diff --git a/src/api/dashboard.js b/src/api/dashboard.js index 8c8bfd5..aaadb23 100644 --- a/src/api/dashboard.js +++ b/src/api/dashboard.js @@ -83,19 +83,17 @@ // 用水事记查询 export function getNoteList() { return request({ - // url: '/note/list', - url: 'waterMeterData/count', - method: 'get', - params + url: '/note/list', + method: 'get' }) } // 用水事记更新 -export function updateNoteList(params) { +export function updateNoteList(data) { return request({ - // url: '/note/update', - url: 'waterMeterData/count', + url: '/note/edit', + // url: 'waterMeterData/count', method: 'post', - params + data }) } diff --git a/src/api/dashboard.js b/src/api/dashboard.js index 8c8bfd5..aaadb23 100644 --- a/src/api/dashboard.js +++ b/src/api/dashboard.js @@ -83,19 +83,17 @@ // 用水事记查询 export function getNoteList() { return request({ - // url: '/note/list', - url: 'waterMeterData/count', - method: 'get', - params + url: '/note/list', + method: 'get' }) } // 用水事记更新 -export function updateNoteList(params) { +export function updateNoteList(data) { return request({ - // url: '/note/update', - url: 'waterMeterData/count', + url: '/note/edit', + // url: 'waterMeterData/count', method: 'post', - params + data }) } diff --git a/src/components/BigData/Card1/index.vue b/src/components/BigData/Card1/index.vue index aa46454..722c24c 100644 --- a/src/components/BigData/Card1/index.vue +++ b/src/components/BigData/Card1/index.vue @@ -4,7 +4,7 @@
-
+
- - - - - - - - + + + + + + + +
@@ -67,15 +76,18 @@ import editRule from '@/views/alarmRule/components/editRule' import { getDeviceType } from '@/api/device' import { getAlarmRuleList, delAlarmRule } from '@/api/alarmRule' +import AreaSelectTree from "@/components/AreaSelect/areaSelectTree"; export default { name: 'ListRule', - components: { editRule, infoWell }, + components: { editRule, infoWell, AreaSelectTree }, data() { return { listQuery: { keywords: '', status: '', + deviceType:'', + areaId:'', offset: 1, limit: 20, sort: '', @@ -114,6 +126,11 @@ align: 'center' }, { + text: '预警上限', + value: 'warnValue', + align: 'center' + }, + { text: '操作人', value: 'user', width: 100, @@ -131,7 +148,7 @@ } }, created() { - this.fetchDeviceType()// 获取部门树 + this.fetchDeviceType()// 获取设备类型 this.fetchData()// 获取数据 }, methods: { @@ -198,7 +215,7 @@ this.deviceTypeList = [] const supportDeviceTypes = this.$store.getters.deviceTypes for (const item of response.data) { - if (supportDeviceTypes.indexOf(item.value) !== -1 && (item.value === '2' || item.value === '6')) { + if (supportDeviceTypes.indexOf(item.value) !== -1 && (item.value === '2' || item.value === '8' || item.value === '13')) { this.deviceTypeList.push(item) } } diff --git a/src/api/dashboard.js b/src/api/dashboard.js index 8c8bfd5..aaadb23 100644 --- a/src/api/dashboard.js +++ b/src/api/dashboard.js @@ -83,19 +83,17 @@ // 用水事记查询 export function getNoteList() { return request({ - // url: '/note/list', - url: 'waterMeterData/count', - method: 'get', - params + url: '/note/list', + method: 'get' }) } // 用水事记更新 -export function updateNoteList(params) { +export function updateNoteList(data) { return request({ - // url: '/note/update', - url: 'waterMeterData/count', + url: '/note/edit', + // url: 'waterMeterData/count', method: 'post', - params + data }) } diff --git a/src/components/BigData/Card1/index.vue b/src/components/BigData/Card1/index.vue index aa46454..722c24c 100644 --- a/src/components/BigData/Card1/index.vue +++ b/src/components/BigData/Card1/index.vue @@ -4,7 +4,7 @@
-
+
- - - - - - - - + + + + + + + +
@@ -67,15 +76,18 @@ import editRule from '@/views/alarmRule/components/editRule' import { getDeviceType } from '@/api/device' import { getAlarmRuleList, delAlarmRule } from '@/api/alarmRule' +import AreaSelectTree from "@/components/AreaSelect/areaSelectTree"; export default { name: 'ListRule', - components: { editRule, infoWell }, + components: { editRule, infoWell, AreaSelectTree }, data() { return { listQuery: { keywords: '', status: '', + deviceType:'', + areaId:'', offset: 1, limit: 20, sort: '', @@ -114,6 +126,11 @@ align: 'center' }, { + text: '预警上限', + value: 'warnValue', + align: 'center' + }, + { text: '操作人', value: 'user', width: 100, @@ -131,7 +148,7 @@ } }, created() { - this.fetchDeviceType()// 获取部门树 + this.fetchDeviceType()// 获取设备类型 this.fetchData()// 获取数据 }, methods: { @@ -198,7 +215,7 @@ this.deviceTypeList = [] const supportDeviceTypes = this.$store.getters.deviceTypes for (const item of response.data) { - if (supportDeviceTypes.indexOf(item.value) !== -1 && (item.value === '2' || item.value === '6')) { + if (supportDeviceTypes.indexOf(item.value) !== -1 && (item.value === '2' || item.value === '8' || item.value === '13')) { this.deviceTypeList.push(item) } } diff --git a/src/views/alarmRule/editRule.vue b/src/views/alarmRule/editRule.vue deleted file mode 100644 index d39eb05..0000000 --- a/src/views/alarmRule/editRule.vue +++ /dev/null @@ -1,232 +0,0 @@ - - - - - diff --git a/src/api/dashboard.js b/src/api/dashboard.js index 8c8bfd5..aaadb23 100644 --- a/src/api/dashboard.js +++ b/src/api/dashboard.js @@ -83,19 +83,17 @@ // 用水事记查询 export function getNoteList() { return request({ - // url: '/note/list', - url: 'waterMeterData/count', - method: 'get', - params + url: '/note/list', + method: 'get' }) } // 用水事记更新 -export function updateNoteList(params) { +export function updateNoteList(data) { return request({ - // url: '/note/update', - url: 'waterMeterData/count', + url: '/note/edit', + // url: 'waterMeterData/count', method: 'post', - params + data }) } diff --git a/src/components/BigData/Card1/index.vue b/src/components/BigData/Card1/index.vue index aa46454..722c24c 100644 --- a/src/components/BigData/Card1/index.vue +++ b/src/components/BigData/Card1/index.vue @@ -4,7 +4,7 @@
-
+
- - - - - - - - + + + + + + + +
@@ -67,15 +76,18 @@ import editRule from '@/views/alarmRule/components/editRule' import { getDeviceType } from '@/api/device' import { getAlarmRuleList, delAlarmRule } from '@/api/alarmRule' +import AreaSelectTree from "@/components/AreaSelect/areaSelectTree"; export default { name: 'ListRule', - components: { editRule, infoWell }, + components: { editRule, infoWell, AreaSelectTree }, data() { return { listQuery: { keywords: '', status: '', + deviceType:'', + areaId:'', offset: 1, limit: 20, sort: '', @@ -114,6 +126,11 @@ align: 'center' }, { + text: '预警上限', + value: 'warnValue', + align: 'center' + }, + { text: '操作人', value: 'user', width: 100, @@ -131,7 +148,7 @@ } }, created() { - this.fetchDeviceType()// 获取部门树 + this.fetchDeviceType()// 获取设备类型 this.fetchData()// 获取数据 }, methods: { @@ -198,7 +215,7 @@ this.deviceTypeList = [] const supportDeviceTypes = this.$store.getters.deviceTypes for (const item of response.data) { - if (supportDeviceTypes.indexOf(item.value) !== -1 && (item.value === '2' || item.value === '6')) { + if (supportDeviceTypes.indexOf(item.value) !== -1 && (item.value === '2' || item.value === '8' || item.value === '13')) { this.deviceTypeList.push(item) } } diff --git a/src/views/alarmRule/editRule.vue b/src/views/alarmRule/editRule.vue deleted file mode 100644 index d39eb05..0000000 --- a/src/views/alarmRule/editRule.vue +++ /dev/null @@ -1,232 +0,0 @@ - - - - - diff --git a/src/views/dashboard/components/FunctionArea.vue b/src/views/dashboard/components/FunctionArea.vue index 9ab2e01..7ba2031 100644 --- a/src/views/dashboard/components/FunctionArea.vue +++ b/src/views/dashboard/components/FunctionArea.vue @@ -20,7 +20,7 @@ value-format="yyyy-MM-dd" size="mini" style="width:250px;margin-right: 20px" - @change="change"/> + @change="change('other')"/>
diff --git a/src/api/dashboard.js b/src/api/dashboard.js index 8c8bfd5..aaadb23 100644 --- a/src/api/dashboard.js +++ b/src/api/dashboard.js @@ -83,19 +83,17 @@ // 用水事记查询 export function getNoteList() { return request({ - // url: '/note/list', - url: 'waterMeterData/count', - method: 'get', - params + url: '/note/list', + method: 'get' }) } // 用水事记更新 -export function updateNoteList(params) { +export function updateNoteList(data) { return request({ - // url: '/note/update', - url: 'waterMeterData/count', + url: '/note/edit', + // url: 'waterMeterData/count', method: 'post', - params + data }) } diff --git a/src/components/BigData/Card1/index.vue b/src/components/BigData/Card1/index.vue index aa46454..722c24c 100644 --- a/src/components/BigData/Card1/index.vue +++ b/src/components/BigData/Card1/index.vue @@ -4,7 +4,7 @@
-
+
- - - - - - - - + + + + + + + +
@@ -67,15 +76,18 @@ import editRule from '@/views/alarmRule/components/editRule' import { getDeviceType } from '@/api/device' import { getAlarmRuleList, delAlarmRule } from '@/api/alarmRule' +import AreaSelectTree from "@/components/AreaSelect/areaSelectTree"; export default { name: 'ListRule', - components: { editRule, infoWell }, + components: { editRule, infoWell, AreaSelectTree }, data() { return { listQuery: { keywords: '', status: '', + deviceType:'', + areaId:'', offset: 1, limit: 20, sort: '', @@ -114,6 +126,11 @@ align: 'center' }, { + text: '预警上限', + value: 'warnValue', + align: 'center' + }, + { text: '操作人', value: 'user', width: 100, @@ -131,7 +148,7 @@ } }, created() { - this.fetchDeviceType()// 获取部门树 + this.fetchDeviceType()// 获取设备类型 this.fetchData()// 获取数据 }, methods: { @@ -198,7 +215,7 @@ this.deviceTypeList = [] const supportDeviceTypes = this.$store.getters.deviceTypes for (const item of response.data) { - if (supportDeviceTypes.indexOf(item.value) !== -1 && (item.value === '2' || item.value === '6')) { + if (supportDeviceTypes.indexOf(item.value) !== -1 && (item.value === '2' || item.value === '8' || item.value === '13')) { this.deviceTypeList.push(item) } } diff --git a/src/views/alarmRule/editRule.vue b/src/views/alarmRule/editRule.vue deleted file mode 100644 index d39eb05..0000000 --- a/src/views/alarmRule/editRule.vue +++ /dev/null @@ -1,232 +0,0 @@ - - - - - diff --git a/src/views/dashboard/components/FunctionArea.vue b/src/views/dashboard/components/FunctionArea.vue index 9ab2e01..7ba2031 100644 --- a/src/views/dashboard/components/FunctionArea.vue +++ b/src/views/dashboard/components/FunctionArea.vue @@ -20,7 +20,7 @@ value-format="yyyy-MM-dd" size="mini" style="width:250px;margin-right: 20px" - @change="change"/> + @change="change('other')"/>
diff --git a/src/views/dashboard/components/PanelGroup.vue b/src/views/dashboard/components/PanelGroup.vue index 7be90a7..48fa7d2 100644 --- a/src/views/dashboard/components/PanelGroup.vue +++ b/src/views/dashboard/components/PanelGroup.vue @@ -34,7 +34,7 @@ { title: ['总用水量', '本月用水量'], context: ['--', '--'], - icon: 'icon-water', + icon: '', color: '#40c9c6', unit: '吨', index: 0 @@ -101,8 +101,8 @@ getWater() { // 用水量 getWatchStatistic().then(response => { - this.dataGroup1[0].context = [response.data.total?parseFloat(response.data.total).toFixed(0):'--', response.data.month?parseFloat(response.data.month).toFixed(0):'--'] - this.dataGroup1[1].context = [response.data.today?parseFloat(response.data.today).toFixed(0):'--', response.data.production?parseFloat(response.data.production).toFixed(0):'--'] + this.dataGroup1[0].context = [response.data.total?parseFloat(response.data.total).toFixed(2):'--', response.data.month?parseFloat(response.data.month).toFixed(2):'--'] + this.dataGroup1[1].context = [response.data.today?parseFloat(response.data.today).toFixed(2):'--', response.data.prodution?parseFloat(response.data.prodution).toFixed(2):'--'] this.dataGroup1[2].context = [response.data.sound?Number(response.data.sound).toFixed(2):'--'] }) diff --git a/src/api/dashboard.js b/src/api/dashboard.js index 8c8bfd5..aaadb23 100644 --- a/src/api/dashboard.js +++ b/src/api/dashboard.js @@ -83,19 +83,17 @@ // 用水事记查询 export function getNoteList() { return request({ - // url: '/note/list', - url: 'waterMeterData/count', - method: 'get', - params + url: '/note/list', + method: 'get' }) } // 用水事记更新 -export function updateNoteList(params) { +export function updateNoteList(data) { return request({ - // url: '/note/update', - url: 'waterMeterData/count', + url: '/note/edit', + // url: 'waterMeterData/count', method: 'post', - params + data }) } diff --git a/src/components/BigData/Card1/index.vue b/src/components/BigData/Card1/index.vue index aa46454..722c24c 100644 --- a/src/components/BigData/Card1/index.vue +++ b/src/components/BigData/Card1/index.vue @@ -4,7 +4,7 @@
-
+
- - - - - - - - + + + + + + + +
@@ -67,15 +76,18 @@ import editRule from '@/views/alarmRule/components/editRule' import { getDeviceType } from '@/api/device' import { getAlarmRuleList, delAlarmRule } from '@/api/alarmRule' +import AreaSelectTree from "@/components/AreaSelect/areaSelectTree"; export default { name: 'ListRule', - components: { editRule, infoWell }, + components: { editRule, infoWell, AreaSelectTree }, data() { return { listQuery: { keywords: '', status: '', + deviceType:'', + areaId:'', offset: 1, limit: 20, sort: '', @@ -114,6 +126,11 @@ align: 'center' }, { + text: '预警上限', + value: 'warnValue', + align: 'center' + }, + { text: '操作人', value: 'user', width: 100, @@ -131,7 +148,7 @@ } }, created() { - this.fetchDeviceType()// 获取部门树 + this.fetchDeviceType()// 获取设备类型 this.fetchData()// 获取数据 }, methods: { @@ -198,7 +215,7 @@ this.deviceTypeList = [] const supportDeviceTypes = this.$store.getters.deviceTypes for (const item of response.data) { - if (supportDeviceTypes.indexOf(item.value) !== -1 && (item.value === '2' || item.value === '6')) { + if (supportDeviceTypes.indexOf(item.value) !== -1 && (item.value === '2' || item.value === '8' || item.value === '13')) { this.deviceTypeList.push(item) } } diff --git a/src/views/alarmRule/editRule.vue b/src/views/alarmRule/editRule.vue deleted file mode 100644 index d39eb05..0000000 --- a/src/views/alarmRule/editRule.vue +++ /dev/null @@ -1,232 +0,0 @@ - - - - - diff --git a/src/views/dashboard/components/FunctionArea.vue b/src/views/dashboard/components/FunctionArea.vue index 9ab2e01..7ba2031 100644 --- a/src/views/dashboard/components/FunctionArea.vue +++ b/src/views/dashboard/components/FunctionArea.vue @@ -20,7 +20,7 @@ value-format="yyyy-MM-dd" size="mini" style="width:250px;margin-right: 20px" - @change="change"/> + @change="change('other')"/>
diff --git a/src/views/dashboard/components/PanelGroup.vue b/src/views/dashboard/components/PanelGroup.vue index 7be90a7..48fa7d2 100644 --- a/src/views/dashboard/components/PanelGroup.vue +++ b/src/views/dashboard/components/PanelGroup.vue @@ -34,7 +34,7 @@ { title: ['总用水量', '本月用水量'], context: ['--', '--'], - icon: 'icon-water', + icon: '', color: '#40c9c6', unit: '吨', index: 0 @@ -101,8 +101,8 @@ getWater() { // 用水量 getWatchStatistic().then(response => { - this.dataGroup1[0].context = [response.data.total?parseFloat(response.data.total).toFixed(0):'--', response.data.month?parseFloat(response.data.month).toFixed(0):'--'] - this.dataGroup1[1].context = [response.data.today?parseFloat(response.data.today).toFixed(0):'--', response.data.production?parseFloat(response.data.production).toFixed(0):'--'] + this.dataGroup1[0].context = [response.data.total?parseFloat(response.data.total).toFixed(2):'--', response.data.month?parseFloat(response.data.month).toFixed(2):'--'] + this.dataGroup1[1].context = [response.data.today?parseFloat(response.data.today).toFixed(2):'--', response.data.prodution?parseFloat(response.data.prodution).toFixed(2):'--'] this.dataGroup1[2].context = [response.data.sound?Number(response.data.sound).toFixed(2):'--'] }) diff --git a/src/views/dashboard/components/waterCompare.vue b/src/views/dashboard/components/waterCompare.vue index b06d288..9cc5ca6 100644 --- a/src/views/dashboard/components/waterCompare.vue +++ b/src/views/dashboard/components/waterCompare.vue @@ -82,7 +82,7 @@ fetchData(timeRange,type) { const params = { areaId: '110000', - type: type, + type: type?type:'other', startTime: timeRange[0], endTime: timeRange[1] } diff --git a/src/api/dashboard.js b/src/api/dashboard.js index 8c8bfd5..aaadb23 100644 --- a/src/api/dashboard.js +++ b/src/api/dashboard.js @@ -83,19 +83,17 @@ // 用水事记查询 export function getNoteList() { return request({ - // url: '/note/list', - url: 'waterMeterData/count', - method: 'get', - params + url: '/note/list', + method: 'get' }) } // 用水事记更新 -export function updateNoteList(params) { +export function updateNoteList(data) { return request({ - // url: '/note/update', - url: 'waterMeterData/count', + url: '/note/edit', + // url: 'waterMeterData/count', method: 'post', - params + data }) } diff --git a/src/components/BigData/Card1/index.vue b/src/components/BigData/Card1/index.vue index aa46454..722c24c 100644 --- a/src/components/BigData/Card1/index.vue +++ b/src/components/BigData/Card1/index.vue @@ -4,7 +4,7 @@
-
+
- - - - - - - - + + + + + + + +
@@ -67,15 +76,18 @@ import editRule from '@/views/alarmRule/components/editRule' import { getDeviceType } from '@/api/device' import { getAlarmRuleList, delAlarmRule } from '@/api/alarmRule' +import AreaSelectTree from "@/components/AreaSelect/areaSelectTree"; export default { name: 'ListRule', - components: { editRule, infoWell }, + components: { editRule, infoWell, AreaSelectTree }, data() { return { listQuery: { keywords: '', status: '', + deviceType:'', + areaId:'', offset: 1, limit: 20, sort: '', @@ -114,6 +126,11 @@ align: 'center' }, { + text: '预警上限', + value: 'warnValue', + align: 'center' + }, + { text: '操作人', value: 'user', width: 100, @@ -131,7 +148,7 @@ } }, created() { - this.fetchDeviceType()// 获取部门树 + this.fetchDeviceType()// 获取设备类型 this.fetchData()// 获取数据 }, methods: { @@ -198,7 +215,7 @@ this.deviceTypeList = [] const supportDeviceTypes = this.$store.getters.deviceTypes for (const item of response.data) { - if (supportDeviceTypes.indexOf(item.value) !== -1 && (item.value === '2' || item.value === '6')) { + if (supportDeviceTypes.indexOf(item.value) !== -1 && (item.value === '2' || item.value === '8' || item.value === '13')) { this.deviceTypeList.push(item) } } diff --git a/src/views/alarmRule/editRule.vue b/src/views/alarmRule/editRule.vue deleted file mode 100644 index d39eb05..0000000 --- a/src/views/alarmRule/editRule.vue +++ /dev/null @@ -1,232 +0,0 @@ - - - - - diff --git a/src/views/dashboard/components/FunctionArea.vue b/src/views/dashboard/components/FunctionArea.vue index 9ab2e01..7ba2031 100644 --- a/src/views/dashboard/components/FunctionArea.vue +++ b/src/views/dashboard/components/FunctionArea.vue @@ -20,7 +20,7 @@ value-format="yyyy-MM-dd" size="mini" style="width:250px;margin-right: 20px" - @change="change"/> + @change="change('other')"/>
diff --git a/src/views/dashboard/components/PanelGroup.vue b/src/views/dashboard/components/PanelGroup.vue index 7be90a7..48fa7d2 100644 --- a/src/views/dashboard/components/PanelGroup.vue +++ b/src/views/dashboard/components/PanelGroup.vue @@ -34,7 +34,7 @@ { title: ['总用水量', '本月用水量'], context: ['--', '--'], - icon: 'icon-water', + icon: '', color: '#40c9c6', unit: '吨', index: 0 @@ -101,8 +101,8 @@ getWater() { // 用水量 getWatchStatistic().then(response => { - this.dataGroup1[0].context = [response.data.total?parseFloat(response.data.total).toFixed(0):'--', response.data.month?parseFloat(response.data.month).toFixed(0):'--'] - this.dataGroup1[1].context = [response.data.today?parseFloat(response.data.today).toFixed(0):'--', response.data.production?parseFloat(response.data.production).toFixed(0):'--'] + this.dataGroup1[0].context = [response.data.total?parseFloat(response.data.total).toFixed(2):'--', response.data.month?parseFloat(response.data.month).toFixed(2):'--'] + this.dataGroup1[1].context = [response.data.today?parseFloat(response.data.today).toFixed(2):'--', response.data.prodution?parseFloat(response.data.prodution).toFixed(2):'--'] this.dataGroup1[2].context = [response.data.sound?Number(response.data.sound).toFixed(2):'--'] }) diff --git a/src/views/dashboard/components/waterCompare.vue b/src/views/dashboard/components/waterCompare.vue index b06d288..9cc5ca6 100644 --- a/src/views/dashboard/components/waterCompare.vue +++ b/src/views/dashboard/components/waterCompare.vue @@ -82,7 +82,7 @@ fetchData(timeRange,type) { const params = { areaId: '110000', - type: type, + type: type?type:'other', startTime: timeRange[0], endTime: timeRange[1] } diff --git a/src/views/dashboard/components/waterNote.vue b/src/views/dashboard/components/waterNote.vue index a4ff85d..24cd67f 100644 --- a/src/views/dashboard/components/waterNote.vue +++ b/src/views/dashboard/components/waterNote.vue @@ -58,17 +58,17 @@ methods: { // 获取统计数据 fetchData() { - this.currentList = [ - { 'content': '测试文本测试文本测试文本测试文本测试文本测试文本测试文本测试', 'num': 1 }, - { 'content': '测试文本测试文本测试文本测试文本测试文本测试文本测试文本测试', 'num': 1 }, - { 'content': '测试文本测试文本测试文本测试文本测试文本测试文本测试文本测试', 'num': 1 }, - { 'content': '测试文本测试文本测试文本测试文本测试文本测试文本测试文本测试', 'num': 1 }, - { 'content': '测试文本测试文本测试文本测试文本测试文本测试文本测试文本测试', 'num': 1 } - ] - this.originList = JSON.parse(JSON.stringify(this.currentList)) - // getNoteList().then(response => { - // this.currentList = response.data - // }) + // this.currentList = [ + // { 'content': '测试文本测试文本测试文本测试文本测试文本测试文本测试文本测试', 'num': 1 }, + // { 'content': '测试文本测试文本测试文本测试文本测试文本测试文本测试文本测试', 'num': 1 }, + // { 'content': '测试文本测试文本测试文本测试文本测试文本测试文本测试文本测试', 'num': 1 }, + // { 'content': '测试文本测试文本测试文本测试文本测试文本测试文本测试文本测试', 'num': 1 }, + // { 'content': '测试文本测试文本测试文本测试文本测试文本测试文本测试文本测试', 'num': 1 } + // ] + // this.originList = JSON.parse(JSON.stringify(this.currentList)) + getNoteList().then(response => { + this.currentList = JSON.parse(response.data) + }) }, toTop(index){ this.currentList[index-1] = this.currentList.splice(index,1,this.currentList[index-1])[0] @@ -109,6 +109,12 @@ height: 428px; display: flex; flex-direction: column; + .title{ + font-weight: bolder; + font-size: 18px; + font-family: sans-serif; + color: #333; + } .content-div{ height: 410px; .content-line{ diff --git a/src/api/dashboard.js b/src/api/dashboard.js index 8c8bfd5..aaadb23 100644 --- a/src/api/dashboard.js +++ b/src/api/dashboard.js @@ -83,19 +83,17 @@ // 用水事记查询 export function getNoteList() { return request({ - // url: '/note/list', - url: 'waterMeterData/count', - method: 'get', - params + url: '/note/list', + method: 'get' }) } // 用水事记更新 -export function updateNoteList(params) { +export function updateNoteList(data) { return request({ - // url: '/note/update', - url: 'waterMeterData/count', + url: '/note/edit', + // url: 'waterMeterData/count', method: 'post', - params + data }) } diff --git a/src/components/BigData/Card1/index.vue b/src/components/BigData/Card1/index.vue index aa46454..722c24c 100644 --- a/src/components/BigData/Card1/index.vue +++ b/src/components/BigData/Card1/index.vue @@ -4,7 +4,7 @@
-
+
- - - - - - - - + + + + + + + +
@@ -67,15 +76,18 @@ import editRule from '@/views/alarmRule/components/editRule' import { getDeviceType } from '@/api/device' import { getAlarmRuleList, delAlarmRule } from '@/api/alarmRule' +import AreaSelectTree from "@/components/AreaSelect/areaSelectTree"; export default { name: 'ListRule', - components: { editRule, infoWell }, + components: { editRule, infoWell, AreaSelectTree }, data() { return { listQuery: { keywords: '', status: '', + deviceType:'', + areaId:'', offset: 1, limit: 20, sort: '', @@ -114,6 +126,11 @@ align: 'center' }, { + text: '预警上限', + value: 'warnValue', + align: 'center' + }, + { text: '操作人', value: 'user', width: 100, @@ -131,7 +148,7 @@ } }, created() { - this.fetchDeviceType()// 获取部门树 + this.fetchDeviceType()// 获取设备类型 this.fetchData()// 获取数据 }, methods: { @@ -198,7 +215,7 @@ this.deviceTypeList = [] const supportDeviceTypes = this.$store.getters.deviceTypes for (const item of response.data) { - if (supportDeviceTypes.indexOf(item.value) !== -1 && (item.value === '2' || item.value === '6')) { + if (supportDeviceTypes.indexOf(item.value) !== -1 && (item.value === '2' || item.value === '8' || item.value === '13')) { this.deviceTypeList.push(item) } } diff --git a/src/views/alarmRule/editRule.vue b/src/views/alarmRule/editRule.vue deleted file mode 100644 index d39eb05..0000000 --- a/src/views/alarmRule/editRule.vue +++ /dev/null @@ -1,232 +0,0 @@ - - - - - diff --git a/src/views/dashboard/components/FunctionArea.vue b/src/views/dashboard/components/FunctionArea.vue index 9ab2e01..7ba2031 100644 --- a/src/views/dashboard/components/FunctionArea.vue +++ b/src/views/dashboard/components/FunctionArea.vue @@ -20,7 +20,7 @@ value-format="yyyy-MM-dd" size="mini" style="width:250px;margin-right: 20px" - @change="change"/> + @change="change('other')"/>
diff --git a/src/views/dashboard/components/PanelGroup.vue b/src/views/dashboard/components/PanelGroup.vue index 7be90a7..48fa7d2 100644 --- a/src/views/dashboard/components/PanelGroup.vue +++ b/src/views/dashboard/components/PanelGroup.vue @@ -34,7 +34,7 @@ { title: ['总用水量', '本月用水量'], context: ['--', '--'], - icon: 'icon-water', + icon: '', color: '#40c9c6', unit: '吨', index: 0 @@ -101,8 +101,8 @@ getWater() { // 用水量 getWatchStatistic().then(response => { - this.dataGroup1[0].context = [response.data.total?parseFloat(response.data.total).toFixed(0):'--', response.data.month?parseFloat(response.data.month).toFixed(0):'--'] - this.dataGroup1[1].context = [response.data.today?parseFloat(response.data.today).toFixed(0):'--', response.data.production?parseFloat(response.data.production).toFixed(0):'--'] + this.dataGroup1[0].context = [response.data.total?parseFloat(response.data.total).toFixed(2):'--', response.data.month?parseFloat(response.data.month).toFixed(2):'--'] + this.dataGroup1[1].context = [response.data.today?parseFloat(response.data.today).toFixed(2):'--', response.data.prodution?parseFloat(response.data.prodution).toFixed(2):'--'] this.dataGroup1[2].context = [response.data.sound?Number(response.data.sound).toFixed(2):'--'] }) diff --git a/src/views/dashboard/components/waterCompare.vue b/src/views/dashboard/components/waterCompare.vue index b06d288..9cc5ca6 100644 --- a/src/views/dashboard/components/waterCompare.vue +++ b/src/views/dashboard/components/waterCompare.vue @@ -82,7 +82,7 @@ fetchData(timeRange,type) { const params = { areaId: '110000', - type: type, + type: type?type:'other', startTime: timeRange[0], endTime: timeRange[1] } diff --git a/src/views/dashboard/components/waterNote.vue b/src/views/dashboard/components/waterNote.vue index a4ff85d..24cd67f 100644 --- a/src/views/dashboard/components/waterNote.vue +++ b/src/views/dashboard/components/waterNote.vue @@ -58,17 +58,17 @@ methods: { // 获取统计数据 fetchData() { - this.currentList = [ - { 'content': '测试文本测试文本测试文本测试文本测试文本测试文本测试文本测试', 'num': 1 }, - { 'content': '测试文本测试文本测试文本测试文本测试文本测试文本测试文本测试', 'num': 1 }, - { 'content': '测试文本测试文本测试文本测试文本测试文本测试文本测试文本测试', 'num': 1 }, - { 'content': '测试文本测试文本测试文本测试文本测试文本测试文本测试文本测试', 'num': 1 }, - { 'content': '测试文本测试文本测试文本测试文本测试文本测试文本测试文本测试', 'num': 1 } - ] - this.originList = JSON.parse(JSON.stringify(this.currentList)) - // getNoteList().then(response => { - // this.currentList = response.data - // }) + // this.currentList = [ + // { 'content': '测试文本测试文本测试文本测试文本测试文本测试文本测试文本测试', 'num': 1 }, + // { 'content': '测试文本测试文本测试文本测试文本测试文本测试文本测试文本测试', 'num': 1 }, + // { 'content': '测试文本测试文本测试文本测试文本测试文本测试文本测试文本测试', 'num': 1 }, + // { 'content': '测试文本测试文本测试文本测试文本测试文本测试文本测试文本测试', 'num': 1 }, + // { 'content': '测试文本测试文本测试文本测试文本测试文本测试文本测试文本测试', 'num': 1 } + // ] + // this.originList = JSON.parse(JSON.stringify(this.currentList)) + getNoteList().then(response => { + this.currentList = JSON.parse(response.data) + }) }, toTop(index){ this.currentList[index-1] = this.currentList.splice(index,1,this.currentList[index-1])[0] @@ -109,6 +109,12 @@ height: 428px; display: flex; flex-direction: column; + .title{ + font-weight: bolder; + font-size: 18px; + font-family: sans-serif; + color: #333; + } .content-div{ height: 410px; .content-line{ diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue index 6403977..b562719 100644 --- a/src/views/dashboard/index.vue +++ b/src/views/dashboard/index.vue @@ -2,18 +2,6 @@
- - - - - - - - - - - - @@ -39,7 +27,18 @@ - + + + + + + + + + + + + diff --git a/src/api/dashboard.js b/src/api/dashboard.js index 8c8bfd5..aaadb23 100644 --- a/src/api/dashboard.js +++ b/src/api/dashboard.js @@ -83,19 +83,17 @@ // 用水事记查询 export function getNoteList() { return request({ - // url: '/note/list', - url: 'waterMeterData/count', - method: 'get', - params + url: '/note/list', + method: 'get' }) } // 用水事记更新 -export function updateNoteList(params) { +export function updateNoteList(data) { return request({ - // url: '/note/update', - url: 'waterMeterData/count', + url: '/note/edit', + // url: 'waterMeterData/count', method: 'post', - params + data }) } diff --git a/src/components/BigData/Card1/index.vue b/src/components/BigData/Card1/index.vue index aa46454..722c24c 100644 --- a/src/components/BigData/Card1/index.vue +++ b/src/components/BigData/Card1/index.vue @@ -4,7 +4,7 @@
-
+
- - - - - - - - + + + + + + + +
@@ -67,15 +76,18 @@ import editRule from '@/views/alarmRule/components/editRule' import { getDeviceType } from '@/api/device' import { getAlarmRuleList, delAlarmRule } from '@/api/alarmRule' +import AreaSelectTree from "@/components/AreaSelect/areaSelectTree"; export default { name: 'ListRule', - components: { editRule, infoWell }, + components: { editRule, infoWell, AreaSelectTree }, data() { return { listQuery: { keywords: '', status: '', + deviceType:'', + areaId:'', offset: 1, limit: 20, sort: '', @@ -114,6 +126,11 @@ align: 'center' }, { + text: '预警上限', + value: 'warnValue', + align: 'center' + }, + { text: '操作人', value: 'user', width: 100, @@ -131,7 +148,7 @@ } }, created() { - this.fetchDeviceType()// 获取部门树 + this.fetchDeviceType()// 获取设备类型 this.fetchData()// 获取数据 }, methods: { @@ -198,7 +215,7 @@ this.deviceTypeList = [] const supportDeviceTypes = this.$store.getters.deviceTypes for (const item of response.data) { - if (supportDeviceTypes.indexOf(item.value) !== -1 && (item.value === '2' || item.value === '6')) { + if (supportDeviceTypes.indexOf(item.value) !== -1 && (item.value === '2' || item.value === '8' || item.value === '13')) { this.deviceTypeList.push(item) } } diff --git a/src/views/alarmRule/editRule.vue b/src/views/alarmRule/editRule.vue deleted file mode 100644 index d39eb05..0000000 --- a/src/views/alarmRule/editRule.vue +++ /dev/null @@ -1,232 +0,0 @@ - - - - - diff --git a/src/views/dashboard/components/FunctionArea.vue b/src/views/dashboard/components/FunctionArea.vue index 9ab2e01..7ba2031 100644 --- a/src/views/dashboard/components/FunctionArea.vue +++ b/src/views/dashboard/components/FunctionArea.vue @@ -20,7 +20,7 @@ value-format="yyyy-MM-dd" size="mini" style="width:250px;margin-right: 20px" - @change="change"/> + @change="change('other')"/>
diff --git a/src/views/dashboard/components/PanelGroup.vue b/src/views/dashboard/components/PanelGroup.vue index 7be90a7..48fa7d2 100644 --- a/src/views/dashboard/components/PanelGroup.vue +++ b/src/views/dashboard/components/PanelGroup.vue @@ -34,7 +34,7 @@ { title: ['总用水量', '本月用水量'], context: ['--', '--'], - icon: 'icon-water', + icon: '', color: '#40c9c6', unit: '吨', index: 0 @@ -101,8 +101,8 @@ getWater() { // 用水量 getWatchStatistic().then(response => { - this.dataGroup1[0].context = [response.data.total?parseFloat(response.data.total).toFixed(0):'--', response.data.month?parseFloat(response.data.month).toFixed(0):'--'] - this.dataGroup1[1].context = [response.data.today?parseFloat(response.data.today).toFixed(0):'--', response.data.production?parseFloat(response.data.production).toFixed(0):'--'] + this.dataGroup1[0].context = [response.data.total?parseFloat(response.data.total).toFixed(2):'--', response.data.month?parseFloat(response.data.month).toFixed(2):'--'] + this.dataGroup1[1].context = [response.data.today?parseFloat(response.data.today).toFixed(2):'--', response.data.prodution?parseFloat(response.data.prodution).toFixed(2):'--'] this.dataGroup1[2].context = [response.data.sound?Number(response.data.sound).toFixed(2):'--'] }) diff --git a/src/views/dashboard/components/waterCompare.vue b/src/views/dashboard/components/waterCompare.vue index b06d288..9cc5ca6 100644 --- a/src/views/dashboard/components/waterCompare.vue +++ b/src/views/dashboard/components/waterCompare.vue @@ -82,7 +82,7 @@ fetchData(timeRange,type) { const params = { areaId: '110000', - type: type, + type: type?type:'other', startTime: timeRange[0], endTime: timeRange[1] } diff --git a/src/views/dashboard/components/waterNote.vue b/src/views/dashboard/components/waterNote.vue index a4ff85d..24cd67f 100644 --- a/src/views/dashboard/components/waterNote.vue +++ b/src/views/dashboard/components/waterNote.vue @@ -58,17 +58,17 @@ methods: { // 获取统计数据 fetchData() { - this.currentList = [ - { 'content': '测试文本测试文本测试文本测试文本测试文本测试文本测试文本测试', 'num': 1 }, - { 'content': '测试文本测试文本测试文本测试文本测试文本测试文本测试文本测试', 'num': 1 }, - { 'content': '测试文本测试文本测试文本测试文本测试文本测试文本测试文本测试', 'num': 1 }, - { 'content': '测试文本测试文本测试文本测试文本测试文本测试文本测试文本测试', 'num': 1 }, - { 'content': '测试文本测试文本测试文本测试文本测试文本测试文本测试文本测试', 'num': 1 } - ] - this.originList = JSON.parse(JSON.stringify(this.currentList)) - // getNoteList().then(response => { - // this.currentList = response.data - // }) + // this.currentList = [ + // { 'content': '测试文本测试文本测试文本测试文本测试文本测试文本测试文本测试', 'num': 1 }, + // { 'content': '测试文本测试文本测试文本测试文本测试文本测试文本测试文本测试', 'num': 1 }, + // { 'content': '测试文本测试文本测试文本测试文本测试文本测试文本测试文本测试', 'num': 1 }, + // { 'content': '测试文本测试文本测试文本测试文本测试文本测试文本测试文本测试', 'num': 1 }, + // { 'content': '测试文本测试文本测试文本测试文本测试文本测试文本测试文本测试', 'num': 1 } + // ] + // this.originList = JSON.parse(JSON.stringify(this.currentList)) + getNoteList().then(response => { + this.currentList = JSON.parse(response.data) + }) }, toTop(index){ this.currentList[index-1] = this.currentList.splice(index,1,this.currentList[index-1])[0] @@ -109,6 +109,12 @@ height: 428px; display: flex; flex-direction: column; + .title{ + font-weight: bolder; + font-size: 18px; + font-family: sans-serif; + color: #333; + } .content-div{ height: 410px; .content-line{ diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue index 6403977..b562719 100644 --- a/src/views/dashboard/index.vue +++ b/src/views/dashboard/index.vue @@ -2,18 +2,6 @@
- - - - - - - - - - - - @@ -39,7 +27,18 @@ - + + + + + + + + + + + + diff --git a/src/views/dataManage/deviceData/listNoiseData.vue b/src/views/dataManage/deviceData/listNoiseData.vue index fd909d9..1a87421 100644 --- a/src/views/dataManage/deviceData/listNoiseData.vue +++ b/src/views/dataManage/deviceData/listNoiseData.vue @@ -2,14 +2,11 @@
- + - - - - 搜索 + + + + 搜索
diff --git a/src/api/dashboard.js b/src/api/dashboard.js index 8c8bfd5..aaadb23 100644 --- a/src/api/dashboard.js +++ b/src/api/dashboard.js @@ -83,19 +83,17 @@ // 用水事记查询 export function getNoteList() { return request({ - // url: '/note/list', - url: 'waterMeterData/count', - method: 'get', - params + url: '/note/list', + method: 'get' }) } // 用水事记更新 -export function updateNoteList(params) { +export function updateNoteList(data) { return request({ - // url: '/note/update', - url: 'waterMeterData/count', + url: '/note/edit', + // url: 'waterMeterData/count', method: 'post', - params + data }) } diff --git a/src/components/BigData/Card1/index.vue b/src/components/BigData/Card1/index.vue index aa46454..722c24c 100644 --- a/src/components/BigData/Card1/index.vue +++ b/src/components/BigData/Card1/index.vue @@ -4,7 +4,7 @@
-
+
- - - - - - - - + + + + + + + +
@@ -67,15 +76,18 @@ import editRule from '@/views/alarmRule/components/editRule' import { getDeviceType } from '@/api/device' import { getAlarmRuleList, delAlarmRule } from '@/api/alarmRule' +import AreaSelectTree from "@/components/AreaSelect/areaSelectTree"; export default { name: 'ListRule', - components: { editRule, infoWell }, + components: { editRule, infoWell, AreaSelectTree }, data() { return { listQuery: { keywords: '', status: '', + deviceType:'', + areaId:'', offset: 1, limit: 20, sort: '', @@ -114,6 +126,11 @@ align: 'center' }, { + text: '预警上限', + value: 'warnValue', + align: 'center' + }, + { text: '操作人', value: 'user', width: 100, @@ -131,7 +148,7 @@ } }, created() { - this.fetchDeviceType()// 获取部门树 + this.fetchDeviceType()// 获取设备类型 this.fetchData()// 获取数据 }, methods: { @@ -198,7 +215,7 @@ this.deviceTypeList = [] const supportDeviceTypes = this.$store.getters.deviceTypes for (const item of response.data) { - if (supportDeviceTypes.indexOf(item.value) !== -1 && (item.value === '2' || item.value === '6')) { + if (supportDeviceTypes.indexOf(item.value) !== -1 && (item.value === '2' || item.value === '8' || item.value === '13')) { this.deviceTypeList.push(item) } } diff --git a/src/views/alarmRule/editRule.vue b/src/views/alarmRule/editRule.vue deleted file mode 100644 index d39eb05..0000000 --- a/src/views/alarmRule/editRule.vue +++ /dev/null @@ -1,232 +0,0 @@ - - - - - diff --git a/src/views/dashboard/components/FunctionArea.vue b/src/views/dashboard/components/FunctionArea.vue index 9ab2e01..7ba2031 100644 --- a/src/views/dashboard/components/FunctionArea.vue +++ b/src/views/dashboard/components/FunctionArea.vue @@ -20,7 +20,7 @@ value-format="yyyy-MM-dd" size="mini" style="width:250px;margin-right: 20px" - @change="change"/> + @change="change('other')"/>
diff --git a/src/views/dashboard/components/PanelGroup.vue b/src/views/dashboard/components/PanelGroup.vue index 7be90a7..48fa7d2 100644 --- a/src/views/dashboard/components/PanelGroup.vue +++ b/src/views/dashboard/components/PanelGroup.vue @@ -34,7 +34,7 @@ { title: ['总用水量', '本月用水量'], context: ['--', '--'], - icon: 'icon-water', + icon: '', color: '#40c9c6', unit: '吨', index: 0 @@ -101,8 +101,8 @@ getWater() { // 用水量 getWatchStatistic().then(response => { - this.dataGroup1[0].context = [response.data.total?parseFloat(response.data.total).toFixed(0):'--', response.data.month?parseFloat(response.data.month).toFixed(0):'--'] - this.dataGroup1[1].context = [response.data.today?parseFloat(response.data.today).toFixed(0):'--', response.data.production?parseFloat(response.data.production).toFixed(0):'--'] + this.dataGroup1[0].context = [response.data.total?parseFloat(response.data.total).toFixed(2):'--', response.data.month?parseFloat(response.data.month).toFixed(2):'--'] + this.dataGroup1[1].context = [response.data.today?parseFloat(response.data.today).toFixed(2):'--', response.data.prodution?parseFloat(response.data.prodution).toFixed(2):'--'] this.dataGroup1[2].context = [response.data.sound?Number(response.data.sound).toFixed(2):'--'] }) diff --git a/src/views/dashboard/components/waterCompare.vue b/src/views/dashboard/components/waterCompare.vue index b06d288..9cc5ca6 100644 --- a/src/views/dashboard/components/waterCompare.vue +++ b/src/views/dashboard/components/waterCompare.vue @@ -82,7 +82,7 @@ fetchData(timeRange,type) { const params = { areaId: '110000', - type: type, + type: type?type:'other', startTime: timeRange[0], endTime: timeRange[1] } diff --git a/src/views/dashboard/components/waterNote.vue b/src/views/dashboard/components/waterNote.vue index a4ff85d..24cd67f 100644 --- a/src/views/dashboard/components/waterNote.vue +++ b/src/views/dashboard/components/waterNote.vue @@ -58,17 +58,17 @@ methods: { // 获取统计数据 fetchData() { - this.currentList = [ - { 'content': '测试文本测试文本测试文本测试文本测试文本测试文本测试文本测试', 'num': 1 }, - { 'content': '测试文本测试文本测试文本测试文本测试文本测试文本测试文本测试', 'num': 1 }, - { 'content': '测试文本测试文本测试文本测试文本测试文本测试文本测试文本测试', 'num': 1 }, - { 'content': '测试文本测试文本测试文本测试文本测试文本测试文本测试文本测试', 'num': 1 }, - { 'content': '测试文本测试文本测试文本测试文本测试文本测试文本测试文本测试', 'num': 1 } - ] - this.originList = JSON.parse(JSON.stringify(this.currentList)) - // getNoteList().then(response => { - // this.currentList = response.data - // }) + // this.currentList = [ + // { 'content': '测试文本测试文本测试文本测试文本测试文本测试文本测试文本测试', 'num': 1 }, + // { 'content': '测试文本测试文本测试文本测试文本测试文本测试文本测试文本测试', 'num': 1 }, + // { 'content': '测试文本测试文本测试文本测试文本测试文本测试文本测试文本测试', 'num': 1 }, + // { 'content': '测试文本测试文本测试文本测试文本测试文本测试文本测试文本测试', 'num': 1 }, + // { 'content': '测试文本测试文本测试文本测试文本测试文本测试文本测试文本测试', 'num': 1 } + // ] + // this.originList = JSON.parse(JSON.stringify(this.currentList)) + getNoteList().then(response => { + this.currentList = JSON.parse(response.data) + }) }, toTop(index){ this.currentList[index-1] = this.currentList.splice(index,1,this.currentList[index-1])[0] @@ -109,6 +109,12 @@ height: 428px; display: flex; flex-direction: column; + .title{ + font-weight: bolder; + font-size: 18px; + font-family: sans-serif; + color: #333; + } .content-div{ height: 410px; .content-line{ diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue index 6403977..b562719 100644 --- a/src/views/dashboard/index.vue +++ b/src/views/dashboard/index.vue @@ -2,18 +2,6 @@
- - - - - - - - - - - - @@ -39,7 +27,18 @@ - + + + + + + + + + + + + diff --git a/src/views/dataManage/deviceData/listNoiseData.vue b/src/views/dataManage/deviceData/listNoiseData.vue index fd909d9..1a87421 100644 --- a/src/views/dataManage/deviceData/listNoiseData.vue +++ b/src/views/dataManage/deviceData/listNoiseData.vue @@ -2,14 +2,11 @@
- + - - - - 搜索 + + + + 搜索
diff --git a/src/views/dataManage/deviceData/listWaterData.vue b/src/views/dataManage/deviceData/listWaterData.vue index 571557a..558af5f 100644 --- a/src/views/dataManage/deviceData/listWaterData.vue +++ b/src/views/dataManage/deviceData/listWaterData.vue @@ -4,7 +4,6 @@ @@ -22,6 +22,7 @@ v-model="listQuery.areaId" :need-top="false" :dept-show="true" + size="small" placeholder="区域" /> @@ -84,6 +85,9 @@ @@ -105,6 +109,7 @@ />
+
@@ -115,10 +120,11 @@ import { parseUrl } from '@/utils/parseutils' import WatchSevenDay from './watchSevenDay' import AreaSelectTree from '@/components/AreaSelect/areaSelectTree' +import WaterHistory from "./waterHistory"; export default { name: 'ListWaterData', - components: { AreaSelectTree, WatchSevenDay, DeptSelect, selectTree }, + components: {WaterHistory, AreaSelectTree, WatchSevenDay, DeptSelect, selectTree }, data() { return { listQuery: { @@ -215,6 +221,7 @@ listLoading: true, // 加载动画 fullscreenLoading: false, // 全屏加载动画 dialogFormVisible: false, + waterHistoryShow: false, editShow: false, // 是否显示编辑框 detailShow: false, // 是否显示编辑框 deptShowTop: false @@ -291,6 +298,10 @@ this.dialogFormVisible = true this.$refs.watchsevenday.initDialog(this.dialogFormVisible, row) }, + openData(row){ + this.waterHistoryShow = true + this.$refs.waterHistory.initDialog(this.waterHistoryShow, row) + }, // 获取液位配置数据 fetchData(isNowPage = true) { this.listLoading = true diff --git a/src/api/dashboard.js b/src/api/dashboard.js index 8c8bfd5..aaadb23 100644 --- a/src/api/dashboard.js +++ b/src/api/dashboard.js @@ -83,19 +83,17 @@ // 用水事记查询 export function getNoteList() { return request({ - // url: '/note/list', - url: 'waterMeterData/count', - method: 'get', - params + url: '/note/list', + method: 'get' }) } // 用水事记更新 -export function updateNoteList(params) { +export function updateNoteList(data) { return request({ - // url: '/note/update', - url: 'waterMeterData/count', + url: '/note/edit', + // url: 'waterMeterData/count', method: 'post', - params + data }) } diff --git a/src/components/BigData/Card1/index.vue b/src/components/BigData/Card1/index.vue index aa46454..722c24c 100644 --- a/src/components/BigData/Card1/index.vue +++ b/src/components/BigData/Card1/index.vue @@ -4,7 +4,7 @@
-
+
- - - - - - - - + + + + + + + +
@@ -67,15 +76,18 @@ import editRule from '@/views/alarmRule/components/editRule' import { getDeviceType } from '@/api/device' import { getAlarmRuleList, delAlarmRule } from '@/api/alarmRule' +import AreaSelectTree from "@/components/AreaSelect/areaSelectTree"; export default { name: 'ListRule', - components: { editRule, infoWell }, + components: { editRule, infoWell, AreaSelectTree }, data() { return { listQuery: { keywords: '', status: '', + deviceType:'', + areaId:'', offset: 1, limit: 20, sort: '', @@ -114,6 +126,11 @@ align: 'center' }, { + text: '预警上限', + value: 'warnValue', + align: 'center' + }, + { text: '操作人', value: 'user', width: 100, @@ -131,7 +148,7 @@ } }, created() { - this.fetchDeviceType()// 获取部门树 + this.fetchDeviceType()// 获取设备类型 this.fetchData()// 获取数据 }, methods: { @@ -198,7 +215,7 @@ this.deviceTypeList = [] const supportDeviceTypes = this.$store.getters.deviceTypes for (const item of response.data) { - if (supportDeviceTypes.indexOf(item.value) !== -1 && (item.value === '2' || item.value === '6')) { + if (supportDeviceTypes.indexOf(item.value) !== -1 && (item.value === '2' || item.value === '8' || item.value === '13')) { this.deviceTypeList.push(item) } } diff --git a/src/views/alarmRule/editRule.vue b/src/views/alarmRule/editRule.vue deleted file mode 100644 index d39eb05..0000000 --- a/src/views/alarmRule/editRule.vue +++ /dev/null @@ -1,232 +0,0 @@ - - - - - diff --git a/src/views/dashboard/components/FunctionArea.vue b/src/views/dashboard/components/FunctionArea.vue index 9ab2e01..7ba2031 100644 --- a/src/views/dashboard/components/FunctionArea.vue +++ b/src/views/dashboard/components/FunctionArea.vue @@ -20,7 +20,7 @@ value-format="yyyy-MM-dd" size="mini" style="width:250px;margin-right: 20px" - @change="change"/> + @change="change('other')"/>
diff --git a/src/views/dashboard/components/PanelGroup.vue b/src/views/dashboard/components/PanelGroup.vue index 7be90a7..48fa7d2 100644 --- a/src/views/dashboard/components/PanelGroup.vue +++ b/src/views/dashboard/components/PanelGroup.vue @@ -34,7 +34,7 @@ { title: ['总用水量', '本月用水量'], context: ['--', '--'], - icon: 'icon-water', + icon: '', color: '#40c9c6', unit: '吨', index: 0 @@ -101,8 +101,8 @@ getWater() { // 用水量 getWatchStatistic().then(response => { - this.dataGroup1[0].context = [response.data.total?parseFloat(response.data.total).toFixed(0):'--', response.data.month?parseFloat(response.data.month).toFixed(0):'--'] - this.dataGroup1[1].context = [response.data.today?parseFloat(response.data.today).toFixed(0):'--', response.data.production?parseFloat(response.data.production).toFixed(0):'--'] + this.dataGroup1[0].context = [response.data.total?parseFloat(response.data.total).toFixed(2):'--', response.data.month?parseFloat(response.data.month).toFixed(2):'--'] + this.dataGroup1[1].context = [response.data.today?parseFloat(response.data.today).toFixed(2):'--', response.data.prodution?parseFloat(response.data.prodution).toFixed(2):'--'] this.dataGroup1[2].context = [response.data.sound?Number(response.data.sound).toFixed(2):'--'] }) diff --git a/src/views/dashboard/components/waterCompare.vue b/src/views/dashboard/components/waterCompare.vue index b06d288..9cc5ca6 100644 --- a/src/views/dashboard/components/waterCompare.vue +++ b/src/views/dashboard/components/waterCompare.vue @@ -82,7 +82,7 @@ fetchData(timeRange,type) { const params = { areaId: '110000', - type: type, + type: type?type:'other', startTime: timeRange[0], endTime: timeRange[1] } diff --git a/src/views/dashboard/components/waterNote.vue b/src/views/dashboard/components/waterNote.vue index a4ff85d..24cd67f 100644 --- a/src/views/dashboard/components/waterNote.vue +++ b/src/views/dashboard/components/waterNote.vue @@ -58,17 +58,17 @@ methods: { // 获取统计数据 fetchData() { - this.currentList = [ - { 'content': '测试文本测试文本测试文本测试文本测试文本测试文本测试文本测试', 'num': 1 }, - { 'content': '测试文本测试文本测试文本测试文本测试文本测试文本测试文本测试', 'num': 1 }, - { 'content': '测试文本测试文本测试文本测试文本测试文本测试文本测试文本测试', 'num': 1 }, - { 'content': '测试文本测试文本测试文本测试文本测试文本测试文本测试文本测试', 'num': 1 }, - { 'content': '测试文本测试文本测试文本测试文本测试文本测试文本测试文本测试', 'num': 1 } - ] - this.originList = JSON.parse(JSON.stringify(this.currentList)) - // getNoteList().then(response => { - // this.currentList = response.data - // }) + // this.currentList = [ + // { 'content': '测试文本测试文本测试文本测试文本测试文本测试文本测试文本测试', 'num': 1 }, + // { 'content': '测试文本测试文本测试文本测试文本测试文本测试文本测试文本测试', 'num': 1 }, + // { 'content': '测试文本测试文本测试文本测试文本测试文本测试文本测试文本测试', 'num': 1 }, + // { 'content': '测试文本测试文本测试文本测试文本测试文本测试文本测试文本测试', 'num': 1 }, + // { 'content': '测试文本测试文本测试文本测试文本测试文本测试文本测试文本测试', 'num': 1 } + // ] + // this.originList = JSON.parse(JSON.stringify(this.currentList)) + getNoteList().then(response => { + this.currentList = JSON.parse(response.data) + }) }, toTop(index){ this.currentList[index-1] = this.currentList.splice(index,1,this.currentList[index-1])[0] @@ -109,6 +109,12 @@ height: 428px; display: flex; flex-direction: column; + .title{ + font-weight: bolder; + font-size: 18px; + font-family: sans-serif; + color: #333; + } .content-div{ height: 410px; .content-line{ diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue index 6403977..b562719 100644 --- a/src/views/dashboard/index.vue +++ b/src/views/dashboard/index.vue @@ -2,18 +2,6 @@
- - - - - - - - - - - - @@ -39,7 +27,18 @@ - + + + + + + + + + + + + diff --git a/src/views/dataManage/deviceData/listNoiseData.vue b/src/views/dataManage/deviceData/listNoiseData.vue index fd909d9..1a87421 100644 --- a/src/views/dataManage/deviceData/listNoiseData.vue +++ b/src/views/dataManage/deviceData/listNoiseData.vue @@ -2,14 +2,11 @@
- + - - - - 搜索 + + + + 搜索
diff --git a/src/views/dataManage/deviceData/listWaterData.vue b/src/views/dataManage/deviceData/listWaterData.vue index 571557a..558af5f 100644 --- a/src/views/dataManage/deviceData/listWaterData.vue +++ b/src/views/dataManage/deviceData/listWaterData.vue @@ -4,7 +4,6 @@ @@ -22,6 +22,7 @@ v-model="listQuery.areaId" :need-top="false" :dept-show="true" + size="small" placeholder="区域" /> @@ -84,6 +85,9 @@ @@ -105,6 +109,7 @@ />
+
@@ -115,10 +120,11 @@ import { parseUrl } from '@/utils/parseutils' import WatchSevenDay from './watchSevenDay' import AreaSelectTree from '@/components/AreaSelect/areaSelectTree' +import WaterHistory from "./waterHistory"; export default { name: 'ListWaterData', - components: { AreaSelectTree, WatchSevenDay, DeptSelect, selectTree }, + components: {WaterHistory, AreaSelectTree, WatchSevenDay, DeptSelect, selectTree }, data() { return { listQuery: { @@ -215,6 +221,7 @@ listLoading: true, // 加载动画 fullscreenLoading: false, // 全屏加载动画 dialogFormVisible: false, + waterHistoryShow: false, editShow: false, // 是否显示编辑框 detailShow: false, // 是否显示编辑框 deptShowTop: false @@ -291,6 +298,10 @@ this.dialogFormVisible = true this.$refs.watchsevenday.initDialog(this.dialogFormVisible, row) }, + openData(row){ + this.waterHistoryShow = true + this.$refs.waterHistory.initDialog(this.waterHistoryShow, row) + }, // 获取液位配置数据 fetchData(isNowPage = true) { this.listLoading = true diff --git a/src/views/dataManage/deviceData/watchSevenDay.vue b/src/views/dataManage/deviceData/watchSevenDay.vue index c418589..a6a47ad 100644 --- a/src/views/dataManage/deviceData/watchSevenDay.vue +++ b/src/views/dataManage/deviceData/watchSevenDay.vue @@ -15,18 +15,20 @@
- +
- +
- - - + + + + +
@@ -40,13 +42,6 @@ export default { name: 'WatchSevenDay', data() { - this.chartSettings = { - labelMap: { - 'alarmTimes': '用水量' - }, - metrics: ['alarmTimes'], - dimension: ['date'] - } return { loading: true, loading1: true, @@ -64,13 +59,28 @@ endTime: '' }, chartData: { - columns: ['date', 'alarmTimes'], + columns: ['time', 'value'], rows: [] }, chartData1: { - columns: ['date', 'alarmTimes'], + columns: ['uptime', 'total'], rows: [] - } + }, + chartSettings: { + labelMap: { + 'value': '用水量' + }, + metrics: ['value'], + dimension: ['time'] + }, + chartSettings1: { + labelMap: { + 'total': '总用水量' + }, + metrics: ['total'], + dimension: ['uptime'] + }, + } }, watch: { @@ -117,7 +127,7 @@ } .lineDialog .el-table th{ color: white !important; - background-color: #488f7d !important; + background-color: #52a4fa !important; } diff --git a/src/api/dashboard.js b/src/api/dashboard.js index 8c8bfd5..aaadb23 100644 --- a/src/api/dashboard.js +++ b/src/api/dashboard.js @@ -83,19 +83,17 @@ // 用水事记查询 export function getNoteList() { return request({ - // url: '/note/list', - url: 'waterMeterData/count', - method: 'get', - params + url: '/note/list', + method: 'get' }) } // 用水事记更新 -export function updateNoteList(params) { +export function updateNoteList(data) { return request({ - // url: '/note/update', - url: 'waterMeterData/count', + url: '/note/edit', + // url: 'waterMeterData/count', method: 'post', - params + data }) } diff --git a/src/components/BigData/Card1/index.vue b/src/components/BigData/Card1/index.vue index aa46454..722c24c 100644 --- a/src/components/BigData/Card1/index.vue +++ b/src/components/BigData/Card1/index.vue @@ -4,7 +4,7 @@
-
+
- - - - - - - - + + + + + + + +
@@ -67,15 +76,18 @@ import editRule from '@/views/alarmRule/components/editRule' import { getDeviceType } from '@/api/device' import { getAlarmRuleList, delAlarmRule } from '@/api/alarmRule' +import AreaSelectTree from "@/components/AreaSelect/areaSelectTree"; export default { name: 'ListRule', - components: { editRule, infoWell }, + components: { editRule, infoWell, AreaSelectTree }, data() { return { listQuery: { keywords: '', status: '', + deviceType:'', + areaId:'', offset: 1, limit: 20, sort: '', @@ -114,6 +126,11 @@ align: 'center' }, { + text: '预警上限', + value: 'warnValue', + align: 'center' + }, + { text: '操作人', value: 'user', width: 100, @@ -131,7 +148,7 @@ } }, created() { - this.fetchDeviceType()// 获取部门树 + this.fetchDeviceType()// 获取设备类型 this.fetchData()// 获取数据 }, methods: { @@ -198,7 +215,7 @@ this.deviceTypeList = [] const supportDeviceTypes = this.$store.getters.deviceTypes for (const item of response.data) { - if (supportDeviceTypes.indexOf(item.value) !== -1 && (item.value === '2' || item.value === '6')) { + if (supportDeviceTypes.indexOf(item.value) !== -1 && (item.value === '2' || item.value === '8' || item.value === '13')) { this.deviceTypeList.push(item) } } diff --git a/src/views/alarmRule/editRule.vue b/src/views/alarmRule/editRule.vue deleted file mode 100644 index d39eb05..0000000 --- a/src/views/alarmRule/editRule.vue +++ /dev/null @@ -1,232 +0,0 @@ - - - - - diff --git a/src/views/dashboard/components/FunctionArea.vue b/src/views/dashboard/components/FunctionArea.vue index 9ab2e01..7ba2031 100644 --- a/src/views/dashboard/components/FunctionArea.vue +++ b/src/views/dashboard/components/FunctionArea.vue @@ -20,7 +20,7 @@ value-format="yyyy-MM-dd" size="mini" style="width:250px;margin-right: 20px" - @change="change"/> + @change="change('other')"/>
diff --git a/src/views/dashboard/components/PanelGroup.vue b/src/views/dashboard/components/PanelGroup.vue index 7be90a7..48fa7d2 100644 --- a/src/views/dashboard/components/PanelGroup.vue +++ b/src/views/dashboard/components/PanelGroup.vue @@ -34,7 +34,7 @@ { title: ['总用水量', '本月用水量'], context: ['--', '--'], - icon: 'icon-water', + icon: '', color: '#40c9c6', unit: '吨', index: 0 @@ -101,8 +101,8 @@ getWater() { // 用水量 getWatchStatistic().then(response => { - this.dataGroup1[0].context = [response.data.total?parseFloat(response.data.total).toFixed(0):'--', response.data.month?parseFloat(response.data.month).toFixed(0):'--'] - this.dataGroup1[1].context = [response.data.today?parseFloat(response.data.today).toFixed(0):'--', response.data.production?parseFloat(response.data.production).toFixed(0):'--'] + this.dataGroup1[0].context = [response.data.total?parseFloat(response.data.total).toFixed(2):'--', response.data.month?parseFloat(response.data.month).toFixed(2):'--'] + this.dataGroup1[1].context = [response.data.today?parseFloat(response.data.today).toFixed(2):'--', response.data.prodution?parseFloat(response.data.prodution).toFixed(2):'--'] this.dataGroup1[2].context = [response.data.sound?Number(response.data.sound).toFixed(2):'--'] }) diff --git a/src/views/dashboard/components/waterCompare.vue b/src/views/dashboard/components/waterCompare.vue index b06d288..9cc5ca6 100644 --- a/src/views/dashboard/components/waterCompare.vue +++ b/src/views/dashboard/components/waterCompare.vue @@ -82,7 +82,7 @@ fetchData(timeRange,type) { const params = { areaId: '110000', - type: type, + type: type?type:'other', startTime: timeRange[0], endTime: timeRange[1] } diff --git a/src/views/dashboard/components/waterNote.vue b/src/views/dashboard/components/waterNote.vue index a4ff85d..24cd67f 100644 --- a/src/views/dashboard/components/waterNote.vue +++ b/src/views/dashboard/components/waterNote.vue @@ -58,17 +58,17 @@ methods: { // 获取统计数据 fetchData() { - this.currentList = [ - { 'content': '测试文本测试文本测试文本测试文本测试文本测试文本测试文本测试', 'num': 1 }, - { 'content': '测试文本测试文本测试文本测试文本测试文本测试文本测试文本测试', 'num': 1 }, - { 'content': '测试文本测试文本测试文本测试文本测试文本测试文本测试文本测试', 'num': 1 }, - { 'content': '测试文本测试文本测试文本测试文本测试文本测试文本测试文本测试', 'num': 1 }, - { 'content': '测试文本测试文本测试文本测试文本测试文本测试文本测试文本测试', 'num': 1 } - ] - this.originList = JSON.parse(JSON.stringify(this.currentList)) - // getNoteList().then(response => { - // this.currentList = response.data - // }) + // this.currentList = [ + // { 'content': '测试文本测试文本测试文本测试文本测试文本测试文本测试文本测试', 'num': 1 }, + // { 'content': '测试文本测试文本测试文本测试文本测试文本测试文本测试文本测试', 'num': 1 }, + // { 'content': '测试文本测试文本测试文本测试文本测试文本测试文本测试文本测试', 'num': 1 }, + // { 'content': '测试文本测试文本测试文本测试文本测试文本测试文本测试文本测试', 'num': 1 }, + // { 'content': '测试文本测试文本测试文本测试文本测试文本测试文本测试文本测试', 'num': 1 } + // ] + // this.originList = JSON.parse(JSON.stringify(this.currentList)) + getNoteList().then(response => { + this.currentList = JSON.parse(response.data) + }) }, toTop(index){ this.currentList[index-1] = this.currentList.splice(index,1,this.currentList[index-1])[0] @@ -109,6 +109,12 @@ height: 428px; display: flex; flex-direction: column; + .title{ + font-weight: bolder; + font-size: 18px; + font-family: sans-serif; + color: #333; + } .content-div{ height: 410px; .content-line{ diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue index 6403977..b562719 100644 --- a/src/views/dashboard/index.vue +++ b/src/views/dashboard/index.vue @@ -2,18 +2,6 @@
- - - - - - - - - - - - @@ -39,7 +27,18 @@ - + + + + + + + + + + + + diff --git a/src/views/dataManage/deviceData/listNoiseData.vue b/src/views/dataManage/deviceData/listNoiseData.vue index fd909d9..1a87421 100644 --- a/src/views/dataManage/deviceData/listNoiseData.vue +++ b/src/views/dataManage/deviceData/listNoiseData.vue @@ -2,14 +2,11 @@
- + - - - - 搜索 + + + + 搜索
diff --git a/src/views/dataManage/deviceData/listWaterData.vue b/src/views/dataManage/deviceData/listWaterData.vue index 571557a..558af5f 100644 --- a/src/views/dataManage/deviceData/listWaterData.vue +++ b/src/views/dataManage/deviceData/listWaterData.vue @@ -4,7 +4,6 @@ @@ -22,6 +22,7 @@ v-model="listQuery.areaId" :need-top="false" :dept-show="true" + size="small" placeholder="区域" /> @@ -84,6 +85,9 @@ @@ -105,6 +109,7 @@ />
+
@@ -115,10 +120,11 @@ import { parseUrl } from '@/utils/parseutils' import WatchSevenDay from './watchSevenDay' import AreaSelectTree from '@/components/AreaSelect/areaSelectTree' +import WaterHistory from "./waterHistory"; export default { name: 'ListWaterData', - components: { AreaSelectTree, WatchSevenDay, DeptSelect, selectTree }, + components: {WaterHistory, AreaSelectTree, WatchSevenDay, DeptSelect, selectTree }, data() { return { listQuery: { @@ -215,6 +221,7 @@ listLoading: true, // 加载动画 fullscreenLoading: false, // 全屏加载动画 dialogFormVisible: false, + waterHistoryShow: false, editShow: false, // 是否显示编辑框 detailShow: false, // 是否显示编辑框 deptShowTop: false @@ -291,6 +298,10 @@ this.dialogFormVisible = true this.$refs.watchsevenday.initDialog(this.dialogFormVisible, row) }, + openData(row){ + this.waterHistoryShow = true + this.$refs.waterHistory.initDialog(this.waterHistoryShow, row) + }, // 获取液位配置数据 fetchData(isNowPage = true) { this.listLoading = true diff --git a/src/views/dataManage/deviceData/watchSevenDay.vue b/src/views/dataManage/deviceData/watchSevenDay.vue index c418589..a6a47ad 100644 --- a/src/views/dataManage/deviceData/watchSevenDay.vue +++ b/src/views/dataManage/deviceData/watchSevenDay.vue @@ -15,18 +15,20 @@
- +
- +
- - - + + + + +
@@ -40,13 +42,6 @@ export default { name: 'WatchSevenDay', data() { - this.chartSettings = { - labelMap: { - 'alarmTimes': '用水量' - }, - metrics: ['alarmTimes'], - dimension: ['date'] - } return { loading: true, loading1: true, @@ -64,13 +59,28 @@ endTime: '' }, chartData: { - columns: ['date', 'alarmTimes'], + columns: ['time', 'value'], rows: [] }, chartData1: { - columns: ['date', 'alarmTimes'], + columns: ['uptime', 'total'], rows: [] - } + }, + chartSettings: { + labelMap: { + 'value': '用水量' + }, + metrics: ['value'], + dimension: ['time'] + }, + chartSettings1: { + labelMap: { + 'total': '总用水量' + }, + metrics: ['total'], + dimension: ['uptime'] + }, + } }, watch: { @@ -117,7 +127,7 @@ } .lineDialog .el-table th{ color: white !important; - background-color: #488f7d !important; + background-color: #52a4fa !important; } diff --git a/src/views/dataManage/deviceData/waterHistory.vue b/src/views/dataManage/deviceData/waterHistory.vue new file mode 100644 index 0000000..1017a94 --- /dev/null +++ b/src/views/dataManage/deviceData/waterHistory.vue @@ -0,0 +1,91 @@ + + + + diff --git a/src/api/dashboard.js b/src/api/dashboard.js index 8c8bfd5..aaadb23 100644 --- a/src/api/dashboard.js +++ b/src/api/dashboard.js @@ -83,19 +83,17 @@ // 用水事记查询 export function getNoteList() { return request({ - // url: '/note/list', - url: 'waterMeterData/count', - method: 'get', - params + url: '/note/list', + method: 'get' }) } // 用水事记更新 -export function updateNoteList(params) { +export function updateNoteList(data) { return request({ - // url: '/note/update', - url: 'waterMeterData/count', + url: '/note/edit', + // url: 'waterMeterData/count', method: 'post', - params + data }) } diff --git a/src/components/BigData/Card1/index.vue b/src/components/BigData/Card1/index.vue index aa46454..722c24c 100644 --- a/src/components/BigData/Card1/index.vue +++ b/src/components/BigData/Card1/index.vue @@ -4,7 +4,7 @@
-
+
- - - - - - - - + + + + + + + +
@@ -67,15 +76,18 @@ import editRule from '@/views/alarmRule/components/editRule' import { getDeviceType } from '@/api/device' import { getAlarmRuleList, delAlarmRule } from '@/api/alarmRule' +import AreaSelectTree from "@/components/AreaSelect/areaSelectTree"; export default { name: 'ListRule', - components: { editRule, infoWell }, + components: { editRule, infoWell, AreaSelectTree }, data() { return { listQuery: { keywords: '', status: '', + deviceType:'', + areaId:'', offset: 1, limit: 20, sort: '', @@ -114,6 +126,11 @@ align: 'center' }, { + text: '预警上限', + value: 'warnValue', + align: 'center' + }, + { text: '操作人', value: 'user', width: 100, @@ -131,7 +148,7 @@ } }, created() { - this.fetchDeviceType()// 获取部门树 + this.fetchDeviceType()// 获取设备类型 this.fetchData()// 获取数据 }, methods: { @@ -198,7 +215,7 @@ this.deviceTypeList = [] const supportDeviceTypes = this.$store.getters.deviceTypes for (const item of response.data) { - if (supportDeviceTypes.indexOf(item.value) !== -1 && (item.value === '2' || item.value === '6')) { + if (supportDeviceTypes.indexOf(item.value) !== -1 && (item.value === '2' || item.value === '8' || item.value === '13')) { this.deviceTypeList.push(item) } } diff --git a/src/views/alarmRule/editRule.vue b/src/views/alarmRule/editRule.vue deleted file mode 100644 index d39eb05..0000000 --- a/src/views/alarmRule/editRule.vue +++ /dev/null @@ -1,232 +0,0 @@ - - - - - diff --git a/src/views/dashboard/components/FunctionArea.vue b/src/views/dashboard/components/FunctionArea.vue index 9ab2e01..7ba2031 100644 --- a/src/views/dashboard/components/FunctionArea.vue +++ b/src/views/dashboard/components/FunctionArea.vue @@ -20,7 +20,7 @@ value-format="yyyy-MM-dd" size="mini" style="width:250px;margin-right: 20px" - @change="change"/> + @change="change('other')"/>
diff --git a/src/views/dashboard/components/PanelGroup.vue b/src/views/dashboard/components/PanelGroup.vue index 7be90a7..48fa7d2 100644 --- a/src/views/dashboard/components/PanelGroup.vue +++ b/src/views/dashboard/components/PanelGroup.vue @@ -34,7 +34,7 @@ { title: ['总用水量', '本月用水量'], context: ['--', '--'], - icon: 'icon-water', + icon: '', color: '#40c9c6', unit: '吨', index: 0 @@ -101,8 +101,8 @@ getWater() { // 用水量 getWatchStatistic().then(response => { - this.dataGroup1[0].context = [response.data.total?parseFloat(response.data.total).toFixed(0):'--', response.data.month?parseFloat(response.data.month).toFixed(0):'--'] - this.dataGroup1[1].context = [response.data.today?parseFloat(response.data.today).toFixed(0):'--', response.data.production?parseFloat(response.data.production).toFixed(0):'--'] + this.dataGroup1[0].context = [response.data.total?parseFloat(response.data.total).toFixed(2):'--', response.data.month?parseFloat(response.data.month).toFixed(2):'--'] + this.dataGroup1[1].context = [response.data.today?parseFloat(response.data.today).toFixed(2):'--', response.data.prodution?parseFloat(response.data.prodution).toFixed(2):'--'] this.dataGroup1[2].context = [response.data.sound?Number(response.data.sound).toFixed(2):'--'] }) diff --git a/src/views/dashboard/components/waterCompare.vue b/src/views/dashboard/components/waterCompare.vue index b06d288..9cc5ca6 100644 --- a/src/views/dashboard/components/waterCompare.vue +++ b/src/views/dashboard/components/waterCompare.vue @@ -82,7 +82,7 @@ fetchData(timeRange,type) { const params = { areaId: '110000', - type: type, + type: type?type:'other', startTime: timeRange[0], endTime: timeRange[1] } diff --git a/src/views/dashboard/components/waterNote.vue b/src/views/dashboard/components/waterNote.vue index a4ff85d..24cd67f 100644 --- a/src/views/dashboard/components/waterNote.vue +++ b/src/views/dashboard/components/waterNote.vue @@ -58,17 +58,17 @@ methods: { // 获取统计数据 fetchData() { - this.currentList = [ - { 'content': '测试文本测试文本测试文本测试文本测试文本测试文本测试文本测试', 'num': 1 }, - { 'content': '测试文本测试文本测试文本测试文本测试文本测试文本测试文本测试', 'num': 1 }, - { 'content': '测试文本测试文本测试文本测试文本测试文本测试文本测试文本测试', 'num': 1 }, - { 'content': '测试文本测试文本测试文本测试文本测试文本测试文本测试文本测试', 'num': 1 }, - { 'content': '测试文本测试文本测试文本测试文本测试文本测试文本测试文本测试', 'num': 1 } - ] - this.originList = JSON.parse(JSON.stringify(this.currentList)) - // getNoteList().then(response => { - // this.currentList = response.data - // }) + // this.currentList = [ + // { 'content': '测试文本测试文本测试文本测试文本测试文本测试文本测试文本测试', 'num': 1 }, + // { 'content': '测试文本测试文本测试文本测试文本测试文本测试文本测试文本测试', 'num': 1 }, + // { 'content': '测试文本测试文本测试文本测试文本测试文本测试文本测试文本测试', 'num': 1 }, + // { 'content': '测试文本测试文本测试文本测试文本测试文本测试文本测试文本测试', 'num': 1 }, + // { 'content': '测试文本测试文本测试文本测试文本测试文本测试文本测试文本测试', 'num': 1 } + // ] + // this.originList = JSON.parse(JSON.stringify(this.currentList)) + getNoteList().then(response => { + this.currentList = JSON.parse(response.data) + }) }, toTop(index){ this.currentList[index-1] = this.currentList.splice(index,1,this.currentList[index-1])[0] @@ -109,6 +109,12 @@ height: 428px; display: flex; flex-direction: column; + .title{ + font-weight: bolder; + font-size: 18px; + font-family: sans-serif; + color: #333; + } .content-div{ height: 410px; .content-line{ diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue index 6403977..b562719 100644 --- a/src/views/dashboard/index.vue +++ b/src/views/dashboard/index.vue @@ -2,18 +2,6 @@
- - - - - - - - - - - - @@ -39,7 +27,18 @@ - + + + + + + + + + + + + diff --git a/src/views/dataManage/deviceData/listNoiseData.vue b/src/views/dataManage/deviceData/listNoiseData.vue index fd909d9..1a87421 100644 --- a/src/views/dataManage/deviceData/listNoiseData.vue +++ b/src/views/dataManage/deviceData/listNoiseData.vue @@ -2,14 +2,11 @@
- + - - - - 搜索 + + + + 搜索
diff --git a/src/views/dataManage/deviceData/listWaterData.vue b/src/views/dataManage/deviceData/listWaterData.vue index 571557a..558af5f 100644 --- a/src/views/dataManage/deviceData/listWaterData.vue +++ b/src/views/dataManage/deviceData/listWaterData.vue @@ -4,7 +4,6 @@ @@ -22,6 +22,7 @@ v-model="listQuery.areaId" :need-top="false" :dept-show="true" + size="small" placeholder="区域" /> @@ -84,6 +85,9 @@ @@ -105,6 +109,7 @@ />
+
@@ -115,10 +120,11 @@ import { parseUrl } from '@/utils/parseutils' import WatchSevenDay from './watchSevenDay' import AreaSelectTree from '@/components/AreaSelect/areaSelectTree' +import WaterHistory from "./waterHistory"; export default { name: 'ListWaterData', - components: { AreaSelectTree, WatchSevenDay, DeptSelect, selectTree }, + components: {WaterHistory, AreaSelectTree, WatchSevenDay, DeptSelect, selectTree }, data() { return { listQuery: { @@ -215,6 +221,7 @@ listLoading: true, // 加载动画 fullscreenLoading: false, // 全屏加载动画 dialogFormVisible: false, + waterHistoryShow: false, editShow: false, // 是否显示编辑框 detailShow: false, // 是否显示编辑框 deptShowTop: false @@ -291,6 +298,10 @@ this.dialogFormVisible = true this.$refs.watchsevenday.initDialog(this.dialogFormVisible, row) }, + openData(row){ + this.waterHistoryShow = true + this.$refs.waterHistory.initDialog(this.waterHistoryShow, row) + }, // 获取液位配置数据 fetchData(isNowPage = true) { this.listLoading = true diff --git a/src/views/dataManage/deviceData/watchSevenDay.vue b/src/views/dataManage/deviceData/watchSevenDay.vue index c418589..a6a47ad 100644 --- a/src/views/dataManage/deviceData/watchSevenDay.vue +++ b/src/views/dataManage/deviceData/watchSevenDay.vue @@ -15,18 +15,20 @@
- +
- +
- - - + + + + +
@@ -40,13 +42,6 @@ export default { name: 'WatchSevenDay', data() { - this.chartSettings = { - labelMap: { - 'alarmTimes': '用水量' - }, - metrics: ['alarmTimes'], - dimension: ['date'] - } return { loading: true, loading1: true, @@ -64,13 +59,28 @@ endTime: '' }, chartData: { - columns: ['date', 'alarmTimes'], + columns: ['time', 'value'], rows: [] }, chartData1: { - columns: ['date', 'alarmTimes'], + columns: ['uptime', 'total'], rows: [] - } + }, + chartSettings: { + labelMap: { + 'value': '用水量' + }, + metrics: ['value'], + dimension: ['time'] + }, + chartSettings1: { + labelMap: { + 'total': '总用水量' + }, + metrics: ['total'], + dimension: ['uptime'] + }, + } }, watch: { @@ -117,7 +127,7 @@ } .lineDialog .el-table th{ color: white !important; - background-color: #488f7d !important; + background-color: #52a4fa !important; } diff --git a/src/views/dataManage/deviceData/waterHistory.vue b/src/views/dataManage/deviceData/waterHistory.vue new file mode 100644 index 0000000..1017a94 --- /dev/null +++ b/src/views/dataManage/deviceData/waterHistory.vue @@ -0,0 +1,91 @@ + + + + diff --git a/src/views/deviceManage/listDevice.vue b/src/views/deviceManage/listDevice.vue index 545a949..a48e580 100644 --- a/src/views/deviceManage/listDevice.vue +++ b/src/views/deviceManage/listDevice.vue @@ -133,6 +133,7 @@ { text: '设备编号', value: 'devcode', + width: 120, align: 'center' }, // { @@ -154,7 +155,7 @@ { text: '设备位置', value: 'position', - width: 140, + // width: 180, align: 'center' }, // { @@ -172,7 +173,8 @@ text: '井编号', value: 'wellCode', align: 'center', - type: 'Button' + type: 'Button', + width: 110 }, { text: '关联集中器编号', diff --git a/src/api/dashboard.js b/src/api/dashboard.js index 8c8bfd5..aaadb23 100644 --- a/src/api/dashboard.js +++ b/src/api/dashboard.js @@ -83,19 +83,17 @@ // 用水事记查询 export function getNoteList() { return request({ - // url: '/note/list', - url: 'waterMeterData/count', - method: 'get', - params + url: '/note/list', + method: 'get' }) } // 用水事记更新 -export function updateNoteList(params) { +export function updateNoteList(data) { return request({ - // url: '/note/update', - url: 'waterMeterData/count', + url: '/note/edit', + // url: 'waterMeterData/count', method: 'post', - params + data }) } diff --git a/src/components/BigData/Card1/index.vue b/src/components/BigData/Card1/index.vue index aa46454..722c24c 100644 --- a/src/components/BigData/Card1/index.vue +++ b/src/components/BigData/Card1/index.vue @@ -4,7 +4,7 @@
-
+
- - - - - - - - + + + + + + + +
@@ -67,15 +76,18 @@ import editRule from '@/views/alarmRule/components/editRule' import { getDeviceType } from '@/api/device' import { getAlarmRuleList, delAlarmRule } from '@/api/alarmRule' +import AreaSelectTree from "@/components/AreaSelect/areaSelectTree"; export default { name: 'ListRule', - components: { editRule, infoWell }, + components: { editRule, infoWell, AreaSelectTree }, data() { return { listQuery: { keywords: '', status: '', + deviceType:'', + areaId:'', offset: 1, limit: 20, sort: '', @@ -114,6 +126,11 @@ align: 'center' }, { + text: '预警上限', + value: 'warnValue', + align: 'center' + }, + { text: '操作人', value: 'user', width: 100, @@ -131,7 +148,7 @@ } }, created() { - this.fetchDeviceType()// 获取部门树 + this.fetchDeviceType()// 获取设备类型 this.fetchData()// 获取数据 }, methods: { @@ -198,7 +215,7 @@ this.deviceTypeList = [] const supportDeviceTypes = this.$store.getters.deviceTypes for (const item of response.data) { - if (supportDeviceTypes.indexOf(item.value) !== -1 && (item.value === '2' || item.value === '6')) { + if (supportDeviceTypes.indexOf(item.value) !== -1 && (item.value === '2' || item.value === '8' || item.value === '13')) { this.deviceTypeList.push(item) } } diff --git a/src/views/alarmRule/editRule.vue b/src/views/alarmRule/editRule.vue deleted file mode 100644 index d39eb05..0000000 --- a/src/views/alarmRule/editRule.vue +++ /dev/null @@ -1,232 +0,0 @@ - - - - - diff --git a/src/views/dashboard/components/FunctionArea.vue b/src/views/dashboard/components/FunctionArea.vue index 9ab2e01..7ba2031 100644 --- a/src/views/dashboard/components/FunctionArea.vue +++ b/src/views/dashboard/components/FunctionArea.vue @@ -20,7 +20,7 @@ value-format="yyyy-MM-dd" size="mini" style="width:250px;margin-right: 20px" - @change="change"/> + @change="change('other')"/>
diff --git a/src/views/dashboard/components/PanelGroup.vue b/src/views/dashboard/components/PanelGroup.vue index 7be90a7..48fa7d2 100644 --- a/src/views/dashboard/components/PanelGroup.vue +++ b/src/views/dashboard/components/PanelGroup.vue @@ -34,7 +34,7 @@ { title: ['总用水量', '本月用水量'], context: ['--', '--'], - icon: 'icon-water', + icon: '', color: '#40c9c6', unit: '吨', index: 0 @@ -101,8 +101,8 @@ getWater() { // 用水量 getWatchStatistic().then(response => { - this.dataGroup1[0].context = [response.data.total?parseFloat(response.data.total).toFixed(0):'--', response.data.month?parseFloat(response.data.month).toFixed(0):'--'] - this.dataGroup1[1].context = [response.data.today?parseFloat(response.data.today).toFixed(0):'--', response.data.production?parseFloat(response.data.production).toFixed(0):'--'] + this.dataGroup1[0].context = [response.data.total?parseFloat(response.data.total).toFixed(2):'--', response.data.month?parseFloat(response.data.month).toFixed(2):'--'] + this.dataGroup1[1].context = [response.data.today?parseFloat(response.data.today).toFixed(2):'--', response.data.prodution?parseFloat(response.data.prodution).toFixed(2):'--'] this.dataGroup1[2].context = [response.data.sound?Number(response.data.sound).toFixed(2):'--'] }) diff --git a/src/views/dashboard/components/waterCompare.vue b/src/views/dashboard/components/waterCompare.vue index b06d288..9cc5ca6 100644 --- a/src/views/dashboard/components/waterCompare.vue +++ b/src/views/dashboard/components/waterCompare.vue @@ -82,7 +82,7 @@ fetchData(timeRange,type) { const params = { areaId: '110000', - type: type, + type: type?type:'other', startTime: timeRange[0], endTime: timeRange[1] } diff --git a/src/views/dashboard/components/waterNote.vue b/src/views/dashboard/components/waterNote.vue index a4ff85d..24cd67f 100644 --- a/src/views/dashboard/components/waterNote.vue +++ b/src/views/dashboard/components/waterNote.vue @@ -58,17 +58,17 @@ methods: { // 获取统计数据 fetchData() { - this.currentList = [ - { 'content': '测试文本测试文本测试文本测试文本测试文本测试文本测试文本测试', 'num': 1 }, - { 'content': '测试文本测试文本测试文本测试文本测试文本测试文本测试文本测试', 'num': 1 }, - { 'content': '测试文本测试文本测试文本测试文本测试文本测试文本测试文本测试', 'num': 1 }, - { 'content': '测试文本测试文本测试文本测试文本测试文本测试文本测试文本测试', 'num': 1 }, - { 'content': '测试文本测试文本测试文本测试文本测试文本测试文本测试文本测试', 'num': 1 } - ] - this.originList = JSON.parse(JSON.stringify(this.currentList)) - // getNoteList().then(response => { - // this.currentList = response.data - // }) + // this.currentList = [ + // { 'content': '测试文本测试文本测试文本测试文本测试文本测试文本测试文本测试', 'num': 1 }, + // { 'content': '测试文本测试文本测试文本测试文本测试文本测试文本测试文本测试', 'num': 1 }, + // { 'content': '测试文本测试文本测试文本测试文本测试文本测试文本测试文本测试', 'num': 1 }, + // { 'content': '测试文本测试文本测试文本测试文本测试文本测试文本测试文本测试', 'num': 1 }, + // { 'content': '测试文本测试文本测试文本测试文本测试文本测试文本测试文本测试', 'num': 1 } + // ] + // this.originList = JSON.parse(JSON.stringify(this.currentList)) + getNoteList().then(response => { + this.currentList = JSON.parse(response.data) + }) }, toTop(index){ this.currentList[index-1] = this.currentList.splice(index,1,this.currentList[index-1])[0] @@ -109,6 +109,12 @@ height: 428px; display: flex; flex-direction: column; + .title{ + font-weight: bolder; + font-size: 18px; + font-family: sans-serif; + color: #333; + } .content-div{ height: 410px; .content-line{ diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue index 6403977..b562719 100644 --- a/src/views/dashboard/index.vue +++ b/src/views/dashboard/index.vue @@ -2,18 +2,6 @@
- - - - - - - - - - - - @@ -39,7 +27,18 @@ - + + + + + + + + + + + + diff --git a/src/views/dataManage/deviceData/listNoiseData.vue b/src/views/dataManage/deviceData/listNoiseData.vue index fd909d9..1a87421 100644 --- a/src/views/dataManage/deviceData/listNoiseData.vue +++ b/src/views/dataManage/deviceData/listNoiseData.vue @@ -2,14 +2,11 @@
- + - - - - 搜索 + + + + 搜索
diff --git a/src/views/dataManage/deviceData/listWaterData.vue b/src/views/dataManage/deviceData/listWaterData.vue index 571557a..558af5f 100644 --- a/src/views/dataManage/deviceData/listWaterData.vue +++ b/src/views/dataManage/deviceData/listWaterData.vue @@ -4,7 +4,6 @@ @@ -22,6 +22,7 @@ v-model="listQuery.areaId" :need-top="false" :dept-show="true" + size="small" placeholder="区域" /> @@ -84,6 +85,9 @@ @@ -105,6 +109,7 @@ />
+
@@ -115,10 +120,11 @@ import { parseUrl } from '@/utils/parseutils' import WatchSevenDay from './watchSevenDay' import AreaSelectTree from '@/components/AreaSelect/areaSelectTree' +import WaterHistory from "./waterHistory"; export default { name: 'ListWaterData', - components: { AreaSelectTree, WatchSevenDay, DeptSelect, selectTree }, + components: {WaterHistory, AreaSelectTree, WatchSevenDay, DeptSelect, selectTree }, data() { return { listQuery: { @@ -215,6 +221,7 @@ listLoading: true, // 加载动画 fullscreenLoading: false, // 全屏加载动画 dialogFormVisible: false, + waterHistoryShow: false, editShow: false, // 是否显示编辑框 detailShow: false, // 是否显示编辑框 deptShowTop: false @@ -291,6 +298,10 @@ this.dialogFormVisible = true this.$refs.watchsevenday.initDialog(this.dialogFormVisible, row) }, + openData(row){ + this.waterHistoryShow = true + this.$refs.waterHistory.initDialog(this.waterHistoryShow, row) + }, // 获取液位配置数据 fetchData(isNowPage = true) { this.listLoading = true diff --git a/src/views/dataManage/deviceData/watchSevenDay.vue b/src/views/dataManage/deviceData/watchSevenDay.vue index c418589..a6a47ad 100644 --- a/src/views/dataManage/deviceData/watchSevenDay.vue +++ b/src/views/dataManage/deviceData/watchSevenDay.vue @@ -15,18 +15,20 @@
- +
- +
- - - + + + + +
@@ -40,13 +42,6 @@ export default { name: 'WatchSevenDay', data() { - this.chartSettings = { - labelMap: { - 'alarmTimes': '用水量' - }, - metrics: ['alarmTimes'], - dimension: ['date'] - } return { loading: true, loading1: true, @@ -64,13 +59,28 @@ endTime: '' }, chartData: { - columns: ['date', 'alarmTimes'], + columns: ['time', 'value'], rows: [] }, chartData1: { - columns: ['date', 'alarmTimes'], + columns: ['uptime', 'total'], rows: [] - } + }, + chartSettings: { + labelMap: { + 'value': '用水量' + }, + metrics: ['value'], + dimension: ['time'] + }, + chartSettings1: { + labelMap: { + 'total': '总用水量' + }, + metrics: ['total'], + dimension: ['uptime'] + }, + } }, watch: { @@ -117,7 +127,7 @@ } .lineDialog .el-table th{ color: white !important; - background-color: #488f7d !important; + background-color: #52a4fa !important; } diff --git a/src/views/dataManage/deviceData/waterHistory.vue b/src/views/dataManage/deviceData/waterHistory.vue new file mode 100644 index 0000000..1017a94 --- /dev/null +++ b/src/views/dataManage/deviceData/waterHistory.vue @@ -0,0 +1,91 @@ + + + + diff --git a/src/views/deviceManage/listDevice.vue b/src/views/deviceManage/listDevice.vue index 545a949..a48e580 100644 --- a/src/views/deviceManage/listDevice.vue +++ b/src/views/deviceManage/listDevice.vue @@ -133,6 +133,7 @@ { text: '设备编号', value: 'devcode', + width: 120, align: 'center' }, // { @@ -154,7 +155,7 @@ { text: '设备位置', value: 'position', - width: 140, + // width: 180, align: 'center' }, // { @@ -172,7 +173,8 @@ text: '井编号', value: 'wellCode', align: 'center', - type: 'Button' + type: 'Button', + width: 110 }, { text: '关联集中器编号', diff --git a/src/views/wellManage/addWell.vue b/src/views/wellManage/addWell.vue index 6abb8d6..6765449 100644 --- a/src/views/wellManage/addWell.vue +++ b/src/views/wellManage/addWell.vue @@ -106,7 +106,7 @@ accept=".jpg,.jpeg,.png " list-type="picture-card" > - +
- +
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + - + + + + + + + + + + + + + + + - + @@ -193,7 +187,7 @@ - 重置 + 重置 - diff --git a/src/api/dashboard.js b/src/api/dashboard.js index 8c8bfd5..aaadb23 100644 --- a/src/api/dashboard.js +++ b/src/api/dashboard.js @@ -83,19 +83,17 @@ // 用水事记查询 export function getNoteList() { return request({ - // url: '/note/list', - url: 'waterMeterData/count', - method: 'get', - params + url: '/note/list', + method: 'get' }) } // 用水事记更新 -export function updateNoteList(params) { +export function updateNoteList(data) { return request({ - // url: '/note/update', - url: 'waterMeterData/count', + url: '/note/edit', + // url: 'waterMeterData/count', method: 'post', - params + data }) } diff --git a/src/components/BigData/Card1/index.vue b/src/components/BigData/Card1/index.vue index aa46454..722c24c 100644 --- a/src/components/BigData/Card1/index.vue +++ b/src/components/BigData/Card1/index.vue @@ -4,7 +4,7 @@
-
+
- - - - - - - - + + + + + + + +
@@ -67,15 +76,18 @@ import editRule from '@/views/alarmRule/components/editRule' import { getDeviceType } from '@/api/device' import { getAlarmRuleList, delAlarmRule } from '@/api/alarmRule' +import AreaSelectTree from "@/components/AreaSelect/areaSelectTree"; export default { name: 'ListRule', - components: { editRule, infoWell }, + components: { editRule, infoWell, AreaSelectTree }, data() { return { listQuery: { keywords: '', status: '', + deviceType:'', + areaId:'', offset: 1, limit: 20, sort: '', @@ -114,6 +126,11 @@ align: 'center' }, { + text: '预警上限', + value: 'warnValue', + align: 'center' + }, + { text: '操作人', value: 'user', width: 100, @@ -131,7 +148,7 @@ } }, created() { - this.fetchDeviceType()// 获取部门树 + this.fetchDeviceType()// 获取设备类型 this.fetchData()// 获取数据 }, methods: { @@ -198,7 +215,7 @@ this.deviceTypeList = [] const supportDeviceTypes = this.$store.getters.deviceTypes for (const item of response.data) { - if (supportDeviceTypes.indexOf(item.value) !== -1 && (item.value === '2' || item.value === '6')) { + if (supportDeviceTypes.indexOf(item.value) !== -1 && (item.value === '2' || item.value === '8' || item.value === '13')) { this.deviceTypeList.push(item) } } diff --git a/src/views/alarmRule/editRule.vue b/src/views/alarmRule/editRule.vue deleted file mode 100644 index d39eb05..0000000 --- a/src/views/alarmRule/editRule.vue +++ /dev/null @@ -1,232 +0,0 @@ - - - - - diff --git a/src/views/dashboard/components/FunctionArea.vue b/src/views/dashboard/components/FunctionArea.vue index 9ab2e01..7ba2031 100644 --- a/src/views/dashboard/components/FunctionArea.vue +++ b/src/views/dashboard/components/FunctionArea.vue @@ -20,7 +20,7 @@ value-format="yyyy-MM-dd" size="mini" style="width:250px;margin-right: 20px" - @change="change"/> + @change="change('other')"/>
diff --git a/src/views/dashboard/components/PanelGroup.vue b/src/views/dashboard/components/PanelGroup.vue index 7be90a7..48fa7d2 100644 --- a/src/views/dashboard/components/PanelGroup.vue +++ b/src/views/dashboard/components/PanelGroup.vue @@ -34,7 +34,7 @@ { title: ['总用水量', '本月用水量'], context: ['--', '--'], - icon: 'icon-water', + icon: '', color: '#40c9c6', unit: '吨', index: 0 @@ -101,8 +101,8 @@ getWater() { // 用水量 getWatchStatistic().then(response => { - this.dataGroup1[0].context = [response.data.total?parseFloat(response.data.total).toFixed(0):'--', response.data.month?parseFloat(response.data.month).toFixed(0):'--'] - this.dataGroup1[1].context = [response.data.today?parseFloat(response.data.today).toFixed(0):'--', response.data.production?parseFloat(response.data.production).toFixed(0):'--'] + this.dataGroup1[0].context = [response.data.total?parseFloat(response.data.total).toFixed(2):'--', response.data.month?parseFloat(response.data.month).toFixed(2):'--'] + this.dataGroup1[1].context = [response.data.today?parseFloat(response.data.today).toFixed(2):'--', response.data.prodution?parseFloat(response.data.prodution).toFixed(2):'--'] this.dataGroup1[2].context = [response.data.sound?Number(response.data.sound).toFixed(2):'--'] }) diff --git a/src/views/dashboard/components/waterCompare.vue b/src/views/dashboard/components/waterCompare.vue index b06d288..9cc5ca6 100644 --- a/src/views/dashboard/components/waterCompare.vue +++ b/src/views/dashboard/components/waterCompare.vue @@ -82,7 +82,7 @@ fetchData(timeRange,type) { const params = { areaId: '110000', - type: type, + type: type?type:'other', startTime: timeRange[0], endTime: timeRange[1] } diff --git a/src/views/dashboard/components/waterNote.vue b/src/views/dashboard/components/waterNote.vue index a4ff85d..24cd67f 100644 --- a/src/views/dashboard/components/waterNote.vue +++ b/src/views/dashboard/components/waterNote.vue @@ -58,17 +58,17 @@ methods: { // 获取统计数据 fetchData() { - this.currentList = [ - { 'content': '测试文本测试文本测试文本测试文本测试文本测试文本测试文本测试', 'num': 1 }, - { 'content': '测试文本测试文本测试文本测试文本测试文本测试文本测试文本测试', 'num': 1 }, - { 'content': '测试文本测试文本测试文本测试文本测试文本测试文本测试文本测试', 'num': 1 }, - { 'content': '测试文本测试文本测试文本测试文本测试文本测试文本测试文本测试', 'num': 1 }, - { 'content': '测试文本测试文本测试文本测试文本测试文本测试文本测试文本测试', 'num': 1 } - ] - this.originList = JSON.parse(JSON.stringify(this.currentList)) - // getNoteList().then(response => { - // this.currentList = response.data - // }) + // this.currentList = [ + // { 'content': '测试文本测试文本测试文本测试文本测试文本测试文本测试文本测试', 'num': 1 }, + // { 'content': '测试文本测试文本测试文本测试文本测试文本测试文本测试文本测试', 'num': 1 }, + // { 'content': '测试文本测试文本测试文本测试文本测试文本测试文本测试文本测试', 'num': 1 }, + // { 'content': '测试文本测试文本测试文本测试文本测试文本测试文本测试文本测试', 'num': 1 }, + // { 'content': '测试文本测试文本测试文本测试文本测试文本测试文本测试文本测试', 'num': 1 } + // ] + // this.originList = JSON.parse(JSON.stringify(this.currentList)) + getNoteList().then(response => { + this.currentList = JSON.parse(response.data) + }) }, toTop(index){ this.currentList[index-1] = this.currentList.splice(index,1,this.currentList[index-1])[0] @@ -109,6 +109,12 @@ height: 428px; display: flex; flex-direction: column; + .title{ + font-weight: bolder; + font-size: 18px; + font-family: sans-serif; + color: #333; + } .content-div{ height: 410px; .content-line{ diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue index 6403977..b562719 100644 --- a/src/views/dashboard/index.vue +++ b/src/views/dashboard/index.vue @@ -2,18 +2,6 @@
- - - - - - - - - - - - @@ -39,7 +27,18 @@ - + + + + + + + + + + + + diff --git a/src/views/dataManage/deviceData/listNoiseData.vue b/src/views/dataManage/deviceData/listNoiseData.vue index fd909d9..1a87421 100644 --- a/src/views/dataManage/deviceData/listNoiseData.vue +++ b/src/views/dataManage/deviceData/listNoiseData.vue @@ -2,14 +2,11 @@
- + - - - - 搜索 + + + + 搜索
diff --git a/src/views/dataManage/deviceData/listWaterData.vue b/src/views/dataManage/deviceData/listWaterData.vue index 571557a..558af5f 100644 --- a/src/views/dataManage/deviceData/listWaterData.vue +++ b/src/views/dataManage/deviceData/listWaterData.vue @@ -4,7 +4,6 @@ @@ -22,6 +22,7 @@ v-model="listQuery.areaId" :need-top="false" :dept-show="true" + size="small" placeholder="区域" /> @@ -84,6 +85,9 @@ @@ -105,6 +109,7 @@ />
+
@@ -115,10 +120,11 @@ import { parseUrl } from '@/utils/parseutils' import WatchSevenDay from './watchSevenDay' import AreaSelectTree from '@/components/AreaSelect/areaSelectTree' +import WaterHistory from "./waterHistory"; export default { name: 'ListWaterData', - components: { AreaSelectTree, WatchSevenDay, DeptSelect, selectTree }, + components: {WaterHistory, AreaSelectTree, WatchSevenDay, DeptSelect, selectTree }, data() { return { listQuery: { @@ -215,6 +221,7 @@ listLoading: true, // 加载动画 fullscreenLoading: false, // 全屏加载动画 dialogFormVisible: false, + waterHistoryShow: false, editShow: false, // 是否显示编辑框 detailShow: false, // 是否显示编辑框 deptShowTop: false @@ -291,6 +298,10 @@ this.dialogFormVisible = true this.$refs.watchsevenday.initDialog(this.dialogFormVisible, row) }, + openData(row){ + this.waterHistoryShow = true + this.$refs.waterHistory.initDialog(this.waterHistoryShow, row) + }, // 获取液位配置数据 fetchData(isNowPage = true) { this.listLoading = true diff --git a/src/views/dataManage/deviceData/watchSevenDay.vue b/src/views/dataManage/deviceData/watchSevenDay.vue index c418589..a6a47ad 100644 --- a/src/views/dataManage/deviceData/watchSevenDay.vue +++ b/src/views/dataManage/deviceData/watchSevenDay.vue @@ -15,18 +15,20 @@
- +
- +
- - - + + + + +
@@ -40,13 +42,6 @@ export default { name: 'WatchSevenDay', data() { - this.chartSettings = { - labelMap: { - 'alarmTimes': '用水量' - }, - metrics: ['alarmTimes'], - dimension: ['date'] - } return { loading: true, loading1: true, @@ -64,13 +59,28 @@ endTime: '' }, chartData: { - columns: ['date', 'alarmTimes'], + columns: ['time', 'value'], rows: [] }, chartData1: { - columns: ['date', 'alarmTimes'], + columns: ['uptime', 'total'], rows: [] - } + }, + chartSettings: { + labelMap: { + 'value': '用水量' + }, + metrics: ['value'], + dimension: ['time'] + }, + chartSettings1: { + labelMap: { + 'total': '总用水量' + }, + metrics: ['total'], + dimension: ['uptime'] + }, + } }, watch: { @@ -117,7 +127,7 @@ } .lineDialog .el-table th{ color: white !important; - background-color: #488f7d !important; + background-color: #52a4fa !important; } diff --git a/src/views/dataManage/deviceData/waterHistory.vue b/src/views/dataManage/deviceData/waterHistory.vue new file mode 100644 index 0000000..1017a94 --- /dev/null +++ b/src/views/dataManage/deviceData/waterHistory.vue @@ -0,0 +1,91 @@ + + + + diff --git a/src/views/deviceManage/listDevice.vue b/src/views/deviceManage/listDevice.vue index 545a949..a48e580 100644 --- a/src/views/deviceManage/listDevice.vue +++ b/src/views/deviceManage/listDevice.vue @@ -133,6 +133,7 @@ { text: '设备编号', value: 'devcode', + width: 120, align: 'center' }, // { @@ -154,7 +155,7 @@ { text: '设备位置', value: 'position', - width: 140, + // width: 180, align: 'center' }, // { @@ -172,7 +173,8 @@ text: '井编号', value: 'wellCode', align: 'center', - type: 'Button' + type: 'Button', + width: 110 }, { text: '关联集中器编号', diff --git a/src/views/wellManage/addWell.vue b/src/views/wellManage/addWell.vue index 6abb8d6..6765449 100644 --- a/src/views/wellManage/addWell.vue +++ b/src/views/wellManage/addWell.vue @@ -106,7 +106,7 @@ accept=".jpg,.jpeg,.png " list-type="picture-card" > - +
- +
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + - + + + + + + + + + + + + + + + - + @@ -193,7 +187,7 @@ - 重置 + 重置 - diff --git a/src/views/wellManage/editWell.vue b/src/views/wellManage/editWell.vue index 9079847..a259516 100644 --- a/src/views/wellManage/editWell.vue +++ b/src/views/wellManage/editWell.vue @@ -172,10 +172,10 @@ --> - - + + - @@ -451,7 +450,6 @@ console.log(row, '===---098') this.wellForm = { id: row.id, // 井id - areaId: row.areaId, wellCode: row.wellCode, // 井编号 wellName: row.wellName, // 井名称 wellType: row.wellType, // 井类型 diff --git a/src/api/dashboard.js b/src/api/dashboard.js index 8c8bfd5..aaadb23 100644 --- a/src/api/dashboard.js +++ b/src/api/dashboard.js @@ -83,19 +83,17 @@ // 用水事记查询 export function getNoteList() { return request({ - // url: '/note/list', - url: 'waterMeterData/count', - method: 'get', - params + url: '/note/list', + method: 'get' }) } // 用水事记更新 -export function updateNoteList(params) { +export function updateNoteList(data) { return request({ - // url: '/note/update', - url: 'waterMeterData/count', + url: '/note/edit', + // url: 'waterMeterData/count', method: 'post', - params + data }) } diff --git a/src/components/BigData/Card1/index.vue b/src/components/BigData/Card1/index.vue index aa46454..722c24c 100644 --- a/src/components/BigData/Card1/index.vue +++ b/src/components/BigData/Card1/index.vue @@ -4,7 +4,7 @@
-
+
- - - - - - - - + + + + + + + +
@@ -67,15 +76,18 @@ import editRule from '@/views/alarmRule/components/editRule' import { getDeviceType } from '@/api/device' import { getAlarmRuleList, delAlarmRule } from '@/api/alarmRule' +import AreaSelectTree from "@/components/AreaSelect/areaSelectTree"; export default { name: 'ListRule', - components: { editRule, infoWell }, + components: { editRule, infoWell, AreaSelectTree }, data() { return { listQuery: { keywords: '', status: '', + deviceType:'', + areaId:'', offset: 1, limit: 20, sort: '', @@ -114,6 +126,11 @@ align: 'center' }, { + text: '预警上限', + value: 'warnValue', + align: 'center' + }, + { text: '操作人', value: 'user', width: 100, @@ -131,7 +148,7 @@ } }, created() { - this.fetchDeviceType()// 获取部门树 + this.fetchDeviceType()// 获取设备类型 this.fetchData()// 获取数据 }, methods: { @@ -198,7 +215,7 @@ this.deviceTypeList = [] const supportDeviceTypes = this.$store.getters.deviceTypes for (const item of response.data) { - if (supportDeviceTypes.indexOf(item.value) !== -1 && (item.value === '2' || item.value === '6')) { + if (supportDeviceTypes.indexOf(item.value) !== -1 && (item.value === '2' || item.value === '8' || item.value === '13')) { this.deviceTypeList.push(item) } } diff --git a/src/views/alarmRule/editRule.vue b/src/views/alarmRule/editRule.vue deleted file mode 100644 index d39eb05..0000000 --- a/src/views/alarmRule/editRule.vue +++ /dev/null @@ -1,232 +0,0 @@ - - - - - diff --git a/src/views/dashboard/components/FunctionArea.vue b/src/views/dashboard/components/FunctionArea.vue index 9ab2e01..7ba2031 100644 --- a/src/views/dashboard/components/FunctionArea.vue +++ b/src/views/dashboard/components/FunctionArea.vue @@ -20,7 +20,7 @@ value-format="yyyy-MM-dd" size="mini" style="width:250px;margin-right: 20px" - @change="change"/> + @change="change('other')"/>
diff --git a/src/views/dashboard/components/PanelGroup.vue b/src/views/dashboard/components/PanelGroup.vue index 7be90a7..48fa7d2 100644 --- a/src/views/dashboard/components/PanelGroup.vue +++ b/src/views/dashboard/components/PanelGroup.vue @@ -34,7 +34,7 @@ { title: ['总用水量', '本月用水量'], context: ['--', '--'], - icon: 'icon-water', + icon: '', color: '#40c9c6', unit: '吨', index: 0 @@ -101,8 +101,8 @@ getWater() { // 用水量 getWatchStatistic().then(response => { - this.dataGroup1[0].context = [response.data.total?parseFloat(response.data.total).toFixed(0):'--', response.data.month?parseFloat(response.data.month).toFixed(0):'--'] - this.dataGroup1[1].context = [response.data.today?parseFloat(response.data.today).toFixed(0):'--', response.data.production?parseFloat(response.data.production).toFixed(0):'--'] + this.dataGroup1[0].context = [response.data.total?parseFloat(response.data.total).toFixed(2):'--', response.data.month?parseFloat(response.data.month).toFixed(2):'--'] + this.dataGroup1[1].context = [response.data.today?parseFloat(response.data.today).toFixed(2):'--', response.data.prodution?parseFloat(response.data.prodution).toFixed(2):'--'] this.dataGroup1[2].context = [response.data.sound?Number(response.data.sound).toFixed(2):'--'] }) diff --git a/src/views/dashboard/components/waterCompare.vue b/src/views/dashboard/components/waterCompare.vue index b06d288..9cc5ca6 100644 --- a/src/views/dashboard/components/waterCompare.vue +++ b/src/views/dashboard/components/waterCompare.vue @@ -82,7 +82,7 @@ fetchData(timeRange,type) { const params = { areaId: '110000', - type: type, + type: type?type:'other', startTime: timeRange[0], endTime: timeRange[1] } diff --git a/src/views/dashboard/components/waterNote.vue b/src/views/dashboard/components/waterNote.vue index a4ff85d..24cd67f 100644 --- a/src/views/dashboard/components/waterNote.vue +++ b/src/views/dashboard/components/waterNote.vue @@ -58,17 +58,17 @@ methods: { // 获取统计数据 fetchData() { - this.currentList = [ - { 'content': '测试文本测试文本测试文本测试文本测试文本测试文本测试文本测试', 'num': 1 }, - { 'content': '测试文本测试文本测试文本测试文本测试文本测试文本测试文本测试', 'num': 1 }, - { 'content': '测试文本测试文本测试文本测试文本测试文本测试文本测试文本测试', 'num': 1 }, - { 'content': '测试文本测试文本测试文本测试文本测试文本测试文本测试文本测试', 'num': 1 }, - { 'content': '测试文本测试文本测试文本测试文本测试文本测试文本测试文本测试', 'num': 1 } - ] - this.originList = JSON.parse(JSON.stringify(this.currentList)) - // getNoteList().then(response => { - // this.currentList = response.data - // }) + // this.currentList = [ + // { 'content': '测试文本测试文本测试文本测试文本测试文本测试文本测试文本测试', 'num': 1 }, + // { 'content': '测试文本测试文本测试文本测试文本测试文本测试文本测试文本测试', 'num': 1 }, + // { 'content': '测试文本测试文本测试文本测试文本测试文本测试文本测试文本测试', 'num': 1 }, + // { 'content': '测试文本测试文本测试文本测试文本测试文本测试文本测试文本测试', 'num': 1 }, + // { 'content': '测试文本测试文本测试文本测试文本测试文本测试文本测试文本测试', 'num': 1 } + // ] + // this.originList = JSON.parse(JSON.stringify(this.currentList)) + getNoteList().then(response => { + this.currentList = JSON.parse(response.data) + }) }, toTop(index){ this.currentList[index-1] = this.currentList.splice(index,1,this.currentList[index-1])[0] @@ -109,6 +109,12 @@ height: 428px; display: flex; flex-direction: column; + .title{ + font-weight: bolder; + font-size: 18px; + font-family: sans-serif; + color: #333; + } .content-div{ height: 410px; .content-line{ diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue index 6403977..b562719 100644 --- a/src/views/dashboard/index.vue +++ b/src/views/dashboard/index.vue @@ -2,18 +2,6 @@
- - - - - - - - - - - - @@ -39,7 +27,18 @@ - + + + + + + + + + + + + diff --git a/src/views/dataManage/deviceData/listNoiseData.vue b/src/views/dataManage/deviceData/listNoiseData.vue index fd909d9..1a87421 100644 --- a/src/views/dataManage/deviceData/listNoiseData.vue +++ b/src/views/dataManage/deviceData/listNoiseData.vue @@ -2,14 +2,11 @@
- + - - - - 搜索 + + + + 搜索
diff --git a/src/views/dataManage/deviceData/listWaterData.vue b/src/views/dataManage/deviceData/listWaterData.vue index 571557a..558af5f 100644 --- a/src/views/dataManage/deviceData/listWaterData.vue +++ b/src/views/dataManage/deviceData/listWaterData.vue @@ -4,7 +4,6 @@ @@ -22,6 +22,7 @@ v-model="listQuery.areaId" :need-top="false" :dept-show="true" + size="small" placeholder="区域" /> @@ -84,6 +85,9 @@ @@ -105,6 +109,7 @@ />
+
@@ -115,10 +120,11 @@ import { parseUrl } from '@/utils/parseutils' import WatchSevenDay from './watchSevenDay' import AreaSelectTree from '@/components/AreaSelect/areaSelectTree' +import WaterHistory from "./waterHistory"; export default { name: 'ListWaterData', - components: { AreaSelectTree, WatchSevenDay, DeptSelect, selectTree }, + components: {WaterHistory, AreaSelectTree, WatchSevenDay, DeptSelect, selectTree }, data() { return { listQuery: { @@ -215,6 +221,7 @@ listLoading: true, // 加载动画 fullscreenLoading: false, // 全屏加载动画 dialogFormVisible: false, + waterHistoryShow: false, editShow: false, // 是否显示编辑框 detailShow: false, // 是否显示编辑框 deptShowTop: false @@ -291,6 +298,10 @@ this.dialogFormVisible = true this.$refs.watchsevenday.initDialog(this.dialogFormVisible, row) }, + openData(row){ + this.waterHistoryShow = true + this.$refs.waterHistory.initDialog(this.waterHistoryShow, row) + }, // 获取液位配置数据 fetchData(isNowPage = true) { this.listLoading = true diff --git a/src/views/dataManage/deviceData/watchSevenDay.vue b/src/views/dataManage/deviceData/watchSevenDay.vue index c418589..a6a47ad 100644 --- a/src/views/dataManage/deviceData/watchSevenDay.vue +++ b/src/views/dataManage/deviceData/watchSevenDay.vue @@ -15,18 +15,20 @@
- +
- +
- - - + + + + +
@@ -40,13 +42,6 @@ export default { name: 'WatchSevenDay', data() { - this.chartSettings = { - labelMap: { - 'alarmTimes': '用水量' - }, - metrics: ['alarmTimes'], - dimension: ['date'] - } return { loading: true, loading1: true, @@ -64,13 +59,28 @@ endTime: '' }, chartData: { - columns: ['date', 'alarmTimes'], + columns: ['time', 'value'], rows: [] }, chartData1: { - columns: ['date', 'alarmTimes'], + columns: ['uptime', 'total'], rows: [] - } + }, + chartSettings: { + labelMap: { + 'value': '用水量' + }, + metrics: ['value'], + dimension: ['time'] + }, + chartSettings1: { + labelMap: { + 'total': '总用水量' + }, + metrics: ['total'], + dimension: ['uptime'] + }, + } }, watch: { @@ -117,7 +127,7 @@ } .lineDialog .el-table th{ color: white !important; - background-color: #488f7d !important; + background-color: #52a4fa !important; } diff --git a/src/views/dataManage/deviceData/waterHistory.vue b/src/views/dataManage/deviceData/waterHistory.vue new file mode 100644 index 0000000..1017a94 --- /dev/null +++ b/src/views/dataManage/deviceData/waterHistory.vue @@ -0,0 +1,91 @@ + + + + diff --git a/src/views/deviceManage/listDevice.vue b/src/views/deviceManage/listDevice.vue index 545a949..a48e580 100644 --- a/src/views/deviceManage/listDevice.vue +++ b/src/views/deviceManage/listDevice.vue @@ -133,6 +133,7 @@ { text: '设备编号', value: 'devcode', + width: 120, align: 'center' }, // { @@ -154,7 +155,7 @@ { text: '设备位置', value: 'position', - width: 140, + // width: 180, align: 'center' }, // { @@ -172,7 +173,8 @@ text: '井编号', value: 'wellCode', align: 'center', - type: 'Button' + type: 'Button', + width: 110 }, { text: '关联集中器编号', diff --git a/src/views/wellManage/addWell.vue b/src/views/wellManage/addWell.vue index 6abb8d6..6765449 100644 --- a/src/views/wellManage/addWell.vue +++ b/src/views/wellManage/addWell.vue @@ -106,7 +106,7 @@ accept=".jpg,.jpeg,.png " list-type="picture-card" > - +
- +
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + - + + + + + + + + + + + + + + + - + @@ -193,7 +187,7 @@ - 重置 + 重置 - diff --git a/src/views/wellManage/editWell.vue b/src/views/wellManage/editWell.vue index 9079847..a259516 100644 --- a/src/views/wellManage/editWell.vue +++ b/src/views/wellManage/editWell.vue @@ -172,10 +172,10 @@ --> - - + + - @@ -451,7 +450,6 @@ console.log(row, '===---098') this.wellForm = { id: row.id, // 井id - areaId: row.areaId, wellCode: row.wellCode, // 井编号 wellName: row.wellName, // 井名称 wellType: row.wellType, // 井类型 diff --git a/src/views/wellManage/listWell.vue b/src/views/wellManage/listWell.vue index 9e5aed1..f69c45e 100644 --- a/src/views/wellManage/listWell.vue +++ b/src/views/wellManage/listWell.vue @@ -234,6 +234,7 @@ { text: "井编号", value: "wellCode", + width: 110, align: "center", }, { @@ -249,7 +250,12 @@ align: "center", }, { - text: "详细地址", + text: "区域", + value: "areaFullName", + align: "center", + }, + { + text: "位置", value: "position", align: "center", }, @@ -259,11 +265,11 @@ // width: 70, // align: 'center' // }, - { - text: "权属单位", - value: "deptName", - align: "center", - }, + // { + // text: "权属单位", + // value: "deptName", + // align: "center", + // }, { text: "设备数量", value: "deviceCount", diff --git a/src/api/dashboard.js b/src/api/dashboard.js index 8c8bfd5..aaadb23 100644 --- a/src/api/dashboard.js +++ b/src/api/dashboard.js @@ -83,19 +83,17 @@ // 用水事记查询 export function getNoteList() { return request({ - // url: '/note/list', - url: 'waterMeterData/count', - method: 'get', - params + url: '/note/list', + method: 'get' }) } // 用水事记更新 -export function updateNoteList(params) { +export function updateNoteList(data) { return request({ - // url: '/note/update', - url: 'waterMeterData/count', + url: '/note/edit', + // url: 'waterMeterData/count', method: 'post', - params + data }) } diff --git a/src/components/BigData/Card1/index.vue b/src/components/BigData/Card1/index.vue index aa46454..722c24c 100644 --- a/src/components/BigData/Card1/index.vue +++ b/src/components/BigData/Card1/index.vue @@ -4,7 +4,7 @@
-
+
- - - - - - - - + + + + + + + +
@@ -67,15 +76,18 @@ import editRule from '@/views/alarmRule/components/editRule' import { getDeviceType } from '@/api/device' import { getAlarmRuleList, delAlarmRule } from '@/api/alarmRule' +import AreaSelectTree from "@/components/AreaSelect/areaSelectTree"; export default { name: 'ListRule', - components: { editRule, infoWell }, + components: { editRule, infoWell, AreaSelectTree }, data() { return { listQuery: { keywords: '', status: '', + deviceType:'', + areaId:'', offset: 1, limit: 20, sort: '', @@ -114,6 +126,11 @@ align: 'center' }, { + text: '预警上限', + value: 'warnValue', + align: 'center' + }, + { text: '操作人', value: 'user', width: 100, @@ -131,7 +148,7 @@ } }, created() { - this.fetchDeviceType()// 获取部门树 + this.fetchDeviceType()// 获取设备类型 this.fetchData()// 获取数据 }, methods: { @@ -198,7 +215,7 @@ this.deviceTypeList = [] const supportDeviceTypes = this.$store.getters.deviceTypes for (const item of response.data) { - if (supportDeviceTypes.indexOf(item.value) !== -1 && (item.value === '2' || item.value === '6')) { + if (supportDeviceTypes.indexOf(item.value) !== -1 && (item.value === '2' || item.value === '8' || item.value === '13')) { this.deviceTypeList.push(item) } } diff --git a/src/views/alarmRule/editRule.vue b/src/views/alarmRule/editRule.vue deleted file mode 100644 index d39eb05..0000000 --- a/src/views/alarmRule/editRule.vue +++ /dev/null @@ -1,232 +0,0 @@ - - - - - diff --git a/src/views/dashboard/components/FunctionArea.vue b/src/views/dashboard/components/FunctionArea.vue index 9ab2e01..7ba2031 100644 --- a/src/views/dashboard/components/FunctionArea.vue +++ b/src/views/dashboard/components/FunctionArea.vue @@ -20,7 +20,7 @@ value-format="yyyy-MM-dd" size="mini" style="width:250px;margin-right: 20px" - @change="change"/> + @change="change('other')"/>
diff --git a/src/views/dashboard/components/PanelGroup.vue b/src/views/dashboard/components/PanelGroup.vue index 7be90a7..48fa7d2 100644 --- a/src/views/dashboard/components/PanelGroup.vue +++ b/src/views/dashboard/components/PanelGroup.vue @@ -34,7 +34,7 @@ { title: ['总用水量', '本月用水量'], context: ['--', '--'], - icon: 'icon-water', + icon: '', color: '#40c9c6', unit: '吨', index: 0 @@ -101,8 +101,8 @@ getWater() { // 用水量 getWatchStatistic().then(response => { - this.dataGroup1[0].context = [response.data.total?parseFloat(response.data.total).toFixed(0):'--', response.data.month?parseFloat(response.data.month).toFixed(0):'--'] - this.dataGroup1[1].context = [response.data.today?parseFloat(response.data.today).toFixed(0):'--', response.data.production?parseFloat(response.data.production).toFixed(0):'--'] + this.dataGroup1[0].context = [response.data.total?parseFloat(response.data.total).toFixed(2):'--', response.data.month?parseFloat(response.data.month).toFixed(2):'--'] + this.dataGroup1[1].context = [response.data.today?parseFloat(response.data.today).toFixed(2):'--', response.data.prodution?parseFloat(response.data.prodution).toFixed(2):'--'] this.dataGroup1[2].context = [response.data.sound?Number(response.data.sound).toFixed(2):'--'] }) diff --git a/src/views/dashboard/components/waterCompare.vue b/src/views/dashboard/components/waterCompare.vue index b06d288..9cc5ca6 100644 --- a/src/views/dashboard/components/waterCompare.vue +++ b/src/views/dashboard/components/waterCompare.vue @@ -82,7 +82,7 @@ fetchData(timeRange,type) { const params = { areaId: '110000', - type: type, + type: type?type:'other', startTime: timeRange[0], endTime: timeRange[1] } diff --git a/src/views/dashboard/components/waterNote.vue b/src/views/dashboard/components/waterNote.vue index a4ff85d..24cd67f 100644 --- a/src/views/dashboard/components/waterNote.vue +++ b/src/views/dashboard/components/waterNote.vue @@ -58,17 +58,17 @@ methods: { // 获取统计数据 fetchData() { - this.currentList = [ - { 'content': '测试文本测试文本测试文本测试文本测试文本测试文本测试文本测试', 'num': 1 }, - { 'content': '测试文本测试文本测试文本测试文本测试文本测试文本测试文本测试', 'num': 1 }, - { 'content': '测试文本测试文本测试文本测试文本测试文本测试文本测试文本测试', 'num': 1 }, - { 'content': '测试文本测试文本测试文本测试文本测试文本测试文本测试文本测试', 'num': 1 }, - { 'content': '测试文本测试文本测试文本测试文本测试文本测试文本测试文本测试', 'num': 1 } - ] - this.originList = JSON.parse(JSON.stringify(this.currentList)) - // getNoteList().then(response => { - // this.currentList = response.data - // }) + // this.currentList = [ + // { 'content': '测试文本测试文本测试文本测试文本测试文本测试文本测试文本测试', 'num': 1 }, + // { 'content': '测试文本测试文本测试文本测试文本测试文本测试文本测试文本测试', 'num': 1 }, + // { 'content': '测试文本测试文本测试文本测试文本测试文本测试文本测试文本测试', 'num': 1 }, + // { 'content': '测试文本测试文本测试文本测试文本测试文本测试文本测试文本测试', 'num': 1 }, + // { 'content': '测试文本测试文本测试文本测试文本测试文本测试文本测试文本测试', 'num': 1 } + // ] + // this.originList = JSON.parse(JSON.stringify(this.currentList)) + getNoteList().then(response => { + this.currentList = JSON.parse(response.data) + }) }, toTop(index){ this.currentList[index-1] = this.currentList.splice(index,1,this.currentList[index-1])[0] @@ -109,6 +109,12 @@ height: 428px; display: flex; flex-direction: column; + .title{ + font-weight: bolder; + font-size: 18px; + font-family: sans-serif; + color: #333; + } .content-div{ height: 410px; .content-line{ diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue index 6403977..b562719 100644 --- a/src/views/dashboard/index.vue +++ b/src/views/dashboard/index.vue @@ -2,18 +2,6 @@
- - - - - - - - - - - - @@ -39,7 +27,18 @@ - + + + + + + + + + + + + diff --git a/src/views/dataManage/deviceData/listNoiseData.vue b/src/views/dataManage/deviceData/listNoiseData.vue index fd909d9..1a87421 100644 --- a/src/views/dataManage/deviceData/listNoiseData.vue +++ b/src/views/dataManage/deviceData/listNoiseData.vue @@ -2,14 +2,11 @@
- + - - - - 搜索 + + + + 搜索
diff --git a/src/views/dataManage/deviceData/listWaterData.vue b/src/views/dataManage/deviceData/listWaterData.vue index 571557a..558af5f 100644 --- a/src/views/dataManage/deviceData/listWaterData.vue +++ b/src/views/dataManage/deviceData/listWaterData.vue @@ -4,7 +4,6 @@ @@ -22,6 +22,7 @@ v-model="listQuery.areaId" :need-top="false" :dept-show="true" + size="small" placeholder="区域" /> @@ -84,6 +85,9 @@ @@ -105,6 +109,7 @@ />
+
@@ -115,10 +120,11 @@ import { parseUrl } from '@/utils/parseutils' import WatchSevenDay from './watchSevenDay' import AreaSelectTree from '@/components/AreaSelect/areaSelectTree' +import WaterHistory from "./waterHistory"; export default { name: 'ListWaterData', - components: { AreaSelectTree, WatchSevenDay, DeptSelect, selectTree }, + components: {WaterHistory, AreaSelectTree, WatchSevenDay, DeptSelect, selectTree }, data() { return { listQuery: { @@ -215,6 +221,7 @@ listLoading: true, // 加载动画 fullscreenLoading: false, // 全屏加载动画 dialogFormVisible: false, + waterHistoryShow: false, editShow: false, // 是否显示编辑框 detailShow: false, // 是否显示编辑框 deptShowTop: false @@ -291,6 +298,10 @@ this.dialogFormVisible = true this.$refs.watchsevenday.initDialog(this.dialogFormVisible, row) }, + openData(row){ + this.waterHistoryShow = true + this.$refs.waterHistory.initDialog(this.waterHistoryShow, row) + }, // 获取液位配置数据 fetchData(isNowPage = true) { this.listLoading = true diff --git a/src/views/dataManage/deviceData/watchSevenDay.vue b/src/views/dataManage/deviceData/watchSevenDay.vue index c418589..a6a47ad 100644 --- a/src/views/dataManage/deviceData/watchSevenDay.vue +++ b/src/views/dataManage/deviceData/watchSevenDay.vue @@ -15,18 +15,20 @@
- +
- +
- - - + + + + +
@@ -40,13 +42,6 @@ export default { name: 'WatchSevenDay', data() { - this.chartSettings = { - labelMap: { - 'alarmTimes': '用水量' - }, - metrics: ['alarmTimes'], - dimension: ['date'] - } return { loading: true, loading1: true, @@ -64,13 +59,28 @@ endTime: '' }, chartData: { - columns: ['date', 'alarmTimes'], + columns: ['time', 'value'], rows: [] }, chartData1: { - columns: ['date', 'alarmTimes'], + columns: ['uptime', 'total'], rows: [] - } + }, + chartSettings: { + labelMap: { + 'value': '用水量' + }, + metrics: ['value'], + dimension: ['time'] + }, + chartSettings1: { + labelMap: { + 'total': '总用水量' + }, + metrics: ['total'], + dimension: ['uptime'] + }, + } }, watch: { @@ -117,7 +127,7 @@ } .lineDialog .el-table th{ color: white !important; - background-color: #488f7d !important; + background-color: #52a4fa !important; } diff --git a/src/views/dataManage/deviceData/waterHistory.vue b/src/views/dataManage/deviceData/waterHistory.vue new file mode 100644 index 0000000..1017a94 --- /dev/null +++ b/src/views/dataManage/deviceData/waterHistory.vue @@ -0,0 +1,91 @@ + + + + diff --git a/src/views/deviceManage/listDevice.vue b/src/views/deviceManage/listDevice.vue index 545a949..a48e580 100644 --- a/src/views/deviceManage/listDevice.vue +++ b/src/views/deviceManage/listDevice.vue @@ -133,6 +133,7 @@ { text: '设备编号', value: 'devcode', + width: 120, align: 'center' }, // { @@ -154,7 +155,7 @@ { text: '设备位置', value: 'position', - width: 140, + // width: 180, align: 'center' }, // { @@ -172,7 +173,8 @@ text: '井编号', value: 'wellCode', align: 'center', - type: 'Button' + type: 'Button', + width: 110 }, { text: '关联集中器编号', diff --git a/src/views/wellManage/addWell.vue b/src/views/wellManage/addWell.vue index 6abb8d6..6765449 100644 --- a/src/views/wellManage/addWell.vue +++ b/src/views/wellManage/addWell.vue @@ -106,7 +106,7 @@ accept=".jpg,.jpeg,.png " list-type="picture-card" > - +
- +
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + - + + + + + + + + + + + + + + + - + @@ -193,7 +187,7 @@ - 重置 + 重置 - diff --git a/src/views/wellManage/editWell.vue b/src/views/wellManage/editWell.vue index 9079847..a259516 100644 --- a/src/views/wellManage/editWell.vue +++ b/src/views/wellManage/editWell.vue @@ -172,10 +172,10 @@ --> - - + + - @@ -451,7 +450,6 @@ console.log(row, '===---098') this.wellForm = { id: row.id, // 井id - areaId: row.areaId, wellCode: row.wellCode, // 井编号 wellName: row.wellName, // 井名称 wellType: row.wellType, // 井类型 diff --git a/src/views/wellManage/listWell.vue b/src/views/wellManage/listWell.vue index 9e5aed1..f69c45e 100644 --- a/src/views/wellManage/listWell.vue +++ b/src/views/wellManage/listWell.vue @@ -234,6 +234,7 @@ { text: "井编号", value: "wellCode", + width: 110, align: "center", }, { @@ -249,7 +250,12 @@ align: "center", }, { - text: "详细地址", + text: "区域", + value: "areaFullName", + align: "center", + }, + { + text: "位置", value: "position", align: "center", }, @@ -259,11 +265,11 @@ // width: 70, // align: 'center' // }, - { - text: "权属单位", - value: "deptName", - align: "center", - }, + // { + // text: "权属单位", + // value: "deptName", + // align: "center", + // }, { text: "设备数量", value: "deviceCount", diff --git a/static/project.config.json b/static/project.config.json index fe03293..d4c4b39 100644 --- a/static/project.config.json +++ b/static/project.config.json @@ -1,5 +1,5 @@ { - "title": "供水管理系统", + "title": "智能供水监控系统", "baseUrl": "http://111.198.10.15:20104/", "mainPage": "http://111.198.10.15:11404/dcms/#", "singleSys": true,