From 98e0f9de02397b15ed4595f25a12a8378eac5e84 Mon Sep 17 00:00:00 2001 From: guanj Date: Thu, 28 May 2026 19:28:12 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=85=B3=E9=94=AE=E5=AD=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 156 +- index.html | 2 +- src/components/cockpit/integrity/index.vue | 2 +- src/components/cockpit/onlineRate/index.vue | 2 +- .../cockpit/terminalEvaluation/index.vue | 2 +- src/utils/constantRequest.ts | 26 +- .../pqs/business/terminal/deviceter/index.vue | 8 +- .../pqs/database/case/components/drawer.vue | 2 +- .../embed/lntegruty/index_JB.vue | 2 +- .../embed/onlinerate/index_JB.vue | 2 +- .../monitoringPoint/online/index.vue | 2 +- .../pqs/panorama/components/cityMapL.vue | 1248 +++++++-------- src/views/pqs/panorama/components/mapL.vue | 1350 ++++++++--------- .../panorama/components/cityMapL.vue | 2 +- .../panorama/components/mapL.vue | 2 +- .../pqs/runManage/runEvaluate/index_JB.vue | 2 +- .../harmonicSurvey/components/planAdd.vue | 23 +- 17 files changed, 1425 insertions(+), 1408 deletions(-) diff --git a/README.md b/README.md index 04bf15e6..cae0b682 100644 --- a/README.md +++ b/README.md @@ -1,78 +1,78 @@ -#### 介绍 - -``` -Vue 3 + TypeScript + Vite这个模板可以帮助您开始使用Vue 3和TypeScript在Vite中进行开发。该模板使用了Vue 3的 - + diff --git a/src/components/cockpit/integrity/index.vue b/src/components/cockpit/integrity/index.vue index 0e886df3..0a4c2b48 100644 --- a/src/components/cockpit/integrity/index.vue +++ b/src/components/cockpit/integrity/index.vue @@ -183,7 +183,7 @@ const tableStore: any = new TableStore({ if (tableStore.table.params.statisticalType.name == '终端厂家') { return k.citTotalNum != 0 } else { - return k.citName != '上送国网' && k.citName != '非上送国网' + return !k.citName.includes('上送') } }) } diff --git a/src/components/cockpit/onlineRate/index.vue b/src/components/cockpit/onlineRate/index.vue index 67e5c632..3dc256ab 100644 --- a/src/components/cockpit/onlineRate/index.vue +++ b/src/components/cockpit/onlineRate/index.vue @@ -181,7 +181,7 @@ const tableStore: any = new TableStore({ if (tableStore.table.params.statisticalType.name == '终端厂家') { return k.citTotalNum != 0 } else { - return k.citName != '上送国网' && k.citName != '非上送国网' + return !k.citName.includes('上送') } }) diff --git a/src/components/cockpit/terminalEvaluation/index.vue b/src/components/cockpit/terminalEvaluation/index.vue index e8d7b813..c9eb2d3a 100644 --- a/src/components/cockpit/terminalEvaluation/index.vue +++ b/src/components/cockpit/terminalEvaluation/index.vue @@ -233,7 +233,7 @@ const tableStore: any = new TableStore({ if (tableStore.table.params.statisticalType.name == '终端厂家') { return k.count != 0 } else { - return k.name != '上送国网' && k.name != '非上送国网' + return !k.citName.includes('上送') } }) } diff --git a/src/utils/constantRequest.ts b/src/utils/constantRequest.ts index e5e61a52..04060056 100644 --- a/src/utils/constantRequest.ts +++ b/src/utils/constantRequest.ts @@ -1,14 +1,14 @@ -// 高级算法 -export const ADVANCE_BOOT = '/advance-boot' - -//技术监督 -export const PROCESS_BOOT = '/process-boot' - -//工作流模块 -export const BPM_BOOT = '/bpm-boot' - -//冀北技术监督 -export const SUPERVISION_BOOT = '/supervision-boot' - -//终端模块 +// 高级算法 +export const ADVANCE_BOOT = '/advance-boot' + +//技术监督 +export const PROCESS_BOOT = '/process-boot' + +//工作流模块 +export const BPM_BOOT = '/bpm-boot' + +//网公司技术监督 +export const SUPERVISION_BOOT = '/supervision-boot' + +//终端模块 export const DEVICE_BOOT = '/device-boot' \ No newline at end of file diff --git a/src/views/pqs/business/terminal/deviceter/index.vue b/src/views/pqs/business/terminal/deviceter/index.vue index b92dfca6..425bc9e3 100644 --- a/src/views/pqs/business/terminal/deviceter/index.vue +++ b/src/views/pqs/business/terminal/deviceter/index.vue @@ -2911,7 +2911,7 @@ const selectChanged = async (value: any) => { capacity = 750 break case '35': - capacity = 259 + capacity = 250 break case '10': capacity = 100 @@ -2931,9 +2931,9 @@ const selectChanged = async (value: any) => { case '750': capacity = 7000 break - case '800': - capacity = 7000 - break + // case '800': + // capacity = 7000 + // break case '1000': capacity = 9000 break diff --git a/src/views/pqs/database/case/components/drawer.vue b/src/views/pqs/database/case/components/drawer.vue index d98cfddd..ef027312 100644 --- a/src/views/pqs/database/case/components/drawer.vue +++ b/src/views/pqs/database/case/components/drawer.vue @@ -12,7 +12,7 @@ - +
diff --git a/src/views/pqs/harmonicMonitoring/embed/lntegruty/index_JB.vue b/src/views/pqs/harmonicMonitoring/embed/lntegruty/index_JB.vue index b6282ebe..a8bddf68 100644 --- a/src/views/pqs/harmonicMonitoring/embed/lntegruty/index_JB.vue +++ b/src/views/pqs/harmonicMonitoring/embed/lntegruty/index_JB.vue @@ -277,7 +277,7 @@ const tableStore = new TableStore({ if (tableStore.table.params.statisticalType.name == '终端厂家') { return k.citTotalNum != 0 } else { - return k.citName != '上送国网' && k.citName != '非上送国网' + return !k.citName.includes('上送') } }) // 合并子集数据 并去重 diff --git a/src/views/pqs/harmonicMonitoring/embed/onlinerate/index_JB.vue b/src/views/pqs/harmonicMonitoring/embed/onlinerate/index_JB.vue index 0e9108eb..8789693a 100644 --- a/src/views/pqs/harmonicMonitoring/embed/onlinerate/index_JB.vue +++ b/src/views/pqs/harmonicMonitoring/embed/onlinerate/index_JB.vue @@ -270,7 +270,7 @@ const tableStore = new TableStore({ if (tableStore.table.params.statisticalType.name == '终端厂家') { return k.citTotalNum != 0 } else { - return k.citName != '上送国网' && k.citName != '非上送国网' + return !k.citName.includes('上送') } }) // console.log(123, tableStore.table.params.statisticalType.name) diff --git a/src/views/pqs/harmonicMonitoring/monitoringPoint/online/index.vue b/src/views/pqs/harmonicMonitoring/monitoringPoint/online/index.vue index c3e267ae..f1734246 100644 --- a/src/views/pqs/harmonicMonitoring/monitoringPoint/online/index.vue +++ b/src/views/pqs/harmonicMonitoring/monitoringPoint/online/index.vue @@ -41,7 +41,7 @@ - + diff --git a/src/views/pqs/panorama/components/cityMapL.vue b/src/views/pqs/panorama/components/cityMapL.vue index 6fb24724..7f67a84b 100644 --- a/src/views/pqs/panorama/components/cityMapL.vue +++ b/src/views/pqs/panorama/components/cityMapL.vue @@ -1,624 +1,624 @@ - - - - - + + + + + diff --git a/src/views/pqs/panorama/components/mapL.vue b/src/views/pqs/panorama/components/mapL.vue index 654a8730..9a907eb9 100644 --- a/src/views/pqs/panorama/components/mapL.vue +++ b/src/views/pqs/panorama/components/mapL.vue @@ -1,675 +1,675 @@ - - - - - + + + + + diff --git a/src/views/pqs/qualityInspeection/panorama/components/cityMapL.vue b/src/views/pqs/qualityInspeection/panorama/components/cityMapL.vue index 2c5ebe9e..998cdd93 100644 --- a/src/views/pqs/qualityInspeection/panorama/components/cityMapL.vue +++ b/src/views/pqs/qualityInspeection/panorama/components/cityMapL.vue @@ -302,7 +302,7 @@ const list: any = ref([ ]) const countList: any = ref([ { - title: '冀北', + title: '网公司', children: [ { title: '电网侧监测点', diff --git a/src/views/pqs/qualityInspeection/panorama/components/mapL.vue b/src/views/pqs/qualityInspeection/panorama/components/mapL.vue index 16cc450f..42d73a6e 100644 --- a/src/views/pqs/qualityInspeection/panorama/components/mapL.vue +++ b/src/views/pqs/qualityInspeection/panorama/components/mapL.vue @@ -314,7 +314,7 @@ const list: any = ref([ ]) const countList: any = ref([ { - title: '冀北', + title: '网公司', children: [ { title: '电网侧监测点', diff --git a/src/views/pqs/runManage/runEvaluate/index_JB.vue b/src/views/pqs/runManage/runEvaluate/index_JB.vue index 5ad38e1e..6704fa10 100644 --- a/src/views/pqs/runManage/runEvaluate/index_JB.vue +++ b/src/views/pqs/runManage/runEvaluate/index_JB.vue @@ -273,7 +273,7 @@ const tableStore = new TableStore({ if (tableStore.table.params.statisticalType.name == '终端厂家') { return k.count != 0 } else { - return k.name != '上送国网' && k.name != '非上送国网' + return !k.citName.includes('上送') } }) // 合并子集数据 并去重 diff --git a/src/views/pqs/supervise/harmonicSurvey/components/planAdd.vue b/src/views/pqs/supervise/harmonicSurvey/components/planAdd.vue index 2d8158cb..316d6eda 100644 --- a/src/views/pqs/supervise/harmonicSurvey/components/planAdd.vue +++ b/src/views/pqs/supervise/harmonicSurvey/components/planAdd.vue @@ -13,7 +13,13 @@ - + @@ -26,7 +32,13 @@ - + { treeList.value.forEach((item: any) => { if (item.id == form.value.deptId) { list.push(item) - if (item.id != treeListCgy.value[0].id && item.name != '冀北电力有限公司' && item.name != '超高压') { + if ( + item.id != treeListCgy.value[0].id && + !item.name.includes('电力有限公司') && + + item.name != '超高压' + ) { list.push(...treeListCgy.value) } } else {