From c07e204da897a616481b1cdb993cd837b3d0a8e4 Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期一, 09 十月 2023 19:52:47 +0800
Subject: [PATCH] 修改更新编码不显示问题

---
 src/views/visualization.vue |   74 +++++++++++++++++++++++++-----------
 1 files changed, 51 insertions(+), 23 deletions(-)

diff --git a/src/views/visualization.vue b/src/views/visualization.vue
index a6dd135..163be06 100644
--- a/src/views/visualization.vue
+++ b/src/views/visualization.vue
@@ -124,8 +124,8 @@
               </div>
             </div>
             <div class="content_right">
-              <div class="gif" v-if="taskData.Procedure.ID" @click="processModelClick(taskData)">
-                    <img v-if="isUpdateIcon"  src="../../public/shan.gif" />
+              <div class="gif" v-if="taskData.Procedure.ID" @click="processModelClick(taskData,index)">
+                    <img v-if="taskData.isUpdateIcon"  src="../../public/shan.gif" />
                     <span v-else class="yuandian"></span>
                </div>
               <el-descriptions :column="(activeName == 1||activeName == 3) ? 2 : 1" :colon="true">
@@ -605,8 +605,6 @@
 
     </template> -->
     <!-- 鎺у埗鐨勫脊妗� -->
-    <AddControl ref="control" :Arr="Arr" />
-    <!-- 鎺у埗鐨勫脊妗� -->
     <TaskControlModal
       ref="control"
       :activeName="activeName"
@@ -617,6 +615,7 @@
     <ProcessModel
       ref="processModel"
       :listData="listData"
+      @updateGet="updateGet"
     />
   </div>
 </template>
@@ -770,11 +769,11 @@
         procedureList: [],
       },
       processList:[],
-      isUpdateIcon:false,
       listData:[],
-      resResult:null,
+      resResult:[],
       resprocInfoTimer:null,
-      channelNameConfig: channelNameConfig
+      channelNameConfig: channelNameConfig,
+      index:null,
     };
   },
   mounted() {
@@ -809,9 +808,19 @@
     // }
   },
   methods: {
+    updateGet(number,val){
+      if(val){
+        this.getTaskInfo(this.activeName,'new')
+        return true;
+      }
+      this.listData.number=number
+      if(this.index){
+        this.TasksCopy[this.index].number=number
+      }
+    },
     getModelList(){
-      this.resResult=null
       for (let i in this.TasksCopy){
+        this.TasksCopy[i].isUpdateIcon=false;
         if(this.TasksCopy[i].Procedure.ID&&this.TasksCopy[i].number){
           processModelList({
             procedureId: this.TasksCopy[i].Procedure.ID,
@@ -822,21 +831,24 @@
             if(res.code==200){
               this.processList=res.data?res.data:[];
               if(this.processList.length>0){
-                for(let i in this.processList){
-                  if(this.processList[i].isUpdate){
-                    this.isUpdateIcon=true;
+                for(let j in this.processList){
+                  if(this.processList[j].isUpdate){
+                    this.TasksCopy[i].isUpdateIcon=true;
+                    this.$forceUpdate()
                     break;
                   }
                 }
               }
             }
-            this.resResult=res;
+            this.resResult[i]=res;
+            console.log( this.resResult[i],'===res111')
           })
         }
       }
     },
-    processModelClick(list){
+    processModelClick(list,index){
       this.listData=list;
+      this.index=index
       if( Object.keys(this.listData).length > 0){
         if(this.listData.Procedure.ID&&this.listData.number){
           this.$refs.processModel.islook=true
@@ -847,10 +859,19 @@
     },
     getProcessModelList(){
       this.getModelList()
-      if (!this.ProcessModelTimer&&!this.resResult) {
+      let string=false;
+      if(this.resResult.length>0){
+        for(let i in this.resResult){
+          if(this.resResult[i]){
+            string=false;
+          }
+        }
+      }
+      if (!this.ProcessModelTimer&&!string) {
           this.ProcessModelTimer = setInterval(() => {
+            this.resResult=[]
           this.getModelList();
-        }, 10000)
+        }, 5000)
       }
     },
     mergeProcessParams(params){
@@ -1052,14 +1073,14 @@
       });
     },
 
-    getTaskInfo(val) {
+    getTaskInfo(val,info) {
       this.Tasks = [];
       this.TasksCopy=[]
       getTaskInfo({taskMode:2}).then((res) => {
         if (res.code == 200&&res.data) {
-          let arr=[]
+          // let arr=[]
           if(res.data.Tasks){
-           arr.sort(function(a,b){
+            res.data.Tasks.sort(function(a,b){
             return (a.Channel - b.Channel)
            })
           }
@@ -1087,6 +1108,7 @@
             this.TasksCopy[i].outputMaterials = [];
             this.TasksCopy[i].finishNumber = 0;
             this.TasksCopy[i].number=0;
+            this.TasksCopy[i].isUpdateIcon=false;
             this.finishShow['finishShow&'+i]=false
             this.TasksCopy[i].Procedure.procedure.workers = this.TasksCopy[i].Procedure
               .procedure.workers
@@ -1110,20 +1132,26 @@
                   });
                   this.TasksCopy[i].Arr=res.data.Params ? res.data.Params : []
                   // this.isFinsh=Number(i)+1
+                  this.$forceUpdate()
                 }
               });
             }
             this.setInterCard("inputMaterials", "cardBox1&" + i, i);
             this.setInterCard("outputMaterials", "cardBox3&" + i, i);
           }
+          this.getProcessModelList();
           this.getStartArr()
+          this.cutClick(val?val:1)
+          if(info=='new'){
+            return true;
+          }
+          
           this.getProgressInfo();
               if (!this.procInfoTimer&&!this.resprocInfoTimer) {
                 this.procInfoTimer = setInterval(() => {
                   this.getProgressInfo();
                 }, 3000);
               }
-           this.getProcessModelList();
         }
         // if (res.code != 200 || this.TasksCopy.length == 0) {
         //   this.getcountdown();
@@ -1134,7 +1162,7 @@
         //     }, 60000);
         //   }
         // }
-        this.cutClick(val?val:1)
+
       });
       // this.TasksCopy.push(this.object)
       // this.TasksCopy.push(this.object)
@@ -1723,7 +1751,7 @@
           width: 100%;
           height: 30px;
           // text-align: left;
-          font-size: 24px;
+          font-size: 28px!important;
           margin: 0;
           text-align: center;
           line-height: 36px;
@@ -1798,11 +1826,11 @@
             white-space:nowrap;
           }
         .card_top-2{
-          width:35%;
+          width:38%;
         }
         .card-top-input-out-r,
         .card_top-3 {
-          width:65%;
+          width:62%;
         }
         .card_top-2,.card-top-input-out-r,
         .card_top-3 {

--
Gitblit v1.8.0