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

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 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 bbd75044d9e49ac6a4e572c75851ab7e1772375d 2 parents 6cc3487 + a3f6d3e dutingting authored on 13 Feb 2023

Patch

Unified Split

Showing 33 changed files

Ignore Space Show notes View src/api/system/price.ts

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

Ignore Space Show notes View src/store/modules/dict.ts

Ignore Space Show notes View src/views/business/lab/environmental/environmentalAdd.vue

Ignore Space Show notes View src/views/business/lab/environmental/environmentalList.vue

Ignore Space Show notes View src/views/business/lab/environmental/environmentalList_interface.ts

Ignore Space Show notes View src/views/business/lab/primitiveLog/primitiveLogList.vue

Ignore Space Show notes View src/views/business/lab/primitiveLog/primitveLogAdd.vue

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

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

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

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

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

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

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

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

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

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

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

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

Show line notes below