From 628e36be8061681e520d52ba2ced7189101477d2 Mon Sep 17 00:00:00 2001
From: xy <271556543@qq.com>
Date: Tue, 4 Jun 2024 16:47:07 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E8=B0=83=E4=BB=A4=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/bigScreen1/component/doing.vue |  5 ++++-
 src/views/bigScreen1/component/toDo.vue  | 19 +++++++++++++++++++
 src/views/bigScreen1/index.vue           |  8 +++++++-
 3 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/src/views/bigScreen1/component/doing.vue b/src/views/bigScreen1/component/doing.vue
index cd92a5a..aca0ec6 100644
--- a/src/views/bigScreen1/component/doing.vue
+++ b/src/views/bigScreen1/component/doing.vue
@@ -51,7 +51,10 @@
               </template>
             </div>
             <div class="list-item__name">
-              <p>{{ item.equipment_id_equipments_id_relation ? item.equipment_id_equipments_id_relation.name : '' }}</p>
+              <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;">
                 <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>
diff --git a/src/views/bigScreen1/component/toDo.vue b/src/views/bigScreen1/component/toDo.vue
index 6918ff7..849057e 100644
--- a/src/views/bigScreen1/component/toDo.vue
+++ b/src/views/bigScreen1/component/toDo.vue
@@ -28,6 +28,9 @@
       <div class="list">
         <transition-group name="list-item" ref="listItems">
           <div v-for="(item, index) in scrollList" :key="item.id" ref="listItem" class="list-item" :class="`list-item-${timeStatusFormat(item)}`">
+            <div class="list-item__new" v-if="item._isNew">
+              新
+            </div>
             <div class="list-item__status">
               <template>
                 <template v-if="timeStatusFormat(item) === 3">
@@ -472,11 +475,27 @@ $list-height: calc(#{$container-height} - 5.33rem);
     border-bottom: 1px #fff solid;
 
     padding: 1.2rem 2rem;
+    position: relative;
 
     &:nth-last-child(1) {
       border-radius: 0 0 .67rem .67rem;
       border-bottom: none;
     }
+    &__new {
+      color: #fff;
+      background: rgb(115, 160, 223);
+      width: 1.8rem;
+      height: 1.8rem;
+      line-height: 1.8rem;
+      text-align: center;
+      font-size: 1rem;
+      border-radius: 100% 100% 100% 0%;
+      animation: flash 5s infinite linear;
+
+      position: absolute;
+      top: 0.5rem;
+      left: 0.5rem;
+    }
 
     $bkg-colors: #fff,linear-gradient(to bottom,#527ded18, #527ded28),linear-gradient(to bottom,#ecc06918, #ecc06928),linear-gradient(to bottom,#d15d5218, #d15d5228);
     @for $i from 1 through length($bkg-colors) {
diff --git a/src/views/bigScreen1/index.vue b/src/views/bigScreen1/index.vue
index 5170c4c..464f8f7 100644
--- a/src/views/bigScreen1/index.vue
+++ b/src/views/bigScreen1/index.vue
@@ -226,7 +226,7 @@ export default {
       } else {
         const startTime = this.forwardRefreshTime.format('YYYY-MM-DD HH:mm:ss');
         const endTime = this.$moment().format('YYYY-MM-DD HH:mm:ss');
-        this.forwardRefreshTime = this.$moment()
+        this.forwardRefreshTime = this.$moment();
         //新的调令
         const res = (
           (await index({
@@ -249,6 +249,9 @@ export default {
           ).data);
         this.transferLength = res.length;
         if (res.length > 0) {
+          res.forEach(i => {
+            i._isNew = true;
+          })
           this.$audioPlay(2)
           this.transfers1.unshift(...res)
         }
@@ -273,6 +276,9 @@ export default {
         if (res1.length > 0) {
           let msFlag = false
           res1.forEach(i => {
+            if (i.status === 2) {
+              i._isNew = true;
+            }
             if (this.transfers1.findIndex(j => j.id === i.id) !== -1) {
               this.transfers1.splice(this.transfers1.findIndex(j => j.id === i.id),1,i)
             }