From a01bfa857a20198769ea7ba3557f614cf875e7e3 Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Mon, 1 Aug 2022 12:28:31 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E6=BB=9A=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/DeviceScreen.vue     | 18 +++++++++---------
 src/pages/HomeScreen.vue       |  4 ++++
 src/pages/MonitoringScreen.vue |  7 ++++++-
 src/pages/Setup.vue            |  8 ++++----
 4 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/src/pages/DeviceScreen.vue b/src/pages/DeviceScreen.vue
index ec943a9..b66176d 100644
--- a/src/pages/DeviceScreen.vue
+++ b/src/pages/DeviceScreen.vue
@@ -196,7 +196,8 @@
             </div>
           </div>
         </div>
-        <div class="item_wrap">
+      </div>
+      <div class="item_wrap">
           <div class="item_tip">
             <div class="item_tip_left">近10天设备故障统计</div>
           </div>
@@ -207,7 +208,6 @@
             <div id="echart_d10" style="width: 100%; height: 100%"></div>
           </div>
         </div>
-      </div>
     </div>
   </div>
 </template>
@@ -1696,7 +1696,7 @@ export default {
     async _oeeAndTeep () {
       let res = await oeeAndTeep()
       if (res.code === '1') {
-        console.log(res.result)
+        // console.log(res.result)
         this.data03 = res.result
         this.setEchart03() // 中1
       } else {
@@ -1707,7 +1707,7 @@ export default {
     async _queryDeviceByWork () {
       let res = await queryDeviceByWork()
       if (res.code === '1') {
-        console.log(res.result)
+        // console.log(res.result)
         this.xData = []
         this.yData = []
         this.taskDate = []
@@ -1730,7 +1730,7 @@ export default {
     async _deviceCensus () {
       let res = await deviceCensus()
       if (res.code === '1') {
-        console.log(res.result)
+        // console.log(res.result)
         this.data05_d0 = []
         this.data05_d1 = []
         this.data05_d2 = []
@@ -1752,7 +1752,7 @@ export default {
     async _deviceStatusList () {
       let res = await deviceStatusList()
       if (res.code === '1') {
-        console.log(res.result)
+        // console.log(res.result)
         // let colors = ['#2D7CEB', '#07E083', '#00D5FF', '#CC6060', '#fc0']
         res.result.map((e, i) => {
           if (e.device_status === '02') {
@@ -1782,7 +1782,7 @@ export default {
       if (res.code === '1') {
         this.data06_d0 = []
         this.data06_d1 = []
-        console.log(res.result)
+        // console.log(res.result)
         res.result.map((e, i) => {
           this.data06_d0.push(e.device_name)
           this.data06_d1.push(e.err_num)
@@ -1796,7 +1796,7 @@ export default {
     async _deviceErrorInfo () {
       let res = await deviceErrorInfo()
       if (res.code === '1') {
-        console.log(res.result)
+        // console.log(res.result)
         this.array2 = res.result
       } else {
         this.Dialog(res.desc)
@@ -1806,7 +1806,7 @@ export default {
     async _errCensus () {
       let res = await errCensus()
       if (res.code === '1') {
-        console.log(res.result)
+        // console.log(res.result)
         this.chartData2 = res.result
         if (res.result.length) {
           clearInterval(this.timeOut3)
diff --git a/src/pages/HomeScreen.vue b/src/pages/HomeScreen.vue
index f217aa5..e057c4c 100644
--- a/src/pages/HomeScreen.vue
+++ b/src/pages/HomeScreen.vue
@@ -5,6 +5,7 @@
     </t-header>
     <Monitoring-Screen v-if="page === 'two'"></Monitoring-Screen>
     <Device-Screen v-if="page === 'one'"></Device-Screen>
+    <section class="bottom"></section>
   </section>
 </template>
 
@@ -77,4 +78,7 @@ export default {
   font-family "SourceHanSansCN"
   _font(.18rem, .30rem, #fff, 700,)
   letter-spacing .01rem
+.bottom
+  _wh(100%, .38rem)
+  background center bottom / 19.06rem 100% url(../assets/images/screen1/bottom.png) no-repeat
 </style>
diff --git a/src/pages/MonitoringScreen.vue b/src/pages/MonitoringScreen.vue
index 4b89571..12087b2 100644
--- a/src/pages/MonitoringScreen.vue
+++ b/src/pages/MonitoringScreen.vue
@@ -324,6 +324,7 @@ export default {
   data () {
     return {
       interTime: this.$store.getters.setTime,
+      timer1: null,
       timer2: null,
       timer3: null,
       timeOut1: null,
@@ -392,6 +393,7 @@ export default {
   },
   beforeDestroy () {
     this.$once('hook:beforeDestroy', () => {
+      clearInterval(this.timer1)
       clearInterval(this.timer2)
       clearInterval(this.timer3)
       clearInterval(this.interTime)
@@ -403,7 +405,6 @@ export default {
     initData () {
       this._planReached()
       this._worksectionHarvest()
-      this._monthHarvest()
       this._productSchedule()
       this._output()
       this._unfinishOrder()
@@ -412,9 +413,13 @@ export default {
     },
     refresh () {
       this.initData()
+      this._monthHarvest()
       this.timer2 = setInterval(() => {
         this.initData()
       }, this.interTime)
+      this.timer1 = setInterval(() => {
+        this._monthHarvest()
+      }, 50000)
     },
     setEchart1 () {
       let date = []
diff --git a/src/pages/Setup.vue b/src/pages/Setup.vue
index 13b0586..db9c024 100644
--- a/src/pages/Setup.vue
+++ b/src/pages/Setup.vue
@@ -69,8 +69,8 @@ export default {
       password: '',
       drift: 0,
       baseUrl: this.$store.getters.baseUrl,
-      setTime: this.$store.getters.setTime,
-      setTime1: this.$store.getters.setTime1,
+      setTime: this.$store.getters.setTime / 1000,
+      setTime1: this.$store.getters.setTime1 / 1000,
       fullscreen: false,
       heightLimit: false,
       option: [{value: '1', label: '海亮铜管智能车间生产监控中心'}, {value: '2', label: '海亮铜管智能车间设备监控中心'}, {value: '3', label: '海亮铜管智能车间AGV监控中心'}],
@@ -93,8 +93,8 @@ export default {
     _config () {
       let obj = {
         baseUrl: this.baseUrl,
-        setTime: this.setTime,
-        setTime1: this.setTime1
+        setTime: this.setTime * 1000,
+        setTime1: this.setTime1 * 1000
         // equipId: this.active
       }
       this.$store.dispatch('setConfig', obj)