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

8.26 接口修改

See merge request eshop/fe_service_ebtp_frontend!254

config/proxy.ts

@@ -17,31 +17,6 @@ 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,

src/pages/Device/service.ts

@@ -1,15 +1,15 @@
 import request from '@/utils/request';
 
 export async function reserveList(data: any) { // 查询会议室/评标室预约情况
-  return request('/v1/eval/room/reserve/list', {
+  return request('/api/biz-service-ebtp-evaluation/v1/eval/room/reserve/list', {
     method: 'post',
-    data: {...data,pageNo: data.current}
+    data: { ...data, pageNo: data.current }
   });
 }
 
 export async function roomList() { // 查询评标室列表
   ///api/biz-service-ebtp-evaluation
-  return request('/v1/elec/eval/room/list', {
+  return request('/api/biz-service-ebtp-evaluation/v1/elec/eval/room/list', {
     method: 'get',
     params: {}
   });
@@ -18,23 +18,23 @@ export async function roomList() { // 查询评标室列表
 
 export async function deviceList(data: any) {
   // 查询设备列表
-  return request('/v1/eval/device/queryPageByParam', {
+  return request('/api/biz-service-ebtp-evaluation/v1/eval/device/queryPageByParam', {
     method: 'post',
     data: { ...data, pageNo: data.current },
   });
 }
 
-export async function getplaceareaList() { 
+export async function getplaceareaList() {
   // 查询场所、区域列表
   /// /v1/elec/eval/placearea/uset/list
-  return request('/v1/elec/eval/placearea/list', {
+  return request('/api/biz-service-ebtp-evaluation/v1/elec/eval/placearea/user/list', {
     method: 'get',
     params: {}
   });
 }
 
-export async function getDeviceById(id: any) { 
+export async function getDeviceById(id: any) {
-  return request('/v1/eval/device/query/'+`${id}`, {
+  return request('/api/biz-service-ebtp-evaluation/v1/eval/device/query/' + `${id}`, {
     method: 'get',
     params: {}
   });

src/pages/ElecEvalReserve/service.ts

@@ -1,15 +1,15 @@
 import request from '@/utils/request';
 
 export async function reserveList(data: any) { // 查询会议室/评标室预约情况
-  return request('/v1/eval/room/reserve/list', {
+  return request('/api/biz-service-ebtp-evaluation/v1/eval/room/reserve/list', {
     method: 'post',
-    data: {...data,pageNo: data.current}
+    data: { ...data, pageNo: data.current }
   });
 }
 
 export async function roomList() { // 查询评标室列表
   ///api/biz-service-ebtp-evaluation
-  return request('/v1/elec/eval/room/list', {
+  return request('/api/biz-service-ebtp-evaluation/v1/elec/eval/room/list', {
     method: 'get',
     params: {}
   });
@@ -18,7 +18,7 @@ export async function roomList() { // 查询评标室列表
 
 export async function cancelReserve(id: any) { // 取消预约
   ///api/biz-service-ebtp-evaluation
-  return request('/v1/eval/room/reserve/cancel/'+`${id}`, {
+  return request('/api/biz-service-ebtp-evaluation/v1/eval/room/reserve/cancel/' + `${id}`, {
     method: 'get',
   });
 }