diff --git a/src/components/inspection/maintainanceTaskDetail.vue b/src/components/inspection/maintainanceTaskDetail.vue index a58c539..91162de 100644 --- a/src/components/inspection/maintainanceTaskDetail.vue +++ b/src/components/inspection/maintainanceTaskDetail.vue @@ -1,125 +1,58 @@  @@ -188,7 +121,7 @@ export default { this.loadTaskDetails() }, handleViewDetail(taskDetailId) { - window.open(`/#/pages/property/maintainanceTaskDetailView?taskDetailId=${taskDetailId}`, '_blank') + window.open(`/#/views/inspection/maintainanceTaskDetailView?taskDetailId=${taskDetailId}`, '_blank') } } } diff --git a/src/components/machine/addPrinterRule.vue b/src/components/machine/addPrinterRule.vue index 29d65c2..691bf74 100644 --- a/src/components/machine/addPrinterRule.vue +++ b/src/components/machine/addPrinterRule.vue @@ -7,11 +7,11 @@ - + @@ -51,12 +51,11 @@ export default { }, created() { this.form.communityId = getCommunityId() - this.getStateOptions() }, methods: { async getStateOptions() { try { - const data = await getDict('printer_rule', 'state') + const {data} = await getDict('printer_rule', 'state') this.stateOptions = data } catch (error) { console.error('获取状态字典失败:', error) @@ -65,6 +64,8 @@ export default { open() { this.visible = true this.resetForm() + this.getStateOptions() + }, handleClose() { this.resetForm() diff --git a/src/components/machine/printerRuleFees.vue b/src/components/machine/printerRuleFees.vue index c972266..c6869d1 100644 --- a/src/components/machine/printerRuleFees.vue +++ b/src/components/machine/printerRuleFees.vue @@ -2,19 +2,16 @@
- + - + {{ $t('common.search') }} - - {{ $t('common.reset') }} - {{ $t('common.add') }} diff --git a/src/components/machine/printerRuleMachine.vue b/src/components/machine/printerRuleMachine.vue index 0a084c9..1ea6e21 100644 --- a/src/components/machine/printerRuleMachine.vue +++ b/src/components/machine/printerRuleMachine.vue @@ -2,10 +2,10 @@
- + - + @@ -13,9 +13,6 @@ {{ $t('common.search') }} - - {{ $t('common.reset') }} - {{ $t('common.add') }} diff --git a/src/components/machine/printerRuleRepair.vue b/src/components/machine/printerRuleRepair.vue index c243807..ad027ff 100644 --- a/src/components/machine/printerRuleRepair.vue +++ b/src/components/machine/printerRuleRepair.vue @@ -2,10 +2,10 @@
- + - + @@ -13,9 +13,6 @@ {{ $t('common.search') }} - - {{ $t('common.reset') }} - {{ $t('common.add') }} diff --git a/src/components/staff/AStaffDetailMaintainance.vue b/src/components/staff/AStaffDetailMaintainance.vue index ce699be..daf800b 100644 --- a/src/components/staff/AStaffDetailMaintainance.vue +++ b/src/components/staff/AStaffDetailMaintainance.vue @@ -69,7 +69,7 @@ diff --git a/src/i18n/inspectionI18n.js b/src/i18n/inspectionI18n.js index 88e4c96..818fa07 100644 --- a/src/i18n/inspectionI18n.js +++ b/src/i18n/inspectionI18n.js @@ -7,6 +7,7 @@ import { messages as editMaintainancePlanMessages } from '../views/inspection/ed import { messages as maintainancePlanMachineMessages } from '../views/inspection/maintainancePlanMachineLang' import { messages as maintainanceTaskDetailsMessages } from '../views/inspection/maintainanceTaskDetailsLang' import { messages as maintainanceTaskManageMessages } from '../views/inspection/maintainanceTaskManageLang' +import { messages as maintainanceTaskDetailViewMessages } from '../views/inspection/maintainanceTaskDetailViewLang' import { messages as adminInspectionPlanMessages } from '../views/inspection/adminInspectionPlanLang' import { messages as aInspectionPlanDetailMessages } from '../views/inspection/aInspectionPlanDetailLang' import { messages as adminInspectionTaskMessages } from '../views/inspection/adminInspectionTaskLang' @@ -36,6 +37,7 @@ export const messages = { ...maintainancePlanMachineMessages.en, ...maintainanceTaskDetailsMessages.en, ...maintainanceTaskManageMessages.en, + ...maintainanceTaskDetailViewMessages.en, ...inspectionPointMessages.en, ...inspectionRouteMessages.en, ...inspectionItemManageMessages.en, @@ -60,6 +62,7 @@ export const messages = { ...maintainancePlanMachineMessages.zh, ...maintainanceTaskDetailsMessages.zh, ...maintainanceTaskManageMessages.zh, + ...maintainanceTaskDetailViewMessages.zh, ...inspectionPointMessages.zh, ...inspectionRouteMessages.zh, ...inspectionItemManageMessages.zh, diff --git a/src/router/inspectionRouter.js b/src/router/inspectionRouter.js index aad317c..329becf 100644 --- a/src/router/inspectionRouter.js +++ b/src/router/inspectionRouter.js @@ -100,6 +100,11 @@ export default [ component: () => import('@/views/inspection/maintainanceTaskDetailsList.vue') }, { + path: '/views/inspection/maintainanceTaskDetailView', + name: '/views/inspection/maintainanceTaskDetailView', + component: () => import('@/views/inspection/maintainanceTaskDetailView.vue') + }, + { path: '/pages/property/maintainanceTaskManage', name: '/pages/property/maintainanceTaskManage', component: () => import('@/views/inspection/maintainanceTaskManageList.vue') diff --git a/src/views/dev/cacheList.vue b/src/views/dev/cacheList.vue index 546654d..f09a34a 100644 --- a/src/views/dev/cacheList.vue +++ b/src/views/dev/cacheList.vue @@ -1,5 +1,5 @@