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 c7942b9b34613c5c95f0de9a5478066a71acdb63 2 parents ae0e136 + db6f500 bairujie authored on 14 Mar 2023

Patch

Unified Split

Showing 40 changed files

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

Ignore Space Show notes View src/components/AddressSelect/AddressSelect.vue

Ignore Space Show notes View src/components/ApprovalRecord/ApprovalRecord.vue

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

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

Ignore Space Show notes View src/utils/download.ts 0 → 100644

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

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

Ignore Space Show notes View src/views/business/schedule/interchangeReceipt/selectOrder.vue

Ignore Space Show notes View src/views/customer/advice/adviceList.vue

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

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

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

Show notes View src/views/device/deviceMaintenance/components/listPageAdd.vue 100644 → 0

Ignore Space Show notes View src/views/device/deviceMaintenance/components/maintenanceDetail.vue 0 → 100644

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

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

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

Show notes View src/views/device/stateManage/components/addRow.vue 100644 → 0

Ignore Space Show notes View src/views/device/stateManage/components/selectDevice.vue 0 → 100644

Ignore Space Show notes View src/views/device/stateManage/components/templateAddEditCancel.vue

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

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

Ignore Space Show notes View src/views/measure/source/components/sourceApprovalDetail.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/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/components/planApprovalDetail.vue

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

Ignore Space Show notes View src/views/system/log/listErrorLog.vue

Ignore Space Show notes View src/views/system/log/listLog.vue

Ignore Space Show notes View src/views/system/log/loginLog.vue

Ignore Space Show notes View src/views/system/tool/certificate/addDDialog.vue

Ignore Space Show notes View src/views/system/tool/certificate/certificate.vue

Ignore Space Show notes View src/views/system/tool/document/addDDialog.vue

Ignore Space Show notes View src/views/system/tool/document/document.vue

Show line notes below