Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into HEAD

Fork: 0

codedev / smart-metering-front

Browse code Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into HEAD 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 fecef60caeee56a4b02f0bd62ecb81a445a2946f 2 parents 819bd78 + 0f378fe Stephanie authored on 7 Feb 2023

Patch

Unified Split

Showing 33 changed files

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

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

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

Ignore Space Show notes View src/views/business/lab/reportOnCredentials/components/baseInfo.vue 0 → 100644

Ignore Space Show notes View src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue 0 → 100644

Ignore Space Show notes View src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue 0 → 100644

Ignore Space Show notes View src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue 0 → 100644

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

Ignore Space Show notes View src/views/device/deviceMaintenance/components/listApprovalAdd.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/standardEquipment/cancelApply.vue

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

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

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

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

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

Ignore Space Show notes View src/views/device/standardEquipment/components/listApply/examineAndApprove.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/passed.vue

Ignore Space Show notes View src/views/device/standardEquipment/components/listApply/standardDialog.vue 0 → 100644

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/components/standardList/equipmentDialog.vue 0 → 100644

Ignore Space Show notes View src/views/device/standardEquipment/components/standardList/laboratoryDialog.vue 0 → 100644

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

Ignore Space Show notes View src/views/device/standardEquipment/components/standardList/verificationDialog.vue 0 → 100644

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/standardEquipment/standard_interface.ts

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

Show line notes below