From 6ff3137cc624a59eeba6ca9dd1ccec9e4d71f62b Mon Sep 17 00:00:00 2001
From: xy <271556543@qq.com>
Date: Mon, 6 May 2024 10:21:23 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9C=8B=E6=9D=BF=E5=88=B7=E6=96=B0=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/bigScreen1/component/title.vue |  7 +++++-
 src/views/bigScreen1/index.vue           | 28 ++++++++++++++----------
 2 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/src/views/bigScreen1/component/title.vue b/src/views/bigScreen1/component/title.vue
index 0878594..940bfe0 100644
--- a/src/views/bigScreen1/component/title.vue
+++ b/src/views/bigScreen1/component/title.vue
@@ -7,6 +7,7 @@
         <p style="font-size: 1.3rem;">
           <span style="color:#f00;padding-right: 4px;">{{ refresh }}</span><span>秒刷新</span>
           <Icon type="md-refresh-circle" class="refresh-icon" style="margin-left: 10px;font-size:1.7rem;cursor: pointer;" @click="refreshTransfer"/>
+          <span style="padding-left: 6px;">新调令数：{{ newLength }}</span>
         </p>
         <p>{{ $moment(time).format('YYYY-MM-DD HH:mm:ss') }}</p>
       </div>
@@ -28,7 +29,7 @@ export default {
   components: {
     tomorrow
   },
-  inject: ['nowTime','refreshTime','refreshList'],
+  inject: ['nowTime','refreshTime','refreshList','newTransferLength'],
   data() {
     return {
       tomorrows: []
@@ -68,6 +69,10 @@ export default {
     },
     refreshTransfer () {
       return this.refreshList
+    },
+
+    newLength () {
+      return this.newTransferLength()
     }
   },
   mounted() {
diff --git a/src/views/bigScreen1/index.vue b/src/views/bigScreen1/index.vue
index 2f820b4..8fc18c6 100644
--- a/src/views/bigScreen1/index.vue
+++ b/src/views/bigScreen1/index.vue
@@ -1,8 +1,5 @@
 <template>
   <div id="big-screen" ref="appRef">
-<!--    <div class="refresh-time">-->
-<!--      {{ refreshTime }}秒后刷新-->
-<!--    </div>-->
     <topBackground></topBackground>
     <Title ref="title" @show-done="$refs['done'].show()" @step-click="stepClick"></Title>
     <toDo ref="toDo"
@@ -78,6 +75,7 @@ export default {
         }
       },
       nowTime: () => this.time,
+      newTransferLength: () => this.transferLength,
       auths: () => this.auths_auth_mixin,
       refreshTime: () => this.refreshTime,
       refreshList: () => this.getTransfer(true)
@@ -85,6 +83,7 @@ export default {
   },
   data() {
     return {
+      transferLength: 0,
       refreshTime: refreshTransferTime / 10000,
       forwardRefreshTime: '',
       transfers1: [],
@@ -191,10 +190,10 @@ export default {
               if (pTransfer && (pTransfer.status === i.status)) {
                 transfers1.splice(transfers1.indexOf(pTransfer),1,i)
               } else {
-                transfers1.push(i)
+                transfers1.unshift(i)
               }
             } else {
-              transfers1.push(i)
+              transfers1.unshift(i)
             }
           }
           if (i.status === 5 || i.status === 6) {
@@ -203,22 +202,25 @@ export default {
               if (pTransfer && (pTransfer.status === i.status)) {
                 transfers2.splice(transfers2.indexOf(pTransfer),1,i)
               } else {
-                transfers2.push(i)
+                transfers2.unshift(i)
               }
             } else {
               if (!transfers2.find(j => j.to_transfer_id === i.id)) {
-                transfers2.push(i)
+                transfers2.unshift(i)
               }
             }
           }
           if (i.status === 7) {
-            transfers3.push(i)
+            transfers3.unshift(i)
           }
         })
         this.transfers1 = transfers1;
         this.transfers2 = transfers2;
         this.transfers3 = transfers3;
       } 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()
         //新的调令
         const res = (
           (await index({
@@ -229,7 +231,7 @@ export default {
                 {
                   key: "created_at",
                   op: "range",
-                  value: `${this.forwardRefreshTime.format('YYYY-MM-DD HH:mm:ss')},${this.$moment().format('YYYY-MM-DD HH:mm:ss')}`
+                  value: `${startTime},${endTime}`
                 },
                 {
                   key: "status",
@@ -239,9 +241,10 @@ export default {
               ]
             },false)
           ).data);
+        this.transferLength = res.length;
         if (res.length > 0) {
           this.$audioPlay(2)
-          this.transfers1.push(...res)
+          this.transfers1.unshift(...res)
         }
         //跟新的调令
         const res1 = (await index({
@@ -252,7 +255,7 @@ export default {
             {
               key: "updated_at",
               op: "range",
-              value: `${this.forwardRefreshTime.format('YYYY-MM-DD HH:mm:ss')},${this.$moment().format('YYYY-MM-DD HH:mm:ss')}`
+              value: `${startTime},${endTime}`
             },
             {
               key: "status",
@@ -275,8 +278,9 @@ export default {
             else {}
           })
         }
-        this.forwardRefreshTime = this.$moment()
       }
+
+      this.$forceUpdate()
     }
   },
   computed: {},