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 src/store/modules/websocket.js dev-bjgas dev3.0 v3.3.0.1 V3.3.0
commit 2fa19ee75715989d2e5de40e93eeb975dd3b3c06 2 parents f500a3a + 4b2d9b1 wangxitong authored on 25 Aug 2022

Showing 18 changed files

• public/config/project.config.json
• src/App.vue
• src/api/overview/wellOverview.js
• src/components/Amap/AMapContainer.vue
• src/components/Amap/mixins/register-component.js
• src/layout/components/AppHeader.vue
• src/main.js
• src/store/modules/websocket.js
• src/views/alarmManage/listAlarmNow.vue
• src/views/alarmStatics/components/alarmWellRank.vue
• src/views/dashboard/components/JobByStatus.vue
• src/views/dashboard/components/WellCountByDept.vue
• src/views/dashboard/index.vue
• src/views/jobManage/detailJob.vue
• src/views/overview/components/infoWindowAlarm.vue
• src/views/overview/components/mapSearchComp.vue
• src/views/overview/overviewAmap.vue
• src/views/wellManage/infoWell.vue

Ignore Space Show notes View public/config/project.config.json

Ignore Space Show notes View src/App.vue

Ignore Space Show notes View src/api/overview/wellOverview.js

Ignore Space Show notes View src/components/Amap/AMapContainer.vue

Ignore Space Show notes View src/components/Amap/mixins/register-component.js

Ignore Space Show notes View src/layout/components/AppHeader.vue

Ignore Space Show notes View src/main.js

Ignore Space Show notes View src/store/modules/websocket.js

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

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

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

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

Ignore Space Show notes View src/views/dashboard/index.vue

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

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

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

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

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

Show line notes below