bug5161设备看板：数据异常和适应性调整

src/views/business/deviceManagement/components/barCharto.vue

@@ -61,7 +61,7 @@ export default {
       default: true
     }
   },
-  data() {
+  data () {
     return {
       correspondence: {
         numO: '1年以下',
@@ -98,7 +98,7 @@ export default {
   },
   watch: {
     value: {
-      handler(newVal) {
+      handler (newVal) {
         if (newVal.length > 0) {
           this.show = true
           setTimeout(() => {
@@ -111,13 +111,13 @@ export default {
       deep: true
     }
   },
-  mounted() {
+  mounted () {
     // setTimeout(() => {
     //   this.drawLine()
     // }, 100);
   },
   methods: {
-    drawLine() {
+    drawLine () {
       const that = this
       const xData = []
       for (const key in this.value[0]) {
@@ -166,7 +166,7 @@ export default {
           show: this.legendVal,
           textStyle: {
             color: '#fff',
-            fontSize: '0.8em'
+            // fontSize: '0.8em'
           },
           formatter: function (name) {
             return (
@@ -179,9 +179,9 @@ export default {
         grid: {
           // 让图表占满容器
           top: '80px',
-          left: '40px',
+          left: '60px',
           right: '20px',
-          bottom: '40px'
+          bottom: '60px'
         },
         tooltip: {
           trigger: 'axis',
@@ -199,7 +199,7 @@ export default {
                 that.correspondence[item.seriesName] ||
                 that.correspondenceUn[item.seriesName] ||
                 that.dynamicMappingCondition[
-                  that.correspondenceCondition[item.seriesName]
+                that.correspondenceCondition[item.seriesName]
                 ]
               str += `<br /> ${item.marker} ${nameNum}  ${item.data[item.seriesName]}`
             })
@@ -221,7 +221,7 @@ export default {
             formatter: function (params) {
               let str = ''
               const paramsLen = params.length
-              const len = 5
+              const len = 7
               const rowNumber = Math.ceil(paramsLen / len)
               if (paramsLen > len) {
                 for (let i = 0; i < rowNumber; i++) {
@@ -251,7 +251,7 @@ export default {
               const mid = (value + '').indexOf('.') === -1 ? value + '' : ''
               let str = ''
               const paramsLen = mid.length
-              const len = 4
+              const len = 6
               const rowNumber = Math.ceil(paramsLen / len)
               if (paramsLen > len) {
                 for (let i = 0; i < rowNumber; i++) {
@@ -288,6 +288,7 @@ export default {
 .statisticsPage {
   box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
   padding: 1%;
+
   /* background-color: rgba(6, 30, 93, 0.5); */
   //   font-size: 16px;
   //   @media only screen and (max-width: 1680px) {

src/views/business/deviceManagement/components/getPieView.vue

@@ -83,7 +83,7 @@ export default {
           formatter: '{d}%'
         },
         label: {
-          formatter: '{c}，{d}%\n{b}',
+          formatter: '{c}，{d}%\n\n{b}',
           edgeDistance: '20%',
           color: '#fff',
           fontSize: '0.75em'
@@ -91,7 +91,7 @@ export default {
 
         legend: {
           show: true,
-          // orient: 'vertical',
+          orient: 'vertical',
           itemGap: 6,
           z: 3,
           left: 'left',

src/views/business/deviceManagement/components/pieChart.vue

@@ -110,7 +110,7 @@ export default {
             let strn = ''
             const mid = that.value.find((i) => i.name === name)
             const rate = ((mid.value / totality) * 100).toFixed(2)
-            const leng = 4
+            const leng = 5
             const rowNumber = Math.ceil(name.length / leng)
             if (name.length > leng) {
               for (let i = 0; i < rowNumber; i++) {

src/views/business/deviceManagement/index.vue

@@ -173,9 +173,9 @@
   </div>
 </template>
 <script>
+import { equipDashBoard } from '@/api/platform/spectaculars/lab'
 import screenfull from 'screenfull'
 import dataobj from './constants/simulated.js'
-import { equipDashBoard } from '@/api/platform/spectaculars/lab'
 export default {
   components: {
     barChart: () => import('./components/barCharto.vue'),
@@ -325,7 +325,20 @@ export default {
             '&nbsp;&nbsp;&nbsp;&nbsp;' + scrapData[i][1] + '次'
           scrapDataList[i].splice(5, 3)
         }
-        this.mergeData[0].numData = data.distributionDataObj || []
+
+        const { setting = {} } = this.$store.getters || {}
+        const typeList = setting?.device?.typeList
+        if (typeList) {
+          const distributionDataObj = data.distributionDataObj.filter(
+            (item) => typeList[item.name]
+          )
+          for (const item of distributionDataObj) {
+            item.name = typeList[item.name]
+          }
+          this.mergeData[0].numData = distributionDataObj || []
+        } else {
+          this.mergeData[0].numData = data.distributionDataObj || []
+        }
         this.mergeData[1].numData = numDistributionDataObj
         this.mergeData[2].numData = lifeTimeData
         this.mergeData[3].numData = intactData