Quellcode durchsuchen

[Fix 0000]数据中心系统接口路径修改

bobo04052021@163.com vor 1 Monat
Ursprung
Commit
5b73848a84

+ 1 - 1
.env

@@ -1,5 +1,5 @@
 # port
-VITE_PORT = 3100
+VITE_PORT = 8062
 
 #  网站标题
 VITE_GLOB_APP_TITLE = 智能通风管控系统

+ 2 - 2
src/router/routes/index.ts

@@ -38,9 +38,9 @@ export const LoginRoute: AppRouteRecordRaw = {
   path: '/login',
   name: 'Login',
   //新版后台登录,如果想要使用旧版登录放开即可
-  component: () => import('/@/views/sys/login/Login.vue'),
+  // component: () => import('/@/views/sys/login/Login.vue'),
   //数据中心登录
-  // component: () => import('/@/views/sys/login/LoginDataCenter.vue'),
+  component: () => import('/@/views/sys/login/LoginDataCenter.vue'),
   // 内页登录
   // component: () => import('/@/views/sys/login/LoginNeiye.vue'),
   // component: () => import('/@/views/system/loginmini/MiniLogin.vue'),

+ 9 - 1
src/utils/http/axios/index.ts

@@ -118,7 +118,15 @@ const transform: AxiosTransform = {
         const firstCode = config.url?.split('/')[1];
         const currentPort = window.location.port;
         if (currentPort === '8062' && !proxyFixList.includes(firstCode)) {
-          config.url = `/dataCenter${config.url}`;
+          const originalUrl = config.url;
+          // 判断是否以 /safety 开头
+          if (originalUrl.startsWith('/safety')) {
+            // 替换 /safety 为 /ventanaly-collect/collect
+            config.url = `/dataCenter${originalUrl.replace('/safety', '/ventanaly-collect/collect')}`;
+          } else {
+            // 不是 /safety 开头则正常拼接
+            config.url = `/dataCenter${originalUrl}`;
+          }
         } else if (!proxyFixList || !proxyFixList.includes(firstCode)) {
           config.url = `${apiUrl}${config.url}`;
         }

+ 4 - 4
src/views/monitor/quartz/quartz.api.ts

@@ -9,12 +9,13 @@ enum Api {
   pause = '/ventanaly/quartzJob/pause',
   resume = '/ventanaly/quartzJob/resume',
   delete = '/ventanaly/quartzJob/delete',
+  dataCenterDelete = '/ventanaly-collect/collect/quartzJob/delete',
   exportXlsUrl = '/ventanaly/quartzJob/exportXls',
   importExcelUrl = '/ventanaly/quartzJob/importExcel',
   execute = '/ventanaly/quartzJob/execute',
-  deleteBatch = '/ventanaly/quartzJob/deleteBatch',
+  deleteBatch = '/ventanaly-collect/collect/quartzJob/deleteBatch',
   //数据中心
-  dataCenterList = '/dataCenter/ventanaly/quartzJob/list',
+  dataCenterList = '/dataCenter/ventanaly-collect/collect/quartzJob/list',
   // dataCentersave = '/dataCenter/ventanaly/quartzJob/add',
   // dataCenteredit = '/dataCenter/ventanaly/quartzJob/edit',
 }
@@ -61,7 +62,6 @@ export const deleteQuartz = (params, handleSuccess) => {
     handleSuccess();
   });
 };
-
 /**
  * 启动
  * @param params
@@ -138,7 +138,7 @@ export const deleteDataCenterQuartz = (params, handleSuccess) => {
   return defHttp
     .delete(
       {
-        url: Api.delete,
+        url: Api.dataCenterDelete,
         data: params,
       },
       { joinParamsToUrl: true }

+ 1 - 1
src/views/vent/dataCenter/deviceCenter/history/history.api.ts

@@ -2,7 +2,7 @@ import { PaginationProps } from '/@/components/Table';
 import { defHttp } from '/@/utils/http/axios';
 
 enum Api {
-  getHistory = '/dataCenter/safety/ventanalyMonitorData/getRealHistory',
+  getHistory = '/safety/ventanalyMonitorData/getRealHistory',
   getDeviceList = '/monitor/device',
 }
 /**