Browse code Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev dev excel vue3-front v1.1.0.1 v1.1.0 V1.3.2 V1.3.1 V1.0.2 V1.0.1 V1.0.0
commit ae14983f02b48fa0a5d1b0d1df3e0e4d8f452fff 2 parents 9af270c + 524b07d dutingting authored on 29 Jan 2023

Showing 35 changed files

• src/api/device/standard.ts
• src/components/Approval/ApprovalDialog.vue
• src/router/modules/measure.ts
• src/utils/scheduleDict.ts
• src/views/device/borrow/components/handleList.vue
• src/views/device/deviceMaintenance/checkList_interface.ts
• src/views/device/deviceMaintenance/components/manageAdd.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/standardList/baseInfo.vue
• src/views/device/standardEquipment/components/standardList/templateTable.vue
• src/views/device/standardEquipment/components/standardListAdd.vue
• src/views/device/standardEquipment/expirationRemind.vue
• src/views/device/standardEquipment/standardList.vue
• src/views/device/stateManage/components/templateList.vue
• src/views/measure/bench/bench.vue
• src/views/measure/file/components/addDialog.vue
• src/views/measure/file/components/approve/addDialog.vue
• src/views/measure/file/components/approve/templatePage.vue
• src/views/measure/file/components/templatePage.vue
• src/views/measure/file/file-interface.ts
• src/views/measure/price/list_interface.ts
• src/views/measure/price/priceAdd.vue
• src/views/measure/source/approve.vue
• src/views/measure/source/components/listApproval.vue
• src/views/measure/source/list.vue
• src/views/measure/source/listAdd.vue
• src/views/measure/train/components/listApproval.vue
• src/views/measure/train/plan.vue
• src/views/measure/train/plan_interface.ts
• src/views/measure/train/trainPlanApprove.vue
• src/views/system/dept/editDept.vue
• src/views/system/role/listRole.vue
• src/views/system/user/listUser.vue

Ignore Space Show notes View src/api/device/standard.ts

Ignore Space Show notes View src/components/Approval/ApprovalDialog.vue

Ignore Space Show notes View src/router/modules/measure.ts

Ignore Space Show notes View src/utils/scheduleDict.ts

Ignore Space Show notes View src/views/device/borrow/components/handleList.vue

Ignore Space Show notes View src/views/device/deviceMaintenance/checkList_interface.ts

Ignore Space Show notes View src/views/device/deviceMaintenance/components/manageAdd.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/standardList/baseInfo.vue

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

Ignore Space Show notes View src/views/device/standardEquipment/components/standardListAdd.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/stateManage/components/templateList.vue

Ignore Space Show notes View src/views/measure/bench/bench.vue

Ignore Space Show notes View src/views/measure/file/components/addDialog.vue

Ignore Space Show notes View src/views/measure/file/components/approve/addDialog.vue 0 → 100644

Ignore Space Show notes View src/views/measure/file/components/approve/templatePage.vue

Ignore Space Show notes View src/views/measure/file/components/templatePage.vue

Ignore Space Show notes View src/views/measure/file/file-interface.ts

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

Ignore Space Show notes View src/views/measure/price/priceAdd.vue

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.vue

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

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

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

Ignore Space Show notes View src/views/measure/train/plan_interface.ts

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

Ignore Space Show notes View src/views/system/dept/editDept.vue

Ignore Space Show notes View src/views/system/role/listRole.vue

Ignore Space Show notes View src/views/system/user/listUser.vue

Show line notes below