diff --git a/src/views/screen/gwScreen/components/center/index.vue b/src/views/screen/gwScreen/components/center/index.vue index 7d3d873b..24045d6e 100644 --- a/src/views/screen/gwScreen/components/center/index.vue +++ b/src/views/screen/gwScreen/components/center/index.vue @@ -434,6 +434,7 @@ export default { if (this.btnIndex == 1) { res = await getUnitEquipmentConfigurationApi() if (!res.data) return + res.data = res.data.filter(item => item.location) this.cityData = res.data.map((item) => { let value = item.location.split(',') value.push(item.totalValue) @@ -445,6 +446,8 @@ export default { }) } else if (this.btnIndex == 2) { res = await getEquipmentNumberApi() + if (!res.data) return + res.data = res.data.filter(item => item.location) this.cityData = res.data.map((item) => { let value = item.location.split(',') value.push(item.num) diff --git a/src/views/screen/wsScreen/components/center/index-old-3d.vue b/src/views/screen/wsScreen/components/center/index-old-3d.vue deleted file mode 100644 index 8be926a4..00000000 --- a/src/views/screen/wsScreen/components/center/index-old-3d.vue +++ /dev/null @@ -1,413 +0,0 @@ - - - - 总价值数 - 在库装备数 - 机械化率 - - - - - - - - - - - - {{ selectedCity.cityName }} - 装备价值: {{ selectedCity.totalValue }} 万元 - 装备数量: {{ selectedCity.totalEquipmentQuantity }} 台 - 配置率: {{ selectedCity.configRate || 0 }} % - 线路数量: {{ selectedCity.lineNum }} 台 - 变电数量: {{ selectedCity.substationNum }} 台 - 电缆数量: {{ selectedCity.cableNum }} 台 - - - - - - - diff --git a/src/views/screen/wsScreen/components/center/index-old.vue b/src/views/screen/wsScreen/components/center/index-old.vue deleted file mode 100644 index 7a142928..00000000 --- a/src/views/screen/wsScreen/components/center/index-old.vue +++ /dev/null @@ -1,413 +0,0 @@ - - - - 总价值数 - 在库装备数 - 机械化率 - - - - - - - - - - - - {{ selectedCity.cityName }} - 装备价值: {{ selectedCity.totalValue }} 元 - 装备数量: {{ selectedCity.totalEquipmentQuantity }} 台 - 配置率: {{ selectedCity.configRate || 0 }} % - 线路数量: {{ selectedCity.lineNum }} 台 - 变电数量: {{ selectedCity.substationNum }} 台 - 电缆数量: {{ selectedCity.cableNum }} 台 - - - - - - - diff --git a/src/views/screen/wsScreen/components/center/index.vue b/src/views/screen/wsScreen/components/center/index.vue index 976550ad..5361e3eb 100644 --- a/src/views/screen/wsScreen/components/center/index.vue +++ b/src/views/screen/wsScreen/components/center/index.vue @@ -73,6 +73,7 @@ export default { if (this.btnIndex == 1) { res = await getUnitEquipmentConfigurationApi() if (!res.data) return + res.data = res.data.filter(item => item.location) this.cityData = res.data.map((item) => { let value = item.location.split(',') value.push(item.totalValue) @@ -84,6 +85,8 @@ export default { }) } else if (this.btnIndex == 2) { res = await getEquipmentNumberApi() + if (!res.data) return + res.data = res.data.filter(item => item.location) this.cityData = res.data.map((item) => { let value = item.location.split(',') value.push(item.num) diff --git a/src/views/screen/wsScreenWidescreen/components/center/index-old-3d.vue b/src/views/screen/wsScreenWidescreen/components/center/index-old-3d.vue deleted file mode 100644 index 8be926a4..00000000 --- a/src/views/screen/wsScreenWidescreen/components/center/index-old-3d.vue +++ /dev/null @@ -1,413 +0,0 @@ - - - - 总价值数 - 在库装备数 - 机械化率 - - - - - - - - - - - - {{ selectedCity.cityName }} - 装备价值: {{ selectedCity.totalValue }} 万元 - 装备数量: {{ selectedCity.totalEquipmentQuantity }} 台 - 配置率: {{ selectedCity.configRate || 0 }} % - 线路数量: {{ selectedCity.lineNum }} 台 - 变电数量: {{ selectedCity.substationNum }} 台 - 电缆数量: {{ selectedCity.cableNum }} 台 - - - - - - - diff --git a/src/views/screen/wsScreenWidescreen/components/center/index-old.vue b/src/views/screen/wsScreenWidescreen/components/center/index-old.vue deleted file mode 100644 index 7a142928..00000000 --- a/src/views/screen/wsScreenWidescreen/components/center/index-old.vue +++ /dev/null @@ -1,413 +0,0 @@ - - - - 总价值数 - 在库装备数 - 机械化率 - - - - - - - - - - - - {{ selectedCity.cityName }} - 装备价值: {{ selectedCity.totalValue }} 元 - 装备数量: {{ selectedCity.totalEquipmentQuantity }} 台 - 配置率: {{ selectedCity.configRate || 0 }} % - 线路数量: {{ selectedCity.lineNum }} 台 - 变电数量: {{ selectedCity.substationNum }} 台 - 电缆数量: {{ selectedCity.cableNum }} 台 - - - - - - - diff --git a/src/views/screen/wsScreenWidescreen/components/center/index.vue b/src/views/screen/wsScreenWidescreen/components/center/index.vue index 2130afef..6df90333 100644 --- a/src/views/screen/wsScreenWidescreen/components/center/index.vue +++ b/src/views/screen/wsScreenWidescreen/components/center/index.vue @@ -73,6 +73,7 @@ export default { if (this.btnIndex == 1) { res = await getUnitEquipmentConfigurationApi() if (!res.data) return + res.data = res.data.filter(item => item.location) this.cityData = res.data.map((item) => { let value = item.location.split(',') value.push(item.totalValue) @@ -84,6 +85,8 @@ export default { }) } else if (this.btnIndex == 2) { res = await getEquipmentNumberApi() + if (!res.data) return + res.data = res.data.filter(item => item.location) this.cityData = res.data.map((item) => { let value = item.location.split(',') value.push(item.num)