冲突合并

src/views/modules/visual/communityGovern/resiPieOption.js

@@ -116,6 +116,7 @@ const center= ['50%', '250px']
           maxSurfaceAngle: 80
         },
         labelLayout: function (params) {
+          
           const isLeft = params.labelRect.x < _charts.getWidth() / 2;
           const points = params.labelLinePoints;
           // Update the end point.

src/views/modules/visual/communityGovern/resibuzz.vue

@@ -77,7 +77,7 @@ export default {
     return {
       showNoData: false,
       timer: null,
-
+      pieChartS: null,
       pieChart: '',
       pieOption: {},
       pieInitState: false,
@@ -172,7 +172,7 @@ export default {
         pageSize: 10,
         pageNo: 1,
         total: 0,
-        pieChartS: null
+
       },
 
       casOptions: [],
@@ -260,12 +260,12 @@ export default {
 
       const { data, code, msg } = await requestPost(url, params);
       // 获取pieChart配置
-      this.pieOption = pieOption(this.pieChartS)
+
 
 
       if (code === 0) {
         // 获取pieChart配置
-        this.pieOption = pieOption()
+        this.pieOption = pieOption(this.pieChartS)
         if (data && data.length > 0) {
           // this.pieData = data