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

Release sy v1.0.0 See merge request project/water/shuili-vue!66
1 year ago · 9616b8cc66
6 changed files with 62 additions and 16 deletions
--- a/src/api/dike/index.js
+++ b/src/api/dike/index.js
@ -18,7 +18,13 @@ export function getInspectionProjectDetails(id) {
    method: 'get',
  })
 }
-
+//检查是否被引用
+export function checkUsed(id) {
+  return request({
+    url: `/run/df/checking/check-use/${id}`,
+    method: 'get',
+  })
+}
 // 巡查项目管理-新增巡视检查
 export function postInspectionProjectData(data) {
  return request({
--- a/src/api/sluice/index.js
+++ b/src/api/sluice/index.js
@ -18,6 +18,14 @@ export function getInspectionProjectDetails(id) {
    method: 'get',
  })
 }
+//检查是否被引用
+export function checkUsed(id) {
+  return request({
+    url: `/run/sz/checking/check-use/${id}`,
+    method: 'get',
+  })
+}
+
 // 巡查项目管理-新增巡视检查
 export function postInspectionProjectData(data) {
  return request({
--- a/src/views/dike/runManage/enginerring/inspectionItems/index.vue
+++ b/src/views/dike/runManage/enginerring/inspectionItems/index.vue
@ -1,6 +1,6 @@
 <!-- 巡查项目管理-堤防 -->
 <script>
-import { getDicts, postDFInspectionProjectList } from "@/api/management";
+import { getDicts, postDFInspectionProjectList,deleteDFInspectionProject } from "@/api/management";
 export default {
  name: "InspectionItems",
  components: {},
@ -31,6 +31,12 @@ export default {
      this.pageData.pageSize = pageSize;
      this.getTableData();
    },
+    deleteTableItem(row) {
+      deleteDFInspectionProject(row.id).then((res) => {
+        this.getTableData();
+        this.$message.success("删除成功");
+      });
+    },
    // 表格筛选
    searchTableList() {
      postDFInspectionProjectList({
--- a/src/views/dike/runManage/enginerring/inspectionItems/inspectionItemDetails.vue
+++ b/src/views/dike/runManage/enginerring/inspectionItems/inspectionItemDetails.vue
@ -5,13 +5,15 @@
      <div class="top-box">
        <span>巡视检查名称：</span>
        <el-input
+          :disabled="isEdit"
          v-model="formData.name"
+          :maxlength="50"
          size="small"
          class="search-input"
          placeholder="请输入巡视检查名称"
        ></el-input>
        <span>巡检类型：</span>
-        <el-select v-model="formData.type" placeholder="请选择">
+        <el-select :disabled="isEdit" v-model="formData.type" placeholder="请选择">
          <el-option
            v-for="item in xcTypeOptions"
            :key="item.dictValue"
@ -89,7 +91,7 @@
                          class="flex flex-1 items-center p-4 r-b-border h-full"
                        >
                          <el-input
-                            :disabled="!item3.check"
+                            :disabled="!item3.check || isEdit"
                            v-model="item3.content"
                            type="textarea"
                            :rows="1"
@ -101,11 +103,12 @@
                          class="w-120 flex justify-center items-center p-4 r-b-border h-full"
                        >
                          <el-radio-group
+                            :disabled="isEdit"
                            class="inspection-radio-group"
                            v-model="item3.check"
                          >
-                            <el-radio :label="true">是</el-radio>
-                            <el-radio :label="false">否</el-radio>
+                            <el-radio :disabled="isEdit" :label="true">是</el-radio>
+                            <el-radio :disabled="isEdit" :label="false">否</el-radio>
                          </el-radio-group>
                        </div>
                      </div>
@ -115,7 +118,7 @@
                  <div v-else class="flex flex-1 items-center">
                    <div class="flex-1 flex items-center p-4 r-b-border h-full">
                      <el-input
-                        :disabled="!item2.check"
+                        :disabled="!item2.check || isEdit"
                        v-model="item2.content"
                        type="textarea"
                        :rows="1"
@ -127,10 +130,11 @@
                      class="w-120 flex justify-center items-center p-4 r-b-border h-full"
                    >
                      <el-radio-group
+                       :disabled="isEdit"
                        class="inspection-radio-group"
                        v-model="item2.check"
                      >
-                        <el-radio :label="true">是</el-radio>
+                        <el-radio  :label="true">是</el-radio>
                        <el-radio :label="false">否</el-radio>
                      </el-radio-group>
                    </div>
@ -141,7 +145,7 @@
              <div v-else class="flex flex-1 items-center">
                <div class="flex-1 flex items-center p-4 r-b-border h-full">
                  <el-input
-                    :disabled="!item.check"
+                    :disabled="!item.check || isEdit"
                    v-model="item.content"
                    type="textarea"
                    :rows="1"
@ -153,6 +157,7 @@
                  class="w-120 flex justify-center items-center p-4 r-b-border h-full"
                >
                  <el-radio-group
+                    :disabled="isEdit"
                    class="inspection-radio-group"
                    v-model="item.check"
                  >
@ -168,7 +173,7 @@
    </div>

    <div class="bottom-btns">
-      <el-button type="primary" @click="handleSave">保存</el-button>
+      <el-button :disabled="isEdit" type="primary" @click="handleSave">保存</el-button>
      <el-button @click="$router.go(-1)">返回</el-button>
    </div>
  </div>
@ -177,6 +182,7 @@
 import { intersection } from "lodash";
 import {
  putInspectionProjectData,
+  checkUsed,
  postInspectionProjectData,
  getCheckingDictTree,
  getInspectionProjectDetails,
@ -187,6 +193,7 @@ export default {
    return {
      xcTreeData: [],
      xcTypeOptions: [],
+      isEdit: true,
      formData: {
        id: null,
        name: "",
@ -212,6 +219,7 @@ export default {
      const detailData = await getInspectionProjectDetails(
        this.$route.query.id
      );
+
      if (detailData?.data?.items) {
        // 匹配xcTreeData
        this.formData.name = detailData.data.name;
@ -219,6 +227,8 @@ export default {
        this.matchXcTreeData(_xcTreeData, detailData.data.items);
      }
      this.xcTreeData = _xcTreeData;
+      const checkUsedData = await checkUsed(this.$route.query.id);
+      this.isEdit = checkUsedData?.data;
    },
    // 树转换
    transformArr(treeList) {
--- a/src/views/sluice/runManage/enginerring/inspectionItems/index.vue
+++ b/src/views/sluice/runManage/enginerring/inspectionItems/index.vue
@ -1,6 +1,6 @@
 <!-- 巡查项目管理-水闸 -->
 <script>
-import { getDicts, postSZInspectionProjectList } from "@/api/management";
+import { getDicts, postSZInspectionProjectList,deleteSZInspectionProject } from "@/api/management";
 export default {
  name: "InspectionItems",
  data() {
@ -69,6 +69,12 @@ export default {
        },
      });
    },
+    deleteTableItem(row) {
+      deleteSZInspectionProject(row.id).then((res) => {
+        this.getTableData();
+        this.$message.success("删除成功");
+      });
+    },
    // 编辑巡查项目
    editTableItem(row) {
      this.$router.push({
--- a/src/views/sluice/runManage/enginerring/inspectionItems/inspectionItemDetails.vue
+++ b/src/views/sluice/runManage/enginerring/inspectionItems/inspectionItemDetails.vue
@ -5,13 +5,15 @@
      <div class="top-box">
        <span>巡视检查名称：</span>
        <el-input
+          :disabled="isEdit"
          v-model="formData.name"
+          :maxlength="50"
          size="small"
          class="search-input"
          placeholder="请输入巡视检查名称"
        ></el-input>
        <span>巡检类型：</span>
-        <el-select v-model="formData.type" placeholder="请选择">
+        <el-select :disabled="isEdit" v-model="formData.type" placeholder="请选择">
          <el-option
            v-for="item in xcTypeOptions"
            :key="item.dictValue"
@ -89,7 +91,7 @@
                          class="flex flex-1 items-center p-4 r-b-border h-full"
                        >
                          <el-input
-                            :disabled="!item3.check"
+                            :disabled="!item3.check || isEdit"
                            v-model="item3.content"
                            type="textarea"
                            :rows="1"
@ -101,6 +103,7 @@
                          class="w-120 flex justify-center items-center p-4 r-b-border h-full"
                        >
                          <el-radio-group
+                            :disabled="isEdit"
                            class="inspection-radio-group"
                            v-model="item3.check"
                          >
@ -115,7 +118,7 @@
                  <div v-else class="flex flex-1 items-center">
                    <div class="flex-1 flex items-center p-4 r-b-border h-full">
                      <el-input
-                        :disabled="!item2.check"
+                        :disabled="!item2.check || isEdit"
                        v-model="item2.content"
                        type="textarea"
                        :rows="1"
@ -127,6 +130,7 @@
                      class="w-120 flex justify-center items-center p-4 r-b-border h-full"
                    >
                      <el-radio-group
+                        :disabled="isEdit"
                        class="inspection-radio-group"
                        v-model="item2.check"
                      >
@ -141,7 +145,7 @@
              <div v-else class="flex flex-1 items-center">
                <div class="flex-1 flex items-center p-4 r-b-border h-full">
                  <el-input
-                    :disabled="!item.check"
+                    :disabled="!item.check || isEdit"
                    v-model="item.content"
                    type="textarea"
                    :rows="1"
@ -153,6 +157,7 @@
                  class="w-120 flex justify-center items-center p-4 r-b-border h-full"
                >
                  <el-radio-group
+                    :disabled="isEdit"
                    class="inspection-radio-group"
                    v-model="item.check"
                  >
@ -168,7 +173,7 @@
    </div>

    <div class="bottom-btns">
-      <el-button type="primary" @click="handleSave">保存</el-button>
+      <el-button  :disabled="isEdit" type="primary" @click="handleSave">保存</el-button>
      <el-button @click="$router.go(-1)">返回</el-button>
    </div>
  </div>
@ -177,6 +182,7 @@
 import { intersection } from "lodash";
 import {
  putInspectionProjectData,
+  checkUsed,
  postInspectionProjectData,
  getCheckingDictTree,
  getInspectionProjectDetails,
@ -187,6 +193,7 @@ export default {
    return {
      xcTreeData: [],
      xcTypeOptions: [],
+      isEdit: true,
      formData: {
        id: null,
        name: "",
@ -221,6 +228,9 @@ export default {
        }
      }
      this.xcTreeData = _xcTreeData;
+      const checkUsedData = await checkUsed(this.$route.query.id);
+      this.isEdit = checkUsedData?.data;
+      
    },
    // 树转换
    transformArr(treeList) {