chore: 总览图表调整

app/src/views/FireCondition/components/FireAddressType.vue

@@ -87,7 +87,7 @@ export default {
             type: "pie",
             center: ["50%", "45%"],
             radius: ["6%", "60%"],
-            avoidLabelOverlap: false,
+            avoidLabelOverlap: true,
             label: {
               normal: {
                 color: "#fff",

app/src/views/FireCondition/components/FireReason.vue

@@ -75,9 +75,9 @@ export default {
           {
             name: "存在隐患数",
             type: "pie",
-            center: ["50%", "45%"],
+            center: ["50%", "50%"],
             radius: ["25%", "60%"],
-            avoidLabelOverlap: false,
+            avoidLabelOverlap: true,
             label: {
               normal: {
                 color: "#fff",
@@ -99,7 +99,7 @@ export default {
               }
             },
             labelLine: {
-              length: 15,
+              length: 20,
               length2: 0,
               maxSurfaceAngle: 80,
               lineStyle: {
@@ -122,7 +122,7 @@ export default {
           },
           {
             type: "pie",
-            center: ["50%", "45%"],
+            center: ["50%", "50%"],
             radius: ["30%", "55%"],
             hoverAnimation: false,
             z: 10,
@@ -146,7 +146,7 @@ export default {
           },
           {
             type: "pie",
-            center: ["50%", "45%"],
+            center: ["50%", "50%"],
             radius: ["45%", "46%"],
             hoverAnimation: false,
             z: 10,
@@ -171,7 +171,7 @@ export default {
           },
           {
             type: "pie",
-            center: ["50%", "45%"],
+            center: ["50%", "50%"],
             radius: ["45%", "46%"],
             hoverAnimation: false,
             z: 10,

app/src/views/Home/components/HiddenDangerDetection/HiddenDangerType.vue

@@ -4,7 +4,7 @@
       <span>隐患类型</span>
       <span>单位：条</span>
     </div>
-    <div ref="chart" class="item" style="width: 175px; height: 201px" />
+    <div ref="chart" class="item" style="width: 217px; height: 201px" />
   </div>
 </template>
 
@@ -60,7 +60,7 @@ export default {
         },
         legend: {
           show: true,
-          right: 0,
+          right: 20,
           bottom: 0,
           itemWidth: 10,
           itemHeight: 10,
@@ -77,9 +77,9 @@ export default {
           {
             name: "建筑总数",
             type: "pie",
-            center: ["40%", "45%"],
+            center: ["45%", "45%"],
             radius: ["35%", "50%"],
-            avoidLabelOverlap: false,
+            avoidLabelOverlap: true,
             label: {
               normal: {
                 color: "#fff",
@@ -92,7 +92,7 @@ export default {
                 align: "center",
                 rich: {
                   value: {
-                    fontSize: 16,
+                    fontSize: 15,
                     color: '#44F1FF',
                     padding: [0,0,10, 15],
                   }
@@ -100,20 +100,30 @@ export default {
               }
             },
             labelLine: {
-              normal: {
-                show: true,
-                length2: 75,
-                lineStyle: {
-                  color: "#fff",
-                  type: 'dashed'
-                }
-              },
+              show: true,
+              length: 0,
+              length2: 90,
+              lineStyle: {
+                color: "#fff",
+                type: 'dashed'
+              }
+            },
+            labelLayout:  (params) => {
+              const isLeft = params.labelRect.x < this.chart.getWidth() / 3;
+              const points = params.labelLinePoints;
+              // Update the end point.
+              points[2][0] = isLeft
+                ? params.labelRect.x
+                : params.labelRect.x + params.labelRect.width;
+              return {
+                labelLinePoints: points
+              };
             },
             data:data
           },
           {
             type: "pie",
-            center: ["40%", "45%"],
+            center: ["45%", "45%"],
             radius: ["35%", "45%"],
             hoverAnimation: false,
             z: 10,
@@ -142,7 +152,7 @@ export default {
             type: "pie",
             zlevel: 4,
             silent: true,
-            center: ["40%", "45%"],
+            center: ["45%", "45%"],
             radius: ["55%", "56%"],
             label: {
               normal: {

app/src/views/Home/components/HiddenDangerDetection/RectificationChart.vue

@@ -4,7 +4,7 @@
       <span>整改进度</span>
       <span>单位：条</span>
     </div>
-    <div ref="chart" class="item" style="width: 259px; height: 201px" />
+    <div ref="chart" class="item" style="width: 234px; height: 201px" />
   </div>
 </template>
 
@@ -75,7 +75,7 @@ export default {
             type: "pie",
             center: ["50%", "45%"],
             radius: ["35%", "50%"],
-            avoidLabelOverlap: false,
+            avoidLabelOverlap: true,
             label: {
               normal: {
                 color: "#fff",
@@ -89,7 +89,7 @@ export default {
                 lineHeight: 15,
                 rich: {
                   value: {
-                    fontSize: 20,
+                    fontSize: 15,
                     color: '#44F1FF',
                     padding: [0,0,12, 0]
                   }
@@ -97,7 +97,7 @@ export default {
               }
             },
             labelLine: {
-              length: 15,
+              length: 5,
               length2: 0,
               maxSurfaceAngle: 80,
               lineStyle: {

app/src/views/Home/components/HiddenDangerDetection/index.vue

@@ -142,10 +142,10 @@ export default {
     background-color: rgba(0, 213, 255, 0.12);
     height: 231px;
     &:nth-child(1) {
-      width: 175px;
+      width: 200px;
     }
     &:nth-child(2) {
-      width: 259px;
+      width: 234px;
     }
   }
 }

app/src/views/Home/components/RiskWarning.vue

@@ -74,7 +74,7 @@ export default {
             type: "pie",
             center: ["40%", "50%"],
             radius: ["10%", "65%"],
-            avoidLabelOverlap: false,
+            avoidLabelOverlap: true,
             label: {
               normal: {
                 color: "#fff",
@@ -100,13 +100,25 @@ export default {
             labelLine: {
               normal: {
                 show: true,
-                length2: 75,
+                length: 20,
+                length2: 85,
                 lineStyle: {
                   color: "#fff",
                   type: 'dashed'
                 }
               },
             },
+            labelLayout:  (params) => {
+              const isLeft = params.labelRect.x < this.chart.getWidth() / 3;
+              const points = params.labelLinePoints;
+              // Update the end point.
+              points[2][0] = isLeft
+                ? params.labelRect.x
+                : params.labelRect.x + params.labelRect.width;
+              return {
+                labelLinePoints: points
+              };
+            },
             data:data.map(item=>{
               return{
                 value: item.sl,

app/src/views/Iot/components/xfwlw.vue

@@ -158,7 +158,7 @@
       </div>
 		</div>
 		<div v-if="showFlag===1">
-			<basic-table :data="tableData111111" @row-click="rowClickHandler" style="text-align: center">
+			<basic-table :data="tableData" @row-click="rowClickHandler" style="text-align: center">
 				<el-table-column type="index" label="序号">
 				</el-table-column>
 				<el-table-column prop="qx" label="已完成物联网建筑数（栋）" show-overflow-tooltip>
@@ -355,4 +355,4 @@
 		margin-right: 15px;
 		margin-bottom: 15px;
 	}
-</style>
+</style>