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: public/config/project.config.json public/config/project.configgz.json src/router/modules/well.js dev-bjgas dev3.0 v3.3.0.1 V3.3.0
commit 9a6454a77f1b2dc00fecb9bad2db4fb7b5e385eb 2 parents dad8da4 + 33be79f wangxitong authored on 21 Oct 2022

Patch

Unified Split

Showing 8 changed files

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/dashboard/components/PanelGroup.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

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

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

Show line notes below