Q-ABAB преди 1 година
родител
ревизия
25495daca2
променени са 2 файла, в които са добавени 6 реда и са изтрити 3 реда
  1. 3 2
      src/views/echarts/components/topData.vue
  2. 3 1
      src/views/echarts/echarts.vue

+ 3 - 2
src/views/echarts/components/topData.vue

@@ -29,9 +29,10 @@
           </div>
           </div>
         </div> 
         </div> 
         <div class="topData">
         <div class="topData">
-          <div class="DataTitle">已支出预算<span style="font-size: 14px;position: relative;top: 5px;">(万)</span></div>
+          <div class="DataTitle">已支出预算<span style="font-size: 14px;position: relative;top: 5px;">{{data.isPay<=9999999?'(万)':'(千万)'}}</span></div>
           <div class="topData_value">
           <div class="topData_value">
-            <span>{{ data.isPay }}</span>
+            <span v-if="data.isPay<=9999999">{{ Math.floor(data.isPay/10000*100)/100 }}</span>
+            <span v-else>{{ Math.floor(data.isPay/10000000*100)/100 }}</span>
             <!-- <span>(万)</span> -->
             <!-- <span>(万)</span> -->
           </div>
           </div>
         </div> 
         </div> 

+ 3 - 1
src/views/echarts/echarts.vue

@@ -117,7 +117,9 @@
             for(let i in isUse)item['isUse']+=Number(isUse[i]);
             for(let i in isUse)item['isUse']+=Number(isUse[i]);
             num+=item['isUse'];
             num+=item['isUse'];
           })
           })
-          this.HeaderData['isPay'] = num/10000;
+          // this.HeaderData['isPay'] = 9999999;
+          // this.HeaderData['isPay'] = 10000000;
+          this.HeaderData['isPay'] = num;
           //扇形图数据
           //扇形图数据
           this.CircularData[0]['value'] = data[2][0]['personal']
           this.CircularData[0]['value'] = data[2][0]['personal']
           this.CircularData[1]['value'] = data[2][0]['Maker']
           this.CircularData[1]['value'] = data[2][0]['Maker']