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 dev-bjgas dev3.0 v3.3.0.1 V3.3.0
commit 67db8cd288cfc88b51cbab323646af828faa2740 2 parents 590771e + 53dcffa wangxitong authored on 5 Dec 2022

Patch

Unified Split

Showing 18 changed files

Ignore Space Show notes View src/api/config/wellcoverconfig.js

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

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

Ignore Space Show notes View src/components/BigData/Card/panelCard.vue

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

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

Ignore Space Show notes View src/views/alarmStatics/components/alarmWellRank.vue

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

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

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

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

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

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

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

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

Ignore Space Show notes View src/views/jobManage/listJobs.vue

Ignore Space Show notes View src/views/jobManage/listJobsOverTimeGet.vue

Ignore Space Show notes View src/views/jobManage/listJobsOverTimeHandle.vue

Show line notes below