diff --git a/src/views/dike/runManage/enginerring/inspectionPlan/index.vue b/src/views/dike/runManage/enginerring/inspectionPlan/index.vue index c5ceee3..e3e5031 100644 --- a/src/views/dike/runManage/enginerring/inspectionPlan/index.vue +++ b/src/views/dike/runManage/enginerring/inspectionPlan/index.vue @@ -29,7 +29,7 @@ export default { xcId: '', frequency: '', cycleType: '', - messageReminder: false, + isReminder: false, reminderTime: '', operators: [], otherConfig: { @@ -52,7 +52,7 @@ export default { cycleType: [ { required: true, message: '请选择巡查周期', trigger: 'change' } ], - messageReminder: [ + isReminder: [ { required: true, message: '请选择消息提醒', trigger: 'change' } ], reminderTime: [ @@ -197,7 +197,7 @@ export default { xcId: '', frequency: '', cycleType: '', - messageReminder: false, + isReminder: false, reminderTime: '', operators: [], otherConfig: { @@ -354,8 +354,8 @@ export default { - - + + diff --git a/src/views/dike/runManage/maintenance/maintenancePlan/index.vue b/src/views/dike/runManage/maintenance/maintenancePlan/index.vue index b7f1c0f..80e9c15 100644 --- a/src/views/dike/runManage/maintenance/maintenancePlan/index.vue +++ b/src/views/dike/runManage/maintenance/maintenancePlan/index.vue @@ -4,12 +4,7 @@ import { putDFMaintenancePlan, deleteDFMaintenancePlan, postDFMaintenancePlan, postDFMaintenancePlanList, getDFMaintenancePlan } from '@/api/management' import { - listDikeInfo, - getDikeInfo, - delDikeInfo, - addDikeInfo, - updateDikeInfo, - exportDikeInfo, + listDikeInfo } from "@/api/yg/dikeInfo"; export default { name: 'InspectionItems', @@ -128,7 +123,7 @@ export default { // 跳转记录页面 goMaintenanceRecords(row) { this.$router.push({ - path: '/dyke/runManage/maintenance/maintenanceRecords', + path: 'maintenanceRecords', query: { name: row.name } diff --git a/src/views/dike/runManage/maintenance/maintenanceRecords/index.vue b/src/views/dike/runManage/maintenance/maintenanceRecords/index.vue index 832e8cf..4ae890d 100644 --- a/src/views/dike/runManage/maintenance/maintenanceRecords/index.vue +++ b/src/views/dike/runManage/maintenance/maintenanceRecords/index.vue @@ -99,7 +99,7 @@ export default { // 遍历用户数据让select组件渲染选项 if (res.data.operators) { this.personnelList = [] - res.data.operators.forEach(element => { + res.data.operators?.forEach(element => { listUser({ data: { timeView: { @@ -121,7 +121,7 @@ export default { this.ruleForm = res.data // 渲染选中项 this.ruleForm.selectUser = [] - res.data.operators.forEach(element => { + res.data.operators?.forEach(element => { let a = { id: element.uid, lebel: element.name @@ -131,6 +131,10 @@ export default { this.dialogVisible = true }) }, + resetForm(){ + this.$refs.ruleForm.resetFields() + this.dialogVisible = false + }, // 保存维修记录 submitForm(formName, confirm = false) { this.$refs[formName].validate((valid) => { @@ -281,6 +285,7 @@ export default { } // 获取列表数据 this.getTableData(this.$route.query.name || '') + this.searchPlan('') // 获取状态字典 getDicts('xs_yh_record_status').then((res) => { if (res.data && Array.isArray(res.data)) { @@ -357,8 +362,8 @@ export default { - 详情 - 打开地图 + 详情 + 打开地图
@@ -498,6 +503,9 @@ export default { } } +.ml-6{ + margin-left: 6px; +} /deep/.el-input__count { height: 15px; line-height: 15px; diff --git a/src/views/dike/runManage/pestAnimalControl/planManagement/index.vue b/src/views/dike/runManage/pestAnimalControl/planManagement/index.vue index 9638e39..7ec32d6 100644 --- a/src/views/dike/runManage/pestAnimalControl/planManagement/index.vue +++ b/src/views/dike/runManage/pestAnimalControl/planManagement/index.vue @@ -263,7 +263,7 @@ export default { mounted() { // 获取列表数据 // this.getTableData() - getDicts('dike_level').then((res) => { + getDicts('embankment_level').then((res) => { this.dikeLevel = res.data }) getDicts('dh_jh_type').then((res) => { diff --git a/src/views/runManage/engineering/inspectionPlan/Dike.vue b/src/views/runManage/engineering/inspectionPlan/Dike.vue index 937c04e..1eebe22 100644 --- a/src/views/runManage/engineering/inspectionPlan/Dike.vue +++ b/src/views/runManage/engineering/inspectionPlan/Dike.vue @@ -104,7 +104,7 @@ export default { // 路线设置 routeSetting(row) { this.$router.push({ - path: '/patrolRouteSettings', + path: 'patrolRouteSettings', query: { id: row.id, name: row.name, editor: true } }) }, diff --git a/src/views/runManage/engineering/inspectionPlan/Sluice.vue b/src/views/runManage/engineering/inspectionPlan/Sluice.vue index 660a407..200c44e 100644 --- a/src/views/runManage/engineering/inspectionPlan/Sluice.vue +++ b/src/views/runManage/engineering/inspectionPlan/Sluice.vue @@ -104,7 +104,7 @@ export default { // 路线设置 routeSetting(row) { this.$router.push({ - path: '/patrolRouteSettings', + path: 'patrolRouteSettings', query: { id: row.id, name: row.name, editor: true } }) }, diff --git a/src/views/runManage/engineering/inspectionRecords/Dike.vue b/src/views/runManage/engineering/inspectionRecords/Dike.vue index a55b539..10ac313 100644 --- a/src/views/runManage/engineering/inspectionRecords/Dike.vue +++ b/src/views/runManage/engineering/inspectionRecords/Dike.vue @@ -20,7 +20,7 @@ export default { routeSetting(row) { console.log('🚀row🚀', row) this.$router.push({ - path: '/patrolRouteSettings', + path: 'patrolRouteSettings', query: { name: row.name, editor: false, id: row.id } }) }, diff --git a/src/views/runManage/engineering/inspectionRecords/Sluice.vue b/src/views/runManage/engineering/inspectionRecords/Sluice.vue index e2c8a28..08cb446 100644 --- a/src/views/runManage/engineering/inspectionRecords/Sluice.vue +++ b/src/views/runManage/engineering/inspectionRecords/Sluice.vue @@ -20,7 +20,7 @@ export default { routeSetting(row) { console.log('🚀row🚀', row) this.$router.push({ - path: '/patrolRouteSettings', + path: 'patrolRouteSettings', query: { name: row.name, editor: false, id: row.id } }) }, diff --git a/src/views/sluice/runManage/enginerring/inspectionPlan/index.vue b/src/views/sluice/runManage/enginerring/inspectionPlan/index.vue index 35319b7..3c7682f 100644 --- a/src/views/sluice/runManage/enginerring/inspectionPlan/index.vue +++ b/src/views/sluice/runManage/enginerring/inspectionPlan/index.vue @@ -26,7 +26,7 @@ export default { xcId: '', frequency: '', cycleType: '', - messageReminder: false, + isReminder: false, reminderTime: '', operators: [], otherConfig: { @@ -49,7 +49,7 @@ export default { cycleType: [ { required: true, message: '请选择巡查周期', trigger: 'change' } ], - messageReminder: [ + isReminder: [ { required: true, message: '请选择消息提醒', trigger: 'change' } ], reminderTime: [ @@ -196,7 +196,7 @@ export default { xcId: '', frequency: '', cycleType: '', - messageReminder: false, + isReminder: false, reminderTime: '', operators: [], otherConfig: { @@ -345,8 +345,8 @@ export default { - - + + diff --git a/src/views/sluice/runManage/enginerring/inspectionRecords/index.vue b/src/views/sluice/runManage/enginerring/inspectionRecords/index.vue index 9bfa85b..d17a870 100644 --- a/src/views/sluice/runManage/enginerring/inspectionRecords/index.vue +++ b/src/views/sluice/runManage/enginerring/inspectionRecords/index.vue @@ -20,7 +20,7 @@ export default { routeSetting(row) { console.log('🚀row🚀', row) this.$router.push({ - path: '/dyke/runManage/enginerring/patrolRouteSettings', + path: 'patrolRouteSettings', query: { name: row.name, editor: false, id: row.id } }) }, diff --git a/src/views/sluice/runManage/maintenance/maintenancePlan/index.vue b/src/views/sluice/runManage/maintenance/maintenancePlan/index.vue index 42476e3..3300f05 100644 --- a/src/views/sluice/runManage/maintenance/maintenancePlan/index.vue +++ b/src/views/sluice/runManage/maintenance/maintenancePlan/index.vue @@ -133,7 +133,7 @@ export default { // 跳转记录页面 goMaintenanceRecords(row) { this.$router.push({ - path: '/dyke/runManage/maintenance/maintenanceRecords', + path: 'maintenanceRecords', query: { name: row.name } @@ -211,6 +211,11 @@ export default { console.log('🚀表格数据🚀', res) }) }, + // 重置校验 + resetForm(formName) { + this.$refs[formName].resetFields(); + this.dialogVisible = false + }, // 重置搜索 resetSearch() { this.searchInput = ''