From 6752c64e34db7bece286435386e3fe5f4ce88fab Mon Sep 17 00:00:00 2001
From: xy <271556543@qq.com>
Date: Mon, 24 Jun 2024 10:26:52 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E4=BB=A4=E8=B0=83=E6=95=B4=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E8=B0=83=E6=95=B4=E6=97=B6=E9=97=B4=E3=80=81=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E9=80=89=E6=8B=A9=E5=92=8C=E6=9B=B4=E5=A4=9A=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E6=9F=A5=E7=9C=8B=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/order/component/adjust.vue | 76 +++++++++++++++++++++-------
 1 file changed, 58 insertions(+), 18 deletions(-)

diff --git a/src/views/order/component/adjust.vue b/src/views/order/component/adjust.vue
index fe9a27f..87c2d73 100644
--- a/src/views/order/component/adjust.vue
+++ b/src/views/order/component/adjust.vue
@@ -12,8 +12,10 @@
       <template #extraFormTop>
         <el-descriptions title="调令信息" :column="2" label-class-name="xy-table-item-label">
           <el-descriptions-item label="点位">{{ detail.equipment_id_equipments_id_relation ? detail.equipment_id_equipments_id_relation.name : "" }}</el-descriptions-item>
-          <el-descriptions-item label="泵闸总数">{{ detail.equipment_id_equipments_id_relation ? detail.equipment_id_equipments_id_relation.bengzhashuliang : "" }}</el-descriptions-item>
-          <el-descriptions-item label="开启数量">{{ detail.kaiqishuliang }}</el-descriptions-item>
+          <el-descriptions-item label="闸门总数">{{ detail.equipment_id_equipments_id_relation ? detail.equipment_id_equipments_id_relation.bengzhashuliang : "" }}</el-descriptions-item>
+          <el-descriptions-item label="水泵总数">{{ detail.equipment_id_equipments_id_relation ? detail.equipment_id_equipments_id_relation.shuibengtaishu : "" }}</el-descriptions-item>
+          <el-descriptions-item label="开启闸门数量">{{ detail.kaiqishuliang }}</el-descriptions-item>
+          <el-descriptions-item label="开启水泵数量">{{ detail.kaiqishuliang1 }}</el-descriptions-item>
           <el-descriptions-item label="开始时间">{{ $moment(detail.start_time).format("HH:mm") }}</el-descriptions-item>
           <el-descriptions-item label="结束时间">{{ $moment(detail.end_time).format("HH:mm") }}</el-descriptions-item>
           <el-descriptions-item label="类型">
@@ -43,20 +45,25 @@
         <div class="xy-table-item">
           <div class="xy-table-item-label">调整类型 ：</div>
           <div class="xy-table-item-content">
-            <el-select
-              :popper-append-to-body="false"
-              v-model="form.tiaozhengleixing"
-              clearable
-              placeholder="请选择调整类型"
-              style="width: 300px"
-            >
-              <el-option
-                v-for="item in types"
-                :key="item.id"
-                :label="item.value"
-                :value="item.id"
-              ></el-option>
-            </el-select>
+            <div style="width: 300px">
+              <el-radio-group v-model="adjustEquipmentType">
+                <el-radio :label="1">水泵</el-radio>
+                <el-radio :label="2">闸门</el-radio>
+              </el-radio-group>
+              <el-select
+                :popper-append-to-body="false"
+                v-model="form.tiaozhengleixing"
+                clearable
+                placeholder="请选择调整类型"
+              >
+                <el-option
+                  v-for="item in types"
+                  :key="item.id"
+                  :label="item.value"
+                  :value="item.id"
+                ></el-option>
+              </el-select>
+            </div>
           </div>
         </div>
       </template>
@@ -68,6 +75,35 @@
           </div>
         </div>
       </template>
+      <template #start_time>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label">开始时间 ：</div>
+          <div class="xy-table-item-content">
+            <el-date-picker
+              v-model="form.start_time"
+              type="datetime"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              placeholder="请选择开始时间"
+              style="width: 300px"
+            ></el-date-picker>
+          </div>
+        </div>
+      </template>
+      <template #end_time>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label">结束时间 ：</div>
+          <div class="xy-table-item-content">
+            <el-date-picker
+              v-model="form.end_time"
+              type="datetime"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              placeholder="请选择结束时间"
+              style="width: 300px"
+            ></el-date-picker>
+          </div>
+        </div>
+      </template>
+
     </xy-dialog>
   </div>
 </template>
@@ -81,6 +117,7 @@ export default {
   },
   data() {
     return {
+      adjustEquipmentType: 1,
       isShow: false,
       id: "",
       type: "",
@@ -89,7 +126,9 @@ export default {
       form: {
         content: "",
         tiaozhengleixing: "",
-        kaiqishuliang: 0
+        kaiqishuliang: 0,
+        start_time: "",
+        end_time: ""
       },
       rules: {},
       originalData: "",
@@ -244,7 +283,8 @@ export default {
     },
 
     equipmentType () {
-      return this.detail?.equipment_id_equipments_id_relation?.type;
+      return this.adjustEquipmentType;
+      //return this.detail?.equipment_id_equipments_id_relation?.type;
     },
 
     types () {