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 @@
-
-
-
-
-
-
- 监测规模
-
-
-

-
-
-
-
- {{ item.title }}:
-
- {{ item.list[item.list.length - 1]?.numOne }}
-
-
-
-
-
-
-
-
-
-
- {{ item.title }}
-
-
-
- {{ item.list[i]?.numOne }}
-
-
-
-
-
-
-
-
-
- 监测点指标统计
-
-
-

-
-
-
-
-

- {{ item.title }}
-
-
-
-
- {{ val.title }}
-
-
-
- 投运:
- {{ val.num }}
-
-
- 在线:
- {{ val.onLineNum }}
-
-
- 数据完整性:
- {{ val.integrityRate }}%
-
-
-
-
-
-
-
-
-
- 监测运行统计
-
-
-

-
-
-
-
-
-
- {{ item.title[0] }}
-
-
-
- {{ item.title[1] }}:
-
- {{ item.lineNumOne || 0 }}
-
-
-
- {{ item.title[2] }}:
-
- {{ item.lineNumTwo || 0 }}
-
-
-
-
-
-
-
-
-

-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+ 监测规模
+
+
+

+
+
+
+
+ {{ item.title }}:
+
+ {{ item.list[item.list.length - 1]?.numOne }}
+
+
+
+
+
+
+
+
+
+
+ {{ item.title }}
+
+
+
+ {{ item.list[i]?.numOne }}
+
+
+
+
+
+
+
+
+
+ 监测点指标统计
+
+
+

+
+
+
+
+

+ {{ item.title }}
+
+
+
+
+ {{ val.title }}
+
+
+
+ 投运:
+ {{ val.num }}
+
+
+ 在线:
+ {{ val.onLineNum }}
+
+
+ 数据完整性:
+ {{ val.integrityRate }}%
+
+
+
+
+
+
+
+
+
+ 监测运行统计
+
+
+

+
+
+
+
+
+
+ {{ item.title[0] }}
+
+
+
+ {{ item.title[1] }}:
+
+ {{ item.lineNumOne || 0 }}
+
+
+
+ {{ item.title[2] }}:
+
+ {{ item.lineNumTwo || 0 }}
+
+
+
+
+
+
+
+
+

+
+
+
+
+
+
+
+
+
+
+
+
+
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 @@
-
-
-
-
-
-
- 监测规模
-
-
-

-
-
-
-
- {{ item.title }}:
-
- {{ item.list?.[item.list.length - 1]?.numOne }}
-
-
-
-
-
-
-
-
-
-
- {{ item.title }}
-
-
- {{ item.list[i]?.numOne }}
-
-
-
- 详情
-
-
-
-
-
-
-
- 监测点指标统计
-
-
-

-
-
-
-
-

- {{ item.title }}
-
-
-
-
- {{ val.title }}
-
-
-
- 投运:
- {{ val.num }}
-
-
- 在线:
- {{ val.onLineNum }}
-
-
- 数据完整性:
- {{ val.integrityRate }}%
-
-
-
-
-
-
-
-
-
- 监测运行统计
-
-
-

-
-
-
-
-
-
- {{ item.title[0] }}
-
-
-
- {{ item.title[1] }}:
-
- {{ item.lineNumOne || 0 }}
-
-
-
- {{ item.title[2] }}:
-
- {{ item.lineNumTwo || 0 }}
-
-
-
-
-
-
-
-
-

-
-
-
- {{ item.title }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+ 监测规模
+
+
+

+
+
+
+
+ {{ item.title }}:
+
+ {{ item.list?.[item.list.length - 1]?.numOne }}
+
+
+
+
+
+
+
+
+
+
+ {{ item.title }}
+
+
+ {{ item.list[i]?.numOne }}
+
+
+
+ 详情
+
+
+
+
+
+
+
+ 监测点指标统计
+
+
+

+
+
+
+
+

+ {{ item.title }}
+
+
+
+
+ {{ val.title }}
+
+
+
+ 投运:
+ {{ val.num }}
+
+
+ 在线:
+ {{ val.onLineNum }}
+
+
+ 数据完整性:
+ {{ val.integrityRate }}%
+
+
+
+
+
+
+
+
+
+ 监测运行统计
+
+
+

+
+
+
+
+
+
+ {{ item.title[0] }}
+
+
+
+ {{ item.title[1] }}:
+
+ {{ item.lineNumOne || 0 }}
+
+
+
+ {{ item.title[2] }}:
+
+ {{ item.lineNumTwo || 0 }}
+
+
+
+
+
+
+
+
+

+
+
+
+ {{ item.title }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
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 {