Merge branch 'release-sy-v1.0.0' into 'dev'

Release sy v1.0.0

See merge request project/water/shuili-vue!122

src/views/dike/runManage/enginerring/inspectionPlan/components/PlanDetail.vue

@@ -17,8 +17,9 @@
             remote
             filterable
             reserve-keyword
+            :maxlength="50"
             :remote-method="handleGetRemoteDikeMethod"
-            @focus="handleGetRemoteDikeMethod"
+            @focus="handleGetRemoteDikeMethod('')"
             @change="handleChangeDike"
             v-model="formData.dikeName"
             placeholder="请选择堤防"
@@ -411,7 +412,6 @@ export default {
   methods: {
     getDetail() {
       getProjectCheckingPlanDetails(this.id).then((res) => {
-        console.log("res >>>>>  ", res);
         this.formData = res.data;
         this.formData.contents?.forEach((v) => {
           if (v.startDate && v.endDate) {
@@ -439,14 +439,11 @@ export default {
       )?.name;
     },
     handleGetRemoteDikeMethod(query) {
-      console.log("query >>>>>  ", query);
       getRunProjectList({
         pageSize: 10,
         pageNum: 1,
-        cv: {
+        data: {
-          name: "dikeName",
+          dikeName: query,
-          type: "like",
-          value: query,
         },
       }).then((res) => {
         if (res) {
@@ -543,7 +540,6 @@ export default {
     },
     submit(reset) {
       console.log("提交表单 >>>> ", this.formData);
-      console.log("subFormRef >>>>>>>> ", this.$refs.subFormRef);
       return new Promise((r, j) => {
         Promise.all([
           this.$refs.formRef.validate(),

src/views/dike/runManage/enginerring/inspectionRecords/CreateInspectionRecords.vue

@@ -37,13 +37,14 @@ export default {
   methods: {
     handleSave(reset) {
       this.$refs.formRef.submit(reset).then((res) => {
-        console.log("res >>>>>  ", res);
+        if (!reset) {
-        this.$router.go(-1);
+          this.$router.go(-1);
+        }
       });
     },
     handleCancel() {
       // 二次确认
-      this.$confirm("是否取消编辑？", "提示", {
+      this.$confirm(`是否取消${this.id ? "编辑" : "新增"}？`, "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning",

src/views/dike/runManage/enginerring/inspectionRecords/components/NewRecord.vue

@@ -16,6 +16,7 @@
             size="small"
             remote
             filterable
+            :maxlength="50"
             reserve-keyword
             :remote-method="handleGetRemotePlanMethod"
             @focus="() => handleGetRemotePlanMethod(null)"
@@ -218,6 +219,7 @@
       <div class="form-item-title">巡查路线（推荐）</div>
       <div class="map-box">
         <SyMixMap
+          ref="syMapRef"
           :showPosition="false"
           :canEdit="!canEdit"
           :entries="entries"
@@ -356,7 +358,6 @@ export default {
           this.subPlanList = res2.data?.contents || [];
         });
         this.dealLineDetailData(res.data.lineId, res.data.items);
-        console.log("this.formData >>>> ", this.formData);
       });
     },
 
@@ -388,7 +389,6 @@ export default {
 
       setTimeout(() => {
         this.$refs.formRef.clearValidate();
-        console.log("重置表单验证效果 >>>>>>> ");
       }, 30);
 
       getProjectCheckingPlanDetails(planItem.id).then((res) => {
@@ -416,7 +416,6 @@ export default {
     },
     // 上传前
     beforeProblemImgUpload(e) {
-      console.log("e >>>>>  ", e);
       if (this.currentItem.problemImages?.length >= 3) {
         this.$message.warning("最多上传3张");
         return false;
@@ -449,7 +448,6 @@ export default {
     // 获取路线详情
     dealLineDetailData(lineId, items) {
       getProjectCheckingLineRouteDetails(lineId).then((response) => {
-        console.log("路线详情 >>>>>  ", response);
         const data = response.data;
         if (data) {
           this.formData.lineType = data.type;
@@ -466,7 +464,6 @@ export default {
       return data.label.indexOf(value) !== -1;
     },
     handleGetRemotePlanMethod(query = null) {
-      console.log("query >>>>>  ", query);
       postDFInspectionPlanlist({
         data: {
           timeView: {
@@ -679,7 +676,6 @@ export default {
         let currentItem = data.nodeLink;
         currentItem.key = currentItem.parts[currentItem.parts.length - 1];
         this.$set(this, "currentItem", currentItem);
-        console.log("当前的currentItem >>>> ", this.currentItem);
         setTimeout(() => {
           this.$refs.treeRef.setCurrentKey(this.currentItem.key);
         }, 30);
@@ -713,7 +709,8 @@ export default {
                 }
                 r();
               })
-              .catch(() => {
+              .catch((e) => {
+                console.log("err >>>>>  ", e);
                 j();
               });
           } else {
@@ -730,6 +727,8 @@ export default {
       this.checkTreeData = [];
       this.currentItem = {};
 
+      this.formData.planName = "";
+      this.formData.planId = "";
       this.formData.subPlanName = "";
       this.formData.subPlanId = "";
       this.subPlanDateArr = [];

src/views/dike/runManage/enginerring/inspectionRecords/index.vue

@@ -44,7 +44,7 @@ export default {
         adcd: "",
         dikeName: "",
         dikeType: "",
-        name: "",
+        lineName: "",
         lineType: "",
         dutyHolderType: "",
         status: "",
@@ -69,10 +69,10 @@ export default {
       this.getTableData();
     },
     handleChangeQuery() {
+      this.pageData.pageNum = 1;
       this.getTableData();
     },
     handleCheckDetails(row, canEdit) {
-      console.log("row >>>>>  ", row);
       this.currentRow = row;
       this.currentRow.canEdit = !!canEdit;
       this.dialogVisible = true;
@@ -146,7 +146,7 @@ export default {
           adcd: this.paramsData.adcd,
           dikeName: this.paramsData.dikeName,
           dikeType: this.paramsData.dikeType,
-          lineName: this.paramsData.name,
+          lineName: this.paramsData.lineName,
           lineType: this.paramsData.lineType,
           dutyHolderType: this.paramsData.dutyHolderType,
           status: this.paramsData.status,
@@ -202,13 +202,12 @@ export default {
       this.paramsData.adcd = "";
       this.paramsData.dikeName = "";
       this.paramsData.dikeType = "";
-      this.paramsData.name = "";
+      this.paramsData.lineName = "";
       this.paramsData.lineType = "";
       this.paramsData.dutyHolderType = "";
       this.paramsData.status = "";
       this.pageData.pageNum = 1;
 
-      this.searchInput = "";
       this.getTableData();
     },
     // 匹配字典label
@@ -370,7 +369,7 @@ export default {
             size="small"
             class="w-202 ml-10"
             :maxlength="50"
-            v-model="paramsData.name"
+            v-model="paramsData.lineName"
             @change="handleChangeQuery"
             placeholder="请输入名称"
           />

src/views/dike/runManage/enginerring/inspectionRouteManage/components/RouteDetail.vue

@@ -17,6 +17,7 @@
             remote
             filterable
             reserve-keyword
+            :maxlength="50"
             :remote-method="handleGetRemoteDikeMethod"
             @focus="handleGetRemoteDikeMethod('')"
             @change="handleChangeDike"
@@ -229,7 +230,6 @@ export default {
   watch: {
     id: {
       handler(val) {
-        console.log("id-watch >>>>>  ", val);
         if (val) {
           getProjectCheckingLineRouteDetails(val).then((response) => {
             this.formData = response.data;
@@ -238,7 +238,6 @@ export default {
               response.data.entries && typeof response.data.entries === "string"
                 ? JSON.parse(response.data.entries)
                 : [];
-            console.log(" this.entries >>>>>  ", this.entries);
           });
         }
       },
@@ -274,7 +273,6 @@ export default {
       )?.name;
     },
     handleGetRemoteDikeMethod(query) {
-      console.log("query >>>>>  ", query);
       getRunProjectList({
         pageSize: 10,
         pageNum: 1,
@@ -288,7 +286,6 @@ export default {
       });
     },
     handleGetRemoteProjectMethod(query) {
-      console.log("query >>>>>  ", query);
       postDFInspectionProjectList({
         data: {
           timeView: {

src/views/dike/runManage/enginerring/inspectionRouteManage/index.vue

@@ -515,6 +515,7 @@ export default {
       });
     },
     handleChangeQuery() {
+      this.pageData.pageNum = 1;
       this.getTableData();
     },
     handleCheckDetail(row) {