更新页面展示bug

imcs-ui/src/views/login/index.vue

@@ -683,7 +683,7 @@
    	/*background: url(../../assets/logo/logoBg1.jpg) 50% no-repeat;*/
    	/*background: url(../../assets/logo/logoBg2.png) 50% no-repeat;
     background-size: cover;*/
-   	background: $bg1_color;
+   	background: $bg2_color;
 
     width: 100%;
     height: 100vh;
@@ -731,7 +731,7 @@
       width: 320px;
       height: 440px;
       padding: 10px 36px 36px 36px;
-      background: $bg1_formbg;
+      background: $bg2_formbg;
       border-radius: 3px;
 
 			.el-tabs__item {

imcs-ui/src/views/zuihou/dispatchMgr/dispatchRecord/Index.vue

@@ -78,8 +78,8 @@
         align="center"
       >
       <template slot-scope="{ row }">
-           <span v-if="row.category=='2'">AGV异常</span>
-           <span v-else-if="row.resourceName">{{row.resourceName}}异常</span>
+           <span v-if="row.category=='2'">AGV成功</span>
+           <span v-else-if="row.resourceName">{{row.resourceName}}成功</span>
            <span v-else>{{row.feedback}}</span>
       </template>      
       </el-table-column>

imcs-ui/src/views/zuihou/machiningClient/touchScreen/Index.vue

@@ -280,6 +280,7 @@ export default {
       taskData: [
       ],
       current: 1,
+      timer: null,
       confirmDisabled: true,
       tenantViewVisible: false,
       view1Visible: false,
@@ -301,16 +302,21 @@ export default {
       return this.$store.state.account.user;
     },
   },
-  mounted() {},
+  mounted() {
+    //setInterval(this.getStation, 2000);
+    this.timerTask()
+  },
   methods: {
     tabClick(e){
       console.log("被选择的tab:", e.index)
       // 待执行-tab
       if(e.index == 0){
-        this.getStation()
+        //this.getStation()
+        this.timerTask()
       }
       // 已完成-tab
       if(e.index == 1){
+        this.clearTimer()
         this.fetch()
       }
     },
@@ -327,7 +333,19 @@ export default {
         }
       });
     },
-
+    //定时器处理
+    timerTask(){
+       let that = this
+       that.timer = setInterval(()=>{
+          this.getStation();         
+       }, 60000)
+    },
+    clearTimer(){
+       if(this.timer){
+          clearInterval(this.timer)
+          this.timer = null
+       }
+    },
     // 退出全屏
     exitFullPing() {
       this.$nextTick(() => {
@@ -402,8 +420,8 @@ export default {
       this.view3Visible = false
     },
     editSuccess(item){
-      this.getStation(item)
-      // this.taskData.shift();
+      this.getStation()
+      this.taskData.shift();
     },
     setPercentage(time, left) {
       return this.formatGap(time, left)[0] > 100