Merge branch 'master' of http://git.zthymaoyi.com/gdc/yiliangyiyun-pc

src/api/V2/charts/index.js

@@ -1,2 +1,3 @@
 
-export const API_GET_GETCHARTSDATA = `/biInfoController/selectBiInfo`
+// export const API_GET_GETCHARTSDATA = `/biInfoController/selectBiInfo`
+export const API_GET_GETCHARTSDATA = `/biInfoController/selectBiInfoNew`

src/views/home/index.vue

@@ -16,7 +16,7 @@
               ><div class="title_text">易 粮 易 运 大 数 据 平 台</div>
               <dv-decoration-5
                 class="title_center"
-                dur="5"
+                :dur='Number(5)'
                 :color="['#008CFF', '#00ADDD']"
             /></el-col>
             <el-col :span="6"
@@ -34,6 +34,7 @@
               <div class="left_box1">
                 <dv-border-box-11 title="采 购 合 同">
                   <dv-scroll-ranking-board
+                    id="left1"
                     :config="configLeft1"
                     style="width: 90%; height: 87%; margin-left: 5%; padding-top:10%"
                   />
@@ -84,7 +85,8 @@
               <div class="right_box1">
                 <dv-border-box-11 title="销 售 合 同">
                   <dv-scroll-ranking-board
-                    :config="config"
+                  id="right1"
+                    :config="configRight1"
                     style="width: 90%; height: 87%; margin-left: 5%; padding-top:10%"
                   />
                 </dv-border-box-11>
@@ -107,7 +109,9 @@
 </template>
 
 <script>
- 
+   import {
+    gChartsData,
+  } from '@/model/home/index'
 import drawMixin from './drawMixin'; //自适应缩放
 import { formatTime } from './format.js'; //日期格式转换
   export default {
@@ -134,15 +138,31 @@ import { formatTime } from './format.js'; //日期格式转换
         data: [
           {
             name: '玉米',
-            value: 55,
+            value: 20,
           },
           {
             name: '白小麦',
-            value: 120,
+            value: 30,
           },
           {
             name: '混合麦',
-            value: 78,
+            value: 50,
+          }
+        ],
+      },
+      configRight1: {
+        data: [
+          {
+            name: '玉米',
+            value: 20,
+          },
+          {
+            name: '白小麦',
+            value: 30,
+          },
+          {
+            name: '混合麦',
+            value: 50,
           }
         ],
       },
@@ -244,12 +264,43 @@ import { formatTime } from './format.js'; //日期格式转换
       },
       }
     },
-    
+  compute:{
+
+  },
   mounted() {
-    //获取实时时间
-    this.timeFn();
-    //中国地图
-    this.china_map();
+    gChartsData({
+        compId: localStorage.getItem('ws-pf_compId'),
+        loadingstatus: 1,
+        seachMoth: '2022'
+      }).toPromise().then(res => {debugger
+        console.log('··············', res)
+        
+        this.configRight1.data = res[0].biViewInfoList
+        this.configLeft1.data = res[1].biViewInfoList
+         //获取实时时间
+        this.timeFn();
+        //中国地图
+        this.china_map();
+        let left1 = this.$echarts.init(
+          document.getElementById('left1')
+        );
+        
+        window.onresize = left1.resize; //如果容器变大小，自适应从新构图
+        left1.setOption(this.configLeft1)
+        // this.chartsData = res
+        // this.carCount1 = res[1].biViewInfoList[0].count
+        // this.carCount2 = res[6].biViewInfoList[1].count
+        // this.carCount3 = res[6].biViewInfoList[2].count
+        // this.physicalInventory = Number(res[7].biViewInfoList[0].count).toFixed(2)
+        // this.procurementPending= Number(res[7].biViewInfoList[1].count).toFixed(2)
+        // this.salesPending =  Number(res[7].biViewInfoList[2].count).toFixed(2)
+        // this.position = Number(Number(this.physicalInventory)+Number(this.procurementPending) - Number(this.salesPending)).toFixed(2)
+        // this.totalReserves = res[8].biViewInfoList
+        // this.mapInfo = res[9]
+        console.log(res)
+        // this.initCharts()
+      })
+   
   },
   beforeDestroy() {
     //离开时删除计时器

src/views/taskManagement/supplyofgoodslook.vue

@@ -29,7 +29,7 @@
         </el-table-column>
         <el-table-column prop="surplusWeight" class="table_td" label="剩余重量（吨）"></el-table-column>
         <el-table-column prop="avgCost" class="table_td" label="平均成本（吨）"></el-table-column>
-        <el-table-column prop="issuingTimeOther" class="table_td" label="入库单日期"></el-table-column>
+        <el-table-column prop="issuingTime" class="table_td" label="入库单日期"></el-table-column>
         <el-table-column prop="estimateOutWarehouseWeight" class="table_td" label="预计出库重量（吨）">
             <template slot-scope="scope">
                 <el-input disabled v-model="scope.row.estimateOutWarehouseWeight" placeholder="输入本次出库重量"></el-input>