From 106e961674b984dfbeca74bcc00014779b8e4a67 Mon Sep 17 00:00:00 2001
From: panyuyi <panyuyi@datametatech.com>
Date: Mon, 17 Mar 2025 21:38:33 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/Iframe.vue                         |   6 +
 .../acceptanceRecords/index.vue               | 120 ++++++++----
 .../overviewAnalysis/index.vue                |   4 +-
 .../statisticsAnalysis/index.vue              |   4 +-
 .../InspectionRecords/index.vue               | 169 ++++++++++-------
 .../acceptanceRecords/index.vue               | 127 +++++++++----
 .../pestAnimalControl2/defectList/index.vue   |  92 ++++++----
 .../maintenanceRecords/index.vue              | 173 ++++++++++++------
 .../overviewAnalysis/index.vue                |   4 +-
 .../patrolItemsManage/index.vue               |   4 +-
 .../statisticsAnalysis/index.vue              |   4 +-
 .../components/DataStatistics.vue             |   7 +-
 .../overviewAnalysis/index.vue                |   4 +-
 .../statisticsAnalysis/index.vue              |   4 +-
 .../safeOperation/components/BaseInfo.vue     |   2 +-
 vue.config.js                                 |   4 +-
 16 files changed, 484 insertions(+), 244 deletions(-)

diff --git a/src/layout/Iframe.vue b/src/layout/Iframe.vue
index 756b53f..7837087 100644
--- a/src/layout/Iframe.vue
+++ b/src/layout/Iframe.vue
@@ -10,6 +10,12 @@
         frameborder="no"
         style="border: none"
       ></iframe>
+      <!-- <iframe
+        class="w-full h-full"
+        src="http://172.16.34.83:6050/sgcyy-slgcyxgl/sy-water-data-board-ui"
+        frameborder="no"
+        style="border: none"
+      ></iframe> -->
     </div>
   </div>
 </template>
diff --git a/src/views/dike/runManage/patrolMaintenance/acceptanceRecords/index.vue b/src/views/dike/runManage/patrolMaintenance/acceptanceRecords/index.vue
index 09d7e3b..51ebdef 100644
--- a/src/views/dike/runManage/patrolMaintenance/acceptanceRecords/index.vue
+++ b/src/views/dike/runManage/patrolMaintenance/acceptanceRecords/index.vue
@@ -150,10 +150,11 @@
       </div>
       <el-table :height="tableHeight" :data="tableData" border>
         <!--<el-table-column prop="id" align="center" label="单号"/>-->
-        <el-table-column type="index" label="序号"/>
+        <el-table-column type="index" align="center" label="序号" width="100">
+        </el-table-column>
         <el-table-column prop="detail.name" align="center" label="巡查名称" />
-        <el-table-column prop="dikeName" align="center" label="堤防名称"/>
-        <el-table-column prop="dikeCode" align="center" label="堤防代码"/>
+        <el-table-column prop="dikeName" align="center" label="堤防名称" />
+        <el-table-column prop="dikeCode" align="center" label="堤防代码" />
         <el-table-column align="center" label="巡查类型">
           <template slot-scope="scope">
             <span>{{
@@ -164,48 +165,99 @@
         <el-table-column prop="category" align="center" label="巡查类别">
           <template slot-scope="scope">
             <span>{{
-              getDictLabelName(scope.row.detail.category || '', "maintenanceCategory")
+              getDictLabelName(
+                scope.row.detail.category || "",
+                "maintenanceCategory"
+              )
             }}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="status" align="center" label="巡查状态" width="100">
+        <el-table-column
+          prop="status"
+          align="center"
+          label="巡查状态"
+          width="100"
+        >
           <template slot-scope="scope">
-            <span style="position: relative"
-                  :style="['3', '5', '6'].includes(scope.row.detail.status) && {color: 'rgba(0,0,0,0.4)'}">
-                <div
-                  v-if="scope.row.detail.status === '1'"
-                  style="position: absolute;left: -16px;top: 6px;width: 8px;height: 8px;border-radius: 50%; background: #FFB20D"
-                ></div>
-                <div
-                  v-if="scope.row.detail.status === '2'"
-                  style="position: absolute;left: -16px;top: 6px;width: 8px;height: 8px;border-radius: 50%; background: #0EC885"
-                ></div>
-                <div
-                  v-if="scope.row.detail.status === '4'"
-                  style="position: absolute;left: -16px;top: 6px;width: 8px;height: 8px;border-radius: 50%; background: #3A89FE"
-                ></div>
-                <div
-                  v-if="['3', '5', '6'].includes(scope.row.detail.status)"
-                  style="position: absolute;left: -16px;top: 6px;width: 8px;height: 8px;border-radius: 50%; background: #A6A6A6"
-                ></div>
-                  {{ getDictLabelName(scope.row.detail.status, "maintenanceStatus") }}
-                </span>
+            <span
+              style="position: relative"
+              :style="
+                ['3', '5', '6'].includes(scope.row.detail.status) && {
+                  color: 'rgba(0,0,0,0.4)',
+                }
+              "
+            >
+              <div
+                v-if="scope.row.detail.status === '1'"
+                style="
+                  position: absolute;
+                  left: -16px;
+                  top: 6px;
+                  width: 8px;
+                  height: 8px;
+                  border-radius: 50%;
+                  background: #ffb20d;
+                "
+              ></div>
+              <div
+                v-if="scope.row.detail.status === '2'"
+                style="
+                  position: absolute;
+                  left: -16px;
+                  top: 6px;
+                  width: 8px;
+                  height: 8px;
+                  border-radius: 50%;
+                  background: #0ec885;
+                "
+              ></div>
+              <div
+                v-if="scope.row.detail.status === '4'"
+                style="
+                  position: absolute;
+                  left: -16px;
+                  top: 6px;
+                  width: 8px;
+                  height: 8px;
+                  border-radius: 50%;
+                  background: #3a89fe;
+                "
+              ></div>
+              <div
+                v-if="['3', '5', '6'].includes(scope.row.detail.status)"
+                style="
+                  position: absolute;
+                  left: -16px;
+                  top: 6px;
+                  width: 8px;
+                  height: 8px;
+                  border-radius: 50%;
+                  background: #a6a6a6;
+                "
+              ></div>
+              {{
+                getDictLabelName(scope.row.detail.status, "maintenanceStatus")
+              }}
+            </span>
           </template>
         </el-table-column>
 
         <el-table-column align="center" label="问题等级" width="120">
           <template slot-scope="scope">
             <span>{{
-              getDictLabelName(scope.row.detail.problemLevel || '', "maintenanceLevel")
+              getDictLabelName(
+                scope.row.detail.problemLevel || "",
+                "maintenanceLevel"
+              )
             }}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="detail.dutyHolderName" align="center" label="责任人" />
         <el-table-column
-          prop="submitTime"
+          prop="detail.dutyHolderName"
           align="center"
-          label="验收时间"
+          label="责任人"
         />
+        <el-table-column prop="submitTime" align="center" label="验收时间" />
 
         <el-table-column
           prop="opera"
@@ -309,7 +361,13 @@ export default {
     handleCheckDetails(row, mode) {
       this.$router.push({
         path: "acceptanceDetails",
-        query: { id: row.id, formId: row.formId, recordId: row.detail.recordId, defectId: row.detail.problemId, mode: mode },
+        query: {
+          id: row.id,
+          formId: row.formId,
+          recordId: row.detail.recordId,
+          defectId: row.detail.problemId,
+          mode: mode,
+        },
       });
     },
     getDictLabelName(type, dictListName) {
@@ -353,7 +411,7 @@ export default {
             this.paramsData.time && this.paramsData.time.length > 1
               ? this.paramsData.time[1]
               : "",
-        }
+        },
       };
       postV2ApprovalList({
         data: {
diff --git a/src/views/dike/runManage/patrolMaintenance/overviewAnalysis/index.vue b/src/views/dike/runManage/patrolMaintenance/overviewAnalysis/index.vue
index 161d17e..a27621d 100644
--- a/src/views/dike/runManage/patrolMaintenance/overviewAnalysis/index.vue
+++ b/src/views/dike/runManage/patrolMaintenance/overviewAnalysis/index.vue
@@ -128,10 +128,10 @@ export default {
       return getV2PatrolStatisticChart({
         group,
         startTime: this.paramsData.timeRange[0]
-          ? this.paramsData[0] + " 00:00:00"
+          ? this.paramsData.timeRange[0] + " 00:00:00"
           : null,
         endTime: this.paramsData.timeRange[1]
-          ? this.paramsData[1] + " 23:59:59"
+          ? this.paramsData.timeRange[1] + " 23:59:59"
           : null,
         adcd: this.paramsData.adcd,
       });
diff --git a/src/views/dike/runManage/patrolMaintenance/statisticsAnalysis/index.vue b/src/views/dike/runManage/patrolMaintenance/statisticsAnalysis/index.vue
index 1c6bc24..dc8ea56 100644
--- a/src/views/dike/runManage/patrolMaintenance/statisticsAnalysis/index.vue
+++ b/src/views/dike/runManage/patrolMaintenance/statisticsAnalysis/index.vue
@@ -201,10 +201,10 @@ export default {
       return getV2PatrolStatisticChart({
         group,
         startTime: this.paramsData.timeRange[0]
-          ? this.paramsData[0] + " 00:00:00"
+          ? this.paramsData.timeRange[0] + " 00:00:00"
           : null,
         endTime: this.paramsData.timeRange[1]
-          ? this.paramsData[1] + " 23:59:59"
+          ? this.paramsData.timeRange[1] + " 23:59:59"
           : null,
         code: this.paramsData.dikeCode,
       });
diff --git a/src/views/dike/runManage/pestAnimalControl2/InspectionRecords/index.vue b/src/views/dike/runManage/pestAnimalControl2/InspectionRecords/index.vue
index bdb0f0b..92e3c1f 100644
--- a/src/views/dike/runManage/pestAnimalControl2/InspectionRecords/index.vue
+++ b/src/views/dike/runManage/pestAnimalControl2/InspectionRecords/index.vue
@@ -115,69 +115,112 @@
               class="flex-shrink-0 myml-12"
               type="success"
               @click="handleChangeQuery"
-            >查询
-            </el-button
-            >
+              >查询
+            </el-button>
             <el-button
               class="flex-shrink-0"
               size="small"
               @click="handleResetQuery"
-            >重置
-            </el-button
-            >
+              >重置
+            </el-button>
           </div>
         </div>
         <div class="line" ref="lineRef"></div>
       </div>
-      <el-table
-        :height="tableHeight"
-        :data="tableData"
-        border
-      >
-        <el-table-column prop="id" align="center" label="单号"/>
-        <el-table-column prop="checkingName" align="center" label="防治项目名称"/>
-        <el-table-column prop="dikeName" align="center" label="堤防名称"/>
-        <el-table-column prop="dikeCode" align="center" label="堤防代码"/>
+      <el-table :height="tableHeight" :data="tableData" border>
+        <!-- <el-table-column prop="id" align="center" label="单号"/> -->
+        <el-table-column type="index" align="center" label="序号" width="100">
+        </el-table-column>
+        <el-table-column
+          prop="checkingName"
+          align="center"
+          label="防治项目名称"
+        />
+        <el-table-column prop="dikeName" align="center" label="堤防名称" />
+        <el-table-column prop="dikeCode" align="center" label="堤防代码" />
 
         <el-table-column prop="type" align="center" label="检查类型">
           <template slot-scope="scope">
             <span>{{
-                getDictLabelName(scope.row.type, "maintenanceType")
-              }}</span>
+              getDictLabelName(scope.row.type, "maintenanceType")
+            }}</span>
           </template>
         </el-table-column>
         <el-table-column prop="category" align="center" label="防治类别">
           <template slot-scope="scope">
             <span>{{
-                getDictLabelName(scope.row.category, "maintenanceCategory")
-              }}</span>
+              getDictLabelName(scope.row.category, "maintenanceCategory")
+            }}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="status" align="center" label="检查状态" width="100">
+        <el-table-column
+          prop="status"
+          align="center"
+          label="检查状态"
+          width="100"
+        >
           <template slot-scope="scope">
-            <span style="position: relative"
-                  :style="['3', '5', '6'].includes(scope.row.status) && {color: 'rgba(0,0,0,0.4)'}">
-                <div
-                  v-if="scope.row.status === '1'"
-                  style="position: absolute;left: -16px;top: 6px;width: 8px;height: 8px;border-radius: 50%; background: #FFB20D"
-                ></div>
-                <div
-                  v-if="scope.row.status === '2'"
-                  style="position: absolute;left: -16px;top: 6px;width: 8px;height: 8px;border-radius: 50%; background: #0EC885"
-                ></div>
-                <div
-                  v-if="scope.row.status === '4'"
-                  style="position: absolute;left: -16px;top: 6px;width: 8px;height: 8px;border-radius: 50%; background: #3A89FE"
-                ></div>
-                <div
-                  v-if="['3', '5', '6'].includes(scope.row.status)"
-                  style="position: absolute;left: -16px;top: 6px;width: 8px;height: 8px;border-radius: 50%; background: #A6A6A6"
-                ></div>
-                  {{ getDictLabelName(scope.row.status, "maintenanceStatus") }}
-                </span>
+            <span
+              style="position: relative"
+              :style="
+                ['3', '5', '6'].includes(scope.row.status) && {
+                  color: 'rgba(0,0,0,0.4)',
+                }
+              "
+            >
+              <div
+                v-if="scope.row.status === '1'"
+                style="
+                  position: absolute;
+                  left: -16px;
+                  top: 6px;
+                  width: 8px;
+                  height: 8px;
+                  border-radius: 50%;
+                  background: #ffb20d;
+                "
+              ></div>
+              <div
+                v-if="scope.row.status === '2'"
+                style="
+                  position: absolute;
+                  left: -16px;
+                  top: 6px;
+                  width: 8px;
+                  height: 8px;
+                  border-radius: 50%;
+                  background: #0ec885;
+                "
+              ></div>
+              <div
+                v-if="scope.row.status === '4'"
+                style="
+                  position: absolute;
+                  left: -16px;
+                  top: 6px;
+                  width: 8px;
+                  height: 8px;
+                  border-radius: 50%;
+                  background: #3a89fe;
+                "
+              ></div>
+              <div
+                v-if="['3', '5', '6'].includes(scope.row.status)"
+                style="
+                  position: absolute;
+                  left: -16px;
+                  top: 6px;
+                  width: 8px;
+                  height: 8px;
+                  border-radius: 50%;
+                  background: #a6a6a6;
+                "
+              ></div>
+              {{ getDictLabelName(scope.row.status, "maintenanceStatus") }}
+            </span>
           </template>
         </el-table-column>
-        <el-table-column prop="createName" align="center" label="检查责任人"/>
+        <el-table-column prop="createName" align="center" label="检查责任人" />
         <el-table-column
           prop="startDate"
           align="center"
@@ -185,7 +228,7 @@
         >
           <template slot-scope="scope">
             <span
-            >{{ scope.row.startDate || "-" }}/{{
+              >{{ scope.row.startDate || "-" }}/{{
                 scope.row.endDate || "-"
               }}</span
             >
@@ -205,18 +248,16 @@
               size="small"
               v-hasPermi="['df:run:pestanimal2:inspection:list:item:check']"
               @click="handleCheckDetails(scope.row, false)"
-            >查看
-            </el-button
-            >
+              >查看
+            </el-button>
             <el-button
               type="text"
               size="small"
               :disabled="scope.row.status !== '1'"
               v-hasPermi="['df:run:pestanimal2:inspection:list:item:edit']"
               @click="handleEditDetails(scope.row, true)"
-            >编辑
-            </el-button
-            >
+              >编辑
+            </el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -237,14 +278,12 @@
 </template>
 <script>
 import TopBackTitle from "@/components/TopBackTitle/index.vue";
-import {calcTableHeight} from "@/mixins/calcTableHeight";
+import { calcTableHeight } from "@/mixins/calcTableHeight";
 
-import {
-  postV2RecordList
-} from "@/api/dike/pestAnimalControl2";
+import { postV2RecordList } from "@/api/dike/pestAnimalControl2";
 
 export default {
-  components: {TopBackTitle},
+  components: { TopBackTitle },
   mixins: [calcTableHeight],
   data() {
     return {
@@ -256,9 +295,9 @@ export default {
         name: "",
         type: "",
         time: [],
-        dutyHolder: '',
-        category: '',
-        status: ''
+        dutyHolder: "",
+        category: "",
+        status: "",
       },
       pageData: {
         pageNum: 1, // 当前页
@@ -280,7 +319,7 @@ export default {
     });
   },
   mounted() {
-    this.getTableData()
+    this.getTableData();
   },
   methods: {
     handleCurrentPageChange(page) {
@@ -294,13 +333,13 @@ export default {
     handleCheckDetails(row) {
       this.$router.push({
         path: "inspectionRecordDetails",
-        query: {id: row.id, checkingId: row.checkingId, mode: "check"},
+        query: { id: row.id, checkingId: row.checkingId, mode: "check" },
       });
     },
     handleEditDetails(row) {
       this.$router.push({
         path: "inspectionRecordDetails",
-        query: {id: row.id, checkingId: row.checkingId, mode: "edit"},
+        query: { id: row.id, checkingId: row.checkingId, mode: "edit" },
       });
     },
     getDictLabelName(type, dictListName) {
@@ -333,9 +372,15 @@ export default {
         dutyHolder: this.paramsData.dutyHolder,
         category: this.paramsData.category,
         status: this.paramsData.status,
-        startDate: this.paramsData.time && this.paramsData.time.length > 1 ? this.paramsData.time[0] : '',
-        endDate: this.paramsData.time && this.paramsData.time.length > 1 ? this.paramsData.time[1] : '',
-      }
+        startDate:
+          this.paramsData.time && this.paramsData.time.length > 1
+            ? this.paramsData.time[0]
+            : "",
+        endDate:
+          this.paramsData.time && this.paramsData.time.length > 1
+            ? this.paramsData.time[1]
+            : "",
+      };
       postV2RecordList({
         data: {
           timeView: {
diff --git a/src/views/dike/runManage/pestAnimalControl2/acceptanceRecords/index.vue b/src/views/dike/runManage/pestAnimalControl2/acceptanceRecords/index.vue
index 4cf711a..fee8c29 100644
--- a/src/views/dike/runManage/pestAnimalControl2/acceptanceRecords/index.vue
+++ b/src/views/dike/runManage/pestAnimalControl2/acceptanceRecords/index.vue
@@ -149,10 +149,16 @@
         <div class="line" ref="lineRef"></div>
       </div>
       <el-table :height="tableHeight" :data="tableData" border>
-        <el-table-column prop="id" align="center" label="单号" />
-        <el-table-column prop="detail.name" align="center" label="防治项目名称" />
-        <el-table-column prop="dikeName" align="center" label="堤防名称"/>
-        <el-table-column prop="dikeCode" align="center" label="堤防代码"/>
+        <!-- <el-table-column prop="id" align="center" label="单号" /> -->
+        <el-table-column type="index" align="center" label="序号" width="100">
+        </el-table-column>
+        <el-table-column
+          prop="detail.name"
+          align="center"
+          label="防治项目名称"
+        />
+        <el-table-column prop="dikeName" align="center" label="堤防名称" />
+        <el-table-column prop="dikeCode" align="center" label="堤防代码" />
         <el-table-column align="center" label="检查类型">
           <template slot-scope="scope">
             <span>{{
@@ -163,48 +169,99 @@
         <el-table-column prop="category" align="center" label="防治类别">
           <template slot-scope="scope">
             <span>{{
-              getDictLabelName(scope.row.detail.category || '', "maintenanceCategory")
+              getDictLabelName(
+                scope.row.detail.category || "",
+                "maintenanceCategory"
+              )
             }}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="status" align="center" label="验收状态" width="100">
+        <el-table-column
+          prop="status"
+          align="center"
+          label="验收状态"
+          width="100"
+        >
           <template slot-scope="scope">
-            <span style="position: relative"
-                  :style="['3', '5', '6'].includes(scope.row.detail.status) && {color: 'rgba(0,0,0,0.4)'}">
-                <div
-                  v-if="scope.row.detail.status === '1'"
-                  style="position: absolute;left: -16px;top: 6px;width: 8px;height: 8px;border-radius: 50%; background: #FFB20D"
-                ></div>
-                <div
-                  v-if="scope.row.detail.status === '2'"
-                  style="position: absolute;left: -16px;top: 6px;width: 8px;height: 8px;border-radius: 50%; background: #0EC885"
-                ></div>
-                <div
-                  v-if="scope.row.detail.status === '4'"
-                  style="position: absolute;left: -16px;top: 6px;width: 8px;height: 8px;border-radius: 50%; background: #3A89FE"
-                ></div>
-                <div
-                  v-if="['3', '5', '6'].includes(scope.row.detail.status)"
-                  style="position: absolute;left: -16px;top: 6px;width: 8px;height: 8px;border-radius: 50%; background: #A6A6A6"
-                ></div>
-                  {{ getDictLabelName(scope.row.detail.status, "maintenanceStatus") }}
-                </span>
+            <span
+              style="position: relative"
+              :style="
+                ['3', '5', '6'].includes(scope.row.detail.status) && {
+                  color: 'rgba(0,0,0,0.4)',
+                }
+              "
+            >
+              <div
+                v-if="scope.row.detail.status === '1'"
+                style="
+                  position: absolute;
+                  left: -16px;
+                  top: 6px;
+                  width: 8px;
+                  height: 8px;
+                  border-radius: 50%;
+                  background: #ffb20d;
+                "
+              ></div>
+              <div
+                v-if="scope.row.detail.status === '2'"
+                style="
+                  position: absolute;
+                  left: -16px;
+                  top: 6px;
+                  width: 8px;
+                  height: 8px;
+                  border-radius: 50%;
+                  background: #0ec885;
+                "
+              ></div>
+              <div
+                v-if="scope.row.detail.status === '4'"
+                style="
+                  position: absolute;
+                  left: -16px;
+                  top: 6px;
+                  width: 8px;
+                  height: 8px;
+                  border-radius: 50%;
+                  background: #3a89fe;
+                "
+              ></div>
+              <div
+                v-if="['3', '5', '6'].includes(scope.row.detail.status)"
+                style="
+                  position: absolute;
+                  left: -16px;
+                  top: 6px;
+                  width: 8px;
+                  height: 8px;
+                  border-radius: 50%;
+                  background: #a6a6a6;
+                "
+              ></div>
+              {{
+                getDictLabelName(scope.row.detail.status, "maintenanceStatus")
+              }}
+            </span>
           </template>
         </el-table-column>
 
         <el-table-column align="center" label="问题等级" width="120">
           <template slot-scope="scope">
             <span>{{
-              getDictLabelName(scope.row.detail.problemLevel || '', "maintenanceLevel")
+              getDictLabelName(
+                scope.row.detail.problemLevel || "",
+                "maintenanceLevel"
+              )
             }}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="detail.dutyHolderName" align="center" label="验收责任人" />
         <el-table-column
-          prop="submitTime"
+          prop="detail.dutyHolderName"
           align="center"
-          label="验收时间"
+          label="验收责任人"
         />
+        <el-table-column prop="submitTime" align="center" label="验收时间" />
 
         <el-table-column
           prop="opera"
@@ -308,7 +365,13 @@ export default {
     handleCheckDetails(row, mode) {
       this.$router.push({
         path: "acceptanceDetails",
-        query: { id: row.id, formId: row.formId, recordId: row.detail.recordId, defectId: row.detail.problemId, mode: mode },
+        query: {
+          id: row.id,
+          formId: row.formId,
+          recordId: row.detail.recordId,
+          defectId: row.detail.problemId,
+          mode: mode,
+        },
       });
     },
     getDictLabelName(type, dictListName) {
@@ -352,7 +415,7 @@ export default {
             this.paramsData.time && this.paramsData.time.length > 1
               ? this.paramsData.time[1]
               : "",
-        }
+        },
       };
       postV2ApprovalList({
         data: {
diff --git a/src/views/dike/runManage/pestAnimalControl2/defectList/index.vue b/src/views/dike/runManage/pestAnimalControl2/defectList/index.vue
index 1034ace..f6a8034 100644
--- a/src/views/dike/runManage/pestAnimalControl2/defectList/index.vue
+++ b/src/views/dike/runManage/pestAnimalControl2/defectList/index.vue
@@ -136,49 +136,60 @@
               class="flex-shrink-0 myml-12"
               type="success"
               @click="handleChangeQuery"
-            >查询</el-button
+              >查询</el-button
             >
             <el-button
               class="flex-shrink-0"
               size="small"
               @click="handleResetQuery"
-            >重置</el-button
+              >重置</el-button
             >
           </div>
         </div>
         <div class="line" ref="lineRef"></div>
       </div>
-      <el-table
-        :height="tableHeight"
-        :data="tableData"
-        border
-      >
-        <el-table-column prop="id" align="center" label="单号" />
-        <el-table-column prop="checkingName" align="center" label="防治项目名称" />
-        <el-table-column prop="dikeName" align="center" label="堤防名称"/>
-        <el-table-column prop="dikeCode" align="center" label="堤防代码"/>
+      <el-table :height="tableHeight" :data="tableData" border>
+        <!-- <el-table-column prop="id" align="center" label="单号" /> -->
+        <el-table-column type="index" align="center" label="序号" width="100">
+        </el-table-column>
+        <el-table-column
+          prop="checkingName"
+          align="center"
+          label="防治项目名称"
+        />
+        <el-table-column prop="dikeName" align="center" label="堤防名称" />
+        <el-table-column prop="dikeCode" align="center" label="堤防代码" />
         <el-table-column prop="type" align="center" label="检查类型">
           <template slot-scope="scope">
             <span>{{
-                getDictLabelName(scope.row.type, "maintenanceType")
-              }}</span>
+              getDictLabelName(scope.row.type, "maintenanceType")
+            }}</span>
           </template>
         </el-table-column>
         <el-table-column prop="category" align="center" label="防治类别">
           <template slot-scope="scope">
             <span>{{
-                getDictLabelName(scope.row.category, "maintenanceCategory")
-              }}</span>
+              getDictLabelName(scope.row.category, "maintenanceCategory")
+            }}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="level" align="center" label="问题等级" width="120">
+        <el-table-column
+          prop="level"
+          align="center"
+          label="问题等级"
+          width="120"
+        >
           <template slot-scope="scope">
             <span>{{
-                getDictLabelName(scope.row.problemLevel, "maintenanceLevel")
-              }}</span>
+              getDictLabelName(scope.row.problemLevel, "maintenanceLevel")
+            }}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="dutyHolderName" align="center" label="处置责任人" />
+        <el-table-column
+          prop="dutyHolderName"
+          align="center"
+          label="处置责任人"
+        />
         <el-table-column
           prop="startDate"
           align="center"
@@ -186,7 +197,7 @@
         >
           <template slot-scope="scope">
             <span
-            >{{ scope.row.startDate || "-" }}/{{
+              >{{ scope.row.startDate || "-" }}/{{
                 scope.row.endDate || "-"
               }}</span
             >
@@ -207,14 +218,14 @@
               :disabled="scope.row.neckFlag === '0'"
               v-hasPermi="['df:run:pestanimal2:defect:list:item:getInvoices']"
               @click="handleReceiveDetails(scope.row)"
-            >领单</el-button
+              >领单</el-button
             >
             <el-button
               type="text"
               size="small"
               v-hasPermi="['df:run:pestanimal2:defect:list:item:check']"
               @click="handleCheckDetails(scope.row)"
-            >查看</el-button
+              >查看</el-button
             >
           </template>
         </el-table-column>
@@ -238,11 +249,9 @@
 import TopBackTitle from "@/components/TopBackTitle/index.vue";
 import { calcTableHeight } from "@/mixins/calcTableHeight";
 
-import {
-  postV2ProblemList
-} from "@/api/dike/pestAnimalControl2";
+import { postV2ProblemList } from "@/api/dike/pestAnimalControl2";
 export default {
-  components: {TopBackTitle},
+  components: { TopBackTitle },
   mixins: [calcTableHeight],
   data() {
     return {
@@ -255,10 +264,10 @@ export default {
         name: "",
         type: "",
         time: [],
-        dutyHolder: '',
-        category: '',
-        status: '',
-        problemLevel: ''
+        dutyHolder: "",
+        category: "",
+        status: "",
+        problemLevel: "",
       },
       pageData: {
         pageNum: 1, // 当前页
@@ -283,7 +292,7 @@ export default {
     });
   },
   mounted() {
-    this.getTableData()
+    this.getTableData();
   },
   methods: {
     handleCurrentPageChange(page) {
@@ -297,13 +306,17 @@ export default {
     handleReceiveDetails(row) {
       this.$router.push({
         path: "maintenanceDetails",
-        query: { recordId: row.recordId, defectId: row.id, checkingId: row.checkingId },
+        query: {
+          recordId: row.recordId,
+          defectId: row.id,
+          checkingId: row.checkingId,
+        },
       });
     },
     handleCheckDetails(row) {
       this.$router.push({
         path: "defectDetails",
-        query: { recordId: row.recordId, defectId: row.id , mode: 'check' },
+        query: { recordId: row.recordId, defectId: row.id, mode: "check" },
       });
     },
     getDictLabelName(type, dictListName) {
@@ -338,9 +351,15 @@ export default {
         category: this.paramsData.category,
         status: this.paramsData.status,
         problemLevel: this.paramsData.problemLevel,
-        startDate: this.paramsData.time && this.paramsData.time.length > 1 ? this.paramsData.time[0] : '',
-        endDate: this.paramsData.time && this.paramsData.time.length > 1 ? this.paramsData.time[1] : '',
-      }
+        startDate:
+          this.paramsData.time && this.paramsData.time.length > 1
+            ? this.paramsData.time[0]
+            : "",
+        endDate:
+          this.paramsData.time && this.paramsData.time.length > 1
+            ? this.paramsData.time[1]
+            : "",
+      };
       postV2ProblemList({
         data: {
           timeView: {
@@ -376,4 +395,3 @@ export default {
   }
 }
 </style>
-
diff --git a/src/views/dike/runManage/pestAnimalControl2/maintenanceRecords/index.vue b/src/views/dike/runManage/pestAnimalControl2/maintenanceRecords/index.vue
index 0942f56..dee8c53 100644
--- a/src/views/dike/runManage/pestAnimalControl2/maintenanceRecords/index.vue
+++ b/src/views/dike/runManage/pestAnimalControl2/maintenanceRecords/index.vue
@@ -136,82 +136,128 @@
               class="flex-shrink-0 myml-12"
               type="success"
               @click="handleChangeQuery"
-            >查询</el-button
+              >查询</el-button
             >
             <el-button
               class="flex-shrink-0"
               size="small"
               @click="handleResetQuery"
-            >重置</el-button
+              >重置</el-button
             >
           </div>
         </div>
         <div class="line" ref="lineRef"></div>
       </div>
-      <el-table
-        :height="tableHeight"
-        :data="tableData"
-        border
-      >
-        <el-table-column prop="id" align="center" label="单号" />
+      <el-table :height="tableHeight" :data="tableData" border>
+        <!-- <el-table-column prop="id" align="center" label="单号" /> -->
+        <el-table-column type="index" align="center" label="序号" width="100">
+        </el-table-column>
         <el-table-column prop="name" align="center" label="防治项目名称" />
-        <el-table-column prop="dikeName" align="center" label="堤防名称"/>
-        <el-table-column prop="dikeCode" align="center" label="堤防代码"/>
+        <el-table-column prop="dikeName" align="center" label="堤防名称" />
+        <el-table-column prop="dikeCode" align="center" label="堤防代码" />
         <el-table-column prop="type" align="center" label="检查类型">
           <template slot-scope="scope">
             <span>{{
-                getDictLabelName(scope.row.type, "maintenanceType")
-              }}</span>
+              getDictLabelName(scope.row.type, "maintenanceType")
+            }}</span>
           </template>
         </el-table-column>
         <el-table-column prop="category" align="center" label="防治类别">
           <template slot-scope="scope">
             <span>{{
-                getDictLabelName(scope.row.category, "maintenanceCategory")
-              }}</span>
+              getDictLabelName(scope.row.category, "maintenanceCategory")
+            }}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="status" align="center" label="处置状态" width="100">
+        <el-table-column
+          prop="status"
+          align="center"
+          label="处置状态"
+          width="100"
+        >
           <template slot-scope="scope">
-           <span style="position: relative"
-                 :style="['3', '5', '6'].includes(scope.row.status) && {color: 'rgba(0,0,0,0.4)'}">
-                <div
-                  v-if="scope.row.status === '1'"
-                  style="position: absolute;left: -16px;top: 6px;width: 8px;height: 8px;border-radius: 50%; background: #FFB20D"
-                ></div>
-                <div
-                  v-if="scope.row.status === '2'"
-                  style="position: absolute;left: -16px;top: 6px;width: 8px;height: 8px;border-radius: 50%; background: #0EC885"
-                ></div>
-                <div
-                  v-if="scope.row.status === '4'"
-                  style="position: absolute;left: -16px;top: 6px;width: 8px;height: 8px;border-radius: 50%; background: #3A89FE"
-                ></div>
-                <div
-                  v-if="['3', '5', '6'].includes(scope.row.status)"
-                  style="position: absolute;left: -16px;top: 6px;width: 8px;height: 8px;border-radius: 50%; background: #A6A6A6"
-                ></div>
-                  {{ getDictLabelName(scope.row.status, "maintenanceStatus") }}
-                </span>
+            <span
+              style="position: relative"
+              :style="
+                ['3', '5', '6'].includes(scope.row.status) && {
+                  color: 'rgba(0,0,0,0.4)',
+                }
+              "
+            >
+              <div
+                v-if="scope.row.status === '1'"
+                style="
+                  position: absolute;
+                  left: -16px;
+                  top: 6px;
+                  width: 8px;
+                  height: 8px;
+                  border-radius: 50%;
+                  background: #ffb20d;
+                "
+              ></div>
+              <div
+                v-if="scope.row.status === '2'"
+                style="
+                  position: absolute;
+                  left: -16px;
+                  top: 6px;
+                  width: 8px;
+                  height: 8px;
+                  border-radius: 50%;
+                  background: #0ec885;
+                "
+              ></div>
+              <div
+                v-if="scope.row.status === '4'"
+                style="
+                  position: absolute;
+                  left: -16px;
+                  top: 6px;
+                  width: 8px;
+                  height: 8px;
+                  border-radius: 50%;
+                  background: #3a89fe;
+                "
+              ></div>
+              <div
+                v-if="['3', '5', '6'].includes(scope.row.status)"
+                style="
+                  position: absolute;
+                  left: -16px;
+                  top: 6px;
+                  width: 8px;
+                  height: 8px;
+                  border-radius: 50%;
+                  background: #a6a6a6;
+                "
+              ></div>
+              {{ getDictLabelName(scope.row.status, "maintenanceStatus") }}
+            </span>
           </template>
         </el-table-column>
 
-        <el-table-column prop="level" align="center" label="问题等级" width="120">
+        <el-table-column
+          prop="level"
+          align="center"
+          label="问题等级"
+          width="120"
+        >
           <template slot-scope="scope">
             <span>{{
-                getDictLabelName(scope.row.problemLevel, "maintenanceLevel")
-              }}</span>
+              getDictLabelName(scope.row.problemLevel, "maintenanceLevel")
+            }}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="dutyHolderName" align="center" label="处置责任人" />
         <el-table-column
-          prop="startDate"
+          prop="dutyHolderName"
           align="center"
-          label="处置时间"
-        >
+          label="处置责任人"
+        />
+        <el-table-column prop="startDate" align="center" label="处置时间">
           <template slot-scope="scope">
             <span
-            >{{ scope.row.startDate || "-" }}/{{
+              >{{ scope.row.startDate || "-" }}/{{
                 scope.row.endDate || "-"
               }}</span
             >
@@ -231,7 +277,7 @@
               size="small"
               v-hasPermi="['df:run:pestanimal2:maintenance:list:item:check']"
               @click="handleCheckDetails(scope.row, 'check')"
-            >查看</el-button
+              >查看</el-button
             >
             <el-button
               type="text"
@@ -239,7 +285,7 @@
               v-hasPermi="['df:run:pestanimal2:maintenance:list:item:edit']"
               :disabled="scope.row.status !== '4'"
               @click="handleCheckDetails(scope.row, 'edit')"
-            >编辑</el-button
+              >编辑</el-button
             >
           </template>
         </el-table-column>
@@ -262,11 +308,9 @@
 <script>
 import TopBackTitle from "@/components/TopBackTitle/index.vue";
 import { calcTableHeight } from "@/mixins/calcTableHeight";
-import {
-  postV2YhList
-} from "@/api/dike/pestAnimalControl2";
+import { postV2YhList } from "@/api/dike/pestAnimalControl2";
 export default {
-  components: {TopBackTitle},
+  components: { TopBackTitle },
   mixins: [calcTableHeight],
   data() {
     return {
@@ -279,10 +323,10 @@ export default {
         name: "",
         type: "",
         time: [],
-        dutyHolder: '',
-        category: '',
-        status: '',
-        problemLevel: ''
+        dutyHolder: "",
+        category: "",
+        status: "",
+        problemLevel: "",
       },
       pageData: {
         pageNum: 1, // 当前页
@@ -307,7 +351,7 @@ export default {
     });
   },
   mounted() {
-    this.getTableData()
+    this.getTableData();
   },
   methods: {
     handleCurrentPageChange(page) {
@@ -321,7 +365,13 @@ export default {
     handleCheckDetails(row, mode) {
       this.$router.push({
         path: "maintenanceDetails",
-        query: { id: row.id, recordId: row.recordId, defectId: row.problemId, status: row.status, mode: mode },
+        query: {
+          id: row.id,
+          recordId: row.recordId,
+          defectId: row.problemId,
+          status: row.status,
+          mode: mode,
+        },
       });
     },
     getDictLabelName(type, dictListName) {
@@ -356,9 +406,15 @@ export default {
         category: this.paramsData.category,
         status: this.paramsData.status,
         problemLevel: this.paramsData.problemLevel,
-        startDate: this.paramsData.time && this.paramsData.time.length > 1 ? this.paramsData.time[0] : '',
-        endDate: this.paramsData.time && this.paramsData.time.length > 1 ? this.paramsData.time[1] : '',
-      }
+        startDate:
+          this.paramsData.time && this.paramsData.time.length > 1
+            ? this.paramsData.time[0]
+            : "",
+        endDate:
+          this.paramsData.time && this.paramsData.time.length > 1
+            ? this.paramsData.time[1]
+            : "",
+      };
       postV2YhList({
         data: {
           timeView: {
@@ -394,4 +450,3 @@ export default {
   }
 }
 </style>
-
diff --git a/src/views/dike/runManage/pestAnimalControl2/overviewAnalysis/index.vue b/src/views/dike/runManage/pestAnimalControl2/overviewAnalysis/index.vue
index 3227e43..9616e36 100644
--- a/src/views/dike/runManage/pestAnimalControl2/overviewAnalysis/index.vue
+++ b/src/views/dike/runManage/pestAnimalControl2/overviewAnalysis/index.vue
@@ -128,10 +128,10 @@ export default {
       return getV2PatrolStatisticChart({
         group,
         startTime: this.paramsData.timeRange[0]
-          ? this.paramsData[0] + " 00:00:00"
+          ? this.paramsData.timeRange[0] + " 00:00:00"
           : null,
         endTime: this.paramsData.timeRange[1]
-          ? this.paramsData[1] + " 23:59:59"
+          ? this.paramsData.timeRange[1] + " 23:59:59"
           : null,
         adcd: this.paramsData.adcd,
       });
diff --git a/src/views/dike/runManage/pestAnimalControl2/patrolItemsManage/index.vue b/src/views/dike/runManage/pestAnimalControl2/patrolItemsManage/index.vue
index 91e4568..254751d 100644
--- a/src/views/dike/runManage/pestAnimalControl2/patrolItemsManage/index.vue
+++ b/src/views/dike/runManage/pestAnimalControl2/patrolItemsManage/index.vue
@@ -182,9 +182,9 @@ export default {
         </div>
       </div>
       <el-table :height="tableHeight" :data="tableData" border>
-        <!-- <el-table-column type="index" align="center" label="序号" width="100">
+        <!-- <el-table-column prop="id" align="center" label="单号" width="100">
         </el-table-column> -->
-        <el-table-column prop="id" align="center" label="单号" width="100">
+        <el-table-column type="index" align="center" label="序号" width="100">
         </el-table-column>
         <el-table-column
           prop="name"
diff --git a/src/views/dike/runManage/pestAnimalControl2/statisticsAnalysis/index.vue b/src/views/dike/runManage/pestAnimalControl2/statisticsAnalysis/index.vue
index 3c4451b..2894ee1 100644
--- a/src/views/dike/runManage/pestAnimalControl2/statisticsAnalysis/index.vue
+++ b/src/views/dike/runManage/pestAnimalControl2/statisticsAnalysis/index.vue
@@ -201,10 +201,10 @@ export default {
       return getV2PatrolStatisticChart({
         group,
         startTime: this.paramsData.timeRange[0]
-          ? this.paramsData[0] + " 00:00:00"
+          ? this.paramsData.timeRange[0] + " 00:00:00"
           : null,
         endTime: this.paramsData.timeRange[1]
-          ? this.paramsData[1] + " 23:59:59"
+          ? this.paramsData.timeRange[1] + " 23:59:59"
           : null,
         code: this.paramsData.dikeCode,
       });
diff --git a/src/views/reservoir/safeOperation/components/DataStatistics.vue b/src/views/reservoir/safeOperation/components/DataStatistics.vue
index b4dcefc..7c54fcd 100644
--- a/src/views/reservoir/safeOperation/components/DataStatistics.vue
+++ b/src/views/reservoir/safeOperation/components/DataStatistics.vue
@@ -306,13 +306,8 @@ export default {
   }
 
   .echarts-box {
-    display: flex;
-    flex-wrap: wrap;
     .echarts-dom-box {
       margin-bottom: 24px;
-      &:nth-child(2n) {
-        margin-left: 24px;
-      }
       .title {
         padding-left: 10px;
         font-size: 14px;
@@ -332,7 +327,7 @@ export default {
         }
       }
       .echarts-dom {
-        width: 478px;
+        width: 100%;
         height: 260px;
         border: 1px solid #f0f0f0;
       }
diff --git a/src/views/sluice/runManage/patrolMaintenance/overviewAnalysis/index.vue b/src/views/sluice/runManage/patrolMaintenance/overviewAnalysis/index.vue
index 3c35dd7..ffd37e7 100644
--- a/src/views/sluice/runManage/patrolMaintenance/overviewAnalysis/index.vue
+++ b/src/views/sluice/runManage/patrolMaintenance/overviewAnalysis/index.vue
@@ -128,10 +128,10 @@ export default {
       return getV2PatrolStatisticChart({
         group,
         startTime: this.paramsData.timeRange[0]
-          ? this.paramsData[0] + " 00:00:00"
+          ? this.paramsData.timeRange[0] + " 00:00:00"
           : null,
         endTime: this.paramsData.timeRange[1]
-          ? this.paramsData[1] + " 23:59:59"
+          ? this.paramsData.timeRange[1] + " 23:59:59"
           : null,
         adcd: this.paramsData.adcd,
       });
diff --git a/src/views/sluice/runManage/patrolMaintenance/statisticsAnalysis/index.vue b/src/views/sluice/runManage/patrolMaintenance/statisticsAnalysis/index.vue
index efb591f..789af1a 100644
--- a/src/views/sluice/runManage/patrolMaintenance/statisticsAnalysis/index.vue
+++ b/src/views/sluice/runManage/patrolMaintenance/statisticsAnalysis/index.vue
@@ -211,10 +211,10 @@ export default {
       return getV2PatrolStatisticChart({
         group,
         startTime: this.paramsData.timeRange[0]
-          ? this.paramsData[0] + " 00:00:00"
+          ? this.paramsData.timeRange[0] + " 00:00:00"
           : null,
         endTime: this.paramsData.timeRange[1]
-          ? this.paramsData[1] + " 23:59:59"
+          ? this.paramsData.timeRange[1] + " 23:59:59"
           : null,
         code: this.paramsData.wagaCode,
       });
diff --git a/src/views/sluice/safeOperation/components/BaseInfo.vue b/src/views/sluice/safeOperation/components/BaseInfo.vue
index 7888d2b..6347b5e 100644
--- a/src/views/sluice/safeOperation/components/BaseInfo.vue
+++ b/src/views/sluice/safeOperation/components/BaseInfo.vue
@@ -276,7 +276,7 @@ export default {
     this.commonInitDict();
   },
   methods: {
-    commonInitDice() {
+    commonInitDict() {
       this.getDicts("engineering_scale").then((response) => {
         this.projectScaleOptions = response.data;
       });
diff --git a/vue.config.js b/vue.config.js
index 9397459..d4c5a90 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -80,8 +80,8 @@ module.exports = {
         changeOrigin: true,
       },
       [process.env.VUE_APP_BASE_API]: {
-        target: "http://shuili.product.dev.com:30115/",
-        // target: "http://172.16.34.80:18082/",
+        // target: "http://shuili.product.dev.com:30115/",
+        target: "http://172.16.34.80:18082/",
         // target: 'http://172.16.32.62:18888/',
         // target: "http://172.16.34.27:18082",
         changeOrigin: true,