From 1a724466d4af5d278750b37421acfa15c0354505 Mon Sep 17 00:00:00 2001
From: xy <271556543@qq.com>
Date: Wed, 25 Dec 2024 11:32:43 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                                    |  1 +
 src/const/addProps.js                         |  2 +-
 src/utils/request.js                          |  2 +-
 .../bigScreen1/component/detailTransfer.vue   | 13 +++---
 src/views/bigScreen1/component/tomorrow.vue   |  2 +-
 src/views/component/dialog.vue                |  2 +-
 src/views/order/component/adjust.vue          | 41 ++++++++++---------
 src/views/order/component/dispatchList.vue    |  8 +++-
 src/views/order/component/quickCreate.vue     |  9 ++--
 src/views/order/orderPlan.vue                 |  2 +-
 10 files changed, 49 insertions(+), 33 deletions(-)

diff --git a/.gitignore b/.gitignore
index 9ad28d2..feaeb97 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,4 @@ tests/**/coverage/
 *.ntvs*
 *.njsproj
 *.sln
+/.VSCodeCounter/
diff --git a/src/const/addProps.js b/src/const/addProps.js
index edd8a70..4cf83cf 100644
--- a/src/const/addProps.js
+++ b/src/const/addProps.js
@@ -20,7 +20,7 @@ export const addPropsMap = new Map([
   ["datetime", {
     type: 'datetime',
     clearable: true,
-    valueFormat: 'yyyy-MM-dd mm:hh:ss',
+    valueFormat: 'yyyy-MM-dd HH:mm',
     pickerOptions: {
       shortcuts: [{
         text: '今天',
diff --git a/src/utils/request.js b/src/utils/request.js
index ab840ea..315dcd4 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -14,7 +14,7 @@ let loading ;
 const service = axios.create({
   baseURL: process.env.VUE_APP_BASE_API, // url = base url + request url
   // withCredentials: true, // send cookies when cross-domain requests
-  timeout: 5000, // request timeout
+  timeout: 10000, // request timeout
   isLoading:true
 })
 
diff --git a/src/views/bigScreen1/component/detailTransfer.vue b/src/views/bigScreen1/component/detailTransfer.vue
index 0f8b8c4..9a2c035 100644
--- a/src/views/bigScreen1/component/detailTransfer.vue
+++ b/src/views/bigScreen1/component/detailTransfer.vue
@@ -50,21 +50,20 @@
               <tbody>
                 <tr>
                   <td>
-                    <div style="padding: 0 20px;overflow-y: scroll;max-height: 19vh;">
+                    <div style="padding: 10px;display: flex;flex-direction: column;justify-content: center;width: 100%;height: 100%;overflow-y: scroll;line-height: 2;">
                       <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" style="text-align: left;margin-top: 10px;">{{ $moment(item.created_at).format("YYYY-MM-DD HH:mm") }}{{ item.content }}</p>
-                      </div>
+                      <template v-if="data.id_logs_transfer_id_relation instanceof Array && data.id_logs_transfer_id_relation.length > 0">
+                        <div v-for="item in data.id_logs_transfer_id_relation" style="text-align: left;margin-top: 10px;">{{ item.created_at }}{{ item.content }}</div>
+                      </template>
                     </div>
                   </td>
                   <td>
                     <div
                       style="
-                        max-height: 19vh;
                         overflow-y: scroll;
                         line-height: 2;
                         text-align: left;
@@ -647,6 +646,7 @@ $height: 74vh;
     color: #333;
     text-align: center;
     border-collapse: collapse;
+    table-layout: fixed;
     font-size: 1.3rem;
     width: 100%;
     height: 100%;
@@ -664,6 +664,9 @@ $height: 74vh;
         border-bottom: none;
       }
     }
+    td {
+      height: 10vh;
+    }
   }
 
   .sign-container {
diff --git a/src/views/bigScreen1/component/tomorrow.vue b/src/views/bigScreen1/component/tomorrow.vue
index 587d208..b2fffe9 100644
--- a/src/views/bigScreen1/component/tomorrow.vue
+++ b/src/views/bigScreen1/component/tomorrow.vue
@@ -4,7 +4,7 @@
                :modal="false"
                :visible.sync="drawer"
                direction="rtl"
-               size="76%">
+               size="80%">
       <div class="container">
         <div class="header">
           <p>明日调令</p>
diff --git a/src/views/component/dialog.vue b/src/views/component/dialog.vue
index 3bd6099..73da543 100644
--- a/src/views/component/dialog.vue
+++ b/src/views/component/dialog.vue
@@ -639,7 +639,7 @@ export default {
         });
         document.documentElement.style.setProperty(
           "--column-num",
-          Math.floor(newVal.length / 8).toString()
+          '2'
         );
       },
       //immediate: true,
diff --git a/src/views/order/component/adjust.vue b/src/views/order/component/adjust.vue
index dc59f2f..c6c40e6 100644
--- a/src/views/order/component/adjust.vue
+++ b/src/views/order/component/adjust.vue
@@ -64,6 +64,7 @@
                   :label="item.value"
                   :value="item.id"
                 ></el-option>
+                <el-option label="其他" value=""></el-option>
               </el-select>
             </div>
           </div>
@@ -84,7 +85,7 @@
             <el-date-picker
               v-model="form.start_time"
               type="datetime"
-              value-format="yyyy-MM-dd HH:mm:ss"
+              value-format="yyyy-MM-dd HH:mm"
               placeholder="请选择开始时间"
               style="width: 300px"
             ></el-date-picker>
@@ -98,7 +99,7 @@
             <el-date-picker
               v-model="form.end_time"
               type="datetime"
-              value-format="yyyy-MM-dd HH:mm:ss"
+              value-format="yyyy-MM-dd HH:mm"
               placeholder="请选择结束时间"
               style="width: 300px"
             ></el-date-picker>
@@ -200,20 +201,22 @@ export default {
     },
 
     submit() {
-      if (this.form.tiaozhengleixing === "" || this.form.tiaozhengleixing === undefined) {
-        this.$message({
-          message: "请选择类型",
-          type: "warning"
-        })
-        return
-      }
+      // 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.equipmentType === 1 ? (this.form.kaiqishuliang1 = Number(this.detail?.kaiqishuliang1) - Number(this.kaiqishuliang)) : (this.form.kaiqishuliang = Number(this.detail?.kaiqishuliang) - Number(this.kaiqishuliang))
-      } else if (leixingLabel === 1) {
-        this.equipmentType === 1 ? (this.form.kaiqishuliang1 = Number(this.detail?.kaiqishuliang1) + Number(this.kaiqishuliang)) : (this.form.kaiqishuliang = Number(this.detail?.kaiqishuliang) + Number(this.kaiqishuliang))
-      } else {
-        this.equipmentType === 1 ? this.form.kaiqishuliang1 = 0 : this.form.kaiqishuliang = 0;
+      if (leixingLabel) {
+        if (leixingLabel === 0) {
+          this.equipmentType === 1 ? (this.form.kaiqishuliang1 = Number(this.detail?.kaiqishuliang1) - Number(this.kaiqishuliang)) : (this.form.kaiqishuliang = Number(this.detail?.kaiqishuliang) - Number(this.kaiqishuliang))
+        } else if (leixingLabel === 1) {
+          this.equipmentType === 1 ? (this.form.kaiqishuliang1 = Number(this.detail?.kaiqishuliang1) + Number(this.kaiqishuliang)) : (this.form.kaiqishuliang = Number(this.detail?.kaiqishuliang) + Number(this.kaiqishuliang))
+        } else {
+          this.equipmentType === 1 ? this.form.kaiqishuliang1 = 0 : this.form.kaiqishuliang = 0;
+        }
       }
       let updateData = JSON.stringify(this.form);
       let text = ""
@@ -241,11 +244,12 @@ export default {
       this.form.id_logs_transfer_id_relation = this.detail.id_logs_transfer_id_relation.map(i => ({
         transfer_id: i.transfer_id,
         content: i.content,
-        created_at: this.$moment().format("YYYY-MM-DD HH:mm:ss")
+        created_at: i.created_at
       }))
       this.form.id_logs_transfer_id_relation.push({
         transfer_id: this.detail.id,
-        content: text
+        content: text,
+        created_at: this.$moment().format('YYYY-MM-DD')
       })
       for (let key in this.detail) {
         if (/_relation|_at/g.test(key)) {
@@ -263,8 +267,7 @@ export default {
           save({
             table_name: "logs",
             transfer_id: this.getId(),
-            content: text,
-            created_at: this.$moment().format("YYYY-MM-DD HH:mm:ss")
+            content: text
           },false)
         }
         this.$message({
diff --git a/src/views/order/component/dispatchList.vue b/src/views/order/component/dispatchList.vue
index fe2f1ed..b590408 100644
--- a/src/views/order/component/dispatchList.vue
+++ b/src/views/order/component/dispatchList.vue
@@ -59,7 +59,7 @@
       :table-name="customForm.tableName"
       :form-info="form"
       ref="dialog"
-      @refresh="$refs['xyTable'].getTableData()"
+      @refresh="getDispatches"
     >
     </dialoger>
   </div>
@@ -135,6 +135,12 @@ export default {
           width: 54,
           type: "selection"
         },
+        {
+          width: 50,
+          type: "index",
+          title: " ",
+          align: 'center'
+        },
         {
           width: 100,
           title: "序号",
diff --git a/src/views/order/component/quickCreate.vue b/src/views/order/component/quickCreate.vue
index f29d5e2..22380fe 100644
--- a/src/views/order/component/quickCreate.vue
+++ b/src/views/order/component/quickCreate.vue
@@ -209,13 +209,14 @@ export default {
             this.data.push({
               no: uid,
               equipment_id: this.equipments.find(i => i.name === dataArr[0])?.id,
-              start_time: `${this.$moment().format('YYYY-MM-DD')} ${dataArr[1]}`,
-              end_time: `${this.$moment().format('YYYY-MM-DD')} ${dataArr[2]}`,
+              start_time: `${dataArr[1]}`,
+              end_time: `${dataArr[2]}`,
               content: dataArr[3] || '',
               level: 1,
               status: 1
             })
           })
+          console.log(this.data)
         }
       }).catch(_ => {})
     },
@@ -225,7 +226,9 @@ export default {
       let promiseAll = this.data.map(form => {
         return save({
           table_name: 'transfers',
-          ...form
+          ...form,
+          start_time: `${this.$moment().format('YYYY-MM-DD')} ${form.start_time}`,
+          end_time: `${this.$moment().format('YYYY-MM-DD')} ${form.end_time}`,
         },false)
       })
       let loadingInstance = this.$loading({
diff --git a/src/views/order/orderPlan.vue b/src/views/order/orderPlan.vue
index 55de812..6026a0a 100644
--- a/src/views/order/orderPlan.vue
+++ b/src/views/order/orderPlan.vue
@@ -76,7 +76,7 @@
           <!--          <span>3×5m3/s</span>-->
           <!--        </template>-->
           <!--      </el-table-column>-->
-          <el-table-column :label="weekRange[i]" header-align="center" v-for="(n,i) in 6">
+          <el-table-column :label="weekRange[i]" header-align="center" v-for="(n,i) in 7">
             <el-table-column prop="x1" :label="weekName[i]" min-width="220" header-align="center">
               <template #default="{ row }">
                 <div>