Merge branch 'dev' of http://192.168.0.203:8080/gitbucket/git/root/smartwell_front into dev

Fork: 0

codedev / smartwell_front

Browse code Merge branch 'dev' of http://192.168.0.203:8080/gitbucket/git/root/smartwell_front into dev dev dev-bjgas dev3.0 dev_bjgas_well_v3 dev_sz(深圳) v3.3.0.1 v1.2.1 V3.3.0 2.0.0
commit 1bb99fdcd8554286d4f6aacf12e75a52e02d7f78 2 parents f4e1e11 + 2a24118 StephanieGitHub authored on 22 Jun 2020

Patch

Unified Split

Showing 8 changed files

Ignore Space Show notes View src/components/SelectTree/singleSelect.vue

Ignore Space Show notes View src/views/alarmManage/listAlarmRecords.vue

Ignore Space Show notes View src/views/alarmRule/editRule.vue

Ignore Space Show notes View src/views/deviceManage/listDevice.vue

Ignore Space Show notes View src/views/deviceStatics/components/deviceCountByDept.vue

Ignore Space Show notes View src/views/wellManage/addWell.vue

Ignore Space Show notes View src/views/wellManage/detailWell.vue

Ignore Space Show notes View src/views/wellManage/listWell.vue

Show line notes below