From fc46c447f49fa6a838d2b591def2537b3171f6b0 Mon Sep 17 00:00:00 2001
From: panyuyi <panyuyi@datametatech.com>
Date: Tue, 26 Mar 2024 13:46:04 +0800
Subject: [PATCH 1/4] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=AE=B3=E5=A0=A4?=
 =?UTF-8?q?=E5=8A=A8=E7=89=A9=E7=A1=AE=E8=AE=A4=E6=93=8D=E4=BD=9Cbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../governanceRecords/index.vue               | 33 ++++++++++++-------
 1 file changed, 22 insertions(+), 11 deletions(-)

diff --git a/src/views/dike/runManage/pestAnimalControl/governanceRecords/index.vue b/src/views/dike/runManage/pestAnimalControl/governanceRecords/index.vue
index d15fbfd..63c9b09 100644
--- a/src/views/dike/runManage/pestAnimalControl/governanceRecords/index.vue
+++ b/src/views/dike/runManage/pestAnimalControl/governanceRecords/index.vue
@@ -14,6 +14,7 @@ import {
   updateDikeAnimalRecordData,
   getDikeAnimalRecordDetails,
   deleteDikeAnimalRecordDetails,
+  updateDikeAnimalRecordStatus,
 } from "@/api/dike";
 
 export default {
@@ -21,8 +22,8 @@ export default {
   data() {
     return {
       paramsData: {
-        status: "",
-        location: "",
+        status: null,
+        location: null,
       },
       dialogVisible: false,
       imageDialog: false,
@@ -175,17 +176,24 @@ export default {
     },
     // 确认
     handleConfirm(row) {
+      console.log("row >>>>>  ", row);
       this.$confirm("是否确认？", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning",
       })
         .then(() => {
-          // 确认
-          // this.$message({
-          //   type: "success",
-          //   message: "确认成功!",
-          // });
+          console.log("?????????");
+          updateDikeAnimalRecordStatus({
+            id: row.id,
+            status: "1",
+          }).then(() => {
+            this.getTableData();
+            this.$message({
+              type: "success",
+              message: "确认成功!",
+            });
+          });
         })
         .catch(() => {});
     },
@@ -308,8 +316,8 @@ export default {
     },
     // 重置搜索
     resetSearch() {
-      this.paramsData.status = "";
-      this.paramsData.location = "";
+      this.paramsData.status = null;
+      this.paramsData.location = null;
       this.getTableData();
     },
     // 获取计划列表
@@ -392,7 +400,7 @@ export default {
         />
         <span style="margin-left: 10px">状态：</span>
         <el-select v-model="paramsData.status" placeholder="请选择">
-          <el-option label="全部" value="" />
+          <el-option label="全部" :value="null" />
           <el-option
             v-for="item in statusList"
             :label="item.dictLabel"
@@ -827,7 +835,10 @@ export default {
           />
           <el-table-column prop="drugName" align="center" label="药物名称">
             <template slot-scope="scope">
-              <el-input v-model="scope.row.drugName" placeholder="请输入药物名称" />
+              <el-input
+                v-model="scope.row.drugName"
+                placeholder="请输入药物名称"
+              />
             </template>
           </el-table-column>
           <el-table-column prop="concentration" align="center" label="浓度">

From ee9183bc37706e7e99dee5edee4ebf03354de7e2 Mon Sep 17 00:00:00 2001
From: panyuyi <panyuyi@datametatech.com>
Date: Tue, 26 Mar 2024 13:49:42 +0800
Subject: [PATCH 2/4] =?UTF-8?q?fix:=20=E5=90=88=E5=B9=B6=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../runManage/superVisionInspetion/methodsManage/index.vue  | 6 ++++++
 .../projectManage/projectReportPage.vue                     | 2 +-
 .../runManage/superVisionInspetion/tasksManage/index.vue    | 5 +++--
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/views/dike/runManage/superVisionInspetion/methodsManage/index.vue b/src/views/dike/runManage/superVisionInspetion/methodsManage/index.vue
index 1f53626..4f86384 100644
--- a/src/views/dike/runManage/superVisionInspetion/methodsManage/index.vue
+++ b/src/views/dike/runManage/superVisionInspetion/methodsManage/index.vue
@@ -136,6 +136,7 @@ export default {
         style="margin-right: 16px; margin-bottom: 8px; float: right"
         type="success"
         @click="handleAddMethod()"
+        v-hasPermi="['df:run:sup:meth:add']"
         >添加</el-button
       >
       <el-table class="table" height="640" :data="tableData" border>
@@ -168,11 +169,13 @@ export default {
               type="text"
               size="small"
               @click="handleEditMethod(scope.row)"
+              v-hasPermi="['df:run:sup:meth:edit']"
               >编辑</el-button
             >
             <el-button
               type="text"
               size="small"
+              v-hasPermi="['df:run:sup:meth:view']"
               @click="handlePreviewMethod(scope.row)"
               >预览</el-button
             >
@@ -180,18 +183,21 @@ export default {
               type="text"
               size="small"
               @click="handleExportMethod(scope.row)"
+              v-hasPermi="['df:run:sup:meth:down']"
               >导出</el-button
             >
             <el-button
               type="text"
               size="small"
               @click="handleCopyMethod(scope.row)"
+              v-hasPermi="['df:run:sup:meth:edit']"
               >复制</el-button
             >
             <el-button
               type="text"
               size="small"
               @click="handleToItemsList(scope.row)"
+              v-hasPermi="['df:run:sup:meth:config']"
               >配置数据项</el-button
             >
           </template>
diff --git a/src/views/dike/runManage/superVisionInspetion/projectManage/projectReportPage.vue b/src/views/dike/runManage/superVisionInspetion/projectManage/projectReportPage.vue
index 79a91e5..18dac2a 100644
--- a/src/views/dike/runManage/superVisionInspetion/projectManage/projectReportPage.vue
+++ b/src/views/dike/runManage/superVisionInspetion/projectManage/projectReportPage.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="report-page">
     <div class="sticky-top flex justify-between">
-      <el-button type="primary" @click="handleDownPdf">下载报告</el-button>
+      <el-button v-hasPermi="['df:run:sup:project:down']" type="primary" @click="handleDownPdf">下载报告</el-button>
       <el-button @click="$router.go(-1)">返回</el-button>
     </div>
     <div class="flex justify-center mt-16">
diff --git a/src/views/dike/runManage/superVisionInspetion/tasksManage/index.vue b/src/views/dike/runManage/superVisionInspetion/tasksManage/index.vue
index 26d7ace..ccb82db 100644
--- a/src/views/dike/runManage/superVisionInspetion/tasksManage/index.vue
+++ b/src/views/dike/runManage/superVisionInspetion/tasksManage/index.vue
@@ -137,6 +137,7 @@ export default {
         class="search-btn"
         style="margin-right: 16px; margin-bottom: 8px; float: right"
         type="success"
+        v-hasPermi="['df:run:sup:task:add']"
         @click="handleGoDetails()"
         >添加</el-button
       >
@@ -153,10 +154,10 @@ export default {
         />
         <el-table-column prop="operate" align="center" label="操作">
           <template slot-scope="scope">
-            <el-button v-hasPermi="['sz:run:jc:task:edit']"  type="text" size="small" @click="handleEdit(scope.row)"
+            <el-button v-hasPermi="['df:run:sup:task:edit']" type="text" size="small" @click="handleEdit(scope.row)"
               >编辑</el-button
             >
-            <el-button v-hasPermi="['df:run:jc:task:delete']"  type="text" size="small" @click="handleDel(scope.row)"
+            <el-button v-hasPermi="['df:run:sup:task:delete']" type="text" size="small" @click="handleDel(scope.row)"
               >删除</el-button
             >
           </template>

From 1ee975795c80d32d4c98877b4863798c5d0d2c3d Mon Sep 17 00:00:00 2001
From: panyuyi <panyuyi@datametatech.com>
Date: Tue, 26 Mar 2024 17:48:07 +0800
Subject: [PATCH 3/4] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=8A=A8=E7=89=A9?=
 =?UTF-8?q?=E9=98=B2=E6=B2=BBbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../governanceRecords/index.vue               | 251 +++++++++++-------
 1 file changed, 153 insertions(+), 98 deletions(-)

diff --git a/src/views/dike/runManage/pestAnimalControl/governanceRecords/index.vue b/src/views/dike/runManage/pestAnimalControl/governanceRecords/index.vue
index b13ccf8..faf0fd1 100644
--- a/src/views/dike/runManage/pestAnimalControl/governanceRecords/index.vue
+++ b/src/views/dike/runManage/pestAnimalControl/governanceRecords/index.vue
@@ -17,6 +17,8 @@ import {
   updateDikeAnimalRecordStatus,
 } from "@/api/dike";
 
+import { uploadFileData } from "@/api/system/upload";
+
 export default {
   name: "InspectionItems",
   data() {
@@ -80,9 +82,9 @@ export default {
         drugs: [{ drugName: "", concentration: "", dose: "" }], // 用药
       },
       planRules: {
-        planId: [{ required: true, message: "请选择计划", trigger: "blur" }],
+        planId: [{ required: true, message: "请选择计划", trigger: "change" }],
         dikeCode: [
-          { required: true, message: "请选择堤防名称", trigger: "blur" },
+          { required: true, message: "请选择堤防名称", trigger: "change" },
         ],
         type: [{ required: true, message: "请选择计划", trigger: "change" }],
         month: [{ required: true, message: "请选择月份", trigger: "change" }],
@@ -176,14 +178,12 @@ export default {
     },
     // 确认
     handleConfirm(row) {
-      console.log("row >>>>>  ", row);
       this.$confirm("是否确认？", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning",
       })
         .then(() => {
-          console.log("?????????");
           updateDikeAnimalRecordStatus({
             id: row.id,
             status: "1",
@@ -199,71 +199,70 @@ export default {
     },
     // 查看或编辑计划详情
     viewOrEditPlanDetails(row, edit = false) {
+      this.handleGetRemotePlanData("");
       if (!edit) {
         this.prohibitEditing = true;
       }
-      getDFMaintenancePlan(row.id).then((res) => {
+      getDFPreventionControlPlan(row.planId).then((res) => {
         if (res.data) {
           this.planForm = res.data;
+          this.planForm.planName = res.data.name;
+          this.planForm.planId = res.data.id;
+          this.planForm.selectUser = res.data.otherConfig.selectUser;
           // this.planForm.reminderCycle = res.data.instruction + res.data.month; // ??????
           this.dialogVisible = true;
-          this.recordForm.id = row.id;
         }
       });
       getDikeAnimalRecordDetails(row.id).then((res) => {
+        this.recordForm.id = row.id;
         this.recordForm = res.data || this.recordForm;
       });
-    },
-    handleRemove(file) {
-      console.log(file);
-    },
-    handlePictureCardPreview(file) {
-      this.dialogImageUrl = file.url;
-      this.imageDialog = true;
-    },
-    handleDownload(file) {
-      console.log(file);
+
+      console.log("查看 >>>> ", this.planList);
     },
     // 保存维修计划
-    submitForm(formName) {
-      console.log("this.planForm >>>>>  ", this.planForm);
-      this.$refs[formName].validate((valid) => {
-        if (valid) {
-          if (this.planForm.id) {
-            updateDikeAnimalRecordData({
-              planId: this.planForm.planId,
-              planName: this.planForm.name,
-              id: this.$route.query.id,
-              dikeCode: this.$route.query.dikeCode,
-              ...this.recordForm,
-            }).then(() => {
-              this.getTableData();
-              this.dialogVisible = false;
-              this.$message({
-                message: "保存成功",
-                type: "success",
-              });
-            });
-          } else {
-            addDikeAnimalRecordData({
-              planId: this.planForm.planId,
-              planName: this.planForm.name,
-              id: null,
-              status: "0",
-              dikeCode: this.$route.query.dikeCode,
-              ...this.recordForm,
-            }).then(() => {
-              this.getTableData();
-              this.dialogVisible = false;
-              this.$message({
-                message: "保存成功",
-                type: "success",
-              });
-            });
-          }
-        } else {
-          console.log("校验不通过");
-          return false;
+    submitForm() {
+      this.$refs.planForm.validate((v) => {
+        if (v) {
+          this.$refs.recordForm.validate((valid) => {
+            if (valid) {
+              if (this.planForm.id) {
+                updateDikeAnimalRecordData({
+                  planId: this.planForm.planId,
+                  planName: this.planForm.name,
+                  id: this.$route.query.id,
+                  dikeCode: this.$route.query.dikeCode,
+                  ...this.recordForm,
+                }).then(() => {
+                  this.getTableData();
+                  this.dialogVisible = false;
+                  this.$message({
+                    message: "保存成功",
+                    type: "success",
+                  });
+                });
+              } else {
+                addDikeAnimalRecordData({
+                  planId: this.planForm.planId,
+                  planName: this.planForm.name,
+                  id: null,
+                  status: "0",
+                  dikeCode: this.$route.query.dikeCode,
+                  ...this.recordForm,
+                }).then(() => {
+                  this.getTableData();
+                  this.dialogVisible = false;
+                  this.$message({
+                    message: "保存成功",
+                    type: "success",
+                  });
+                });
+              }
+            } else {
+              console.log("校验不通过");
+              return false;
+            }
+          });
         }
       });
     },
@@ -273,9 +272,9 @@ export default {
       this.dialogVisible = false;
     },
     // 关闭dialog
-    closeDialog(planForm = "planForm") {
-      console.log("触发关闭dialog", planForm);
-      this.$refs[planForm].resetFields();
+    closeDialog() {
+      this.$refs.recordForm.resetFields();
+      this.$refs.planForm.resetFields();
       this.planForm = {
         dikeCode: "",
         name: "",
@@ -285,6 +284,15 @@ export default {
         location: "",
         content: "",
       };
+      this.recordForm = {
+        id: null,
+        location: "",
+        constructionStatus: "",
+        pest: null,
+        images: [],
+        remark: "",
+        drugs: [{ drugName: "", concentration: "", dose: "" }], // 用药
+      };
     },
     // 添加工作项
     addWorkItem() {
@@ -346,7 +354,6 @@ export default {
     changeDikePlan(planId) {
       if (planId) {
         getDFPreventionControlPlan(planId).then((res) => {
-          console.log("res >>>>>  ", res);
           if (res?.data) {
             const { data } = res;
             this.planForm.dikeCode = data.dikeCode;
@@ -364,6 +371,30 @@ export default {
         });
       }
     },
+    // 上传前
+    beforeUpload(e) {
+      if (this.recordForm.images?.length >= 10) {
+        this.$message.warning("最多上传10张图片");
+        return false;
+      }
+      return true;
+    },
+    handleUpload(e) {
+      const { file } = e;
+      let fData = new FormData();
+      fData.append("file", file);
+      uploadFileData(fData)
+        .then((res) => {
+          this.recordForm.images?.push(res.url);
+        })
+        .catch((err) => {
+          console.log("err >>>>>  ", err);
+        });
+    },
+    // 删除图片
+    handleDelImages(index) {
+      this.recordForm.images.splice(index, 1);
+    },
   },
   mounted() {
     this.getDicts("dh_jh_type").then((res) => {
@@ -471,9 +502,9 @@ export default {
               >编辑</el-button
             >
             <el-button
-              style="margin-right: 9px"
               type="text"
               size="small"
+              v-if="scope.row.status == '0'"
               @click="handleConfirm(scope.row)"
               v-hasPermi="['df:run:fz:record:confirm']"
               >确认</el-button
@@ -487,7 +518,7 @@ export default {
               @confirm="deleteTableItem(scope.row)"
             >
               <el-button
-                style="color: red"
+                style="color: red; margin-left: 9px"
                 type="text"
                 size="small"
                 slot="reference"
@@ -888,39 +919,51 @@ export default {
           </el-table-column>
         </el-table>
         <el-form-item label-width="120px" label="上传图片" prop="images">
-          <el-upload action="#" list-type="picture-card" :auto-upload="false">
-            <i slot="default" class="el-icon-plus"></i>
-            <div slot="file" slot-scope="{ file }">
-              <img
-                class="el-upload-list__item-thumbnail"
-                :src="file.url"
-                alt=""
-              />
-              <span class="el-upload-list__item-actions">
-                <span
-                  class="el-upload-list__item-preview"
-                  @click="handlePictureCardPreview(file)"
-                >
-                  <i class="el-icon-zoom-in"></i>
-                </span>
-                <span
-                  class="el-upload-list__item-delete"
-                  @click="handleDownload(file)"
-                >
-                  <i class="el-icon-download"></i>
-                </span>
-                <span
-                  class="el-upload-list__item-delete"
-                  @click="handleRemove(file)"
-                >
-                  <i class="el-icon-delete"></i>
-                </span>
-              </span>
+          <div class="flex flex-wrap">
+            <div
+              style="width: 148px; height: 148px"
+              v-for="(url, index) in recordForm.images"
+              :key="index"
+              class="mr-6 mb-6 img-div-box"
+            >
+              <el-image
+                style="width: 148px; height: 148px"
+                :src="url"
+                fit="contain"
+                :preview-src-list="[url]"
+              >
+                <template #error>
+                  <div
+                    class="w-full flex justify-center items-center"
+                    style="
+                      height: 148px;
+                      border: 1px solid #f0f0f0;
+                      font-style: italic;
+                      color: #ccc;
+                    "
+                  >
+                    图片加载失败
+                  </div>
+                </template>
+              </el-image>
+              <i
+                class="el-icon-error del-btn-icon"
+                @click="handleDelImages(index)"
+              ></i>
             </div>
+          </div>
+          <el-upload
+            action="#"
+            list-type="picture-card"
+            :http-request="handleUpload"
+            :auto-upload="true"
+            :before-upload="beforeUpload"
+            :showFileList="false"
+            accept=".jpg,.png,.jpeg"
+            :maxLength="10"
+          >
+            <i slot="default" class="el-icon-plus"></i>
           </el-upload>
-          <el-dialog :visible.sync="imageDialog">
-            <img width="100%" :src="dialogImageUrl" alt="" />
-          </el-dialog>
         </el-form-item>
         <el-form-item label-width="120px" label="备注" prop="remark">
           <el-input
@@ -996,12 +1039,24 @@ export default {
       background-color: #2b8070;
     }
   }
-}
 
-/deep/.el-input__count {
-  height: 15px;
-  line-height: 15px;
-  margin-right: 10px;
-  margin-bottom: -4px;
+  .img-div-box {
+    position: relative;
+    .del-btn-icon {
+      display: none;
+      position: absolute;
+      top: -8px;
+      right: -8px;
+      font-size: 24px;
+      color: rgba(0, 0, 0, 0.5);
+      cursor: pointer;
+    }
+
+    &:hover {
+      .del-btn-icon {
+        display: block;
+      }
+    }
+  }
 }
 </style>

From 0752fce88644e146d68864486d69c1467492c5c2 Mon Sep 17 00:00:00 2001
From: panyuyi <panyuyi@datametatech.com>
Date: Tue, 26 Mar 2024 17:53:54 +0800
Subject: [PATCH 4/4] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pestAnimalControl/governanceRecords/index.vue        | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/views/dike/runManage/pestAnimalControl/governanceRecords/index.vue b/src/views/dike/runManage/pestAnimalControl/governanceRecords/index.vue
index faf0fd1..b7ba9a2 100644
--- a/src/views/dike/runManage/pestAnimalControl/governanceRecords/index.vue
+++ b/src/views/dike/runManage/pestAnimalControl/governanceRecords/index.vue
@@ -872,6 +872,7 @@ export default {
             <template slot-scope="scope">
               <el-input
                 v-model="scope.row.drugName"
+                maxLength="100"
                 placeholder="请输入药物名称"
               />
             </template>
@@ -880,13 +881,18 @@ export default {
             <template slot-scope="scope">
               <el-input
                 v-model="scope.row.concentration"
+                maxLength="100"
                 placeholder="请输入浓度"
               />
             </template>
           </el-table-column>
           <el-table-column prop="dose" align="center" label="剂量" width="80">
             <template slot-scope="scope">
-              <el-input v-model="scope.row.dose" placeholder="请输入剂量" />
+              <el-input
+                v-model="scope.row.dose"
+                maxLength="100"
+                placeholder="请输入剂量"
+              />
             </template>
           </el-table-column>
           <el-table-column align="center" label="操作" width="100">
@@ -896,6 +902,7 @@ export default {
                 type="text"
                 size="small"
                 @click="addWorkItem"
+                :disabled="recordForm.drugs.length >= 10"
                 >添加</el-button
               >
               <el-popconfirm