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 dd96b9e74f60d3037a80acc8abedb329c965d609 2 parents 6a3d91c + d444185 wangxitong authored on 25 Jul 2022

Patch

Unified Split

Showing 24 changed files

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

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

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

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

Ignore Space Show notes View src/icons/svg/icon-database.svg 0 → 100644

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

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

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

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

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

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

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

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

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

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

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

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

Show notes View src/views/dataView/components/alarmStatus.vue 100644 → 0

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

Ignore Space Show notes View src/views/dataView/components/jobAnalysis.vue 0 → 100644

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

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

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

Ignore Space Show notes View src/views/system/resource/editResource.vue

Show line notes below