图标

src/pages/modules/home/index.vue

@@ -100,16 +100,17 @@
                       <li>报警时间</li>
                     </ul>
                     <div class="scroll_container_1">
-                      <vue-seamless-scroll :data="deviceWorkOrder" :class-option="defaultOption1">
+                      <vue-seamless-scroll :data="deviceErrorRecordList" :class-option="defaultOption1">
                         <ul class="scroll-ul_1">
-                          <li v-for="(e, i) in deviceWorkOrder" :key="i">
+                          <li v-for="(e, i) in deviceErrorRecordList" :key="i">
                           <div class="scroll-ul_1_div">{{e.deviceCode}}</div>
                           <div class="scroll-ul_1_div">{{e.deviceName}}</div>
-                          <div class="scroll-ul_1_div">
+                          <!-- <div class="scroll-ul_1_div">
                             <span class="state" :class="'state_' + e.status"></span>
                             <p class="state_name">{{['关机', '待机', '生产中', '故障'][Number(e.status)]}}</p>
-                          </div>
-                          <div class="scroll-ul_1_div">{{e.startTime}}</div>
+                          </div> -->
+                          <div class="scroll-ul_1_div">{{e.errorInfo}}</div>
+                          <div class="scroll-ul_1_div">{{e.errorTime}}</div>
                           </li>
                         </ul>
                       </vue-seamless-scroll>
@@ -124,7 +125,7 @@
 </template>
 
 <script>
-import { homepageDataLeft, homepageDataRight } from '@js/mork2.js'
+import { homepageDataLeft, homepageDataRight, screenTableData } from '@js/mork2.js'
 // import { homepageDataLeft } from '@js/getData2.js'
 import symbol1 from '@img/symbol_1.png'
 import symbol2 from '@img/symbol_2.png'
@@ -147,6 +148,9 @@ export default {
       interTime: this.$store.getters.setTime,
       timer: null,
       expand: false,
+      deviceErrorRecordList: [], // 设备报警信息
+      mixingList: [], // 当日混料
+      historyList: [], // 历史分析
       todayMixProduction: {}, // 今日生产混料
       todayPressProduction: {}, // 今日生产成型
       todaySortProduction: {}, // 今日生产包装
@@ -169,7 +173,6 @@ export default {
       chart9Timer: null,
       capacityRate: [], // 设备产能利用
       stateStatistics: {}, // 设备运行统计
-      deviceWorkOrder: [], // 设备工单生产
       areaDeviceStatus: [{process: '混料'}, {process: '压制'}, {process: '干燥'}, {process: '包装'}], // 工序设备状态
       top10Of30Days: [] // 30天故障top10
     }
@@ -189,8 +192,9 @@ export default {
     }
   },
   created () {
-    // this._homepageDataLeft()
-    // this._homepageDataRight()
+    this._homepageDataLeft()
+    this._homepageDataRight()
+    this._screenTableData()
     // this.refresh()
   },
   beforeDestroy () {
@@ -207,6 +211,7 @@ export default {
     refresh () {
       this.timer = setInterval(() => {
         this._homepageDataLeft()
+        this._screenTableData()
       }, this.interTime)
     },
     async _homepageDataLeft () {
@@ -290,6 +295,18 @@ export default {
       this.setEchart4()
       this.setEchart5()
     },
+    async _screenTableData () {
+      let res = await screenTableData()
+      clearInterval(this.chart2Timer)
+      clearInterval(this.chart3Timer)
+      clearInterval(this.chart4Timer)
+      clearInterval(this.chart5Timer)
+      clearInterval(this.chart7Timer)
+      clearInterval(this.chart9Timer)
+      this.deviceErrorRecordList = [...res.deviceErrorRecordList]
+      this.mixingList = [...res.mixingList]
+      this.historyList = [...res.historyList]
+    },
     setEchart1 () {
       let img = {
         imgSrc1: symbol1,
@@ -298,10 +315,10 @@ export default {
       let barName = []
       let barData1 = []
       let barData2 = []
-      this.todayMix.map(el => {
-        barName.push(el.materialCode)
-        barData1.push(el.plan)
-        barData2.push(el.real)
+      this.mixingList.map(el => {
+        barName.push(el.materialName)
+        barData1.push(el.planQty)
+        barData2.push(el.realQty)
       })
       let option = {
         grid: {
@@ -708,7 +725,7 @@ export default {
           itemGap: 30,
           itemWidth: 8,
           itemHeight: 8,
-          data: [{name: '压制', itemStyle: {color: '#67D470'}}, {name: '成品', itemStyle: {color: '#1980EA'}}]
+          data: [{name: '已压制', itemStyle: {color: '#67D470'}}, {name: '需生产', itemStyle: {color: '#1980EA'}}]
         },
         xAxis: {
           type: 'category',
@@ -760,7 +777,7 @@ export default {
         },
         series: [
           {
-            name: '压制',
+            name: '已压制',
             type: 'line',
             symbol: 'image://' + img.imgSrc1,
             symbolSize: [10, 10],
@@ -788,7 +805,7 @@ export default {
             data: barData1
           },
           {
-            name: '成品',
+            name: '需生产',
             type: 'line',
             symbol: 'image://' + img.imgSrc2,
             symbolSize: [10, 10],