fix: 联调工程问题模块

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",

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
+  })
+}

src/assets/styles/flex.scss

@@ -1,6 +1,12 @@
 .flex {
   display: flex;
 }
+.flex-3{
+  flex: 3;
+}
+.flex-2{
+  flex: 2;
+}
 .flex-1{
   flex: 1;
 }

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>

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) {
+      if (this.problemList.length) {
-        let sum = this.formData.reduce((prev, cur) => {
+        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() {
+    searchUser(e = null) {
-      getEnableSuperviseWayData().then((res) => {
+      listUser({
-        console.log(res);
+        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="step-box">
+        <div
-          <div
+          class="bar"
-            class="bar"
+          :style="{
-            :style="{
+            left: `-${100 - calcStep}%`,
-              left: `-${100 - calcStep}%`,
+            backgroundColor: `rgb(${255 - (255 * calcStep) / 100},${
-              backgroundColor: `rgb(${255 - (255 * calcStep) / 100},${
+              0 + (255 * calcStep) / 100
-                0 + (255 * calcStep) / 100
+            },0)`,
-              },0)`,
+          }"
-            }"
+        ></div>
-          ></div>
+        <div style="position: relative; z-index: 1" class="pl-4 font-14">
-          <div style="position: relative; z-index: 1" class="pl-4 font-14">
+          检查进度 {{ calcStep }}%
-            检查进度 {{ calcStep }}%
-          </div>
         </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;

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>

src/views/sluice/runManage/supervisionInspetion/tasksManage/tasksDetails.vue

@@ -1,13 +1,7 @@
 <!-- 监督检查任务新增 -->
 <script>
 import dayjs from "dayjs";
-import {
+import { listUser } from "@/api/management";
-  putDFPreventionControlPlan,
-  deleteDFMaintenancePlan,
-  postDFNewPreventionControlPlan,
-  postDFPreventionControlPlanList,
-  listUser,
-} from "@/api/management";
 import {
   getEnableSuperviseWayData,
   getRunProjectList,

vue.config.js

@@ -35,14 +35,14 @@ module.exports = {
     port: 80,
     open: true,
     proxy: {
-      // [process.env.VUE_APP_BASE_API + '/run/']: {
+      [process.env.VUE_APP_BASE_API + '/run/']: {
-      //   target: "http://172.16.34.27:18082",
+        target: "http://172.16.34.27:18082",
-      //   changeOrigin: true,
+        changeOrigin: true,
-      //   // logLevel: 'debug',
+        // logLevel: 'debug',
-      //   pathRewrite: {
+        pathRewrite: {
-      //     [process.env.VUE_APP_BASE_API +'/run/']: '/tianhui-admin-web/run/'
+          [process.env.VUE_APP_BASE_API +'/run/']: '/tianhui-admin-web/run/'
-      //   }
+        }
-      // },
+      },
 
       // 曹琪本地接口
       // [process.env.VUE_APP_BASE_API]: {