From 353df4b0c4d9b2e84516fc794f981e093521ef17 Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Mon, 1 Aug 2022 15:53:13 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=87=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/DeviceScreen.vue     | 29 +++++++++++++++++++++++++++--
 src/pages/MonitoringScreen.vue | 28 +++++++++++++++++++++++-----
 src/vuex/modules/com.js        |  6 +++---
 3 files changed, 53 insertions(+), 10 deletions(-)

diff --git a/src/pages/DeviceScreen.vue b/src/pages/DeviceScreen.vue
index 18a4be8..e296c39 100644
--- a/src/pages/DeviceScreen.vue
+++ b/src/pages/DeviceScreen.vue
@@ -1,4 +1,8 @@
 <template>
+<section class="bg">
+  <t-header title="海亮铜管智能车间设备监控中心">
+    <p class="p1" @click="toJump">海亮铜管智能车间生产监控中心</p>
+  </t-header>
   <div class="container">
     <div class="left_wrap">
       <div class="item_wrap">
@@ -210,15 +214,23 @@
         </div>
     </div>
   </div>
+  <section class="bottom"></section>
+</section>
 </template>
 
 <script>
+import THeader from '@components/header.vue'
 import {deviceStatus, oeeAndTeep, queryDeviceByWork, deviceErrorNum, deviceManage, deviceCensus, deviceErrorInfo, deviceUseRate, deviceStatusList, errCensus} from '@js/getData1.js'
 import * as echarts from 'echarts'
 export default {
   name: 'DeviceScreen',
+  components: {
+    THeader
+  },
   data () {
     return {
+      setTime: null,
+      iTime: this.$store.getters.setTime1,
       interTime: this.$store.getters.setTime,
       timer1: null,
       timer2: null,
@@ -382,9 +394,9 @@ export default {
   // },
   mounted () {
     this.refresh()
-    setTimeout(() => {
+    this.setTime = setTimeout(() => {
       this.$router.push('/MonitoringScreen')
-    }, 5000)
+    }, this.iTime)
   },
   beforeDestroy () {
     this.$once('hook:beforeDestroy', () => {
@@ -394,9 +406,13 @@ export default {
       clearInterval(this.timeOut1)
       clearInterval(this.timeOut2)
       clearInterval(this.timeOut3)
+      clearTimeout(this.setTime)
     })
   },
   methods: {
+    toJump () {
+      this.$router.push('/MonitoringScreen')
+    },
     initData () {
       this._deviceStatus()
       this._deviceManage()
@@ -1974,4 +1990,13 @@ header
           width .4rem
           _font(.14rem, .4rem, #fff,,center)
           font-style normal
+.p1
+  position absolute
+  display block
+  cursor pointer
+  left .2509rem
+  top .22rem
+  font-family "SourceHanSansCN"
+  _font(.18rem, .30rem, #fff, 700,)
+  letter-spacing .01rem
 </style>
diff --git a/src/pages/MonitoringScreen.vue b/src/pages/MonitoringScreen.vue
index 7a6c33c..1c267b5 100644
--- a/src/pages/MonitoringScreen.vue
+++ b/src/pages/MonitoringScreen.vue
@@ -1,4 +1,8 @@
 <template>
+<section class="bg">
+  <t-header title="海亮铜管智能车间生产监控中心">
+    <p class="p1" @click="toJump">海亮铜管智能车间设备监控中心</p>
+  </t-header>
   <div class="container">
     <div class="left_wrap">
       <div class="item_wrap">
@@ -313,6 +317,8 @@
       </div>
     </div>
   </div>
+  <section class="bottom"></section>
+</section>
 </template>
 
 <script>
@@ -325,6 +331,8 @@ export default {
   },
   data () {
     return {
+      setTime: null,
+      iTime: this.$store.getters.setTime1,
       interTime: this.$store.getters.setTime,
       timer1: null,
       timer2: null,
@@ -390,12 +398,9 @@ export default {
       }
     }
   },
-  // created () {
-  //   this.refresh()
-  // },
   mounted () {
     this.refresh()
-    setTimeout(() => {
+    this.setTime = setTimeout(() => {
       this.$router.push('/devicescreen')
     }, 5000)
   },
@@ -407,9 +412,13 @@ export default {
       clearInterval(this.interTime)
       clearInterval(this.timeOut1)
       clearInterval(this.timeOut2)
+      clearTimeout(this.setTime)
     })
   },
   methods: {
+    toJump () {
+      this.$router.push('/devicescreen')
+    },
     initData () {
       this._planReached()
       this._worksectionHarvest()
@@ -427,7 +436,7 @@ export default {
       }, this.interTime)
       this.timer1 = setInterval(() => {
         this._monthHarvest()
-      }, 50000)
+      }, this.iTime)
     },
     setEchart1 () {
       let date = []
@@ -1296,4 +1305,13 @@ export default {
   float left
   _wh(100%, 100%)
   _fj(space-around)
+.p1
+  position absolute
+  display block
+  cursor pointer
+  left .2509rem
+  top .22rem
+  font-family "SourceHanSansCN"
+  _font(.18rem, .30rem, #fff, 700,)
+  letter-spacing .01rem
 </style>
diff --git a/src/vuex/modules/com.js b/src/vuex/modules/com.js
index 62ea072..e1fb638 100644
--- a/src/vuex/modules/com.js
+++ b/src/vuex/modules/com.js
@@ -1,7 +1,7 @@
 import * as types from '../types'
 import { getStore, setStore } from '@js/mUtils.js'
 
-const baseUrl = process.env.NODE_ENV === 'development' ? 'http://192.168.81.252:8010' : 'http://192.168.81.252:8010'
+const baseUrl = process.env.NODE_ENV === 'development' ? 'http://192.168.81.156:8010' : 'http://192.168.81.156:8010'
 
 /**
  * App通用配置
@@ -15,8 +15,8 @@ const state = {
   toastMsg: '退出登录',
   alertMsg: '操作成功',
   baseUrl: getStore('baseUrl') || baseUrl,
-  setTime: getStore('setTime') || 5000,
-  setTime1: getStore('setTime1') || 5000,
+  setTime: getStore('setTime') || 10000,
+  setTime1: getStore('setTime1') || 60000,
   equipId: getStore('equipId') || '0'
 }