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

Release sy v1.0.0

See merge request project/water/shuili-vue!138

src/api/dike/index.js

@@ -106,6 +106,15 @@ export function exportProjectCheckingRecord(data){
   })
 }
 
+// 巡查记录-获取轨迹列表
+export function getRecordTraceList(data = {}) {
+  return request({
+    url: `/run/df/trace/list`,
+    method: 'post',
+    data
+  })
+}
+
 /**************************************************/
 
 // 获取巡查堤防列表

src/assets/styles/index.scss

@@ -152,21 +152,21 @@ aside {
   font-size: 14px;
   padding-bottom: 24px;
   overflow: auto;
-  // .slider-right-body{
-  //   width: 100%;
-  //   height: calc(100% - 74px);
-  //   margin-top: 24px;
-  //   padding: 16px;
-  //   padding-bottom: 60px; // 预留给分页器的
-  //   background-color: #fff;
-  //   overflow: auto;
-  // }
+  .slider-right-body{
+    width: 100%;
+    // height: calc(100% - 74px);
+    margin-top: 24px;
+    padding: 16px;
+    padding-bottom: 60px; // 预留给分页器的
+    background-color: #fff;
+    // overflow: auto;
+  }
   .table-box{
     padding-bottom: 60px !important;
   }
   .bottom-btns{
     width: 100%;
-    position: absolute;
+    position: fixed;
     bottom: 0;
     left: 0;
     display: flex;

src/views/dike/runManage/enginerring/inspectionPlan/components/PlanDetail.vue

@@ -646,6 +646,7 @@ export default {
   padding: 16px;
   padding-bottom: 78px;
   border-radius: 6px;
+  background-color: #fff;
   .form-row-title {
     font-size: 16px;
     font-weight: bold;

src/views/dike/runManage/enginerring/inspectionRecords/components/NewRecord.vue

@@ -155,7 +155,7 @@
             <template #default="{ node, data }">
               <div class="flex justify-between items-center w-full pr-8">
                 <div>{{ data.value }}</div>
-                <div v-if="node.isLeaf && data.nodeLink.hasProblem">
+                <div v-if="node.isLeaf && data.nodeLink.status">
                   <img
                     class="w-16 h-16"
                     src="@/assets/common/icon-checked.png"
@@ -173,13 +173,15 @@
               @change="$forceUpdate()"
               :disabled="!canEdit"
               size="small"
-              v-model="currentItem.hasProblem"
+              v-model="currentItem.status"
             >
               <el-radio label="0">无</el-radio>
-              <el-radio label="1">有</el-radio>
+              <el-radio label="1">一般隐患</el-radio>
+              <el-radio label="2">较大至重大</el-radio>
+              <el-radio label="3">重大隐患</el-radio>
             </el-radio-group>
           </div>
-          <template v-if="currentItem.hasProblem === '1'">
+          <template v-if="currentItem.status && currentItem.status != '0'">
             <div>
               <span class="label">隐患描述：</span>
               <el-input
@@ -210,11 +212,11 @@
               <div class="mt-10 img-list-box">
                 <div
                   class="img-box"
-                  v-for="(item, index) in this.currentItem.problemImages"
-                  :key="item"
+                  v-for="(url, index) in this.currentItem.problemImages"
+                  :key="url"
                 >
                   <el-image
-                    :src="item"
+                    :src="url"
                     class="w-240 h-124"
                     :preview-src-list="[url]"
                   ></el-image>
@@ -355,9 +357,6 @@ export default {
       getRecordDetails(id).then((res) => {
         this.formData = res.data;
         this.items = [...res.data.items];
-        this.items?.forEach((v) => {
-          v.hasProblem = !!v.problem ? "1" : "0";
-        });
         if (res.data.subPlanStartDate && res.data.subPlanEndDate) {
           this.subPlanDateArr = [
             res.data.subPlanStartDate,
@@ -548,8 +547,7 @@ export default {
             handleContent: "",
             handleImages: [],
             problemImages: [],
-            hasProblem: "",
-            status: "0",
+            status: "",
           };
         });
         this.items = items;
@@ -721,7 +719,11 @@ export default {
             })
               .then(() => {
                 this.items?.forEach((v) => {
-                  if (v.hasProblem != "1") {
+                  if (v.status == "0") {
+                    v.problem = "";
+                    v.problemImages = [];
+                  } else if (!v.status) {
+                    v.status = "0";
                     v.problem = "";
                     v.problemImages = [];
                   }

src/views/dike/runManage/enginerring/inspectionRecords/components/RecordDetails.vue

@@ -93,8 +93,15 @@
               <div class="flex justify-between">
                 <div class="flex tc-text1">
                   巡检记录：
-                  <div v-if="item.problem" class="warn-status">有隐患</div>
-                  <div v-else class="success-status">无隐患</div>
+                  <div
+                    v-if="!item.status || item.status == '0'"
+                    class="success-status"
+                  >
+                    无隐患
+                  </div>
+                  <div v-else class="warn-status">
+                    {{ statusMap[item.status] }}
+                  </div>
                 </div>
                 <div class="tc-text2">
                   上报时间：{{ item.createTime || "--:--:--" }}
@@ -207,7 +214,7 @@ import dayjs from "dayjs";
 
 import { getDictMapData } from "@/api/system/dict/data";
 
-import { getRecordDetails } from "@/api/dike";
+import { getRecordDetails, getRecordTraceList } from "@/api/dike";
 import { uploadFileData } from "@/api/system/upload";
 
 export default {
@@ -219,6 +226,7 @@ export default {
       type: String,
       default: "",
     },
+
     canEdit: {
       type: Boolean,
       default: false,
@@ -227,6 +235,12 @@ export default {
   data() {
     return {
       dayjs,
+      statusMap: {
+        ["0"]: "无隐患",
+        ["1"]: "一般隐患",
+        ["2"]: "较大至重大",
+        ["3"]: "重大隐患",
+      },
       filesList: [],
       activeNames: [],
       labelMapData: {},
@@ -234,6 +248,7 @@ export default {
       treeData: [],
       xcClassfyOptions: [],
       entries: {},
+      traceList: [],
     };
   },
   watch: {
@@ -262,6 +277,18 @@ export default {
           item.partsName = this.labelMapData[item.parts.join(":")];
         });
         this.entries = res.data.entries ? JSON.parse(res.data.entries) : {};
+        getRecordTraceList({
+          data: {
+            recordId: this.id,
+          },
+          pageNum: 1,
+          pageSize: 50,
+        }).then((res) => {
+          this.traceList =
+            res.records?.map((v) => {
+              return [v.longitude, v.altitude];
+            }) || [];
+        });
       });
     },
     // 树转换

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

@@ -231,6 +231,11 @@ export default {
         .then(() => {
           let formData = this.$refs.recordRef.submit();
           console.log("formData >>>>>  ", formData);
+          formData.items.forEach((v) => {
+            if (!v.handleTime && v.handleContent && v.handleImages.length) {
+              v.handleTime = dayjs().format("YYYY-MM-DD HH:mm:ss");
+            }
+          });
           updateRecordData(formData).then((res) => {
             if (res) {
               this.$message.success("处理成功");

src/views/sluice/runManage/maintenance/maintenanceManage/index.vue

@@ -84,7 +84,8 @@
         :page-sizes="pageData.pageSizes"
         layout="total, prev, pager, next, sizes, jumper"
         :total="pageData.total"
-        @size-change="getTableData()"
+        @current-change="(e) => handleCurrentPageChange(e)"
+        @size-change="(e) => handlePageSizeChange(e)"
       >
       </el-pagination>
     </div>
@@ -125,6 +126,14 @@ export default {
     this.getTableData();
   },
   methods: {
+    handleCurrentPageChange(page) {
+      this.pageData.pageNum = page;
+      this.getTableData();
+    },
+    handlePageSizeChange(pageSize) {
+      this.pageData.pageSize = pageSize;
+      this.getTableData();
+    },
     // 获取列表信息
     getTableData() {
       listJbxx({