Merge branch 'master' of http://175.178.86.109:3000/ljf/shuili-vue

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
     },
   },
 };

src/components/linkNameSelect/linkSluice.vue

@@ -149,6 +149,7 @@ export default {
     },
     chooseDike(item) {
       this.form.wagaName = item.wagaName;
+      this.form.adcd=item.adcd
     },
   },
 };

src/layout/components/Navbar.vue

@@ -141,14 +141,31 @@ export default {
   },
   methods: {
     handleSelectTab(e) {
-      sessionStorage.setItem("topTab", e);
+      sessionStorage.setItem('topTab', e)
-      this.$store.dispatch("changeTopTab", e);
+      this.$store.dispatch('changeTopTab', e)
+      console.log(e)
+      if (e === 'sluice') {
         this.$router.replace({
-        path: "/",
+          path: '/sluice/engineeringCondition/sluiceBaseInfo',
           query: {
-          timestamp: new Date().getTime(),
+            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");
@@ -171,11 +188,9 @@ export default {
 <style lang="scss" scoped>
 .navbar {
   // background: #122c7d !important;
-  background: linear-gradient(
+  background: linear-gradient(270deg,
-    270deg,
     rgba(61, 156, 204, 1) 1%,
-    rgba(131, 179, 107, 1) 100%
+    rgba(131, 179, 107, 1) 100%) !important;
-  ) !important;
   // height: 70px;
   height: 56px;
   overflow: hidden;

src/views/dike/engineeringCondition/identificationPlate/index.vue

@@ -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[counterType][this[counterType].length - 1].dikeCode =
-        //     this.comForm.embankmentCode;
+        //     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.counter0[this.counter0.length - 1].dikeCode =
-      //       this.comForm.embankmentCode;
+      //       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
+      // dikeCode
-      this.comForm.embankmentCode = data.embankmentCode;
+      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.noticeForm.dikeCode = data.dikeCode;
-      // this.warnForm.embankmentCode = data.embankmentCode;
+      // this.warnForm.dikeCode = data.dikeCode;
-      // this.nameForm.embankmentCode = data.embankmentCode;
+      // this.nameForm.dikeCode = data.dikeCode;
-      // this.guideForm.embankmentCode = data.embankmentCode;
+      // 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;
+      const dikeCode = row.dikeCode;
-      getDikeMark(embankmentCode).then((response) => {
+      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);
@@ -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: "确定",

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"
@@ -437,7 +437,7 @@ export default {
       // 工程规模字典
       projectScaleOptions: [],
       // 堤防类型字典
-      sluiceTypeOptions: [],
+      dikeTypeOptions: [],
       // 工程等别字典
       engineerLevelOptions: [],
       // 主要建筑物级别字典

src/views/dike/safetyManage/declarationManage/declare/components/listPage/index.vue

@@ -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",
+          hzStatus:null,
-          zxStatus: "0",
+          zxStatus: null,
           reason: null,
           startLoc: null,
           endLoc: null,