diff --git a/mock/system/user.js b/mock/system/user.js index 41fd42d..ecb871f 100644 --- a/mock/system/user.js +++ b/mock/system/user.js @@ -207,7 +207,7 @@ { 'code': 'nbdevice_add', 'icon': '', 'id': '1138694871019384833', 'ismenu': '0', 'levels': 11, 'name': 'NB设备注册', 'num': 0, 'parentId': '1138694597554958338', 'resourceType': '04', 'url': '/nbdevice/add' }, { 'code': 'job_handlejob', 'icon': '', 'id': '1138701026445717506', 'ismenu': '0', 'levels': 11, 'name': '处理设备异常', 'num': 0, 'parentId': '1138699051712868353', 'resourceType': '04', 'url': '/job/handleJob' }, { 'code': 'nbdevice_delete', 'icon': '', 'id': '1138695159369396226', 'ismenu': '0', 'levels': 11, 'name': '注册信息删除', 'num': 0, 'parentId': '1138694597554958338', 'resourceType': '04', 'url': '/nbdevice/delete' }, - { 'code': 'overview_wellinfo', 'icon': '', 'id': '1138701638772158466', 'ismenu': '0', 'levels': 11, 'name': '闸井详情', 'num': 0, 'parentId': '1138701347507105794', 'resourceType': '04', 'url': '/overview/wellInfo' }, + { 'code': 'overview_wellinfo', 'icon': '', 'id': '1138701638772158466', 'ismenu': '0', 'levels': 11, 'name': '点位详情', 'num': 0, 'parentId': '1138701347507105794', 'resourceType': '04', 'url': '/overview/wellInfo' }, { 'code': 'alarm_list', 'icon': '', 'id': '1138696931051794434', 'ismenu': '1', 'levels': 11, 'name': '告警记录', 'num': 0, 'parentId': '1138696443757555713', 'resourceType': '03', 'url': '/alarm/list' }, { 'code': 'alarm_export', 'icon': '', 'id': '1138697500676026369', 'ismenu': '0', 'levels': 11, 'name': '导出告警记录', 'num': 0, 'parentId': '1138696443757555713', 'resourceType': '04', 'url': '/alarm/export' }, { 'code': 'device_type', 'icon': '', 'id': '1138678482233683970', 'ismenu': '0', 'levels': 11, 'name': '获取设备类型', 'num': 0, 'parentId': '1138378119630761985', 'resourceType': '04', 'url': '/device/type' }, diff --git a/mock/system/user.js b/mock/system/user.js index 41fd42d..ecb871f 100644 --- a/mock/system/user.js +++ b/mock/system/user.js @@ -207,7 +207,7 @@ { 'code': 'nbdevice_add', 'icon': '', 'id': '1138694871019384833', 'ismenu': '0', 'levels': 11, 'name': 'NB设备注册', 'num': 0, 'parentId': '1138694597554958338', 'resourceType': '04', 'url': '/nbdevice/add' }, { 'code': 'job_handlejob', 'icon': '', 'id': '1138701026445717506', 'ismenu': '0', 'levels': 11, 'name': '处理设备异常', 'num': 0, 'parentId': '1138699051712868353', 'resourceType': '04', 'url': '/job/handleJob' }, { 'code': 'nbdevice_delete', 'icon': '', 'id': '1138695159369396226', 'ismenu': '0', 'levels': 11, 'name': '注册信息删除', 'num': 0, 'parentId': '1138694597554958338', 'resourceType': '04', 'url': '/nbdevice/delete' }, - { 'code': 'overview_wellinfo', 'icon': '', 'id': '1138701638772158466', 'ismenu': '0', 'levels': 11, 'name': '闸井详情', 'num': 0, 'parentId': '1138701347507105794', 'resourceType': '04', 'url': '/overview/wellInfo' }, + { 'code': 'overview_wellinfo', 'icon': '', 'id': '1138701638772158466', 'ismenu': '0', 'levels': 11, 'name': '点位详情', 'num': 0, 'parentId': '1138701347507105794', 'resourceType': '04', 'url': '/overview/wellInfo' }, { 'code': 'alarm_list', 'icon': '', 'id': '1138696931051794434', 'ismenu': '1', 'levels': 11, 'name': '告警记录', 'num': 0, 'parentId': '1138696443757555713', 'resourceType': '03', 'url': '/alarm/list' }, { 'code': 'alarm_export', 'icon': '', 'id': '1138697500676026369', 'ismenu': '0', 'levels': 11, 'name': '导出告警记录', 'num': 0, 'parentId': '1138696443757555713', 'resourceType': '04', 'url': '/alarm/export' }, { 'code': 'device_type', 'icon': '', 'id': '1138678482233683970', 'ismenu': '0', 'levels': 11, 'name': '获取设备类型', 'num': 0, 'parentId': '1138378119630761985', 'resourceType': '04', 'url': '/device/type' }, diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue index f50de80..0a1cae5 100644 --- a/src/views/alarmManage/listAlarmNow.vue +++ b/src/views/alarmManage/listAlarmNow.vue @@ -381,7 +381,8 @@ getAlarmContentType(this.listQuery.alarmType).then(response => { const supportDeviceTypes = this.$store.getters.deviceTypes for (const item of response.data.list) { - if (supportDeviceTypes.indexOf(item.deviceType) !== -1) { + const deviceType = '' + item.deviceType + if (supportDeviceTypes.indexOf(deviceType) !== -1) { this.alarmContentTypeList.push(item) } } diff --git a/mock/system/user.js b/mock/system/user.js index 41fd42d..ecb871f 100644 --- a/mock/system/user.js +++ b/mock/system/user.js @@ -207,7 +207,7 @@ { 'code': 'nbdevice_add', 'icon': '', 'id': '1138694871019384833', 'ismenu': '0', 'levels': 11, 'name': 'NB设备注册', 'num': 0, 'parentId': '1138694597554958338', 'resourceType': '04', 'url': '/nbdevice/add' }, { 'code': 'job_handlejob', 'icon': '', 'id': '1138701026445717506', 'ismenu': '0', 'levels': 11, 'name': '处理设备异常', 'num': 0, 'parentId': '1138699051712868353', 'resourceType': '04', 'url': '/job/handleJob' }, { 'code': 'nbdevice_delete', 'icon': '', 'id': '1138695159369396226', 'ismenu': '0', 'levels': 11, 'name': '注册信息删除', 'num': 0, 'parentId': '1138694597554958338', 'resourceType': '04', 'url': '/nbdevice/delete' }, - { 'code': 'overview_wellinfo', 'icon': '', 'id': '1138701638772158466', 'ismenu': '0', 'levels': 11, 'name': '闸井详情', 'num': 0, 'parentId': '1138701347507105794', 'resourceType': '04', 'url': '/overview/wellInfo' }, + { 'code': 'overview_wellinfo', 'icon': '', 'id': '1138701638772158466', 'ismenu': '0', 'levels': 11, 'name': '点位详情', 'num': 0, 'parentId': '1138701347507105794', 'resourceType': '04', 'url': '/overview/wellInfo' }, { 'code': 'alarm_list', 'icon': '', 'id': '1138696931051794434', 'ismenu': '1', 'levels': 11, 'name': '告警记录', 'num': 0, 'parentId': '1138696443757555713', 'resourceType': '03', 'url': '/alarm/list' }, { 'code': 'alarm_export', 'icon': '', 'id': '1138697500676026369', 'ismenu': '0', 'levels': 11, 'name': '导出告警记录', 'num': 0, 'parentId': '1138696443757555713', 'resourceType': '04', 'url': '/alarm/export' }, { 'code': 'device_type', 'icon': '', 'id': '1138678482233683970', 'ismenu': '0', 'levels': 11, 'name': '获取设备类型', 'num': 0, 'parentId': '1138378119630761985', 'resourceType': '04', 'url': '/device/type' }, diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue index f50de80..0a1cae5 100644 --- a/src/views/alarmManage/listAlarmNow.vue +++ b/src/views/alarmManage/listAlarmNow.vue @@ -381,7 +381,8 @@ getAlarmContentType(this.listQuery.alarmType).then(response => { const supportDeviceTypes = this.$store.getters.deviceTypes for (const item of response.data.list) { - if (supportDeviceTypes.indexOf(item.deviceType) !== -1) { + const deviceType = '' + item.deviceType + if (supportDeviceTypes.indexOf(deviceType) !== -1) { this.alarmContentTypeList.push(item) } } diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue index 873e7be..a41440b 100644 --- a/src/views/alarmManage/listAlarmRecords.vue +++ b/src/views/alarmManage/listAlarmRecords.vue @@ -346,7 +346,8 @@ getAlarmContentType(this.listQuery.alarmType).then(response => { const supportDeviceTypes = this.$store.getters.deviceTypes for (const item of response.data.list) { - if (supportDeviceTypes.indexOf(item.deviceType) !== -1) { + const deviceType = '' + item.deviceType + if (supportDeviceTypes.indexOf(deviceType) !== -1) { this.alarmContentTypeList.push(item) } } diff --git a/mock/system/user.js b/mock/system/user.js index 41fd42d..ecb871f 100644 --- a/mock/system/user.js +++ b/mock/system/user.js @@ -207,7 +207,7 @@ { 'code': 'nbdevice_add', 'icon': '', 'id': '1138694871019384833', 'ismenu': '0', 'levels': 11, 'name': 'NB设备注册', 'num': 0, 'parentId': '1138694597554958338', 'resourceType': '04', 'url': '/nbdevice/add' }, { 'code': 'job_handlejob', 'icon': '', 'id': '1138701026445717506', 'ismenu': '0', 'levels': 11, 'name': '处理设备异常', 'num': 0, 'parentId': '1138699051712868353', 'resourceType': '04', 'url': '/job/handleJob' }, { 'code': 'nbdevice_delete', 'icon': '', 'id': '1138695159369396226', 'ismenu': '0', 'levels': 11, 'name': '注册信息删除', 'num': 0, 'parentId': '1138694597554958338', 'resourceType': '04', 'url': '/nbdevice/delete' }, - { 'code': 'overview_wellinfo', 'icon': '', 'id': '1138701638772158466', 'ismenu': '0', 'levels': 11, 'name': '闸井详情', 'num': 0, 'parentId': '1138701347507105794', 'resourceType': '04', 'url': '/overview/wellInfo' }, + { 'code': 'overview_wellinfo', 'icon': '', 'id': '1138701638772158466', 'ismenu': '0', 'levels': 11, 'name': '点位详情', 'num': 0, 'parentId': '1138701347507105794', 'resourceType': '04', 'url': '/overview/wellInfo' }, { 'code': 'alarm_list', 'icon': '', 'id': '1138696931051794434', 'ismenu': '1', 'levels': 11, 'name': '告警记录', 'num': 0, 'parentId': '1138696443757555713', 'resourceType': '03', 'url': '/alarm/list' }, { 'code': 'alarm_export', 'icon': '', 'id': '1138697500676026369', 'ismenu': '0', 'levels': 11, 'name': '导出告警记录', 'num': 0, 'parentId': '1138696443757555713', 'resourceType': '04', 'url': '/alarm/export' }, { 'code': 'device_type', 'icon': '', 'id': '1138678482233683970', 'ismenu': '0', 'levels': 11, 'name': '获取设备类型', 'num': 0, 'parentId': '1138378119630761985', 'resourceType': '04', 'url': '/device/type' }, diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue index f50de80..0a1cae5 100644 --- a/src/views/alarmManage/listAlarmNow.vue +++ b/src/views/alarmManage/listAlarmNow.vue @@ -381,7 +381,8 @@ getAlarmContentType(this.listQuery.alarmType).then(response => { const supportDeviceTypes = this.$store.getters.deviceTypes for (const item of response.data.list) { - if (supportDeviceTypes.indexOf(item.deviceType) !== -1) { + const deviceType = '' + item.deviceType + if (supportDeviceTypes.indexOf(deviceType) !== -1) { this.alarmContentTypeList.push(item) } } diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue index 873e7be..a41440b 100644 --- a/src/views/alarmManage/listAlarmRecords.vue +++ b/src/views/alarmManage/listAlarmRecords.vue @@ -346,7 +346,8 @@ getAlarmContentType(this.listQuery.alarmType).then(response => { const supportDeviceTypes = this.$store.getters.deviceTypes for (const item of response.data.list) { - if (supportDeviceTypes.indexOf(item.deviceType) !== -1) { + const deviceType = '' + item.deviceType + if (supportDeviceTypes.indexOf(deviceType) !== -1) { this.alarmContentTypeList.push(item) } } diff --git a/src/views/dashboard/components/DeviceCountByRoad.vue b/src/views/dashboard/components/DeviceCountByRoad.vue new file mode 100644 index 0000000..481152e --- /dev/null +++ b/src/views/dashboard/components/DeviceCountByRoad.vue @@ -0,0 +1,87 @@ + + + + diff --git a/mock/system/user.js b/mock/system/user.js index 41fd42d..ecb871f 100644 --- a/mock/system/user.js +++ b/mock/system/user.js @@ -207,7 +207,7 @@ { 'code': 'nbdevice_add', 'icon': '', 'id': '1138694871019384833', 'ismenu': '0', 'levels': 11, 'name': 'NB设备注册', 'num': 0, 'parentId': '1138694597554958338', 'resourceType': '04', 'url': '/nbdevice/add' }, { 'code': 'job_handlejob', 'icon': '', 'id': '1138701026445717506', 'ismenu': '0', 'levels': 11, 'name': '处理设备异常', 'num': 0, 'parentId': '1138699051712868353', 'resourceType': '04', 'url': '/job/handleJob' }, { 'code': 'nbdevice_delete', 'icon': '', 'id': '1138695159369396226', 'ismenu': '0', 'levels': 11, 'name': '注册信息删除', 'num': 0, 'parentId': '1138694597554958338', 'resourceType': '04', 'url': '/nbdevice/delete' }, - { 'code': 'overview_wellinfo', 'icon': '', 'id': '1138701638772158466', 'ismenu': '0', 'levels': 11, 'name': '闸井详情', 'num': 0, 'parentId': '1138701347507105794', 'resourceType': '04', 'url': '/overview/wellInfo' }, + { 'code': 'overview_wellinfo', 'icon': '', 'id': '1138701638772158466', 'ismenu': '0', 'levels': 11, 'name': '点位详情', 'num': 0, 'parentId': '1138701347507105794', 'resourceType': '04', 'url': '/overview/wellInfo' }, { 'code': 'alarm_list', 'icon': '', 'id': '1138696931051794434', 'ismenu': '1', 'levels': 11, 'name': '告警记录', 'num': 0, 'parentId': '1138696443757555713', 'resourceType': '03', 'url': '/alarm/list' }, { 'code': 'alarm_export', 'icon': '', 'id': '1138697500676026369', 'ismenu': '0', 'levels': 11, 'name': '导出告警记录', 'num': 0, 'parentId': '1138696443757555713', 'resourceType': '04', 'url': '/alarm/export' }, { 'code': 'device_type', 'icon': '', 'id': '1138678482233683970', 'ismenu': '0', 'levels': 11, 'name': '获取设备类型', 'num': 0, 'parentId': '1138378119630761985', 'resourceType': '04', 'url': '/device/type' }, diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue index f50de80..0a1cae5 100644 --- a/src/views/alarmManage/listAlarmNow.vue +++ b/src/views/alarmManage/listAlarmNow.vue @@ -381,7 +381,8 @@ getAlarmContentType(this.listQuery.alarmType).then(response => { const supportDeviceTypes = this.$store.getters.deviceTypes for (const item of response.data.list) { - if (supportDeviceTypes.indexOf(item.deviceType) !== -1) { + const deviceType = '' + item.deviceType + if (supportDeviceTypes.indexOf(deviceType) !== -1) { this.alarmContentTypeList.push(item) } } diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue index 873e7be..a41440b 100644 --- a/src/views/alarmManage/listAlarmRecords.vue +++ b/src/views/alarmManage/listAlarmRecords.vue @@ -346,7 +346,8 @@ getAlarmContentType(this.listQuery.alarmType).then(response => { const supportDeviceTypes = this.$store.getters.deviceTypes for (const item of response.data.list) { - if (supportDeviceTypes.indexOf(item.deviceType) !== -1) { + const deviceType = '' + item.deviceType + if (supportDeviceTypes.indexOf(deviceType) !== -1) { this.alarmContentTypeList.push(item) } } diff --git a/src/views/dashboard/components/DeviceCountByRoad.vue b/src/views/dashboard/components/DeviceCountByRoad.vue new file mode 100644 index 0000000..481152e --- /dev/null +++ b/src/views/dashboard/components/DeviceCountByRoad.vue @@ -0,0 +1,87 @@ + + + + diff --git a/src/views/dashboard/components/WellCountByBfzt.vue b/src/views/dashboard/components/WellCountByBfzt.vue index bc4991b..f8e7bd5 100644 --- a/src/views/dashboard/components/WellCountByBfzt.vue +++ b/src/views/dashboard/components/WellCountByBfzt.vue @@ -14,7 +14,7 @@ this.chartSettings = { labelMap: { 'bfzt': '布防状态', - 'wellCount': '井数量' + 'wellCount': '点位数量' }, dimension: 'bfzt', metrics: 'wellCount' diff --git a/mock/system/user.js b/mock/system/user.js index 41fd42d..ecb871f 100644 --- a/mock/system/user.js +++ b/mock/system/user.js @@ -207,7 +207,7 @@ { 'code': 'nbdevice_add', 'icon': '', 'id': '1138694871019384833', 'ismenu': '0', 'levels': 11, 'name': 'NB设备注册', 'num': 0, 'parentId': '1138694597554958338', 'resourceType': '04', 'url': '/nbdevice/add' }, { 'code': 'job_handlejob', 'icon': '', 'id': '1138701026445717506', 'ismenu': '0', 'levels': 11, 'name': '处理设备异常', 'num': 0, 'parentId': '1138699051712868353', 'resourceType': '04', 'url': '/job/handleJob' }, { 'code': 'nbdevice_delete', 'icon': '', 'id': '1138695159369396226', 'ismenu': '0', 'levels': 11, 'name': '注册信息删除', 'num': 0, 'parentId': '1138694597554958338', 'resourceType': '04', 'url': '/nbdevice/delete' }, - { 'code': 'overview_wellinfo', 'icon': '', 'id': '1138701638772158466', 'ismenu': '0', 'levels': 11, 'name': '闸井详情', 'num': 0, 'parentId': '1138701347507105794', 'resourceType': '04', 'url': '/overview/wellInfo' }, + { 'code': 'overview_wellinfo', 'icon': '', 'id': '1138701638772158466', 'ismenu': '0', 'levels': 11, 'name': '点位详情', 'num': 0, 'parentId': '1138701347507105794', 'resourceType': '04', 'url': '/overview/wellInfo' }, { 'code': 'alarm_list', 'icon': '', 'id': '1138696931051794434', 'ismenu': '1', 'levels': 11, 'name': '告警记录', 'num': 0, 'parentId': '1138696443757555713', 'resourceType': '03', 'url': '/alarm/list' }, { 'code': 'alarm_export', 'icon': '', 'id': '1138697500676026369', 'ismenu': '0', 'levels': 11, 'name': '导出告警记录', 'num': 0, 'parentId': '1138696443757555713', 'resourceType': '04', 'url': '/alarm/export' }, { 'code': 'device_type', 'icon': '', 'id': '1138678482233683970', 'ismenu': '0', 'levels': 11, 'name': '获取设备类型', 'num': 0, 'parentId': '1138378119630761985', 'resourceType': '04', 'url': '/device/type' }, diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue index f50de80..0a1cae5 100644 --- a/src/views/alarmManage/listAlarmNow.vue +++ b/src/views/alarmManage/listAlarmNow.vue @@ -381,7 +381,8 @@ getAlarmContentType(this.listQuery.alarmType).then(response => { const supportDeviceTypes = this.$store.getters.deviceTypes for (const item of response.data.list) { - if (supportDeviceTypes.indexOf(item.deviceType) !== -1) { + const deviceType = '' + item.deviceType + if (supportDeviceTypes.indexOf(deviceType) !== -1) { this.alarmContentTypeList.push(item) } } diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue index 873e7be..a41440b 100644 --- a/src/views/alarmManage/listAlarmRecords.vue +++ b/src/views/alarmManage/listAlarmRecords.vue @@ -346,7 +346,8 @@ getAlarmContentType(this.listQuery.alarmType).then(response => { const supportDeviceTypes = this.$store.getters.deviceTypes for (const item of response.data.list) { - if (supportDeviceTypes.indexOf(item.deviceType) !== -1) { + const deviceType = '' + item.deviceType + if (supportDeviceTypes.indexOf(deviceType) !== -1) { this.alarmContentTypeList.push(item) } } diff --git a/src/views/dashboard/components/DeviceCountByRoad.vue b/src/views/dashboard/components/DeviceCountByRoad.vue new file mode 100644 index 0000000..481152e --- /dev/null +++ b/src/views/dashboard/components/DeviceCountByRoad.vue @@ -0,0 +1,87 @@ + + + + diff --git a/src/views/dashboard/components/WellCountByBfzt.vue b/src/views/dashboard/components/WellCountByBfzt.vue index bc4991b..f8e7bd5 100644 --- a/src/views/dashboard/components/WellCountByBfzt.vue +++ b/src/views/dashboard/components/WellCountByBfzt.vue @@ -14,7 +14,7 @@ this.chartSettings = { labelMap: { 'bfzt': '布防状态', - 'wellCount': '井数量' + 'wellCount': '点位数量' }, dimension: 'bfzt', metrics: 'wellCount' diff --git a/src/views/dashboard/components/WellCountByDept.vue b/src/views/dashboard/components/WellCountByDept.vue new file mode 100644 index 0000000..8c077ef --- /dev/null +++ b/src/views/dashboard/components/WellCountByDept.vue @@ -0,0 +1,55 @@ + + + diff --git a/mock/system/user.js b/mock/system/user.js index 41fd42d..ecb871f 100644 --- a/mock/system/user.js +++ b/mock/system/user.js @@ -207,7 +207,7 @@ { 'code': 'nbdevice_add', 'icon': '', 'id': '1138694871019384833', 'ismenu': '0', 'levels': 11, 'name': 'NB设备注册', 'num': 0, 'parentId': '1138694597554958338', 'resourceType': '04', 'url': '/nbdevice/add' }, { 'code': 'job_handlejob', 'icon': '', 'id': '1138701026445717506', 'ismenu': '0', 'levels': 11, 'name': '处理设备异常', 'num': 0, 'parentId': '1138699051712868353', 'resourceType': '04', 'url': '/job/handleJob' }, { 'code': 'nbdevice_delete', 'icon': '', 'id': '1138695159369396226', 'ismenu': '0', 'levels': 11, 'name': '注册信息删除', 'num': 0, 'parentId': '1138694597554958338', 'resourceType': '04', 'url': '/nbdevice/delete' }, - { 'code': 'overview_wellinfo', 'icon': '', 'id': '1138701638772158466', 'ismenu': '0', 'levels': 11, 'name': '闸井详情', 'num': 0, 'parentId': '1138701347507105794', 'resourceType': '04', 'url': '/overview/wellInfo' }, + { 'code': 'overview_wellinfo', 'icon': '', 'id': '1138701638772158466', 'ismenu': '0', 'levels': 11, 'name': '点位详情', 'num': 0, 'parentId': '1138701347507105794', 'resourceType': '04', 'url': '/overview/wellInfo' }, { 'code': 'alarm_list', 'icon': '', 'id': '1138696931051794434', 'ismenu': '1', 'levels': 11, 'name': '告警记录', 'num': 0, 'parentId': '1138696443757555713', 'resourceType': '03', 'url': '/alarm/list' }, { 'code': 'alarm_export', 'icon': '', 'id': '1138697500676026369', 'ismenu': '0', 'levels': 11, 'name': '导出告警记录', 'num': 0, 'parentId': '1138696443757555713', 'resourceType': '04', 'url': '/alarm/export' }, { 'code': 'device_type', 'icon': '', 'id': '1138678482233683970', 'ismenu': '0', 'levels': 11, 'name': '获取设备类型', 'num': 0, 'parentId': '1138378119630761985', 'resourceType': '04', 'url': '/device/type' }, diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue index f50de80..0a1cae5 100644 --- a/src/views/alarmManage/listAlarmNow.vue +++ b/src/views/alarmManage/listAlarmNow.vue @@ -381,7 +381,8 @@ getAlarmContentType(this.listQuery.alarmType).then(response => { const supportDeviceTypes = this.$store.getters.deviceTypes for (const item of response.data.list) { - if (supportDeviceTypes.indexOf(item.deviceType) !== -1) { + const deviceType = '' + item.deviceType + if (supportDeviceTypes.indexOf(deviceType) !== -1) { this.alarmContentTypeList.push(item) } } diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue index 873e7be..a41440b 100644 --- a/src/views/alarmManage/listAlarmRecords.vue +++ b/src/views/alarmManage/listAlarmRecords.vue @@ -346,7 +346,8 @@ getAlarmContentType(this.listQuery.alarmType).then(response => { const supportDeviceTypes = this.$store.getters.deviceTypes for (const item of response.data.list) { - if (supportDeviceTypes.indexOf(item.deviceType) !== -1) { + const deviceType = '' + item.deviceType + if (supportDeviceTypes.indexOf(deviceType) !== -1) { this.alarmContentTypeList.push(item) } } diff --git a/src/views/dashboard/components/DeviceCountByRoad.vue b/src/views/dashboard/components/DeviceCountByRoad.vue new file mode 100644 index 0000000..481152e --- /dev/null +++ b/src/views/dashboard/components/DeviceCountByRoad.vue @@ -0,0 +1,87 @@ + + + + diff --git a/src/views/dashboard/components/WellCountByBfzt.vue b/src/views/dashboard/components/WellCountByBfzt.vue index bc4991b..f8e7bd5 100644 --- a/src/views/dashboard/components/WellCountByBfzt.vue +++ b/src/views/dashboard/components/WellCountByBfzt.vue @@ -14,7 +14,7 @@ this.chartSettings = { labelMap: { 'bfzt': '布防状态', - 'wellCount': '井数量' + 'wellCount': '点位数量' }, dimension: 'bfzt', metrics: 'wellCount' diff --git a/src/views/dashboard/components/WellCountByDept.vue b/src/views/dashboard/components/WellCountByDept.vue new file mode 100644 index 0000000..8c077ef --- /dev/null +++ b/src/views/dashboard/components/WellCountByDept.vue @@ -0,0 +1,55 @@ + + + diff --git a/src/views/dashboard/components/WellCountByType.vue b/src/views/dashboard/components/WellCountByType.vue index 9d8edd5..189e2f5 100644 --- a/src/views/dashboard/components/WellCountByType.vue +++ b/src/views/dashboard/components/WellCountByType.vue @@ -27,7 +27,7 @@ barWidth: 15, labelMap: { 'wellTypeName': '点位类型', - 'wellCount': '井数量' + 'wellCount': '点位数量' }, dimension: ['wellTypeName'], metrics: ['wellCount'] diff --git a/mock/system/user.js b/mock/system/user.js index 41fd42d..ecb871f 100644 --- a/mock/system/user.js +++ b/mock/system/user.js @@ -207,7 +207,7 @@ { 'code': 'nbdevice_add', 'icon': '', 'id': '1138694871019384833', 'ismenu': '0', 'levels': 11, 'name': 'NB设备注册', 'num': 0, 'parentId': '1138694597554958338', 'resourceType': '04', 'url': '/nbdevice/add' }, { 'code': 'job_handlejob', 'icon': '', 'id': '1138701026445717506', 'ismenu': '0', 'levels': 11, 'name': '处理设备异常', 'num': 0, 'parentId': '1138699051712868353', 'resourceType': '04', 'url': '/job/handleJob' }, { 'code': 'nbdevice_delete', 'icon': '', 'id': '1138695159369396226', 'ismenu': '0', 'levels': 11, 'name': '注册信息删除', 'num': 0, 'parentId': '1138694597554958338', 'resourceType': '04', 'url': '/nbdevice/delete' }, - { 'code': 'overview_wellinfo', 'icon': '', 'id': '1138701638772158466', 'ismenu': '0', 'levels': 11, 'name': '闸井详情', 'num': 0, 'parentId': '1138701347507105794', 'resourceType': '04', 'url': '/overview/wellInfo' }, + { 'code': 'overview_wellinfo', 'icon': '', 'id': '1138701638772158466', 'ismenu': '0', 'levels': 11, 'name': '点位详情', 'num': 0, 'parentId': '1138701347507105794', 'resourceType': '04', 'url': '/overview/wellInfo' }, { 'code': 'alarm_list', 'icon': '', 'id': '1138696931051794434', 'ismenu': '1', 'levels': 11, 'name': '告警记录', 'num': 0, 'parentId': '1138696443757555713', 'resourceType': '03', 'url': '/alarm/list' }, { 'code': 'alarm_export', 'icon': '', 'id': '1138697500676026369', 'ismenu': '0', 'levels': 11, 'name': '导出告警记录', 'num': 0, 'parentId': '1138696443757555713', 'resourceType': '04', 'url': '/alarm/export' }, { 'code': 'device_type', 'icon': '', 'id': '1138678482233683970', 'ismenu': '0', 'levels': 11, 'name': '获取设备类型', 'num': 0, 'parentId': '1138378119630761985', 'resourceType': '04', 'url': '/device/type' }, diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue index f50de80..0a1cae5 100644 --- a/src/views/alarmManage/listAlarmNow.vue +++ b/src/views/alarmManage/listAlarmNow.vue @@ -381,7 +381,8 @@ getAlarmContentType(this.listQuery.alarmType).then(response => { const supportDeviceTypes = this.$store.getters.deviceTypes for (const item of response.data.list) { - if (supportDeviceTypes.indexOf(item.deviceType) !== -1) { + const deviceType = '' + item.deviceType + if (supportDeviceTypes.indexOf(deviceType) !== -1) { this.alarmContentTypeList.push(item) } } diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue index 873e7be..a41440b 100644 --- a/src/views/alarmManage/listAlarmRecords.vue +++ b/src/views/alarmManage/listAlarmRecords.vue @@ -346,7 +346,8 @@ getAlarmContentType(this.listQuery.alarmType).then(response => { const supportDeviceTypes = this.$store.getters.deviceTypes for (const item of response.data.list) { - if (supportDeviceTypes.indexOf(item.deviceType) !== -1) { + const deviceType = '' + item.deviceType + if (supportDeviceTypes.indexOf(deviceType) !== -1) { this.alarmContentTypeList.push(item) } } diff --git a/src/views/dashboard/components/DeviceCountByRoad.vue b/src/views/dashboard/components/DeviceCountByRoad.vue new file mode 100644 index 0000000..481152e --- /dev/null +++ b/src/views/dashboard/components/DeviceCountByRoad.vue @@ -0,0 +1,87 @@ + + + + diff --git a/src/views/dashboard/components/WellCountByBfzt.vue b/src/views/dashboard/components/WellCountByBfzt.vue index bc4991b..f8e7bd5 100644 --- a/src/views/dashboard/components/WellCountByBfzt.vue +++ b/src/views/dashboard/components/WellCountByBfzt.vue @@ -14,7 +14,7 @@ this.chartSettings = { labelMap: { 'bfzt': '布防状态', - 'wellCount': '井数量' + 'wellCount': '点位数量' }, dimension: 'bfzt', metrics: 'wellCount' diff --git a/src/views/dashboard/components/WellCountByDept.vue b/src/views/dashboard/components/WellCountByDept.vue new file mode 100644 index 0000000..8c077ef --- /dev/null +++ b/src/views/dashboard/components/WellCountByDept.vue @@ -0,0 +1,55 @@ + + + diff --git a/src/views/dashboard/components/WellCountByType.vue b/src/views/dashboard/components/WellCountByType.vue index 9d8edd5..189e2f5 100644 --- a/src/views/dashboard/components/WellCountByType.vue +++ b/src/views/dashboard/components/WellCountByType.vue @@ -27,7 +27,7 @@ barWidth: 15, labelMap: { 'wellTypeName': '点位类型', - 'wellCount': '井数量' + 'wellCount': '点位数量' }, dimension: ['wellTypeName'], metrics: ['wellCount'] diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue index f96a2a2..cf96daa 100644 --- a/src/views/dashboard/index.vue +++ b/src/views/dashboard/index.vue @@ -14,16 +14,10 @@ - - + + - - - - - - - + @@ -38,6 +32,24 @@ + + + + + + + + + + + + + + + + + + @@ -47,22 +59,24 @@ import PanelGroup from './components/PanelGroup' import WellCountByBfzt from './components/WellCountByBfzt' import WellCountByType from './components/WellCountByType' -import DeviceCount from './components/DeviceCount' import DeviceCountByOnline from './components/DeviceCountByOnline' import AlarmByDays from './components/AlarmByDays' import JobByStatus from './components/JobByStatus' import DeviceCountByTypeBar from '@/views/staticCharts/DeviceCountByTypeBar' +import WellCountByDept from '@/views/dashboard/components/WellCountByDept' +import DeviceCountByRoad from '@/views/dashboard/components/DeviceCountByRoad' export default { name: 'Dashboard', components: { + DeviceCountByRoad, + WellCountByDept, DeviceCountByTypeBar, JobByStatus, AlarmByDays, PanelGroup, WellCountByBfzt, WellCountByType, - DeviceCount, DeviceCountByOnline }, computed: { diff --git a/mock/system/user.js b/mock/system/user.js index 41fd42d..ecb871f 100644 --- a/mock/system/user.js +++ b/mock/system/user.js @@ -207,7 +207,7 @@ { 'code': 'nbdevice_add', 'icon': '', 'id': '1138694871019384833', 'ismenu': '0', 'levels': 11, 'name': 'NB设备注册', 'num': 0, 'parentId': '1138694597554958338', 'resourceType': '04', 'url': '/nbdevice/add' }, { 'code': 'job_handlejob', 'icon': '', 'id': '1138701026445717506', 'ismenu': '0', 'levels': 11, 'name': '处理设备异常', 'num': 0, 'parentId': '1138699051712868353', 'resourceType': '04', 'url': '/job/handleJob' }, { 'code': 'nbdevice_delete', 'icon': '', 'id': '1138695159369396226', 'ismenu': '0', 'levels': 11, 'name': '注册信息删除', 'num': 0, 'parentId': '1138694597554958338', 'resourceType': '04', 'url': '/nbdevice/delete' }, - { 'code': 'overview_wellinfo', 'icon': '', 'id': '1138701638772158466', 'ismenu': '0', 'levels': 11, 'name': '闸井详情', 'num': 0, 'parentId': '1138701347507105794', 'resourceType': '04', 'url': '/overview/wellInfo' }, + { 'code': 'overview_wellinfo', 'icon': '', 'id': '1138701638772158466', 'ismenu': '0', 'levels': 11, 'name': '点位详情', 'num': 0, 'parentId': '1138701347507105794', 'resourceType': '04', 'url': '/overview/wellInfo' }, { 'code': 'alarm_list', 'icon': '', 'id': '1138696931051794434', 'ismenu': '1', 'levels': 11, 'name': '告警记录', 'num': 0, 'parentId': '1138696443757555713', 'resourceType': '03', 'url': '/alarm/list' }, { 'code': 'alarm_export', 'icon': '', 'id': '1138697500676026369', 'ismenu': '0', 'levels': 11, 'name': '导出告警记录', 'num': 0, 'parentId': '1138696443757555713', 'resourceType': '04', 'url': '/alarm/export' }, { 'code': 'device_type', 'icon': '', 'id': '1138678482233683970', 'ismenu': '0', 'levels': 11, 'name': '获取设备类型', 'num': 0, 'parentId': '1138378119630761985', 'resourceType': '04', 'url': '/device/type' }, diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue index f50de80..0a1cae5 100644 --- a/src/views/alarmManage/listAlarmNow.vue +++ b/src/views/alarmManage/listAlarmNow.vue @@ -381,7 +381,8 @@ getAlarmContentType(this.listQuery.alarmType).then(response => { const supportDeviceTypes = this.$store.getters.deviceTypes for (const item of response.data.list) { - if (supportDeviceTypes.indexOf(item.deviceType) !== -1) { + const deviceType = '' + item.deviceType + if (supportDeviceTypes.indexOf(deviceType) !== -1) { this.alarmContentTypeList.push(item) } } diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue index 873e7be..a41440b 100644 --- a/src/views/alarmManage/listAlarmRecords.vue +++ b/src/views/alarmManage/listAlarmRecords.vue @@ -346,7 +346,8 @@ getAlarmContentType(this.listQuery.alarmType).then(response => { const supportDeviceTypes = this.$store.getters.deviceTypes for (const item of response.data.list) { - if (supportDeviceTypes.indexOf(item.deviceType) !== -1) { + const deviceType = '' + item.deviceType + if (supportDeviceTypes.indexOf(deviceType) !== -1) { this.alarmContentTypeList.push(item) } } diff --git a/src/views/dashboard/components/DeviceCountByRoad.vue b/src/views/dashboard/components/DeviceCountByRoad.vue new file mode 100644 index 0000000..481152e --- /dev/null +++ b/src/views/dashboard/components/DeviceCountByRoad.vue @@ -0,0 +1,87 @@ + + + + diff --git a/src/views/dashboard/components/WellCountByBfzt.vue b/src/views/dashboard/components/WellCountByBfzt.vue index bc4991b..f8e7bd5 100644 --- a/src/views/dashboard/components/WellCountByBfzt.vue +++ b/src/views/dashboard/components/WellCountByBfzt.vue @@ -14,7 +14,7 @@ this.chartSettings = { labelMap: { 'bfzt': '布防状态', - 'wellCount': '井数量' + 'wellCount': '点位数量' }, dimension: 'bfzt', metrics: 'wellCount' diff --git a/src/views/dashboard/components/WellCountByDept.vue b/src/views/dashboard/components/WellCountByDept.vue new file mode 100644 index 0000000..8c077ef --- /dev/null +++ b/src/views/dashboard/components/WellCountByDept.vue @@ -0,0 +1,55 @@ + + + diff --git a/src/views/dashboard/components/WellCountByType.vue b/src/views/dashboard/components/WellCountByType.vue index 9d8edd5..189e2f5 100644 --- a/src/views/dashboard/components/WellCountByType.vue +++ b/src/views/dashboard/components/WellCountByType.vue @@ -27,7 +27,7 @@ barWidth: 15, labelMap: { 'wellTypeName': '点位类型', - 'wellCount': '井数量' + 'wellCount': '点位数量' }, dimension: ['wellTypeName'], metrics: ['wellCount'] diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue index f96a2a2..cf96daa 100644 --- a/src/views/dashboard/index.vue +++ b/src/views/dashboard/index.vue @@ -14,16 +14,10 @@ - - + + - - - - - - - + @@ -38,6 +32,24 @@ + + + + + + + + + + + + + + + + + + @@ -47,22 +59,24 @@ import PanelGroup from './components/PanelGroup' import WellCountByBfzt from './components/WellCountByBfzt' import WellCountByType from './components/WellCountByType' -import DeviceCount from './components/DeviceCount' import DeviceCountByOnline from './components/DeviceCountByOnline' import AlarmByDays from './components/AlarmByDays' import JobByStatus from './components/JobByStatus' import DeviceCountByTypeBar from '@/views/staticCharts/DeviceCountByTypeBar' +import WellCountByDept from '@/views/dashboard/components/WellCountByDept' +import DeviceCountByRoad from '@/views/dashboard/components/DeviceCountByRoad' export default { name: 'Dashboard', components: { + DeviceCountByRoad, + WellCountByDept, DeviceCountByTypeBar, JobByStatus, AlarmByDays, PanelGroup, WellCountByBfzt, WellCountByType, - DeviceCount, DeviceCountByOnline }, computed: { diff --git a/src/views/dataView/components/wellCountView.vue b/src/views/dataView/components/wellCountView.vue index 8c7c110..19ad261 100644 --- a/src/views/dataView/components/wellCountView.vue +++ b/src/views/dataView/components/wellCountView.vue @@ -51,7 +51,7 @@ pieChartSettings: { labelMap: { 'bfzt': '布防状态', - 'wellCount': '井数量' + 'wellCount': '点位数量' }, dimension: 'bfzt', metrics: 'wellCount' @@ -77,7 +77,7 @@ barWidth: 15, labelMap: { 'wellTypeName': '点位类型', - 'wellCount': '井数量' + 'wellCount': '点位数量' }, dimension: ['wellTypeName'], metrics: ['wellCount'] diff --git a/mock/system/user.js b/mock/system/user.js index 41fd42d..ecb871f 100644 --- a/mock/system/user.js +++ b/mock/system/user.js @@ -207,7 +207,7 @@ { 'code': 'nbdevice_add', 'icon': '', 'id': '1138694871019384833', 'ismenu': '0', 'levels': 11, 'name': 'NB设备注册', 'num': 0, 'parentId': '1138694597554958338', 'resourceType': '04', 'url': '/nbdevice/add' }, { 'code': 'job_handlejob', 'icon': '', 'id': '1138701026445717506', 'ismenu': '0', 'levels': 11, 'name': '处理设备异常', 'num': 0, 'parentId': '1138699051712868353', 'resourceType': '04', 'url': '/job/handleJob' }, { 'code': 'nbdevice_delete', 'icon': '', 'id': '1138695159369396226', 'ismenu': '0', 'levels': 11, 'name': '注册信息删除', 'num': 0, 'parentId': '1138694597554958338', 'resourceType': '04', 'url': '/nbdevice/delete' }, - { 'code': 'overview_wellinfo', 'icon': '', 'id': '1138701638772158466', 'ismenu': '0', 'levels': 11, 'name': '闸井详情', 'num': 0, 'parentId': '1138701347507105794', 'resourceType': '04', 'url': '/overview/wellInfo' }, + { 'code': 'overview_wellinfo', 'icon': '', 'id': '1138701638772158466', 'ismenu': '0', 'levels': 11, 'name': '点位详情', 'num': 0, 'parentId': '1138701347507105794', 'resourceType': '04', 'url': '/overview/wellInfo' }, { 'code': 'alarm_list', 'icon': '', 'id': '1138696931051794434', 'ismenu': '1', 'levels': 11, 'name': '告警记录', 'num': 0, 'parentId': '1138696443757555713', 'resourceType': '03', 'url': '/alarm/list' }, { 'code': 'alarm_export', 'icon': '', 'id': '1138697500676026369', 'ismenu': '0', 'levels': 11, 'name': '导出告警记录', 'num': 0, 'parentId': '1138696443757555713', 'resourceType': '04', 'url': '/alarm/export' }, { 'code': 'device_type', 'icon': '', 'id': '1138678482233683970', 'ismenu': '0', 'levels': 11, 'name': '获取设备类型', 'num': 0, 'parentId': '1138378119630761985', 'resourceType': '04', 'url': '/device/type' }, diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue index f50de80..0a1cae5 100644 --- a/src/views/alarmManage/listAlarmNow.vue +++ b/src/views/alarmManage/listAlarmNow.vue @@ -381,7 +381,8 @@ getAlarmContentType(this.listQuery.alarmType).then(response => { const supportDeviceTypes = this.$store.getters.deviceTypes for (const item of response.data.list) { - if (supportDeviceTypes.indexOf(item.deviceType) !== -1) { + const deviceType = '' + item.deviceType + if (supportDeviceTypes.indexOf(deviceType) !== -1) { this.alarmContentTypeList.push(item) } } diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue index 873e7be..a41440b 100644 --- a/src/views/alarmManage/listAlarmRecords.vue +++ b/src/views/alarmManage/listAlarmRecords.vue @@ -346,7 +346,8 @@ getAlarmContentType(this.listQuery.alarmType).then(response => { const supportDeviceTypes = this.$store.getters.deviceTypes for (const item of response.data.list) { - if (supportDeviceTypes.indexOf(item.deviceType) !== -1) { + const deviceType = '' + item.deviceType + if (supportDeviceTypes.indexOf(deviceType) !== -1) { this.alarmContentTypeList.push(item) } } diff --git a/src/views/dashboard/components/DeviceCountByRoad.vue b/src/views/dashboard/components/DeviceCountByRoad.vue new file mode 100644 index 0000000..481152e --- /dev/null +++ b/src/views/dashboard/components/DeviceCountByRoad.vue @@ -0,0 +1,87 @@ + + + + diff --git a/src/views/dashboard/components/WellCountByBfzt.vue b/src/views/dashboard/components/WellCountByBfzt.vue index bc4991b..f8e7bd5 100644 --- a/src/views/dashboard/components/WellCountByBfzt.vue +++ b/src/views/dashboard/components/WellCountByBfzt.vue @@ -14,7 +14,7 @@ this.chartSettings = { labelMap: { 'bfzt': '布防状态', - 'wellCount': '井数量' + 'wellCount': '点位数量' }, dimension: 'bfzt', metrics: 'wellCount' diff --git a/src/views/dashboard/components/WellCountByDept.vue b/src/views/dashboard/components/WellCountByDept.vue new file mode 100644 index 0000000..8c077ef --- /dev/null +++ b/src/views/dashboard/components/WellCountByDept.vue @@ -0,0 +1,55 @@ + + + diff --git a/src/views/dashboard/components/WellCountByType.vue b/src/views/dashboard/components/WellCountByType.vue index 9d8edd5..189e2f5 100644 --- a/src/views/dashboard/components/WellCountByType.vue +++ b/src/views/dashboard/components/WellCountByType.vue @@ -27,7 +27,7 @@ barWidth: 15, labelMap: { 'wellTypeName': '点位类型', - 'wellCount': '井数量' + 'wellCount': '点位数量' }, dimension: ['wellTypeName'], metrics: ['wellCount'] diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue index f96a2a2..cf96daa 100644 --- a/src/views/dashboard/index.vue +++ b/src/views/dashboard/index.vue @@ -14,16 +14,10 @@ - - + + - - - - - - - + @@ -38,6 +32,24 @@ + + + + + + + + + + + + + + + + + + @@ -47,22 +59,24 @@ import PanelGroup from './components/PanelGroup' import WellCountByBfzt from './components/WellCountByBfzt' import WellCountByType from './components/WellCountByType' -import DeviceCount from './components/DeviceCount' import DeviceCountByOnline from './components/DeviceCountByOnline' import AlarmByDays from './components/AlarmByDays' import JobByStatus from './components/JobByStatus' import DeviceCountByTypeBar from '@/views/staticCharts/DeviceCountByTypeBar' +import WellCountByDept from '@/views/dashboard/components/WellCountByDept' +import DeviceCountByRoad from '@/views/dashboard/components/DeviceCountByRoad' export default { name: 'Dashboard', components: { + DeviceCountByRoad, + WellCountByDept, DeviceCountByTypeBar, JobByStatus, AlarmByDays, PanelGroup, WellCountByBfzt, WellCountByType, - DeviceCount, DeviceCountByOnline }, computed: { diff --git a/src/views/dataView/components/wellCountView.vue b/src/views/dataView/components/wellCountView.vue index 8c7c110..19ad261 100644 --- a/src/views/dataView/components/wellCountView.vue +++ b/src/views/dataView/components/wellCountView.vue @@ -51,7 +51,7 @@ pieChartSettings: { labelMap: { 'bfzt': '布防状态', - 'wellCount': '井数量' + 'wellCount': '点位数量' }, dimension: 'bfzt', metrics: 'wellCount' @@ -77,7 +77,7 @@ barWidth: 15, labelMap: { 'wellTypeName': '点位类型', - 'wellCount': '井数量' + 'wellCount': '点位数量' }, dimension: ['wellTypeName'], metrics: ['wellCount'] diff --git a/src/views/deviceManage/components/listWellcoverData.vue b/src/views/deviceManage/components/listWellcoverData.vue index 5e3d69b..a140aa6 100644 --- a/src/views/deviceManage/components/listWellcoverData.vue +++ b/src/views/deviceManage/components/listWellcoverData.vue @@ -63,7 +63,7 @@ needIndex: false }, // 是否需要序号列 columns: [ - { text: '上报时间', value: 'logTime', align: 'center' }, + { text: '上报时间', value: 'logtime', align: 'center' }, { text: '井盖状态', value: 'statusName', align: 'center' } ], // 显示列 headConfig: { diff --git a/mock/system/user.js b/mock/system/user.js index 41fd42d..ecb871f 100644 --- a/mock/system/user.js +++ b/mock/system/user.js @@ -207,7 +207,7 @@ { 'code': 'nbdevice_add', 'icon': '', 'id': '1138694871019384833', 'ismenu': '0', 'levels': 11, 'name': 'NB设备注册', 'num': 0, 'parentId': '1138694597554958338', 'resourceType': '04', 'url': '/nbdevice/add' }, { 'code': 'job_handlejob', 'icon': '', 'id': '1138701026445717506', 'ismenu': '0', 'levels': 11, 'name': '处理设备异常', 'num': 0, 'parentId': '1138699051712868353', 'resourceType': '04', 'url': '/job/handleJob' }, { 'code': 'nbdevice_delete', 'icon': '', 'id': '1138695159369396226', 'ismenu': '0', 'levels': 11, 'name': '注册信息删除', 'num': 0, 'parentId': '1138694597554958338', 'resourceType': '04', 'url': '/nbdevice/delete' }, - { 'code': 'overview_wellinfo', 'icon': '', 'id': '1138701638772158466', 'ismenu': '0', 'levels': 11, 'name': '闸井详情', 'num': 0, 'parentId': '1138701347507105794', 'resourceType': '04', 'url': '/overview/wellInfo' }, + { 'code': 'overview_wellinfo', 'icon': '', 'id': '1138701638772158466', 'ismenu': '0', 'levels': 11, 'name': '点位详情', 'num': 0, 'parentId': '1138701347507105794', 'resourceType': '04', 'url': '/overview/wellInfo' }, { 'code': 'alarm_list', 'icon': '', 'id': '1138696931051794434', 'ismenu': '1', 'levels': 11, 'name': '告警记录', 'num': 0, 'parentId': '1138696443757555713', 'resourceType': '03', 'url': '/alarm/list' }, { 'code': 'alarm_export', 'icon': '', 'id': '1138697500676026369', 'ismenu': '0', 'levels': 11, 'name': '导出告警记录', 'num': 0, 'parentId': '1138696443757555713', 'resourceType': '04', 'url': '/alarm/export' }, { 'code': 'device_type', 'icon': '', 'id': '1138678482233683970', 'ismenu': '0', 'levels': 11, 'name': '获取设备类型', 'num': 0, 'parentId': '1138378119630761985', 'resourceType': '04', 'url': '/device/type' }, diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue index f50de80..0a1cae5 100644 --- a/src/views/alarmManage/listAlarmNow.vue +++ b/src/views/alarmManage/listAlarmNow.vue @@ -381,7 +381,8 @@ getAlarmContentType(this.listQuery.alarmType).then(response => { const supportDeviceTypes = this.$store.getters.deviceTypes for (const item of response.data.list) { - if (supportDeviceTypes.indexOf(item.deviceType) !== -1) { + const deviceType = '' + item.deviceType + if (supportDeviceTypes.indexOf(deviceType) !== -1) { this.alarmContentTypeList.push(item) } } diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue index 873e7be..a41440b 100644 --- a/src/views/alarmManage/listAlarmRecords.vue +++ b/src/views/alarmManage/listAlarmRecords.vue @@ -346,7 +346,8 @@ getAlarmContentType(this.listQuery.alarmType).then(response => { const supportDeviceTypes = this.$store.getters.deviceTypes for (const item of response.data.list) { - if (supportDeviceTypes.indexOf(item.deviceType) !== -1) { + const deviceType = '' + item.deviceType + if (supportDeviceTypes.indexOf(deviceType) !== -1) { this.alarmContentTypeList.push(item) } } diff --git a/src/views/dashboard/components/DeviceCountByRoad.vue b/src/views/dashboard/components/DeviceCountByRoad.vue new file mode 100644 index 0000000..481152e --- /dev/null +++ b/src/views/dashboard/components/DeviceCountByRoad.vue @@ -0,0 +1,87 @@ + + + + diff --git a/src/views/dashboard/components/WellCountByBfzt.vue b/src/views/dashboard/components/WellCountByBfzt.vue index bc4991b..f8e7bd5 100644 --- a/src/views/dashboard/components/WellCountByBfzt.vue +++ b/src/views/dashboard/components/WellCountByBfzt.vue @@ -14,7 +14,7 @@ this.chartSettings = { labelMap: { 'bfzt': '布防状态', - 'wellCount': '井数量' + 'wellCount': '点位数量' }, dimension: 'bfzt', metrics: 'wellCount' diff --git a/src/views/dashboard/components/WellCountByDept.vue b/src/views/dashboard/components/WellCountByDept.vue new file mode 100644 index 0000000..8c077ef --- /dev/null +++ b/src/views/dashboard/components/WellCountByDept.vue @@ -0,0 +1,55 @@ + + + diff --git a/src/views/dashboard/components/WellCountByType.vue b/src/views/dashboard/components/WellCountByType.vue index 9d8edd5..189e2f5 100644 --- a/src/views/dashboard/components/WellCountByType.vue +++ b/src/views/dashboard/components/WellCountByType.vue @@ -27,7 +27,7 @@ barWidth: 15, labelMap: { 'wellTypeName': '点位类型', - 'wellCount': '井数量' + 'wellCount': '点位数量' }, dimension: ['wellTypeName'], metrics: ['wellCount'] diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue index f96a2a2..cf96daa 100644 --- a/src/views/dashboard/index.vue +++ b/src/views/dashboard/index.vue @@ -14,16 +14,10 @@ - - + + - - - - - - - + @@ -38,6 +32,24 @@ + + + + + + + + + + + + + + + + + + @@ -47,22 +59,24 @@ import PanelGroup from './components/PanelGroup' import WellCountByBfzt from './components/WellCountByBfzt' import WellCountByType from './components/WellCountByType' -import DeviceCount from './components/DeviceCount' import DeviceCountByOnline from './components/DeviceCountByOnline' import AlarmByDays from './components/AlarmByDays' import JobByStatus from './components/JobByStatus' import DeviceCountByTypeBar from '@/views/staticCharts/DeviceCountByTypeBar' +import WellCountByDept from '@/views/dashboard/components/WellCountByDept' +import DeviceCountByRoad from '@/views/dashboard/components/DeviceCountByRoad' export default { name: 'Dashboard', components: { + DeviceCountByRoad, + WellCountByDept, DeviceCountByTypeBar, JobByStatus, AlarmByDays, PanelGroup, WellCountByBfzt, WellCountByType, - DeviceCount, DeviceCountByOnline }, computed: { diff --git a/src/views/dataView/components/wellCountView.vue b/src/views/dataView/components/wellCountView.vue index 8c7c110..19ad261 100644 --- a/src/views/dataView/components/wellCountView.vue +++ b/src/views/dataView/components/wellCountView.vue @@ -51,7 +51,7 @@ pieChartSettings: { labelMap: { 'bfzt': '布防状态', - 'wellCount': '井数量' + 'wellCount': '点位数量' }, dimension: 'bfzt', metrics: 'wellCount' @@ -77,7 +77,7 @@ barWidth: 15, labelMap: { 'wellTypeName': '点位类型', - 'wellCount': '井数量' + 'wellCount': '点位数量' }, dimension: ['wellTypeName'], metrics: ['wellCount'] diff --git a/src/views/deviceManage/components/listWellcoverData.vue b/src/views/deviceManage/components/listWellcoverData.vue index 5e3d69b..a140aa6 100644 --- a/src/views/deviceManage/components/listWellcoverData.vue +++ b/src/views/deviceManage/components/listWellcoverData.vue @@ -63,7 +63,7 @@ needIndex: false }, // 是否需要序号列 columns: [ - { text: '上报时间', value: 'logTime', align: 'center' }, + { text: '上报时间', value: 'logtime', align: 'center' }, { text: '井盖状态', value: 'statusName', align: 'center' } ], // 显示列 headConfig: { diff --git a/src/views/jobManage/listJobs.vue b/src/views/jobManage/listJobs.vue index 8017d30..b241503 100644 --- a/src/views/jobManage/listJobs.vue +++ b/src/views/jobManage/listJobs.vue @@ -79,7 +79,7 @@ {{ scope.row[column.value] | personFilter(scope.row.jobStatus) }} - + @@ -47,22 +59,24 @@ import PanelGroup from './components/PanelGroup' import WellCountByBfzt from './components/WellCountByBfzt' import WellCountByType from './components/WellCountByType' -import DeviceCount from './components/DeviceCount' import DeviceCountByOnline from './components/DeviceCountByOnline' import AlarmByDays from './components/AlarmByDays' import JobByStatus from './components/JobByStatus' import DeviceCountByTypeBar from '@/views/staticCharts/DeviceCountByTypeBar' +import WellCountByDept from '@/views/dashboard/components/WellCountByDept' +import DeviceCountByRoad from '@/views/dashboard/components/DeviceCountByRoad' export default { name: 'Dashboard', components: { + DeviceCountByRoad, + WellCountByDept, DeviceCountByTypeBar, JobByStatus, AlarmByDays, PanelGroup, WellCountByBfzt, WellCountByType, - DeviceCount, DeviceCountByOnline }, computed: { diff --git a/src/views/dataView/components/wellCountView.vue b/src/views/dataView/components/wellCountView.vue index 8c7c110..19ad261 100644 --- a/src/views/dataView/components/wellCountView.vue +++ b/src/views/dataView/components/wellCountView.vue @@ -51,7 +51,7 @@ pieChartSettings: { labelMap: { 'bfzt': '布防状态', - 'wellCount': '井数量' + 'wellCount': '点位数量' }, dimension: 'bfzt', metrics: 'wellCount' @@ -77,7 +77,7 @@ barWidth: 15, labelMap: { 'wellTypeName': '点位类型', - 'wellCount': '井数量' + 'wellCount': '点位数量' }, dimension: ['wellTypeName'], metrics: ['wellCount'] diff --git a/src/views/deviceManage/components/listWellcoverData.vue b/src/views/deviceManage/components/listWellcoverData.vue index 5e3d69b..a140aa6 100644 --- a/src/views/deviceManage/components/listWellcoverData.vue +++ b/src/views/deviceManage/components/listWellcoverData.vue @@ -63,7 +63,7 @@ needIndex: false }, // 是否需要序号列 columns: [ - { text: '上报时间', value: 'logTime', align: 'center' }, + { text: '上报时间', value: 'logtime', align: 'center' }, { text: '井盖状态', value: 'statusName', align: 'center' } ], // 显示列 headConfig: { diff --git a/src/views/jobManage/listJobs.vue b/src/views/jobManage/listJobs.vue index 8017d30..b241503 100644 --- a/src/views/jobManage/listJobs.vue +++ b/src/views/jobManage/listJobs.vue @@ -79,7 +79,7 @@ {{ scope.row[column.value] | personFilter(scope.row.jobStatus) }} - + - +