From f6739d7542be48f7f8139c3d5fc7b2326e5cfc8d Mon Sep 17 00:00:00 2001
From: songshankun <songshankun@foxmail.com>
Date: 星期三, 22 十一月 2023 11:06:35 +0800
Subject: [PATCH] feat: 轮询plc时间调整; 接口报错时也轮询plc

---
 src/components/ProcessModel.vue |   29 +++++++++++++++++++----------
 1 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/src/components/ProcessModel.vue b/src/components/ProcessModel.vue
index d62bd4d..a6fabaf 100644
--- a/src/components/ProcessModel.vue
+++ b/src/components/ProcessModel.vue
@@ -32,8 +32,9 @@
                       <img src="../../public/process-model.png" />
                    </div>
                    <div class="item-r" @click="processDetailsClick(item,index)">
-                      <div class="item-r-t font_weight">{{ item.procedure }}</div>
-                      <div class="item-r-b">褰撳墠宸ヨ壓缂栧彿锛歿{ item.number }}</div>
+                      <div class="item-r-t font_weight">{{ item.number }}</div>
+                      <div class="item-r-b">浜у搧锛歿{ item.product }}</div>
+                      <div class="item-r-b">宸ュ簭锛歿{ item.procedure }}</div>
                     </div>
                     <div class="tip-r" v-if="item.isUpdate">
                       <img src="../../public/process-tip.png" />
@@ -59,7 +60,7 @@
       </div>
       <div slot="footer" class="dialog-footer tac" style="overflow: hidden">
         
-            <el-button
+            <el-button v-if="isPage"
                       type="primary"
                       size="mini"
                       :disabled="top"
@@ -70,7 +71,7 @@
                       涓婁竴椤�</el-button
                     >
           
-          <el-button
+          <el-button v-if="isPage"
                       type="primary"
                       size="mini"
                       :disabled="bottom"
@@ -123,6 +124,8 @@
       top:false,
       bottom:false,
       index:null,
+      isPage:false,
+      isRenew:false,
     };
   },
   mounted() {
@@ -130,6 +133,7 @@
   },
   watch: {
     islook(){
+      this.pageObj.page=1
       this.getProcessModelList()
     },
   },
@@ -147,20 +151,20 @@
       if (
         Object.keys(this.listData).length > 0
       ) {
-          this.islook = true;
+          this.pageObj.page=1
           this.getProcessModelList()
+          this.islook = true;
       } else {
         this.islook = false;
       }
     },
     getProcessModelList(number){
       if( Object.keys(this.listData).length > 0){
-        if(this.listData.Procedure.ID&&this.listData.number){
+        if(this.listData.Procedure.ID){
           processModelList({
             procedureId: this.listData.Procedure.ID,
             page: this.pageObj.page,
             pageSize:this.pageObj.pageSize,
-            number:number?number:this.listData.number
           }).then(res=>{
             if(res.data){
               this.processList=res.data?res.data:[];
@@ -171,9 +175,11 @@
             }
             this.total=res.total?res.total:0;
             if(this.total<=6){
+              this.isPage=false;
               this.top=true;
               this.bottom=true;
             }else{
+              this.isPage=true;
               let pageTotal=Math.ceil(Number(this.total)/6)
               if(this.pageObj.page<pageTotal){
                
@@ -196,6 +202,7 @@
       this.processObj.paramsMap=this.processObj.newParamsMap
       this.processObj.number=this.processObj.newNumber
       this.processObj.isUpdate=false
+      this.isRenew=true;
       this.$emit('updateGet',this.processObj.newNumber)
       this.getProcessModelList(this.processObj.newNumber)
     },
@@ -225,7 +232,9 @@
     },
     shutdown() {
       this.islook = false;
-      this.$emit('updateGet',this.processObj.newNumber,true)
+      if(this.isRenew){
+        this.$emit('updateGet',this.processObj.newNumber,true)
+      }
     },
   },
 };
@@ -420,7 +429,7 @@
       width:calc(100% - 20px);
       .title-item{
         width:calc(50%  - 30px);
-        height:77px;
+        height:92px;
         padding:23px 10px 10px;
         background:#31478f;
         border-radius: 8px;
@@ -443,7 +452,7 @@
         .item-r{
           width:calc(100% - 60px);
           float:left;
-          line-height:25px;
+          line-height:22px;
           color:#fff;
           font-size:15px;
           cursor:pointer;

--
Gitblit v1.8.0