Merge branch 'master' of http://119.23.210.103:3000/wy/mj_firm_former

src/views/system/jbdHome/board/component/getPieView.vue

@@ -49,7 +49,8 @@ export default {
         },
         color:this.info.color,
         tooltip: {
-          trigger: 'item'
+          trigger: 'item',
+          formatter: '{d}%'
         },
         legend: {
           show: true,

src/views/system/jbdHome/board/equipmentBoard.vue

@@ -15,7 +15,7 @@
           <dv-border-box-8>返回</dv-border-box-8>
         </div>
       </div>
-      <dv-border-box-1 v-if="MiddleLeftPieViewList.data.length">
+      <dv-border-box-1 v-if="MiddleLeftPieViewList.data.length" style="height:90%">
         <!-- 顶部数据 -->
         <div class="topCard">
           <top-bar v-if="topBarData.length" :info="topBarData" />
@@ -516,7 +516,7 @@ export default {
   .header {
     position: relative;
     width: 100%;
-    height: 7%;
+    height: 9%;
     display: flex;
     justify-content: space-between;
     flex-shrink: 0;

src/views/system/jbdScan/goods/caigourukudan.vue

@@ -40,13 +40,10 @@
                       >
                     </div>
                     <div style=" margin-left: 20px; margin-right: 5px; font-size: 10px;">
-                      日期:<span style="margin-left: 10px">{{
-                        item1[0].dao_ku_ri_qi_
-                      }}</span>
+                      日期:<span style="margin-left: 10px">{{item1[0].dao_ku_ri_qi_}}</span>
                     </div>
                   </div>
                 </div>
-
                 <div>
                   <table :border="1">
                     <thead>
@@ -69,27 +66,24 @@
                       </tr>
                     </thead>
                     <tbody>
-                      <tr>
-                        <td style="width: 30px">{{ index1 }}</td>
-                        <td style="width: 70px">
-                          {{ item1[0].wu_liao_dai_ma_ }}
-                        </td>
-                        <td style="width: 120px">
-                          {{ item1[0].wu_liao_ming_chen }}
+                      <tr v-for="(item, index) in item1" :key="index">
+                        <td style="width: 30px">{{ index+1 }}</td>
+                        <td style="width: 70px">{{ item.wu_liao_dai_ma_ }}</td>
+                        <td style="width: 120px">{{ item.wu_liao_ming_chen }}
                         </td>
-                        <td style="width: 60px">{{ item1[0].huo_hao_ }}</td>
-                        <td style="width: 60px">{{ item1[0].pi_hao_ }}</td>
-                        <td style="width: 80px">{{ item1[0].gui_ge_ }}</td>
-                        <td style="width: 120px">{{ item1[0].chang_jia_| gongyingshang(gongyingshangList) }}</td>
-                        <td style="width: 45px">{{ item1[0].dao_huo_shu_liang }}</td>
-                        <td style="width: 60px">{{ item1[0].dan_wei_ }}</td>
-                        <td style="width: 60px">{{ item1[0].dan_jia_han_shui_ }}</td>
-                        <td style="width: 45px">{{ item1[0].shui_lv_ }}</td>
-                        <td style="width: 45px">{{ item1[0].dan_jia_|numToFixed(item1[0].dan_jia_)}}</td>
-                        <td style="width: 45px">{{ item1[0].shui_e_ |numToFixed}}</td>
-                        <td style="width: 45px">{{ item1[0].jin_e_ |numToFixed(item1[0].jin_e_)}}</td>
+                        <td style="width: 60px">{{ item.huo_hao_ }}</td>
+                        <td style="width: 60px">{{ item.pi_hao_ }}</td>
+                        <td style="width: 80px">{{ item.gui_ge_ }}</td>
+                        <td style="width: 120px">{{ item.chang_jia_| gongyingshang(gongyingshangList) }}</td>
+                        <td style="width: 45px">{{ item.dao_huo_shu_liang }}</td>
+                        <td style="width: 60px">{{ item.dan_wei_ }}</td>
+                        <td style="width: 60px">{{ item.dan_jia_han_shui_ }}</td>
+                        <td style="width: 45px">{{ item.shui_lv_ }}</td>
+                        <td style="width: 45px">{{ item.dan_jia_|numToFixed(item.dan_jia_)}}</td>
+                        <td style="width: 45px">{{ item.shui_e_ |numToFixed}}</td>
+                        <td style="width: 45px">{{ item.jin_e_ |numToFixed(item.jin_e_)}}</td>
                         <td style="width: 60px">
-                          {{ item1[0].han_shui_he_ji_|numToFixed(item1[0].han_shui_he_ji_) }}
+                          {{ item.han_shui_he_ji_|numToFixed(item.han_shui_he_ji_) }}
                         </td>
                       </tr>
                       <tr>