Selaa lähdekoodia

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

haojianlong 5 vuotta sitten
vanhempi
commit
90d156010f
2 muutettua tiedostoa jossa 7 lisäystä ja 5 poistoa
  1. 2 2
      src/components/ledger/report/datafan.vue
  2. 5 3
      src/views/ledger/report/index.vue

+ 2 - 2
src/components/ledger/report/datafan.vue

@@ -6,7 +6,7 @@
       </el-tooltip>
     </div>
     <div class="doughnut-view">
-      <fan-chart v-if="renderData.needCountO" type="type" width="200" height="200" :name="renderData.title" :renderData="echartsData" :id="id">
+      <fan-chart v-if="renderData.needCountO" type="type" width="200" height="200" :name="renderData.title" :renderData="renderData.needCountO" :id="id">
       </fan-chart>
     </div>
     <slot></slot>
@@ -79,4 +79,4 @@ export default {
     box-sizing: border-box;
   }
 }
-</style>
+</style>

+ 5 - 3
src/views/ledger/report/index.vue

@@ -83,7 +83,7 @@
         <span class="contain-title">租户<i>{{`(${rentantCount?rentantCount:'0'})`}}</i></span>
         <div class="data-show" v-loading="isLoading" v-if="tenant.length">
           <div class="show-content" v-for="(item,index) in tenant" :key="index">
-            <data-origin :id="'origin-rentant' + index" :renderData="item"></data-origin>
+            <data-origin :id="'origin-tenant' + index" :renderData="item"></data-origin>
           </div>
         </div>
       </div>
@@ -640,9 +640,11 @@
           if (res1.Content.length) {
             res1.Content.forEach(item => {
               this.zoneTypeConversion(item);
+            })
+            let arr = res1.Content.filter(i => i.Count).forEach(j => {
               this.partProtion.push({
-                name: item.Name + item.Count,
-                value: item.Count
+                name: j.Name + j.Count,
+                value: j.Count
               })
             })
             this.business.push({