From e05717790d7b5a3e2024c86f5807e166010ce767 Mon Sep 17 00:00:00 2001 From: GGJ <357021191@qq.com> Date: Mon, 27 May 2024 10:37:50 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E7=94=B5=E7=BD=91=E4=B8=80?= =?UTF-8?q?=E5=BC=A0=E5=9B=BE=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../package/theme/element-variables.scss | 12 ++--- .../admin/components/menus/menuTree.vue | 3 +- src/styles/element.scss | 30 +++++------- .../panorama/components/cityMapL.vue | 3 ++ .../panorama/components/cityMapR.vue | 3 ++ .../panorama/components/details/evaluate.vue | 49 ++++++++++--------- .../panorama/components/details/stand.vue | 27 ++++------ .../components/details/steadyState.vue | 3 ++ .../panorama/components/details/technique.vue | 5 +- .../components/details/temporaryState.vue | 9 ++-- .../panorama/components/details/terminal.vue | 3 ++ .../panorama/components/line/info.vue | 12 ++--- .../panorama/components/map.vue | 2 +- .../panorama/components/mapL.vue | 3 ++ .../panorama/components/mapR.vue | 29 +++++++---- .../pqs/qualityInspeection/panorama/index.vue | 11 +++-- 16 files changed, 113 insertions(+), 91 deletions(-) diff --git a/src/components/bpmnProcessDesigner/package/theme/element-variables.scss b/src/components/bpmnProcessDesigner/package/theme/element-variables.scss index 49bd326d..251f5e0b 100644 --- a/src/components/bpmnProcessDesigner/package/theme/element-variables.scss +++ b/src/components/bpmnProcessDesigner/package/theme/element-variables.scss @@ -45,12 +45,12 @@ span:focus { box-sizing: border-box; border-bottom: 1px solid #e8e8e8; } -.el-dialog__body { - padding: 16px; - max-height: 80vh; - box-sizing: border-box; - overflow-y: auto; -} +// .el-dialog__body { +// padding: 16px; +// max-height: 80vh; +// box-sizing: border-box; +// overflow-y: auto; +// } .el-dialog__footer { padding: 16px; box-sizing: border-box; diff --git a/src/layouts/admin/components/menus/menuTree.vue b/src/layouts/admin/components/menus/menuTree.vue index 47c332b8..96ac16d0 100644 --- a/src/layouts/admin/components/menus/menuTree.vue +++ b/src/layouts/admin/components/menus/menuTree.vue @@ -73,9 +73,10 @@ const onClickSubMenu = (menu: RouteRecordRaw) => { flex-shrink: 0; } .is-active > .icon { - color: var(--el-menu-active-color) !important; + color: v-bind('config.getColorVal("menuActiveColor")') !important; } .el-menu-item.is-active { background-color: v-bind('config.getColorVal("menuActiveBackground")'); + color: v-bind('config.getColorVal("menuActiveColor")'); } diff --git a/src/styles/element.scss b/src/styles/element.scss index 4c39528e..2f2ab0dd 100644 --- a/src/styles/element.scss +++ b/src/styles/element.scss @@ -31,18 +31,20 @@ } .el-dialog { padding: 0px !important; - .el-dialog__body{ - max-height: 60vh; - overflow-y: auto; - } + .el-dialog__footer { padding: 15px; box-shadow: var(--el-box-shadow); - + width: 100%; bottom: 0; } } +.el-dialog__body { + max-height: 60vh; + overflow-y: auto; + padding: 10px; +} .el-dialog__header { background: var(--el-color-primary); padding: 15px; @@ -54,17 +56,15 @@ color: var(--el-color-white); } } - .el-dialog__headerbtn:hover{ - .el-icon{ - color:#409EFF; + .el-dialog__headerbtn:hover { + .el-icon { + color: #409eff; } } - .el-dialog__title { color: var(--el-color-white); } - } .el-table { @@ -83,10 +83,6 @@ padding: 5px 11px; } -.el-dialog__body { - padding: 10px; -} - /* dialog滚动条-s */ .el-overlay-dialog, .el-tabs__content, @@ -209,10 +205,10 @@ opacity: 0.6; } -.sgmap-ctrl-bottom-left{ +.sgmap-ctrl-bottom-left { display: none !important; } -.el-drawer__header{ +.el-drawer__header { margin-bottom: 0 !important; -} \ No newline at end of file +} diff --git a/src/views/pqs/qualityInspeection/panorama/components/cityMapL.vue b/src/views/pqs/qualityInspeection/panorama/components/cityMapL.vue index afb6ff79..1148af6c 100644 --- a/src/views/pqs/qualityInspeection/panorama/components/cityMapL.vue +++ b/src/views/pqs/qualityInspeection/panorama/components/cityMapL.vue @@ -326,4 +326,7 @@ defineExpose({ info, show }) color: #2dcd28; } } +:deep(.el-dialog__body) { + max-height: none !important; +} diff --git a/src/views/pqs/qualityInspeection/panorama/components/cityMapR.vue b/src/views/pqs/qualityInspeection/panorama/components/cityMapR.vue index c33456da..2ff6fd2b 100644 --- a/src/views/pqs/qualityInspeection/panorama/components/cityMapR.vue +++ b/src/views/pqs/qualityInspeection/panorama/components/cityMapR.vue @@ -608,4 +608,7 @@ defineExpose({ info, show }) margin-bottom: 1px; } } +:deep(.el-dialog__body) { + max-height: none !important; +} diff --git a/src/views/pqs/qualityInspeection/panorama/components/details/evaluate.vue b/src/views/pqs/qualityInspeection/panorama/components/details/evaluate.vue index f458e8e2..e2202d89 100644 --- a/src/views/pqs/qualityInspeection/panorama/components/details/evaluate.vue +++ b/src/views/pqs/qualityInspeection/panorama/components/details/evaluate.vue @@ -6,28 +6,27 @@ - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + +
@@ -100,4 +99,8 @@ const formatter = (row: any) => { defineExpose({ open }) - + diff --git a/src/views/pqs/qualityInspeection/panorama/components/details/stand.vue b/src/views/pqs/qualityInspeection/panorama/components/details/stand.vue index 21119156..46be3d3d 100644 --- a/src/views/pqs/qualityInspeection/panorama/components/details/stand.vue +++ b/src/views/pqs/qualityInspeection/panorama/components/details/stand.vue @@ -121,28 +121,16 @@ const contaminateC = () => { } for (let i = 0; i < data.length; i++) { if (data[i] >= 2) { - a5++ + ++a5 } else if (data[i] >= 1.6 && data[i] < 2) { - a4++ + ++a4 } else if (data[i] >= 1.2 && data[i] < 1.6) { - a3++ + ++a3 } else if (data[i] >= 1 && data[i] < 1.2) { - a4++ + ++a2 } else if (data[i] >= 0 && data[i] < 1) { - a1++ + ++a1 } - - // if (data[i] >= 0 || data[i] < 1) { - // a1++ - // } else if (data[i] >= 1 || data[i] < 1.2) { - // a2++ - // } else if (data[i] >= 1.2 || data[i] < 1.6) { - // a3++ - // } else if (data[i] >= 1.6 || data[i] < 2) { - // a4++ - // } else if (data[i] >= 2) { - // a5++ - // } } // console.log('🚀 ~ getPollutionAlarmData ~ a1 / data.length:', a1 / data.length) @@ -275,7 +263,7 @@ const contaminateC = () => { num2: item[3], num3: item[4], num4: item[5], - num5: item[5] + num5: item[6] } }) }) @@ -369,4 +357,7 @@ defineExpose({ open }) margin-right: 3%; } } +:deep(.el-dialog__body) { + max-height: none !important; +} diff --git a/src/views/pqs/qualityInspeection/panorama/components/details/steadyState.vue b/src/views/pqs/qualityInspeection/panorama/components/details/steadyState.vue index e138f139..3bb3d2d3 100644 --- a/src/views/pqs/qualityInspeection/panorama/components/details/steadyState.vue +++ b/src/views/pqs/qualityInspeection/panorama/components/details/steadyState.vue @@ -313,4 +313,7 @@ defineExpose({ open }) // color: var(--el-color-primary) !important; // } } +:deep(.el-dialog__body) { + max-height: none !important; +} diff --git a/src/views/pqs/qualityInspeection/panorama/components/details/technique.vue b/src/views/pqs/qualityInspeection/panorama/components/details/technique.vue index 96952b40..96dc2602 100644 --- a/src/views/pqs/qualityInspeection/panorama/components/details/technique.vue +++ b/src/views/pqs/qualityInspeection/panorama/components/details/technique.vue @@ -90,4 +90,7 @@ const open = async (row: any) => { defineExpose({ open }) - + diff --git a/src/views/pqs/qualityInspeection/panorama/components/details/temporaryState.vue b/src/views/pqs/qualityInspeection/panorama/components/details/temporaryState.vue index 91113e55..38806d1a 100644 --- a/src/views/pqs/qualityInspeection/panorama/components/details/temporaryState.vue +++ b/src/views/pqs/qualityInspeection/panorama/components/details/temporaryState.vue @@ -16,7 +16,7 @@
-
+
@@ -135,16 +135,19 @@ defineExpose({ open }) diff --git a/src/views/pqs/qualityInspeection/panorama/components/details/terminal.vue b/src/views/pqs/qualityInspeection/panorama/components/details/terminal.vue index 3a465237..d26c327b 100644 --- a/src/views/pqs/qualityInspeection/panorama/components/details/terminal.vue +++ b/src/views/pqs/qualityInspeection/panorama/components/details/terminal.vue @@ -252,4 +252,7 @@ defineExpose({ open }) :deep(.el-table thead) { color: #000; } +:deep(.el-dialog__body) { + max-height: none !important; +} diff --git a/src/views/pqs/qualityInspeection/panorama/components/line/info.vue b/src/views/pqs/qualityInspeection/panorama/components/line/info.vue index 8c31f881..ad2b54ed 100644 --- a/src/views/pqs/qualityInspeection/panorama/components/line/info.vue +++ b/src/views/pqs/qualityInspeection/panorama/components/line/info.vue @@ -51,18 +51,18 @@ }} - {{ TargetData.flickerAllTime }} - {{ TargetData.freqDevOvertime }} + {{ TargetData.freqDevOvertime }} + {{ TargetData.voltageDevOvertime }} {{ TargetData.iharmOvertime }} {{ TargetData.inegOvertime }} {{ TargetData.inuharmOvertime }} {{ TargetData.uaberranceOvertime }} - {{ TargetData.ubalanceOvertime }} + {{ TargetData.flickerOvertime }} {{ TargetData.uharmOvertime }} - {{ TargetData.voltageDevOvertime }} + {{ TargetData.ubalanceOvertime }} @@ -486,9 +486,9 @@ const open = async (id: string) => { flag += res.data[k] } } - console.log('🚀 ~ getGridDiagramTargetData ~ flag:', flag) + // console.log('🚀 ~ getGridDiagramTargetData ~ flag:', flag) - if (IntegrityNum.value <= 0) { + if (IntegrityNum.value == 0) { num = 2 //完整性告警 } else { if (flag > 0) { diff --git a/src/views/pqs/qualityInspeection/panorama/components/map.vue b/src/views/pqs/qualityInspeection/panorama/components/map.vue index 56fba3e6..f366125a 100644 --- a/src/views/pqs/qualityInspeection/panorama/components/map.vue +++ b/src/views/pqs/qualityInspeection/panorama/components/map.vue @@ -526,7 +526,7 @@ const addLayer = () => { class="state" style="background-color: ${data.comFlag == 0 ? '#ff0000' : '#3ab34a'};" > - ${data.comFlag == 0 ? '停运' : '在运'} + ${data.comFlag == 0 ? '中断' : '在线'}
diff --git a/src/views/pqs/qualityInspeection/panorama/components/mapL.vue b/src/views/pqs/qualityInspeection/panorama/components/mapL.vue index 23bd4385..adb3e995 100644 --- a/src/views/pqs/qualityInspeection/panorama/components/mapL.vue +++ b/src/views/pqs/qualityInspeection/panorama/components/mapL.vue @@ -510,4 +510,7 @@ defineExpose({ info, show }) :deep(.el-table thead) { color: #000; } +:deep(.el-dialog__body) { + max-height: none !important; +} diff --git a/src/views/pqs/qualityInspeection/panorama/components/mapR.vue b/src/views/pqs/qualityInspeection/panorama/components/mapR.vue index 36900b75..f6a91fb0 100644 --- a/src/views/pqs/qualityInspeection/panorama/components/mapR.vue +++ b/src/views/pqs/qualityInspeection/panorama/components/mapR.vue @@ -4,7 +4,8 @@
- 综合评估 + + 综合评估