From 0a89ed2f8d6f63477eef37f13f48e10a353eefb3 Mon Sep 17 00:00:00 2001
From: xzt <1113240624@qq.com>
Date: Thu, 29 Feb 2024 10:24:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sluiceBaseInfo/index.vue                  | 26 ++++++++++---------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/src/views/sluice/engineeringCondition/sluiceBaseInfo/index.vue b/src/views/sluice/engineeringCondition/sluiceBaseInfo/index.vue
index e31a0b5..2ed9549 100644
--- a/src/views/sluice/engineeringCondition/sluiceBaseInfo/index.vue
+++ b/src/views/sluice/engineeringCondition/sluiceBaseInfo/index.vue
@@ -819,10 +819,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="闸门型式（可多选）" prop="gtst">
-              <el-checkbox-group v-model="form.gtst">
+            <el-form-item label="启闭机形式（可多选）" prop="machineForm">
+              <el-checkbox-group v-model="form.machineForm">
                 <el-checkbox
-                  v-for="dict in gtstOptions"
+                  v-for="dict in machineFormOptions"
                   :key="dict.dictValue"
                   :label="dict.dictValue"
                 >
@@ -832,10 +832,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="启闭机形式（可多选）" prop="machineForm">
-              <el-checkbox-group v-model="form.machineForm">
+            <el-form-item label="消能方式（可多选）" prop="endsst">
+              <el-checkbox-group v-model="form.endsst">
                 <el-checkbox
-                  v-for="dict in machineFormOptions"
+                  v-for="dict in endsstOptions"
                   :key="dict.dictValue"
                   :label="dict.dictValue"
                 >
@@ -844,11 +844,11 @@
               </el-checkbox-group>
             </el-form-item>
           </el-col>
-          <el-col :span="8">
-            <el-form-item label="消能方式（可多选）" prop="endsst">
-              <el-checkbox-group v-model="form.endsst">
+          <el-col :span="24">
+            <el-form-item label="闸门型式（可多选）" prop="gtst">
+              <el-checkbox-group v-model="form.gtst">
                 <el-checkbox
-                  v-for="dict in endsstOptions"
+                  v-for="dict in gtstOptions"
                   :key="dict.dictValue"
                   :label="dict.dictValue"
                 >
@@ -857,6 +857,7 @@
               </el-checkbox-group>
             </el-form-item>
           </el-col>
+
           <el-col :span="8">
             <el-form-item label="自动化控制（可多选）" prop="automationControl">
               <el-checkbox-group v-model="form.automationControl">
@@ -1264,8 +1265,9 @@ export default {
     },
     // 取消按钮
     cancel() {
-      this.open = false;
-      this.reset();
+      // this.open = false;
+      // this.reset();
+      this.$router.back();
     },
     // 表单重置
     reset() {