Merge branch 'dev3.0' of http://111.198.10.15:12003/gitbucket/git/codedev/smartwell_front into dev3.0

Fork: 0

codedev / smartwell_front

Browse code Merge branch 'dev3.0' of http://111.198.10.15:12003/gitbucket/git/codedev/smartwell_front into dev3.0 Conflicts: src/components/Amap/utils/convert-helper.js src/permission.js dev-bjgas dev3.0 v3.3.0.1 V3.3.0
commit cc5f998721fecb52bac8239946f11693f673ae3c 2 parents a019c24 + 22a33ec wangxitong authored on 16 Aug 2022

Patch

Unified Split

Showing 19 changed files

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

Ignore Space Show notes View src/components/Amap/utils/convert-helper.js

Ignore Space Show notes View src/permission.js

Ignore Space Show notes View src/views/dataView/components/panelGroup.vue

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

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

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

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

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

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

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

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

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

Ignore Space Show notes View src/views/system/dept/editDept.vue

Ignore Space Show notes View src/views/system/tenant/components/relateDept.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/editWell.vue

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

Show line notes below