Merge branch 'release-sy-v1.0.0' of ssh://gitlab.datameta.com:2224/project/water/shuili-vue into release-sy-v1.0.0

src/api/dike/index.js

@@ -19,6 +19,15 @@ export function getInspectionProjectDetails(id) {
   })
 }
 
+// 巡查项目管理-新增巡视检查
+export function postInspectionProjectData(data) {
+  return request({
+    url: '/run/df/checking',
+    method: 'post',
+    data
+  })
+}
+
 // 巡查项目管理-修改巡视检查
 export function putInspectionProjectData(data) {
   return request({

src/api/sluice/index.js

@@ -18,7 +18,14 @@ export function getInspectionProjectDetails(id) {
     method: 'get',
   })
 }
-
+// 巡查项目管理-新增巡视检查
+export function postInspectionProjectData(data) {
+  return request({
+    url: '/run/sz/checking',
+    method: 'post',
+    data
+  })
+}
 // 巡查项目管理-修改巡视检查
 export function putInspectionProjectData(data) {
   return request({

src/views/dike/runManage/enginerring/inspectionItems/inspectionItemDetails.vue

@@ -177,6 +177,7 @@
 import { intersection } from "lodash";
 import {
   putInspectionProjectData,
+  postInspectionProjectData,
   getCheckingDictTree,
   getInspectionProjectDetails,
 } from "@/api/dike";
@@ -288,14 +289,24 @@ export default {
         this.$message.error("请选择巡检类型");
         return;
       }
+      this.formData.items = this.getCheckData(this.xcTreeData);
+
       if (this.$route.query.id) {
         this.formData.id = this.$route.query.id;
       }
-      this.formData.items = this.getCheckData(this.xcTreeData);
+      
-      putInspectionProjectData(this.formData).then(() => {
+      if(this.formData.id){
+        putInspectionProjectData(this.formData).then((res) => {
         this.$message.success("保存成功");
-        // this.$router.go(-1);
         });
+      } else{
+        postInspectionProjectData(this.formData).then((res) => {
+        if (res.data?.id) {
+          this.formData.id = res.data.id;
+        }
+        this.$message.success("保存成功");
+        });
+    }
     },
   },
   mounted() {

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

@@ -35,8 +35,8 @@ export default {
         type: "",
         xcId: "",
         frequency: "",
-        cycleType: "",
+        cycleType: "0",
-        isReminder: false,
+        isReminder: true,
         reminderTime: "",
         operators: [],
         files: [], //依据
@@ -222,8 +222,8 @@ export default {
         type: "",
         xcId: "",
         frequency: "",
-        cycleType: "",
+        cycleType: "0",
-        isReminder: false,
+        isReminder: true,
         reminderTime: "",
         operators: [],
         otherConfig: {

src/views/sluice/runManage/enginerring/inspectionItems/inspectionItemDetails.vue

@@ -177,6 +177,7 @@
 import { intersection } from "lodash";
 import {
   putInspectionProjectData,
+  postInspectionProjectData,
   getCheckingDictTree,
   getInspectionProjectDetails,
 } from "@/api/sluice";
@@ -290,14 +291,25 @@ export default {
         this.$message.error("请选择巡检类型");
         return;
       }
+      this.formData.items = this.getCheckData(this.xcTreeData);
+
       if (this.$route.query.id) {
         this.formData.id = this.$route.query.id;
       } 
-      this.formData.items = this.getCheckData(this.xcTreeData);
+      
+      if (this.formData.id){
         putInspectionProjectData(this.formData).then(() => {
         this.$message.success("保存成功");
-        // this.$router.go(-1);
       }); 
+      }else {
+        postInspectionProjectData(this.formData).then((res) => {
+        if (res.data?.id) {
+          this.formData.id = res.data.id;
+        }
+        this.$message.success("保存成功");
+        });
+      }
+      
     },
   },
   mounted() {

src/views/sluice/runManage/enginerring/inspectionPlan/index.vue

@@ -35,8 +35,8 @@ export default {
         type: "",
         xcId: "",
         frequency: "",
-        cycleType: "",
+        cycleType: "0",
-        isReminder: false,
+        isReminder: true,
         reminderTime: "",
         operators: [],
         files: [], //依据
@@ -224,8 +224,8 @@ export default {
         type: "",
         xcId: "",
         frequency: "",
-        cycleType: "",
+        cycleType: "0",
-        isReminder: false,
+        isReminder: true,
         reminderTime: "",
         operators: [],
         otherConfig: {