From 05f3dd19cd55fef61fa89ac9f60f915ef7bd9e07 Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期五, 15 九月 2023 10:52:52 +0800
Subject: [PATCH] 提示 修改为2种状态+ 无任务页面的显示问题

---
 src/views/visualization.vue |   29 ++++++++++++++++++++---------
 1 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/src/views/visualization.vue b/src/views/visualization.vue
index b0763dc..3745c30 100644
--- a/src/views/visualization.vue
+++ b/src/views/visualization.vue
@@ -2,7 +2,7 @@
 <template>
   <div class="home">
     <!-- v-if="Object.keys(taskData).length > 0 && taskData.Procedure.ID" -->
-    <template>
+    <template v-if="Tasks&&Tasks.length>0">
       <div class="left">
         <p class="title">
           <span
@@ -27,7 +27,7 @@
             style="float: right;margin-right:20px;font-size:28px;line-height:25px;"
             @click="taskClick"
           >
-          <el-badge :value="TaskCount"  :class="TaskCount==0?'item color_666':'item color_fff'">
+          <el-badge :value="TaskCount"  :class="(TaskCount==0||isTipShow)?'item color_666':'item color_fff'">
             <i   class="el-icon-chat-dot-round" />
           </el-badge>
         </span>
@@ -82,7 +82,7 @@
           <div class="content">
             <div class="content_left">
               <div class="content-top">
-                <div class="small_title">褰撳墠瀹屾垚</div>
+                <div class="small_title">鍔犲伐鏁�</div>
                 <div class="content_leftBttom">
                   <dl>
                     <dd
@@ -95,7 +95,7 @@
                 </div>
               </div>
               <div class="content-top">
-                <div class="small_title">姝ｅ搧鐢熶骇</div>
+                <div class="small_title">鐩爣鏁�</div>
                 <div class="content_leftBttom">
                   <dl>
                     <dd
@@ -152,8 +152,10 @@
                         ? parseInt(
                             (taskData.finishNumber / taskData.Order.amount) *
                               100
-                          )
-                        : 0
+                        )>100?100:parseInt(
+                            (taskData.finishNumber / taskData.Order.amount) *
+                              100
+                        ): 0
                     "
                   ></el-progress>
                 </el-descriptions-item>
@@ -274,7 +276,11 @@
                                     (taskData.finishNumber /
                                       taskData.Order.amount) *
                                       100
-                                  )
+                                )>100?100:parseInt(
+                                    (taskData.finishNumber /
+                                      taskData.Order.amount) *
+                                      100
+                                )
                                 : 0
                             "
                             :show-text="false"
@@ -499,7 +505,7 @@
       </div>
     </template>
     <!-- v-else -->
-    <template>
+    <template v-else>
       <div class="home-img-box">
         <div class="bg-title">
           <img src="../../public/bg-title.png" />
@@ -539,6 +545,7 @@
       :taskData="taskData"
       :Order="taskData.Order"
       @getSetProductNumber="getTaskInfo"
+      @isTip="isTip"
     />
   </div>
 </template>
@@ -665,6 +672,7 @@
       cutdownTimer: null,
       TaskCount:0,
       plcStatus:1,
+      isTipShow:false,
     };
   },
   mounted() {
@@ -688,6 +696,9 @@
       }else{
         this.$message.error('鐩墠娌℃湁浠诲姟锛�')
       }
+    },
+    isTip(val){
+      this.isTipShow=val
     },
     cutClick(val) {
       this.activeName = val;
@@ -1195,7 +1206,7 @@
   // float:left;
   .bottom-title {
     font-weight: 600;
-    font-size: 22px;
+    font-size: 20px;
     height: 30px;
     line-height: 30px;
     margin-bottom: 5px;

--
Gitblit v1.8.0