From aa376609f9fc8ef4e617c77740601174ba824dd2 Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Tue, 24 Oct 2023 14:24:46 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=B7=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/js/http.js                 | 18 +++++++++---------
 src/components/workshop.vue           | 22 +++++++++++++++++-----
 src/pages/shunhe/LogisticsProcess.vue |  1 -
 3 files changed, 26 insertions(+), 15 deletions(-)

diff --git a/src/assets/js/http.js b/src/assets/js/http.js
index 5a12266..83d9dad 100644
--- a/src/assets/js/http.js
+++ b/src/assets/js/http.js
@@ -1,7 +1,7 @@
 import axios from 'axios'
-import { Dialog, toast } from './mUtils.js'
+import { Dialog } from './mUtils.js'
 import store from '../../vuex/store'
-import router from '@/router'
+// import router from '@/router'
 
 axios.defaults.timeout = 50000
 axios.defaults.headers.post['Content-Type'] = 'application/json;charset=UTF-8'
@@ -33,13 +33,13 @@ axios.interceptors.response.use(
   },
   error => {
     if (error && error.response) {
-      switch (error.response.status) {
-        case 401:
-          toast(error.response.data.message)
-          store.dispatch('setSignOut')
-          router.push('/login')
-          break
-      }
+      // switch (error.response.status) {
+      //   case 401:
+      //     toast(error.response.data.message)
+      //     store.dispatch('setSignOut')
+      //     router.push('/setup')
+      //     break
+      // }
       return Promise.reject(error.response.data)
     } else {
       return Promise.reject(error)
diff --git a/src/components/workshop.vue b/src/components/workshop.vue
index e13298a..bc158ca 100644
--- a/src/components/workshop.vue
+++ b/src/components/workshop.vue
@@ -219,10 +219,8 @@
     <div class="p_device cpj_ssx_wrap">
       <div class="ssx_wrap">
         <div class="ssx" v-for="(e, i) in vconveyorLine" :key="i">
-          <img v-show="e.status === 1" class="device_img" src="../assets/images/device/ssx_green.png" alt="" @click="getInfo(e)">
-          <img v-show="e.status === 2" class="device_img" src="../assets/images/device/ssx_yellow.png" alt="" @click="getInfo(e)">
-          <img v-show="e.status === 3" class="device_img" src="../assets/images/device/ssx_gray.png" alt="" @click="getInfo(e)">
-          <img v-show="e.status === 4" class="device_img" src="../assets/images/device/ssx_red.png" alt="" @click="getInfo(e)">
+          <img v-show="e.status === 2" class="device_img" src="../assets/images/device/ssx_green.png" alt="" @click="getInfo(e)">
+          <img v-show="e.status !== 2" class="device_img" src="../assets/images/device/ssx_gray.png" alt="" @click="getInfo(e)">
           <device-pop
             type="ssx"
             :pkId="pkId"
@@ -676,6 +674,8 @@ export default {
   },
   data () {
     return {
+      interTime: this.$store.getters.setTime,
+      timer3: null,
       mixingMachine: [],
       unloadLocation: [],
       storageLocation: [],
@@ -698,9 +698,21 @@ export default {
     }
   },
   created () {
-    this._homepageEquipment()
+    clearInterval(this.timer3)
+    this.refresh()
+  },
+  beforeDestroy () {
+    this.$once('hook:beforeDestroy', () => {
+      clearInterval(this.timer3)
+    })
   },
   methods: {
+    refresh () {
+      this._homepageEquipment()
+      this.timer3 = setInterval(() => {
+        this._homepageEquipment()
+      }, this.interTime)
+    },
     async _homepageEquipment () {
       let res = await homepageEquipment()
       // 混料机
diff --git a/src/pages/shunhe/LogisticsProcess.vue b/src/pages/shunhe/LogisticsProcess.vue
index 9d4bf53..e0403bf 100644
--- a/src/pages/shunhe/LogisticsProcess.vue
+++ b/src/pages/shunhe/LogisticsProcess.vue
@@ -243,7 +243,6 @@ export default {
   },
   data () {
     return {
-      iTime: this.$store.getters.setTime1,
       interTime: this.$store.getters.setTime,
       timer1: null,
       timer2: null,