From 14b29c3e4f84ca25c6e9c83aefe1a06c5acf16cd Mon Sep 17 00:00:00 2001
From: xzt <1113240624@qq.com>
Date: Wed, 31 Jan 2024 13:36:52 +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

---
 .../dykeCompare/components/basePage.vue       |   2 +-
 .../components/projectManagement.vue          |   2 +-
 .../dyke/dykeCompare/components/basePage.vue  |   2 +-
 .../components/projectManagement.vue          |   2 +-
 .../baseInfo/sluice/sluiceBaseInfo/index.vue  |   3 +-
 .../sluiceCompare/components/basePage.vue     |   2 +-
 .../components/projectManagement.vue          |   2 +-
 .../sluice/index.vue                          |   2 +-
 .../declare/components/listPage/index.vue     |   8 +-
 .../declare/components/listPage/transform.vue |  27 +-
 .../components/listPage/options/basePage.vue  |  32 +-
 .../listPage/options/designParameter.vue      |   6 +-
 .../listPage/options/dischargeCapacity.vue    |   6 +-
 .../options/electromechanicalEquipment.vue    |   6 +-
 .../listPage/options/engineeringBenefit.vue   |   6 +-
 .../options/hydrologicalCharacteristics.vue   |   6 +-
 .../components/listPage/options/index.vue     |  13 +
 .../listPage/options/managementSystemFxzz.vue |   4 +-
 .../listPage/options/managementSystemFzr.vue  |   2 +-
 .../examine/components/listPage/transform.vue |   6 +-
 .../sluice/components/listBaseInfo_em.vue     |   2 +-
 .../components/listSafetyDetection_em.vue     |   2 +-
 .../safetyAppraisal/sluice/list.vue           |  19 +-
 .../sluiceCompare/components/basePage.vue     |   2 +-
 .../components/projectManagement.vue          |   2 +-
 src/views/system/dept/index.vue               | 319 +++++++++++-------
 26 files changed, 297 insertions(+), 188 deletions(-)

diff --git a/src/views/dyke/engineeringCondition/dykeCompare/components/basePage.vue b/src/views/dyke/engineeringCondition/dykeCompare/components/basePage.vue
index 0f07cdf..5a67909 100644
--- a/src/views/dyke/engineeringCondition/dykeCompare/components/basePage.vue
+++ b/src/views/dyke/engineeringCondition/dykeCompare/components/basePage.vue
@@ -24,7 +24,7 @@
         width: '120px',
         height: '50px',
       }"
-      :contentStyle="{}"
+      :contentStyle="{ minWidth: '350px' }"
       ref="descriptions"
     >
       <el-descriptions-item :contentClassName="isDiff('dikeName')">
diff --git a/src/views/dyke/engineeringCondition/dykeCompare/components/projectManagement.vue b/src/views/dyke/engineeringCondition/dykeCompare/components/projectManagement.vue
index c9d4301..08be913 100644
--- a/src/views/dyke/engineeringCondition/dykeCompare/components/projectManagement.vue
+++ b/src/views/dyke/engineeringCondition/dykeCompare/components/projectManagement.vue
@@ -24,7 +24,7 @@
         width: '120px',
         height: '50px',
       }"
-      :contentStyle="{}"
+      :contentStyle="{ minWidth: '350px' }"
     >
       <el-descriptions-item
         :contentClassName="isDiff('engineeringManagementUnit')"
diff --git a/src/views/engineeringCondition/baseInfo/dyke/dykeCompare/components/basePage.vue b/src/views/engineeringCondition/baseInfo/dyke/dykeCompare/components/basePage.vue
index 0f07cdf..5a67909 100644
--- a/src/views/engineeringCondition/baseInfo/dyke/dykeCompare/components/basePage.vue
+++ b/src/views/engineeringCondition/baseInfo/dyke/dykeCompare/components/basePage.vue
@@ -24,7 +24,7 @@
         width: '120px',
         height: '50px',
       }"
-      :contentStyle="{}"
+      :contentStyle="{ minWidth: '350px' }"
       ref="descriptions"
     >
       <el-descriptions-item :contentClassName="isDiff('dikeName')">
diff --git a/src/views/engineeringCondition/baseInfo/dyke/dykeCompare/components/projectManagement.vue b/src/views/engineeringCondition/baseInfo/dyke/dykeCompare/components/projectManagement.vue
index c9d4301..08be913 100644
--- a/src/views/engineeringCondition/baseInfo/dyke/dykeCompare/components/projectManagement.vue
+++ b/src/views/engineeringCondition/baseInfo/dyke/dykeCompare/components/projectManagement.vue
@@ -24,7 +24,7 @@
         width: '120px',
         height: '50px',
       }"
-      :contentStyle="{}"
+      :contentStyle="{ minWidth: '350px' }"
     >
       <el-descriptions-item
         :contentClassName="isDiff('engineeringManagementUnit')"
diff --git a/src/views/engineeringCondition/baseInfo/sluice/sluiceBaseInfo/index.vue b/src/views/engineeringCondition/baseInfo/sluice/sluiceBaseInfo/index.vue
index abec67a..e935b43 100644
--- a/src/views/engineeringCondition/baseInfo/sluice/sluiceBaseInfo/index.vue
+++ b/src/views/engineeringCondition/baseInfo/sluice/sluiceBaseInfo/index.vue
@@ -436,7 +436,7 @@
           label-position="top"
         >
           <el-col :span="8">
-            <el-form-item label="水闸名称" prop="wagaName">
+            <el-form-item label="水闸名称" prop="wagaName" >
               <el-input v-model="form.wagaName" placeholder="请输入水闸名称" />
             </el-form-item>
           </el-col>
@@ -1021,6 +1021,7 @@ export default {
       rules: {
         wagaName: [
           { required: true, message: "请输入水闸名称", trigger: "blur" },
+          { max:250, message: "字符长度最大为250", trigger: "blur" },
         ],
         wagaCode: [
           { required: true, message: "请输入水闸编码", trigger: "blur" },
diff --git a/src/views/engineeringCondition/baseInfo/sluice/sluiceCompare/components/basePage.vue b/src/views/engineeringCondition/baseInfo/sluice/sluiceCompare/components/basePage.vue
index 6ab166e..037e981 100644
--- a/src/views/engineeringCondition/baseInfo/sluice/sluiceCompare/components/basePage.vue
+++ b/src/views/engineeringCondition/baseInfo/sluice/sluiceCompare/components/basePage.vue
@@ -24,7 +24,7 @@
         width: '120px',
         height: '50px',
       }"
-      :contentStyle="{}"
+      :contentStyle="{ minWidth: '350px' }"
       ref="descriptions"
     >
       <el-descriptions-item :contentClassName="isDiff('wagaName')">
diff --git a/src/views/engineeringCondition/baseInfo/sluice/sluiceCompare/components/projectManagement.vue b/src/views/engineeringCondition/baseInfo/sluice/sluiceCompare/components/projectManagement.vue
index fa447cd..59aea56 100644
--- a/src/views/engineeringCondition/baseInfo/sluice/sluiceCompare/components/projectManagement.vue
+++ b/src/views/engineeringCondition/baseInfo/sluice/sluiceCompare/components/projectManagement.vue
@@ -24,7 +24,7 @@
         width: '120px',
         height: '50px',
       }"
-      :contentStyle="{}"
+      :contentStyle="{ minWidth: '350px' }"
     >
       <el-descriptions-item
         :contentClassName="isDiff('engineeringManagementUnit')"
diff --git a/src/views/safetyManage/confirmDelimitationManage/sluice/index.vue b/src/views/safetyManage/confirmDelimitationManage/sluice/index.vue
index 9c0b871..9542e78 100644
--- a/src/views/safetyManage/confirmDelimitationManage/sluice/index.vue
+++ b/src/views/safetyManage/confirmDelimitationManage/sluice/index.vue
@@ -298,7 +298,7 @@
           width: '180px',
           height: '50px',
         }"
-        :contentStyle="{}"
+        :contentStyle="{ minWidth: '350px' }"
       >
         <el-descriptions-item>
           <template slot="label"> 工程功能 </template>
diff --git a/src/views/safetyManage/declarationManage/sluice/declare/components/listPage/index.vue b/src/views/safetyManage/declarationManage/sluice/declare/components/listPage/index.vue
index c3a48bf..ae691d0 100644
--- a/src/views/safetyManage/declarationManage/sluice/declare/components/listPage/index.vue
+++ b/src/views/safetyManage/declarationManage/sluice/declare/components/listPage/index.vue
@@ -64,7 +64,7 @@
           size="mini"
           @click="handleAdd"
           v-hasPermi="['yg:jbxx:add']"
-          >申报</el-button
+          >登记</el-button
         >
       </el-col>
       <el-col :span="1.5">
@@ -622,7 +622,7 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <!-- <el-col :span="12">
             <el-form-item label="安全鉴定状态">
               <el-radio-group v-model="form.securityStatus">
                 <el-radio
@@ -633,7 +633,7 @@
                 >
               </el-radio-group>
             </el-form-item>
-          </el-col>
+          </el-col> -->
         </el-form>
       </el-row>
       <div slot="footer" class="dialog-footer">
@@ -848,6 +848,8 @@ export default {
       this.djOpen = true;
       setTimeout(() => {
         this.$refs.transform.inFo = row;
+        console.log("this.$refs.transform.inFo", this.$refs.transform.inFo);
+
         this.$refs.transform.open = this.djOpen;
         this.$refs.transform.title = "换证信息";
       }, 0);
diff --git a/src/views/safetyManage/declarationManage/sluice/declare/components/listPage/transform.vue b/src/views/safetyManage/declarationManage/sluice/declare/components/listPage/transform.vue
index 2526dff..8e69d78 100644
--- a/src/views/safetyManage/declarationManage/sluice/declare/components/listPage/transform.vue
+++ b/src/views/safetyManage/declarationManage/sluice/declare/components/listPage/transform.vue
@@ -116,15 +116,6 @@
               </el-date-picker>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
-            <el-form-item label="所管部门" prop="departmentManagement">
-              <el-input
-                v-model="form.departmentManagement"
-                placeholder="请输入所管部门"
-              />
-            </el-form-item>
-          </el-col>
-
           <el-col :span="12">
             <el-form-item label="原安全类别" prop="securityCategory">
               <el-select
@@ -142,6 +133,14 @@
               </el-select>
             </el-form-item>
           </el-col>
+          <el-col :span="12">
+            <el-form-item label="所管部门" prop="departmentManagement">
+              <el-input
+                v-model="form.departmentManagement"
+                placeholder="请输入所管部门"
+              />
+            </el-form-item>
+          </el-col>
           <el-col :span="12">
             <el-form-item label="变更后安全类别" prop="securityCategoryNow">
               <!-- <el-input
@@ -441,6 +440,7 @@ export default {
     getList() {
       this.loading = true;
       this.queryParams.data.wagaId = this.inFo.id;
+      console.log(111, this.inFo);
       listHzxx(this.queryParams).then((response) => {
         if (response.records[0]) {
           this.form = response.records[0];
@@ -458,6 +458,15 @@ export default {
           if (this.form.securityCategoryAttachment) {
             this.fileList2 = JSON.parse(this.form.securityCategoryAttachment);
           }
+        } else {
+          this.form.wagaName = this.inFo.wagaName;
+          this.form.wagaCode = this.inFo.wagaCode;
+          this.form.wagaType = this.inFo.wagaType;
+          this.form.adcd = this.inFo.adcd;
+          this.form.engScal = this.inFo.engScal;
+          this.form.wagaUse = this.inFo.wagaUse;
+          this.form.completionTime = this.inFo.compDate;
+          this.form.securityCategory = this.inFo.securityCategory;
         }
         console.log("☃☃登记表单信息☃☃", this.form);
         // this.total = response.total;
diff --git a/src/views/safetyManage/declarationManage/sluice/examine/components/listPage/options/basePage.vue b/src/views/safetyManage/declarationManage/sluice/examine/components/listPage/options/basePage.vue
index d786782..2b7aa85 100644
--- a/src/views/safetyManage/declarationManage/sluice/examine/components/listPage/options/basePage.vue
+++ b/src/views/safetyManage/declarationManage/sluice/examine/components/listPage/options/basePage.vue
@@ -9,7 +9,7 @@
         width: '180px',
         height: '50px',
       }"
-      :contentStyle="{}"
+      :contentStyle="{ minWidth: '350px' }"
     >
       <el-descriptions-item>
         <template slot="label"> 水闸名称 </template>
@@ -98,7 +98,7 @@
       </el-descriptions-item>
       <el-descriptions-item>
         <template slot="label"> 观测项目 </template>
-        {{ this.form.observationProject }}
+        {{ observationProjectFormat(this.form) }}
       </el-descriptions-item>
       <el-descriptions-item>
         <template slot="label"> 水准基面 </template>
@@ -108,14 +108,6 @@
         <template slot="label"> 水闸概况 </template>
         {{ this.form.sluiceOverview }}
       </el-descriptions-item>
-      <el-descriptions-item>
-        <template slot="label"> 观测项目 </template>
-        {{ this.form.observationProject }}
-      </el-descriptions-item>
-      <el-descriptions-item>
-        <template slot="label"> 观测项目 </template>
-        {{ this.form.observationProject }}
-      </el-descriptions-item>
       <el-descriptions-item>
         <template slot="label"> 安全类别 </template>
         {{ securityCategoryFormat(this.form) }}
@@ -128,8 +120,8 @@
     </el-descriptions>
 
     <div class="btnList">
-      <el-button type="primary" @click="submitForm">确 定</el-button>
-      <el-button @click="cancel">取 消</el-button>
+      <el-button type="primary" @click="pass">通 过</el-button>
+      <el-button @click="noPass">不通过</el-button>
     </div>
   </div>
 </template>
@@ -315,6 +307,12 @@ export default {
     });
   },
   methods: {
+    pass() {
+      console.log("审核通过");
+    },
+    noPass() {
+      console.log("审核不通过");
+    },
     getTreeData() {
       getAreasData().then((items) => {
         // console.log("getAreasData", items.data);
@@ -381,6 +379,14 @@ export default {
     isGateProjectFormat(row, column) {
       return this.selectDictLabel(this.isGateProjectOptions, row.isGateProject);
     },
+    // 观测项目字典翻译
+    observationProjectFormat(row, column) {
+      return this.selectDictLabel(
+        this.observationProjectOptions,
+        row.observationProject
+      );
+    },
+
     // 安全类别字典翻译
     securityCategoryFormat(row, column) {
       return this.selectDictLabel(
@@ -443,7 +449,7 @@ export default {
 
     /** 提交按钮 */
     submitForm() {
-      console.log("审核");
+      console.log("审核通过");
       // this.$refs["form"].validate((valid) => {
       //   if (valid) {
       //     if (this.form.id != null) {
diff --git a/src/views/safetyManage/declarationManage/sluice/examine/components/listPage/options/designParameter.vue b/src/views/safetyManage/declarationManage/sluice/examine/components/listPage/options/designParameter.vue
index a2b6c61..04d53b8 100644
--- a/src/views/safetyManage/declarationManage/sluice/examine/components/listPage/options/designParameter.vue
+++ b/src/views/safetyManage/declarationManage/sluice/examine/components/listPage/options/designParameter.vue
@@ -9,7 +9,7 @@
         width: '180px',
         height: '50px',
       }"
-      :contentStyle="{}"
+      :contentStyle="{ minWidth: '350px' }"
     >
       <el-descriptions-item>
         <template slot="label"> 闸基地质条件 </template>
@@ -103,10 +103,10 @@
       </el-descriptions-item>
     </el-descriptions>
 
-    <div class="btnList">
+    <!-- <div class="btnList">
       <el-button type="primary" @click="submitForm">保 存</el-button>
       <el-button @click="cancel">取 消</el-button>
-    </div>
+    </div> -->
   </div>
 </template>
 
diff --git a/src/views/safetyManage/declarationManage/sluice/examine/components/listPage/options/dischargeCapacity.vue b/src/views/safetyManage/declarationManage/sluice/examine/components/listPage/options/dischargeCapacity.vue
index fb64ff3..699cf5d 100644
--- a/src/views/safetyManage/declarationManage/sluice/examine/components/listPage/options/dischargeCapacity.vue
+++ b/src/views/safetyManage/declarationManage/sluice/examine/components/listPage/options/dischargeCapacity.vue
@@ -9,7 +9,7 @@
         width: '180px',
         height: '50px',
       }"
-      :contentStyle="{}"
+      :contentStyle="{ minWidth: '350px' }"
     >
       <el-descriptions-item>
         <template slot="label"> 闸上水位 </template>
@@ -38,10 +38,10 @@
       </el-descriptions-item>
     </el-descriptions>
 
-    <div class="btnList">
+    <!-- <div class="btnList">
       <el-button type="primary" @click="submitForm">保 存</el-button>
       <el-button @click="cancel">取 消</el-button>
-    </div>
+    </div> -->
   </div>
 </template>
 
diff --git a/src/views/safetyManage/declarationManage/sluice/examine/components/listPage/options/electromechanicalEquipment.vue b/src/views/safetyManage/declarationManage/sluice/examine/components/listPage/options/electromechanicalEquipment.vue
index d216c18..ae1c84a 100644
--- a/src/views/safetyManage/declarationManage/sluice/examine/components/listPage/options/electromechanicalEquipment.vue
+++ b/src/views/safetyManage/declarationManage/sluice/examine/components/listPage/options/electromechanicalEquipment.vue
@@ -9,7 +9,7 @@
         width: '180px',
         height: '50px',
       }"
-      :contentStyle="{}"
+      :contentStyle="{ minWidth: '350px' }"
     >
       <el-descriptions-item>
         <template slot="label"> 启闭设备 </template>
@@ -59,10 +59,10 @@
       </el-descriptions-item>
     </el-descriptions>
 
-    <div class="btnList">
+    <!-- <div class="btnList">
       <el-button type="primary" @click="submitForm">保 存</el-button>
       <el-button @click="cancel">取 消</el-button>
-    </div>
+    </div> -->
   </div>
 </template>
 
diff --git a/src/views/safetyManage/declarationManage/sluice/examine/components/listPage/options/engineeringBenefit.vue b/src/views/safetyManage/declarationManage/sluice/examine/components/listPage/options/engineeringBenefit.vue
index 3a5605d..4a2a5ac 100644
--- a/src/views/safetyManage/declarationManage/sluice/examine/components/listPage/options/engineeringBenefit.vue
+++ b/src/views/safetyManage/declarationManage/sluice/examine/components/listPage/options/engineeringBenefit.vue
@@ -9,7 +9,7 @@
         width: '180px',
         height: '50px',
       }"
-      :contentStyle="{}"
+      :contentStyle="{ minWidth: '350px' }"
     >
       <el-descriptions-item>
         <template slot="label"> 设计灌溉面积（m²） </template>
@@ -38,10 +38,10 @@
       </el-descriptions-item>
     </el-descriptions>
 
-    <div class="btnList">
+    <!-- <div class="btnList">
       <el-button type="primary" @click="submitForm">保 存</el-button>
       <el-button @click="cancel">取 消</el-button>
-    </div>
+    </div> -->
   </div>
 </template>
 
diff --git a/src/views/safetyManage/declarationManage/sluice/examine/components/listPage/options/hydrologicalCharacteristics.vue b/src/views/safetyManage/declarationManage/sluice/examine/components/listPage/options/hydrologicalCharacteristics.vue
index 52aa810..1f24362 100644
--- a/src/views/safetyManage/declarationManage/sluice/examine/components/listPage/options/hydrologicalCharacteristics.vue
+++ b/src/views/safetyManage/declarationManage/sluice/examine/components/listPage/options/hydrologicalCharacteristics.vue
@@ -9,7 +9,7 @@
         width: '180px',
         height: '50px',
       }"
-      :contentStyle="{}"
+      :contentStyle="{ minWidth: '350px' }"
     >
       <el-descriptions-item>
         <template slot="label"> 河道宽度（m） </template>
@@ -74,10 +74,10 @@
       </el-descriptions-item>
     </el-descriptions>
 
-    <div class="btnList">
+    <!-- <div class="btnList">
       <el-button type="primary" @click="submitForm">保 存</el-button>
       <el-button @click="cancel">取 消</el-button>
-    </div>
+    </div> -->
   </div>
 </template>
 
diff --git a/src/views/safetyManage/declarationManage/sluice/examine/components/listPage/options/index.vue b/src/views/safetyManage/declarationManage/sluice/examine/components/listPage/options/index.vue
index ac21449..8621f11 100644
--- a/src/views/safetyManage/declarationManage/sluice/examine/components/listPage/options/index.vue
+++ b/src/views/safetyManage/declarationManage/sluice/examine/components/listPage/options/index.vue
@@ -74,6 +74,10 @@
       >
         <engineeringBenefit />
       </el-tab-pane>
+      <!-- <div class="btnList">
+        <el-button type="primary" @click="pass">通 过</el-button>
+        <el-button @click="noPass">不通过</el-button>
+      </div> -->
     </el-tabs>
   </div>
 </template>
@@ -116,6 +120,12 @@ export default {
     this.getList();
   },
   methods: {
+    pass() {
+      console.log("审核通过");
+    },
+    noPass() {
+      console.log("审核不通过");
+    },
     goBack() {
       this.$router.back();
     },
@@ -147,4 +157,7 @@ export default {
   justify-content: space-between;
   margin-bottom: 20px;
 }
+.btnList {
+  text-align: right;
+}
 </style>
diff --git a/src/views/safetyManage/declarationManage/sluice/examine/components/listPage/options/managementSystemFxzz.vue b/src/views/safetyManage/declarationManage/sluice/examine/components/listPage/options/managementSystemFxzz.vue
index a3e9727..43d8703 100644
--- a/src/views/safetyManage/declarationManage/sluice/examine/components/listPage/options/managementSystemFxzz.vue
+++ b/src/views/safetyManage/declarationManage/sluice/examine/components/listPage/options/managementSystemFxzz.vue
@@ -237,7 +237,7 @@
           width: '180px',
           height: '50px',
         }"
-        :contentStyle="{}"
+        :contentStyle="{ minWidth: '350px' }"
       >
         <el-descriptions-item>
           <template slot="label"> 组织名称 </template>
@@ -311,7 +311,7 @@
           width: '180px',
           height: '50px',
         }"
-        :contentStyle="{}"
+        :contentStyle="{ minWidth: '350px' }"
       >
         <template v-for="(item, index) in counter">
           <el-descriptions-item :key="'name' + index">
diff --git a/src/views/safetyManage/declarationManage/sluice/examine/components/listPage/options/managementSystemFzr.vue b/src/views/safetyManage/declarationManage/sluice/examine/components/listPage/options/managementSystemFzr.vue
index 090b180..c8ff715 100644
--- a/src/views/safetyManage/declarationManage/sluice/examine/components/listPage/options/managementSystemFzr.vue
+++ b/src/views/safetyManage/declarationManage/sluice/examine/components/listPage/options/managementSystemFzr.vue
@@ -196,7 +196,7 @@
           width: '180px',
           height: '50px',
         }"
-        :contentStyle="{}"
+        :contentStyle="{ minWidth: '350px' }"
       >
         <el-descriptions-item>
           <template slot="label"> 责任人部门类型 </template>
diff --git a/src/views/safetyManage/declarationManage/sluice/examine/components/listPage/transform.vue b/src/views/safetyManage/declarationManage/sluice/examine/components/listPage/transform.vue
index 8b06912..55505da 100644
--- a/src/views/safetyManage/declarationManage/sluice/examine/components/listPage/transform.vue
+++ b/src/views/safetyManage/declarationManage/sluice/examine/components/listPage/transform.vue
@@ -24,7 +24,7 @@
         width: '180px',
         height: '50px',
       }"
-      :contentStyle="{}"
+      :contentStyle="{ minWidth: '350px' }"
     >
       <el-descriptions-item>
         <template slot="label"> 水闸名称 </template>
@@ -92,7 +92,7 @@
         width: '180px',
         height: '50px',
       }"
-      :contentStyle="{}"
+      :contentStyle="{ minWidth: '350px' }"
     >
       <el-descriptions-item>
         <template slot="label"> 安全鉴定情况 </template>
@@ -143,7 +143,7 @@
       </el-descriptions-item>
     </el-descriptions>
     <div slot="footer" class="dialog-footer">
-      <el-button type="primary" @click="submitForm">确 定</el-button>
+      <el-button type="primary" @click="submitForm">通 过</el-button>
       <el-button type="primary" @click="notPass">不通过</el-button>
       <el-button @click="cancel">取 消</el-button>
     </div>
diff --git a/src/views/safetyManage/safetyAppraisal/sluice/components/listBaseInfo_em.vue b/src/views/safetyManage/safetyAppraisal/sluice/components/listBaseInfo_em.vue
index 7f56f2f..ba0b0a5 100644
--- a/src/views/safetyManage/safetyAppraisal/sluice/components/listBaseInfo_em.vue
+++ b/src/views/safetyManage/safetyAppraisal/sluice/components/listBaseInfo_em.vue
@@ -9,7 +9,7 @@
         width: '180px',
         height: '50px',
       }"
-      :contentStyle="{}"
+      :contentStyle="{ minWidth: '350px' }"
     >
       <el-descriptions-item>
         <template slot="label"> 水闸名称 </template>
diff --git a/src/views/safetyManage/safetyAppraisal/sluice/components/listSafetyDetection_em.vue b/src/views/safetyManage/safetyAppraisal/sluice/components/listSafetyDetection_em.vue
index 6a1b181..2aa8df6 100644
--- a/src/views/safetyManage/safetyAppraisal/sluice/components/listSafetyDetection_em.vue
+++ b/src/views/safetyManage/safetyAppraisal/sluice/components/listSafetyDetection_em.vue
@@ -9,7 +9,7 @@
         width: '180px',
         height: '50px',
       }"
-      :contentStyle="{}"
+      :contentStyle="{ minWidth: '350px' }"
     >
       <el-descriptions-item :span="2">
         <template slot="label"> 水闸名称 </template>
diff --git a/src/views/safetyManage/safetyAppraisal/sluice/list.vue b/src/views/safetyManage/safetyAppraisal/sluice/list.vue
index b3d1ca0..82a200c 100644
--- a/src/views/safetyManage/safetyAppraisal/sluice/list.vue
+++ b/src/views/safetyManage/safetyAppraisal/sluice/list.vue
@@ -251,7 +251,7 @@
       </el-tabs>
 
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary">通 过66</el-button>
+        <el-button type="primary">通 过</el-button>
         <el-button>不通过</el-button>
       </div>
     </el-dialog>
@@ -446,6 +446,23 @@ export default {
     margin-top: 8vh !important;
     height: 800px;
     overflow: auto;
+    position: relative;
+    .el-dialog__footer {
+      border-top: 2px solid #e6ebf5;
+      position: absolute;
+      right: 0;
+      bottom: 0;
+      display: flex;
+      width: 100%;
+      justify-content: center;
+      .dialog-footer {
+        background: #f5f7fa;
+        width: 100%;
+        text-align: center;
+        padding: 10px 0;
+        border-radius: 10px;
+      }
+    }
   }
 }
 </style>
diff --git a/src/views/sluice/engineeringCondition/sluiceCompare/components/basePage.vue b/src/views/sluice/engineeringCondition/sluiceCompare/components/basePage.vue
index 6ab166e..037e981 100644
--- a/src/views/sluice/engineeringCondition/sluiceCompare/components/basePage.vue
+++ b/src/views/sluice/engineeringCondition/sluiceCompare/components/basePage.vue
@@ -24,7 +24,7 @@
         width: '120px',
         height: '50px',
       }"
-      :contentStyle="{}"
+      :contentStyle="{ minWidth: '350px' }"
       ref="descriptions"
     >
       <el-descriptions-item :contentClassName="isDiff('wagaName')">
diff --git a/src/views/sluice/engineeringCondition/sluiceCompare/components/projectManagement.vue b/src/views/sluice/engineeringCondition/sluiceCompare/components/projectManagement.vue
index fa447cd..59aea56 100644
--- a/src/views/sluice/engineeringCondition/sluiceCompare/components/projectManagement.vue
+++ b/src/views/sluice/engineeringCondition/sluiceCompare/components/projectManagement.vue
@@ -24,7 +24,7 @@
         width: '120px',
         height: '50px',
       }"
-      :contentStyle="{}"
+      :contentStyle="{ minWidth: '350px' }"
     >
       <el-descriptions-item
         :contentClassName="isDiff('engineeringManagementUnit')"
diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue
index 430cc9d..6c15a08 100644
--- a/src/views/system/dept/index.vue
+++ b/src/views/system/dept/index.vue
@@ -117,7 +117,7 @@
             v-hasPermi="['system:dept:add']"
             >新增</el-button
           >
-<!--          v-if="scope.row.parentId != 0 && scope.row.id != 'water_youke_id'"-->
+          <!--          v-if="scope.row.parentId != 0 && scope.row.id != 'water_youke_id'"-->
           <el-button
             size="mini"
             type="text"
@@ -200,7 +200,7 @@
               <el-input v-model="form.deptName" placeholder="请输入单位名称" />
             </el-form-item>
           </el-col>
-             <el-col :span="12">
+          <el-col :span="12">
             <el-form-item label="显示排序" prop="orderNum">
               <el-input-number
                 v-model="form.orderNum"
@@ -209,8 +209,8 @@
               />
             </el-form-item>
           </el-col>
-          </el-row>
-          <el-row>
+        </el-row>
+        <el-row>
           <el-col :span="12">
             <el-form-item label="前端名称" prop="name">
               <el-input v-model="form.name" placeholder="请输入前端系统名称" />
@@ -248,7 +248,21 @@
               />
             </el-form-item>
           </el-col>-->
-
+          <el-col :span="12">
+            <el-form-item label="行政区划" prop="xzqhId">
+              <el-cascader
+                :options="areasOptions"
+                v-model="form.xzqhId"
+                :props="areasOptionProps"
+                placeholder="请选择行政区划"
+                clearable
+                size="small"
+                style="width: 100%"
+                @change="handleChange"
+              >
+              </el-cascader>
+            </el-form-item>
+          </el-col>
 
           <el-col :span="12">
             <el-form-item label="SLOGAN">
@@ -308,118 +322,118 @@
           </el-col>
         </el-row> -->
 
-<!--        <el-row>-->
-<!--          <el-col :span="12">-->
-<!--            <el-form-item label="前端logo" prop="pcLogo">-->
-<!--              <el-upload-->
-<!--                v-model="form.pcLogo"-->
-<!--                class="upload-demo"-->
-<!--                ref="upload"-->
-<!--                action="this.url"-->
-<!--                :show-file-list="false"-->
-<!--                :file-list="fileList"-->
-<!--                :http-request="uploadPcLogo"-->
-<!--                :before-upload="beforeUpload"-->
-<!--              >-->
-<!--                <el-button slot="trigger" size="small" type="primary"-->
-<!--                  >选取图片</el-button-->
-<!--                >-->
-<!--                <el-button-->
-<!--                  style="margin-left: 30px"-->
-<!--                  class="el-button el-button&#45;&#45;primary el-button&#45;&#45;small"-->
-<!--                  type="primary"-->
-<!--                  @click="deletePcLogo"-->
-<!--                  v-if="img.pcLogoUrl != undefined"-->
-<!--                  >删除图片</el-button-->
-<!--                >-->
-<!--                <div slot="tip" class="el-upload__tip">-->
-<!--                  只能上传图片，如：JPG，PNG，且不超过5MB-->
-<!--                </div>-->
-<!--              </el-upload>-->
-<!--              <img-->
-<!--                v-if="img.pcLogoUrl"-->
-<!--                :src="img.pcLogoUrl"-->
-<!--                class="avatar"-->
-<!--                style="width: 200px; height: 124px"-->
-<!--              />-->
-<!--              <i v-else class="el-icon-plus avatar-uploader-icon"></i>-->
-<!--            </el-form-item>-->
-<!--          </el-col>-->
+        <!--        <el-row>-->
+        <!--          <el-col :span="12">-->
+        <!--            <el-form-item label="前端logo" prop="pcLogo">-->
+        <!--              <el-upload-->
+        <!--                v-model="form.pcLogo"-->
+        <!--                class="upload-demo"-->
+        <!--                ref="upload"-->
+        <!--                action="this.url"-->
+        <!--                :show-file-list="false"-->
+        <!--                :file-list="fileList"-->
+        <!--                :http-request="uploadPcLogo"-->
+        <!--                :before-upload="beforeUpload"-->
+        <!--              >-->
+        <!--                <el-button slot="trigger" size="small" type="primary"-->
+        <!--                  >选取图片</el-button-->
+        <!--                >-->
+        <!--                <el-button-->
+        <!--                  style="margin-left: 30px"-->
+        <!--                  class="el-button el-button&#45;&#45;primary el-button&#45;&#45;small"-->
+        <!--                  type="primary"-->
+        <!--                  @click="deletePcLogo"-->
+        <!--                  v-if="img.pcLogoUrl != undefined"-->
+        <!--                  >删除图片</el-button-->
+        <!--                >-->
+        <!--                <div slot="tip" class="el-upload__tip">-->
+        <!--                  只能上传图片，如：JPG，PNG，且不超过5MB-->
+        <!--                </div>-->
+        <!--              </el-upload>-->
+        <!--              <img-->
+        <!--                v-if="img.pcLogoUrl"-->
+        <!--                :src="img.pcLogoUrl"-->
+        <!--                class="avatar"-->
+        <!--                style="width: 200px; height: 124px"-->
+        <!--              />-->
+        <!--              <i v-else class="el-icon-plus avatar-uploader-icon"></i>-->
+        <!--            </el-form-item>-->
+        <!--          </el-col>-->
 
-<!--          &lt;!&ndash; <el-col :span="8">-->
-<!--            <el-form-item label="首页背景" prop="pcBackground">-->
-<!--              <el-upload-->
-<!--                v-model="form.pcBackground"-->
-<!--                class="upload-demo"-->
-<!--                ref="upload"-->
-<!--                action="this.url"-->
-<!--                :show-file-list="false"-->
-<!--                :file-list="fileList"-->
-<!--                :http-request="uploadPcBackground"-->
-<!--                :before-upload="beforeUpload"-->
-<!--              >-->
-<!--                <el-button slot="trigger" size="small" type="primary"-->
-<!--                  >选取图片</el-button-->
-<!--                >-->
-<!--                <el-button-->
-<!--                  style="margin-left: 30px"-->
-<!--                  class="el-button el-button&#45;&#45;primary el-button&#45;&#45;small"-->
-<!--                  type="primary"-->
-<!--                  @click="deletePcBackground"-->
-<!--                  v-if="img.pcBackgroundUrl != undefined"-->
-<!--                  >删除图片</el-button-->
-<!--                >-->
-<!--                <div slot="tip" class="el-upload__tip">-->
-<!--                  只能上传图片，如：JPG，PNG，且不超过5MB-->
+        <!--          &lt;!&ndash; <el-col :span="8">-->
+        <!--            <el-form-item label="首页背景" prop="pcBackground">-->
+        <!--              <el-upload-->
+        <!--                v-model="form.pcBackground"-->
+        <!--                class="upload-demo"-->
+        <!--                ref="upload"-->
+        <!--                action="this.url"-->
+        <!--                :show-file-list="false"-->
+        <!--                :file-list="fileList"-->
+        <!--                :http-request="uploadPcBackground"-->
+        <!--                :before-upload="beforeUpload"-->
+        <!--              >-->
+        <!--                <el-button slot="trigger" size="small" type="primary"-->
+        <!--                  >选取图片</el-button-->
+        <!--                >-->
+        <!--                <el-button-->
+        <!--                  style="margin-left: 30px"-->
+        <!--                  class="el-button el-button&#45;&#45;primary el-button&#45;&#45;small"-->
+        <!--                  type="primary"-->
+        <!--                  @click="deletePcBackground"-->
+        <!--                  v-if="img.pcBackgroundUrl != undefined"-->
+        <!--                  >删除图片</el-button-->
+        <!--                >-->
+        <!--                <div slot="tip" class="el-upload__tip">-->
+        <!--                  只能上传图片，如：JPG，PNG，且不超过5MB-->
 
-<!--              </el-upload>-->
-<!--              <img-->
-<!--                v-if="img.pcBackgroundUrl"-->
-<!--                :src="img.pcBackgroundUrl"-->
-<!--                class="avatar"-->
-<!--                style="width: 200px; height: 124px"-->
-<!--              />-->
-<!--              <i v-else class="el-icon-plus avatar-uploader-icon"></i>-->
-<!--            </el-form-item> &ndash;&gt;-->
-<!--          </el-col>-->
+        <!--              </el-upload>-->
+        <!--              <img-->
+        <!--                v-if="img.pcBackgroundUrl"-->
+        <!--                :src="img.pcBackgroundUrl"-->
+        <!--                class="avatar"-->
+        <!--                style="width: 200px; height: 124px"-->
+        <!--              />-->
+        <!--              <i v-else class="el-icon-plus avatar-uploader-icon"></i>-->
+        <!--            </el-form-item> &ndash;&gt;-->
+        <!--          </el-col>-->
 
-<!--          <el-col :span="12">-->
-<!--            <el-form-item label="后端logo" prop="adminLogo">-->
-<!--              <el-upload-->
-<!--                v-model="form.adminLogo"-->
-<!--                class="upload-demo"-->
-<!--                ref="upload"-->
-<!--                action="this.url"-->
-<!--                :show-file-list="false"-->
-<!--                :file-list="fileList"-->
-<!--                :http-request="uploadAdminLogo"-->
-<!--                :before-upload="beforeUpload"-->
-<!--              >-->
-<!--                <el-button slot="trigger" size="small" type="primary"-->
-<!--                  >选取图片</el-button-->
-<!--                >-->
-<!--                <el-button-->
-<!--                  style="margin-left: 30px"-->
-<!--                  class="el-button el-button&#45;&#45;primary el-button&#45;&#45;small"-->
-<!--                  type="primary"-->
-<!--                  @click="deleteAdminLogo"-->
-<!--                  v-if="img.adminLogoUrl != undefined"-->
-<!--                  >删除图片</el-button-->
-<!--                >-->
-<!--                <div slot="tip" class="el-upload__tip">-->
-<!--                  只能上传图片，如：JPG，PNG，且不超过5MB-->
-<!--                </div>-->
-<!--              </el-upload>-->
-<!--              <img-->
-<!--                v-if="img.adminLogoUrl"-->
-<!--                :src="img.adminLogoUrl"-->
-<!--                class="avatar"-->
-<!--                style="width: 200px; height: 124px"-->
-<!--              />-->
-<!--              <i v-else class="el-icon-plus avatar-uploader-icon"></i>-->
-<!--            </el-form-item>-->
-<!--          </el-col>-->
-<!--        </el-row>-->
+        <!--          <el-col :span="12">-->
+        <!--            <el-form-item label="后端logo" prop="adminLogo">-->
+        <!--              <el-upload-->
+        <!--                v-model="form.adminLogo"-->
+        <!--                class="upload-demo"-->
+        <!--                ref="upload"-->
+        <!--                action="this.url"-->
+        <!--                :show-file-list="false"-->
+        <!--                :file-list="fileList"-->
+        <!--                :http-request="uploadAdminLogo"-->
+        <!--                :before-upload="beforeUpload"-->
+        <!--              >-->
+        <!--                <el-button slot="trigger" size="small" type="primary"-->
+        <!--                  >选取图片</el-button-->
+        <!--                >-->
+        <!--                <el-button-->
+        <!--                  style="margin-left: 30px"-->
+        <!--                  class="el-button el-button&#45;&#45;primary el-button&#45;&#45;small"-->
+        <!--                  type="primary"-->
+        <!--                  @click="deleteAdminLogo"-->
+        <!--                  v-if="img.adminLogoUrl != undefined"-->
+        <!--                  >删除图片</el-button-->
+        <!--                >-->
+        <!--                <div slot="tip" class="el-upload__tip">-->
+        <!--                  只能上传图片，如：JPG，PNG，且不超过5MB-->
+        <!--                </div>-->
+        <!--              </el-upload>-->
+        <!--              <img-->
+        <!--                v-if="img.adminLogoUrl"-->
+        <!--                :src="img.adminLogoUrl"-->
+        <!--                class="avatar"-->
+        <!--                style="width: 200px; height: 124px"-->
+        <!--              />-->
+        <!--              <i v-else class="el-icon-plus avatar-uploader-icon"></i>-->
+        <!--            </el-form-item>-->
+        <!--          </el-col>-->
+        <!--        </el-row>-->
 
         <!-- <el-row>
           <el-col :span="8">
@@ -539,7 +553,7 @@ import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
 import { getFile } from "@/api/common";
-
+import { getAreasData } from "@/api/areas/index";
 
 import myaxios from "axios";
 
@@ -553,11 +567,21 @@ export default {
   components: { Treeselect },
   data() {
     return {
+      areasOptionProps: {
+        emitPath: false,
+        checkStrictly: true, //选择任意一级
+        // lazy: true,
+        // lazyLoad: function qylazyLoad(node) {
+        //   // node.level = 5;
+        //   console.log("node", node.level);
+        // },
+      },
+      areasOptions: [],
       uploadForm: new FormData(),
       fileList: [],
       list: [],
-      dataTypes:[],
-      dataType:[],
+      dataTypes: [],
+      dataType: [],
       pcLogoUrl: "", // 前端Logo预览
       pcBackgroundUrl: "", // 前端背景图预览
       adminLogoUrl: "", // 后端Logo图预览
@@ -637,6 +661,9 @@ export default {
             trigger: "blur",
           },
         ],
+        xzqhId: [
+          { required: true, message: "行政区划不能为空", trigger: "blur" },
+        ],
       },
       //全选
       checkTags: false,
@@ -645,11 +672,12 @@ export default {
     };
   },
   created() {
+    this.getTreeData();
     this.getList();
     this.getDicts("sys_normal_disable").then((response) => {
       this.statusOptions = response.data;
     });
-    this.getDicts('characteristic_type').then((response) => {
+    this.getDicts("characteristic_type").then((response) => {
       this.dataTypes = response.data;
     });
     this.getDicts("sys_notice_status").then((response) => {
@@ -669,12 +697,39 @@ export default {
     // });
   },
   methods: {
-    handleRouter(path,row) {
+    getTreeData() {
+      getAreasData().then((items) => {
+        let res = [];
+        let getChildren = (res, pid) => {
+          for (const i of items.data) {
+            if (i.parentid === pid) {
+              const newItem = {
+                label: i.name,
+                value: i.id,
+              };
+              if (i.layer != 3) newItem.children = [];
+              res.push(newItem);
+              getChildren(newItem.children, newItem.value);
+            }
+          }
+        };
+        getChildren(res, items.data[0].parentid);
+        console.log("areasOptions", res);
+        this.areasOptions = res;
+      });
+    },
+    handleChange(value) {
+      //value为省市区code数组
+      if (value) {
+        console.log("value", value);
+      }
+    },
+    handleRouter(path, row) {
       this.$router.push({
         path: path,
         query: {
           deptId: row.id,
-          name:row.deptName
+          name: row.deptName,
         },
       });
     },
@@ -815,10 +870,16 @@ export default {
       this.loading = true;
       listDept(this.queryParams).then((response) => {
         // id, parentId, children, rootId
-        if(this.queryParams.deptName  || this.queryParams.status){
+        if (this.queryParams.deptName || this.queryParams.status) {
           this.deptList = response.data;
-        }else{
-          this.deptList = this.handleTree(response.data, "id","parentId","children","0");
+        } else {
+          this.deptList = this.handleTree(
+            response.data,
+            "id",
+            "parentId",
+            "children",
+            "0"
+          );
         }
         this.loading = false;
       });
@@ -876,9 +937,9 @@ export default {
         menuIds: [],
         tags: [],
         dataSources: [],
-        dataType:null,
-        beginDate:null,
-        endDate:null,
+        dataType: null,
+        beginDate: null,
+        endDate: null,
         status: "0",
       };
       this.resetForm("form");
@@ -982,8 +1043,8 @@ export default {
         if (adminLogo != null && adminLogo != "" && adminLogo != undefined) {
           getFile(adminLogo, this.img, "adminLogoUrl"); // 后端Logo图片
         }
-        if(this.form.dataType){
-            this.dataType = this.form.dataType.split(",");
+        if (this.form.dataType) {
+          this.dataType = this.form.dataType.split(",");
         }
         this.open = true;
         this.title = "修改单位";
@@ -1008,7 +1069,7 @@ export default {
     submitForm: function () {
       return this.$refs["queryForm"].validate((valid) => {
         if (valid) {
-          if(this.dataType){
+          if (this.dataType) {
             this.form.dataType = this.dataType.join(",");
           }
           if (this.form.id != undefined) {