diff --git a/package.json b/package.json
index 6e235b5..5e4a9ad 100644
--- a/package.json
+++ b/package.json
@@ -59,6 +59,7 @@
     "js-beautify": "1.10.2",
     "js-cookie": "2.2.0",
     "jsencrypt": "^3.2.0",
+    "jspdf": "^2.5.1",
     "jsplumb": "^2.15.6",
     "less": "^4.1.1",
     "less-loader": "^7.0.0",
diff --git a/src/api/sluice/index.js b/src/api/sluice/index.js
index 5935e71..8af65aa 100644
--- a/src/api/sluice/index.js
+++ b/src/api/sluice/index.js
@@ -274,11 +274,11 @@ export function updateSuperviseWayItemData(data){
 }
 
 // 督检查办法-获取启用中的督检查办法
-export function getEnableSuperviseWayData(data){
+export function getEnableSuperviseWayData(params){
   return request({
     url: `/run/sz/superviseWay/enable`,
     method: 'get',
-    data
+    params
   })
 }
 
@@ -324,3 +324,46 @@ export function putSuperviseWayTaskDetailsData(data){
     data
   })
 }
+
+// 监督检查-新增工程问题上报
+export function addSuperviseEngineeringReportData(data){
+  return request({
+    url: `/run/sz/superviseEngineering/add`,
+    method: 'post',
+    data
+  })
+}
+
+// 监督检查-工程详情
+export function getSuperviseEngineeringReportDetailsData(id){
+  return request({
+    url: `/run/sz/superviseEngineering/detail/${id}`,
+    method: 'get'
+  })
+}
+
+// 监督检查-工程问题列表
+export function getSuperviseEngineeringProblemListData(data){
+  return request({
+    url: `/run/sz/superviseEngineering/list`,
+    method: 'post',
+    data
+  })
+}
+
+// 监督检查-工程问题详情
+export function getSuperviseEngineeringProblemDetailsData(id){
+  return request({
+    url: `/run/sz/superviseEngineering/problemDetail/${id}`,
+    method: 'get'
+  })
+}
+
+// 监督检查-工程问题问题处理和状态修改
+export function updateSuperviseEngineeringProblemStatusAndData(data){
+  return request({
+    url: `/run/sz/superviseEngineering/updateStatus`,
+    method: 'put',
+    data
+  })
+}
diff --git a/src/assets/styles/flex.scss b/src/assets/styles/flex.scss
index 78c7f88..ef2bfe9 100644
--- a/src/assets/styles/flex.scss
+++ b/src/assets/styles/flex.scss
@@ -1,6 +1,12 @@
 .flex {
   display: flex;
 }
+.flex-3{
+  flex: 3;
+}
+.flex-2{
+  flex: 2;
+}
 .flex-1{
   flex: 1;
 }
diff --git a/src/views/sluice/runManage/supervisionInspetion/projectManage/index.vue b/src/views/sluice/runManage/supervisionInspetion/projectManage/index.vue
index cac0a01..14a748b 100644
--- a/src/views/sluice/runManage/supervisionInspetion/projectManage/index.vue
+++ b/src/views/sluice/runManage/supervisionInspetion/projectManage/index.vue
@@ -43,6 +43,7 @@ export default {
         path: "supervisionProjectReport",
         query: {
           type: "preview",
+          wayId: row.wayId,
           id: row.id,
         },
       });
@@ -53,6 +54,17 @@ export default {
         path: "supervisionProjectReport",
         query: {
           type: "edit",
+          wayId: row.wayId,
+          id: row.id,
+        },
+      });
+    },
+    // 跳转报告页面
+    handleCheckReport(row) {
+      this.$router.push({
+        path: "supervisionProjectReportPage",
+        query: {
+          wayId: row.wayId,
           id: row.id,
         },
       });
@@ -90,7 +102,9 @@ export default {
       }).then((res) => {
         if (res) {
           this.tableData = res.records.map((item) => {
-            item.deadTime = this.calcDeadLine(item.doneTime);
+            if (item.state != "1") {
+              item.deadTime = this.calcDeadLine(item.doneTime);
+            }
             return item;
           });
           this.pageData.total = res.total;
@@ -170,9 +184,20 @@ export default {
             <el-button type="text" size="small" @click="handleCheck(scope.row)"
               >查看</el-button
             >
-            <el-button type="text" size="small" @click="handleEdit(scope.row)"
+            <el-button
+              type="text"
+              size="small"
+              v-if="scope.row.state != '1'"
+              @click="handleEdit(scope.row)"
               >巡查</el-button
             >
+            <el-button
+              v-else
+              type="text"
+              size="small"
+              @click="handleCheckReport(scope.row)"
+              >报告</el-button
+            >
           </template>
         </el-table-column>
       </el-table>
diff --git a/src/views/sluice/runManage/supervisionInspetion/projectManage/projectReport.vue b/src/views/sluice/runManage/supervisionInspetion/projectManage/projectReport.vue
index f0441ff..7904d10 100644
--- a/src/views/sluice/runManage/supervisionInspetion/projectManage/projectReport.vue
+++ b/src/views/sluice/runManage/supervisionInspetion/projectManage/projectReport.vue
@@ -1,22 +1,39 @@
 <!-- 监督检查工程管理 -->
 <script>
-import { getEnableSuperviseWayData } from "@/api/sluice";
+import { cloneDeep } from "lodash";
+import { uploadFileData } from "@/api/system/upload";
+import { listUser } from "@/api/management";
+import {
+  getEnableSuperviseWayData,
+  getSuperviseEngineeringReportDetailsData,
+  addSuperviseEngineeringReportData,
+} from "@/api/sluice";
 export default {
   name: "projectReport",
   data() {
     return {
       activeName: "",
-      formData: [],
+      currentItem: null,
+      problemList: [],
+      personnelList: [],
+      formData: {
+        patrolName: "",
+        patrolUid: "",
+        problemList: [],
+        state: "",
+        taskId: "",
+        weather: "",
+      },
     };
   },
   computed: {
     // 进度条
     calcStep() {
-      if (this.formData.length) {
-        let sum = this.formData.reduce((prev, cur) => {
+      if (this.problemList.length) {
+        let sum = this.problemList.reduce((prev, cur) => {
           return prev + cur.children.length;
         }, 0);
-        let hasDoneLevel = this.formData.reduce((prev, cur) => {
+        let hasDoneLevel = this.problemList.reduce((prev, cur) => {
           return (
             prev +
             cur.children.reduce((prev2, cur2) => {
@@ -30,28 +47,72 @@ export default {
         return 0;
       }
     },
+    isDisabled() {
+      return (
+        this.formData.state === "1" || this.$route.query.type === "preview"
+      );
+    },
+    // 巡查人员
+    computedPatrolUid: {
+      get() {
+        return this.formData.patrolUid?.split(",").filter((v) => v) || [];
+      },
+      set(val) {
+        this.formData.patrolUid = val?.join(",") || "";
+        this.formData.patrolName = this.personnelList
+          .filter((v) => val.includes(v.id))
+          .map((v) => v.nickName)
+          .join(",");
+      },
+    },
   },
   methods: {
-    // 获取启用的方法配置项
-    getEnableSuperviseWayData() {
-      getEnableSuperviseWayData().then((res) => {
-        console.log(res);
+    // 搜索用户
+    searchUser(e = null) {
+      listUser({
+        data: {
+          timeView: {
+            timeField: "create_time",
+          },
+        },
+        cv: {
+          name: "nickName",
+          type: "like",
+          value: e,
+        },
+        pageSize: 100,
+        pageNum: 1,
+      }).then((res) => {
+        this.personnelList = res.records;
+      });
+    },
+    async initData() {
+      const enableData = await getEnableSuperviseWayData({
+        wayId: this.$route.query.wayId,
+      });
+      if (enableData) {
         let list = [];
-        res.data?.itemList?.forEach((item, index) => {
+        enableData.data?.itemList?.forEach((item, index) => {
           if (index === 0) {
             list.push({
+              id: item.id,
               projectId: item.projectId,
               projectName: item.projectName,
               problemDescribe: "",
+              siteSituationRecords: "",
+              siteSituationRecordsArr: [],
               children: [{ ...item, level: null }],
             });
           } else {
             let exitItem = list.find((v) => v.projectId === item.projectId);
             if (!exitItem) {
               list.push({
+                id: item.id,
                 projectId: item.projectId,
                 projectName: item.projectName,
                 problemDescribe: "",
+                siteSituationRecords: "",
+                siteSituationRecordsArr: [],
                 children: [{ ...item, level: null }],
               });
             } else {
@@ -62,22 +123,176 @@ export default {
             }
           }
         });
-        this.formData = list;
+        this.problemList = list;
         this.activeName = list[0]?.projectId || "";
+      }
+
+      const detailRes = await getSuperviseEngineeringReportDetailsData(
+        this.$route.query.id
+      );
+      if (detailRes?.data && this.problemList.length) {
+        const { data } = detailRes;
+        this.formData.patrolName = data.patrolName;
+        this.formData.patrolUid = data.patrolUid;
+        this.formData.state = data.state;
+        this.formData.taskId = data.taskId;
+        this.formData.weather = data.weather;
+        this.formData.problemList = [];
+        const { engineeringList, problemList } = data;
+        this.problemList.forEach((item) => {
+          let exitItem = engineeringList.find(
+            (v) => v.projectId === item.projectId
+          );
+          if (exitItem) {
+            item.newId = item.id === exitItem.id ? null : exitItem.id;
+            item.problemDescribe = exitItem.problemDescribe;
+            item.siteSituationRecords = exitItem.siteSituationRecords;
+            item.siteSituationRecordsArr = exitItem.siteSituationRecords
+              ? exitItem.siteSituationRecords.split(",")
+              : [];
+            item.children.forEach((item2) => {
+              let exitItem2 = problemList.find(
+                (v) => v.projectItemId === item2.id
+              );
+              if (exitItem2) {
+                item2.level = exitItem2.level;
+                item2.newId = item2.id === exitItem2.id ? null : exitItem2.id;
+              }
+            });
+          }
+        });
+      }
+    },
+    // 选中某个项目
+    handleClickItem(item) {
+      this.currentItem = item;
+    },
+    // 上传前
+    beforeUpload(e) {
+      console.log("beforeUpload >>>>>  ", e);
+      if (this.currentItem.siteSituationRecordsArr?.length >= 99) {
+        this.$message.warning("最多上传99张图片");
+        return false;
+      }
+      return true;
+    },
+    handleUpload(e) {
+      const { file } = e;
+      let fData = new FormData();
+      fData.append("file", file);
+      uploadFileData(fData)
+        .then((res) => {
+          this.currentItem.siteSituationRecordsArr.push(res.url);
+        })
+        .catch((err) => {
+          console.log("err >>>>>  ", err);
+        });
+    },
+    // 获取启用的方法配置项
+    getEnableSuperviseWayData() {
+      getEnableSuperviseWayData({ wayId: this.$route.query.wayId }).then(
+        (res) => {
+          console.log(res);
+          let list = [];
+          res.data?.itemList?.forEach((item, index) => {
+            if (index === 0) {
+              list.push({
+                projectId: item.projectId,
+                projectName: item.projectName,
+                problemDescribe: "",
+                siteSituationRecords: "",
+                siteSituationRecordsArr: [],
+                children: [{ ...item, level: null }],
+              });
+            } else {
+              let exitItem = list.find((v) => v.projectId === item.projectId);
+              if (!exitItem) {
+                list.push({
+                  projectId: item.projectId,
+                  projectName: item.projectName,
+                  problemDescribe: "",
+                  siteSituationRecords: "",
+                  siteSituationRecordsArr: [],
+                  children: [{ ...item, level: null }],
+                });
+              } else {
+                exitItem.children.push({
+                  ...item,
+                  level: null,
+                });
+              }
+            }
+          });
+          this.problemList = list;
+          this.activeName = list[0]?.projectId || "";
+        }
+      );
+    },
+    // 处理提交数据
+    dealFormData() {
+      this.formData.taskId = this.$route.query.id;
+      this.problemList.forEach((item) => {
+        let problemItem = {
+          id: item.newId || null,
+          levelList: [],
+          problemDescribe: item.problemDescribe,
+          siteSituationRecords: item.siteSituationRecordsArr.join(",") || "",
+          projectId: item.projectId,
+        };
+        if (item.children.length) {
+          item.children.forEach((item2) => {
+            problemItem.levelList.push({
+              id: item2.newId || null,
+              level: item2.level,
+              projectItemId: item2.id,
+            });
+          });
+        }
+        this.formData.problemList.push(problemItem);
       });
+      return cloneDeep(this.formData);
     },
     handleSave() {
       console.log("保存");
+      let data = this.dealFormData();
+      data.state = "0";
+      console.log("data >>>>>  ", data);
+      addSuperviseEngineeringReportData(data).then((res) => {
+        this.$message({
+          type: "success",
+          message: "保存成功",
+        });
+      });
     },
     handleSubmit() {
       if (this.calcStep < 100) {
         this.$message.warning("检查进度未达到100%，请检查");
         return;
       }
+      // 二次确认提交
+      this.$confirm("是否确认提交?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          let data = this.dealFormData();
+          data.state = "1";
+          console.log("data >>>>>  ", data);
+          addSuperviseEngineeringReportData(data).then((res) => {
+            this.$message({
+              type: "success",
+              message: "提交成功",
+            });
+            this.formData.state = "1";
+          });
+        })
+        .catch(() => {});
     },
   },
   created() {
-    this.getEnableSuperviseWayData();
+    this.searchUser();
+    this.initData();
   },
   mounted() {},
 };
@@ -87,24 +302,54 @@ export default {
   <div class="body slider-right">
     <div class="top-title">工程问题上报</div>
     <div class="table-box">
-      <template v-if="formData.length">
-        <div class="step-box">
-          <div
-            class="bar"
-            :style="{
-              left: `-${100 - calcStep}%`,
-              backgroundColor: `rgb(${255 - (255 * calcStep) / 100},${
-                0 + (255 * calcStep) / 100
-              },0)`,
-            }"
-          ></div>
-          <div style="position: relative; z-index: 1" class="pl-4 font-14">
-            检查进度 {{ calcStep }}%
-          </div>
+      <div class="step-box">
+        <div
+          class="bar"
+          :style="{
+            left: `-${100 - calcStep}%`,
+            backgroundColor: `rgb(${255 - (255 * calcStep) / 100},${
+              0 + (255 * calcStep) / 100
+            },0)`,
+          }"
+        ></div>
+        <div style="position: relative; z-index: 1" class="pl-4 font-14">
+          检查进度 {{ calcStep }}%
         </div>
+      </div>
+      <div class="flex items-center mb-12">
+        <div>巡查人员</div>
+        <el-select
+          :disabled="isDisabled"
+          style="width: 240px"
+          class="ml-4"
+          v-model="computedPatrolUid"
+          multiple
+          filterable
+          remote
+          :remote-method="searchUser"
+          placeholder="请选择"
+        >
+          <el-option
+            v-for="item in personnelList"
+            :key="item.id"
+            :label="item.nickName"
+            :value="item.id"
+          >
+          </el-option>
+        </el-select>
+        <div class="ml-24">天气</div>
+        <el-input
+          :disabled="isDisabled"
+          class="ml-4"
+          style="width: 240px"
+          v-model="formData.weather"
+          placeholder="请输入"
+        />
+      </div>
+      <template v-if="problemList.length">
         <el-tabs v-model="activeName" type="card">
           <el-tab-pane
-            v-for="item in formData"
+            v-for="item in problemList"
             :key="item.id"
             :label="item.projectName"
             :name="item.projectId"
@@ -125,27 +370,34 @@ export default {
                       <div>较重：{{ item2.heavyGrade || " " }}；</div>
                       <div>严重：{{ item2.seriousGrade || " " }}；</div>
                     </div>
-                    <span>提示</span>
+                    <i
+                      class="el-icon-warning font-20"
+                      style="color: #e6a23c"
+                    ></i>
                   </el-tooltip>
                 </div>
               </div>
               <div class="question-select">
                 <el-button
+                  :disabled="isDisabled"
                   :type="item2.level === '0' ? 'primary' : ''"
                   @click="item2.level = '0'"
                   >无</el-button
                 >
                 <el-button
+                  :disabled="isDisabled"
                   :type="item2.level === '1' ? 'primary' : ''"
                   @click="item2.level = '1'"
                   >一般</el-button
                 >
                 <el-button
+                  :disabled="isDisabled"
                   :type="item2.level === '2' ? 'primary' : ''"
                   @click="item2.level = '2'"
                   >较重</el-button
                 >
                 <el-button
+                  :disabled="isDisabled"
                   :type="item2.level === '3' ? 'primary' : ''"
                   @click="item2.level = '3'"
                   >严重</el-button
@@ -159,17 +411,63 @@ export default {
                   type="textarea"
                   v-model="item.problemDescribe"
                   :rows="4"
+                  :disabled="isDisabled"
                   placeholder="请输入内容"
                 />
               </div>
             </div>
             <div class="question-row w-full">
               <div class="question-col flex-shrink-0">照片</div>
-              <div class="question-col flex-1">上传照片</div>
+              <div class="question-col flex-1">
+                <div class="flex flex-wrap">
+                  <div
+                    class="w-100 h-100 mr-12 mb-12"
+                    v-for="(item, index) in item.siteSituationRecordsArr"
+                    :key="index"
+                  >
+                    <el-image
+                      style="width: 200px; min-height: 100px; height: auto"
+                      :src="item"
+                      :preview-src-list="[item]"
+                    >
+                      <template #error>
+                        <div
+                          class="w-full flex justify-center items-center"
+                          style="
+                            height: 100px;
+                            border: 1px solid #f0f0f0;
+                            font-style: italic;
+                            color: #ccc;
+                          "
+                        >
+                          图片加载失败
+                        </div>
+                      </template>
+                    </el-image>
+                  </div>
+                </div>
+                <el-upload
+                  action="#"
+                  :disabled="isDisabled"
+                  :http-request="handleUpload"
+                  :auto-upload="true"
+                  :before-upload="beforeUpload"
+                  :showFileList="false"
+                  accept=".jpg,.png,.jpeg"
+                  :maxLength="99"
+                >
+                  <el-button
+                    type="primary"
+                    @click="handleClickItem(item)"
+                    :disabled="isDisabled"
+                    >上传</el-button
+                  >
+                </el-upload>
+              </div>
             </div>
           </el-tab-pane>
         </el-tabs>
-        <div class="mt-30 flex justify-end">
+        <div class="mt-30 flex justify-end" v-if="!isDisabled">
           <el-button class="mr-12" @click="handleSave">保存</el-button>
           <el-button type="primary" @click="handleSubmit">提交</el-button>
         </div>
@@ -196,16 +494,17 @@ export default {
 
   .table-box {
     width: 100%;
-    min-height: calc(100vh - 56px - 64px);
+    height: calc(100vh - 56px - 64px);
     margin-top: 24px;
     padding: 16px;
     background-color: white;
+    overflow: auto;
     .step-box {
       position: relative;
       height: 32px;
       width: 120px;
       background-color: #f0f0f0;
-      border: 1px solid #333;
+      border: 1px solid #999;
       border-radius: 2px;
       float: right;
       display: flex;
diff --git a/src/views/sluice/runManage/supervisionInspetion/projectManage/projectReportPage.vue b/src/views/sluice/runManage/supervisionInspetion/projectManage/projectReportPage.vue
new file mode 100644
index 0000000..e33fec8
--- /dev/null
+++ b/src/views/sluice/runManage/supervisionInspetion/projectManage/projectReportPage.vue
@@ -0,0 +1,352 @@
+<template>
+  <div class="report-page">
+    <div class="sticky-top flex justify-between">
+      <el-button type="primary" @click="handleDownPdf">下载报告</el-button>
+      <el-button @click="$router.go(-1)">返回</el-button>
+    </div>
+    <div class="flex justify-center mt-16">
+      <div class="p-20" ref="pdfRef">
+        <div class="table-box border-l-t font-14">
+          <div class="text-center font-16 border-b-r p-10">
+            {{ formData.name }}
+          </div>
+          <div class="flex border-l-t w-full">
+            <div class="flex flex-1">
+              <div class="label border-b-r p-10 w-100">巡查时间</div>
+              <div class="value border-b-r flex-1 p-10">
+                {{ formData.startTime }}-{{ formData.doneTime }}
+              </div>
+            </div>
+            <div class="flex flex-1">
+              <div class="label border-b-r p-10 w-100">天气</div>
+              <div class="value border-b-r flex-1 p-10">
+                {{ formData.weather || "-" }}
+              </div>
+            </div>
+          </div>
+          <div class="flex border-l-t w-full">
+            <div class="flex flex-1">
+              <div class="label border-b-r p-10 w-100">检查人员</div>
+              <div class="value border-b-r flex-1 p-10">
+                {{ formData.patrolName || "-" }}
+              </div>
+            </div>
+          </div>
+          <div class="flex border-l-t w-full">
+            <div class="flex flex-1">
+              <div class="label border-b-r p-10 w-100">管理单位</div>
+              <div class="value border-b-r flex-1 p-10">
+                {{ formData.engineeringManagementUnit }}
+              </div>
+            </div>
+            <div class="flex flex-1">
+              <div class="label border-b-r p-10 w-100">水闸名称</div>
+              <div class="value border-b-r flex-1 p-10">
+                {{ formData.wagaName || "-" }}
+              </div>
+            </div>
+          </div>
+          <div class="flex border-l-t w-full">
+            <div
+              class="flex-1 border-b-r p-10 w-full flex justify-center items-center"
+            >
+              检查内容
+            </div>
+            <div class="w-300">
+              <div class="label border-b-r p-6 text-center">问题等级</div>
+              <div class="flex flex-shrink-0">
+                <div class="flex-1 border-b-r p-6 text-center">无</div>
+                <div class="flex-1 border-b-r p-6 text-center">一般</div>
+                <div class="flex-1 border-b-r p-6 text-center">较重</div>
+                <div class="flex-1 border-b-r p-6 text-center">严重</div>
+              </div>
+            </div>
+          </div>
+          <div class="border-l-t w-full">
+            <div v-for="(item, index) in problemList" :key="index" class="flex">
+              <div class="w-p-10 border-b-r">
+                <div class="flex items-center p-10">{{ item.projectName }}</div>
+              </div>
+              <div class="w-p-90">
+                <div
+                  v-for="(item2, index2) in item.children"
+                  :key="index2 + '0'"
+                  class="w-full flex"
+                >
+                  <div class="flex-1 border-b-r p-10">{{ item2.content }}</div>
+                  <div class="w-300 flex flex-shrink-0">
+                    <div
+                      class="flex-1 border-b-r p-10 flex justify-center items-center"
+                    >
+                      <i class="el-icon-check" v-if="item2.level === '0'"></i>
+                    </div>
+                    <div
+                      class="flex-1 border-b-r p-10 flex justify-center items-center"
+                    >
+                      <i class="el-icon-check" v-if="item2.level === '1'"></i>
+                    </div>
+                    <div
+                      class="flex-1 border-b-r p-10 flex justify-center items-center"
+                    >
+                      <i class="el-icon-check" v-if="item2.level === '2'"></i>
+                    </div>
+                    <div
+                      class="flex-1 border-b-r p-10 flex justify-center items-center"
+                    >
+                      <i class="el-icon-check" v-if="item2.level === '3'"></i>
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+          <div class="border-l-t w-full">
+            <div class="flex">
+              <div class="w-p-10 border-b-r">
+                <div class="flex items-center p-10">问题描述</div>
+              </div>
+              <div class="w-p-90 border-b-r p-10">
+                {{
+                  formData.describeTotal && formData.describeTotal.slice(0, -1)
+                }}
+              </div>
+            </div>
+          </div>
+          <div class="border-l-t w-full">
+            <div class="flex">
+              <div class="w-p-10 border-b-r">
+                <div class="flex items-center p-10">现场记录情况</div>
+              </div>
+              <div class="w-p-90 border-b-r p-10">
+                <el-image
+                  v-for="item in formData.pictures"
+                  :src="item"
+                  style="width: auto"
+                  class="mb-10 mr-10"
+                  :preview-src-list="[item]"
+                >
+                  <template #error>
+                    <div
+                      class="w-full flex justify-center items-center"
+                      style="
+                        height: 100px;
+                        border: 1px solid #f0f0f0;
+                        font-style: italic;
+                        color: #ccc;
+                        padding: 10px;
+                      "
+                    >
+                      图片加载失败
+                    </div>
+                  </template>
+                </el-image>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="w-full" style="height: 200px">
+      <!-- 占位 -->
+    </div>
+  </div>
+</template>
+<script>
+import html2canvas from "html2canvas";
+import { jsPDF } from "jspdf";
+import {
+  getEnableSuperviseWayData,
+  getSuperviseEngineeringReportDetailsData,
+} from "@/api/sluice";
+
+import { Loading } from "element-ui";
+export default {
+  data() {
+    return {
+      problemList: [],
+      formData: {},
+      loadingInstance: null,
+    };
+  },
+  created() {
+    this.initData();
+  },
+  methods: {
+    // 初始化数据
+    async initData() {
+      const enableData = await getEnableSuperviseWayData({
+        wayId: this.$route.query.wayId,
+      });
+      if (enableData) {
+        let list = [];
+        enableData.data?.itemList?.forEach((item, index) => {
+          if (index === 0) {
+            list.push({
+              id: item.id,
+              projectId: item.projectId,
+              projectName: item.projectName,
+              problemDescribe: "",
+              siteSituationRecords: "",
+              siteSituationRecordsArr: [],
+              children: [{ ...item, level: null }],
+            });
+          } else {
+            let exitItem = list.find((v) => v.projectId === item.projectId);
+            if (!exitItem) {
+              list.push({
+                id: item.id,
+                projectId: item.projectId,
+                projectName: item.projectName,
+                problemDescribe: "",
+                siteSituationRecords: "",
+                siteSituationRecordsArr: [],
+                children: [{ ...item, level: null }],
+              });
+            } else {
+              exitItem.children.push({
+                ...item,
+                level: null,
+              });
+            }
+          }
+        });
+        this.problemList = list;
+        console.log("this.problemList >>>>>  ", this.problemList);
+      }
+
+      const detailRes = await getSuperviseEngineeringReportDetailsData(
+        this.$route.query.id
+      );
+      if (detailRes?.data && this.problemList.length) {
+        const { data } = detailRes;
+        this.formData = { ...data };
+        this.formData.problemList = [];
+        this.formData.pictures = [];
+        // 产品说描述拼接一起
+        this.formData.describeTotal = "";
+        const { engineeringList, problemList } = data;
+        this.problemList.forEach((item) => {
+          let exitItem = engineeringList.find(
+            (v) => v.projectId === item.projectId
+          );
+          if (exitItem) {
+            item.newId = item.id === exitItem.id ? null : exitItem.id;
+            item.problemDescribe = exitItem.problemDescribe;
+            if (item.problemDescribe) {
+              this.formData.describeTotal += item.problemDescribe + "，";
+            }
+            item.siteSituationRecords = exitItem.siteSituationRecords;
+            item.siteSituationRecordsArr = exitItem.siteSituationRecords
+              ? exitItem.siteSituationRecords.split(",")
+              : [];
+            if (item.siteSituationRecordsArr.length > 0) {
+              this.formData.pictures.push(...item.siteSituationRecordsArr);
+            }
+            item.children.forEach((item2) => {
+              let exitItem2 = problemList.find(
+                (v) => v.projectItemId === item2.id
+              );
+              if (exitItem2) {
+                item2.level = exitItem2.level;
+                item2.newId = item2.id === exitItem2.id ? null : exitItem2.id;
+              }
+            });
+          }
+        });
+      }
+    },
+    // 下载报告
+    handleDownPdf() {
+      this.loadingInstance = Loading.service({
+        lock: true,
+        text: "正在生成PDF中...",
+        spinner: "el-icon-loading",
+        background: "rgba(0, 0, 0, 0.7)",
+      });
+      // A4纸pdf宽高
+      const PDF_W = 592.28;
+      const PDF_H = 841.89;
+      html2canvas(this.$refs.pdfRef, {
+        useCORS: true,
+        scale: 2,
+      })
+        .then((canvas) => {
+          const width = canvas.width;
+          const height = canvas.height;
+          const pageHeight = (width / PDF_W) * PDF_H;
+          let leftHeight = height;
+          let position = 0;
+          var pageData = canvas.toDataURL("image/jpeg", 1.0);
+
+          const imgWidth = PDF_W;
+          const imgHeight = (PDF_W / width) * height;
+
+          let pdf = new jsPDF(undefined, "pt", "a4");
+          if (height < pageHeight) {
+            pdf.addImage(pageData, "JPEG", 0, position, imgWidth, imgHeight);
+          } else {
+            while (leftHeight > 0) {
+              pdf.addImage(pageData, "JPEG", 0, position, imgWidth, imgHeight);
+              leftHeight -= pageHeight;
+              position -= PDF_H;
+              if (leftHeight > 0) {
+                pdf.addPage();
+              }
+            }
+          }
+          let save = pdf.save("demo.pdf");
+          this.loadingInstance.close();
+        })
+        .catch((e) => {
+          console.log("e >>>>>  ", e);
+          this.loadingInstance.close();
+        });
+    },
+  },
+};
+</script>
+<style scoped lang="scss">
+.report-page {
+  background-color: #fff;
+  height: 100%;
+  overflow: auto;
+  .table-box {
+    width: 1184px;
+  }
+  .sticky-top {
+    position: sticky;
+    top: 0;
+    background-color: #fff;
+    padding: 10px 24px;
+  }
+}
+.border-l-t {
+  border-left: 1px solid #ccc;
+  border-top: 1px solid #ccc;
+}
+.border-b-r {
+  border-bottom: 1px solid #ccc;
+  border-right: 1px solid #ccc;
+}
+.w-100 {
+  width: 100px;
+}
+.w-300 {
+  width: 300px;
+}
+.w-p-10 {
+  width: 10%;
+}
+.w-p-50 {
+  width: 50%;
+}
+.w-p-40 {
+  width: 40%;
+}
+.w-p-60 {
+  width: 60%;
+}
+.w-p-90 {
+  width: 90%;
+}
+</style>
diff --git a/src/views/sluice/runManage/supervisionInspetion/questionManage/index.vue b/src/views/sluice/runManage/supervisionInspetion/questionManage/index.vue
index 3df60ec..8eef244 100644
--- a/src/views/sluice/runManage/supervisionInspetion/questionManage/index.vue
+++ b/src/views/sluice/runManage/supervisionInspetion/questionManage/index.vue
@@ -1,20 +1,28 @@
-<!-- 监督检查办法管理-堤防 -->
+<!-- 监督检查工程管理 -->
 <script>
-import {
-  putDFPreventionControlPlan,
-  deleteDFMaintenancePlan,
-  postDFNewPreventionControlPlan,
-  postDFPreventionControlPlanList,
-  getDFPreventionControlPlan,
-  listUser,
-} from "@/api/management";
-import { listDikeInfo } from "@/api/yg/dikeInfo";
+import dayjs from "dayjs";
+import { regionData, codeToText, TextToCode } from "element-china-area-data";
+import { uploadFileData } from "@/api/system/upload";
 
+import {
+  getSuperviseEngineeringProblemListData,
+  updateSuperviseEngineeringProblemStatusAndData,
+} from "@/api/sluice";
 export default {
-  name: "InspectionItems",
+  name: "projectManage",
   data() {
     return {
-      searchDikeName: "",
+      dealDialogVisible: false,
+      searchTaskName: "",
+      searchManageName: "",
+      searchProjectName: "",
+      currentItem: null,
+      levelMap: {
+        0: "无",
+        1: "一般",
+        2: "较重",
+        3: "严重",
+      },
       paramsData: {
         name: "",
         type: null,
@@ -22,16 +30,11 @@ export default {
         selectLevel: "",
         selectType: "",
       },
-      showMoreFilter: false,
-      dialogVisible: false,
-      prohibitEditing: false,
-      dikeTypeList: [],
-      personnelList: [], // 人员列表
-      patrolType: [], // 提醒周期类型
-      workMonth: [], // 工作月份
-      embankmentList: [], //堤防列表
-      dikeLevel: [], // 堤防级别列表
-      controlType: [], // 防治类型
+      dealForm: {
+        id: "",
+        handleRecord: "",
+        fileList: [],
+      },
       tableData: [], // 检查列表
       pageData: {
         pageNum: 1, // 当前页
@@ -39,259 +42,99 @@ export default {
         pageSizes: [10, 20, 50, 100],
         total: 0, // 总数量
       },
-      ruleForm: {
-        dikeCode: "",
-        dikeName: "",
-        name: "",
-        type: "",
-        instruction: "",
-        month: "",
-        details: [],
-        cycleType: "",
-        frequency: "",
-        operators: [],
-        isReminder: 1,
-        otherConfig: {
-          selectUser: [],
-          week: "",
-          day: "",
-        },
-        reminderTime: "",
-      },
-      rules: {
-        dikeCode: [
-          { required: true, message: "请选择堤防名称", trigger: "blur" },
-        ],
-        name: [
-          { required: true, message: "请输入防治计划名称", trigger: "blur" },
-          { max: 100, message: "名称最长为100个字符", trigger: "blur" },
-        ],
-        type: [
-          { required: true, message: "请选择防治类型", trigger: "change" },
-        ],
-        instruction: [
-          { required: true, message: "请输入防治说明", trigger: "change" },
-        ],
-        month: [
-          { required: true, message: "请选择工作月份", trigger: "change" },
-        ],
-        cycleType: [
-          { required: true, message: "请选择提醒日期", trigger: "change" },
-        ],
-        frequency: [
-          { required: true, message: "请输入次数", trigger: "change" },
-        ],
-        "otherConfig.selectUser": [
-          { required: true, message: "请选择责任人", trigger: "change" },
-        ],
-        "otherConfig.week": [
-          { required: true, message: "请选择星期", trigger: "change" },
-        ],
-        "otherConfig.day": [
-          { required: true, message: "请输入", trigger: "change" },
-        ],
-        reminderTime: [
-          { required: true, message: "请选择提醒时间", trigger: "change" },
-        ],
-      },
     };
   },
-  watch: {
-    dialogVisible(newVal, oldVal) {
-      if (oldVal) {
-        this.prohibitEditing = false;
-      }
-    },
-  },
   methods: {
-    // 获取堤防等级
-    resolveDikeGrad(dikeGrad) {
-      return (
-        this.dikeLevel.find((v) => v.dictValue === dikeGrad)?.dictLabel ||
-        dikeGrad
-      );
-    },
-    // 获取堤防类型
-    resolveDikeType(dikeType) {
-      return (
-        this.dikeTypeList.find((v) => v.dictValue == dikeType)?.dictLabel ||
-        dikeType
-      );
-    },
-    // 获取防治类型
-    resolveType(type) {
-      return (
-        this.controlType.find((v) => v.dictValue == type)?.dictLabel || type
-      );
-    },
-    // 打开新增弹窗
-    openAddDialog() {
-      // // 获取字典数据
-      // this.getDicts("xc_w_month").then((res) => {
-      //   this.workMonth = res.data;
-      // });
-      // this.getDicts("xs_cycle_type").then((res) => {
-      //   this.patrolType = res.data;
-      // });
-      // if (this.ruleForm.details.length <= 0) {
-      //   this.ruleForm.details.push({
-      //     constructionDate: "",
-      //     jobContent: "",
-      //     planDays: 0,
-      //   });
-      // }
-      // this.dialogVisible = true;
-      // setTimeout(() => {
-      //   this.$refs.ruleForm.resetFields();
-      // }, 0);
-    },
-    // 删除对应防治计划
-    deleteTableItem(row) {
-      deleteDFMaintenancePlan(row.id).then((res) => {
-        this.getTableData();
-        this.$message.success("删除成功");
-      });
+    handleCurrentPageChange(page) {
+      this.pageData.pageNum = page;
+      this.getTableData();
     },
-    // 删除对应工作内容
-    deleteWorkTableItem(id) {
-      const index = this.workTable.findIndex((item) => item.id === id);
-      if (index !== -1) {
-        this.workTable.splice(index, 1);
-      }
+    handlePageSizeChange(pageSize) {
+      this.pageData.pageSize = pageSize;
+      this.getTableData();
     },
-    // 搜索用户
-    searchUser(e) {
-      listUser({
-        data: {
-          timeView: {
-            timeField: "create_time",
-          },
+    // 查看
+    handleCheck(row) {
+      this.$router.push({
+        path: "supervisionProjectReport",
+        query: {
+          type: "preview",
+          wayId: row.wayId,
+          id: row.id,
         },
-        cv: {
-          name: "nickName",
-          type: "like",
-          value: e,
-        },
-        pageSize: 100,
-        pageNum: 1,
-      }).then((res) => {
-        this.personnelList = res.records;
       });
     },
-    // 查看或编辑计划详情
-    viewOrEditPlanDetails(row, edit = false) {
-      if (!edit) {
-        this.prohibitEditing = true;
-      }
-      getDFPreventionControlPlan(row.id).then((res) => {
-        this.dialogVisible = true;
-        setTimeout(() => {
-          this.ruleForm = res.data;
-          this.ruleForm.reminderCycle = res.data.instruction + res.data.month;
-        }, 30);
+    // 跳转编辑页面
+    handleEdit(row) {
+      this.$router.push({
+        path: "supervisionProjectReport",
+        query: {
+          type: "edit",
+          wayId: row.wayId,
+          id: row.id,
+        },
       });
     },
-    changeOtherConfigSelectUser(idsArr) {
-      if (idsArr?.length) {
-        this.ruleForm.operators =
-          this.personnelList
-            .filter((v) => idsArr.includes(v.nickName))
-            ?.map((v) => ({
-              name: v.nickName,
-              uid: v.id,
-            })) || [];
-      } else {
-        this.ruleForm.operators = [];
-      }
+    handleClose(done) {
+      this.dealDialogVisible = false;
     },
-    // 保存维修计划
-    submitForm(formName) {
-      this.$refs[formName].validate((valid) => {
+    // 确认提交处理表单
+    submitDeal() {
+      this.$refs.dealForm.validate((valid) => {
         if (valid) {
-          this.ruleForm.cycleType = parseFloat(this.ruleForm.cycleType);
-          this.ruleForm.frequency = parseFloat(this.ruleForm.frequency);
-          this.ruleForm.month = parseFloat(this.ruleForm.month);
-          if (this.ruleForm.id) {
-            putDFPreventionControlPlan(this.ruleForm).then(() => {
-              this.getTableData();
-              this.dialogVisible = false;
+          updateSuperviseEngineeringProblemStatusAndData({
+            id: this.dealForm.id,
+            status: "2",
+            handleRecord: this.dealForm.handleRecord,
+            handleSituationRecords: this.dealForm.fileList,
+          }).then((res) => {
+            if (res) {
               this.$message({
-                message: "保存成功",
                 type: "success",
+                message: "处理成功",
               });
-            });
-          } else {
-            postDFNewPreventionControlPlan(this.ruleForm).then(() => {
-              console.log("保存成功");
               this.getTableData();
-              this.dialogVisible = false;
-              this.$message({
-                message: "保存成功",
-                type: "success",
-              });
-            });
-          }
+              this.dealDialogVisible = false;
+            }
+          });
         } else {
-          console.log("校验不通过");
           return false;
         }
       });
     },
-    // 重置校验
-    resetForm(formName) {
-      this.$refs[formName].resetFields();
-      this.dialogVisible = false;
-    },
-    // 关闭dialog
-    handleClose(ruleForm = "ruleForm") {
-      console.log("关闭");
-      this.$refs[ruleForm].resetFields();
-      this.ruleForm = {
-        dikeCode: "",
-        dikeName: "",
-        name: "",
-        type: "",
-        instruction: "",
-        month: "",
-        details: [],
-        cycleType: "",
-        isReminder: true,
-        selectUser: [],
-        otherConfig: {
-          selectUser: [],
-          week: "",
-          day: "",
+    // 跳转报告页面
+    handleCheckReport(row) {
+      this.$router.push({
+        path: "supervisionProjectReportPage",
+        query: {
+          wayId: row.wayId,
+          id: row.id,
         },
-        week: 1,
-        date: 1,
-        reminderTime: "",
-      };
-    },
-    // 添加工作项
-    addWorkItem() {
-      this.ruleForm.details.push({
-        jobContent: "",
-        constructionDate: "",
-        planDays: "",
       });
     },
+    // 计算doneTime距离此刻剩余多少天
+    calcDeadLine(time) {
+      if (!time) return "-";
+      let days = dayjs(time).diff(dayjs(), "day");
+      let seconds = 0;
+      if (days <= 0) {
+        seconds = dayjs(time).diff(dayjs(), "second");
+      }
+      return days > 0
+        ? days
+        : seconds > 0
+        ? 1
+        : dayjs(time).diff(dayjs(), "day") - 1;
+    },
     // 获取列表数据
     getTableData() {
-      postDFPreventionControlPlanList({
+      getSuperviseEngineeringProblemListData({
         data: {
           timeView: {
             timeField: "create_time",
           },
-          name: this.paramsData.name,
-          type: this.paramsData.type,
-          dikeName: this.paramsData.dikeName,
-          dikeGrad: this.paramsData.dikeGrad,
-          dikeType: this.paramsData.dikeType,
-        },
-        cv: {
-          name: "name",
-          type: "like",
-          value: this.name,
+          name: this.searchTaskName || null,
+          engineeringManagementUnit: this.searchManageName || null,
         },
         params: {
           orderBy: "create_time",
@@ -302,53 +145,111 @@ export default {
       }).then((res) => {
         if (res) {
           this.tableData = res.records;
+          console.log("this.tableData >>>>>  ", this.tableData);
           this.pageData.total = res.total;
         }
       });
     },
     // 重置搜索
     resetSearch() {
-      this.name = "";
-      this.selectStatus = "2";
+      this.searchTaskName = null;
+      this.searchManageName = null;
       this.getTableData();
     },
-    // 打开地图
-    handleOpenMap() {},
-    // 打开详情
-    handleOpenDetail() {},
-    // 获取堤防列表信息
-    getEmbData() {
-      listDikeInfo({
-        pageNum: 1,
-        pageSize: 20,
-        ids: null,
-        data: {
-          embankmentName: null,
-          endStationNumber: null,
-          embankmentType: null,
-        },
-        // 排序方式
-        params: {
-          // 按哪个字段排序
-          orderBy: "create_time",
-          // desc降序，升序asc
-          sort: "desc",
-        },
-      }).then((res) => {
-        this.embankmentList = res?.records || [];
-      });
+    // 下发
+    handleSendDown(row) {
+      this.$confirm("是否确认下发？", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          updateSuperviseEngineeringProblemStatusAndData({
+            id: row.id,
+            status: "1",
+          }).then((res) => {
+            if (res) {
+              this.$message({
+                type: "success",
+                message: "下发成功",
+              });
+              this.getTableData();
+            }
+          });
+        })
+        .catch(() => {});
+    },
+    // 处理-弹窗提交问题详情和图片
+    handleDeal(row) {
+      this.dealDialogVisible = true;
+      this.dealForm.id = row.id;
     },
-    handleChangeDike(value) {
-      console.log("value >>>>>  ", value);
-      this.ruleForm.name = this.ruleForm.dikeCode;
-      let res = this.embankmentList.find((v) => v.dikeCode === value);
-      console.log("res >>>>>  ", res);
-      this.ruleForm.dikeName = res?.dikeName;
-      // this.dikeDetailsDialog.id = res?.id || ''
+    // 确认
+    handleConfirm(row) {
+      this.$confirm("是否确认？", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          updateSuperviseEngineeringProblemStatusAndData({
+            id: row.id,
+            status: "3",
+          }).then((res) => {
+            if (res) {
+              this.$message({
+                type: "success",
+                message: "确认成功",
+              });
+              this.getTableData();
+            }
+          });
+        })
+        .catch(() => {});
+    },
+    // 上传前
+    beforeUpload(e) {
+      console.log("beforeUpload >>>>>  ", e);
+      if (this.dealForm.fileList?.length >= 99) {
+        this.$message.warning("最多上传99张图片");
+        return false;
+      }
+      return true;
+    },
+    handleUpload(e) {
+      const { file } = e;
+      let fData = new FormData();
+      fData.append("file", file);
+      uploadFileData(fData)
+        .then((res) => {
+          this.dealForm.fileList.push(res.url);
+        })
+        .catch((err) => {
+          console.log("err >>>>>  ", err);
+        });
     },
-    // 删除
-    handleDel(row) {
-      console.log("row >>>>>  ", row);
+
+    formatAdcd(adcd) {
+      if (adcd) {
+        let provinceCode = adcd.slice(0, 2);
+        let cityCode = adcd.slice(2, 4);
+        let areaCode = adcd.slice(4, 6);
+        if (areaCode != "00") {
+          return (
+            codeToText[provinceCode] +
+            "-" +
+            codeToText[provinceCode + cityCode] +
+            "-" +
+            codeToText[provinceCode + cityCode + areaCode]
+          );
+        } else if (cityCode != "00") {
+          return (
+            codeToText[provinceCode] + "-" + codeToText[provinceCode + cityCode]
+          );
+        } else {
+          return codeToText[provinceCode];
+        }
+      }
     },
   },
   created() {
@@ -357,15 +258,8 @@ export default {
     });
   },
   mounted() {
-    // // 获取列表数据
-    // this.getTableData();
-    // this.getEmbData();
-    // this.getDicts("embankment_level").then((res) => {
-    //   this.dikeLevel = res.data;
-    // });
-    // this.getDicts("dh_jh_type").then((res) => {
-    //   this.controlType = res.data;
-    // });
+    // 获取列表数据
+    this.getTableData();
   },
 };
 </script>
@@ -374,70 +268,88 @@ export default {
   <div class="body slider-right">
     <div class="top-title">基础信息管理</div>
     <div class="table-box">
-      <div class="flex items-start">
-        <div
-          class="flex flex-col filter-list"
-          :class="{ 'show-more': showMoreFilter }"
-        >
-          <div>
-            <span>任务名称：</span>
-            <el-input
-              class="search-input ml-10"
-              v-model="searchDikeName"
-              placeholder="请输入名称"
-            />
-            <span class="ml-10">管理单位：</span>
-            <el-input
-              class="search-input ml-10"
-              v-model="searchDikeName"
-              placeholder="请输入"
-            />
-            <span class="ml-10">工程对象：</span>
-            <el-input
-              class="search-input ml-10"
-              v-model="searchDikeName"
-              placeholder="请输入"
-            />
-          </div>
-          <div class="mt-12">
-            <span class="">检查项目：</span>
-            <el-input
-              class="search-input ml-10"
-              v-model="searchDikeName"
-              placeholder="请输入"
-            />
-            <span class="ml-10">问题等级：</span>
-            <el-input
-              class="search-input ml-10"
-              v-model="searchDikeName"
-              placeholder="请输入"
-            />
-            <span class="ml-10">操作状态：</span>
-            <el-input
-              class="search-input ml-10"
-              v-model="searchDikeName"
-              placeholder="请输入"
-            />
-          </div>
-          <span>展开</span>
-        </div>
-        <el-button class="search-btn" type="success">搜索</el-button>
-      </div>
-      <el-table class="table mt-16" height="600" :data="tableData" border>
+      <span>任务名称：</span>
+      <el-input
+        class="search-input ml-10"
+        v-model="searchTaskName"
+        placeholder="请输入名称"
+      />
+      <span class="ml-10">管理单位：</span>
+      <el-input
+        class="search-input ml-10"
+        v-model="searchManageName"
+        placeholder="请输入"
+      />
+      <span class="ml-10">工程对象：</span>
+      <el-input
+        class="search-input ml-10"
+        v-model="searchProjectName"
+        placeholder="请输入"
+      />
+      <el-button class="search-btn" type="success" @click="getTableData()"
+        >搜索</el-button
+      >
+      <el-button class="search-btn" @click="resetSearch">重置</el-button>
+      <el-table class="table mt-16" height="640" :data="tableData" border>
         <el-table-column type="index" align="center" label="序号" width="60" />
+        <el-table-column prop="projectName" align="center" label="检查项目" />
         <el-table-column prop="name" align="center" label="任务名称" />
-        <el-table-column prop="area" align="center" label="行政区划" />
-        <el-table-column prop="dikeName" align="center" label="工程" />
-        <el-table-column prop="unit" align="center" label="管理单位" />
-        <el-table-column prop="dikeName" align="center" label="检查项目" />
-        <el-table-column prop="dikeName" align="center" label="检查内容" />
-        <el-table-column prop="dikeName" align="center" label="问题等级" />
-        <el-table-column prop="address" align="center" label="操作">
+        <el-table-column prop="adcd" align="center" label="行政区划">
+          <template #default="{ row }">{{ formatAdcd(row.adcd) }}</template>
+        </el-table-column>
+        <el-table-column
+          prop="wagaName"
+          align="center"
+          label="工程"
+        ></el-table-column>
+        <el-table-column
+          prop="engineeringManagementUnit"
+          align="center"
+          label="管理单位"
+        />
+        <el-table-column
+          prop="content"
+          align="center"
+          label="检查内容"
+        ></el-table-column>
+        <el-table-column prop="level" align="center" label="问题等级">
           <template slot-scope="scope">
-            <el-button type="text" size="small">查看</el-button>
-            <el-button type="text" size="small" @click="handleDel(scope.row)"
+            <span>{{ levelMap[scope.row.level] }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="operate" align="center" label="操作">
+          <template slot-scope="scope">
+            <el-button type="text" size="small" @click="handleCheck(scope.row)"
+              >查看</el-button
+            >
+            <el-button
+              type="text"
+              size="small"
+              v-if="scope.row.status == '0'"
+              @click="handleSendDown(scope.row)"
               >下发</el-button
             >
+            <el-button
+              type="text"
+              size="small"
+              @click="handleDeal(scope.row)"
+              v-else-if="scope.row.status == '1'"
+              >处理</el-button
+            >
+            <el-button
+              type="text"
+              size="small"
+              v-else-if="scope.row.status == '2'"
+              @click="handleConfirm(scope.row)"
+              >确认</el-button
+            >
+            <el-button
+              type="text"
+              :disabled="true"
+              size="small"
+              v-else-if="scope.row.status == '3'"
+              >完成</el-button
+            >
           </template>
         </el-table-column>
       </el-table>
@@ -449,314 +361,71 @@ export default {
         :page-sizes="pageData.pageSizes"
         layout="total, prev, pager, next, sizes, jumper"
         :total="pageData.total"
-        @size-change="getTableData()"
+        @size-change="(e) => handlePageSizeChange(e)"
+        @current-change="(e) => handleCurrentPageChange(e)"
       >
       </el-pagination>
     </div>
-    <!-- 弹窗 -->
+
+    <!-- 处理弹窗 -->
     <el-dialog
-      title="新增/编辑防治计划"
-      @close="handleClose"
-      :visible.sync="dialogVisible"
-      :close-on-click-modal="false"
-      width="720px"
+      title="问题处理"
+      :visible.sync="dealDialogVisible"
+      width="50%"
+      :before-close="handleClose"
     >
-      <div style="display: flex; margin-bottom: 16px">
-        <div
-          style="
-            width: 5px;
-            height: 16px;
-            background-color: #31a08e;
-            margin-right: 8px;
-          "
-        ></div>
-        <span style="font-weight: 600">基础信息</span>
-      </div>
-      <el-form
-        :model="ruleForm"
-        :rules="rules"
-        ref="ruleForm"
-        label-width="100px"
-      >
-        <el-form-item label-width="120px" label="堤防名称" prop="dikeCode">
-          <!-- <el-input style="width: 202px;" v-model="ruleForm.dikeCode" placeholder="请输入" :disabled="prohibitEditing" /> -->
-          <el-select
-            v-model="ruleForm.dikeCode"
-            placeholder="请选择"
-            @change="handleChangeDike"
-            :disabled="prohibitEditing"
-          >
-            <el-option
-              v-for="item in embankmentList"
-              :label="item.dikeName"
-              :value="item.dikeCode"
-              :key="item.id"
-            ></el-option>
-          </el-select>
-          <el-button
-            :disabled="!ruleForm.dikeCode"
-            class="!m-6"
-            type="success"
-            size="small"
-            @click="handleOpenDetail"
-            >详情</el-button
-          >
-          <el-button
-            :disabled="!ruleForm.dikeCode"
-            class="!ml-6"
-            type="success"
-            size="small"
-            @click="handleOpenMap"
-            >打开地图</el-button
-          >
-        </el-form-item>
-        <div style="display: flex">
-          <el-form-item label-width="120px" label="防治计划名称" prop="name">
-            <el-input
-              style="width: 202px"
-              v-model="ruleForm.name"
-              placeholder="请输入"
-              :disabled="prohibitEditing"
-            />
-          </el-form-item>
-          <el-form-item label-width="120px" label="防治类型" prop="type">
-            <el-select
-              v-model="ruleForm.type"
-              placeholder="请选择"
-              :disabled="prohibitEditing"
-            >
-              <el-option
-                v-for="item in controlType"
-                :key="item.id"
-                :label="item.dictLabel"
-                :value="item.dictValue"
-              >
-              </el-option>
-            </el-select>
-          </el-form-item>
-        </div>
-        <el-form-item label-width="120px" label="防治说明" prop="instruction">
+      <el-form ref="dealForm" :model="dealForm" label-width="80px">
+        <el-form-item label="问题描述">
           <el-input
-            v-model="ruleForm.instruction"
             type="textarea"
-            placeholder=" 请输入"
-            :disabled="prohibitEditing"
-          />
+            :rows="4"
+            placeholder="请输入问题描述"
+            v-model="dealForm.handleRecord"
+          ></el-input>
         </el-form-item>
-        <div style="display: flex; margin-bottom: 16px">
+        <el-form-item label="现场情况">
           <div
-            style="
-              width: 5px;
-              height: 16px;
-              background-color: #31a08e;
-              margin-right: 8px;
-            "
-          ></div>
-          <span style="font-weight: 600">工作内容</span>
-        </div>
-        <el-form-item label-width="120px" label="工作月份" prop="month">
-          <el-select
-            v-model="ruleForm.month"
-            placeholder="请选择"
-            :disabled="prohibitEditing"
+            class="w-100 h-100 mr-12 mb-12"
+            v-for="(item, index) in dealForm.fileList"
+            :key="index"
           >
-            <el-option
-              v-for="item in workMonth"
-              :label="item.dictLabel"
-              :value="item.dictValue"
-              :key="item.id"
-            />
-          </el-select>
-        </el-form-item>
-        <el-table
-          style="margin-bottom: 22px"
-          max-height="330"
-          :data="ruleForm.details"
-          border
-        >
-          <el-table-column
-            type="index"
-            align="center"
-            label="序号"
-            width="50"
-          />
-          <el-table-column prop="jobContent" align="center" label="工作内容">
-            <template slot-scope="scope">
-              <el-input
-                v-model="scope.row.jobContent"
-                placeholder="请输入工作内容"
-              />
-            </template>
-          </el-table-column>
-          <el-table-column
-            prop="constructionDate"
-            align="center"
-            label="施工日期"
-          >
-            <template slot-scope="scope">
-              <el-input
-                v-model="scope.row.constructionDate"
-                placeholder="请输入施工日期"
-              />
-            </template>
-          </el-table-column>
-          <el-table-column
-            prop="planDays"
-            align="center"
-            label="计划工日"
-            width="80"
-          >
-            <template slot-scope="scope">
-              <el-input
-                v-model="scope.row.planDays"
-                placeholder="请输入计划工日"
-              />
-            </template>
-          </el-table-column>
-          <el-table-column align="center" label="操作" width="100">
-            <template slot-scope="scope">
-              <el-button
-                style="margin-right: 9px"
-                type="text"
-                size="small"
-                @click="addWorkItem"
-                >添加</el-button
-              >
-              <el-popconfirm
-                confirm-button-text="确定"
-                cancel-button-text="取消"
-                icon="el-icon-info"
-                icon-color="red"
-                title="确定删除吗？"
-                @confirm="deleteWorkTableItem(scope.row.id)"
-              >
-                <el-button
-                  v-if="ruleForm.details.length > 1"
-                  style="color: red"
-                  type="text"
-                  size="small"
-                  slot="reference"
-                  >删除</el-button
-                >
-              </el-popconfirm>
-            </template>
-          </el-table-column>
-        </el-table>
-        <div style="display: flex">
-          <el-form-item label-width="120px" label="提醒周期" prop="frequency">
-            <el-input
-              style="width: 90px"
-              v-model="ruleForm.frequency"
-              placeholder="请输入"
-            />
-            /次
-          </el-form-item>
-          <el-form-item label-width="10px" prop="cycleType">
-            <el-select
-              style="width: 90px"
-              v-model="ruleForm.cycleType"
-              placeholder="请选择"
-            >
-              <el-option
-                v-for="item in patrolType"
-                :label="item.dictLabel"
-                :value="item.dictValue"
-                :key="item.id"
-              ></el-option>
-            </el-select>
-            /日期
-          </el-form-item>
-          <el-form-item
-            label-width="100px"
-            label="责任人"
-            prop="otherConfig.selectUser"
-          >
-            <el-select
-              v-model="ruleForm.otherConfig.selectUser"
-              multiple
-              filterable
-              remote
-              :remote-method="searchUser"
-              value-key="id"
-              placeholder="请输入关键词搜索用户"
-              prop="selectUser"
-              @change="changeOtherConfigSelectUser"
-            >
-              <el-option
-                v-for="item in personnelList"
-                :key="item.id"
-                :label="item.nickName"
-                :value="item.nickName"
-              >
-              </el-option>
-            </el-select>
-          </el-form-item>
-        </div>
-        <div style="display: flex">
-          <el-form-item label-width="120px" label="消息提醒" prop="isReminder">
-            <el-switch
-              v-model="ruleForm.isReminder"
-              :active-value="1"
-              :inactive-value="0"
-              active-color="#31a08e"
-              inactive-color="#dcdfe6"
-            >
-            </el-switch>
-          </el-form-item>
-          <div style="display: flex; flex-direction: column">
-            <el-form-item
-              v-if="ruleForm.isReminder && ruleForm.cycleType === '1'"
-              label-width="120px"
-              label="提醒时间"
-              prop="otherConfig.week"
-            >
-              <el-radio-group v-model="ruleForm.otherConfig.week">
-                <el-radio :label="1">星期一</el-radio>
-                <el-radio :label="2">星期二</el-radio>
-                <el-radio :label="3">星期三</el-radio>
-                <el-radio :label="4">星期四</el-radio>
-                <el-radio :label="5">星期五</el-radio>
-                <el-radio :label="6">星期六</el-radio>
-                <el-radio :label="7">星期日</el-radio>
-              </el-radio-group>
-            </el-form-item>
-            <el-form-item
-              v-if="ruleForm.isReminder && ruleForm.cycleType === '0'"
-              label-width="120px"
-              label="提醒时间"
-              prop="otherConfig.day"
-            >
-              <div>
-                每月<el-input
-                  style="width: 202px"
-                  v-model="ruleForm.otherConfig.day"
-                />号
-              </div>
-            </el-form-item>
-            <el-form-item
-              label-width="120px"
-              :label="ruleForm.cycleType === '2' ? '提醒时间' : ''"
-              prop="reminderTime"
+            <el-image
+              style="width: 200px; min-height: 100px; height: auto"
+              :src="item"
+              :preview-src-list="[item]"
             >
-              <el-time-picker
-                v-model="ruleForm.reminderTime"
-                value-format="yyyy-MM-dd hh:mm:ss"
-                placeholder="选择时间"
-              />
-            </el-form-item>
+              <template #error>
+                <div
+                  class="w-full flex justify-center items-center"
+                  style="
+                    height: 100px;
+                    border: 1px solid #f0f0f0;
+                    font-style: italic;
+                    color: #ccc;
+                  "
+                >
+                  图片加载失败
+                </div>
+              </template>
+            </el-image>
           </div>
-        </div>
+          <el-upload
+            action="#"
+            :http-request="handleUpload"
+            :auto-upload="true"
+            :before-upload="beforeUpload"
+            :showFileList="false"
+            accept=".jpg,.png,.jpeg"
+            :maxLength="99"
+          >
+            <el-button type="primary">上传</el-button>
+          </el-upload>
+        </el-form-item>
+        <el-form-item class="flex justify-end">
+          <el-button @click="handleClose">取消</el-button>
+          <el-button type="primary" @click="submitDeal">提交</el-button>
+        </el-form-item>
       </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button size="mini" @click="resetForm('ruleForm')">取 消</el-button>
-        <el-button
-          v-if="!prohibitEditing"
-          size="mini"
-          type="primary"
-          @click="submitForm('ruleForm')"
-          >保存</el-button
-        >
-      </div>
     </el-dialog>
   </div>
 </template>
@@ -791,12 +460,6 @@ export default {
       height: calc(680px - 34px);
     }
   }
-
-  .filter-list {
-    transition: all 0.5s;
-    height: 40px;
-    overflow: hidden;
-  }
   .search-input {
     width: 202px;
     margin-right: 10px;
@@ -804,23 +467,10 @@ export default {
 
   .search-btn {
     margin-left: 10px;
-    background-color: #37b29e;
-    border: none;
-
-    &:hover {
-      background-color: #5ac6b9;
-    }
-
-    &:active {
-      background-color: #2b8070;
-    }
   }
-}
 
-/deep/.el-input__count {
-  height: 15px;
-  line-height: 15px;
-  margin-right: 10px;
-  margin-bottom: -4px;
+  .warning-time {
+    color: red;
+  }
 }
 </style>
diff --git a/src/views/sluice/runManage/supervisionInspetion/tasksManage/tasksDetails.vue b/src/views/sluice/runManage/supervisionInspetion/tasksManage/tasksDetails.vue
index 3c9568b..930a424 100644
--- a/src/views/sluice/runManage/supervisionInspetion/tasksManage/tasksDetails.vue
+++ b/src/views/sluice/runManage/supervisionInspetion/tasksManage/tasksDetails.vue
@@ -1,13 +1,7 @@
 <!-- 监督检查任务新增 -->
 <script>
 import dayjs from "dayjs";
-import {
-  putDFPreventionControlPlan,
-  deleteDFMaintenancePlan,
-  postDFNewPreventionControlPlan,
-  postDFPreventionControlPlanList,
-  listUser,
-} from "@/api/management";
+import { listUser } from "@/api/management";
 import {
   getEnableSuperviseWayData,
   getRunProjectList,
diff --git a/vue.config.js b/vue.config.js
index 92840a8..fd4e59c 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -35,14 +35,14 @@ module.exports = {
     port: 80,
     open: true,
     proxy: {
-      // [process.env.VUE_APP_BASE_API + '/run/']: {
-      //   target: "http://172.16.34.27:18082",
-      //   changeOrigin: true,
-      //   // logLevel: 'debug',
-      //   pathRewrite: {
-      //     [process.env.VUE_APP_BASE_API +'/run/']: '/tianhui-admin-web/run/'
-      //   }
-      // },
+      [process.env.VUE_APP_BASE_API + '/run/']: {
+        target: "http://172.16.34.27:18082",
+        changeOrigin: true,
+        // logLevel: 'debug',
+        pathRewrite: {
+          [process.env.VUE_APP_BASE_API +'/run/']: '/tianhui-admin-web/run/'
+        }
+      },
 
       // 曹琪本地接口
       // [process.env.VUE_APP_BASE_API]: {