Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/wangxiaoying/smartwell_front into dev

Fork: 0

codedev / smartwell_front

Browse code Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/wangxiaoying/smartwell_front into dev # Conflicts: # src/views/dataManage/dataManage.vue # src/views/deviceConfig/deviceConfig.vue dev dev-bjgas dev3.0 dev_bjgas_well_v3 v3.3.0.1 V3.3.0
commit 663a67d74959b66a3789e9a37a51d169908da92e 2 parents 5b83929 + 8837302 StephanieGitHub authored on 5 May 2022

Patch

Unified Split

Showing 7 changed files

Ignore Space Show notes View src/api/data.js

Ignore Space Show notes View src/api/tubeconfig.js 0 → 100644

Ignore Space Show notes View src/views/dataManage/dataManage.vue

Ignore Space Show notes View src/views/dataManage/deviceData/listTubeData.vue 0 → 100644

Ignore Space Show notes View src/views/deviceConfig/components/editTubeConfig.vue 0 → 100644

Ignore Space Show notes View src/views/deviceConfig/components/listTubeConfig.vue 0 → 100644

Ignore Space Show notes View src/views/deviceConfig/deviceConfig.vue

Show line notes below