diff --git a/src/views/pqs/harmonicMonitoring/area/harmonicDistortionRate/index.vue b/src/views/pqs/harmonicMonitoring/area/harmonicDistortionRate/index.vue index 04e7099f..81bf0a23 100644 --- a/src/views/pqs/harmonicMonitoring/area/harmonicDistortionRate/index.vue +++ b/src/views/pqs/harmonicMonitoring/area/harmonicDistortionRate/index.vue @@ -109,19 +109,19 @@ diff --git a/src/views/pqs/panorama/components/details/evaluate.vue b/src/views/pqs/panorama/components/details/evaluate.vue index 2793fd29..084d2fe3 100644 --- a/src/views/pqs/panorama/components/details/evaluate.vue +++ b/src/views/pqs/panorama/components/details/evaluate.vue @@ -1,299 +1,260 @@ - - - + + + diff --git a/src/views/pqs/panorama/components/mapL-LN.vue b/src/views/pqs/panorama/components/mapL-LN.vue index 74ba7539..b098cece 100644 --- a/src/views/pqs/panorama/components/mapL-LN.vue +++ b/src/views/pqs/panorama/components/mapL-LN.vue @@ -191,12 +191,12 @@ @click="show = !show" src="@/assets/img/QH.png" /> -
+ diff --git a/src/views/pqs/panorama/components/mapL.vue b/src/views/pqs/panorama/components/mapL.vue index 2c5cbb38..7dea5f1a 100644 --- a/src/views/pqs/panorama/components/mapL.vue +++ b/src/views/pqs/panorama/components/mapL.vue @@ -149,12 +149,12 @@ @click="show = !show" src="@/assets/img/QH.png" /> -
+ diff --git a/src/views/pqs/panorama/components/mapR.vue b/src/views/pqs/panorama/components/mapR.vue index aec07ed5..b6e442cb 100644 --- a/src/views/pqs/panorama/components/mapR.vue +++ b/src/views/pqs/panorama/components/mapR.vue @@ -4,26 +4,7 @@
- - 稳态综合评估 - - - -
- 优秀:(4.5,5] -
- 良好:(4,4.5] -
- 合格:(3,4] -
- 较差:(2,3] -
- 极差:[1,2] -
-
-
+ 稳态电能质量水平评估 详情 @@ -34,58 +15,47 @@
- 综合评估得分: - - {{ assessList.score == 3.14159 ? '/' : assessList.score }} - + 区域污染水平评估 + + +
+ 无污染:0 +
+ 轻微污染:(0 , 100] +
+ 轻度污染:(100 , 1000] +
+ 中度污染:(1000 , 10000] +
+ 重度污染:(10000 +
+
-
+
- - {{ item.name }} + + {{ item.deptName }}
- {{ item.score == 3.14159 ? '/' : item.score }} + {{ setVal(item.score) }}
+
@@ -108,7 +78,13 @@
- +
- +
@@ -259,6 +241,7 @@ import temporaryState from './details/temporaryState.vue' import technique from './details/technique.vue' import { getAssessOverview, + getAreaPollution, getEvaluationOverview, getEventLevelEvaluation, getSupervisionData @@ -314,8 +297,7 @@ const options = ref([ { label: '负序电流', value: '9' - }, - + } ]) const technology: any = ref({}) const harmonicType = ref('6') @@ -364,17 +346,16 @@ const JDlist = ref([ { name: '试运行问题', value: 0 - }, - + } ]) const harmonicList: any = ref([]) const harmonicLineRatio: any = ref(0) const WTList: any = ref([]) - +const PollutionList = dictData.getBasicData('Pollution_Calc')?.filter(item => item.name == '谐波电压') const value = ref(options1[0].id) const open = (e: number) => { if (e == 0) { - evaluateRef.value.open(formRow.value) + evaluateRef.value.open(formRow.value, assessList.value) } else if (e == 1) { steadyStateRef.value.open(formRow.value) } else if (e == 2) { @@ -383,6 +364,36 @@ const open = (e: number) => { techniqueRef.value.open(formRow.value) } } +const setColor = (val: any) => { + return val == 3.14159 + ? '' + : val > 10000 + ? '#A52a2a' + : val > 1000 + ? '#ff9900' + : val > 100 + ? '#ffcc33' + : val > 0 + ? '#3399ff' + : val == 0 + ? '#00B07D' + : '' +} +const setVal = (val: any) => { + return val == 3.14159 + ? '/' + : val > 10000 + ? '重度' + : val > 1000 + ? '中度' + : val > 100 + ? '轻度' + : val > 0 + ? '轻微' + : val == 0 + ? '无' + : '' +} const info = (row: any) => { let form = { ...row, @@ -402,7 +413,10 @@ const info = (row: any) => { transientChange() // 综合评估 setTimeout(() => { - getAssessOverview(form).then(res => { + // getAssessOverview(form).then(res => { + // assessList.value = res.data + // }) + getAreaPollution({ ...form, ids: [PollutionList?.[0]?.id] }).then(res => { assessList.value = res.data }) }, 300) @@ -413,8 +427,7 @@ const info = (row: any) => { JDlist.value[1].value = res.data?.onLineNum || 0 JDlist.value[2].value = res.data?.userNum || 0 JDlist.value[3].value = res.data?.trialRunNum || 0 - - }) + }) } const harmonicChange = () => { getEvaluationOverview({ ...formRow.value, harmonicType: harmonicType.value }).then(res => { @@ -476,11 +489,11 @@ defineExpose({ info, show }) cursor: pointer; color: #757575; } - .WarningFilled { - width: 12px; - font-weight: 500; - cursor: pointer; - } +} +.WarningFilled { + width: 12px; + font-weight: 500; + cursor: pointer; } .TJTop { display: flex; diff --git a/src/views/pqs/qualityInspeection/panorama/components/details/evaluate.vue b/src/views/pqs/qualityInspeection/panorama/components/details/evaluate.vue index 34bc32b1..56591e66 100644 --- a/src/views/pqs/qualityInspeection/panorama/components/details/evaluate.vue +++ b/src/views/pqs/qualityInspeection/panorama/components/details/evaluate.vue @@ -29,7 +29,7 @@
-
+