GitBucket
|
Merge remote-tracking branch 'origin/dev3.0' into dev3.0
# Conflicts: # public/config/project.config.json # src/views/alarmStatics/components/alarmWellRank.vue # src/views/deviceManage/deviceImei/deviceImei.vue |
|---|
|
|
| src/components/SelectTree/singleSelect.vue |
|---|
| src/views/deviceManage/components/listLevelData.vue 0 → 100644 |
|---|
| src/views/deviceManage/components/listPressureData.vue 0 → 100644 |
|---|
| src/views/deviceManage/detailDevice.vue |
|---|
| src/views/deviceStatics/components/deviceCountByOffline.vue |
|---|
| src/views/deviceStatics/components/deviceCountByType.vue |
|---|
| src/views/wellManage/addWell.vue |
|---|
| src/views/wellManage/detailMapLonLat.vue |
|---|