diff --git a/src/views/screen/cityScreen/components/equQuantity/index.vue b/src/views/screen/cityScreen/components/equQuantity/index.vue index d2900629..14a9ee4d 100644 --- a/src/views/screen/cityScreen/components/equQuantity/index.vue +++ b/src/views/screen/cityScreen/components/equQuantity/index.vue @@ -26,7 +26,7 @@ {{ lineData.fiveYearCount }} {{ lineData.fiveYearRatio || 0 }}% -
+
5-10年 {{ lineData.fiveToTenYearCount }} {{ lineData.fiveToTenYearRatio || 0 }}% @@ -72,7 +72,7 @@ {{ bdData.fiveYearCount }} {{ bdData.fiveYearRatio }}%
-
+
5-10年 {{ bdData.fiveToTenYearCount }} {{ bdData.fiveToTenYearRatio || 0 }}% @@ -126,7 +126,7 @@ {{ dlData.fiveYearCount }} {{ dlData.fiveYearRatio }}%
-
+
5-10年 {{ dlData.fiveToTenYearCount }} {{ dlData.fiveToTenYearRatio }}% diff --git a/src/views/screen/wsScreen/components/center/index.vue b/src/views/screen/wsScreen/components/center/index.vue index 4ebe2076..0deba83f 100644 --- a/src/views/screen/wsScreen/components/center/index.vue +++ b/src/views/screen/wsScreen/components/center/index.vue @@ -418,12 +418,16 @@ export default { params.data.deptName == '安徽送变电工程有限公司' ? '安徽送变电' : params.data.name.replace(/市$/, '') console.log('🚀 ~ initChart ~ this.$router:', this.$router) - this.$router.push({ - path: '/screen/cityScreen', - query: { - cityName: city, - }, - }) + // this.$router.push({ + // path: '/screen/cityScreen', + // query: { + // cityName: city, + // }, + // }) + window.open( + `${window.location.origin}/screen/cityScreen?cityName=${city}`, + '_blank' + ) } }) myChart.on('mouseover', (params) => { diff --git a/src/views/screen/wsScreen/components/left/EquipStatus.vue b/src/views/screen/wsScreen/components/left/EquipStatus.vue index a1925a20..857295ca 100644 --- a/src/views/screen/wsScreen/components/left/EquipStatus.vue +++ b/src/views/screen/wsScreen/components/left/EquipStatus.vue @@ -50,7 +50,7 @@ export default { const option = { grid: { - left: '10%', + left: '22%', right: '10%', top: '20%', bottom: '15%', diff --git a/src/views/screen/wsScreen/components/left/EquipStatusMore.vue b/src/views/screen/wsScreen/components/left/EquipStatusMore.vue index ead66713..bd73ff56 100644 --- a/src/views/screen/wsScreen/components/left/EquipStatusMore.vue +++ b/src/views/screen/wsScreen/components/left/EquipStatusMore.vue @@ -74,7 +74,7 @@