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"
>
+
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 @@
-
+
+
-
-
+
+
{{
@@ -164,48 +165,99 @@
{{
- getDictLabelName(scope.row.detail.category || '', "maintenanceCategory")
+ getDictLabelName(
+ scope.row.detail.category || "",
+ "maintenanceCategory"
+ )
}}
-
+
-
-
-
-
-
- {{ getDictLabelName(scope.row.detail.status, "maintenanceStatus") }}
-
+
+
+
+
+
+ {{
+ getDictLabelName(scope.row.detail.status, "maintenanceStatus")
+ }}
+
{{
- getDictLabelName(scope.row.detail.problemLevel || '', "maintenanceLevel")
+ getDictLabelName(
+ scope.row.detail.problemLevel || "",
+ "maintenanceLevel"
+ )
}}
-
+
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"
- >查询
-
+ >查询
+
重置
-
+ >重置
+
-
-
-
-
-
+
+
+
+
+
+
+
{{
- getDictLabelName(scope.row.type, "maintenanceType")
- }}
+ getDictLabelName(scope.row.type, "maintenanceType")
+ }}
{{
- getDictLabelName(scope.row.category, "maintenanceCategory")
- }}
+ getDictLabelName(scope.row.category, "maintenanceCategory")
+ }}
-
+
-
-
-
-
-
- {{ getDictLabelName(scope.row.status, "maintenanceStatus") }}
-
+
+
+
+
+
+ {{ getDictLabelName(scope.row.status, "maintenanceStatus") }}
+
-
+
{{ scope.row.startDate || "-" }}/{{
+ >{{ scope.row.startDate || "-" }}/{{
scope.row.endDate || "-"
}}
@@ -205,18 +248,16 @@
size="small"
v-hasPermi="['df:run:pestanimal2:inspection:list:item:check']"
@click="handleCheckDetails(scope.row, false)"
- >查看
-
+ >查看
+
编辑
-
+ >编辑
+
@@ -237,14 +278,12 @@