From b28a103abcd22e73d30628a8fd35f1acbdc8e085 Mon Sep 17 00:00:00 2001
From: xy <271556543@qq.com>
Date: Fri, 24 May 2024 17:34:49 +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/icons/svg/ship.svg                     |  1 +
 src/views/bigScreen1/component/doing.vue   |  4 ++--
 src/views/bigScreen1/component/toDo.vue    | 15 +++++++++++----
 src/views/bigScreen1/index.vue             | 21 ++++++++++++++++++---
 src/views/order/component/dispatchList.vue |  4 ++--
 5 files changed, 34 insertions(+), 11 deletions(-)
 create mode 100644 src/icons/svg/ship.svg

diff --git a/src/icons/svg/ship.svg b/src/icons/svg/ship.svg
new file mode 100644
index 0000000..f470094
--- /dev/null
+++ b/src/icons/svg/ship.svg
@@ -0,0 +1 @@
+<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><svg t="1716171887340" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="11815" width="200" height="200"><path d="M83.437037 414.340741H265.481481c19.911111 13.274074 39.822222 27.496296 59.733334 40.77037h225.659259l4.740741-145.066667-95.762963-5.688888v22.755555h4.740741v7.585185h-62.577778v-7.585185h6.637037v-25.6l-35.081482-1.896296v-6.637037h182.044445l2.844444-70.162963h16.118519l2.844444 70.162963 0.948148 18.014815 3.792593 144.118518H938.666667v31.288889h-11.377778l1.896296 11.377778c-5.688889 46.459259-20.859259 82.488889-40.77037 114.725926H182.044444c-9.481481-3.792593-17.066667-9.481481-11.377777-26.548148l31.288889-5.688889c12.325926-5.688889 14.222222-18.962963 5.688888-32.237037-30.340741-29.392593-86.281481-71.111111-124.207407-133.688889z m290.133333 93.866666c-3.792593 0-7.585185 3.792593-7.585185 7.585186s3.792593 7.585185 7.585185 7.585185 7.585185-3.792593 7.585186-7.585185-3.792593-7.585185-7.585186-7.585186z m91.022223 0c-3.792593 0-7.585185 3.792593-7.585186 7.585186s3.792593 7.585185 7.585186 7.585185 7.585185-3.792593 7.585185-7.585185-3.792593-7.585185-7.585185-7.585186z m-32.237037 0c-3.792593 0-7.585185 3.792593-7.585186 7.585186s3.792593 7.585185 7.585186 7.585185 7.585185-3.792593 7.585185-7.585185-3.792593-7.585185-7.585185-7.585186z m-29.392593 0c-3.792593 0-7.585185 3.792593-7.585185 7.585186s3.792593 7.585185 7.585185 7.585185 7.585185-3.792593 7.585185-7.585185-3.792593-7.585185-7.585185-7.585186zM749.037037 276.859259v-22.755555h-5.688889v22.755555H730.074074v-40.77037h-5.688889V293.925926h-26.548148v54.992593h18.962963v104.296296h206.696296v-66.370371h-4.74074v-27.496296h-92.918519v27.496296h-4.740741V293.925926h-37.925926v-17.066667H749.037037z m76.8 43.614815v32.237037h92.918519v-32.237037h-92.918519zM753.777778 369.777778v16.118518h26.548148V369.777778h-26.548148z m-28.444445 0h21.807408v16.118518h-21.807408v56.888889h188.681482v-47.407407H811.614815v-92.918519H706.37037v9.481482H730.074074v16.118518h-22.755555v11.377778h18.962962V369.777778h-0.948148z m14.222223-57.837037v16.118518h26.548148v-16.118518H739.555556z m-276.85926 34.133333h-4.74074v50.251852h78.696296v-50.251852h-73.955556z m16.118519 9.481482l-11.377778 11.377777v6.637037l17.066667-18.014814h-5.688889z m-11.377778 5.688888l5.688889-6.637037h-5.688889v6.637037z m21.807407-5.688888l-21.807407 22.755555v6.637037l27.496296-29.392592h-5.688889z m10.42963 0l-29.392593 31.288888h6.637038l29.392592-31.288888h-6.637037z m11.377778 0l-29.392593 31.288888h7.585185l29.392593-31.288888h-7.585185z m12.325926 0l-29.392593 31.288888h7.585185l26.548149-28.444444v-2.844444h-4.740741z m4.740741 7.585185l-21.807408 23.703703h6.637037l15.170371-16.118518v-7.585185z m0 12.325926l-10.42963 11.377777h10.42963v-11.377777z m-150.755556-29.392593h-4.740741v50.251852h78.696297v-50.251852h-73.955556z m15.17037 9.481482l-11.377777 11.377777v6.637037l17.066666-18.014814h-5.688889z m-10.429629 5.688888l5.688889-6.637037h-5.688889v6.637037z m21.807407-5.688888l-21.807407 22.755555v6.637037l27.496296-29.392592h-5.688889z m10.42963 0l-29.392593 31.288888h6.637037l29.392593-31.288888h-6.637037z m11.377778 0l-29.392593 31.288888h7.585185l29.392593-31.288888h-7.585185z m12.325925 0l-29.392592 31.288888h7.585185l26.548148-28.444444v-2.844444h-4.740741z m4.740741 7.585185l-21.807407 23.703703h6.637037l15.17037-16.118518v-7.585185z m0 12.325926l-10.429629 11.377777h10.429629v-11.377777z m19.911111 25.6h-4.74074v50.251852h78.696296v-50.251852h-73.955556z m65.422223 9.481481h-60.681482v31.288889h60.681482v-31.288889z m-151.703704-9.481481h-4.740741v50.251852h78.696296v-50.251852h-73.955555z m65.422222 9.481481h-60.681481v31.288889h60.681481v-31.288889z m-27.496296-83.437037h39.822222V303.407407l-39.822222-1.896296v25.6zM182.044444 438.992593c-6.637037 0-11.377778 4.740741-11.377777 11.377777s4.740741 11.377778 11.377777 11.377778 11.377778-4.740741 11.377778-11.377778-4.740741-11.377778-11.377778-11.377777z" fill="#1296db" p-id="11816"></path></svg>
diff --git a/src/views/bigScreen1/component/doing.vue b/src/views/bigScreen1/component/doing.vue
index 6487ab2..53de6c7 100644
--- a/src/views/bigScreen1/component/doing.vue
+++ b/src/views/bigScreen1/component/doing.vue
@@ -62,11 +62,11 @@
               </el-tooltip>
             </div>
             <div class="list-item__time">
-              执行时间：{{ timeFormat(item.start_time) }}至{{ timeFormat(item.end_time,'HH:mm') }}
+              执行时间：{{ timeFormat(item.start_time) }}至{{ item.end_time ? timeFormat(item.end_time,'HH:mm') : "-" }}
               <br>
               发布时间：{{ timeFormat(item.created_at,'YYYY-MM-DD HH:mm') }}
             </div>
-            <div class="list-item__last">预计时长 {{ $moment(item.end_time).diff($moment(item.start_time),'hours', true).toFixed(2) }}小时</div>
+            <div class="list-item__last">预计时长 {{ item.end_time ? ($moment(item.end_time).diff($moment(item.start_time),'hours', true).toFixed(2)) : "-" }}小时</div>
             <div class="list-item__operate">
               <div v-for="(s, si) in (item.tiaozhengleixing === 0 ? closeStatus : status)" :title="operateTitle(item, s)" class="step" @click="stepClick(item,s)">
                 <div class="step-icon">
diff --git a/src/views/bigScreen1/component/toDo.vue b/src/views/bigScreen1/component/toDo.vue
index 57a46d8..760fb6a 100644
--- a/src/views/bigScreen1/component/toDo.vue
+++ b/src/views/bigScreen1/component/toDo.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;" v-if="item.equipment_id_equipments_id_relation && item.equipment_id_equipments_id_relation.type === 1">
                 <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>
@@ -62,11 +65,11 @@
               </el-tooltip>
             </div>
             <div class="list-item__time">
-              运行时间：{{ timeFormat(item.start_time) }}至{{ timeFormat(item.end_time,'HH:mm') }}
+              运行时间：{{ timeFormat(item.start_time) }}至{{ item.end_time ? timeFormat(item.end_time,'HH:mm') : '-' }}
               <br>
               发布时间：{{ timeFormat(item.created_at,'YYYY-MM-DD HH:mm') }}
             </div>
-            <div class="list-item__last">预计时长 {{ $moment(item.end_time).diff($moment(item.start_time),'hours', true).toFixed(2) }}小时</div>
+            <div class="list-item__last">预计时长 {{ item.end_time ? $moment(item.end_time).diff($moment(item.start_time),'hours', true).toFixed(2) : '-' }}小时</div>
             <div class="list-item__operate">
               <div v-for="(s, si) in progressStatus(item)" :title="operateTitle(item, s)" class="step" @click="stepClick(item,s)">
                 <div class="step-icon">
@@ -90,9 +93,13 @@
 </template>
 
 <script>
+import SvgIcon from "@/components/SvgIcon";
 import { deepCopy } from "@/utils";
 
 export default {
+  components: {
+    SvgIcon
+  },
   inject: ["transfers", "nowTime", "auths"],
   data() {
     return {
@@ -185,7 +192,7 @@ export default {
 
     timeFormat () {
       return function (time,format='YYYY-MM-DD HH:mm') {
-        return this.$moment(time).format(format)
+        return this.$moment(time).format(format) || "-"
       }
     },
 
diff --git a/src/views/bigScreen1/index.vue b/src/views/bigScreen1/index.vue
index 8fc18c6..5170c4c 100644
--- a/src/views/bigScreen1/index.vue
+++ b/src/views/bigScreen1/index.vue
@@ -86,6 +86,7 @@ export default {
       transferLength: 0,
       refreshTime: refreshTransferTime / 10000,
       forwardRefreshTime: '',
+      forwardRefreshTime1: this.$moment(),
       transfers1: [],
       transfers2: [],
       transfers3: [],
@@ -127,6 +128,8 @@ export default {
     },
 
     async getFeedback () {
+      const startTime = this.forwardRefreshTime1.format('YYYY-MM-DD HH:mm:ss');
+      const endTime = this.$moment().format('YYYY-MM-DD HH:mm:ss');
       const res = (
         (await index({
             table_name: "feedbacks",
@@ -136,7 +139,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",
@@ -146,6 +149,7 @@ export default {
             ]
           },false)
         ).data);
+      this.forwardRefreshTime1 = this.$moment()
       res.forEach(i => {
         this.$notify({
           title: i.equipment?.name || '调令反馈',
@@ -155,6 +159,8 @@ export default {
       })
     },
 
+
+
     async getTransfer(isFirst = false) {
       this.refreshTime = refreshTransferTime / 1000;
       if (isFirst) {
@@ -168,7 +174,7 @@ export default {
             page: 1,
             page_size: 9999,
             sort_name: "created_at",
-            sort_type: "desc",
+            sort_type: "asc",
             filter: [
               {
                 key: 'start_time',
@@ -265,6 +271,7 @@ export default {
           ]
         })).data
         if (res1.length > 0) {
+          let msFlag = false
           res1.forEach(i => {
             if (this.transfers1.findIndex(j => j.id === i.id) !== -1) {
               this.transfers1.splice(this.transfers1.findIndex(j => j.id === i.id),1,i)
@@ -274,9 +281,17 @@ export default {
             }
             else if (this.transfers3.findIndex(j => j.id === i.id) !== -1) {
               this.transfers3.splice(this.transfers3.findIndex(j => j.id === i.id),1,i)
+            } else {
+              if (i.status === 2) {
+                this.transfers1.unshift(i)
+                this.transferLength++
+                msFlag = true
+              }
             }
-            else {}
           })
+          if (msFlag) {
+            this.$audioPlay(2)
+          }
         }
       }
 
diff --git a/src/views/order/component/dispatchList.vue b/src/views/order/component/dispatchList.vue
index d4602e9..a9ebbb9 100644
--- a/src/views/order/component/dispatchList.vue
+++ b/src/views/order/component/dispatchList.vue
@@ -181,14 +181,14 @@ export default {
           width: 100,
           align: "center",
           key: "last",
-          render: (h,{ row }) => h('span', this.$moment(row.end_time).diff(this.$moment(row.start_time),'hours',true).toFixed(2) + '小时')
+          render: (h,{ row }) => h('span', (row.start_time && row.end_time) ? (this.$moment(row.end_time).diff(this.$moment(row.start_time),'hours',true).toFixed(2) + '小时') : "-")
         },
         {
           title: "结束时间",
           width: 100,
           align: "center",
           key: "end_time",
-          render: (h,{ row }) => h('span', this.$moment(row.end_time).format('HH:mm'))
+          render: (h,{ row }) => h('span', row.end_time ? this.$moment(row.end_time).format('HH:mm') : "-")
         },
         {
           title: "调令内容",