Browse code Merge remote-tracking branch 'origin/master' gas master
commit ee9412567615b38a188f5f980ce13d0522029fb5 2 parents a5c1687 + 0e059ae [wangxitong] authored on 7 Apr 2022

Showing 22 changed files

• src/api/dashboard.js
• src/components/BigData/Card1/index.vue
• src/views/alarmManage/listAlarmNow.vue
• src/views/alarmManage/listAlarmRecords.vue
• src/views/alarmRule/components/editRule.vue
• src/views/alarmRule/components/listRule.vue
• src/views/alarmRule/editRule.vue
• src/views/dashboard/components/DeviceCount.vue
• src/views/dashboard/components/FunctionArea.vue
• src/views/dashboard/components/PanelGroup.vue
• src/views/dashboard/components/waterCompare.vue
• src/views/dashboard/components/waterNote.vue
• src/views/dashboard/index.vue
• src/views/dataManage/deviceData/listNoiseData.vue
• src/views/dataManage/deviceData/listWaterData.vue
• src/views/dataManage/deviceData/watchSevenDay.vue
• src/views/dataManage/deviceData/waterHistory.vue
• src/views/deviceManage/listDevice.vue
• src/views/wellManage/addWell.vue
• src/views/wellManage/editWell.vue
• src/views/wellManage/listWell.vue
• static/project.config.json

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

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

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/alarmRule/components/editRule.vue

Ignore Space Show notes View src/views/alarmRule/components/listRule.vue

Show notes View src/views/alarmRule/editRule.vue 100644 → 0

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

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

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

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

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

Ignore Space Show notes View src/views/dashboard/index.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/watchSevenDay.vue

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

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

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

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

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

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

Show line notes below