Merge branch 'lamp' of http://111.198.10.15:12003/gitbucket/git/codedev/baseResourceFront into lamp
...
Conflicts:
src/router/index.js
src/utils/baseConfig.js
src/views/alarmManage/alarmRule.vue
src/views/alarmManage/components/alarmDetail.vue
src/views/alarmManage/lampType/editLampType.vue
src/views/alarmManage/lampType/lampTypeList.vue
src/views/alarmManage/lampboxType/editLampboxType.vue
src/views/alarmManage/lampboxType/lampboxTypeList.vue
src/views/alarmManage/listAlarm.vue
src/views/alarmManage/listAlarmNow.vue
src/views/base/components/alarmDetail.vue
src/views/base/lampType/editLampType.vue
src/views/base/lampType/lampTypeList.vue
src/views/base/lampboxType/editLampboxType.vue
src/views/base/lampboxType/lampboxTypeList.vue
src/views/base/street/editStreet.vue
src/views/base/street/streetList.vue
src/views/deviceManage/busCircuit.vue
src/views/deviceManage/busController.vue
src/views/deviceManage/busGroup.vue
src/views/deviceManage/busLamp.vue
src/views/deviceManage/busLampbox.vue
src/views/deviceManage/busLamppost.vue
src/views/deviceManage/editCircuit.vue
src/views/deviceManage/editController.vue
src/views/deviceManage/editGroup.vue
src/views/deviceManage/editLamp.vue
src/views/deviceManage/editLampbox.vue
src/views/deviceManage/editLamppost.vue
src/views/deviceManage/listLog.vue
src/views/overview/overview.vue
src/views/report/boxData.vue
src/views/report/boxHistory.vue
src/views/report/controllerData.vue
src/views/report/historyData.vue
src/views/report/quantityData.vue
src/views/report/statics.vue
src/views/strategy/components/editStrategy.vue
src/views/strategy/components/editThreshold.vue
src/views/strategy/components/editTime.vue
src/views/strategy/deviceData.vue
src/views/strategy/deviceHistory.vue
yangqianqian
committed
on 6 Apr 2021
