Browse code Merge branch 'dev3.0' of http://111.198.10.15:12003/gitbucket/git/codedev/smartwell_front into dev3.0 dev-bjgas dev3.0 v3.3.0.1 V3.3.0
commit 0fad952dc8ac401d0b4335ef54b0e27651788a26 2 parents fbfd61c + 9e11738 wangxitong authored on 28 Jul 2022

Showing 56 changed files

• src/api/alarm/deviceStatics.js
• src/api/data/data.js
• src/api/data/dataStatics.js
• src/api/device/device.js
• src/api/device/deviceTypeDetail.js
• src/components/BigData/Card/simpleCard.vue
• src/components/BigData/TimeButtons.vue
• src/utils/dateutils.js
• src/views/alarmStatics/alarmStatics.vue
• src/views/alarmStatics/components/alarmHistoryByType.vue
• src/views/alarmStatics/components/alarmStaticsByContent.vue
• src/views/alarmStatics/components/alarmStaticsByDept.vue
• src/views/alarmStatics/components/alarmStaticsByType.vue
• src/views/alarmStatics/components/alarmWellRank.vue
• src/views/dashboard/components/AlarmByDays.vue
• src/views/dashboard/components/JobByStatus.vue
• src/views/dashboard/index.vue
• src/views/dataManage/dataManage.vue
• src/views/dataManage/deviceData/listH2SData.vue
• src/views/dataManage/deviceData/listHarmfulData.vue
• src/views/dataManage/deviceData/listHydrantData.vue
• src/views/dataView/components/alarmAnalysis.vue
• src/views/dataView/components/alarmView.vue
• src/views/dataView/components/deviceCountView.vue
• src/views/dataView/components/wellCountView.vue
• src/views/dataView/dataView.vue
• src/views/deviceManage/components/listDigData.vue
• src/views/deviceManage/components/listGasData.vue
• src/views/deviceManage/components/listH2SData.vue
• src/views/deviceManage/components/listHarmfulData.vue
• src/views/deviceManage/components/listHydrantData.vue
• src/views/deviceManage/components/listLiquidData.vue
• src/views/deviceManage/components/listLiquidGasData.vue
• src/views/deviceManage/components/listNoiseData.vue
• src/views/deviceManage/components/listTempData.vue
• src/views/deviceManage/components/listTubeData.vue
• src/views/deviceManage/components/listWellData.vue
• src/views/deviceManage/components/listWellLocaData.vue
• src/views/deviceManage/components/listWellcoverData.vue
• src/views/deviceManage/detailDevice.vue
• src/views/deviceManage/deviceType/components/editDeviceType.vue
• src/views/deviceManage/editDevice.vue
• src/views/deviceManage/listDevice.vue
• src/views/deviceStatics/components/deviceCountByDept.vue
• src/views/deviceStatics/components/deviceCountByOffline.vue
• src/views/deviceStatics/components/deviceCountByType.vue
• src/views/deviceStatics/components/listdeviceOffline.vue
• src/views/deviceStatics/deviceStatics.vue
• src/views/staticCharts/AlarmStaticsByType.vue
• src/views/staticCharts/DeviceCountByDeptBar.vue
• src/views/staticCharts/DeviceCountByOnlinePie.vue
• src/views/staticCharts/DeviceCountByTypeBar.vue
• src/views/staticCharts/DeviceOfflineByTypeBar.vue
• src/views/system/dept/listDept.vue
• src/views/wellManage/detailWell.vue
• src/views/wellManage/listWell.vue

Ignore Space Show notes View src/api/alarm/deviceStatics.js

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

Ignore Space Show notes View src/api/data/dataStatics.js

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

Ignore Space Show notes View src/api/device/deviceTypeDetail.js

Ignore Space Show notes View src/components/BigData/Card/simpleCard.vue 0 → 100644

Ignore Space Show notes View src/components/BigData/TimeButtons.vue 0 → 100644

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

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

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

Ignore Space Show notes View src/views/alarmStatics/components/alarmStaticsByContent.vue 0 → 100644

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

Show notes View src/views/alarmStatics/components/alarmStaticsByType.vue 100644 → 0

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

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

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

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

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

Ignore Space Show notes View src/views/dataManage/deviceData/listH2SData.vue 0 → 100644

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

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

Ignore Space Show notes View src/views/dataView/components/alarmAnalysis.vue 0 → 100644

Show notes View src/views/dataView/components/alarmView.vue 100644 → 0

Ignore Space Show notes View src/views/dataView/components/deviceCountView.vue

Ignore Space Show notes View src/views/dataView/components/wellCountView.vue

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

Ignore Space Show notes View src/views/deviceManage/components/listDigData.vue

Ignore Space Show notes View src/views/deviceManage/components/listGasData.vue

Ignore Space Show notes View src/views/deviceManage/components/listH2SData.vue 0 → 100644

Ignore Space Show notes View src/views/deviceManage/components/listHarmfulData.vue

Ignore Space Show notes View src/views/deviceManage/components/listHydrantData.vue

Ignore Space Show notes View src/views/deviceManage/components/listLiquidData.vue

Ignore Space Show notes View src/views/deviceManage/components/listLiquidGasData.vue

Ignore Space Show notes View src/views/deviceManage/components/listNoiseData.vue

Ignore Space Show notes View src/views/deviceManage/components/listTempData.vue

Ignore Space Show notes View src/views/deviceManage/components/listTubeData.vue

Show notes View src/views/deviceManage/components/listWellData.vue 100644 → 0

Ignore Space Show notes View src/views/deviceManage/components/listWellLocaData.vue

Ignore Space Show notes View src/views/deviceManage/components/listWellcoverData.vue 0 → 100644

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

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

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

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

Ignore Space Show notes View src/views/deviceStatics/components/deviceCountByDept.vue

Ignore Space Show notes View src/views/deviceStatics/components/deviceCountByOffline.vue

Ignore Space Show notes View src/views/deviceStatics/components/deviceCountByType.vue

Show notes View src/views/deviceStatics/components/listdeviceOffline.vue 100644 → 0

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

Ignore Space Show notes View src/views/staticCharts/AlarmStaticsByType.vue 0 → 100644

Ignore Space Show notes View src/views/staticCharts/DeviceCountByDeptBar.vue 0 → 100644

Ignore Space Show notes View src/views/staticCharts/DeviceCountByOnlinePie.vue 0 → 100644

Ignore Space Show notes View src/views/staticCharts/DeviceCountByTypeBar.vue 0 → 100644

Ignore Space Show notes View src/views/staticCharts/DeviceOfflineByTypeBar.vue 0 → 100644

Ignore Space Show notes View src/views/system/dept/listDept.vue

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

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

Show line notes below