change

src/pages/HomeScreen.vue

@@ -0,0 +1,41 @@
+<template>
+  <section class="box">
+    <Monitoring-Screen v-if="page === 'two'"></Monitoring-Screen>
+    <Device-Screen v-if="page === 'one'"></Device-Screen>
+  </section>
+</template>
+
+<script>
+import MonitoringScreen from './MonitoringScreen.vue'
+import DeviceScreen from './DeviceScreen.vue'
+export default {
+  name: 'HomeScreen',
+  components: {
+    MonitoringScreen,
+    DeviceScreen
+  },
+  data () {
+    return {
+      page: 'one',
+      timer: null
+    }
+  },
+  mounted () {
+    this.swipePage()
+  },
+  methods: {
+    swipePage () {
+      this.timer = setInterval(() => {
+        this.page = this.page === 'one' ? 'two' : 'one'
+      }, 5000)
+    }
+  }
+}
+</script>
+
+<style lang="stylus" scoped>
+@import '~@css/mixin'
+.box
+  _wh(100%, 100%)
+  overflow hidden
+</style>

src/pages/Setup.vue

@@ -32,6 +32,10 @@
               <input type="number" class="inputStyle" v-model="setTime">
             </div>
             <div class="inputOuter">
+              <label>切换时间</label>
+              <input type="number" class="inputStyle" v-model="setTime1">
+            </div>
+            <!-- <div class="inputOuter">
               <label>设备大屏</label>
               <button class="btn btn1 fr" @click="_queryDevice()">查找</button>
               <div class="fr select_wrap">
@@ -43,7 +47,7 @@
                   @dropdownMenu="dropdownMenu">
                 </dropdown-menu>
               </div>
-            </div>
+            </div> -->
           </div>
           <div class="submit"><input type="submit" value="配  置" class="btn" @click="_config"></div>
         </div>
@@ -66,6 +70,7 @@ export default {
       drift: 0,
       baseUrl: this.$store.getters.baseUrl,
       setTime: this.$store.getters.setTime,
+      setTime1: this.$store.getters.setTime1,
       fullscreen: false,
       heightLimit: false,
       option: [{value: '1', label: '海亮铜管智能车间生产监控中心'}, {value: '2', label: '海亮铜管智能车间设备监控中心'}, {value: '3', label: '海亮铜管智能车间AGV监控中心'}],
@@ -89,14 +94,16 @@ export default {
       let obj = {
         baseUrl: this.baseUrl,
         setTime: this.setTime,
-        equipId: this.active
+        setTime1: this.setTime1
+        // equipId: this.active
       }
       this.$store.dispatch('setConfig', obj)
-      if (this.active === '0') {
-        this.$router.push('/MonitoringScreen')
-      } else {
-        this.$router.push('/devicescreen')
-      }
+      this.$router.push('/HomeScreen')
+      // if (this.active === '0') {
+      //   this.$router.push('/MonitoringScreen')
+      // } else {
+      //   this.$router.push('/devicescreen')
+      // }
       let element = document.documentElement
       if (this.fullscreen) {
         if (document.exitFullscreen) {

src/router/index.js

@@ -5,6 +5,7 @@ const Setup = r => require.ensure([], () => r(require('@page/Setup')), 'Setup')
 const MonitoringScreen = r => require.ensure([], () => r(require('@page/MonitoringScreen')), 'MonitoringScreen')
 const DeviceScreen = r => require.ensure([], () => r(require('@page/DeviceScreen')), 'DeviceScreen')
 const WorkshopScreen = r => require.ensure([], () => r(require('@page/WorkshopScreen')), 'WorkshopScreen')
+const HomeScreen = r => require.ensure([], () => r(require('@page/HomeScreen')), 'HomeScreen')
 
 Vue.use(Router)
 
@@ -30,6 +31,10 @@ export default new Router({
     {
       path: '/WorkshopScreen',
       component: WorkshopScreen
+    },
+    {
+      path: '/HomeScreen',
+      component: HomeScreen
     }
   ]
 })

src/vuex/modules/com.js

@@ -16,6 +16,7 @@ const state = {
   alertMsg: '操作成功',
   baseUrl: getStore('baseUrl') || baseUrl,
   setTime: getStore('setTime') || 5000,
+  setTime1: getStore('setTime1') || 5000,
   equipId: getStore('equipId') || '0'
 }
 
@@ -44,6 +45,7 @@ const actions = {
   setConfig ({commit}, res) {
     setStore('baseUrl', res.baseUrl)
     setStore('setTime', res.setTime)
+    setStore('setTime1', res.setTime1)
     setStore('equipId', res.equipId)
     commit(types.COM_CONFIG, res)
   }
@@ -55,6 +57,7 @@ const getters = {
   showAlert: state => state.showAlert,
   baseUrl: state => state.baseUrl,
   setTime: state => state.setTime,
+  setTime1: state => state.setTime1,
   equipId: state => state.equipId
 }
 
@@ -90,6 +93,7 @@ const mutations = {
   [types.COM_CONFIG] (state, res) {
     state.baseUrl = res.baseUrl
     state.setTime = res.setTime
+    state.setTime1 = res.setTime1
     state.equipId = res.equipId
   }
 }