Fork: 0
wangxitong / qd_cnooc_front
Browse code
Merge branch 'gas' of https://gitee.com/water-supply-management-system/qd_cnooc_front into gas
Conflicts:
	config/dev.env.js
	src/views/dataManage/deviceData/listWaterData.vue
	src/views/gasDashboard/components/PanelGroup.vue
	src/views/gasDashboard/index.vue
	src/views/gasOverview/gasOverviewSimple.vue
gas
commit 20316889384fe22ddfcf8d4e59412913875a9695
2 parents 0b5341f + 9162831
Stephanie authored on 15 Nov 2022
Patch
Unified Split
Showing 4 changed files
View
config/prod.env.js
View
src/views/dataManage/deviceData/listGasflowData.vue
View
src/views/gasDashboard/components/corrodeCountByDay.vue
View
src/views/jobManage/detailJob.vue