Merge remote-tracking branch 'origin/dev3.0' into dev3.0

Fork: 0

codedev / smartwell_front

Browse code Merge remote-tracking branch 'origin/dev3.0' into dev3.0 dev-bjgas dev3.0 v3.3.0.1 V3.3.0
commit 00033e9d35c5f56c04e3b153e3d95f98fe031ec9 2 parents b59ae0b + 2fb548d wangxitong authored on 27 Sep 2022

Patch

Unified Split

Showing 18 changed files

Ignore Space Show notes View src/utils/dateutils.js

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

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

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

Ignore Space Show notes View src/views/dashboard/components/AlarmNowList.vue

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

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

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

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

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

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

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

Ignore Space Show notes View src/views/overview/overviewAmap.vue

Ignore Space Show notes View src/views/system/area/editArea.vue

Ignore Space Show notes View src/views/wellManage/components/mapSearchComp.vue

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

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

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

Show line notes below