From fdfa9db347597966a8ebe50c186b38af243d2709 Mon Sep 17 00:00:00 2001
From: zth <1205836521@qq.com>
Date: Wed, 12 Feb 2025 16:57:57 +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

---
 src/components/linkNameSelect/linkDike.vue    |  3 +-
 src/components/linkNameSelect/linkSluice.vue  |  1 +
 src/layout/components/Navbar.vue              | 35 ++++++---
 .../identificationPlate/index.vue             | 74 +++++++++----------
 .../confirmDelimitationManage/index.vue       | 10 +--
 .../declare/components/listPage/index.vue     | 22 +++---
 .../identificationPlate/index.vue             | 28 +++----
 7 files changed, 95 insertions(+), 78 deletions(-)

diff --git a/src/components/linkNameSelect/linkDike.vue b/src/components/linkNameSelect/linkDike.vue
index b31c3d8..e09c3bb 100644
--- a/src/components/linkNameSelect/linkDike.vue
+++ b/src/components/linkNameSelect/linkDike.vue
@@ -30,14 +30,12 @@
       style="width: 100%"
       v-scroll="selectSearch"
       filterable
-      :filter-method="aaaa"
       clearable
       remote
       reserve-keyword
       :remote-method="remoteMethod"
       :loading="loading"
       @change="handleChange"
-      @blur="handleChange"
     >
       <el-option
         v-for="dict in dikeNameOptions"
@@ -142,6 +140,7 @@ export default {
     },
     chooseDike(item) {
       this.form.dikeName = item.dikeName;
+      this.form.adcd = item.adcd
     },
   },
 };
diff --git a/src/components/linkNameSelect/linkSluice.vue b/src/components/linkNameSelect/linkSluice.vue
index 6491026..6d42486 100644
--- a/src/components/linkNameSelect/linkSluice.vue
+++ b/src/components/linkNameSelect/linkSluice.vue
@@ -149,6 +149,7 @@ export default {
     },
     chooseDike(item) {
       this.form.wagaName = item.wagaName;
+      this.form.adcd=item.adcd
     },
   },
 };
diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index 750c495..13519c3 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -131,13 +131,30 @@ export default {
   methods: {
     handleSelectTab(e) {
       sessionStorage.setItem('topTab', e)
-      this.$store.dispatch('changeTopTab',e)
-      this.$router.replace({
-        path: '/',
-        query: {
-          timestamp: new Date().getTime()
-        }
-      })
+      this.$store.dispatch('changeTopTab', e)
+      console.log(e)
+      if (e === 'sluice') {
+        this.$router.replace({
+          path: '/sluice/engineeringCondition/sluiceBaseInfo',
+          query: {
+            timestamp: new Date().getTime()
+          }
+        })
+      }else if (e==='dike'){
+        this.$router.replace({
+          path: '/dike/engineeringCondition/dikeBaseInfo',
+          query: {
+            timestamp: new Date().getTime()
+          }
+        })
+      }else {
+        this.$router.replace({
+          path: '/',
+          query: {
+            timestamp: new Date().getTime()
+          }
+        })
+      }
     },
     toggleSideBar() {
       this.$store.dispatch("app/toggleSideBar");
@@ -161,8 +178,8 @@ export default {
 .navbar {
   // background: #122c7d !important;
   background: linear-gradient(270deg,
-      rgba(61, 156, 204, 1) 1%,
-      rgba(131, 179, 107, 1) 100%) !important;
+    rgba(61, 156, 204, 1) 1%,
+    rgba(131, 179, 107, 1) 100%) !important;
   // height: 70px;
   height: 56px;
   overflow: hidden;
diff --git a/src/views/dike/engineeringCondition/identificationPlate/index.vue b/src/views/dike/engineeringCondition/identificationPlate/index.vue
index 179938a..d2fbb1c 100644
--- a/src/views/dike/engineeringCondition/identificationPlate/index.vue
+++ b/src/views/dike/engineeringCondition/identificationPlate/index.vue
@@ -108,7 +108,7 @@
             >搜索</el-button
           > -->
             <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
-              >重置</el-button
+            >重置</el-button
             >
           </el-form-item>
         </el-form>
@@ -121,7 +121,7 @@
               size="mini"
               @click="handleAdd"
               v-hasPermi="['yg:dikeMark:add']"
-              >新增</el-button
+            >新增</el-button
             >
           </el-col>
           <el-col :span="1.5">
@@ -132,7 +132,7 @@
               :disabled="single"
               @click="handleUpdate"
               v-hasPermi="['yg:dikeMark:edit']"
-              >修改</el-button
+            >修改</el-button
             >
           </el-col>
           <el-col :span="1.5">
@@ -143,7 +143,7 @@
               :disabled="multiple"
               @click="handleDelete"
               v-hasPermi="['yg:dikeMark:remove']"
-              >删除</el-button
+            >删除</el-button
             >
           </el-col>
           <right-toolbar
@@ -238,7 +238,7 @@
                 icon="el-icon-edit"
                 @click="handleUpdate(scope.row)"
                 v-hasPermi="['yg:dikeMark:edit']"
-                >修改</el-button
+              >修改</el-button
               >
               <el-button
                 size="mini"
@@ -246,7 +246,7 @@
                 icon="el-icon-delete"
                 @click="handleDelete(scope.row)"
                 v-hasPermi="['yg:dikeMark:remove']"
-                >删除</el-button
+              >删除</el-button
               >
             </template>
           </el-table-column>
@@ -637,7 +637,7 @@ export default {
       form: {},
       comForm: {
         dikeName: null,
-        embankmentCode: null,
+        dikeCode: null,
         adcd: null,
       },
       noticeForm: {},
@@ -761,8 +761,8 @@ export default {
         // if (this.comForm.dikeName) {
         //   this[counterType][this[counterType].length - 1].dikeName =
         //     this.comForm.dikeName;
-        //   this[counterType][this[counterType].length - 1].embankmentCode =
-        //     this.comForm.embankmentCode;
+        //   this[counterType][this[counterType].length - 1].dikeCode =
+        //     this.comForm.dikeCode;
         // }
         // 赋值标牌类型
         // this[counterType][this[counterType].length - 1].type = type;
@@ -783,8 +783,8 @@ export default {
       //   if (this.comForm.dikeName) {
       //     this.counter0[this.counter0.length - 1].dikeName =
       //       this.comForm.dikeName;
-      //     this.counter0[this.counter0.length - 1].embankmentCode =
-      //       this.comForm.embankmentCode;
+      //     this.counter0[this.counter0.length - 1].dikeCode =
+      //       this.comForm.dikeCode;
       //   }
       //   // 赋值标牌类型
       //   this.counter0[this.counter0.length - 1].type = "0";
@@ -814,27 +814,27 @@ export default {
       // this.$refs[ele].appendChild(child.$el); //插入元素内部的最后一个子节点之后
     },
     chooseEmbankmenName(data) {
-      // embankmentCode
-      this.comForm.embankmentCode = data.embankmentCode;
+      // dikeCode
+      this.comForm.dikeCode = data.dikeCode;
       this.comForm.adcd = data.adcd;
       // console.log(33333, this.comForm);
       // // 将第一个表单和后面新增的表单赋值，水闸编码和水闸名称
       // this.$refs["noticeForm0"][0].form.dikeName = data.dikeName;
-      // this.$refs["noticeForm0"][0].form.embankmentCode = data.embankmentCode;
+      // this.$refs["noticeForm0"][0].form.dikeCode = data.dikeCode;
       // // this.$refs["noticeForm0"][0].form.type = "0";
       // this.counter0.forEach((item) => {
       //   item.dikeName = data.dikeName;
-      //   item.embankmentCode = data.embankmentCode;
+      //   item.dikeCode = data.dikeCode;
       // });
       // // this.noticeForm.dikeName = data.dikeName;
       // this.warnForm.dikeName = data.dikeName;
       // this.nameForm.dikeName = data.dikeName;
       // this.guideForm.dikeName = data.dikeName;
 
-      // // this.noticeForm.embankmentCode = data.embankmentCode;
-      // this.warnForm.embankmentCode = data.embankmentCode;
-      // this.nameForm.embankmentCode = data.embankmentCode;
-      // this.guideForm.embankmentCode = data.embankmentCode;
+      // // this.noticeForm.dikeCode = data.dikeCode;
+      // this.warnForm.dikeCode = data.dikeCode;
+      // this.nameForm.dikeCode = data.dikeCode;
+      // this.guideForm.dikeCode = data.dikeCode;
     },
     /** 查询水闸标识标牌列表 */
     getList() {
@@ -867,13 +867,13 @@ export default {
       this.counter3 = [{}];
       this.comForm = {
         dikeName: null,
-        embankmentCode: null,
+        dikeCode: null,
         adcd: null,
       };
       this.noticeForm = {
         id: null,
         adcd: null,
-        embankmentCode: null,
+        dikeCode: null,
         markName: null,
         dikeName: null,
         markLocation: null,
@@ -893,7 +893,7 @@ export default {
       this.warnForm = {
         id: null,
         adcd: null,
-        embankmentCode: null,
+        dikeCode: null,
         markName: null,
         dikeName: null,
         markLocation: null,
@@ -913,7 +913,7 @@ export default {
       this.guideForm = {
         id: null,
         adcd: null,
-        embankmentCode: null,
+        dikeCode: null,
         markName: null,
         dikeName: null,
         markLocation: null,
@@ -933,7 +933,7 @@ export default {
       this.nameForm = {
         id: null,
         adcd: null,
-        embankmentCode: null,
+        dikeCode: null,
         markName: null,
         dikeName: null,
         markLocation: null,
@@ -1000,7 +1000,7 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map((item) => item.embankmentCode);
+      this.ids = selection.map((item) => item.dikeCode);
       this.single = selection.length !== 1;
       this.multiple = !selection.length;
     },
@@ -1016,12 +1016,12 @@ export default {
       this.reset();
       this.isEdit = true;
       console.log(77777, row);
-      const embankmentCode = row.embankmentCode;
-      getDikeMark(embankmentCode).then((response) => {
+      const dikeCode = row.dikeCode;
+      getDikeMark(dikeCode).then((response) => {
         // this.form = response.data;
         console.log("回显的数据", response);
         this.comForm.dikeName = response.data[0].dikeName;
-        this.comForm.embankmentCode = response.data[0].embankmentCode;
+        this.comForm.dikeCode = response.data[0].dikeCode;
         this.comForm.adcd = response.data[0].adcd;
         console.log("this.comForm", this.comForm);
         this.counter0 = response.data.filter((item) => item.type == 0);
@@ -1089,26 +1089,26 @@ export default {
             this.counter0.length > 1
               ? this.counter0
               : this.$refs["noticeForm0"][0].form.markName
-              ? [this.$refs["noticeForm0"][0].form]
-              : [];
+                ? [this.$refs["noticeForm0"][0].form]
+                : [];
           const C1 =
             this.counter1.length > 1
               ? this.counter1
               : this.$refs["warnForm0"][0].form.markName
-              ? [this.$refs["warnForm0"][0].form]
-              : [];
+                ? [this.$refs["warnForm0"][0].form]
+                : [];
           const C2 =
             this.counter2.length > 1
               ? this.counter2
               : this.$refs["guideForm0"][0].form.markName
-              ? [this.$refs["guideForm0"][0].form]
-              : [];
+                ? [this.$refs["guideForm0"][0].form]
+                : [];
           const C3 =
             this.counter3.length > 1
               ? this.counter3
               : this.$refs["nameForm0"][0].form.markName
-              ? [this.$refs["nameForm0"][0].form]
-              : [];
+                ? [this.$refs["nameForm0"][0].form]
+                : [];
 
           // console.log("C0C0", C0, C1);
           if (this.isEdit) {
@@ -1156,7 +1156,7 @@ export default {
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      const ids = row.embankmentCode || this.ids;
+      const ids = row.dikeCode || this.ids;
       if (ids) {
         this.$confirm("是否删除选中的数据？", "警告", {
           confirmButtonText: "确定",
diff --git a/src/views/dike/safetyManage/confirmDelimitationManage/index.vue b/src/views/dike/safetyManage/confirmDelimitationManage/index.vue
index e448262..ecca5ab 100644
--- a/src/views/dike/safetyManage/confirmDelimitationManage/index.vue
+++ b/src/views/dike/safetyManage/confirmDelimitationManage/index.vue
@@ -45,7 +45,7 @@
             @change="handleQuery"
           >
             <el-option
-              v-for="dict in sluiceTypeOptions"
+              v-for="dict in dikeTypeOptions"
               :key="dict.dictValue"
               :label="dict.dictLabel"
               :value="dict.dictValue"
@@ -62,7 +62,7 @@
           >搜索</el-button
         > -->
           <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
-            >重置</el-button
+          >重置</el-button
           >
         </el-form-item>
       </el-form>
@@ -174,7 +174,7 @@
               icon="el-icon-view"
               @click="viewInfo(scope.row)"
               v-hasPermi="['df:qqhj:view']"
-              >查看</el-button
+            >查看</el-button
             >
             <el-button
               size="mini"
@@ -182,7 +182,7 @@
               icon="el-icon-edit-outline"
               @click="comfirm(scope.row)"
               v-hasPermi="['df:qqhj:comfirm']"
-              >确权划界</el-button
+            >确权划界</el-button
             >
             <!-- <el-button
             size="mini"
@@ -437,7 +437,7 @@ export default {
       // 工程规模字典
       projectScaleOptions: [],
       // 堤防类型字典
-      sluiceTypeOptions: [],
+      dikeTypeOptions: [],
       // 工程等别字典
       engineerLevelOptions: [],
       // 主要建筑物级别字典
diff --git a/src/views/dike/safetyManage/declarationManage/declare/components/listPage/index.vue b/src/views/dike/safetyManage/declarationManage/declare/components/listPage/index.vue
index 36fef66..40733fe 100644
--- a/src/views/dike/safetyManage/declarationManage/declare/components/listPage/index.vue
+++ b/src/views/dike/safetyManage/declarationManage/declare/components/listPage/index.vue
@@ -51,7 +51,7 @@
           >搜索</el-button
         > -->
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
-          >重置</el-button
+        >重置</el-button
         >
       </el-form-item>
     </el-form>
@@ -65,7 +65,7 @@
           :disabled="!multiple"
           @click="handleAdd"
           v-hasPermi="['df:jbxx:add']"
-          >申报</el-button
+        >申报</el-button
         >
       </el-col>
       <!-- <el-col :span="1.5">
@@ -174,7 +174,7 @@
               icon="el-icon-edit"
               @click="handleAddEdit(scope.row)"
               v-hasPermi="['df:jbxx:addEdit']"
-              >修改申报</el-button
+            >修改申报</el-button
             >
           </template>
 
@@ -227,7 +227,7 @@
               icon="el-icon-folder-checked"
               @click="transformCertificate(scope.row)"
               v-hasPermi="['df:jbxx:transform']"
-              >换证</el-button
+            >换证</el-button
             >
           </template>
 
@@ -257,8 +257,8 @@
                 scope.row.zxStatus == 1
                   ? "注销不通过原因"
                   : scope.row.zxStatus == 0
-                  ? "注销申请中"
-                  : "申请注销"
+                    ? "注销申请中"
+                    : "申请注销"
               }}
             </el-button>
           </el-popconfirm>
@@ -513,7 +513,7 @@
                   v-for="dict in isGateProjectOptions"
                   :key="dict.dictValue + '是否为套闸工程'"
                   :label="dict.dictValue"
-                  >{{ dict.dictLabel }}</el-radio
+                >{{ dict.dictLabel }}</el-radio
                 >
               </el-radio-group>
             </el-form-item>
@@ -1235,7 +1235,7 @@ export default {
           startDate: null,
           compDate: null,
           admDep: null,
-          isGateProject: "0",
+          isGateProject: null,
           observationProject: null,
           levelDatum: null,
           dikeOverview: null,
@@ -1246,11 +1246,11 @@ export default {
           owerDept: null,
           remark: null,
           relation: null,
-          status: "0",
+          status: null,
           securityCategory: null,
           adcd: null,
-          hzStatus: "0",
-          zxStatus: "0",
+          hzStatus:null,
+          zxStatus: null,
           reason: null,
           startLoc: null,
           endLoc: null,
diff --git a/src/views/sluice/engineeringCondition/identificationPlate/index.vue b/src/views/sluice/engineeringCondition/identificationPlate/index.vue
index 4675ccf..fe5141b 100644
--- a/src/views/sluice/engineeringCondition/identificationPlate/index.vue
+++ b/src/views/sluice/engineeringCondition/identificationPlate/index.vue
@@ -108,7 +108,7 @@
             >搜索</el-button
           > -->
             <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
-              >重置</el-button
+            >重置</el-button
             >
           </el-form-item>
         </el-form>
@@ -121,7 +121,7 @@
               size="mini"
               @click="handleAdd"
               v-hasPermi="['yg:sluiceMark:add']"
-              >新增</el-button
+            >新增</el-button
             >
           </el-col>
           <el-col :span="1.5">
@@ -132,7 +132,7 @@
               :disabled="single"
               @click="handleUpdate"
               v-hasPermi="['yg:sluiceMark:edit']"
-              >修改</el-button
+            >修改</el-button
             >
           </el-col>
           <el-col :span="1.5">
@@ -143,7 +143,7 @@
               :disabled="multiple"
               @click="handleDelete"
               v-hasPermi="['yg:sluiceMark:remove']"
-              >删除</el-button
+            >删除</el-button
             >
           </el-col>
           <right-toolbar
@@ -238,7 +238,7 @@
                 icon="el-icon-edit"
                 @click="handleUpdate(scope.row)"
                 v-hasPermi="['yg:sluiceMark:edit']"
-                >修改</el-button
+              >修改</el-button
               >
               <el-button
                 size="mini"
@@ -246,7 +246,7 @@
                 icon="el-icon-delete"
                 @click="handleDelete(scope.row)"
                 v-hasPermi="['yg:sluiceMark:remove']"
-                >删除</el-button
+              >删除</el-button
               >
             </template>
           </el-table-column>
@@ -1097,26 +1097,26 @@ export default {
             this.counter0.length > 1
               ? this.counter0
               : this.$refs["noticeForm0"][0].form.markName
-              ? [this.$refs["noticeForm0"][0].form]
-              : [];
+                ? [this.$refs["noticeForm0"][0].form]
+                : [];
           const C1 =
             this.counter1.length > 1
               ? this.counter1
               : this.$refs["warnForm0"][0].form.markName
-              ? [this.$refs["warnForm0"][0].form]
-              : [];
+                ? [this.$refs["warnForm0"][0].form]
+                : [];
           const C2 =
             this.counter2.length > 1
               ? this.counter2
               : this.$refs["guideForm0"][0].form.markName
-              ? [this.$refs["guideForm0"][0].form]
-              : [];
+                ? [this.$refs["guideForm0"][0].form]
+                : [];
           const C3 =
             this.counter3.length > 1
               ? this.counter3
               : this.$refs["nameForm0"][0].form.markName
-              ? [this.$refs["nameForm0"][0].form]
-              : [];
+                ? [this.$refs["nameForm0"][0].form]
+                : [];
 
           // // console.log("C0C0", C0, C1);
           if (this.isEdit) {