- 新增项目
+ 新增项目
diff --git a/src/views/dike/runManage/dangerWeakProject/inspectProjects/fillReport.vue b/src/views/dike/runManage/dangerWeakProject/inspectProjects/fillReport.vue
index 9213a9d..b0b1b4a 100644
--- a/src/views/dike/runManage/dangerWeakProject/inspectProjects/fillReport.vue
+++ b/src/views/dike/runManage/dangerWeakProject/inspectProjects/fillReport.vue
@@ -276,23 +276,27 @@ export default {
>
-
问题
+
+ 检查项{{ index2 + 1 }}
+
{{ item2.content }}
正常
- 查看
核查
查看报告
diff --git a/src/views/dike/runManage/dangerWeakProject/inspectStatistics/components/Pie.vue b/src/views/dike/runManage/dangerWeakProject/inspectStatistics/components/Pie.vue
index 2e676f3..6e6401b 100644
--- a/src/views/dike/runManage/dangerWeakProject/inspectStatistics/components/Pie.vue
+++ b/src/views/dike/runManage/dangerWeakProject/inspectStatistics/components/Pie.vue
@@ -146,7 +146,7 @@ export default {
border-bottom: 1px solid #e5e5e5;
}
.canvas {
- width: 500px;
+ width: 100%;
height: 200px;
padding: 10px;
}
diff --git a/src/views/dike/runManage/dangerWeakProject/inspectStatistics/index.vue b/src/views/dike/runManage/dangerWeakProject/inspectStatistics/index.vue
index 97337fb..68ffb93 100644
--- a/src/views/dike/runManage/dangerWeakProject/inspectStatistics/index.vue
+++ b/src/views/dike/runManage/dangerWeakProject/inspectStatistics/index.vue
@@ -260,7 +260,7 @@ export default {
ref="pieRef2"
title="任务数统计"
echartsTitle="任务总数"
- class="question-item ml-20"
+ class="question-item"
:itemData="questionLevelList.slice(4, 6)"
>
添加
@@ -310,17 +310,18 @@ export default {
type="text"
size="small"
@click="handlePreview(scope.row)"
+ v-hasPermi="['df:run:dangerProj:task:view']"
>查看
编辑
-
+
+
diff --git a/src/views/dike/runManage/patrolMaintenance/acceptanceRecords/index.vue b/src/views/dike/runManage/patrolMaintenance/acceptanceRecords/index.vue
index ae20c83..3920ad0 100644
--- a/src/views/dike/runManage/patrolMaintenance/acceptanceRecords/index.vue
+++ b/src/views/dike/runManage/patrolMaintenance/acceptanceRecords/index.vue
@@ -149,7 +149,8 @@
-
+
+
diff --git a/src/views/dike/runManage/patrolMaintenance/componentsDetails/inspectionRecordDetails.vue b/src/views/dike/runManage/patrolMaintenance/componentsDetails/inspectionRecordDetails.vue
index dc086bc..cf57d9b 100644
--- a/src/views/dike/runManage/patrolMaintenance/componentsDetails/inspectionRecordDetails.vue
+++ b/src/views/dike/runManage/patrolMaintenance/componentsDetails/inspectionRecordDetails.vue
@@ -30,7 +30,7 @@
:disabled="$route.query.mode === 'check'"
v-model="form.time"
type="daterange"
- value-format="yyyy-MM-dd HH:mm:ss"
+ value-format="yyyy-MM-dd"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
@@ -107,7 +107,6 @@
+
+
验收意见
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
巡查状态
+
养护状态
-
+
+
@@ -176,6 +177,30 @@
}}
+
+
+
+
+
+
+
+ {{ getDictLabelName(scope.row.status, "maintenanceStatus") }}
+
+
+
-
+
+
@@ -319,7 +320,7 @@ export default {
handleCheckDetails(row, mode) {
this.$router.push({
path: "maintenanceDetails",
- query: { id: row.id, recordId: row.recordId, defectId: row.problemId, mode: mode },
+ query: { id: row.id, recordId: row.recordId, defectId: row.problemId,status: row.status, mode: mode },
});
},
getDictLabelName(type, dictListName) {
diff --git a/src/views/dike/runManage/patrolMaintenance/patrolItemsManage/index.vue b/src/views/dike/runManage/patrolMaintenance/patrolItemsManage/index.vue
index 90f55be..2b217dd 100644
--- a/src/views/dike/runManage/patrolMaintenance/patrolItemsManage/index.vue
+++ b/src/views/dike/runManage/patrolMaintenance/patrolItemsManage/index.vue
@@ -179,15 +179,15 @@ export default {
-
-
+
+
-
+
-
+
diff --git a/src/views/dike/runManage/pestAnimalControl2/componentsDetails/inspectionRecordDetails.vue b/src/views/dike/runManage/pestAnimalControl2/componentsDetails/inspectionRecordDetails.vue
index 084fc8f..02f21f5 100644
--- a/src/views/dike/runManage/pestAnimalControl2/componentsDetails/inspectionRecordDetails.vue
+++ b/src/views/dike/runManage/pestAnimalControl2/componentsDetails/inspectionRecordDetails.vue
@@ -30,7 +30,7 @@
:disabled="$route.query.mode === 'check'"
v-model="form.time"
type="daterange"
- value-format="yyyy-MM-dd HH:mm:ss"
+ value-format="yyyy-MM-dd"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
@@ -107,7 +107,6 @@
+
+
验收意见
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
v.code === "DF_PROJECT_ADCD_SUM"
+ (v) => v.code === "DW_PROJECT_ADCD_SUM"
)?.sum;
this.projectSum = Number(num ?? null);
}
@@ -205,7 +205,7 @@ export default {
});
// 获取检查分析数据
this.renderEcharts({
- group: "C_2",
+ group: "C_DW_2",
echartsInstanceName: "patrolEchartInstance",
echartsDomName: "patrolEchart",
echartsOptions: {
@@ -229,7 +229,7 @@ export default {
});
// 获取检查分析数据
this.renderEcharts({
- group: "C_3",
+ group: "C_DW_3",
echartsInstanceName: "compareEchartInstance",
echartsDomName: "compareEchart",
echartsOptions: {
@@ -244,9 +244,9 @@ export default {
// 渲染图表和统计总数
if (res.data?.yaxis?.length) {
let newArr = res.data.yaxis.flatMap((v) => v.series);
- let num1 = newArr.find((v) => v.code === "DF_QX_ADCD_SUM")?.sum;
+ let num1 = newArr.find((v) => v.code === "DW_QX_ADCD_SUM")?.sum;
this.flawSum = Number(num1 ?? null);
- let num2 = newArr.find((v) => v.code === "DF_YH_ADCD_SUM")?.sum;
+ let num2 = newArr.find((v) => v.code === "DW_YH_ADCD_SUM")?.sum;
this.yhSum = Number(num2 ?? null);
}
}
diff --git a/src/views/dike/runManage/pestAnimalControl2/statisticsAnalysis/index.vue b/src/views/dike/runManage/pestAnimalControl2/statisticsAnalysis/index.vue
index a543cc7..2a998f6 100644
--- a/src/views/dike/runManage/pestAnimalControl2/statisticsAnalysis/index.vue
+++ b/src/views/dike/runManage/pestAnimalControl2/statisticsAnalysis/index.vue
@@ -270,7 +270,7 @@ export default {
// 获取页面数据
getTableData() {
// 检查记录分析
- this.requestFunc({ group: "C_14" }).then((res) => {
+ this.requestFunc({ group: "C_DW_14" }).then((res) => {
if (res.data) {
// 渲染图表和统计总数
if (res.data?.yaxis?.length) {
@@ -354,7 +354,7 @@ export default {
}
});
// 检查缺陷分析
- this.requestFunc({ group: "C_15" }).then((res) => {
+ this.requestFunc({ group: "C_DW_15" }).then((res) => {
if (res.data) {
if (res.data?.yaxis?.length) {
this.flawSum = res.data.yaxis
@@ -435,7 +435,7 @@ export default {
}
});
// 缺陷问题等级分析
- this.requestFunc({ group: "C_16" }).then((res) => {
+ this.requestFunc({ group: "C_DW_16" }).then((res) => {
if (res.data) {
this.$nextTick(() => {
// 柱形图
@@ -546,13 +546,13 @@ export default {
}
});
// 缺陷养护对比分析
- this.requestFunc({ group: "C_17" }).then((res) => {
+ this.requestFunc({ group: "C_DW_17" }).then((res) => {
if (res.data) {
if (res.data.yaxis?.length) {
this.yhSum = Number(
res.data.yaxis
.flatMap((v) => v.series)
- ?.find((v) => v.code === "DF_BD_YH_SUM")?.sum ?? null
+ ?.find((v) => v.code === "DW_BD_YH_SUM")?.sum ?? null
);
}
this.$nextTick(() => {
@@ -628,7 +628,7 @@ export default {
}
});
// 项目统计总数
- this.requestFunc({ group: "C_18" }).then((res) => {
+ this.requestFunc({ group: "C_DW_18" }).then((res) => {
if (res.data) {
if (res.data?.yaxis?.length) {
let newArr = res.data.yaxis.flatMap((v) => v.series);
diff --git a/src/views/dike/runManage/supervisionInspetion/methodsManage/index.vue b/src/views/dike/runManage/supervisionInspetion/methodsManage/index.vue
index 9d198d9..8b6eca8 100644
--- a/src/views/dike/runManage/supervisionInspetion/methodsManage/index.vue
+++ b/src/views/dike/runManage/supervisionInspetion/methodsManage/index.vue
@@ -216,7 +216,7 @@ export default {
type="text"
size="small"
@click="handleCopyMethod(scope.row)"
- v-hasPermi="['df:run:sup:meth:edit']"
+ v-hasPermi="['df:run:sup:meth:copy']"
>复制
- 查看
巡查
报告
diff --git a/src/views/dike/runManage/supervisionInspetion/questionManage/index.vue b/src/views/dike/runManage/supervisionInspetion/questionManage/index.vue
index 7cc375b..f925ebd 100644
--- a/src/views/dike/runManage/supervisionInspetion/questionManage/index.vue
+++ b/src/views/dike/runManage/supervisionInspetion/questionManage/index.vue
@@ -345,7 +345,11 @@ export default {
- 查看
下发
处理
确认
完成
diff --git a/src/views/sluice/runManage/dangerWeakProject/inspectGroup/index.vue b/src/views/sluice/runManage/dangerWeakProject/inspectGroup/index.vue
index c91d4b7..67bb540 100644
--- a/src/views/sluice/runManage/dangerWeakProject/inspectGroup/index.vue
+++ b/src/views/sluice/runManage/dangerWeakProject/inspectGroup/index.vue
@@ -220,7 +220,7 @@ export default {
class="search-btn mb-10"
style="margin-right: 16px"
type="success"
- v-hasPermi="['sz:run:jc:group:add']"
+ v-hasPermi="['sz:run:dangerProj:group:add']"
@click="handleAddNew()"
>创建
@@ -245,18 +245,22 @@ export default {
- 查看
编辑
- 新增项目
+ 新增项目
-
问题
+
+ 检查项{{ index2 + 1 }}
+
{{ item2.content }}
@@ -452,6 +454,8 @@ export default {
.question-select {
padding: 10px;
border-bottom: 1px solid #f0f0f0;
+ display: flex;
+ justify-content: center;
}
}
}
diff --git a/src/views/sluice/runManage/dangerWeakProject/inspectProjects/index.vue b/src/views/sluice/runManage/dangerWeakProject/inspectProjects/index.vue
index 4398c99..b31f389 100644
--- a/src/views/sluice/runManage/dangerWeakProject/inspectProjects/index.vue
+++ b/src/views/sluice/runManage/dangerWeakProject/inspectProjects/index.vue
@@ -360,7 +360,11 @@ export default {
- 查看
核查
查看报告
diff --git a/src/views/sluice/runManage/dangerWeakProject/inspectStatistics/components/Pie.vue b/src/views/sluice/runManage/dangerWeakProject/inspectStatistics/components/Pie.vue
index 2e676f3..6e6401b 100644
--- a/src/views/sluice/runManage/dangerWeakProject/inspectStatistics/components/Pie.vue
+++ b/src/views/sluice/runManage/dangerWeakProject/inspectStatistics/components/Pie.vue
@@ -146,7 +146,7 @@ export default {
border-bottom: 1px solid #e5e5e5;
}
.canvas {
- width: 500px;
+ width: 100%;
height: 200px;
padding: 10px;
}
diff --git a/src/views/sluice/runManage/dangerWeakProject/inspectStatistics/index.vue b/src/views/sluice/runManage/dangerWeakProject/inspectStatistics/index.vue
index 81db0d2..e0d106a 100644
--- a/src/views/sluice/runManage/dangerWeakProject/inspectStatistics/index.vue
+++ b/src/views/sluice/runManage/dangerWeakProject/inspectStatistics/index.vue
@@ -283,7 +283,7 @@ export default {
ref="pieRef2"
title="任务数统计"
echartsTitle="任务总数"
- class="question-item ml-20"
+ class="question-item"
:itemData="questionLevelList.slice(4, 6)"
>
添加
@@ -337,12 +337,21 @@ export default {
type="text"
size="small"
@click="handlePreview(scope.row)"
+ v-hasPermi="['sz:run:dangerProj:task:view']"
>查看
- 编辑
- 删除
diff --git a/src/views/sluice/runManage/patrolMaintenance/InspectionRecords/index.vue b/src/views/sluice/runManage/patrolMaintenance/InspectionRecords/index.vue
index 9558e11..b66f1f2 100644
--- a/src/views/sluice/runManage/patrolMaintenance/InspectionRecords/index.vue
+++ b/src/views/sluice/runManage/patrolMaintenance/InspectionRecords/index.vue
@@ -134,7 +134,8 @@
:data="tableData"
border
>
-
+
+
diff --git a/src/views/sluice/runManage/patrolMaintenance/acceptanceRecords/index.vue b/src/views/sluice/runManage/patrolMaintenance/acceptanceRecords/index.vue
index e2d444b..57d34be 100644
--- a/src/views/sluice/runManage/patrolMaintenance/acceptanceRecords/index.vue
+++ b/src/views/sluice/runManage/patrolMaintenance/acceptanceRecords/index.vue
@@ -149,7 +149,8 @@
-
+
+
diff --git a/src/views/sluice/runManage/patrolMaintenance/componentsDetails/inspectionRecordDetails.vue b/src/views/sluice/runManage/patrolMaintenance/componentsDetails/inspectionRecordDetails.vue
index c06262c..9d0d88c 100644
--- a/src/views/sluice/runManage/patrolMaintenance/componentsDetails/inspectionRecordDetails.vue
+++ b/src/views/sluice/runManage/patrolMaintenance/componentsDetails/inspectionRecordDetails.vue
@@ -30,7 +30,7 @@
:disabled="$route.query.mode === 'check'"
v-model="form.time"
type="daterange"
- value-format="yyyy-MM-dd HH:mm:ss"
+ value-format="yyyy-MM-dd"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
@@ -107,7 +107,6 @@
+
+
验收意见
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
巡查状态
+
养护状态
-
+
+
@@ -176,6 +177,31 @@
}}
+
+
+
+
+
+
+
+
+ {{ getDictLabelName(scope.row.status, "maintenanceStatus") }}
+
+
+
-
+
+
@@ -319,7 +320,7 @@ export default {
handleCheckDetails(row, mode) {
this.$router.push({
path: "maintenanceDetails",
- query: { id: row.id, recordId: row.recordId, defectId: row.problemId, mode: mode },
+ query: { id: row.id, recordId: row.recordId, defectId: row.problemId, status: row.status, mode: mode },
});
},
getDictLabelName(type, dictListName) {
diff --git a/src/views/sluice/runManage/patrolMaintenance/patrolItemsManage/index.vue b/src/views/sluice/runManage/patrolMaintenance/patrolItemsManage/index.vue
index 2a73795..21a6a35 100644
--- a/src/views/sluice/runManage/patrolMaintenance/patrolItemsManage/index.vue
+++ b/src/views/sluice/runManage/patrolMaintenance/patrolItemsManage/index.vue
@@ -179,15 +179,15 @@ export default {
-
-
+
+
-
+
-
+
diff --git a/src/views/sluice/runManage/supervisionInspetion/methodsManage/index.vue b/src/views/sluice/runManage/supervisionInspetion/methodsManage/index.vue
index ac30ede..4bd0b60 100644
--- a/src/views/sluice/runManage/supervisionInspetion/methodsManage/index.vue
+++ b/src/views/sluice/runManage/supervisionInspetion/methodsManage/index.vue
@@ -150,6 +150,7 @@ export default {
style="margin-right: 16px"
type="success"
@click="handleAddMethod()"
+ v-hasPermi="['sz:run:sup:meth:add']"
>添加
@@ -214,7 +215,7 @@ export default {
type="text"
size="small"
@click="handleCopyMethod(scope.row)"
- v-hasPermi="['sz:run:sup:meth:edit']"
+ v-hasPermi="['sz:run:sup:meth:copy']"
>复制
- 查看
巡查
报告
diff --git a/src/views/sluice/runManage/supervisionInspetion/questionManage/index.vue b/src/views/sluice/runManage/supervisionInspetion/questionManage/index.vue
index e943a1e..604f763 100644
--- a/src/views/sluice/runManage/supervisionInspetion/questionManage/index.vue
+++ b/src/views/sluice/runManage/supervisionInspetion/questionManage/index.vue
@@ -374,7 +374,11 @@ export default {
- 查看
下发
处理
确认
完成
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,