isv-robot 2 年 前
コミット
d1bbf02ab0

+ 2 - 1
src/views/dashboard-screen/dlsdxl/index.vue

@@ -69,10 +69,11 @@ export default {
           maxs.push(res.info.series[0].data[index])
           values.push(res.info.series[1].data[index])
           used.push(res.info.series[1].data[index])
+          const per = res.info.series[0].data[index] <=0 ? 0 : (res.info.series[1].data[index] * 100 / res.info.series[0].data[index]).toFixed(0)
           const keyMap = {
             [res?.info.series[0].name]: res.info.series[0].data[index],
             [res?.info.series[1].name]: res.info.series[1].data[index],
-            per: (res.info.series[1].data[index] * 100 / res.info.series[0].data[index]).toFixed(0)
+            per: per
           }
 
           this.arrMap[key] = keyMap

+ 12 - 8
src/views/dashboard-screen/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="dashboard-container" v-if="render" >
+  <div class="dashboard-container" v-if="render">
     <div class="header">
       <div class="title clickScoop" @click="openDrawer('数据管理')">
         变电配电大数据可视化系统
@@ -7,13 +7,13 @@
       <div class="r-title">
         <span @click="$refs.datePicker.open = true" style="cursor: pointer"> {{ dateTitle }}</span>
         <a-date-picker :showToday="true" :locale="localeZH"
-          @click="$refs.datePicker.open = false"
-          style="position: absolute;right:20px;top:10px;z-index: -1"
-          ref="datePicker"
-          value-format="YYYY-MM-DD"
-          :value="date"
-          @change="timeChange"
-          placeholder="时间"
+                       @click="$refs.datePicker.open = false"
+                       style="position: absolute;right:20px;top:10px;z-index: -1"
+                       ref="datePicker"
+                       value-format="YYYY-MM-DD"
+                       :value="date"
+                       @change="timeChange"
+                       placeholder="时间"
         />
       </div>
     </div>
@@ -205,6 +205,10 @@ export default {
 }
 </script>
 <style>
+canvas {
+  cursor: default;
+}
+
 ::-webkit-scrollbar {
 
   background-color: transparent;

+ 9 - 7
src/views/dashboard-screen/syjhdxqk/index.vue

@@ -43,25 +43,27 @@ export default {
             name: item,
             value: res.info.series[1].data[index],
             used: res.info.series[1].data[index],
-            total: res.info.series[0].data[index]
+            total: res.info.series[0].data[index],
+            totalLabel: res.info.series[0].data[index]
           }
           arrMap['开关分合计划'].push(valItem)
           const valItem2 = {
             name: item,
             value: res.info.series[3].data[index],
             used: res.info.series[3].data[index],
-            total: res.info.series[2].data[index]
+            total: res.info.series[2].data[index],
+            totalLabel: res.info.series[2].data[index]
           }
           arrMap['单体计划'].push(valItem2)
         })
         arrMap['开关分合计划'].forEach(item => {
           if (item.used > item.total) {
-            item.used = item.total
+             item.total = item.used
           }
         })
         arrMap['单体计划'].forEach(item => {
           if (item.used > item.total) {
-            item.used = item.total
+             item.total = item.used
           }
         })
         this.arrMap = arrMap
@@ -76,7 +78,7 @@ export default {
           left: 20,
           right: 20,
           bottom: 10,
-          top: 40
+          top: 70
         },
         xAxis: {
 
@@ -227,7 +229,7 @@ export default {
               position: [-baseWidth - offsetWidth  / this.EchartfontSize(10), -this.EchartfontSize(30)],
               formatter: (evt) => {
                 const item = this.arrMap['开关分合计划']?.[evt.dataIndex] || {}
-                return `${item.value}\n /\n${item.total}`
+                return `${item.value}\n /\n${item.totalLabel}`
               }
             },
             zlevel: -1
@@ -365,7 +367,7 @@ export default {
               position: [baseWidth + 4 - offsetWidth / this.EchartfontSize(2), -this.EchartfontSize(30)],
               formatter: (evt) => {
                 const item = this.arrMap['单体计划']?.[evt.dataIndex] || {}
-                return `${item.value}\n /\n${item.total}`
+                return `${item.value}\n /\n${item.totalLabel}`
               }
             },
             zlevel: -1