From 161c265ed69fc7efb7f4abf8de15c4915d7c282d Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期五, 15 九月 2023 14:41:01 +0800
Subject: [PATCH] 2个任务的时候 显示无任务图标

---
 src/views/visualization.vue |   84 ++++++++++++++++++++++++++++++------------
 1 files changed, 60 insertions(+), 24 deletions(-)

diff --git a/src/views/visualization.vue b/src/views/visualization.vue
index 3745c30..252d90b 100644
--- a/src/views/visualization.vue
+++ b/src/views/visualization.vue
@@ -1,7 +1,7 @@
 
 <template>
   <div class="home">
-    <!-- v-if="Object.keys(taskData).length > 0 && taskData.Procedure.ID" -->
+    <!--  -->
     <template v-if="Tasks&&Tasks.length>0">
       <div class="left">
         <p class="title">
@@ -37,6 +37,7 @@
           v-for="(taskData, index) in Tasks"
           :key="index"
         >
+        <template v-if="taskData">
           <div class="gong-date">
             宸ュ簭杩愯鏃堕棿锛歿{ getFormatTime(taskData.Procedure.startTime) }}
           </div>
@@ -299,8 +300,8 @@
                       <!-- <div class="card_content">
                         
                       </div> -->
-                      <div class="card_top-4">
-                        <div>宸ヨ壓缂栧彿锛歿{ list.number }}</div>
+                      <div :class="activeName==1?'card_top-4 font_size_20px':'card_top-4'">
+                        <div>宸ヨ壓缂栧彿锛�<div >{{ list.number }}</div></div>
                         <!-- <div
                           style="
                             font-size: 14px;
@@ -423,6 +424,13 @@
               >
             </div>
           </div>
+        </template>
+          <!-- 2涓换鍔＄殑鏃跺�欙紝绗簩涓换鍔′负绌虹殑鏃跺�欐樉绀� -->
+          <template
+              v-if="activeName == 2 &&(!taskData||Object.keys(taskData).length==0)"
+            >
+            <el-empty description="鏆傛棤浠诲姟..."></el-empty>
+          </template>
         </div>
       </div>
       <div class="right">
@@ -477,9 +485,12 @@
                 style="font-size: 20px; font-weight: 600; margin-right: 10px"
                 >{{ item.workerName || "" }}</span
               >
-              <span>{{ item.phoneNum || "" }}</span>
+              <!-- <span>{{ item.phoneNum || "" }}</span> -->
+              <span class="color_yellow"><i class="el-icon-star-on" /><i class="el-icon-star-on" /><i class="el-icon-star-on" /><i class="el-icon-star-on" /><i class="el-icon-star-on" /></span>
             </dl>
+           
           </div>
+         
           <!-- <div
             style="
               width: 100%;
@@ -504,7 +515,7 @@
         </div>
       </div>
     </template>
-    <!-- v-else -->
+    <!--  -->
     <template v-else>
       <div class="home-img-box">
         <div class="bg-title">
@@ -573,7 +584,7 @@
   },
   data() {
     return {
-      activeName: 1,
+      activeName: 2,
       progress: 70, //杩涘害
       passrate: 30, //鍚堟牸鐜�
       production: 25, //鐢熶骇涓�
@@ -852,6 +863,7 @@
            })
           }
           this.Tasks = res.data.Tasks ? res.data.Tasks : [];
+          
           this.TaskCount=res.data.TaskCount?res.data.TaskCount:0
           this.workers=res.data.workers?res.data.workers:[]
           if (this.Tasks.length == 0) {
@@ -911,6 +923,10 @@
             }, 60000);
           }
         }
+        debugger
+        if(this.activeName==2){
+            this.Tasks[1]=null
+        }
       });
     },
     getStartArr(){
@@ -924,17 +940,19 @@
     },
     getProgressInfo() {
       for (let i in this.Tasks){
-        getProgress({
-          position: Number(i),
-          procedureId: this.Tasks[i].Procedure.ID,
-        }).then((res) => {
-          if (res.code == 200) {
-            this.Tasks[i].finishNumber = res.data.finishNumber
-              ? res.data.finishNumber
-              : 0;
-              this.plcStatus=res.data.plcStatus?res.data.plcStatus:1
-          }
-        });
+        if(this.Tasks[i].Procedure.ID){
+          getProgress({
+            position: Number(i),
+            procedureId: this.Tasks[i].Procedure.ID,
+          }).then((res) => {
+            if (res.code == 200) {
+              this.Tasks[i].finishNumber = res.data.finishNumber
+                ? res.data.finishNumber
+                : 0;
+                this.plcStatus=res.data.plcStatus?res.data.plcStatus:1
+            }
+          });
+        }
       }
       
     },
@@ -986,6 +1004,17 @@
 </script>
 
 <style lang="scss">
+.color_yellow{
+  color:yellow;
+}
+.el-empty{
+  height:100%;
+  .el-empty__description p{
+    font-size:16px!important;
+    color:#fff!important;
+  }
+}
+
 .active-one {
   width: 100%;
   height: calc(100% - 100px);
@@ -1001,6 +1030,9 @@
   .bottom {
     height: calc(100% - 410px);
   }
+  .font_size_20px{
+    font-size:20px!important;
+  }
 }
 .active-two {
   width: calc(50% - 10px);
@@ -1013,6 +1045,7 @@
     box-sizing: border-box;
     border-right: 1px solid #eee;
   }
+  
   .small_title {
     margin-bottom: 30px;
   }
@@ -1474,8 +1507,6 @@
           color: #fff;
           font-size: 12px;
           line-height: 45px;
-          float: left;
-
           > div {
             margin-left: 12px;
             position: relative;
@@ -1487,15 +1518,20 @@
             }
           }
         }
+        .card_top{
+          float: left;
+        }
         .card_top-4 {
           width: calc(100% - 20px);
-          padding: 0 10px;
-          height: 70px;
-
-          line-height: 70px;
+          padding: 10px 10px;
           color: #fff;
           background: rgb(19, 35, 90);
-          font-size: 20px;
+          font-size: 14px;
+          height:50px;
+          line-height: 25px;
+          >div{
+            margin-left:0px;
+          }
         }
         .card-info-box {
           position: absolute;

--
Gitblit v1.8.0