Bladeren bron

Merge branch 'dev' of http://39.106.8.246:3003/web/ibms into dev

shaun-sheep 5 jaren geleden
bovenliggende
commit
a759cb24ae
1 gewijzigde bestanden met toevoegingen van 20 en 20 verwijderingen
  1. 20 20
      src/components/point/report/integrateStatistics.vue

+ 20 - 20
src/components/point/report/integrateStatistics.vue

@@ -1,8 +1,8 @@
 <template>
   <div id="integrateStatistics">
     <!-- 环形表 -->
-    <div class="statistics-chart">
-      <div class="chart-title">表号功能号总数量:{{ pointData.tabFuncNumSum }} <span style="float:right">目前可能断数的数量:{{ pointData.disConn }}</span></div>
+    <div class="statistics-chart" v-loading="loopchartLoading">
+      <div class="chart-title">表号功能号总数量:{{ tabFuncNumSum }} <span style="float:right">目前可能断数的数量:{{ disConn }}</span></div>
       <hr style="width:90%" />
       <div ref="loopchart" class="chart" id="loopchart"></div>
     </div>
@@ -10,9 +10,9 @@
     <div class="statistics-chart" style="border-top:5px solid #eee;min-height: calc(65% - 3px);">
       <div class="chart-title">共包含原始点位:{{ originalPoint }} 个</div>
       <div style="padding:15px 20px;line-height:2;">
-        1点位对多表号功能号:{{ pointData.oneToM.toString() }}
+        1点位对多表号功能号:{{oneToM+''}}
         <br />
-        多点位对1表号功能号:{{ pointData.mToOne.toString() }}
+        多点位对1表号功能号:{{mToOne+''}}
         <!-- 查看表号功能号一对多多对一总览 -->
         <el-button @click="showOverview" type="info" icon="el-icon-arrow-right" circle
           style="margin:-25px 0 0 50px;background:rgb(121, 187, 255);color:rgb(225, 228, 229);border:none;"></el-button>
@@ -68,17 +68,16 @@ export default {
     return {
       //环形图
       loopChart: null,
+      loopchartLoading: false,
       //环形图数据
       loopChartData: [],
       //条形图数据
       barChartData: [],
       //点位-标号功能号数据
-      pointData: {
-        tabFuncNumSum: 0,//总数
-        oneToM: 0,//一对多
-        mToOne: 0,//多对一
-        disConn: 0//可能断数数量
-      },
+      tabFuncNumSum: 0,//总数
+      oneToM: 0,//一对多
+      mToOne: 0,//多对一
+      disConn: 0,//可能断数数量
       //原始点数量
       originalPoint: null,
       pointInSum: 0, //左侧柱形图已接入
@@ -88,22 +87,22 @@ export default {
   methods: {
     //加载图表数据
     loadChart() {
+      let that = this;
+      that.loopchartLoading = true;
       //获取环形图数据
       getIntegrateStatisticsToLoop({}, res => {
         //设置点位-表号功能号数据
-        this.pointData = {
-          tabFuncNumSum: res.Content[0].Sum,
-          oneToM: res.Content[0].OtoM,
-          mToOne: res.Content[0].MtoO,
-          disConn: res.Content[0].Disconn
-        };
+        const tempData = res.Content[0];
+        that.tabFuncNumSum = tempData.Sum
+        that.oneToM = tempData.OToM
+        that.mToOne = tempData.MToO
+        that.disConn = tempData.Disconn
         //设置环形表数据
-        this.loopChartData = [
-          { value: res.Content[0].RelatedCount, name: "已对实例数量" },
-          { value: res.Content[0].Sum - res.Content[0].RelatedCount, name: "未对应实例数量" }
+        that.loopChartData = [
+          { value: tempData.RelatedCount, name: "已对实例数量" },
+          { value: tempData.Sum - tempData.RelatedCount, name: "未对应实例数量" }
         ];
 
-        let that = this;
         //环形图参数
         let loopOption = {
           tooltip: {
@@ -188,6 +187,7 @@ export default {
             }
           });
         }, 100);
+        that.loopchartLoading = false;
 
       })