From cbefe62270ae0bd4bb6de87881d29278eb6ffebf Mon Sep 17 00:00:00 2001
From: xy <271556543@qq.com>
Date: Wed, 17 Jul 2024 09:49:44 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=AE=BE=E5=A4=87=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E5=90=8E=E6=97=A0=E6=B3=95=E6=98=BE=E7=A4=BA=E8=B0=83?=
 =?UTF-8?q?=E4=BB=A4=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/bigScreen1/component/doing.vue |  8 ++++----
 src/views/bigScreen1/component/done.vue  | 26 ++++++++++++++++++++++--
 src/views/bigScreen1/component/toDo.vue  | 10 ++++-----
 3 files changed, 33 insertions(+), 11 deletions(-)

diff --git a/src/views/bigScreen1/component/doing.vue b/src/views/bigScreen1/component/doing.vue
index aca0ec6..ff63a98 100644
--- a/src/views/bigScreen1/component/doing.vue
+++ b/src/views/bigScreen1/component/doing.vue
@@ -55,11 +55,11 @@
                 <svg-icon v-if="item.diaolingleixing === 3" icon-class="ship" style="font-size: 2rem;padding-right: 2px;"></svg-icon>
                 <span>{{ item.equipment_id_equipments_id_relation ? item.equipment_id_equipments_id_relation.name : '' }}</span>
               </p>
-              <div style="display: flex;align-items: center;">
+              <div style="display: flex;align-items: center;" v-if="item.equipment_id_equipments_id_relation && item.equipment_id_equipments_id_relation.bengzhashuliang">
                 <p style="zoom:.85;">闸门</p>
                 <div class="list-item__number" v-for="(i,index) in Number(item.equipment_id_equipments_id_relation.bengzhashuliang || 0)" :style="index >= item.kaiqishuliang ? 'background: red;' : ''"></div>
               </div>
-              <div style="display: flex;align-items: center;">
+              <div style="display: flex;align-items: center;" v-if="item.equipment_id_equipments_id_relation && item.equipment_id_equipments_id_relation.shuibengtaishu">
                 <p style="zoom:.85;">水泵</p>
                 <div class="list-item__number" v-for="(i,index) in Number(item.equipment_id_equipments_id_relation.shuibengtaishu || 0)" :style="index >= item.kaiqishuliang1 ? 'background: red;' : ''"></div>
               </div>
@@ -202,7 +202,7 @@ export default {
 
     isShowNotice () {
       return function (item) {
-        return item.id_feedbacks_transfer_id_relation.reduce((pre, cur) => (!!(pre || cur.status)), false)
+        return item.id_feedbacks_transfer_id_relation?.reduce((pre, cur) => (!!(pre || cur.status)), false)
       }
     },
 
@@ -217,7 +217,7 @@ export default {
           }
           return 3
         }
-        if (item.id_transfers_to_transfer_id_relation.length > 0) {
+        if (item.id_transfers_to_transfer_id_relation?.length > 0) {
           return 2
         }
         if (diffMins < 0) {
diff --git a/src/views/bigScreen1/component/done.vue b/src/views/bigScreen1/component/done.vue
index deff40b..f65b78f 100644
--- a/src/views/bigScreen1/component/done.vue
+++ b/src/views/bigScreen1/component/done.vue
@@ -35,6 +35,20 @@
                 <div class="list-item__name">
                   {{ item.equipment_id_equipments_id_relation ? item.equipment_id_equipments_id_relation.name : '' }}
                 </div>
+                <div class="list-item__name">
+                  <p>
+                    <svg-icon v-if="item.diaolingleixing === 3" icon-class="ship" style="font-size: 2rem;padding-right: 2px;"></svg-icon>
+                    <span>{{ item.equipment_id_equipments_id_relation ? item.equipment_id_equipments_id_relation.name : '' }}</span>
+                  </p>
+                  <div style="display: flex;align-items: center;" v-if="item.equipment_id_equipments_id_relation && item.equipment_id_equipments_id_relation.bengzhashuliang">
+                    <p style="zoom:.85;">闸门</p>
+                    <div class="list-item__number" v-for="(i,index) in Number(item.equipment_id_equipments_id_relation.bengzhashuliang || 0)" :style="index >= item.kaiqishuliang ? 'background: red;' : ''"></div>
+                  </div>
+                  <div style="display: flex;align-items: center;" v-if="item.equipment_id_equipments_id_relation && item.equipment_id_equipments_id_relation.shuibengtaishu">
+                    <p style="zoom:.85;">水泵</p>
+                    <div class="list-item__number" v-for="(i,index) in Number(item.equipment_id_equipments_id_relation.shuibengtaishu || 0)" :style="index >= item.kaiqishuliang1 ? 'background: red;' : ''"></div>
+                  </div>
+                </div>
                 <div class="list-item__content">
                   <el-tooltip class="item" effect="dark" :content="item.content" placement="top-start">
                     <span>{{ item.content }}</span>
@@ -315,8 +329,16 @@ $list-height: calc(#{$container-height} - 5.33rem);
       font-size: 1.34rem;
       flex: 1;
     }
+    &__number {
+      width: 0.7rem;
+      height: 0.7rem;
+      border-radius: 100%;
+      background: $primaryColor;
+      margin-right: 0.3rem;
+      margin-top: 0.2rem;
+    }
     &__content {
-      flex-basis: 14%;
+      flex-basis: 11%;
       word-break: keep-all;
       text-overflow: ellipsis;
       overflow: hidden;
@@ -336,7 +358,7 @@ $list-height: calc(#{$container-height} - 5.33rem);
       justify-content: center;
 
       .step {
-        width: 5rem;
+        width: 4.2rem;
 
         &-icon {
           display: flex;
diff --git a/src/views/bigScreen1/component/toDo.vue b/src/views/bigScreen1/component/toDo.vue
index be3ed13..d325b33 100644
--- a/src/views/bigScreen1/component/toDo.vue
+++ b/src/views/bigScreen1/component/toDo.vue
@@ -58,11 +58,11 @@
                 <svg-icon v-if="item.diaolingleixing === 3" icon-class="ship" style="font-size: 2rem;padding-right: 2px;"></svg-icon>
                 <span>{{ item.equipment_id_equipments_id_relation ? item.equipment_id_equipments_id_relation.name : '' }}</span>
               </p>
-              <div style="display: flex;align-items: center;">
+              <div style="display: flex;align-items: center;" v-if="item.equipment_id_equipments_id_relation && item.equipment_id_equipments_id_relation.bengzhashuliang">
                 <p style="zoom:.85;padding-right: 2px;">闸门</p>
                 <div class="list-item__number" v-for="(i,index) in Number(item.equipment_id_equipments_id_relation.bengzhashuliang || 0)" :style="index >= item.kaiqishuliang ? 'background: red;' : ''"></div>
               </div>
-              <div style="display: flex;align-items: center;">
+              <div style="display: flex;align-items: center;" v-if="item.equipment_id_equipments_id_relation && item.equipment_id_equipments_id_relation.shuibengtaishu">
                 <p style="zoom:.85;padding-right: 2px;">水泵</p>
                 <div class="list-item__number" v-for="(i,index) in Number(item.equipment_id_equipments_id_relation.shuibengtaishu || 0)" :style="index >= item.kaiqishuliang1 ? 'background: red;' : ''"></div>
               </div>
@@ -206,7 +206,7 @@ export default {
 
     isShowNotice () {
       return function (item) {
-        return item.id_feedbacks_transfer_id_relation.reduce((pre, cur) => (!!(pre || cur.status)), false)
+        return item.id_feedbacks_transfer_id_relation?.reduce((pre, cur) => (!!(pre || cur.status)), false)
       }
     },
 
@@ -231,7 +231,7 @@ export default {
             },
           ];
         } else if (item.tiaozhengleixing === 1) {
-          if (item.equipment_id_equipments_id_relation.type === 1) {
+          if (item.equipment_id_equipments_id_relation?.type === 1) {
             return [
               {
                 value: 2,
@@ -285,7 +285,7 @@ export default {
           }
           return 3
         }
-        if (item.id_transfers_to_transfer_id_relation.length > 0) {
+        if (item.id_transfers_to_transfer_id_relation?.length > 0) {
           return 2
         }
         if (diffMins < 0) {