diff --git a/.env.development b/.env.development index c3d6537..0a2c835 100644 --- a/.env.development +++ b/.env.development @@ -3,7 +3,8 @@ NODE_ENV = 'development' # 本地环境接口地址(/api/index.ts文件中使用) # 后端本地 -# VITE_API_URL = 'http://192.168.34.155:19111' +VITE_API_URL = 'http://192.168.34.155:19111' +# VITE_API_URL = 'http://192.168.34.221:28890' #雄哥本地 # VITE_API_URL = 'http://192.168.34.221:9111' #雄哥本地 # VITE_API_URL = 'http://182.90.224.237:51234' #雄哥远程 # VITE_API_URL = 'http://192.168.34.221:28889' @@ -17,7 +18,7 @@ NODE_ENV = 'development' # 演示平台 # VITE_API_URL = 'http://jxj.zhgdyun.com:9809' # 百色七参数线上地址 -VITE_API_URL = 'http://101.43.164.214:11111' +# VITE_API_URL = 'http://101.43.164.214:11111' # 七参数标准版(测试平台) # VITE_API_URL = 'http://jxj.zhgdyun.com:15551' # 七参数标准版(测试平台) diff --git a/.env.production b/.env.production index d0dc8f7..8c84a3c 100644 --- a/.env.production +++ b/.env.production @@ -21,8 +21,8 @@ NODE_ENV = "production" # 七参数标准版(测试平台) # 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:11211' #测试环境 +VITE_API_URL = 'http://42.180.188.17:9809' #生产环境 +# VITE_API_URL = 'http://42.180.188.17:11211' #测试环境 # 苏立信/重庆市南岸区 # VITE_API_URL = 'http://101.43.164.214:11111' # 中科安信 diff --git a/src/config/config.ts b/src/config/config.ts index 1ebdda5..ff2368c 100644 --- a/src/config/config.ts +++ b/src/config/config.ts @@ -23,13 +23,13 @@ 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 = "agjtLive"; //鞍钢集团现场大屏 -// export const COMPANY: string = "agjtCommand"; //鞍钢集团指挥部大屏 +export const COMPANY: string = "agjtCommand"; //鞍钢集团指挥部大屏 // export const COMPANY: string = "agjtProjectKanban"; //鞍钢集团项目看板大屏 // export const COMPANY: string = "agjtOverviewScreen"; //鞍钢集团项目总览 // export const COMPANY: string = "zkjc"; //中科佳成项目 diff --git a/src/routers/modules/staticRouter.ts b/src/routers/modules/staticRouter.ts index 4857b63..9748249 100644 --- a/src/routers/modules/staticRouter.ts +++ b/src/routers/modules/staticRouter.ts @@ -24,8 +24,8 @@ export const staticRouter: RouteRecordRaw[] = [ { path: "/large", name: "大屏", - component: () => import("@/views/sevenLargeScreen/indexL.vue"), //七参数标准版 - // component: () => import("@/views/commandScreen/indexCommand.vue"), //指挥部大屏 + // component: () => import("@/views/sevenLargeScreen/indexL.vue"), //七参数标准版 + component: () => import("@/views/commandScreen/indexCommand.vue"), //指挥部大屏 // component: () => import("@/views/agjtLiveScreen/indexLive.vue"), //鞍钢现场大屏 // component: () => import("@/views/overviewScreen/indexCommand.vue"), //总览大屏 // component: () => import("@/views/agjtProjectKanban/indexL.vue"), //鞍钢集团项目看板大屏 diff --git a/src/views/commandScreen/commandCenter/centerBottom.vue b/src/views/commandScreen/commandCenter/centerBottom.vue index 89ee9ab..1121dbe 100644 --- a/src/views/commandScreen/commandCenter/centerBottom.vue +++ b/src/views/commandScreen/commandCenter/centerBottom.vue @@ -207,6 +207,7 @@ const randerInfo = reactive({ }); //切换tab const handleTab = (val: number) => { + if (val == activeIfo.activeIndex) return; if (activeIfo.activeIndex == 1) { activeIfo.activeIndex = val; getCountAlarmNumByEnterprise(false); diff --git a/src/views/commandScreen/commandCenter/leftBottom.vue b/src/views/commandScreen/commandCenter/leftBottom.vue index 54f8b17..d6cab8b 100644 --- a/src/views/commandScreen/commandCenter/leftBottom.vue +++ b/src/views/commandScreen/commandCenter/leftBottom.vue @@ -35,21 +35,30 @@ s
-
总包出勤情况分析
-
人员风险趋势分析
+ +
+ {{ item.title }} +
-
+
- +

暂无数据

-
+
@@ -162,6 +171,17 @@ import { Vue3SeamlessScroll } from "vue3-seamless-scroll"; import radarMapOption from "@/views/commandScreen/components/radarMapOption.vue"; const store = GlobalStore(); +const activeIfo = reactive({ + activeIndex: 0, + activeTitleList: [ + { + id: 1, + title: "总包出勤情况分析" + }, + { id: 2, title: "人员风险趋势分析" } + ] +}); + const randerInfo = reactive({ id: "radarMap1", fontSize: 12, @@ -301,10 +321,12 @@ const queryAttendanceOfEachCompany = async (showLoading: boolean) => { //切换tab const handleTab = (val: number) => { - if (isFlag.value && activeIndex.value == 1) { - activeIndex.value = val; + if (val == activeIfo.activeIndex) return; + isFlag.value = true; + if (isFlag.value && activeIfo.activeIndex == 1) { + activeIfo.activeIndex = val; queryAttendanceOfEachCompany(false); - } else if (activeIndex.value == 0) { + } else if (activeIfo.activeIndex == 0) { getWorkerRiskByProject(false, 1); } }; @@ -524,13 +546,13 @@ const getWorkerRiskByProject = async (showLoading: boolean, val: number) => { ]; randerInfo.titleInfo.percentage = res.result.area; } - activeIndex.value = val; + activeIfo.activeIndex = val; }; const setIntervalFn = (showLoading: boolean) => { // drawBar() getPersonTypeAndEduStatistics(showLoading); - if (activeIndex.value == 0) { + if (activeIfo.activeIndex == 0) { queryAttendanceOfEachCompany(showLoading); } getCountTaskProgress(showLoading); @@ -578,6 +600,7 @@ onMounted(async () => { height: 50%; // background-color: #fff; font-size: 13px; + position: relative; .line1 { color: #fff; padding-top: 5px; @@ -771,7 +794,7 @@ onMounted(async () => { overflow: hidden; } .notoDta { - top: 35%; + top: 38%; width: 50%; // left: 40%; position: absolute; diff --git a/src/views/commandScreen/commandCenter/rightAll.vue b/src/views/commandScreen/commandCenter/rightAll.vue index 4ea7619..cfdcdca 100644 --- a/src/views/commandScreen/commandCenter/rightAll.vue +++ b/src/views/commandScreen/commandCenter/rightAll.vue @@ -341,6 +341,7 @@ const randerInfo2 = reactive({ //切换tab const handleTab = (val: number, type: number) => { if (type == 1) { + if (val == activeInfo.activeIndex) return; if (activeInfo.activeIndex == 1) { activeInfo.activeIndex = val; getInspectionRiskChart(false); @@ -348,6 +349,7 @@ const handleTab = (val: number, type: number) => { getSafetyRiskByProject(false, 1); } } else if (type == 2) { + if (val == activeInfo.activeIndex2) return; if (activeInfo.activeIndex2 == 1) { activeInfo.activeIndex2 = val; getCountAllSpecial(false); diff --git a/src/views/commandScreen/dialogCompnnents/radar-map-list.vue b/src/views/commandScreen/dialogCompnnents/radar-map-list.vue index 49c8046..a0ffead 100644 --- a/src/views/commandScreen/dialogCompnnents/radar-map-list.vue +++ b/src/views/commandScreen/dialogCompnnents/radar-map-list.vue @@ -6,6 +6,10 @@
+
+ +

暂无数据

+
@@ -76,8 +80,28 @@ onMounted(async () => { .scrollbar { height: 85%; + position: relative; } +.notoDta { + top: 40%; + width: 20%; + // left: 40%; + position: absolute; + text-align: center; + left: 50%; + transform: translateX(-50%); + img { + width: 40%; + margin: 5% 30%; + } + + p { + color: #fff; + font-size: calc(100vw * 14 / 1920); + margin: -6% 30%; + } +} .radar-map_list { height: 100%; display: flex;