Browse code Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev Conflicts: src/components/dialog/selectEmployeesDialog.vue dev
commit dae8f59a2125e3d26a39818f1d90f3469b2e0229 2 parents cb725ab + 1d232ca Stephanie authored on 3 Feb 2023

Showing 40 changed files

• src/components/dialog/dialog.ts
• src/components/dialog/errorDialog.vue
• src/components/dialog/selectEmployeesDialog.vue
• src/components/dialog/selectRoleDialog.vue
• src/components/drawer/approverDrawer.vue
• src/components/drawer/conditionDrawer.vue
• src/components/workFlow/addNode.vue
• src/components/workFlow/addNodeBan.vue
• src/components/workFlow/nodeWrap.vue
• src/components/workFlow/selectBox.vue
• src/components/workFlow/selectResult.vue
• src/views/business/schedule/interchange/interchangeEdit.vue
• src/views/business/schedule/interchange/interchangeList.vue
• src/views/device/deviceMaintenance/components/listApproval.vue
• src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
• src/views/device/deviceMaintenance/components/listPageAdd.vue
• src/views/device/deviceMaintenance/components/manageAdd.vue
• src/views/device/deviceMaintenance/maintenanceCheckList.vue
• src/views/device/deviceMaintenance/maintenanceList.vue
• src/views/device/deviceMaintenance/manageCheckList.vue
• src/views/device/standardEquipment/components/listApply/listPage.vue
• src/views/device/standardEquipment/components/listApply/listPageAdd.vue
• src/views/device/standardEquipment/components/listApply/userListDialog.vue
• src/views/device/standardEquipment/components/standardList/baseInfo.vue
• src/views/device/standardEquipment/expirationRemind.vue
• src/views/device/standardEquipment/standardList.vue
• src/views/device/standardEquipment/standard_interface.ts
• src/views/measure/source/approve.vue
• src/views/measure/source/components/listApproval.vue
• src/views/measure/source/list_interface.ts
• src/views/measure/train/components/listApproval.vue
• src/views/measure/train/plan.vue
• src/views/measure/train/trainLog.vue
• src/views/measure/train/trainPlanApprove.vue
• src/views/setting.vue
• src/views/system/process/addProcess.vue
• src/views/system/process/detailProcess.vue
• src/views/system/process/editProcess.vue
• src/views/system/process/process.ts
• src/views/system/process/process.vue

Ignore Space Show notes View src/components/dialog/dialog.ts

Ignore Space Show notes View src/components/dialog/errorDialog.vue

Ignore Space Show notes View src/components/dialog/selectEmployeesDialog.vue

Ignore Space Show notes View src/components/dialog/selectRoleDialog.vue

Ignore Space Show notes View src/components/drawer/approverDrawer.vue

Ignore Space Show notes View src/components/drawer/conditionDrawer.vue

Ignore Space Show notes View src/components/workFlow/addNode.vue

Ignore Space Show notes View src/components/workFlow/addNodeBan.vue

Ignore Space Show notes View src/components/workFlow/nodeWrap.vue

Show notes View src/components/workFlow/selectBox.vue 100644 → 0

Show notes View src/components/workFlow/selectResult.vue 100644 → 0

Ignore Space Show notes View src/views/business/schedule/interchange/interchangeEdit.vue

Ignore Space Show notes View src/views/business/schedule/interchange/interchangeList.vue

Ignore Space Show notes View src/views/device/deviceMaintenance/components/listApproval.vue

Ignore Space Show notes View src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue

Ignore Space Show notes View src/views/device/deviceMaintenance/components/listPageAdd.vue

Ignore Space Show notes View src/views/device/deviceMaintenance/components/manageAdd.vue

Ignore Space Show notes View src/views/device/deviceMaintenance/maintenanceCheckList.vue

Ignore Space Show notes View src/views/device/deviceMaintenance/maintenanceList.vue

Ignore Space Show notes View src/views/device/deviceMaintenance/manageCheckList.vue

Ignore Space Show notes View src/views/device/standardEquipment/components/listApply/listPage.vue

Ignore Space Show notes View src/views/device/standardEquipment/components/listApply/listPageAdd.vue

Ignore Space Show notes View src/views/device/standardEquipment/components/listApply/userListDialog.vue

Ignore Space Show notes View src/views/device/standardEquipment/components/standardList/baseInfo.vue

Ignore Space Show notes View src/views/device/standardEquipment/expirationRemind.vue

Ignore Space Show notes View src/views/device/standardEquipment/standardList.vue

Ignore Space Show notes View src/views/device/standardEquipment/standard_interface.ts

Ignore Space Show notes View src/views/measure/source/approve.vue

Ignore Space Show notes View src/views/measure/source/components/listApproval.vue

Ignore Space Show notes View src/views/measure/source/list_interface.ts

Ignore Space Show notes View src/views/measure/train/components/listApproval.vue

Ignore Space Show notes View src/views/measure/train/plan.vue

Ignore Space Show notes View src/views/measure/train/trainLog.vue

Ignore Space Show notes View src/views/measure/train/trainPlanApprove.vue

Ignore Space Show notes View src/views/setting.vue

Ignore Space Show notes View src/views/system/process/addProcess.vue

Ignore Space Show notes View src/views/system/process/detailProcess.vue

Ignore Space Show notes View src/views/system/process/editProcess.vue

Ignore Space Show notes View src/views/system/process/process.ts

Ignore Space Show notes View src/views/system/process/process.vue

Show line notes below