Merge branch 'master-电子评标室-预约管理-liuh' into 'release_electronic_bid_evaluation_room'

8.26 电子评标室 预约管理 liuh

See merge request eshop/fe_service_ebtp_frontend!246

config/proxy.ts

@@ -17,6 +17,31 @@ export default {
     //   changeOrigin: true,
     //   pathRewrite: { '^': '' },
     // },
+    '/v1/elec/eval/placearea/list': { // /v1/elec/eval/placearea/uset/list
+      target: 'http://localhost:18017', //连接天宫的ng
+      changeOrigin: true,
+      pathRewrite: { '^': '' },
+    },
+    '/v1/eval/device/queryPageByParam': {
+      target: 'http://localhost:18017', //连接天宫的ng
+      changeOrigin: true,
+      pathRewrite: { '^': '' },
+    },
+    '/v1/eval/room/reserve/cancel': {
+      target: 'http://localhost:18017',//连接本地
+      changeOrigin: true,
+      pathRewrite: { '^': '' },
+    },
+    '/v1/eval/room/reserve/list': {
+      target: 'http://localhost:18017',//连接本地
+      changeOrigin: true,
+      pathRewrite: { '^': '' },
+    },
+    '/v1/elec/eval/room/list': {
+      target: 'http://localhost:18017',//连接本地
+      changeOrigin: true,
+      pathRewrite: { '^': '' },
+    },
     '/api/*': {
       target: 'http://10.242.31.158:18022',//连接天宫的ng
       changeOrigin: true,

config/router.config.ts

@@ -129,6 +129,16 @@ export default [
             path: '/',
             redirect: '/userexpert/login',
           },
+          {//设备管理
+            name: 'Device',
+            path: '/Device',
+            component: './Device',
+          },
+          {//评标室查看预约
+            name: 'ElecEvalReserve',
+            path: '/ElecEvalReserve',
+            component: './ElecEvalReserve',
+          },
           ...home,//各角色主页
           ...menuaZhaoBiao,//项目菜单所有路由
           {