Browse code Merge branch 'gas' of http://111.198.10.15:12003/gitbucket/git/wangxitong/qd_cnooc_front into gas Conflicts: src/views/login/index.vue gas
commit 038749f074cc44861ed05aba54194cc88522eec6 2 parents f046e34 + 2031688 wangxitong authored on 18 Nov 2022

Showing 38 changed files

• config/dev.env.js
• config/prod.env.js
• src/api/gasOverview.js
• src/components/BigData/Card1/index.vue
• src/utils/dateutils.js
• src/views/alarmManage/listAlarmNow.vue
• src/views/alarmManage/listAlarmRecords.vue
• src/views/dashboard/components/AlarmByDays.vue
• src/views/dashboard/components/FunctionArea.vue
• src/views/dashboard/components/watchAlarmBar.vue
• src/views/dataManage/dataManage.vue
• src/views/dataManage/deviceData/gasFlowHistory.vue
• src/views/dataManage/deviceData/listCorrodeData.vue
• src/views/dataManage/deviceData/listGasData.vue
• src/views/dataManage/deviceData/listGasflowData.vue
• src/views/dataManage/deviceData/listLiquidData.vue
• src/views/dataManage/deviceData/listNoiseData.vue
• src/views/dataManage/deviceData/listWaterData.vue
• src/views/dataManage/deviceData/waterHistory.vue
• src/views/gasDashboard/components/DeviceCount.vue
• src/views/gasDashboard/components/FunctionArea.vue
• src/views/gasDashboard/components/FunctionArea2.vue
• src/views/gasDashboard/components/PanelGroup.vue
• src/views/gasDashboard/components/alarmGasCountByDept.vue
• src/views/gasDashboard/components/alarmGasCountByType.vue
• src/views/gasDashboard/components/alarmLeakCountPie.vue
• src/views/gasDashboard/components/corrodeCountByDay.vue
• src/views/gasDashboard/components/gasAlarmTrend.vue
• src/views/gasDashboard/components/gasCountByDay.vue
• src/views/gasDashboard/components/gasCountByDeviceBar.vue
• src/views/gasDashboard/index.vue
• src/views/gasOverview/gasOverviewSimple.vue
• src/views/jobManage/detailJob.vue
• src/views/login/index.vue
• src/views/overview/overviewSimple.vue
• static/images/icon/ayw.png
• static/images/icon/yw.png
• static/model/yw.glb

Ignore Space Show notes View config/dev.env.js

Ignore Space Show notes View config/prod.env.js

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

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

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

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/AlarmByDays.vue

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

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

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

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

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

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

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

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

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

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

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

Ignore Space Show notes View src/views/gasDashboard/components/DeviceCount.vue

Ignore Space Show notes View src/views/gasDashboard/components/FunctionArea.vue

Ignore Space Show notes View src/views/gasDashboard/components/FunctionArea2.vue 0 → 100644

Ignore Space Show notes View src/views/gasDashboard/components/PanelGroup.vue

Show notes View src/views/gasDashboard/components/alarmGasCountByDept.vue 100644 → 0

Ignore Space Show notes View src/views/gasDashboard/components/alarmGasCountByType.vue 0 → 100644

Ignore Space Show notes View src/views/gasDashboard/components/alarmLeakCountPie.vue 0 → 100644

Ignore Space Show notes View src/views/gasDashboard/components/corrodeCountByDay.vue

Ignore Space Show notes View src/views/gasDashboard/components/gasAlarmTrend.vue 0 → 100644

Ignore Space Show notes View src/views/gasDashboard/components/gasCountByDay.vue

Ignore Space Show notes View src/views/gasDashboard/components/gasCountByDeviceBar.vue 0 → 100644

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

Ignore Space Show notes View src/views/gasOverview/gasOverviewSimple.vue

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

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

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

Ignore Space Show notes View static/images/icon/ayw.png 0 → 100644

Ignore Space Show notes View static/images/icon/yw.png 0 → 100644

Ignore Space Show notes View static/model/yw.glb 0 → 100644
Not supported

Show line notes below