优化

src/views/screen/cityScreen/components/equQuantity/index.vue

@@ -26,7 +26,7 @@
                             <span style="font-weight: 700; padding: 0 2px">{{ lineData.fiveYearCount }}</span>
                             <span class="unit2">{{ lineData.fiveYearRatio || 0 }}%</span>
                         </div>
-                        <div class="num2" style="color: #00fefc">
+                        <div class="num2" style="color: #00fefc; margin-left: 8px">
                             <span class="unit2" style="color: #00fefc">5-10年</span>
                             <span style="font-weight: 700; padding: 0 2px">{{ lineData.fiveToTenYearCount }}</span>
                             <span class="unit2" style="color: #00fefc">{{ lineData.fiveToTenYearRatio || 0 }}%</span>
@@ -72,7 +72,7 @@
                             <span style="font-weight: 700; padding: 0 2px">{{ bdData.fiveYearCount }}</span>
                             <span class="unit2">{{ bdData.fiveYearRatio }}%</span>
                         </div>
-                        <div class="num2" style="color: #00fefc">
+                        <div class="num2" style="color: #00fefc; margin-left: 8px">
                             <span class="unit2" style="color: #00fefc">5-10年</span>
                             <span style="font-weight: 700; padding: 0 2px">{{ bdData.fiveToTenYearCount }}</span>
                             <span class="unit2" style="color: #00fefc">{{ bdData.fiveToTenYearRatio || 0 }}%</span>
@@ -126,7 +126,7 @@
                             <span style="font-weight: 700; padding: 0 2px">{{ dlData.fiveYearCount }}</span>
                             <span class="unit2">{{ dlData.fiveYearRatio }}%</span>
                         </div>
-                        <div class="num2" style="color: #00fefc">
+                        <div class="num2" style="color: #00fefc; margin-left: 8px">
                             <span class="unit2" style="color: #00fefc">5-10年</span>
                             <span style="font-weight: 700; padding: 0 2px">{{ dlData.fiveToTenYearCount }}</span>
                             <span class="unit2" style="color: #00fefc">{{ dlData.fiveToTenYearRatio }}%</span>

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) => {

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%',

src/views/screen/wsScreen/components/left/EquipStatusMore.vue

@@ -74,7 +74,7 @@
         <!-- 分页 -->
         <pagination
           v-show="total > 0"
-          :total="88"
+          :total="total"
           :page.sync="queryParams.pageNum"
           :limit.sync="queryParams.pageSize"
           @pagination="getList"

src/views/screen/wsScreenWidescreen/components/left/EquipStatusMore.vue

@@ -74,7 +74,7 @@
         <!-- 分页 -->
         <pagination
           v-show="total > 0"
-          :total="88"
+          :total="total"
           :page.sync="queryParams.pageNum"
           :limit.sync="queryParams.pageSize"
           @pagination="getList"