From a25ed0b5590008fa4551cb866793c8d6c46e1d41 Mon Sep 17 00:00:00 2001
From: xy <271556543@qq.com>
Date: Mon, 25 Mar 2024 14:05:06 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E4=BB=A4=E8=B0=83=E6=95=B4=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bigScreen1/component/detailTransfer.vue   |  8 ++--
 src/views/bigScreen1/component/doing.vue      | 44 +++++++++++++------
 src/views/bigScreen1/component/title.vue      |  3 --
 src/views/bigScreen1/component/toDo.vue       | 44 +++++++++++++------
 src/views/order/component/adjust.vue          | 40 ++++++++++++++++-
 src/views/order/component/createDispatch.vue  | 24 +++++-----
 src/views/order/history.vue                   | 12 ++---
 7 files changed, 121 insertions(+), 54 deletions(-)

diff --git a/src/views/bigScreen1/component/detailTransfer.vue b/src/views/bigScreen1/component/detailTransfer.vue
index 916adaa..5a710cc 100644
--- a/src/views/bigScreen1/component/detailTransfer.vue
+++ b/src/views/bigScreen1/component/detailTransfer.vue
@@ -32,7 +32,6 @@
                           top: 50%;
                           right: 20px;
                           transform: translateY(-50%);
-                          width: 46px;
                         "
                         type="primary"
                         size="small"
@@ -51,14 +50,14 @@
               <tbody>
                 <tr>
                   <td>
-                    <div>
+                    <div style="padding: 0 20px;">
                       <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>
                       <div v-if="data.notice_close_time">通知关闭：{{ $moment(data.notice_close_time).format("YYYY-MM-DD HH:mm") }}</div>
                       <div v-if="data.close_time">关闭时间：{{ $moment(data.close_time).format("YYYY-MM-DD HH:mm") }}</div>
                       <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">{{ item.content }}</p>
+                        <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>-->
 <!--                        {{-->
@@ -104,6 +103,9 @@
                       <p>
                         执行状态：{{ typeMap.get(data.status) }}
                       </p>
+                      <p>
+                        开启数量：{{ data.kaiqishuliang }} / {{ data.equipment_id_equipments_id_relation.bengzhashuliang }}
+                      </p>
 
                       <div style="display:flex;">
                         <p>调令反馈：</p>
diff --git a/src/views/bigScreen1/component/doing.vue b/src/views/bigScreen1/component/doing.vue
index 3057d30..3e67b13 100644
--- a/src/views/bigScreen1/component/doing.vue
+++ b/src/views/bigScreen1/component/doing.vue
@@ -29,24 +29,32 @@
         <transition-group name="scroll-list" 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__status">
-              <template v-if="timeStatusFormat(item) === 2">
-                <div class="list-item__status-2"></div>
-                <p>【存在运行中指令】</p>
+              <template>
+                <template v-if="timeStatusFormat(item) === 2">
+                  <div class="list-item__status-2"></div>
+                  <p>【存在运行中指令】</p>
+                </template>
+                <template v-else-if="timeStatusFormat(item) === 3">
+                  <div class="list-item__status-3"></div>
+                  <p>【倒计时{{ $moment(item.end_time).diff($moment(time),'minutes') }}分钟】</p>
+                </template>
+                <template v-else-if="timeStatusFormat(item) === 4">
+                  <div class="list-item__status-4"></div>
+                  <p>【超时】</p>
+                </template>
+                <template v-else>
+
+                </template>
               </template>
-              <template v-else-if="timeStatusFormat(item) === 3">
-                <div class="list-item__status-3"></div>
-                <p>【倒计时{{ $moment(item.end_time).diff($moment(time),'minutes') }}分钟】</p>
-              </template>
-              <template v-else-if="timeStatusFormat(item) === 4">
-                <div class="list-item__status-4"></div>
-                <p>【超时】</p>
-              </template>
-              <template v-else>
-
+              <template v-if="item.id_logs_transfer_id_relation.length > 0">
+                <span style="color: #d15d52;">【调整】</span>
               </template>
             </div>
             <div class="list-item__name">
-              {{ item.equipment_id_equipments_id_relation ? item.equipment_id_equipments_id_relation.name : '' }}
+              <p>{{ item.equipment_id_equipments_id_relation ? item.equipment_id_equipments_id_relation.name : '' }}</p>
+              <div style="display: flex;align-items: center;">
+                <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>
             <div class="list-item__content">
               <el-tooltip class="item" effect="dark" :content="item.content" placement="top-start">
@@ -430,6 +438,14 @@ $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%;
       word-break: keep-all;
diff --git a/src/views/bigScreen1/component/title.vue b/src/views/bigScreen1/component/title.vue
index 951d94e..f063af5 100644
--- a/src/views/bigScreen1/component/title.vue
+++ b/src/views/bigScreen1/component/title.vue
@@ -29,9 +29,6 @@ export default {
     }
   },
   methods: {
-    dataPick (e) {
-      console.log(e)
-    },
     async getTomorrow (day) {
       this.tomorrows = (
         await index({
diff --git a/src/views/bigScreen1/component/toDo.vue b/src/views/bigScreen1/component/toDo.vue
index d7f4659..38ef43e 100644
--- a/src/views/bigScreen1/component/toDo.vue
+++ b/src/views/bigScreen1/component/toDo.vue
@@ -29,24 +29,32 @@
         <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__status">
-              <template v-if="timeStatusFormat(item) === 2">
-                <div class="list-item__status-2"></div>
-                <p>【存在运行中指令】</p>
+              <template>
+                <template v-if="timeStatusFormat(item) === 2">
+                  <div class="list-item__status-2"></div>
+                  <p>【存在运行中指令】</p>
+                </template>
+                <template v-else-if="timeStatusFormat(item) === 3">
+                  <div class="list-item__status-3"></div>
+                  <p>【倒计时{{ $moment(item.start_time).diff($moment(time),'minutes') }}分钟】</p>
+                </template>
+                <template v-else-if="timeStatusFormat(item) === 4">
+                  <div class="list-item__status-4"></div>
+                  <p>【超时】</p>
+                </template>
+                <template v-else>
+
+                </template>
               </template>
-              <template v-else-if="timeStatusFormat(item) === 3">
-                <div class="list-item__status-3"></div>
-                <p>【倒计时{{ $moment(item.start_time).diff($moment(time),'minutes') }}分钟】</p>
-              </template>
-              <template v-else-if="timeStatusFormat(item) === 4">
-                <div class="list-item__status-4"></div>
-                <p>【超时】</p>
-              </template>
-              <template v-else>
-
+              <template v-if="item.id_logs_transfer_id_relation.length > 0">
+                <span style="color: #d15d52;">【调整】</span>
               </template>
             </div>
             <div class="list-item__name">
-              {{ item.equipment_id_equipments_id_relation ? item.equipment_id_equipments_id_relation.name : '' }}
+              <p>{{ item.equipment_id_equipments_id_relation ? item.equipment_id_equipments_id_relation.name : '' }}</p>
+              <div style="display: flex;align-items: center;">
+                <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>
             <div class="list-item__content">
               <el-tooltip class="item" effect="dark" :content="item.content" placement="top-start">
@@ -450,6 +458,14 @@ $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%;
       word-break: keep-all;
diff --git a/src/views/order/component/adjust.vue b/src/views/order/component/adjust.vue
index 8f18a2a..9d9653d 100644
--- a/src/views/order/component/adjust.vue
+++ b/src/views/order/component/adjust.vue
@@ -44,6 +44,14 @@
           </div>
         </div>
       </template>
+      <template #kaiqishuliang>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label">调整数量 ：</div>
+          <div class="xy-table-item-content">
+            <el-input-number :min="0" :max="openNumberMax" controls-position="right" style="width: 300px" v-model="form.kaiqishuliang"></el-input-number>
+          </div>
+        </div>
+      </template>
     </xy-dialog>
   </div>
 </template>
@@ -75,10 +83,12 @@ export default {
       isShow: false,
       id: "",
       type: "",
+      detail: {},
 
       form: {
         content: "",
         tiaozhengleixing: "",
+        kaiqishuliang: 0
       },
       rules: {},
       originalData: "",
@@ -137,9 +147,17 @@ export default {
       const res = await show({ id: this.id, table_name: "transfers" });
       this.$integrateData(this.form, res);
       this.originalData = JSON.stringify(this.form);
+      this.detail = res;
     },
 
     submit() {
+      const leixingLabel = this.tiaozhengleixings.find(i => i.id === this.form.tiaozhengleixing)?.value
+      if (leixingLabel === '关闭') {
+        this.form.kaiqishuliang = Number(this.detail?.kaiqishuliang) - this.form.kaiqishuliang
+      } else if (leixingLabel === '新开') {
+        this.form.kaiqishuliang = Number(this.detail?.kaiqishuliang) + this.form.kaiqishuliang
+      } else {
+      }
       let updateData = JSON.stringify(this.form);
       if (this.type === "add") {
         if (this.form.hasOwnProperty("id")) {
@@ -164,11 +182,16 @@ export default {
           let nowData = JSON.parse(updateData)
           let kv = new Map([
             ['content','调令内容'],
-            ['tiaozhengleixing','调整状态']
+            ['tiaozhengleixing','调整状态'],
+            ['kaiqishuliang','调整数量'],
           ])
           let text = ""
           for (let key in nowData) {
-            text += nowData[key] === originalData[key] ? "" : (`【${kv.get(key)}】从"${this.tiaozhengleixings.find(i => i.id === originalData[key])?.value || originalData[key] || " "}"更改为"${this.tiaozhengleixings.find(i => i.id === nowData[key])?.value || nowData[key]}"` || " ")
+            if (key === 'kaiqishuliang') {
+              text += nowData[key] === originalData[key] ? "" : (`【${kv.get(key)}】从"${originalData[key] || "0"}"更改为"${nowData[key]}"` || " ")
+            } else {
+              text += nowData[key] === originalData[key] ? "" : (`【${kv.get(key)}】从"${this.tiaozhengleixings.find(i => i.id === originalData[key])?.value || originalData[key] || " "}"更改为"${this.tiaozhengleixings.find(i => i.id === nowData[key])?.value || nowData[key]}"` || " ")
+            }
           }
           save({
             table_name: "logs",
@@ -185,6 +208,19 @@ export default {
       });
     },
   },
+  computed: {
+    openNumberMax () {
+      const leixingLabel = this.tiaozhengleixings.find(i => i.id === this.form.tiaozhengleixing)?.value
+      console.log(leixingLabel)
+      if (leixingLabel === '关闭') {
+        return Number(this.detail?.kaiqishuliang) || 0
+      } else if (leixingLabel === '新开') {
+        return (Number(this.detail?.equipment_id_equipments_id_relation?.bengzhashuliang) - Number(this.detail?.kaiqishuliang)) || 0
+      } else {
+        return Number(this.detail?.equipment_id_equipments_id_relation?.bengzhashuliang) || 0
+      }
+    }
+  },
   watch: {
     isShow(val) {
       if (val) {
diff --git a/src/views/order/component/createDispatch.vue b/src/views/order/component/createDispatch.vue
index 5ab5bba..97042ef 100644
--- a/src/views/order/component/createDispatch.vue
+++ b/src/views/order/component/createDispatch.vue
@@ -52,18 +52,18 @@
         </el-checkbox-group>
       </div>
 
-      <div class="select-item">
-        <div class="select-item__title">选择类别</div>
-        <el-radio-group
-          size="small"
-          v-model="ability"
-          @input="(e) => data.forEach((i) => (i.leibie = e))"
-        >
-          <el-radio-button v-for="item in abilities" :label="item.value">{{
-            item.key
-          }}</el-radio-button>
-        </el-radio-group>
-      </div>
+<!--      <div class="select-item">-->
+<!--        <div class="select-item__title">选择类别</div>-->
+<!--        <el-radio-group-->
+<!--          size="small"-->
+<!--          v-model="ability"-->
+<!--          @input="(e) => data.forEach((i) => (i.leibie = e))"-->
+<!--        >-->
+<!--          <el-radio-button v-for="item in abilities" :label="item.value">{{-->
+<!--            item.key-->
+<!--          }}</el-radio-button>-->
+<!--        </el-radio-group>-->
+<!--      </div>-->
 
       <div class="select-item">
         <Button type="primary" style="margin-left: 10px" @click="clear"
diff --git a/src/views/order/history.vue b/src/views/order/history.vue
index 19afc4f..c645bad 100644
--- a/src/views/order/history.vue
+++ b/src/views/order/history.vue
@@ -827,12 +827,12 @@ export default {
               linkOb.customFn = (row) => {
                 if (i.edit_input === "file") {
                   return (
-                    <a
-                      download={row[link_with_name]?.original_name}
-                      href={row[link_with_name]?.url}
+                    <img
+                      style="height: 40px;"
+                      alt={row[link_with_name]?.original_name}
+                      src={row[link_with_name]?.url}
                     >
-                      {row[link_with_name]?.original_name}
-                    </a>
+                    </img>
                   );
                 } else {
                   return (
@@ -852,7 +852,7 @@ export default {
                   return (
                     <div style="display: flex;flex-direction: column;">
                       {row[link_with_name]?.map((o) => (
-                        <a>{o?.original_name || o?.name}</a>
+                        <img alt={o.original_name} src={o?.url}></img>
                       ))}
                     </div>
                   );