From d2a017338897367d3574acaec06c3a477a7d3053 Mon Sep 17 00:00:00 2001 From: Vce Date: Thu, 13 Jun 2024 00:31:11 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E6=8C=87=E6=8C=A5?= =?UTF-8?q?=E9=83=A8=E5=A4=A7=E5=B1=8F=E4=B8=AD=E4=B8=8B=E9=83=A8=E5=88=86?= =?UTF-8?q?=E2=80=9D=E9=9A=90=E6=82=A3=E6=A3=80=E6=9F=A5=E6=8E=A8=E9=80=81?= =?UTF-8?q?=E2=80=9C=E6=98=BE=E7=A4=BA=E8=B6=85=E6=9C=9F=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/config/config.ts | 4 +- src/routers/modules/staticRouter.ts | 4 +- .../commandCenter/centerBottom.vue | 36 ++++++----- .../commandScreen/commandCenter/rightAll.vue | 63 ++++++++++++++----- src/views/login/index.vue | 2 +- 5 files changed, 73 insertions(+), 36 deletions(-) diff --git a/src/config/config.ts b/src/config/config.ts index cda4664..d22b957 100644 --- a/src/config/config.ts +++ b/src/config/config.ts @@ -28,8 +28,8 @@ export const BASE_IMAGE_URL = import.meta.env.VITE_BASE_IMAGE_URL; // 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 = "agjtLive"; //鞍钢集团现场大屏 +export const COMPANY: string = "agjtCommand"; //鞍钢集团指挥部大屏 // export const COMPANY: string = "agjtProjectKanban"; //鞍钢集团项目看板大屏 // export const COMPANY: string = "slx"; //苏立信项目 // export const COMPANY: string = "hfqc"; //合肥启程项目 diff --git a/src/routers/modules/staticRouter.ts b/src/routers/modules/staticRouter.ts index 9e68658..5eddd10 100644 --- a/src/routers/modules/staticRouter.ts +++ b/src/routers/modules/staticRouter.ts @@ -25,8 +25,8 @@ export const staticRouter: RouteRecordRaw[] = [ path: "/large", name: "大屏", // // component: () => import("@/views/sevenLargeScreen/indexL.vue"), //七参数标准版 - // component: () => import("@/views/commandScreen/indexCommand.vue"), //指挥部大屏 - component: () => import("@/views/agjtLiveScreen/indexLive.vue"), //鞍钢现场大屏 + component: () => import("@/views/commandScreen/indexCommand.vue"), //指挥部大屏 + // component: () => import("@/views/agjtLiveScreen/indexLive.vue"), //鞍钢现场大屏 // component: () => import("@/views/agjtProjectKanban/indexL.vue"), //鞍钢集团项目看板大屏 // component: () => import("@/views/sevenLargeScreen/indexL_syhy.vue"), // 只有一级路由(盘锦、嘉兴、鄱湖美湾医疗项目需切换至该首页) children: [ diff --git a/src/views/commandScreen/commandCenter/centerBottom.vue b/src/views/commandScreen/commandCenter/centerBottom.vue index b71dcf8..0e5cc51 100644 --- a/src/views/commandScreen/commandCenter/centerBottom.vue +++ b/src/views/commandScreen/commandCenter/centerBottom.vue @@ -42,12 +42,15 @@
-
未整改
-
未复查
-
未核验
-
合格
+
未整改
+
未复查
+
未核验
+
超期未整改
+
超期未复查
+
超期未核验
+
重大风险
@@ -89,12 +92,15 @@
-
未整改
-
未复查
-
未核验
-
合格
+
未整改
+
未复查
+
未核验
+
超期未整改
+
超期未复查
+
超期未核验
+
重大风险
@@ -154,21 +160,21 @@ const getNoticeList = async (showLoading: boolean) => { listData.value = res.result.page.records.map((item: any) => { let statusMsg1 = item.status == 2 ? "未整改": item.status == 3 ? "未复查": - item.status == 4 ? "未核验": + item.status == 4 ? "未核验":"" // item.status == 5 ? "合格": // item.status == 6 ? "已撤回": - item.status == 7 ? "超期未整改":"" + // item.status == 7 ? "超期未整改":"" let statusMsg2 = item.status == 2 ? "整改！": item.status == 3 ? "复查！": - item.status == 4 ? "核验！": + item.status == 4 ? "核验！":"" // item.status == 5 ? "合格": // item.status == 6 ? "已撤回": - item.status == 7 ? "整改！":"" + // item.status == 7 ? "整改！":"" let tempMsg = item.enterpriseName + "的" + item.regionName + "责任区域内有一条" + item.dangerItemContent + "的隐患" + statusMsg1 + "，请注意监督" + statusMsg2 return { msg:tempMsg, - payload: JSON.stringify({status:item.status, level:item.level, time:item.createTime}) + payload: JSON.stringify({status:item.status, level:item.level, time:item.inspectTime,overTime:item.overTime}) } }) // listData.value.push({ diff --git a/src/views/commandScreen/commandCenter/rightAll.vue b/src/views/commandScreen/commandCenter/rightAll.vue index b63488b..1ff87f6 100644 --- a/src/views/commandScreen/commandCenter/rightAll.vue +++ b/src/views/commandScreen/commandCenter/rightAll.vue @@ -298,7 +298,8 @@ function drawEchart() { let option = { animation: false, // 取消动画 tooltip: { - trigger: "item" + trigger: "item", + // position: ['50%','50%'] }, title: { text: questionTotal.value, @@ -795,35 +796,57 @@ function getSpecialEchart() { tooltip: { trigger: "item", position: "inside", - // confine: true, + confine: true, axisPointer: { // 坐标轴指示器，鼠标放上时变阴影，而不是线 type: "shadow" // 默认为直线，可选为：'line' | 'shadow' }, - // textStyle: { - // color: "#000000" - // }, + // confine:true, + // position:['50%','50%'], + appendToBody:true, + textStyle: { + color: "#fff", + fontSize: '3px' + }, // backgroundColor: "#F3F3F3", - extraCssText: "width:150px;white-space:pre-wrap;box-shadow: 0px 4px 4px 0px rgba(0,0,0,0.25);", + extraCssText: "width:220px;white-space:pre-wrap;box-shadow: 0px 4px 4px 0px rgba(0,0,0,0.25);", formatter: function (params: any) { const obj = safeList[params.dataIndex]; // 当鼠标悬停在柱子上时，显示实际数值和百分比 - return '
'+safeList[params.dataIndex].x+'
●动土安全作业：'+obj.xzGroundSafetNum+'
'+ - '
●用电安全作业：'+obj.xzTemporaryElectricitySafeNum+'
'+ - '
●高处作业作业：'+obj.xzHighJobSafeNum+'
'+ - '
●盲板抽堵作业：'+obj.xzBlindPlatePlugSafeNum+'
'+ - '
●动火安全作业：'+obj.xzSpecialOperationFireSafetyNum+'
'+ - '
●断路安全作业：'+obj.xzOpenCircuitSafeNum+'
'+ - '
●吊装安全作业：'+obj.xzHoistSafetyWorkNum+'
'+ - '
●受限空间作业：'+obj.xzLimitSpaceSafeNum+'
'; + return '
'+safeList[params.dataIndex].x+'
'+ + // return '
●动土安全作业：'+obj.xzGroundSafetNum+'
'+ + '
●动土安全作业：'+obj.xzGroundSafetNum+'
'+ + '
●用电安全作业：'+obj.xzTemporaryElectricitySafeNum+'
'+ + + '
●高处作业作业：'+obj.xzHighJobSafeNum+'
'+ + '
●盲板抽堵作业：'+obj.xzBlindPlatePlugSafeNum+'
'+ + + '
●动火安全作业：'+obj.xzSpecialOperationFireSafetyNum+'
'+ + '
●断路安全作业：'+obj.xzOpenCircuitSafeNum+'
'+ + + '
●吊装安全作业：'+obj.xzHoistSafetyWorkNum+'
'+ + '
●受限空间作业：'+obj.xzLimitSpaceSafeNum+'
'; // return `动火安全作业：${obj.xzSpecialOperationFireSafetyNum}\n盲板抽堵作业：${obj.xzBlindPlatePlugSafeNum}\n动土安全作业：${obj.xzGroundSafetNum}\n高处作业作业：${obj.xzHighJobSafeNum}\n吊装安全作业：${obj.xzHoistSafetyWorkNum}\n受限空间作业：${obj.xzLimitSpaceSafeNum}\n断路安全作业：${obj.xzOpenCircuitSafeNum}\n用电安全作业：${obj.xzTemporaryElectricitySafeNum}`; } }, + legend:{ + show:true, + itemWidth:10, + itemHeight:5, + // x:'right', + textStyle:{ + fontSize:'3px', + color:'#FFF' + }, + // x:'left', + data: ["动土作业", "临时用电", "高处作业", "盲板抽堵","动火作业", "断路作业", "吊装作业", "受限空间"], + // icon: 'circle' + }, grid: { left: "3%", right: "6%", bottom: "0%", - top: "3%", + top: "30%", containLabel: true }, xAxis: { @@ -911,6 +934,7 @@ function getSpecialEchart() { series: [ //动土作业 { + name:'动土作业', // data: safeList.map(item => item.y), data: specialList.value.map((item: any) => item.xzGroundSafetNum), type: "bar", @@ -918,10 +942,11 @@ function getSpecialEchart() { color: "#5470c6", stack: 'total', // label: { show: true}, - // emphasis:{focus: 'series'} + emphasis:{focus: 'series'} }, //临时用电 { + name:'临时用电', // data: safeList.map(item => item.y), data: specialList.value.map((item: any) => item.xzTemporaryElectricitySafeNum), type: "bar", @@ -933,6 +958,7 @@ function getSpecialEchart() { }, //高处作业 { + name:'高处作业', // data: safeList.map(item => item.y), data: specialList.value.map((item: any) => item.xzHighJobSafeNum), type: "bar", @@ -944,6 +970,7 @@ function getSpecialEchart() { }, //盲板抽堵 { + name:'盲板抽堵', // data: safeList.map(item => item.y), data: specialList.value.map((item: any) => item.xzBlindPlatePlugSafeNum), type: "bar", @@ -955,6 +982,7 @@ function getSpecialEchart() { }, //动火作业 { + name:'动火作业', // data: safeList.map(item => item.y), data: specialList.value.map((item: any) => item.xzSpecialOperationFireSafetyNum), type: "bar", @@ -966,6 +994,7 @@ function getSpecialEchart() { }, //断路作业 { + name:'断路作业', // data: safeList.map(item => item.y), data: specialList.value.map((item: any) => item.xzOpenCircuitSafeNum), type: "bar", @@ -977,6 +1006,7 @@ function getSpecialEchart() { }, //吊装作业 { + name:'吊装作业', // data: safeList.map(item => item.y), data: specialList.value.map((item: any) => item.xzHoistSafetyWorkNum), type: "bar", @@ -988,6 +1018,7 @@ function getSpecialEchart() { }, //受限空间 { + name:'受限空间', // data: safeList.map(item => item.y), data: specialList.value.map((item: any) => item.xzLimitSpaceSafeNum), type: "bar", diff --git a/src/views/login/index.vue b/src/views/login/index.vue index 33c42c5..d7d0f11 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -110,7 +110,7 @@ const login = (formEl: FormInstance | undefined) => { // }); // return; // } - // router.push("/commandScreen"); + router.push("/commandScreen"); } else if(COMPANY === "agjtProjectKanban") { router.push("/agjtProjectKanban"); } else if(COMPANY === "agjtLive") {