From d7ca55784181dcec8a7c08c9330d5ab2a7aa371e Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Fri, 29 Jul 2022 13:42:53 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E4=B8=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/css/reset.css                      |  4 ++--
 ...toringScreen1.vue => MonitoringScreen.vue} |  3 +--
 src/pages/Setup.vue                           | 24 ++++++-------------
 src/router/index.js                           |  6 ++---
 src/vuex/modules/com.js                       |  2 +-
 5 files changed, 14 insertions(+), 25 deletions(-)
 rename src/pages/{MonitoringScreen1.vue => MonitoringScreen.vue} (99%)

diff --git a/src/assets/css/reset.css b/src/assets/css/reset.css
index 7ffee80..d0162f2 100644
--- a/src/assets/css/reset.css
+++ b/src/assets/css/reset.css
@@ -90,8 +90,8 @@ html, body {
  
 body {
      -webkit-text-size-adjust: none;
-     /* -webkit-tap-highlight-color: rgba(0, 0, 0, 0); */
-     /* background: #05032a center center / 100% 100% url(../../assets/images/bg.png) no-repeat; */
+     -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
+     background: #05032a center center / 100% 100% url(../../assets/images/screen1/bg.png) no-repeat;
 }
 
 div, p {
diff --git a/src/pages/MonitoringScreen1.vue b/src/pages/MonitoringScreen.vue
similarity index 99%
rename from src/pages/MonitoringScreen1.vue
rename to src/pages/MonitoringScreen.vue
index d975d63..ef56e78 100644
--- a/src/pages/MonitoringScreen1.vue
+++ b/src/pages/MonitoringScreen.vue
@@ -329,7 +329,7 @@
 <script>
 import {planReached, worksectionHarvest, monthHarvest, productSchedule, unfinishOrder, output, topHarvest, monthOrder} from '@js/getData2.js'
 export default {
-  name: 'MonitoringScreen1',
+  name: 'MonitoringScreen',
   data () {
     return {
       interTime: this.$store.getters.setTime,
@@ -984,7 +984,6 @@ export default {
 @import '~@css/mixin'
 .bg
   _wh(100%, 100%)
-  background #050d20 center center / 100% 100% url(../assets/images/screen1/bg.png) no-repeat
   overflow hidden
 header
   width 100%
diff --git a/src/pages/Setup.vue b/src/pages/Setup.vue
index f91d161..d832ce6 100644
--- a/src/pages/Setup.vue
+++ b/src/pages/Setup.vue
@@ -32,7 +32,7 @@
               <input type="number" class="inputStyle" v-model="setTime">
             </div>
             <div class="inputOuter">
-              <label>配粉工位</label>
+              <label>大屏</label>
               <button class="btn btn1 fr" @click="_queryDevice()">查找</button>
               <div class="fr select_wrap">
                 <dropdown-menu
@@ -68,17 +68,11 @@ export default {
       setTime: this.$store.getters.setTime,
       fullscreen: false,
       heightLimit: false,
-      option: [{value: 1, label: '大屏一'}],
-      active: '0',
+      option: [{value: '1', label: '大屏一'}, {value: '2', label: '大屏二'}],
+      active: this.$store.getters.equipId,
       open: false
     }
   },
-  mounted () {
-    document.getElementsByTagName('body')[0].className = 'login_bg'
-  },
-  beforeDestroy () {
-    document.body.removeAttribute('class', 'login_bg')
-  },
   methods: {
     toggleItem () {
       if (!this.open) {
@@ -92,20 +86,16 @@ export default {
       this.open = false
     },
     _config () {
-      if (this.active === '') {
-        this.toast('请选择配粉工位')
-        return
-      }
       let obj = {
         baseUrl: this.baseUrl,
         setTime: this.setTime,
-        equipId: this.option[this.active].value
+        equipId: this.active
       }
       this.$store.dispatch('setConfig', obj)
-      if (this.equipId === 1) {
-        this.$router.push('/MonitoringScreen1')
+      if (this.active === '0') {
+        this.$router.push('/MonitoringScreen')
       } else {
-        this.$router.push('/MonitoringScreen1')
+        this.$router.push('/devicescreen')
       }
       let element = document.documentElement
       if (this.fullscreen) {
diff --git a/src/router/index.js b/src/router/index.js
index 38e490e..3cdcd24 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -2,7 +2,7 @@ import Vue from 'vue'
 import Router from 'vue-router'
 
 const Setup = r => require.ensure([], () => r(require('@page/Setup')), 'Setup')
-const MonitoringScreen1 = r => require.ensure([], () => r(require('@page/MonitoringScreen1')), 'MonitoringScreen1')
+const MonitoringScreen = r => require.ensure([], () => r(require('@page/MonitoringScreen')), 'MonitoringScreen')
 const DeviceScreen = r => require.ensure([], () => r(require('@page/DeviceScreen')), 'DeviceScreen')
 
 Vue.use(Router)
@@ -19,8 +19,8 @@ export default new Router({
       component: Setup
     },
     {
-      path: '/MonitoringScreen1',
-      component: MonitoringScreen1
+      path: '/MonitoringScreen',
+      component: MonitoringScreen
     },
     {
       path: '/devicescreen',
diff --git a/src/vuex/modules/com.js b/src/vuex/modules/com.js
index 36a2a93..6128a6d 100644
--- a/src/vuex/modules/com.js
+++ b/src/vuex/modules/com.js
@@ -16,7 +16,7 @@ const state = {
   alertMsg: '操作成功',
   baseUrl: getStore('baseUrl') || baseUrl,
   setTime: getStore('setTime') || 5000,
-  equipId: getStore('equipId') || ''
+  equipId: getStore('equipId') || '0'
 }
 
 const actions = {