feat: 增加总部和上飞的测试环境和

生产环境

src/router/router-guards.ts

@@ -60,14 +60,17 @@ export function createRouterGuards(router: Router) {
       return;
     }
 
-    const userInfo = await userStore.GetInfo();
-
-    const routes = await asyncRouteStore.generateRoutes(userInfo);
-
-    // 动态添加可访问路由表
-    routes.forEach((item) => {
-      router.addRoute(item as unknown as RouteRecordRaw);
-    });
+    try {
+      const userInfo = await userStore.GetInfo();
+      const routes = await asyncRouteStore.generateRoutes(userInfo);
+      // 动态添加可访问路由表
+      routes.forEach((item) => {
+        router.addRoute(item as unknown as RouteRecordRaw);
+      });
+    } catch (err) {
+      console.log('login error', err);
+      window.location.href = getRedirectUrl();
+    }
 
     //添加404
     const isErrorPage = router.getRoutes().findIndex((item) => item.name === ErrorPageRoute.name);

utils/devProxy/index.ts

@@ -1,7 +1,7 @@
 import { start } from './utils';
 
-import * as config from './staff-shangfei/proxy';
-// import * as config from './staff-zongbu/proxy';
+// import * as config from './shangfei/proxy';
+import * as config from './zongbu/proxy';
 // import * as config from './staff-zhongjiancai/proxy';
 // import * as config from './pc/proxy';
 

utils/devProxy/pc/app.config.js

@@ -1,26 +0,0 @@
-
-window.__PRODUCTION__SKYEYEADMIN__CONF__ = {
-  // document的title，以及显示在左侧导航栏的title，一般是项目的名称
-  "VITE_GLOB_APP_TITLE": "智能工厂视觉管控系统",
-  // 租户tenantCode，可以不用填
-  "VITE_GLOB_TENANT_CODE": "",
-  // 接口前缀
-  "VITE_GLOB_API_URL_PREFIX": "/eye_api_bak/api",
-  // app下载地址
-  "VITE_GLOB_APP_DOWNLOAD_QRCODE": "",
-  // 登录的前端地址
-  "VITE_GLOB_LOGIN_APP": "/skyeye-login/#/",
-  // 平台跳转地址
-  "VITE_GLOB_APP_PC": "/skyeyev3pc/",
-  /** 问题闭环处理，简单处理 */
-  "VITE_GLOB_QUESTION_LIST_VERSION": '',
-
-};
-
-
-
-Object.freeze(window.__PRODUCTION__SKYEYEADMIN__CONF__);
-Object.defineProperty(window, "__PRODUCTION__SKYEYEADMIN__CONF__", {
-  configurable: false,
-  writable: false,
-});

utils/devProxy/pc/proxy.ts

@@ -1,19 +0,0 @@
-import { PROXY_TYPE } from '../types';
-import path from 'path';
-// 连pc电脑的配置
-
-export const proxy: PROXY_TYPE = {
-  // 开发同学的ip
-  serverHost: '192.168.22.234:8800',
-  loginHost: 'http://192.168.13.68/skyeye-login/',
-  skyeyeFileUploadHost: 'http://192.168.13.68:9001',
-  nvrDownload: 'http://192.168.13.68/nvr_download',
-
-  push_stream_host: 'http://192.168.13.68:8080',
-  push_stream_host_shangfei: 'http://192.168.13.73:8080',
-  push_stream_host_shangfeiyuan: 'http://192.168.13.72:8080',
-  push_stream_host_beiyan: 'http://192.168.13.72:8080',
-  push_stream_host_default: 'http://192.168.13.73:8080',
-};
-
-export const appConfigPath = path.resolve(__dirname, 'app.config.js');

utils/devProxy/staff-shangfei/app.config.js

@@ -5,14 +5,15 @@ window.__PRODUCTION__SKYEYEADMIN__CONF__ = {
   // 租户tenantCode，部分项目必填
   "VITE_GLOB_TENANT_CODE": "shangfei",
   // 接口前缀
-  "VITE_GLOB_API_URL_PREFIX": "/eye_api_bak/api",
+  "VITE_GLOB_API_URL_PREFIX": "./eye_api_bak/api",
   // app下载地址
-  "VITE_GLOB_APP_DOWNLOAD_QRCODE": "/apk/skyeye.apk",
+  // "VITE_GLOB_APP_DOWNLOAD_QRCODE": "/apk/skyeye.apk",
   // 登录的前端地址
   "VITE_GLOB_LOGIN_APP": "/skyeye-login-shangfei/#/",
   // 平台跳转地址
-  "VITE_GLOB_APP_PC": "/skyeyev3pc/",
-
+  "VITE_GLOB_APP_PC": "/skyeyev3pc-shangfei/",
+  // simple v2 
+  // simple为简单闭环处理,v2为复杂闭环处理
   "VITE_GLOB_QUESTION_LIST_VERSION": '',
   // 为上飞定制的是否允许修改组织结构编辑，上飞不允许编辑，其他项目允许编辑
   "VITE_GLOB_DISABLE_DEPARTMENT_EDIT": true,

utils/devProxy/shangfei/proxy.ts

@@ -0,0 +1,37 @@
+import { PROXY_TYPE } from '../types';
+import path from 'path';
+
+// 上飞staff环境
+ const proxyStaff: PROXY_TYPE = {
+  serverHost: '192.168.13.102:62/eye_api_bak',
+  loginHost: 'http://192.168.13.102:62/skyeye-login-shangfei/',
+  skyeyeFileUploadHost: 'http://192.168.13.102:62/skyeye-file-upload',
+  nvrDownload: 'http://192.168.13.102:62/nvr_download',
+
+  push_stream_host: 'http://192.168.13.102:62/push_stream_host',
+  push_stream_host_shangfei: 'http://192.168.13.102:62/push_stream_host_shangfei',
+  push_stream_host_shangfeiyuan: 'http://192.168.13.102:62/push_stream_host_shangfeiyuan',
+  push_stream_host_beiyan: 'http://192.168.13.102:62/push_stream_host_beiyan',
+  push_stream_host_default: 'http://192.168.13.102:62/push_stream_host_default',
+};
+
+// 上飞生产
+ const proxyPrd: PROXY_TYPE = {
+  serverHost: '172.16.23.243/skyeye-admin-shangfei/eye_api_bak',
+  loginHost: 'http://172.16.23.243/skyeye-login-shangfei/',
+  skyeyeFileUploadHost: 'http://172.16.23.243/skyeye-admin-shangfei/skyeye-file-upload',
+  nvrDownload: 'http://172.16.23.243/skyeye-admim-shangfei/nvr_download',
+
+  push_stream_host: 'http://172.16.23.243/skyeye-admin-shangfei/push_stream_host',
+  push_stream_host_shangfei: 'http://172.16.23.243/skyeye-admin-shangfei/push_stream_host_shangfei',
+  push_stream_host_shangfeiyuan:
+    'http://172.16.23.243/skyeye-admin-shangfei/push_stream_host_shangfeiyuan',
+  push_stream_host_beiyan: 'http://172.16.23.243/skyeye-admin-shangfei/push_stream_host_beiyan',
+  push_stream_host_default: 'http://172.16.23.243/skyeye-admin-shangfei/push_stream_host_default',
+};
+
+// 如果是要连接本地，在对应的环境把serverHost改为后端本地地址就行
+
+export const proxy = proxyStaff;
+
+export const appConfigPath = path.resolve(__dirname, 'app.config.js');

utils/devProxy/staff-shangfei/proxy.ts

@@ -1,30 +0,0 @@
-import { PROXY_TYPE } from '../types';
-import path from 'path';
-
-// export const proxy: PROXY_TYPE = {
-//   serverHost: '192.168.13.68:8800',
-//   loginHost: 'http://192.168.13.68/skyeye-login-shangfei/',
-//   skyeyeFileUploadHost: 'http://192.168.13.68:9001',
-//   nvrDownload: 'http://192.168.13.68/nvr_download',
-
-//   push_stream_host: 'http://192.168.13.68:8080',
-//   push_stream_host_shangfei: 'http://192.168.13.73:8080',
-//   push_stream_host_shangfeiyuan: 'http://192.168.13.72:8080',
-//   push_stream_host_beiyan: 'http://192.168.13.72:8080',
-//   push_stream_host_default: 'http://192.168.13.73:8080',
-// };
-
-export const proxy: PROXY_TYPE = {
-  serverHost: '192.168.13.102:62/eye_api_bak',
-  loginHost: 'http://192.168.13.102:62/skyeye-login-shangfei/',
-  skyeyeFileUploadHost: 'http://192.168.13.68:9001',
-  nvrDownload: 'http://192.168.13.68/nvr_download',
-
-  push_stream_host: 'http://192.168.13.68:8080',
-  push_stream_host_shangfei: 'http://192.168.13.73:8080',
-  push_stream_host_shangfeiyuan: 'http://192.168.13.72:8080',
-  push_stream_host_beiyan: 'http://192.168.13.72:8080',
-  push_stream_host_default: 'http://192.168.13.73:8080',
-};
-
-export const appConfigPath = path.resolve(__dirname, 'app.config.js');

utils/devProxy/staff-zongbu/proxy.ts

@@ -1,16 +0,0 @@
-import { PROXY_TYPE } from '../types';
-import path from 'path';
-
-export const proxy: PROXY_TYPE = {
-  serverHost: '192.168.13.68:8800',
-  loginHost: 'http://192.168.13.68/skyeye-login-zongbu2/',
-  skyeyeFileUploadHost: 'http://192.168.13.68:9001',
-  nvrDownload: 'http://192.168.13.68/nvr_download',
-  push_stream_host: 'http://192.168.13.68:8080',
-  push_stream_host_shangfei: 'http://192.168.13.73:8080',
-  push_stream_host_shangfeiyuan: 'http://192.168.13.72:8080',
-  push_stream_host_beiyan: 'http://192.168.13.72:8080',
-  push_stream_host_default: 'http://192.168.13.73:8080',
-};
-
-export const appConfigPath = path.resolve(__dirname, 'app.config.js');

utils/devProxy/staff-zongbu/app.config.js

@@ -5,9 +5,9 @@ window.__PRODUCTION__SKYEYEADMIN__CONF__ = {
   // 租户tenantCode，部分项目必填
   "VITE_GLOB_TENANT_CODE": "shangfeizongbu",
   // 接口前缀
-  "VITE_GLOB_API_URL_PREFIX": "/eye_api_bak/api",
+  "VITE_GLOB_API_URL_PREFIX": "./eye_api_bak/api",
   // app下载地址
-  "VITE_GLOB_APP_DOWNLOAD_QRCODE": "/apk/skyeye.apk",
+  // "VITE_GLOB_APP_DOWNLOAD_QRCODE": "/apk/skyeye.apk",
   // 登录的前端地址
   "VITE_GLOB_LOGIN_APP": "/skyeye-login-zongbu2/#/",
   // 平台跳转地址

utils/devProxy/zongbu/proxy.ts

@@ -0,0 +1,35 @@
+import { PROXY_TYPE } from '../types';
+import path from 'path';
+
+// 总部103环境
+const proxyStaff: PROXY_TYPE = {
+  serverHost: '172.16.26.103/eye_api_bak',
+  loginHost: 'http://172.16.26.103/skyeye-login/',
+  skyeyeFileUploadHost: 'http://172.16.26.103/skyeye-file-upload',
+  nvrDownload: 'http://172.16.26.103/nvr_download',
+  push_stream_host: 'http://172.16.26.103/push_stream_host',
+  push_stream_host_shangfei: 'http://172.16.26.103/push_stream_host_shangfei',
+  push_stream_host_shangfeiyuan: 'http://172.16.26.103/push_stream_host_shangfeiyuan',
+  push_stream_host_beiyan: 'http://172.16.26.103/push_stream_host_beiyan',
+  push_stream_host_default: 'http://172.16.26.103/push_stream_host_default',
+};
+
+// 总部生产
+const proxyPrd: PROXY_TYPE = {
+  serverHost: '172.16.23.243/skyeye-admin-zongbu2/eye_api_bak',
+  loginHost: 'http://172.16.23.243/skyeye-login-zongbu2/',
+  skyeyeFileUploadHost: 'http://172.16.23.243/skyeye-admin-zongbu2/skyeye-file-upload',
+  nvrDownload: 'http://172.16.23.243/skyeye-admin-zongbu2/nvr_download',
+
+  push_stream_host: 'http://172.16.23.243/skyeye-admin-zongbu2/push_stream_host',
+  push_stream_host_shangfei: 'http://172.16.23.243/skyeye-admin-zongbu2/push_stream_host_shangfei',
+  push_stream_host_shangfeiyuan:
+    'http://172.16.23.243/skyeye-admin-zongbu2/push_stream_host_shangfeiyuan',
+  push_stream_host_beiyan: 'http://172.16.23.243/skyeye-admin-zongbu2/push_stream_host_beiyan',
+  push_stream_host_default: 'http://172.16.23.243/skyeye-admin-zongbu2/push_stream_host_default',
+};
+
+// 对外导出的代理
+export const proxy = proxyPrd;
+
+export const appConfigPath = path.resolve(__dirname, 'app.config.js');