逻辑调令1

src/views/bigScreen1/component/detailTransfer.vue

@@ -440,6 +440,11 @@ export default {
               },
               false
             ).then((_) => {
+              save({
+                table_name: "logs",
+                content: this.typeMap.get(copyData.status),
+                transfer_id: copyData.id
+              })
               this.setPTransferStatus(copyData.status).then(_ => {
                 this.$emit("refresh");
                 this.$emit('start');
@@ -496,6 +501,12 @@ export default {
           table_name: "transfers",
           ...copyData,
         },false).then((_) => {
+          save({
+            table_name: "logs",
+            content: this.typeMap.get(copyData.status),
+            transfer_id: copyData.id,
+            file_id: fileInfo?.data?.id
+          })
           this.$emit("refresh");
         });
       }
@@ -532,6 +543,12 @@ export default {
           table_name: "transfers",
           ...copyData,
         },false).then((_) => {
+          save({
+            table_name: "logs",
+            content: this.typeMap.get(copyData.status),
+            transfer_id: copyData.id,
+            file_id: fileInfo?.data?.id
+          })
           this.setPTransferStatus(copyData.status).then(_ => {
             this.$emit("refresh");
             this.$emit('start');
@@ -567,10 +584,21 @@ export default {
             delete copyData[key];
           }
         }
+        if (this.data.diaolingleixing === 4) {
+          if (this.$moment().valueOf() > this.$moment(this.data.end_time).valueOf()) {
+            copyData.status = 3;
+          }
+        }
         save({
           table_name: "transfers",
           ...copyData,
         },false).then((_) => {
+          save({
+            table_name: "logs",
+            content: this.typeMap.get(copyData.status),
+            transfer_id: copyData.id,
+            file_id: fileInfo?.data?.id
+          })
           this.setPTransferStatus(copyData.status).then(_ => {
             this.$emit("refresh");
             this.$emit('start');

src/views/bigScreen1/component/toDo.vue

@@ -59,11 +59,11 @@
                 <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>
+                <p style="zoom:.85;padding-right: 2px;">闸门</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>
               </div>
               <div style="display: flex;align-items: center;">
-                <p style="zoom:.85;">水泵</p>
+                <p style="zoom:.85;padding-right: 2px;">水泵</p>
                 <div class="list-item__number" v-for="(i,index) in Number(item.equipment_id_equipments_id_relation.shuibengtaishu || 0)" :style="index >= item.kaiqishuliang1 ? 'background: red;' : ''"></div>
               </div>
             </div>