From ff9f1cede8653788c9bde6a9227493d4ca2dc7a7 Mon Sep 17 00:00:00 2001
From: xy <271556543@qq.com>
Date: Wed, 3 Apr 2024 17:31:09 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A8=E6=80=81=E3=80=81=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bigScreen1/component/detailTransfer.vue   | 13 ++--------
 src/views/bigScreen1/component/toDo.vue       |  2 +-
 src/views/dashboard/index.vue                 | 24 ++++++++++++++++++-
 src/views/order/component/adjust.vue          | 17 ++++++++++---
 src/views/order/handle.vue                    |  2 +-
 5 files changed, 41 insertions(+), 17 deletions(-)

diff --git a/src/views/bigScreen1/component/detailTransfer.vue b/src/views/bigScreen1/component/detailTransfer.vue
index 5350d85..9e8d2a1 100644
--- a/src/views/bigScreen1/component/detailTransfer.vue
+++ b/src/views/bigScreen1/component/detailTransfer.vue
@@ -50,7 +50,7 @@
               <tbody>
                 <tr>
                   <td>
-                    <div style="padding: 0 20px;">
+                    <div style="padding: 0 20px;overflow-y: scroll;max-height: 60rem;">
                       <div v-if="data.receive_time">接收时间：{{ $moment(data.receive_time).format("YYYY-MM-DD HH:mm") }}</div>
                       <div v-if="data.notice_open_time">通知开启：{{ $moment(data.notice_open_time).format("YYYY-MM-DD HH:mm") }}</div>
                       <div v-if="data.open_time">开启时间：{{ $moment(data.open_time).format("YYYY-MM-DD HH:mm") }}</div>
@@ -59,15 +59,6 @@
                       <div v-if="data.id_logs_transfer_id_relation && data.id_logs_transfer_id_relation.length > 0">
                         <p v-for="item in data.id_logs_transfer_id_relation" style="text-align: left;margin-top: 10px;">{{ $moment(item.created_at).format("YYYY-MM-DD HH:mm") }}{{ item.content }}</p>
                       </div>
-                      <!--                      <div>-->
-<!--                        {{-->
-<!--                          $moment(data.start_time).format("YYYY-MM-DD HH:mm")-->
-<!--                        }}-->
-<!--                      </div>-->
-<!--                      <div style="padding: 10px 0">~</div>-->
-<!--                      <div>-->
-<!--                        {{ $moment(data.end_time).format("YYYY-MM-DD HH:mm") }}-->
-<!--                      </div>-->
                     </div>
                   </td>
                   <td>
@@ -103,7 +94,7 @@
                       <p>
                         执行状态：{{ typeMap.get(data.status) }}
                       </p>
-                      <p>
+                      <p v-if="data.equipment_id_equipments_id_relation && data.equipment_id_equipments_id_relation.type === 1">
                         开启数量：{{ data.kaiqishuliang }} / {{ data.equipment_id_equipments_id_relation ? data.equipment_id_equipments_id_relation.bengzhashuliang : 0 }}
                       </p>
 
diff --git a/src/views/bigScreen1/component/toDo.vue b/src/views/bigScreen1/component/toDo.vue
index 936d57c..57a46d8 100644
--- a/src/views/bigScreen1/component/toDo.vue
+++ b/src/views/bigScreen1/component/toDo.vue
@@ -71,7 +71,7 @@
               <div v-for="(s, si) in progressStatus(item)" :title="operateTitle(item, s)" class="step" @click="stepClick(item,s)">
                 <div class="step-icon">
                   <div class="step-icon__cir" :class="`step-icon__cir-${stepFormat(item.status,s.value)}`"></div>
-                  <div class="step-icon__line" :class="`step-icon__line-${stepFormat(item.status,s.value)}`" v-if="si < (item.tiaozhengleixing === 0 ? closeStatus : status).length-1"></div>
+                  <div class="step-icon__line" :class="`step-icon__line-${stepFormat(item.status,s.value)}`" v-if="si < progressStatus(item).length-1"></div>
                 </div>
                 <div class="step-label">{{ s.label }}</div>
               </div>
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index 9b216ae..abb5459 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -2,6 +2,7 @@
   <div>
 
     <div class="statistics">
+      <div class="title">动态</div>
       <weather></weather>
     </div>
 
@@ -12,7 +13,7 @@
 </template>
 
 <script>
-import weather from "@/views/dashboard/components/weather.vue"
+import weather from "@/views/order/component/weather.vue"
 import feedback from "@/views/dashboard/components/feedback.vue";
 export default {
     components: {
@@ -43,5 +44,26 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+.title {
+  font-weight: 600;
+  font-size: 16px;
+  display: flex;
+  align-items: center;
 
+  padding: 10px 20px;
+  position: relative;
+
+  &::before {
+    content: '';
+    width: 12px;
+    height: 12px;
+    border-radius: 100%;
+    transform: translateY(-50%);
+    background: radial-gradient(50% 50% at 50% 50%,$primaryColor 0,$primaryColor 60%,#0000 60%,#0000 80%,$primaryColor 80%,$primaryColor 100%);
+
+    position: absolute;
+    left: 0;
+    top: 50%;
+  }
+}
 </style>
diff --git a/src/views/order/component/adjust.vue b/src/views/order/component/adjust.vue
index 026a3ff..36805ee 100644
--- a/src/views/order/component/adjust.vue
+++ b/src/views/order/component/adjust.vue
@@ -151,6 +151,13 @@ export default {
     },
 
     submit() {
+      if (this.form.tiaozhengleixing === "" || this.form.tiaozhengleixing === undefined) {
+        this.$message({
+          message: "请选择类型",
+          type: "warning"
+        })
+        return
+      }
       const leixingLabel = this.types.find(i => i.id === this.form.tiaozhengleixing)?.id
       if (leixingLabel === 0) {
         this.form.kaiqishuliang = Number(this.detail?.kaiqishuliang) - Number(this.form.kaiqishuliang)
@@ -170,7 +177,9 @@ export default {
         ])
         for (let key of kv.keys()) {
           if (key === 'kaiqishuliang') {
-            text += nowData[key] === originalData[key] ? "" : (`【${kv.get(key)}】从"${originalData[key] || "0"}"更改为"${nowData[key]}"` || " ")
+            if (this.detail.equipment_id_equipments_id_relation?.type === 1) {
+              text += nowData[key] === originalData[key] ? "" : (`【${kv.get(key)}】从"${originalData[key] || "0"}"更改为"${nowData[key]}"` || " ")
+            }
           } else {
             text += nowData[key] === originalData[key] ? "" : (`【${kv.get(key)}】从"${this.types.find(i => i.id === originalData[key])?.value || originalData[key] || " "}"更改为"${this.types.find(i => i.id === nowData[key])?.value || nowData[key]}"` || " ")
           }
@@ -180,7 +189,8 @@ export default {
       this.form.is_adjust =  1;
       this.form.id_logs_transfer_id_relation = this.detail.id_logs_transfer_id_relation.map(i => ({
         transfer_id: i.transfer_id,
-        content: i.content
+        content: i.content,
+        created_at: this.$moment().format("YYYY-MM-DD HH:mm:ss")
       }))
       this.form.id_logs_transfer_id_relation.push({
         transfer_id: this.detail.id,
@@ -202,7 +212,8 @@ export default {
           save({
             table_name: "logs",
             transfer_id: this.getId(),
-            content: text
+            content: text,
+            created_at: this.$moment().format("YYYY-MM-DD HH:mm:ss")
           },false)
         }
         this.$message({
diff --git a/src/views/order/handle.vue b/src/views/order/handle.vue
index 8cf00a5..b147bf0 100644
--- a/src/views/order/handle.vue
+++ b/src/views/order/handle.vue
@@ -754,7 +754,7 @@ export default {
                     </div>
                     <div>
                       <span style="font-weight: 600;padding: 0 6px;">调整类型：</span>
-                      <span>{ i.tiaozhengleixing }</span>
+                      <span>{ this.form.find(i => i.field === "tiaozhengleixing")?._params?.find(j => j.value == i.tiaozhengleixing)?.key }</span>
                     </div>
                     <div>
                       <span style="font-weight: 600;padding: 0 6px;">调整内容：</span>