louhangfei hace 11 meses
padre
commit
2495064fc8

+ 6 - 6
mock/login/routers.ts

@@ -49,10 +49,10 @@ const list = [
             component: '/disaster/disaster-warning/PageWarningInfo',
             id: 1035,
             meta: {
-              activeMenu: null,
+              activeMenu: '/disaster-prevention/disaster-warning',
               alwaysShow: false,
               frameSrc: '',
-              hidden: false,
+              hidden: true,
               icon: '',
               isFrame: 0,
               isRoot: false,
@@ -211,10 +211,10 @@ const list = [
             component: '/disaster/disaster-precaution/PageTaskTemplate',
             id: 1031,
             meta: {
-              activeMenu: null,
+              activeMenu: '/disaster-prevention/disaster-precaution/task-execution',
               alwaysShow: false,
               frameSrc: '',
-              hidden: false,
+              hidden: true,
               icon: '',
               isFrame: 0,
               isRoot: false,
@@ -228,10 +228,10 @@ const list = [
             redirect: '',
           },
           {
-            component: '/disaster/disaster-precaution/PageTaskTemplateDetail',
+            component: '/todo/todo',
             id: 1032,
             meta: {
-              activeMenu: null,
+              activeMenu: '/disaster-prevention/disaster-precaution/task-template',
               alwaysShow: false,
               frameSrc: '',
               hidden: true,

+ 1 - 1
public/app.config.js

@@ -3,7 +3,7 @@ window.__PRODUCTION__SKYEYEADMIN__CONF__ = {
   // document的title,以及显示在左侧导航栏的title,一般是项目的名称
   VITE_GLOB_APP_TITLE: '上飞院安全智能管控平台',
   // 接口前缀
-  VITE_GLOB_API_URL_PREFIX: './eye_api_bak/api',
+  VITE_GLOB_API_URL_PREFIX: './safety_api/api',
 
 };
 

+ 4 - 1
utils/devProxy/index.ts

@@ -1,5 +1,8 @@
 import { start } from './utils';
 
-import * as config from './local/proxy';
+import * as config from './staff/proxy';
+// import * as config from './zongbu/proxy';
+// import * as config from './zhongjiancai/proxy';
+// import * as config from './local/proxy';
 
 export default start(config.proxy, config.appConfigPath);

+ 0 - 28
utils/devProxy/local/app.config.js

@@ -1,28 +0,0 @@
-
-window.__PRODUCTION__SKYEYEADMIN__CONF__ = {
-  "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": 'v2',
-  // 消息管理可选择的推送渠道
-  "VITE_GLOB_NOTICE_CHANNEL": ['lanxin', 'platform', 'wecom'],
-  // 压缩图片的服务地址
-  "minifyImgUrl": 'http://192.168.13.68:3000',
-};
-
-
-
-Object.freeze(window.__PRODUCTION__SKYEYEADMIN__CONF__);
-Object.defineProperty(window, "__PRODUCTION__SKYEYEADMIN__CONF__", {
-  configurable: false,
-  writable: false,
-});

+ 0 - 23
utils/devProxy/local/proxy.ts

@@ -1,23 +0,0 @@
-import { PROXY_TYPE } from '../types';
-import path from 'path';
-
-// 连后端本机时的代理staff环境
-const proxyStaff: PROXY_TYPE = {
-  serverHost: 'http://192.168.13.68:8808/',
-  loginHost: 'http://192.168.13.68/skyeye-login/',
-  skyeyeFileUploadHost: 'http://192.168.13.102:9000/',
-  nvrDownload: 'http://192.168.13.68/nvr_download',
-
-  push_stream_host: 'http://192.168.13.68/push_stream_host',
-  push_stream_host_zongbu: 'http://192.168.13.69:8080',
-  push_stream_host_shangfei: 'http://192.168.13.68/push_stream_host_shangfei',
-  push_stream_host_shangfeiyuan: 'http://192.168.13.68/push_stream_host_shangfeiyuan',
-  push_stream_host_beiyan: 'http://192.168.13.68/push_stream_host_beiyan',
-  push_stream_host_default: 'http://192.168.13.68/push_stream_host_default',
-};
-
-// 如果是要连接本地,在对应的环境把serverHost改为后端本地地址就行
-
-export const proxy = proxyStaff;
-
-export const appConfigPath = path.resolve(__dirname, 'app.config.js');

+ 14 - 0
utils/devProxy/staff/app.config.js

@@ -0,0 +1,14 @@
+window.__PRODUCTION__SKYEYEADMIN__CONF__ = {
+
+  // document的title,以及显示在左侧导航栏的title,一般是项目的名称
+  VITE_GLOB_APP_TITLE: '上飞院安全智能管控平台',
+  // 接口前缀
+  VITE_GLOB_API_URL_PREFIX: './eye_api_bak/api',
+
+};
+
+Object.freeze(window.__PRODUCTION__SKYEYEADMIN__CONF__);
+Object.defineProperty(window, '__PRODUCTION__SKYEYEADMIN__CONF__', {
+  configurable: false,
+  writable: false,
+});

+ 14 - 0
utils/devProxy/staff/proxy.ts

@@ -0,0 +1,14 @@
+import { PROXY_TYPE } from '../types';
+import path from 'path';
+
+// staff环境
+const proxyStaff: PROXY_TYPE = {
+  serverHost: 'http://192.168.13.68:8802/safety_api',
+  loginHost: 'http://192.168.13.68:7200/safety-login/',
+  fileUploadHost: 'http://192.168.13.68/safety-file-upload',
+};
+
+// 对外导出的代理
+export const proxy = proxyStaff;
+
+export const appConfigPath = path.resolve(__dirname, 'app.config.js');

+ 1 - 15
utils/devProxy/types.ts

@@ -5,19 +5,5 @@ export interface PROXY_TYPE {
   /** 登录地址 */
   loginHost: string;
   /** 文件存储服务minio */
-  skyeyeFileUploadHost: string;
-  /** nvr视频文件下载地址 */
-  nvrDownload: string;
-  /** 流媒体服务 */
-  push_stream_host: string;
-  /** 总部流媒体服务 */
-  push_stream_host_zongbu?: string;
-  /** 上飞公司的流媒体服务 */
-  push_stream_host_shangfei?: string;
-  /** 上飞院的流媒体服务 */
-  push_stream_host_shangfeiyuan?: string;
-  /** 北研的流媒体服务 */
-  push_stream_host_beiyan?: string;
-  /** 默认流媒体服务 */
-  push_stream_host_default?: string;
+  fileUploadHost: string;
 }