diff --git a/.env.development b/.env.development index ec2a3da..06c624d 100644 --- a/.env.development +++ b/.env.development @@ -3,7 +3,7 @@ NODE_ENV = 'development' # 本地环境接口地址(/api/index.ts文件中使用) # 后端本地 -# VITE_API_URL = 'http://192.168.34.221:9111' +VITE_API_URL = 'http://192.168.34.221:9111' # VITE_API_URL = 'http://192.168.34.221:28888' # VITE_API_URL = 'http://121.196.214.246/api' # VITE_API_URL = 'http://jxj.zhgdyun.com:100' @@ -21,7 +21,7 @@ NODE_ENV = 'development' # 七参数标准版(测试平台) # VITE_API_URL = 'http://182.90.224.237:15551' # agjt -VITE_API_URL = 'http://42.180.188.17:9809' #生产环境 +# VITE_API_URL = 'http://42.180.188.17:9809' #生产环境 # VITE_API_URL = 'http://42.180.188.17:11211' #测试环境 # VITE_API_URL = 'http://jxj.zhgdyun.com:19812' # 苏立信 diff --git a/src/config/config.ts b/src/config/config.ts index 1653e5f..9cd1ad8 100644 --- a/src/config/config.ts +++ b/src/config/config.ts @@ -23,11 +23,11 @@ export const BAIDU_MAP_KEY: string = ""; export const BASE_IMAGE_URL = import.meta.env.VITE_BASE_IMAGE_URL; // 项目环境标识配置 部署时需更改对应的项目 -// export const COMPANY: string = ""; //标准版 +export const COMPANY: string = ""; //标准版 // export const COMPANY: string = "zhzrf"; //中海·臻如府 // export const COMPANY: string = "zsbf"; //中水北方 // export const COMPANY: string = "as"; //鞍山项目 -export const COMPANY: string = "agjt"; //鞍钢集团 +// export const COMPANY: string = "agjt"; //鞍钢集团 // export const COMPANY: string = "agjtCommand"; //鞍钢集团指挥部大屏 // export const COMPANY: string = "slx"; //苏立信项目 // export const COMPANY: string = "hfqc"; //合肥启程项目 diff --git a/src/config/staticMenu.ts b/src/config/staticMenu.ts index d97b340..d963055 100644 --- a/src/config/staticMenu.ts +++ b/src/config/staticMenu.ts @@ -788,6 +788,14 @@ export const AGJTMenu: Array = [ // }, // ] }, + { + moduleName: "机械设备定位", + modulePath: "/equipmentPosition" + }, + { + moduleName: "智能安全帽", + modulePath: "/smartSafeHat" + } ]; //鞍钢集团 export const SLXMenu: Array = [ diff --git a/src/views/commandScreen/commandCenter/rightAll.vue b/src/views/commandScreen/commandCenter/rightAll.vue index a3eb560..f48fc8a 100644 --- a/src/views/commandScreen/commandCenter/rightAll.vue +++ b/src/views/commandScreen/commandCenter/rightAll.vue @@ -410,7 +410,7 @@ function drawEchart2() { title: { text: questionTotal.value, // text: '100%', - subtext: "超期未整改数", + subtext: "隐患未销项", x: "24%", y: "center", textAlign: "center",