From 6565e619523f045ba3e5e15a5bf3ea3ccbb33ba2 Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期四, 28 九月 2023 10:26:01 +0800
Subject: [PATCH] 如果工艺参数是空，或者报错，弹框提示工艺参数错误的提示而不是新任务的弹框

---
 src/views/visualization.vue |   48 +++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 37 insertions(+), 11 deletions(-)

diff --git a/src/views/visualization.vue b/src/views/visualization.vue
index ac42f15..7dc5a4a 100644
--- a/src/views/visualization.vue
+++ b/src/views/visualization.vue
@@ -223,13 +223,20 @@
                       </div>
                     </div>
                     <div class="card-top-input-out-l">
-                      <div>
+                      <div class="font_dian">
                         <!-- 璁惧12<i
                             style="font-size: 14px"
                             class="el-icon-right font-arrow-20"
                           ></i>
                           璁惧13 -->
-                        {{ list.materialName }}
+                          <el-popover
+                          width="200"
+                          :content="list.materialName"
+                          placement="top-start"
+                          trigger="click"
+                        >
+                          <span slot="reference">{{ list.materialName }}</span>
+                        </el-popover>
                       </div>
                     </div>
                     <div class="card-top-input-out-r">
@@ -419,8 +426,15 @@
                         </div>
                       </div>
                       <div class="card-top-input-out-l">
-                        <div>
-                          {{ list.materialName }}
+                        <div class="font_dian">
+                          <el-popover
+                            width="200"
+                            :content="list.materialName"
+                            placement="top-start"
+                            trigger="click"
+                          >
+                            <span slot="reference">{{ list.materialName }}</span>
+                          </el-popover>
                         </div>
                       </div>
                       <div class="card-top-input-out-r">
@@ -446,6 +460,9 @@
             <el-empty description="鏆傛棤浠诲姟..."></el-empty>
           </template>
         </div>
+        <template v-if="!Tasks||Tasks.length==0">
+          <el-empty description="鏆傛棤浠诲姟..."></el-empty>
+        </template>
       </div>
       <div class="right">
         <div class="right_top">
@@ -581,6 +598,7 @@
     <AddIssue
       ref="control"
       :Arr="Arr"
+      :ArrError="ArrError"
       :safeProduce="safeProduce"
       :taskData="taskData"
       :Order="taskData.Order"
@@ -709,6 +727,7 @@
       countDownHour: 0,
       countDownMinute: 0,
       Arr: [],
+      ArrError:'',
       // 璁板綍瀹氭椂鍣ㄧ姸鎬�
       procInfoTimer: null,
       cutdownTimer: null,
@@ -763,6 +782,9 @@
       this.activeName = val;
       if(this.activeName==2){
         this.Tasks=this.TasksCopy.slice(0,2)
+        if(this.Tasks.length<2){
+          this.Tasks.push(null)
+        }
       }else if(this.activeName==1){
         this.Tasks=this.TasksCopy.slice(0,1)
       }else if(this.activeName==3){
@@ -1026,10 +1048,13 @@
       getTaskInfo({taskMode:1}).then(res=>{
         if(res.code==200){
           this.taskData=res.data.Tasks?res.data.Tasks[0]:{};
+          this.ArrError=''
           if (this.taskData.Procedure.ID) {
               startTask({ id: this.taskData.Procedure.ID }).then((res) => {
                 if (res.code == 200) {
                   this.Arr =res.data.Params ? res.data.Params : []
+                }else{
+                  this.ArrError=res.msg;
                 }
               });
             }
@@ -1122,7 +1147,7 @@
  color:#318583;
 }
 .el-empty{
-  height:100%;
+  height:calc(100% - 190px);
   .el-empty__description p{
     font-size:16px!important;
     color:#fff!important;
@@ -1590,6 +1615,12 @@
         margin-top: 10px;
         color: #333;
         position: relative;
+        .font_dian{
+            -webkit-box-orient:vertical;
+            overflow:hidden;
+            text-overflow:ellipsis;
+            white-space:nowrap;
+          }
         .card_top-2{
           width:35%;
         }
@@ -1711,12 +1742,7 @@
             border-radius: 5px 5px 0 0;
             background: rgb(19, 35, 90);
           }
-          .font_dian{
-            -webkit-box-orient:vertical;
-            overflow:hidden;
-            text-overflow:ellipsis;
-            white-space:nowrap;
-          }
+          
 
           .card_contentRight {
             width: 100%;

--
Gitblit v1.8.0