From c439b7e4fc3792a8af1c1ba0d75d81f915087035 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=98=93=E6=B5=A9=E8=BD=A9?= <[yihaoxuan@datametatech.com]> Date: Mon, 20 Nov 2023 14:56:10 +0800 Subject: [PATCH 1/3] =?UTF-8?q?feat:=20=E5=A0=A4=E9=98=B2-=E5=B7=A1?= =?UTF-8?q?=E6=9F=A5=E8=AE=A1=E5=88=92-=E7=BC=96=E8=BE=91=E8=AE=A1?= =?UTF-8?q?=E5=88=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../engineering/inspectionPlan/Dike.vue | 118 ++++++++---------- 1 file changed, 50 insertions(+), 68 deletions(-) diff --git a/src/views/runManage/engineering/inspectionPlan/Dike.vue b/src/views/runManage/engineering/inspectionPlan/Dike.vue index ee06f07..d77d764 100644 --- a/src/views/runManage/engineering/inspectionPlan/Dike.vue +++ b/src/views/runManage/engineering/inspectionPlan/Dike.vue @@ -1,14 +1,12 @@ + + + + \ No newline at end of file diff --git a/src/views/runManage/engineering/inspectionRecords/Reservoir.vue b/src/views/runManage/engineering/inspectionRecords/Reservoir.vue new file mode 100644 index 0000000..a1abe78 --- /dev/null +++ b/src/views/runManage/engineering/inspectionRecords/Reservoir.vue @@ -0,0 +1,22 @@ + + + + + + \ No newline at end of file diff --git a/src/views/runManage/engineering/inspectionRecords/Sluice.vue b/src/views/runManage/engineering/inspectionRecords/Sluice.vue new file mode 100644 index 0000000..d4dd826 --- /dev/null +++ b/src/views/runManage/engineering/inspectionRecords/Sluice.vue @@ -0,0 +1,22 @@ + + + + + + \ No newline at end of file diff --git a/src/views/runManage/engineering/inspectionRecords/index.vue b/src/views/runManage/engineering/inspectionRecords/index.vue index db25110..a9b8559 100644 --- a/src/views/runManage/engineering/inspectionRecords/index.vue +++ b/src/views/runManage/engineering/inspectionRecords/index.vue @@ -1,72 +1,29 @@ - - - \ No newline at end of file + \ No newline at end of file diff --git a/src/views/runManage/engineering/patrolRouteSettings/Dike.vue b/src/views/runManage/engineering/patrolRouteSettings/Dike.vue new file mode 100644 index 0000000..ebb671b --- /dev/null +++ b/src/views/runManage/engineering/patrolRouteSettings/Dike.vue @@ -0,0 +1,65 @@ + + + + + + \ No newline at end of file diff --git a/src/views/runManage/engineering/patrolRouteSettings/Reservoir.vue b/src/views/runManage/engineering/patrolRouteSettings/Reservoir.vue new file mode 100644 index 0000000..a00bd87 --- /dev/null +++ b/src/views/runManage/engineering/patrolRouteSettings/Reservoir.vue @@ -0,0 +1,22 @@ + + + + + + \ No newline at end of file diff --git a/src/views/runManage/engineering/patrolRouteSettings/Sluice.vue b/src/views/runManage/engineering/patrolRouteSettings/Sluice.vue new file mode 100644 index 0000000..6856ec2 --- /dev/null +++ b/src/views/runManage/engineering/patrolRouteSettings/Sluice.vue @@ -0,0 +1,22 @@ + + + + + + \ No newline at end of file diff --git a/src/views/runManage/engineering/patrolRouteSettings/components/Drawer.vue b/src/views/runManage/engineering/patrolRouteSettings/components/Drawer.vue new file mode 100644 index 0000000..a62a28e --- /dev/null +++ b/src/views/runManage/engineering/patrolRouteSettings/components/Drawer.vue @@ -0,0 +1,224 @@ + + + + + + \ No newline at end of file diff --git a/src/views/runManage/engineering/patrolRouteSettings/components/GaoDeMap.vue b/src/views/runManage/engineering/patrolRouteSettings/components/GaoDeMap.vue new file mode 100644 index 0000000..2b88f7d --- /dev/null +++ b/src/views/runManage/engineering/patrolRouteSettings/components/GaoDeMap.vue @@ -0,0 +1,226 @@ + + + + diff --git a/src/views/runManage/engineering/patrolRouteSettings/index.vue b/src/views/runManage/engineering/patrolRouteSettings/index.vue new file mode 100644 index 0000000..cc65f5d --- /dev/null +++ b/src/views/runManage/engineering/patrolRouteSettings/index.vue @@ -0,0 +1,29 @@ + + + + + + \ No newline at end of file From a8e28a3dbf1205a4d25d515c54e18e7308291511 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=98=93=E6=B5=A9=E8=BD=A9?= <[yihaoxuan@datametatech.com]> Date: Wed, 22 Nov 2023 19:35:26 +0800 Subject: [PATCH 3/3] =?UTF-8?q?feat:=20=E5=B7=A1=E6=9F=A5=E8=AE=B0?= =?UTF-8?q?=E5=BD=95-=E5=B7=A1=E6=9F=A5=E8=BD=A8=E8=BF=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/management/dike.js | 25 +++++++---- .../engineering/inspectionItems/Dike.vue | 22 ++++++---- .../engineering/inspectionPlan/Dike.vue | 7 +++- .../engineering/inspectionRecords/Dike.vue | 2 +- .../components/GaoDeMap.vue | 42 +++++++++++++------ 5 files changed, 66 insertions(+), 32 deletions(-) diff --git a/src/api/management/dike.js b/src/api/management/dike.js index d65d6d0..daad8ac 100644 --- a/src/api/management/dike.js +++ b/src/api/management/dike.js @@ -1,6 +1,14 @@ // 堤防相关接口 import request from '@/utils/request' + +// 巡查计划管理-获取人员信息 +export function getPersonnelInformation(id) { + return request({ + url: `/system/user/${id}`, + method: 'get', + }) +} // 巡查项目管理-巡视检查列表 export function postEmbankmentInspectionChecklist(data) { return request({ @@ -87,14 +95,6 @@ export function deleteInspectionPlan(id) { }) } -// 巡查计划管理-获取人员信息 -export function getPersonnelInformation(id) { - return request({ - url: `/system/user/${id}`, - method: 'get', - }) -} - // 巡查计划管理-巡查点位设置 export function postInspectionRoute(id, data) { return request({ @@ -128,4 +128,13 @@ export function postNewInspectionRecords(data) { method: 'post', data }) +} + +// 巡查记录-巡查记录轨迹列表 +export function postInspectionRecordsTrajectoryList(data) { + return request({ + url: '/run/df/trace/list', + method: 'post', + data + }) } \ No newline at end of file diff --git a/src/views/runManage/engineering/inspectionItems/Dike.vue b/src/views/runManage/engineering/inspectionItems/Dike.vue index 4102750..9304e3f 100644 --- a/src/views/runManage/engineering/inspectionItems/Dike.vue +++ b/src/views/runManage/engineering/inspectionItems/Dike.vue @@ -68,10 +68,8 @@ export default { // 编辑巡查项目 editTableItem(row) { getEmbankmentInspectionCheck(row.id).then((res) => { - console.log('🚀res🚀', res) - this.ruleForm.name = res.data.name - this.ruleForm.type = res.data.type - this.ruleForm.items = res.data.items + console.log('🚀res🚀', res.data) + this.ruleForm = res.data this.ruleForm.checkContentType = res.data.items[0].parts[0] getDicts(res.data.items[0].parts[0]).then((res) => { this.secondType = res.data @@ -83,6 +81,7 @@ export default { }) }); this.dialogVisible = true + console.log('🚀this.ruleForm🚀', this.ruleForm) }) }, // 删除对应巡查项目 @@ -154,10 +153,17 @@ export default { this.$refs[formName].validate((valid) => { if (valid) { console.log(this.ruleForm); - postEmbankmentInspection(this.ruleForm).then((res) => { - this.getTableData() - this.dialogVisible = false - }) + if (this.ruleForm.id) { + putEmbankmentInspection(this.ruleForm).then(() => { + this.getTableData() + this.dialogVisible = false + }) + } else { + postEmbankmentInspection(this.ruleForm).then(() => { + this.getTableData() + this.dialogVisible = false + }) + } } else { console.log('校验不通过'); return false; diff --git a/src/views/runManage/engineering/inspectionPlan/Dike.vue b/src/views/runManage/engineering/inspectionPlan/Dike.vue index d9566fc..c846216 100644 --- a/src/views/runManage/engineering/inspectionPlan/Dike.vue +++ b/src/views/runManage/engineering/inspectionPlan/Dike.vue @@ -81,7 +81,9 @@ export default { } this.ruleForm = res.data this.ruleForm.type = res.data.type.toString() - this.ruleForm.cycleType = res.data.cycleType.toString() + if (res.data.cycleType) { + this.ruleForm.cycleType = res.data.cycleType.toString() + } this.changePatrolType(res) this.dialogVisible = true }) @@ -233,6 +235,7 @@ export default { } }) getDicts('xs_cycle_type').then((res) => { + console.log('🚀res.data🚀', res.data) this.patrolType = res.data }) }, @@ -325,7 +328,7 @@ export default { - + diff --git a/src/views/runManage/engineering/inspectionRecords/Dike.vue b/src/views/runManage/engineering/inspectionRecords/Dike.vue index cf3ba78..00457a9 100644 --- a/src/views/runManage/engineering/inspectionRecords/Dike.vue +++ b/src/views/runManage/engineering/inspectionRecords/Dike.vue @@ -21,7 +21,7 @@ export default { console.log('🚀row🚀', row) this.$router.push({ path: '/patrolRouteSettings', - query: { name: row.name, editor: false } + query: { name: row.name, editor: false,id:row.id } }) }, getTableData(search) { diff --git a/src/views/runManage/engineering/patrolRouteSettings/components/GaoDeMap.vue b/src/views/runManage/engineering/patrolRouteSettings/components/GaoDeMap.vue index 2b88f7d..bc20746 100644 --- a/src/views/runManage/engineering/patrolRouteSettings/components/GaoDeMap.vue +++ b/src/views/runManage/engineering/patrolRouteSettings/components/GaoDeMap.vue @@ -10,7 +10,7 @@