Merge branch 'sit'

src/components/echart/bottom/bottomRightChart/chart.vue

@@ -131,7 +131,7 @@ export default {
       this.total_finish_rate = res.data.total_finish_rate +"%"
   
       res.data.list.forEach((item,index) => {
-        this.$set(this.options.dataset.source, index+1, [item.department,item.finish_rate,item.total_tips])
+        this.$set(this.options.dataset.source, index+1, [item.department,Number(item.finish_rate).toFixed(2) ,item.total_tips])
         
       });
       // console.log(this.options.dataset.source)

src/views/bigScreen/datavScr/center.vue

@@ -3,35 +3,35 @@
     <div class="up">
       <div class="bg-color-black item">
         <p class="ml-3 fw-b fs-xl cec"><span style="color:#ffbc25;">(竞价单)</span> 招标单数</p>
-        <div class="ml-3 cex">{{datatotalzixunpurchease.zixun_total | getNum}}</div>    
+        <div class="ml-3 cex">{{datatotalzixunpurchease.zixun_total}}</div>    
       </div>
       <div class="bg-color-black item">
         <p class="ml-3 fw-b fs-xl cec"><span style="color:#ffbc25;">(竞价单)</span> 未竞标单数</p>
-        <div class="ml-3 cex">{{datatotalzixunpurchease.not_feedback | getNum}}</div>    
+        <div class="ml-3 cex">{{datatotalzixunpurchease.not_feedback}}</div>    
       </div>
       <div class="bg-color-black item">
         <p class="ml-3 fw-b fs-xl cec"><span style="color:#ffbc25;">(采购单)</span> 采购单数</p>
-        <div class="ml-3 cex">{{datatotalzixunpurchease.purchease_total | getNum}}</div>    
+        <div class="ml-3 cex">{{datatotalzixunpurchease.purchease_total}}</div>    
       </div>
       <div class="bg-color-black item">
         <p class="ml-3 fw-b fs-xl cec"><span style="color:#ffbc25;">(采购单)</span> 未下单数</p>
-        <div class="ml-3 cex">{{datatotalzixunpurchease.purchease_wait_confirm | getNum}}</div>    
+        <div class="ml-3 cex">{{datatotalzixunpurchease.purchease_wait_confirm}}</div>    
       </div>
       <!-- <div class="bg-color-black item">
         <p class="ml-3 fw-b fs-xl cec"><span style="color:#ffbc25;">(采购单)</span> 采购下单数</p>
-        <div class="ml-3 cex">{{datatotalzixunpurchease.zixun_total | getNum}}</div>    
+        <div class="ml-3 cex">{{datatotalzixunpurchease.zixun_total}}</div>    
       </div>
       <div class="bg-color-black item">
         <p class="ml-3 fw-b fs-xl cec"><span style="color:#ffbc25;">(采购单)</span> 未生产单数</p>
-        <div class="ml-3 cex">{{datatotalzixunpurchease.zixun_total | getNum}}</div>    
+        <div class="ml-3 cex">{{datatotalzixunpurchease.zixun_total}}</div>    
       </div> -->
       <div class="bg-color-black item" style="margin-bottom:0;">
         <p class="ml-3 fw-b fs-xl cec"><span style="color:#ffbc25;">(未发货)</span> 单数</p>
-        <div class="ml-3 cex">{{datawaitsendtotal.order_num | getNum}}</div>    
+        <div class="ml-3 cex">{{datawaitsendtotal.order_num}}</div>    
       </div>
       <div class="bg-color-black item" style="margin-bottom:0;">
         <p class="ml-3 fw-b fs-xl cec"><span style="color:#ffbc25;">(未发货)</span> 商品数</p>
-        <div class="ml-3 cex">{{datawaitsendtotal.wsend_num | getNum}}</div>    
+        <div class="ml-3 cex">{{datawaitsendtotal.wsend_num}}</div>    
       </div>
     </div>
   </div>

src/views/bigScreen/datavScr/centerLeft1.vue

@@ -14,7 +14,7 @@
         <h3 class="title">今日销量</h3>
         <div class="item-box mt-2">
             <div class="d-flex">
-              <span class="cex">{{datatodaysalesvolume.orders_number | getNum}}</span>
+              <span class="cex">{{datatodaysalesvolume.orders_number}}</span>
             </div>
             <p class="text" style="text-align: center;">
               今日销售单数
@@ -34,7 +34,7 @@
         <h3 class="title">今日采购</h3>
         <div class="item-box mt-2">
             <div class="d-flex">
-              <span class="cex">{{datatodaypurchase.orders_number | getNum}}</span>
+              <span class="cex">{{datatodaypurchase.orders_number}}</span>
             </div>
             <p class="text" style="text-align: center;">
               采购订单数量
@@ -43,7 +43,7 @@
         </div>
         <div class="item-box mt-2">
             <div class="d-flex">
-              <span class="cex">{{datatodaypurchase.good_num | getNum}}</span>
+              <span class="cex">{{datatodaypurchase.good_num}}</span>
             </div>
             <p class="text" style="text-align: center;">
               商品数量
@@ -52,7 +52,7 @@
         </div>
         <div class="item-box mt-2">
             <div class="d-flex">
-              <span class="cex">{{datatodaypurchase.consult_info_total | getNum}}</span>
+              <span class="cex">{{datatodaypurchase.consult_info_total}}</span>
             </div>
             <p class="text" style="text-align: center;">
               竞价单数
@@ -61,7 +61,7 @@
         </div>
         <div class="item-box mt-2">
             <div class="d-flex">
-              <span class="cex">{{datatodaypurchase.consult_bids_total | getNum}}</span>
+              <span class="cex">{{datatodaypurchase.consult_bids_total}}</span>
             </div>
             <p class="text" style="text-align: center;">
               反馈商品数

src/views/bigScreen/datavScr/centerLeft2.vue

@@ -12,7 +12,7 @@
           <h3 class="title">今日销冠</h3>
           <div class="item-box mt-2">
             <div class="d-flex">
-              <span class="cex">{{datatodaysaleschampion.orders | getNum}}</span>
+              <span class="cex">{{datatodaysaleschampion.orders}}</span>
             </div>
             <p class="text" style="text-align: center">
               今日销售单数