diff --git a/config/dev.env.js b/config/dev.env.js index 36f7d4a..1cab225 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -9,6 +9,6 @@ // BASE_API: '"http://42.81.160.165:2022/smartwell"' // BASE_API: '"http://111.198.10.15:11304"' // BASE_API: '"http://111.198.10.15:11643"' - // BASE_API: '"http://111.198.10.15:11409/smartwell"' //可以用 - BASE_API: '"http://192.168.43.66:11643/smartwell"' //彭先洪 + BASE_API: '"http://111.198.10.15:11409/smartwell"' //可以用 + // BASE_API: '"http://192.168.43.66:11643/smartwell"' //彭先洪 }) diff --git a/config/dev.env.js b/config/dev.env.js index 36f7d4a..1cab225 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -9,6 +9,6 @@ // BASE_API: '"http://42.81.160.165:2022/smartwell"' // BASE_API: '"http://111.198.10.15:11304"' // BASE_API: '"http://111.198.10.15:11643"' - // BASE_API: '"http://111.198.10.15:11409/smartwell"' //可以用 - BASE_API: '"http://192.168.43.66:11643/smartwell"' //彭先洪 + BASE_API: '"http://111.198.10.15:11409/smartwell"' //可以用 + // BASE_API: '"http://192.168.43.66:11643/smartwell"' //彭先洪 }) diff --git a/src/utils/baseConfig.js b/src/utils/baseConfig.js index cda5175..70f4159 100644 --- a/src/utils/baseConfig.js +++ b/src/utils/baseConfig.js @@ -1,6 +1,6 @@ const project = { // title: '供水管理系统' - title: '场区能源管理系统' + title: '生产及办公能耗管理系统' } export function getProject() { return project diff --git a/config/dev.env.js b/config/dev.env.js index 36f7d4a..1cab225 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -9,6 +9,6 @@ // BASE_API: '"http://42.81.160.165:2022/smartwell"' // BASE_API: '"http://111.198.10.15:11304"' // BASE_API: '"http://111.198.10.15:11643"' - // BASE_API: '"http://111.198.10.15:11409/smartwell"' //可以用 - BASE_API: '"http://192.168.43.66:11643/smartwell"' //彭先洪 + BASE_API: '"http://111.198.10.15:11409/smartwell"' //可以用 + // BASE_API: '"http://192.168.43.66:11643/smartwell"' //彭先洪 }) diff --git a/src/utils/baseConfig.js b/src/utils/baseConfig.js index cda5175..70f4159 100644 --- a/src/utils/baseConfig.js +++ b/src/utils/baseConfig.js @@ -1,6 +1,6 @@ const project = { // title: '供水管理系统' - title: '场区能源管理系统' + title: '生产及办公能耗管理系统' } export function getProject() { return project diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js index aa41264..11dc521 100644 --- a/src/utils/dateutils.js +++ b/src/utils/dateutils.js @@ -52,3 +52,13 @@ } return fmt } + +/** + * 获取近1周日期范围 + * @returns {*[]} + */ +export function getSearchLastWeekTime() { + const startTime = getLastWeek().Format('yyyy-MM-dd hh:mm:ss') + const endTime = getToday('yyyy-MM-dd hh:mm:ss') + return [startTime, endTime] +} diff --git a/config/dev.env.js b/config/dev.env.js index 36f7d4a..1cab225 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -9,6 +9,6 @@ // BASE_API: '"http://42.81.160.165:2022/smartwell"' // BASE_API: '"http://111.198.10.15:11304"' // BASE_API: '"http://111.198.10.15:11643"' - // BASE_API: '"http://111.198.10.15:11409/smartwell"' //可以用 - BASE_API: '"http://192.168.43.66:11643/smartwell"' //彭先洪 + BASE_API: '"http://111.198.10.15:11409/smartwell"' //可以用 + // BASE_API: '"http://192.168.43.66:11643/smartwell"' //彭先洪 }) diff --git a/src/utils/baseConfig.js b/src/utils/baseConfig.js index cda5175..70f4159 100644 --- a/src/utils/baseConfig.js +++ b/src/utils/baseConfig.js @@ -1,6 +1,6 @@ const project = { // title: '供水管理系统' - title: '场区能源管理系统' + title: '生产及办公能耗管理系统' } export function getProject() { return project diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js index aa41264..11dc521 100644 --- a/src/utils/dateutils.js +++ b/src/utils/dateutils.js @@ -52,3 +52,13 @@ } return fmt } + +/** + * 获取近1周日期范围 + * @returns {*[]} + */ +export function getSearchLastWeekTime() { + const startTime = getLastWeek().Format('yyyy-MM-dd hh:mm:ss') + const endTime = getToday('yyyy-MM-dd hh:mm:ss') + return [startTime, endTime] +} diff --git a/src/views/dashboard/components/AlarmByDays.vue b/src/views/dashboard/components/AlarmByDays.vue index ddfd8e3..8a9a937 100644 --- a/src/views/dashboard/components/AlarmByDays.vue +++ b/src/views/dashboard/components/AlarmByDays.vue @@ -23,11 +23,11 @@ } this.chartSettings = { labelMap: { - '远传水表': '远传水表', + '远程水表': '远程水表', '噪声记录仪': '噪声记录仪', '液位监测仪': '液位监测仪' }, - metrics: ['远传水表', '噪声记录仪', '液位监测仪'], + metrics: ['远程水表', '噪声记录仪', '液位监测仪'], dimension: ['date'] } return { @@ -37,7 +37,7 @@ endTime: '' }, chartData: { - columns: ['date', '远传水表', '噪声记录仪', '液位监测仪'], + columns: ['date', '远程水表', '噪声记录仪', '液位监测仪'], rows: [] } } @@ -65,7 +65,7 @@ delete item.data return item }) - + this.chartData.rows = arr }) }, diff --git a/config/dev.env.js b/config/dev.env.js index 36f7d4a..1cab225 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -9,6 +9,6 @@ // BASE_API: '"http://42.81.160.165:2022/smartwell"' // BASE_API: '"http://111.198.10.15:11304"' // BASE_API: '"http://111.198.10.15:11643"' - // BASE_API: '"http://111.198.10.15:11409/smartwell"' //可以用 - BASE_API: '"http://192.168.43.66:11643/smartwell"' //彭先洪 + BASE_API: '"http://111.198.10.15:11409/smartwell"' //可以用 + // BASE_API: '"http://192.168.43.66:11643/smartwell"' //彭先洪 }) diff --git a/src/utils/baseConfig.js b/src/utils/baseConfig.js index cda5175..70f4159 100644 --- a/src/utils/baseConfig.js +++ b/src/utils/baseConfig.js @@ -1,6 +1,6 @@ const project = { // title: '供水管理系统' - title: '场区能源管理系统' + title: '生产及办公能耗管理系统' } export function getProject() { return project diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js index aa41264..11dc521 100644 --- a/src/utils/dateutils.js +++ b/src/utils/dateutils.js @@ -52,3 +52,13 @@ } return fmt } + +/** + * 获取近1周日期范围 + * @returns {*[]} + */ +export function getSearchLastWeekTime() { + const startTime = getLastWeek().Format('yyyy-MM-dd hh:mm:ss') + const endTime = getToday('yyyy-MM-dd hh:mm:ss') + return [startTime, endTime] +} diff --git a/src/views/dashboard/components/AlarmByDays.vue b/src/views/dashboard/components/AlarmByDays.vue index ddfd8e3..8a9a937 100644 --- a/src/views/dashboard/components/AlarmByDays.vue +++ b/src/views/dashboard/components/AlarmByDays.vue @@ -23,11 +23,11 @@ } this.chartSettings = { labelMap: { - '远传水表': '远传水表', + '远程水表': '远程水表', '噪声记录仪': '噪声记录仪', '液位监测仪': '液位监测仪' }, - metrics: ['远传水表', '噪声记录仪', '液位监测仪'], + metrics: ['远程水表', '噪声记录仪', '液位监测仪'], dimension: ['date'] } return { @@ -37,7 +37,7 @@ endTime: '' }, chartData: { - columns: ['date', '远传水表', '噪声记录仪', '液位监测仪'], + columns: ['date', '远程水表', '噪声记录仪', '液位监测仪'], rows: [] } } @@ -65,7 +65,7 @@ delete item.data return item }) - + this.chartData.rows = arr }) }, diff --git a/src/views/dataManage/dataManage.vue b/src/views/dataManage/dataManage.vue index fa1681b..494e254 100644 --- a/src/views/dataManage/dataManage.vue +++ b/src/views/dataManage/dataManage.vue @@ -25,7 +25,7 @@ - + diff --git a/config/dev.env.js b/config/dev.env.js index 36f7d4a..1cab225 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -9,6 +9,6 @@ // BASE_API: '"http://42.81.160.165:2022/smartwell"' // BASE_API: '"http://111.198.10.15:11304"' // BASE_API: '"http://111.198.10.15:11643"' - // BASE_API: '"http://111.198.10.15:11409/smartwell"' //可以用 - BASE_API: '"http://192.168.43.66:11643/smartwell"' //彭先洪 + BASE_API: '"http://111.198.10.15:11409/smartwell"' //可以用 + // BASE_API: '"http://192.168.43.66:11643/smartwell"' //彭先洪 }) diff --git a/src/utils/baseConfig.js b/src/utils/baseConfig.js index cda5175..70f4159 100644 --- a/src/utils/baseConfig.js +++ b/src/utils/baseConfig.js @@ -1,6 +1,6 @@ const project = { // title: '供水管理系统' - title: '场区能源管理系统' + title: '生产及办公能耗管理系统' } export function getProject() { return project diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js index aa41264..11dc521 100644 --- a/src/utils/dateutils.js +++ b/src/utils/dateutils.js @@ -52,3 +52,13 @@ } return fmt } + +/** + * 获取近1周日期范围 + * @returns {*[]} + */ +export function getSearchLastWeekTime() { + const startTime = getLastWeek().Format('yyyy-MM-dd hh:mm:ss') + const endTime = getToday('yyyy-MM-dd hh:mm:ss') + return [startTime, endTime] +} diff --git a/src/views/dashboard/components/AlarmByDays.vue b/src/views/dashboard/components/AlarmByDays.vue index ddfd8e3..8a9a937 100644 --- a/src/views/dashboard/components/AlarmByDays.vue +++ b/src/views/dashboard/components/AlarmByDays.vue @@ -23,11 +23,11 @@ } this.chartSettings = { labelMap: { - '远传水表': '远传水表', + '远程水表': '远程水表', '噪声记录仪': '噪声记录仪', '液位监测仪': '液位监测仪' }, - metrics: ['远传水表', '噪声记录仪', '液位监测仪'], + metrics: ['远程水表', '噪声记录仪', '液位监测仪'], dimension: ['date'] } return { @@ -37,7 +37,7 @@ endTime: '' }, chartData: { - columns: ['date', '远传水表', '噪声记录仪', '液位监测仪'], + columns: ['date', '远程水表', '噪声记录仪', '液位监测仪'], rows: [] } } @@ -65,7 +65,7 @@ delete item.data return item }) - + this.chartData.rows = arr }) }, diff --git a/src/views/dataManage/dataManage.vue b/src/views/dataManage/dataManage.vue index fa1681b..494e254 100644 --- a/src/views/dataManage/dataManage.vue +++ b/src/views/dataManage/dataManage.vue @@ -25,7 +25,7 @@ - + diff --git a/src/views/dataManage/deviceData/gasFlowHistory.vue b/src/views/dataManage/deviceData/gasFlowHistory.vue index ec65c4d..e89b673 100644 --- a/src/views/dataManage/deviceData/gasFlowHistory.vue +++ b/src/views/dataManage/deviceData/gasFlowHistory.vue @@ -124,7 +124,7 @@ const downloadElement = document.createElement('a') const href = window.URL.createObjectURL(blob) // 创建下载的链接 downloadElement.href = href - downloadElement.download = `${this.listQuery.devCode}远传水表历史数据.xlsx` // 下载后文件名 + downloadElement.download = `${this.listQuery.devCode}远程水表历史数据.xlsx` // 下载后文件名 document.body.appendChild(downloadElement) downloadElement.click() // 点击下载 document.body.removeChild(downloadElement) // 下载完成移除元素 diff --git a/config/dev.env.js b/config/dev.env.js index 36f7d4a..1cab225 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -9,6 +9,6 @@ // BASE_API: '"http://42.81.160.165:2022/smartwell"' // BASE_API: '"http://111.198.10.15:11304"' // BASE_API: '"http://111.198.10.15:11643"' - // BASE_API: '"http://111.198.10.15:11409/smartwell"' //可以用 - BASE_API: '"http://192.168.43.66:11643/smartwell"' //彭先洪 + BASE_API: '"http://111.198.10.15:11409/smartwell"' //可以用 + // BASE_API: '"http://192.168.43.66:11643/smartwell"' //彭先洪 }) diff --git a/src/utils/baseConfig.js b/src/utils/baseConfig.js index cda5175..70f4159 100644 --- a/src/utils/baseConfig.js +++ b/src/utils/baseConfig.js @@ -1,6 +1,6 @@ const project = { // title: '供水管理系统' - title: '场区能源管理系统' + title: '生产及办公能耗管理系统' } export function getProject() { return project diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js index aa41264..11dc521 100644 --- a/src/utils/dateutils.js +++ b/src/utils/dateutils.js @@ -52,3 +52,13 @@ } return fmt } + +/** + * 获取近1周日期范围 + * @returns {*[]} + */ +export function getSearchLastWeekTime() { + const startTime = getLastWeek().Format('yyyy-MM-dd hh:mm:ss') + const endTime = getToday('yyyy-MM-dd hh:mm:ss') + return [startTime, endTime] +} diff --git a/src/views/dashboard/components/AlarmByDays.vue b/src/views/dashboard/components/AlarmByDays.vue index ddfd8e3..8a9a937 100644 --- a/src/views/dashboard/components/AlarmByDays.vue +++ b/src/views/dashboard/components/AlarmByDays.vue @@ -23,11 +23,11 @@ } this.chartSettings = { labelMap: { - '远传水表': '远传水表', + '远程水表': '远程水表', '噪声记录仪': '噪声记录仪', '液位监测仪': '液位监测仪' }, - metrics: ['远传水表', '噪声记录仪', '液位监测仪'], + metrics: ['远程水表', '噪声记录仪', '液位监测仪'], dimension: ['date'] } return { @@ -37,7 +37,7 @@ endTime: '' }, chartData: { - columns: ['date', '远传水表', '噪声记录仪', '液位监测仪'], + columns: ['date', '远程水表', '噪声记录仪', '液位监测仪'], rows: [] } } @@ -65,7 +65,7 @@ delete item.data return item }) - + this.chartData.rows = arr }) }, diff --git a/src/views/dataManage/dataManage.vue b/src/views/dataManage/dataManage.vue index fa1681b..494e254 100644 --- a/src/views/dataManage/dataManage.vue +++ b/src/views/dataManage/dataManage.vue @@ -25,7 +25,7 @@ - + diff --git a/src/views/dataManage/deviceData/gasFlowHistory.vue b/src/views/dataManage/deviceData/gasFlowHistory.vue index ec65c4d..e89b673 100644 --- a/src/views/dataManage/deviceData/gasFlowHistory.vue +++ b/src/views/dataManage/deviceData/gasFlowHistory.vue @@ -124,7 +124,7 @@ const downloadElement = document.createElement('a') const href = window.URL.createObjectURL(blob) // 创建下载的链接 downloadElement.href = href - downloadElement.download = `${this.listQuery.devCode}远传水表历史数据.xlsx` // 下载后文件名 + downloadElement.download = `${this.listQuery.devCode}远程水表历史数据.xlsx` // 下载后文件名 document.body.appendChild(downloadElement) downloadElement.click() // 点击下载 document.body.removeChild(downloadElement) // 下载完成移除元素 diff --git a/src/views/dataManage/deviceData/listCorrodeData.vue b/src/views/dataManage/deviceData/listCorrodeData.vue index 3cdb1f1..63e47c7 100644 --- a/src/views/dataManage/deviceData/listCorrodeData.vue +++ b/src/views/dataManage/deviceData/listCorrodeData.vue @@ -67,7 +67,7 @@ import DeptSelect from '../../../components/DeptSelect/index' import { parseUrl } from '@/utils/parseutils' import AreaSelectTree from '@/components/AreaSelect/areaSelectTree' - +import { getSearchLastWeekTime } from '@/utils/dateutils' export default { name: 'ListCorrodeData', components: { DeptSelect, selectTree, AreaSelectTree }, @@ -155,6 +155,7 @@ if (params && params.deviceType === '8' && params.devcode) { this.listQuery.keywords = params.devcode } + this.timeRange = getSearchLastWeekTime() this.fetchData() } }, diff --git a/config/dev.env.js b/config/dev.env.js index 36f7d4a..1cab225 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -9,6 +9,6 @@ // BASE_API: '"http://42.81.160.165:2022/smartwell"' // BASE_API: '"http://111.198.10.15:11304"' // BASE_API: '"http://111.198.10.15:11643"' - // BASE_API: '"http://111.198.10.15:11409/smartwell"' //可以用 - BASE_API: '"http://192.168.43.66:11643/smartwell"' //彭先洪 + BASE_API: '"http://111.198.10.15:11409/smartwell"' //可以用 + // BASE_API: '"http://192.168.43.66:11643/smartwell"' //彭先洪 }) diff --git a/src/utils/baseConfig.js b/src/utils/baseConfig.js index cda5175..70f4159 100644 --- a/src/utils/baseConfig.js +++ b/src/utils/baseConfig.js @@ -1,6 +1,6 @@ const project = { // title: '供水管理系统' - title: '场区能源管理系统' + title: '生产及办公能耗管理系统' } export function getProject() { return project diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js index aa41264..11dc521 100644 --- a/src/utils/dateutils.js +++ b/src/utils/dateutils.js @@ -52,3 +52,13 @@ } return fmt } + +/** + * 获取近1周日期范围 + * @returns {*[]} + */ +export function getSearchLastWeekTime() { + const startTime = getLastWeek().Format('yyyy-MM-dd hh:mm:ss') + const endTime = getToday('yyyy-MM-dd hh:mm:ss') + return [startTime, endTime] +} diff --git a/src/views/dashboard/components/AlarmByDays.vue b/src/views/dashboard/components/AlarmByDays.vue index ddfd8e3..8a9a937 100644 --- a/src/views/dashboard/components/AlarmByDays.vue +++ b/src/views/dashboard/components/AlarmByDays.vue @@ -23,11 +23,11 @@ } this.chartSettings = { labelMap: { - '远传水表': '远传水表', + '远程水表': '远程水表', '噪声记录仪': '噪声记录仪', '液位监测仪': '液位监测仪' }, - metrics: ['远传水表', '噪声记录仪', '液位监测仪'], + metrics: ['远程水表', '噪声记录仪', '液位监测仪'], dimension: ['date'] } return { @@ -37,7 +37,7 @@ endTime: '' }, chartData: { - columns: ['date', '远传水表', '噪声记录仪', '液位监测仪'], + columns: ['date', '远程水表', '噪声记录仪', '液位监测仪'], rows: [] } } @@ -65,7 +65,7 @@ delete item.data return item }) - + this.chartData.rows = arr }) }, diff --git a/src/views/dataManage/dataManage.vue b/src/views/dataManage/dataManage.vue index fa1681b..494e254 100644 --- a/src/views/dataManage/dataManage.vue +++ b/src/views/dataManage/dataManage.vue @@ -25,7 +25,7 @@ - + diff --git a/src/views/dataManage/deviceData/gasFlowHistory.vue b/src/views/dataManage/deviceData/gasFlowHistory.vue index ec65c4d..e89b673 100644 --- a/src/views/dataManage/deviceData/gasFlowHistory.vue +++ b/src/views/dataManage/deviceData/gasFlowHistory.vue @@ -124,7 +124,7 @@ const downloadElement = document.createElement('a') const href = window.URL.createObjectURL(blob) // 创建下载的链接 downloadElement.href = href - downloadElement.download = `${this.listQuery.devCode}远传水表历史数据.xlsx` // 下载后文件名 + downloadElement.download = `${this.listQuery.devCode}远程水表历史数据.xlsx` // 下载后文件名 document.body.appendChild(downloadElement) downloadElement.click() // 点击下载 document.body.removeChild(downloadElement) // 下载完成移除元素 diff --git a/src/views/dataManage/deviceData/listCorrodeData.vue b/src/views/dataManage/deviceData/listCorrodeData.vue index 3cdb1f1..63e47c7 100644 --- a/src/views/dataManage/deviceData/listCorrodeData.vue +++ b/src/views/dataManage/deviceData/listCorrodeData.vue @@ -67,7 +67,7 @@ import DeptSelect from '../../../components/DeptSelect/index' import { parseUrl } from '@/utils/parseutils' import AreaSelectTree from '@/components/AreaSelect/areaSelectTree' - +import { getSearchLastWeekTime } from '@/utils/dateutils' export default { name: 'ListCorrodeData', components: { DeptSelect, selectTree, AreaSelectTree }, @@ -155,6 +155,7 @@ if (params && params.deviceType === '8' && params.devcode) { this.listQuery.keywords = params.devcode } + this.timeRange = getSearchLastWeekTime() this.fetchData() } }, diff --git a/src/views/dataManage/deviceData/listLiquidData.vue b/src/views/dataManage/deviceData/listLiquidData.vue index 01daf72..a276d24 100644 --- a/src/views/dataManage/deviceData/listLiquidData.vue +++ b/src/views/dataManage/deviceData/listLiquidData.vue @@ -60,7 +60,7 @@ import { getLiquidData, batchExportLiquidData } from '@/api/data' import DeptSelect from '../../../components/DeptSelect/index' import { parseUrl } from '@/utils/parseutils' - +import { getSearchLastWeekTime } from '@/utils/dateutils' export default { name: 'ListLiquidData', components: { DeptSelect, selectTree }, @@ -155,6 +155,7 @@ if (params && params.deviceType === '2' && params.devcode) { this.listQuery.keywords = params.devcode } + this.timeRange = getSearchLastWeekTime() this.fetchData() } }, diff --git a/config/dev.env.js b/config/dev.env.js index 36f7d4a..1cab225 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -9,6 +9,6 @@ // BASE_API: '"http://42.81.160.165:2022/smartwell"' // BASE_API: '"http://111.198.10.15:11304"' // BASE_API: '"http://111.198.10.15:11643"' - // BASE_API: '"http://111.198.10.15:11409/smartwell"' //可以用 - BASE_API: '"http://192.168.43.66:11643/smartwell"' //彭先洪 + BASE_API: '"http://111.198.10.15:11409/smartwell"' //可以用 + // BASE_API: '"http://192.168.43.66:11643/smartwell"' //彭先洪 }) diff --git a/src/utils/baseConfig.js b/src/utils/baseConfig.js index cda5175..70f4159 100644 --- a/src/utils/baseConfig.js +++ b/src/utils/baseConfig.js @@ -1,6 +1,6 @@ const project = { // title: '供水管理系统' - title: '场区能源管理系统' + title: '生产及办公能耗管理系统' } export function getProject() { return project diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js index aa41264..11dc521 100644 --- a/src/utils/dateutils.js +++ b/src/utils/dateutils.js @@ -52,3 +52,13 @@ } return fmt } + +/** + * 获取近1周日期范围 + * @returns {*[]} + */ +export function getSearchLastWeekTime() { + const startTime = getLastWeek().Format('yyyy-MM-dd hh:mm:ss') + const endTime = getToday('yyyy-MM-dd hh:mm:ss') + return [startTime, endTime] +} diff --git a/src/views/dashboard/components/AlarmByDays.vue b/src/views/dashboard/components/AlarmByDays.vue index ddfd8e3..8a9a937 100644 --- a/src/views/dashboard/components/AlarmByDays.vue +++ b/src/views/dashboard/components/AlarmByDays.vue @@ -23,11 +23,11 @@ } this.chartSettings = { labelMap: { - '远传水表': '远传水表', + '远程水表': '远程水表', '噪声记录仪': '噪声记录仪', '液位监测仪': '液位监测仪' }, - metrics: ['远传水表', '噪声记录仪', '液位监测仪'], + metrics: ['远程水表', '噪声记录仪', '液位监测仪'], dimension: ['date'] } return { @@ -37,7 +37,7 @@ endTime: '' }, chartData: { - columns: ['date', '远传水表', '噪声记录仪', '液位监测仪'], + columns: ['date', '远程水表', '噪声记录仪', '液位监测仪'], rows: [] } } @@ -65,7 +65,7 @@ delete item.data return item }) - + this.chartData.rows = arr }) }, diff --git a/src/views/dataManage/dataManage.vue b/src/views/dataManage/dataManage.vue index fa1681b..494e254 100644 --- a/src/views/dataManage/dataManage.vue +++ b/src/views/dataManage/dataManage.vue @@ -25,7 +25,7 @@ - + diff --git a/src/views/dataManage/deviceData/gasFlowHistory.vue b/src/views/dataManage/deviceData/gasFlowHistory.vue index ec65c4d..e89b673 100644 --- a/src/views/dataManage/deviceData/gasFlowHistory.vue +++ b/src/views/dataManage/deviceData/gasFlowHistory.vue @@ -124,7 +124,7 @@ const downloadElement = document.createElement('a') const href = window.URL.createObjectURL(blob) // 创建下载的链接 downloadElement.href = href - downloadElement.download = `${this.listQuery.devCode}远传水表历史数据.xlsx` // 下载后文件名 + downloadElement.download = `${this.listQuery.devCode}远程水表历史数据.xlsx` // 下载后文件名 document.body.appendChild(downloadElement) downloadElement.click() // 点击下载 document.body.removeChild(downloadElement) // 下载完成移除元素 diff --git a/src/views/dataManage/deviceData/listCorrodeData.vue b/src/views/dataManage/deviceData/listCorrodeData.vue index 3cdb1f1..63e47c7 100644 --- a/src/views/dataManage/deviceData/listCorrodeData.vue +++ b/src/views/dataManage/deviceData/listCorrodeData.vue @@ -67,7 +67,7 @@ import DeptSelect from '../../../components/DeptSelect/index' import { parseUrl } from '@/utils/parseutils' import AreaSelectTree from '@/components/AreaSelect/areaSelectTree' - +import { getSearchLastWeekTime } from '@/utils/dateutils' export default { name: 'ListCorrodeData', components: { DeptSelect, selectTree, AreaSelectTree }, @@ -155,6 +155,7 @@ if (params && params.deviceType === '8' && params.devcode) { this.listQuery.keywords = params.devcode } + this.timeRange = getSearchLastWeekTime() this.fetchData() } }, diff --git a/src/views/dataManage/deviceData/listLiquidData.vue b/src/views/dataManage/deviceData/listLiquidData.vue index 01daf72..a276d24 100644 --- a/src/views/dataManage/deviceData/listLiquidData.vue +++ b/src/views/dataManage/deviceData/listLiquidData.vue @@ -60,7 +60,7 @@ import { getLiquidData, batchExportLiquidData } from '@/api/data' import DeptSelect from '../../../components/DeptSelect/index' import { parseUrl } from '@/utils/parseutils' - +import { getSearchLastWeekTime } from '@/utils/dateutils' export default { name: 'ListLiquidData', components: { DeptSelect, selectTree }, @@ -155,6 +155,7 @@ if (params && params.deviceType === '2' && params.devcode) { this.listQuery.keywords = params.devcode } + this.timeRange = getSearchLastWeekTime() this.fetchData() } }, diff --git a/src/views/dataManage/deviceData/listNoiseData.vue b/src/views/dataManage/deviceData/listNoiseData.vue index 699b56a..935f06c 100644 --- a/src/views/dataManage/deviceData/listNoiseData.vue +++ b/src/views/dataManage/deviceData/listNoiseData.vue @@ -63,7 +63,7 @@ import { getNoiseData, batchExportNoiseData } from '@/api/data' import DeptSelect from '../../../components/DeptSelect/index' import { parseUrl } from '@/utils/parseutils' - +import { getSearchLastWeekTime } from '@/utils/dateutils' export default { name: 'ListNoiseData', components: { DeptSelect, selectTree }, @@ -165,6 +165,7 @@ if (params && params.deviceType === '8' && params.devcode) { this.listQuery.keywords = params.devcode } + this.timeRange = getSearchLastWeekTime() this.fetchData() } }, @@ -193,7 +194,7 @@ const downloadElement = document.createElement('a') const href = window.URL.createObjectURL(blob) // 创建下载的链接 downloadElement.href = href - downloadElement.download = `噪声记录仪数据.xlsx` // 下载后文件名 + downloadElement.download = `供水泄漏监测仪数据.xlsx` // 下载后文件名 document.body.appendChild(downloadElement) downloadElement.click() // 点击下载 document.body.removeChild(downloadElement) // 下载完成移除元素 diff --git a/config/dev.env.js b/config/dev.env.js index 36f7d4a..1cab225 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -9,6 +9,6 @@ // BASE_API: '"http://42.81.160.165:2022/smartwell"' // BASE_API: '"http://111.198.10.15:11304"' // BASE_API: '"http://111.198.10.15:11643"' - // BASE_API: '"http://111.198.10.15:11409/smartwell"' //可以用 - BASE_API: '"http://192.168.43.66:11643/smartwell"' //彭先洪 + BASE_API: '"http://111.198.10.15:11409/smartwell"' //可以用 + // BASE_API: '"http://192.168.43.66:11643/smartwell"' //彭先洪 }) diff --git a/src/utils/baseConfig.js b/src/utils/baseConfig.js index cda5175..70f4159 100644 --- a/src/utils/baseConfig.js +++ b/src/utils/baseConfig.js @@ -1,6 +1,6 @@ const project = { // title: '供水管理系统' - title: '场区能源管理系统' + title: '生产及办公能耗管理系统' } export function getProject() { return project diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js index aa41264..11dc521 100644 --- a/src/utils/dateutils.js +++ b/src/utils/dateutils.js @@ -52,3 +52,13 @@ } return fmt } + +/** + * 获取近1周日期范围 + * @returns {*[]} + */ +export function getSearchLastWeekTime() { + const startTime = getLastWeek().Format('yyyy-MM-dd hh:mm:ss') + const endTime = getToday('yyyy-MM-dd hh:mm:ss') + return [startTime, endTime] +} diff --git a/src/views/dashboard/components/AlarmByDays.vue b/src/views/dashboard/components/AlarmByDays.vue index ddfd8e3..8a9a937 100644 --- a/src/views/dashboard/components/AlarmByDays.vue +++ b/src/views/dashboard/components/AlarmByDays.vue @@ -23,11 +23,11 @@ } this.chartSettings = { labelMap: { - '远传水表': '远传水表', + '远程水表': '远程水表', '噪声记录仪': '噪声记录仪', '液位监测仪': '液位监测仪' }, - metrics: ['远传水表', '噪声记录仪', '液位监测仪'], + metrics: ['远程水表', '噪声记录仪', '液位监测仪'], dimension: ['date'] } return { @@ -37,7 +37,7 @@ endTime: '' }, chartData: { - columns: ['date', '远传水表', '噪声记录仪', '液位监测仪'], + columns: ['date', '远程水表', '噪声记录仪', '液位监测仪'], rows: [] } } @@ -65,7 +65,7 @@ delete item.data return item }) - + this.chartData.rows = arr }) }, diff --git a/src/views/dataManage/dataManage.vue b/src/views/dataManage/dataManage.vue index fa1681b..494e254 100644 --- a/src/views/dataManage/dataManage.vue +++ b/src/views/dataManage/dataManage.vue @@ -25,7 +25,7 @@ - + diff --git a/src/views/dataManage/deviceData/gasFlowHistory.vue b/src/views/dataManage/deviceData/gasFlowHistory.vue index ec65c4d..e89b673 100644 --- a/src/views/dataManage/deviceData/gasFlowHistory.vue +++ b/src/views/dataManage/deviceData/gasFlowHistory.vue @@ -124,7 +124,7 @@ const downloadElement = document.createElement('a') const href = window.URL.createObjectURL(blob) // 创建下载的链接 downloadElement.href = href - downloadElement.download = `${this.listQuery.devCode}远传水表历史数据.xlsx` // 下载后文件名 + downloadElement.download = `${this.listQuery.devCode}远程水表历史数据.xlsx` // 下载后文件名 document.body.appendChild(downloadElement) downloadElement.click() // 点击下载 document.body.removeChild(downloadElement) // 下载完成移除元素 diff --git a/src/views/dataManage/deviceData/listCorrodeData.vue b/src/views/dataManage/deviceData/listCorrodeData.vue index 3cdb1f1..63e47c7 100644 --- a/src/views/dataManage/deviceData/listCorrodeData.vue +++ b/src/views/dataManage/deviceData/listCorrodeData.vue @@ -67,7 +67,7 @@ import DeptSelect from '../../../components/DeptSelect/index' import { parseUrl } from '@/utils/parseutils' import AreaSelectTree from '@/components/AreaSelect/areaSelectTree' - +import { getSearchLastWeekTime } from '@/utils/dateutils' export default { name: 'ListCorrodeData', components: { DeptSelect, selectTree, AreaSelectTree }, @@ -155,6 +155,7 @@ if (params && params.deviceType === '8' && params.devcode) { this.listQuery.keywords = params.devcode } + this.timeRange = getSearchLastWeekTime() this.fetchData() } }, diff --git a/src/views/dataManage/deviceData/listLiquidData.vue b/src/views/dataManage/deviceData/listLiquidData.vue index 01daf72..a276d24 100644 --- a/src/views/dataManage/deviceData/listLiquidData.vue +++ b/src/views/dataManage/deviceData/listLiquidData.vue @@ -60,7 +60,7 @@ import { getLiquidData, batchExportLiquidData } from '@/api/data' import DeptSelect from '../../../components/DeptSelect/index' import { parseUrl } from '@/utils/parseutils' - +import { getSearchLastWeekTime } from '@/utils/dateutils' export default { name: 'ListLiquidData', components: { DeptSelect, selectTree }, @@ -155,6 +155,7 @@ if (params && params.deviceType === '2' && params.devcode) { this.listQuery.keywords = params.devcode } + this.timeRange = getSearchLastWeekTime() this.fetchData() } }, diff --git a/src/views/dataManage/deviceData/listNoiseData.vue b/src/views/dataManage/deviceData/listNoiseData.vue index 699b56a..935f06c 100644 --- a/src/views/dataManage/deviceData/listNoiseData.vue +++ b/src/views/dataManage/deviceData/listNoiseData.vue @@ -63,7 +63,7 @@ import { getNoiseData, batchExportNoiseData } from '@/api/data' import DeptSelect from '../../../components/DeptSelect/index' import { parseUrl } from '@/utils/parseutils' - +import { getSearchLastWeekTime } from '@/utils/dateutils' export default { name: 'ListNoiseData', components: { DeptSelect, selectTree }, @@ -165,6 +165,7 @@ if (params && params.deviceType === '8' && params.devcode) { this.listQuery.keywords = params.devcode } + this.timeRange = getSearchLastWeekTime() this.fetchData() } }, @@ -193,7 +194,7 @@ const downloadElement = document.createElement('a') const href = window.URL.createObjectURL(blob) // 创建下载的链接 downloadElement.href = href - downloadElement.download = `噪声记录仪数据.xlsx` // 下载后文件名 + downloadElement.download = `供水泄漏监测仪数据.xlsx` // 下载后文件名 document.body.appendChild(downloadElement) downloadElement.click() // 点击下载 document.body.removeChild(downloadElement) // 下载完成移除元素 diff --git a/src/views/dataManage/deviceData/listWaterData.vue b/src/views/dataManage/deviceData/listWaterData.vue index 2515720..5e6a693 100644 --- a/src/views/dataManage/deviceData/listWaterData.vue +++ b/src/views/dataManage/deviceData/listWaterData.vue @@ -282,7 +282,7 @@ const downloadElement = document.createElement('a') const href = window.URL.createObjectURL(blob) // 创建下载的链接 downloadElement.href = href - downloadElement.download = `远传水表数据.xlsx` // 下载后文件名 + downloadElement.download = `远程水表数据.xlsx` // 下载后文件名 document.body.appendChild(downloadElement) downloadElement.click() // 点击下载 document.body.removeChild(downloadElement) // 下载完成移除元素 diff --git a/config/dev.env.js b/config/dev.env.js index 36f7d4a..1cab225 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -9,6 +9,6 @@ // BASE_API: '"http://42.81.160.165:2022/smartwell"' // BASE_API: '"http://111.198.10.15:11304"' // BASE_API: '"http://111.198.10.15:11643"' - // BASE_API: '"http://111.198.10.15:11409/smartwell"' //可以用 - BASE_API: '"http://192.168.43.66:11643/smartwell"' //彭先洪 + BASE_API: '"http://111.198.10.15:11409/smartwell"' //可以用 + // BASE_API: '"http://192.168.43.66:11643/smartwell"' //彭先洪 }) diff --git a/src/utils/baseConfig.js b/src/utils/baseConfig.js index cda5175..70f4159 100644 --- a/src/utils/baseConfig.js +++ b/src/utils/baseConfig.js @@ -1,6 +1,6 @@ const project = { // title: '供水管理系统' - title: '场区能源管理系统' + title: '生产及办公能耗管理系统' } export function getProject() { return project diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js index aa41264..11dc521 100644 --- a/src/utils/dateutils.js +++ b/src/utils/dateutils.js @@ -52,3 +52,13 @@ } return fmt } + +/** + * 获取近1周日期范围 + * @returns {*[]} + */ +export function getSearchLastWeekTime() { + const startTime = getLastWeek().Format('yyyy-MM-dd hh:mm:ss') + const endTime = getToday('yyyy-MM-dd hh:mm:ss') + return [startTime, endTime] +} diff --git a/src/views/dashboard/components/AlarmByDays.vue b/src/views/dashboard/components/AlarmByDays.vue index ddfd8e3..8a9a937 100644 --- a/src/views/dashboard/components/AlarmByDays.vue +++ b/src/views/dashboard/components/AlarmByDays.vue @@ -23,11 +23,11 @@ } this.chartSettings = { labelMap: { - '远传水表': '远传水表', + '远程水表': '远程水表', '噪声记录仪': '噪声记录仪', '液位监测仪': '液位监测仪' }, - metrics: ['远传水表', '噪声记录仪', '液位监测仪'], + metrics: ['远程水表', '噪声记录仪', '液位监测仪'], dimension: ['date'] } return { @@ -37,7 +37,7 @@ endTime: '' }, chartData: { - columns: ['date', '远传水表', '噪声记录仪', '液位监测仪'], + columns: ['date', '远程水表', '噪声记录仪', '液位监测仪'], rows: [] } } @@ -65,7 +65,7 @@ delete item.data return item }) - + this.chartData.rows = arr }) }, diff --git a/src/views/dataManage/dataManage.vue b/src/views/dataManage/dataManage.vue index fa1681b..494e254 100644 --- a/src/views/dataManage/dataManage.vue +++ b/src/views/dataManage/dataManage.vue @@ -25,7 +25,7 @@ - + diff --git a/src/views/dataManage/deviceData/gasFlowHistory.vue b/src/views/dataManage/deviceData/gasFlowHistory.vue index ec65c4d..e89b673 100644 --- a/src/views/dataManage/deviceData/gasFlowHistory.vue +++ b/src/views/dataManage/deviceData/gasFlowHistory.vue @@ -124,7 +124,7 @@ const downloadElement = document.createElement('a') const href = window.URL.createObjectURL(blob) // 创建下载的链接 downloadElement.href = href - downloadElement.download = `${this.listQuery.devCode}远传水表历史数据.xlsx` // 下载后文件名 + downloadElement.download = `${this.listQuery.devCode}远程水表历史数据.xlsx` // 下载后文件名 document.body.appendChild(downloadElement) downloadElement.click() // 点击下载 document.body.removeChild(downloadElement) // 下载完成移除元素 diff --git a/src/views/dataManage/deviceData/listCorrodeData.vue b/src/views/dataManage/deviceData/listCorrodeData.vue index 3cdb1f1..63e47c7 100644 --- a/src/views/dataManage/deviceData/listCorrodeData.vue +++ b/src/views/dataManage/deviceData/listCorrodeData.vue @@ -67,7 +67,7 @@ import DeptSelect from '../../../components/DeptSelect/index' import { parseUrl } from '@/utils/parseutils' import AreaSelectTree from '@/components/AreaSelect/areaSelectTree' - +import { getSearchLastWeekTime } from '@/utils/dateutils' export default { name: 'ListCorrodeData', components: { DeptSelect, selectTree, AreaSelectTree }, @@ -155,6 +155,7 @@ if (params && params.deviceType === '8' && params.devcode) { this.listQuery.keywords = params.devcode } + this.timeRange = getSearchLastWeekTime() this.fetchData() } }, diff --git a/src/views/dataManage/deviceData/listLiquidData.vue b/src/views/dataManage/deviceData/listLiquidData.vue index 01daf72..a276d24 100644 --- a/src/views/dataManage/deviceData/listLiquidData.vue +++ b/src/views/dataManage/deviceData/listLiquidData.vue @@ -60,7 +60,7 @@ import { getLiquidData, batchExportLiquidData } from '@/api/data' import DeptSelect from '../../../components/DeptSelect/index' import { parseUrl } from '@/utils/parseutils' - +import { getSearchLastWeekTime } from '@/utils/dateutils' export default { name: 'ListLiquidData', components: { DeptSelect, selectTree }, @@ -155,6 +155,7 @@ if (params && params.deviceType === '2' && params.devcode) { this.listQuery.keywords = params.devcode } + this.timeRange = getSearchLastWeekTime() this.fetchData() } }, diff --git a/src/views/dataManage/deviceData/listNoiseData.vue b/src/views/dataManage/deviceData/listNoiseData.vue index 699b56a..935f06c 100644 --- a/src/views/dataManage/deviceData/listNoiseData.vue +++ b/src/views/dataManage/deviceData/listNoiseData.vue @@ -63,7 +63,7 @@ import { getNoiseData, batchExportNoiseData } from '@/api/data' import DeptSelect from '../../../components/DeptSelect/index' import { parseUrl } from '@/utils/parseutils' - +import { getSearchLastWeekTime } from '@/utils/dateutils' export default { name: 'ListNoiseData', components: { DeptSelect, selectTree }, @@ -165,6 +165,7 @@ if (params && params.deviceType === '8' && params.devcode) { this.listQuery.keywords = params.devcode } + this.timeRange = getSearchLastWeekTime() this.fetchData() } }, @@ -193,7 +194,7 @@ const downloadElement = document.createElement('a') const href = window.URL.createObjectURL(blob) // 创建下载的链接 downloadElement.href = href - downloadElement.download = `噪声记录仪数据.xlsx` // 下载后文件名 + downloadElement.download = `供水泄漏监测仪数据.xlsx` // 下载后文件名 document.body.appendChild(downloadElement) downloadElement.click() // 点击下载 document.body.removeChild(downloadElement) // 下载完成移除元素 diff --git a/src/views/dataManage/deviceData/listWaterData.vue b/src/views/dataManage/deviceData/listWaterData.vue index 2515720..5e6a693 100644 --- a/src/views/dataManage/deviceData/listWaterData.vue +++ b/src/views/dataManage/deviceData/listWaterData.vue @@ -282,7 +282,7 @@ const downloadElement = document.createElement('a') const href = window.URL.createObjectURL(blob) // 创建下载的链接 downloadElement.href = href - downloadElement.download = `远传水表数据.xlsx` // 下载后文件名 + downloadElement.download = `远程水表数据.xlsx` // 下载后文件名 document.body.appendChild(downloadElement) downloadElement.click() // 点击下载 document.body.removeChild(downloadElement) // 下载完成移除元素 diff --git a/src/views/dataManage/deviceData/waterHistory.vue b/src/views/dataManage/deviceData/waterHistory.vue index 1330807..42e3303 100644 --- a/src/views/dataManage/deviceData/waterHistory.vue +++ b/src/views/dataManage/deviceData/waterHistory.vue @@ -88,7 +88,7 @@ const downloadElement = document.createElement('a') const href = window.URL.createObjectURL(blob) // 创建下载的链接 downloadElement.href = href - downloadElement.download = `${this.listQuery.devCode}远传水表历史数据.xlsx` // 下载后文件名 + downloadElement.download = `${this.listQuery.devCode}远程水表历史数据.xlsx` // 下载后文件名 document.body.appendChild(downloadElement) downloadElement.click() // 点击下载 document.body.removeChild(downloadElement) // 下载完成移除元素 diff --git a/config/dev.env.js b/config/dev.env.js index 36f7d4a..1cab225 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -9,6 +9,6 @@ // BASE_API: '"http://42.81.160.165:2022/smartwell"' // BASE_API: '"http://111.198.10.15:11304"' // BASE_API: '"http://111.198.10.15:11643"' - // BASE_API: '"http://111.198.10.15:11409/smartwell"' //可以用 - BASE_API: '"http://192.168.43.66:11643/smartwell"' //彭先洪 + BASE_API: '"http://111.198.10.15:11409/smartwell"' //可以用 + // BASE_API: '"http://192.168.43.66:11643/smartwell"' //彭先洪 }) diff --git a/src/utils/baseConfig.js b/src/utils/baseConfig.js index cda5175..70f4159 100644 --- a/src/utils/baseConfig.js +++ b/src/utils/baseConfig.js @@ -1,6 +1,6 @@ const project = { // title: '供水管理系统' - title: '场区能源管理系统' + title: '生产及办公能耗管理系统' } export function getProject() { return project diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js index aa41264..11dc521 100644 --- a/src/utils/dateutils.js +++ b/src/utils/dateutils.js @@ -52,3 +52,13 @@ } return fmt } + +/** + * 获取近1周日期范围 + * @returns {*[]} + */ +export function getSearchLastWeekTime() { + const startTime = getLastWeek().Format('yyyy-MM-dd hh:mm:ss') + const endTime = getToday('yyyy-MM-dd hh:mm:ss') + return [startTime, endTime] +} diff --git a/src/views/dashboard/components/AlarmByDays.vue b/src/views/dashboard/components/AlarmByDays.vue index ddfd8e3..8a9a937 100644 --- a/src/views/dashboard/components/AlarmByDays.vue +++ b/src/views/dashboard/components/AlarmByDays.vue @@ -23,11 +23,11 @@ } this.chartSettings = { labelMap: { - '远传水表': '远传水表', + '远程水表': '远程水表', '噪声记录仪': '噪声记录仪', '液位监测仪': '液位监测仪' }, - metrics: ['远传水表', '噪声记录仪', '液位监测仪'], + metrics: ['远程水表', '噪声记录仪', '液位监测仪'], dimension: ['date'] } return { @@ -37,7 +37,7 @@ endTime: '' }, chartData: { - columns: ['date', '远传水表', '噪声记录仪', '液位监测仪'], + columns: ['date', '远程水表', '噪声记录仪', '液位监测仪'], rows: [] } } @@ -65,7 +65,7 @@ delete item.data return item }) - + this.chartData.rows = arr }) }, diff --git a/src/views/dataManage/dataManage.vue b/src/views/dataManage/dataManage.vue index fa1681b..494e254 100644 --- a/src/views/dataManage/dataManage.vue +++ b/src/views/dataManage/dataManage.vue @@ -25,7 +25,7 @@ - + diff --git a/src/views/dataManage/deviceData/gasFlowHistory.vue b/src/views/dataManage/deviceData/gasFlowHistory.vue index ec65c4d..e89b673 100644 --- a/src/views/dataManage/deviceData/gasFlowHistory.vue +++ b/src/views/dataManage/deviceData/gasFlowHistory.vue @@ -124,7 +124,7 @@ const downloadElement = document.createElement('a') const href = window.URL.createObjectURL(blob) // 创建下载的链接 downloadElement.href = href - downloadElement.download = `${this.listQuery.devCode}远传水表历史数据.xlsx` // 下载后文件名 + downloadElement.download = `${this.listQuery.devCode}远程水表历史数据.xlsx` // 下载后文件名 document.body.appendChild(downloadElement) downloadElement.click() // 点击下载 document.body.removeChild(downloadElement) // 下载完成移除元素 diff --git a/src/views/dataManage/deviceData/listCorrodeData.vue b/src/views/dataManage/deviceData/listCorrodeData.vue index 3cdb1f1..63e47c7 100644 --- a/src/views/dataManage/deviceData/listCorrodeData.vue +++ b/src/views/dataManage/deviceData/listCorrodeData.vue @@ -67,7 +67,7 @@ import DeptSelect from '../../../components/DeptSelect/index' import { parseUrl } from '@/utils/parseutils' import AreaSelectTree from '@/components/AreaSelect/areaSelectTree' - +import { getSearchLastWeekTime } from '@/utils/dateutils' export default { name: 'ListCorrodeData', components: { DeptSelect, selectTree, AreaSelectTree }, @@ -155,6 +155,7 @@ if (params && params.deviceType === '8' && params.devcode) { this.listQuery.keywords = params.devcode } + this.timeRange = getSearchLastWeekTime() this.fetchData() } }, diff --git a/src/views/dataManage/deviceData/listLiquidData.vue b/src/views/dataManage/deviceData/listLiquidData.vue index 01daf72..a276d24 100644 --- a/src/views/dataManage/deviceData/listLiquidData.vue +++ b/src/views/dataManage/deviceData/listLiquidData.vue @@ -60,7 +60,7 @@ import { getLiquidData, batchExportLiquidData } from '@/api/data' import DeptSelect from '../../../components/DeptSelect/index' import { parseUrl } from '@/utils/parseutils' - +import { getSearchLastWeekTime } from '@/utils/dateutils' export default { name: 'ListLiquidData', components: { DeptSelect, selectTree }, @@ -155,6 +155,7 @@ if (params && params.deviceType === '2' && params.devcode) { this.listQuery.keywords = params.devcode } + this.timeRange = getSearchLastWeekTime() this.fetchData() } }, diff --git a/src/views/dataManage/deviceData/listNoiseData.vue b/src/views/dataManage/deviceData/listNoiseData.vue index 699b56a..935f06c 100644 --- a/src/views/dataManage/deviceData/listNoiseData.vue +++ b/src/views/dataManage/deviceData/listNoiseData.vue @@ -63,7 +63,7 @@ import { getNoiseData, batchExportNoiseData } from '@/api/data' import DeptSelect from '../../../components/DeptSelect/index' import { parseUrl } from '@/utils/parseutils' - +import { getSearchLastWeekTime } from '@/utils/dateutils' export default { name: 'ListNoiseData', components: { DeptSelect, selectTree }, @@ -165,6 +165,7 @@ if (params && params.deviceType === '8' && params.devcode) { this.listQuery.keywords = params.devcode } + this.timeRange = getSearchLastWeekTime() this.fetchData() } }, @@ -193,7 +194,7 @@ const downloadElement = document.createElement('a') const href = window.URL.createObjectURL(blob) // 创建下载的链接 downloadElement.href = href - downloadElement.download = `噪声记录仪数据.xlsx` // 下载后文件名 + downloadElement.download = `供水泄漏监测仪数据.xlsx` // 下载后文件名 document.body.appendChild(downloadElement) downloadElement.click() // 点击下载 document.body.removeChild(downloadElement) // 下载完成移除元素 diff --git a/src/views/dataManage/deviceData/listWaterData.vue b/src/views/dataManage/deviceData/listWaterData.vue index 2515720..5e6a693 100644 --- a/src/views/dataManage/deviceData/listWaterData.vue +++ b/src/views/dataManage/deviceData/listWaterData.vue @@ -282,7 +282,7 @@ const downloadElement = document.createElement('a') const href = window.URL.createObjectURL(blob) // 创建下载的链接 downloadElement.href = href - downloadElement.download = `远传水表数据.xlsx` // 下载后文件名 + downloadElement.download = `远程水表数据.xlsx` // 下载后文件名 document.body.appendChild(downloadElement) downloadElement.click() // 点击下载 document.body.removeChild(downloadElement) // 下载完成移除元素 diff --git a/src/views/dataManage/deviceData/waterHistory.vue b/src/views/dataManage/deviceData/waterHistory.vue index 1330807..42e3303 100644 --- a/src/views/dataManage/deviceData/waterHistory.vue +++ b/src/views/dataManage/deviceData/waterHistory.vue @@ -88,7 +88,7 @@ const downloadElement = document.createElement('a') const href = window.URL.createObjectURL(blob) // 创建下载的链接 downloadElement.href = href - downloadElement.download = `${this.listQuery.devCode}远传水表历史数据.xlsx` // 下载后文件名 + downloadElement.download = `${this.listQuery.devCode}远程水表历史数据.xlsx` // 下载后文件名 document.body.appendChild(downloadElement) downloadElement.click() // 点击下载 document.body.removeChild(downloadElement) // 下载完成移除元素 diff --git a/src/views/gasDashboard/components/PanelGroup.vue b/src/views/gasDashboard/components/PanelGroup.vue index eead839..803b666 100644 --- a/src/views/gasDashboard/components/PanelGroup.vue +++ b/src/views/gasDashboard/components/PanelGroup.vue @@ -56,7 +56,7 @@ context: '--', icon: 'icon-watch', color: '#9694f7', - path: '/deviceList?deviceType=13', + path: '/deviceList?deviceType=15', permission: '/device/list' }, { diff --git a/config/dev.env.js b/config/dev.env.js index 36f7d4a..1cab225 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -9,6 +9,6 @@ // BASE_API: '"http://42.81.160.165:2022/smartwell"' // BASE_API: '"http://111.198.10.15:11304"' // BASE_API: '"http://111.198.10.15:11643"' - // BASE_API: '"http://111.198.10.15:11409/smartwell"' //可以用 - BASE_API: '"http://192.168.43.66:11643/smartwell"' //彭先洪 + BASE_API: '"http://111.198.10.15:11409/smartwell"' //可以用 + // BASE_API: '"http://192.168.43.66:11643/smartwell"' //彭先洪 }) diff --git a/src/utils/baseConfig.js b/src/utils/baseConfig.js index cda5175..70f4159 100644 --- a/src/utils/baseConfig.js +++ b/src/utils/baseConfig.js @@ -1,6 +1,6 @@ const project = { // title: '供水管理系统' - title: '场区能源管理系统' + title: '生产及办公能耗管理系统' } export function getProject() { return project diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js index aa41264..11dc521 100644 --- a/src/utils/dateutils.js +++ b/src/utils/dateutils.js @@ -52,3 +52,13 @@ } return fmt } + +/** + * 获取近1周日期范围 + * @returns {*[]} + */ +export function getSearchLastWeekTime() { + const startTime = getLastWeek().Format('yyyy-MM-dd hh:mm:ss') + const endTime = getToday('yyyy-MM-dd hh:mm:ss') + return [startTime, endTime] +} diff --git a/src/views/dashboard/components/AlarmByDays.vue b/src/views/dashboard/components/AlarmByDays.vue index ddfd8e3..8a9a937 100644 --- a/src/views/dashboard/components/AlarmByDays.vue +++ b/src/views/dashboard/components/AlarmByDays.vue @@ -23,11 +23,11 @@ } this.chartSettings = { labelMap: { - '远传水表': '远传水表', + '远程水表': '远程水表', '噪声记录仪': '噪声记录仪', '液位监测仪': '液位监测仪' }, - metrics: ['远传水表', '噪声记录仪', '液位监测仪'], + metrics: ['远程水表', '噪声记录仪', '液位监测仪'], dimension: ['date'] } return { @@ -37,7 +37,7 @@ endTime: '' }, chartData: { - columns: ['date', '远传水表', '噪声记录仪', '液位监测仪'], + columns: ['date', '远程水表', '噪声记录仪', '液位监测仪'], rows: [] } } @@ -65,7 +65,7 @@ delete item.data return item }) - + this.chartData.rows = arr }) }, diff --git a/src/views/dataManage/dataManage.vue b/src/views/dataManage/dataManage.vue index fa1681b..494e254 100644 --- a/src/views/dataManage/dataManage.vue +++ b/src/views/dataManage/dataManage.vue @@ -25,7 +25,7 @@ - + diff --git a/src/views/dataManage/deviceData/gasFlowHistory.vue b/src/views/dataManage/deviceData/gasFlowHistory.vue index ec65c4d..e89b673 100644 --- a/src/views/dataManage/deviceData/gasFlowHistory.vue +++ b/src/views/dataManage/deviceData/gasFlowHistory.vue @@ -124,7 +124,7 @@ const downloadElement = document.createElement('a') const href = window.URL.createObjectURL(blob) // 创建下载的链接 downloadElement.href = href - downloadElement.download = `${this.listQuery.devCode}远传水表历史数据.xlsx` // 下载后文件名 + downloadElement.download = `${this.listQuery.devCode}远程水表历史数据.xlsx` // 下载后文件名 document.body.appendChild(downloadElement) downloadElement.click() // 点击下载 document.body.removeChild(downloadElement) // 下载完成移除元素 diff --git a/src/views/dataManage/deviceData/listCorrodeData.vue b/src/views/dataManage/deviceData/listCorrodeData.vue index 3cdb1f1..63e47c7 100644 --- a/src/views/dataManage/deviceData/listCorrodeData.vue +++ b/src/views/dataManage/deviceData/listCorrodeData.vue @@ -67,7 +67,7 @@ import DeptSelect from '../../../components/DeptSelect/index' import { parseUrl } from '@/utils/parseutils' import AreaSelectTree from '@/components/AreaSelect/areaSelectTree' - +import { getSearchLastWeekTime } from '@/utils/dateutils' export default { name: 'ListCorrodeData', components: { DeptSelect, selectTree, AreaSelectTree }, @@ -155,6 +155,7 @@ if (params && params.deviceType === '8' && params.devcode) { this.listQuery.keywords = params.devcode } + this.timeRange = getSearchLastWeekTime() this.fetchData() } }, diff --git a/src/views/dataManage/deviceData/listLiquidData.vue b/src/views/dataManage/deviceData/listLiquidData.vue index 01daf72..a276d24 100644 --- a/src/views/dataManage/deviceData/listLiquidData.vue +++ b/src/views/dataManage/deviceData/listLiquidData.vue @@ -60,7 +60,7 @@ import { getLiquidData, batchExportLiquidData } from '@/api/data' import DeptSelect from '../../../components/DeptSelect/index' import { parseUrl } from '@/utils/parseutils' - +import { getSearchLastWeekTime } from '@/utils/dateutils' export default { name: 'ListLiquidData', components: { DeptSelect, selectTree }, @@ -155,6 +155,7 @@ if (params && params.deviceType === '2' && params.devcode) { this.listQuery.keywords = params.devcode } + this.timeRange = getSearchLastWeekTime() this.fetchData() } }, diff --git a/src/views/dataManage/deviceData/listNoiseData.vue b/src/views/dataManage/deviceData/listNoiseData.vue index 699b56a..935f06c 100644 --- a/src/views/dataManage/deviceData/listNoiseData.vue +++ b/src/views/dataManage/deviceData/listNoiseData.vue @@ -63,7 +63,7 @@ import { getNoiseData, batchExportNoiseData } from '@/api/data' import DeptSelect from '../../../components/DeptSelect/index' import { parseUrl } from '@/utils/parseutils' - +import { getSearchLastWeekTime } from '@/utils/dateutils' export default { name: 'ListNoiseData', components: { DeptSelect, selectTree }, @@ -165,6 +165,7 @@ if (params && params.deviceType === '8' && params.devcode) { this.listQuery.keywords = params.devcode } + this.timeRange = getSearchLastWeekTime() this.fetchData() } }, @@ -193,7 +194,7 @@ const downloadElement = document.createElement('a') const href = window.URL.createObjectURL(blob) // 创建下载的链接 downloadElement.href = href - downloadElement.download = `噪声记录仪数据.xlsx` // 下载后文件名 + downloadElement.download = `供水泄漏监测仪数据.xlsx` // 下载后文件名 document.body.appendChild(downloadElement) downloadElement.click() // 点击下载 document.body.removeChild(downloadElement) // 下载完成移除元素 diff --git a/src/views/dataManage/deviceData/listWaterData.vue b/src/views/dataManage/deviceData/listWaterData.vue index 2515720..5e6a693 100644 --- a/src/views/dataManage/deviceData/listWaterData.vue +++ b/src/views/dataManage/deviceData/listWaterData.vue @@ -282,7 +282,7 @@ const downloadElement = document.createElement('a') const href = window.URL.createObjectURL(blob) // 创建下载的链接 downloadElement.href = href - downloadElement.download = `远传水表数据.xlsx` // 下载后文件名 + downloadElement.download = `远程水表数据.xlsx` // 下载后文件名 document.body.appendChild(downloadElement) downloadElement.click() // 点击下载 document.body.removeChild(downloadElement) // 下载完成移除元素 diff --git a/src/views/dataManage/deviceData/waterHistory.vue b/src/views/dataManage/deviceData/waterHistory.vue index 1330807..42e3303 100644 --- a/src/views/dataManage/deviceData/waterHistory.vue +++ b/src/views/dataManage/deviceData/waterHistory.vue @@ -88,7 +88,7 @@ const downloadElement = document.createElement('a') const href = window.URL.createObjectURL(blob) // 创建下载的链接 downloadElement.href = href - downloadElement.download = `${this.listQuery.devCode}远传水表历史数据.xlsx` // 下载后文件名 + downloadElement.download = `${this.listQuery.devCode}远程水表历史数据.xlsx` // 下载后文件名 document.body.appendChild(downloadElement) downloadElement.click() // 点击下载 document.body.removeChild(downloadElement) // 下载完成移除元素 diff --git a/src/views/gasDashboard/components/PanelGroup.vue b/src/views/gasDashboard/components/PanelGroup.vue index eead839..803b666 100644 --- a/src/views/gasDashboard/components/PanelGroup.vue +++ b/src/views/gasDashboard/components/PanelGroup.vue @@ -56,7 +56,7 @@ context: '--', icon: 'icon-watch', color: '#9694f7', - path: '/deviceList?deviceType=13', + path: '/deviceList?deviceType=15', permission: '/device/list' }, { diff --git a/src/views/gasOverview/gasOverviewSimple.vue b/src/views/gasOverview/gasOverviewSimple.vue index 585ab8a..5691e51 100644 --- a/src/views/gasOverview/gasOverviewSimple.vue +++ b/src/views/gasOverview/gasOverviewSimple.vue @@ -5,7 +5,7 @@ - + 搜索 @@ -36,7 +36,7 @@ -
+
告警列表 @@ -48,10 +48,10 @@ @@ -106,7 +106,7 @@ data() { return { screenHeight: null, - checkedCities: ['腐蚀速率监测仪', '气体流量计', '气体泄漏检测仪', '供水泄漏检测仪'], + checkedCities: ['腐蚀速率监测仪', '气体流量计', '气体泄漏监测仪', '供水泄漏监测仪'], left: '', mapMark: '-', deviceTypeList: [], // 设备类型列表 @@ -161,6 +161,7 @@ wellTypeList: [], // 井类型列表 showDeptTree: 0, // 是否显示权属单位下拉,0不显示，1显示树，2显示平面 alarmList: [], // 报警列表 + searchAlarmList: [], timer: null, deptShowTop: false, // 是否显示顶级 clock: null, // 计时器 @@ -250,9 +251,9 @@ } else if (item.indexOf('气体流量计') !== -1) { this.wellMode() this.qtModel() - } else if (item.indexOf('气体泄漏检测仪') !== -1) { + } else if (item.indexOf('气体泄漏监测仪') !== -1) { this.rqModel() - } else if (item.indexOf('供水泄漏检测仪') !== -1) { + } else if (item.indexOf('供水泄漏监测仪') !== -1) { this.wellMode() this.zsMoel() } @@ -398,41 +399,6 @@ }) }, // 初始化街道、流向线 - // async initDrawLines() { - // axios.get('./static/position.json').then((result) => { - // const positions = result.data.positions - // flow = new mars3d.layer.GraphicLayer() - // window.map.addLayer(flow) - // street = new mars3d.layer.GraphicLayer() - // window.map.addLayer(street) - // for (let j = 0; j < positions.length; j++) { - // flow.addGraphic(this.addFlow(positions[j].items, positions[j].repeat)) - // street.addGraphic(this.addStreet(positions[j].items)) - // } - // flow.show = false - // }).catch((error) => { - // console.log('get position error...' + error) - // }) - // }, - // 流向线 - // addFlow(positions, repeat) { - // console.log(positions, repeat, '====---1230') - // var style = { - // width: 10, - // material: mars3d.MaterialUtil.createMaterialProperty(mars3d.MaterialType.LineFlow, { - // color: '#215bd9', - // repeat: new Cesium.Cartesian2(repeat, 1), - // image: '../static/images/line.png', - // speed: 15 - // }) - // } - // var graphic = new mars3d.graphic.PolylineEntity({ - // positions: positions, - // style: style - // }) - // return graphic - // }, - // 初始化街道、流向线 async initDrawLines() { axios.get('./static/position2.json').then((result) => { const positions = result.data.positions @@ -533,6 +499,32 @@ }) return graphic }, + search() { + this.filterAlarmList() + this.initPoints() + }, + // 过滤报警列表 + filterAlarmList() { + const list = this.alarmList + const keywords = this.listQuery.keywords + if (keywords) { // 过滤井编号、设备编号 + this.searchAlarmList = list.filter(item => { + let flag = false + if (item.wellCode.indexOf(keywords) > -1) { + flag = true + } + if (item.devcode.indexOf(keywords) > -1) { + flag = true + } + if (item.position.indexOf(keywords) > -1) { + flag = true + } + return flag + }) + } else { + this.searchAlarmList = list + } + }, // 初始化井，设备 async initPoints() { this.wellMode() @@ -593,58 +585,10 @@ } }) }, - // 远程水表（不展示） - watchModel() { - const params = '13' - getMapping(params, this.listQuery.keywords).then(response => { - // 过滤掉该单位不支持的设备(通过部门id) - const deptIds = this.$store.getters.deptId - const responses = [] - response.data.forEach(item => { - if (item.deptid === deptIds) { - responses.push(item) - } - }) - response.data = responses - if (response.code === 200) { - if (watch_model_layer !== null) window.map.removeLayer(watch_model_layer) - watch_model_layer = new mars3d.layer.GraphicLayer() - window.map.addLayer(watch_model_layer) - if (watch_icon_layer !== null) window.map.removeLayer(watch_icon_layer) - watch_icon_layer = new mars3d.layer.GraphicLayer() - window.map.addLayer(watch_icon_layer) - for (let i = 0; i < response.data.length; i++) { - watch_model_layer.addGraphic(new mars3d.graphic.ModelPrimitive({ - position: [response.data[i].longitude, response.data[i].latitude, -0.5], - style: { - url: '../static/model/sb.glb', - scale: 2, - heading: 90 - }, - popup: `远程水表
设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` - })) - watch_icon_layer.addGraphic(new mars3d.graphic.BillboardEntity({ - id: response.data[i].devcode, - position: [response.data[i].longitude, response.data[i].latitude, 1], - style: { - image: '../static/images/icon/sb.png', - scale: 1, - horizontalOrigin: Cesium.HorizontalOrigin.CENTER, - verticalOrigin: Cesium.VerticalOrigin.BOTTOM, - scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3) - }, - popup: `远程水表
设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` - })) - } - this.refreshAlarm() - } - }) - }, // 腐蚀速率监测仪 fsModel() { const params = '14' getMapping(params, this.listQuery.keywords).then(response => { - console.log(response.data[0].latitude, '======腐蚀速率监测仪=======') // 过滤掉该单位不支持的设备(通过部门id) const deptIds = this.$store.getters.deptId const responses = [] @@ -662,29 +606,32 @@ if (fs_icon_layer !== null) window.map.removeLayer(fs_icon_layer) fs_icon_layer = new mars3d.layer.GraphicLayer() window.map.addLayer(fs_icon_layer) - for (let i = 0; i < response.data.length; i++) { - fs_model_layer.addGraphic(new mars3d.graphic.ModelPrimitive({ - position: [response.data[i].longitude, response.data[i].latitude, 0], - style: { - url: '../static/model/fs.glb', - scale: 1, - heading: 90 - }, - popup: `腐蚀速率监测仪
设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` - })) - fs_icon_layer.addGraphic(new mars3d.graphic.BillboardEntity({ - id: response.data[i].devcode, - position: [response.data[i].longitude, response.data[i].latitude, 1], - style: { - image: '../static/images/icon/fs.png', - scale: 1, - horizontalOrigin: Cesium.HorizontalOrigin.CENTER, - verticalOrigin: Cesium.VerticalOrigin.BOTTOM, - scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3) - }, - popup: `腐蚀速率监测仪
设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` - })) + if (response.data.length > 0) { + for (let i = 0; i < response.data.length; i++) { + fs_model_layer.addGraphic(new mars3d.graphic.ModelPrimitive({ + position: [response.data[i].longitude, response.data[i].latitude, 0], + style: { + url: '../static/model/fs.glb', + scale: 1, + heading: 90 + }, + popup: `设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` + })) + fs_icon_layer.addGraphic(new mars3d.graphic.BillboardEntity({ + id: response.data[i].devcode, + position: [response.data[i].longitude, response.data[i].latitude, 1], + style: { + image: '../static/images/icon/fs.png', + scale: 1, + horizontalOrigin: Cesium.HorizontalOrigin.CENTER, + verticalOrigin: Cesium.VerticalOrigin.BOTTOM, + scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3) + }, + popup: `设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` + })) + } } + this.refreshAlarm() } }) @@ -693,7 +640,6 @@ qtModel() { const params = '15' getMapping(params, this.listQuery.keywords).then(response => { - console.log(response.data[0].latitude, '======气体流量计=======') // 过滤掉该单位不支持的设备(通过部门id) const deptIds = this.$store.getters.deptId const responses = [] @@ -711,28 +657,30 @@ if (qt_icon_layer !== null) window.map.removeLayer(qt_icon_layer) qt_icon_layer = new mars3d.layer.GraphicLayer() window.map.addLayer(qt_icon_layer) - for (let i = 0; i < response.data.length; i++) { - qt_model_layer.addGraphic(new mars3d.graphic.ModelPrimitive({ - position: [response.data[i].longitude, response.data[i].latitude, 0], - style: { - url: '../static/model/qt.glb', - scale: 1, - heading: 90 - }, - popup: `气体流量计
设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` - })) - qt_icon_layer.addGraphic(new mars3d.graphic.BillboardEntity({ - id: response.data[i].devcode, - position: [response.data[i].longitude, response.data[i].latitude, 1], - style: { - image: '../static/images/icon/qt.png', - scale: 1, - horizontalOrigin: Cesium.HorizontalOrigin.CENTER, - verticalOrigin: Cesium.VerticalOrigin.BOTTOM, - scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3) - }, - popup: `气体流量计
设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` - })) + if (response.data.length > 0) { + for (let i = 0; i < response.data.length; i++) { + qt_model_layer.addGraphic(new mars3d.graphic.ModelPrimitive({ + position: [response.data[i].longitude, response.data[i].latitude, 0], + style: { + url: '../static/model/qt.glb', + scale: 1, + heading: 90 + }, + popup: `设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` + })) + qt_icon_layer.addGraphic(new mars3d.graphic.BillboardEntity({ + id: response.data[i].devcode, + position: [response.data[i].longitude, response.data[i].latitude, 1], + style: { + image: '../static/images/icon/qt.png', + scale: 1, + horizontalOrigin: Cesium.HorizontalOrigin.CENTER, + verticalOrigin: Cesium.VerticalOrigin.BOTTOM, + scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3) + }, + popup: `设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` + })) + } } this.refreshAlarm() } @@ -742,7 +690,6 @@ rqModel() { const params = '4' getMapping(params, this.listQuery.keywords).then(response => { - console.log(response.data[0].latitude, '======气体泄露监测仪（原燃气）=======') // 过滤掉该单位不支持的设备(通过部门id) const deptIds = this.$store.getters.deptId const responses = [] @@ -760,28 +707,30 @@ if (rq_icon_layer !== null) window.map.removeLayer(rq_icon_layer) rq_icon_layer = new mars3d.layer.GraphicLayer() window.map.addLayer(rq_icon_layer) - for (let i = 0; i < response.data.length; i++) { - rq_model_layer.addGraphic(new mars3d.graphic.ModelPrimitive({ - position: [response.data[i].longitude, response.data[i].latitude, 0], - style: { - url: '../static/model/rq.glb', - scale: 1, - heading: 90 - }, - popup: `气体泄露监测仪
设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` - })) - rq_icon_layer.addGraphic(new mars3d.graphic.BillboardEntity({ - id: response.data[i].devcode, - position: [response.data[i].longitude, response.data[i].latitude, 1], - style: { - image: '../static/images/icon/rq.png', - scale: 1, - horizontalOrigin: Cesium.HorizontalOrigin.CENTER, - verticalOrigin: Cesium.VerticalOrigin.BOTTOM, - scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3) - }, - popup: `气体泄露监测仪
设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` - })) + if (response.data.length > 0) { + for (let i = 0; i < response.data.length; i++) { + rq_model_layer.addGraphic(new mars3d.graphic.ModelPrimitive({ + position: [response.data[i].longitude, response.data[i].latitude, 0], + style: { + url: '../static/model/rq.glb', + scale: 1, + heading: 90 + }, + popup: `设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` + })) + rq_icon_layer.addGraphic(new mars3d.graphic.BillboardEntity({ + id: response.data[i].devcode, + position: [response.data[i].longitude, response.data[i].latitude, 1], + style: { + image: '../static/images/icon/rq.png', + scale: 1, + horizontalOrigin: Cesium.HorizontalOrigin.CENTER, + verticalOrigin: Cesium.VerticalOrigin.BOTTOM, + scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3) + }, + popup: `设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` + })) + } } this.refreshAlarm() } @@ -791,7 +740,6 @@ zsMoel() { const params = '8' getMapping(params, this.listQuery.keywords).then(response => { - console.log(response.data[0].latitude, '======供水泄露监测仪（原噪声））=======') // 过滤掉该单位不支持的设备(通过部门id) const deptIds = this.$store.getters.deptId const responses = [] @@ -810,28 +758,30 @@ if (zs_icon_layer !== null) window.map.removeLayer(zs_icon_layer) zs_icon_layer = new mars3d.layer.GraphicLayer() window.map.addLayer(zs_icon_layer) - for (let i = 0; i < response.data.length; i++) { - zs_model_layer.addGraphic(new mars3d.graphic.ModelPrimitive({ - position: [response.data[i].longitude, response.data[i].latitude, 0], - style: { - url: '../static/model/zs.glb', - scale: 1, - heading: 90 - }, - popup: `供水泄露监测仪
设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` - })) - zs_icon_layer.addGraphic(new mars3d.graphic.BillboardEntity({ - id: response.data[i].devcode, - position: [response.data[i].longitude, response.data[i].latitude, 1], - style: { - image: '../static/images/icon/zs.png', - scale: 1, - horizontalOrigin: Cesium.HorizontalOrigin.CENTER, - verticalOrigin: Cesium.VerticalOrigin.BOTTOM, - scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3) - }, - popup: `供水泄露监测仪
设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` - })) + if (response.data.length > 0) { + for (let i = 0; i < response.data.length; i++) { + zs_model_layer.addGraphic(new mars3d.graphic.ModelPrimitive({ + position: [response.data[i].longitude, response.data[i].latitude, 0], + style: { + url: '../static/model/zs.glb', + scale: 1, + heading: 90 + }, + popup: `设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` + })) + zs_icon_layer.addGraphic(new mars3d.graphic.BillboardEntity({ + id: response.data[i].devcode, + position: [response.data[i].longitude, response.data[i].latitude, 1], + style: { + image: '../static/images/icon/zs.png', + scale: 1, + horizontalOrigin: Cesium.HorizontalOrigin.CENTER, + verticalOrigin: Cesium.VerticalOrigin.BOTTOM, + scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3) + }, + popup: `设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` + })) + } } this.refreshAlarm() } @@ -859,6 +809,7 @@ if (this.alarmList.length > 0) { this.hasAlarm = true } + this.filterAlarmList() for (const alarm of response.data) { for (const watch of watch_icon_layer.graphics) { if (alarm.devcode === watch.options.id) { diff --git a/config/dev.env.js b/config/dev.env.js index 36f7d4a..1cab225 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -9,6 +9,6 @@ // BASE_API: '"http://42.81.160.165:2022/smartwell"' // BASE_API: '"http://111.198.10.15:11304"' // BASE_API: '"http://111.198.10.15:11643"' - // BASE_API: '"http://111.198.10.15:11409/smartwell"' //可以用 - BASE_API: '"http://192.168.43.66:11643/smartwell"' //彭先洪 + BASE_API: '"http://111.198.10.15:11409/smartwell"' //可以用 + // BASE_API: '"http://192.168.43.66:11643/smartwell"' //彭先洪 }) diff --git a/src/utils/baseConfig.js b/src/utils/baseConfig.js index cda5175..70f4159 100644 --- a/src/utils/baseConfig.js +++ b/src/utils/baseConfig.js @@ -1,6 +1,6 @@ const project = { // title: '供水管理系统' - title: '场区能源管理系统' + title: '生产及办公能耗管理系统' } export function getProject() { return project diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js index aa41264..11dc521 100644 --- a/src/utils/dateutils.js +++ b/src/utils/dateutils.js @@ -52,3 +52,13 @@ } return fmt } + +/** + * 获取近1周日期范围 + * @returns {*[]} + */ +export function getSearchLastWeekTime() { + const startTime = getLastWeek().Format('yyyy-MM-dd hh:mm:ss') + const endTime = getToday('yyyy-MM-dd hh:mm:ss') + return [startTime, endTime] +} diff --git a/src/views/dashboard/components/AlarmByDays.vue b/src/views/dashboard/components/AlarmByDays.vue index ddfd8e3..8a9a937 100644 --- a/src/views/dashboard/components/AlarmByDays.vue +++ b/src/views/dashboard/components/AlarmByDays.vue @@ -23,11 +23,11 @@ } this.chartSettings = { labelMap: { - '远传水表': '远传水表', + '远程水表': '远程水表', '噪声记录仪': '噪声记录仪', '液位监测仪': '液位监测仪' }, - metrics: ['远传水表', '噪声记录仪', '液位监测仪'], + metrics: ['远程水表', '噪声记录仪', '液位监测仪'], dimension: ['date'] } return { @@ -37,7 +37,7 @@ endTime: '' }, chartData: { - columns: ['date', '远传水表', '噪声记录仪', '液位监测仪'], + columns: ['date', '远程水表', '噪声记录仪', '液位监测仪'], rows: [] } } @@ -65,7 +65,7 @@ delete item.data return item }) - + this.chartData.rows = arr }) }, diff --git a/src/views/dataManage/dataManage.vue b/src/views/dataManage/dataManage.vue index fa1681b..494e254 100644 --- a/src/views/dataManage/dataManage.vue +++ b/src/views/dataManage/dataManage.vue @@ -25,7 +25,7 @@ - + diff --git a/src/views/dataManage/deviceData/gasFlowHistory.vue b/src/views/dataManage/deviceData/gasFlowHistory.vue index ec65c4d..e89b673 100644 --- a/src/views/dataManage/deviceData/gasFlowHistory.vue +++ b/src/views/dataManage/deviceData/gasFlowHistory.vue @@ -124,7 +124,7 @@ const downloadElement = document.createElement('a') const href = window.URL.createObjectURL(blob) // 创建下载的链接 downloadElement.href = href - downloadElement.download = `${this.listQuery.devCode}远传水表历史数据.xlsx` // 下载后文件名 + downloadElement.download = `${this.listQuery.devCode}远程水表历史数据.xlsx` // 下载后文件名 document.body.appendChild(downloadElement) downloadElement.click() // 点击下载 document.body.removeChild(downloadElement) // 下载完成移除元素 diff --git a/src/views/dataManage/deviceData/listCorrodeData.vue b/src/views/dataManage/deviceData/listCorrodeData.vue index 3cdb1f1..63e47c7 100644 --- a/src/views/dataManage/deviceData/listCorrodeData.vue +++ b/src/views/dataManage/deviceData/listCorrodeData.vue @@ -67,7 +67,7 @@ import DeptSelect from '../../../components/DeptSelect/index' import { parseUrl } from '@/utils/parseutils' import AreaSelectTree from '@/components/AreaSelect/areaSelectTree' - +import { getSearchLastWeekTime } from '@/utils/dateutils' export default { name: 'ListCorrodeData', components: { DeptSelect, selectTree, AreaSelectTree }, @@ -155,6 +155,7 @@ if (params && params.deviceType === '8' && params.devcode) { this.listQuery.keywords = params.devcode } + this.timeRange = getSearchLastWeekTime() this.fetchData() } }, diff --git a/src/views/dataManage/deviceData/listLiquidData.vue b/src/views/dataManage/deviceData/listLiquidData.vue index 01daf72..a276d24 100644 --- a/src/views/dataManage/deviceData/listLiquidData.vue +++ b/src/views/dataManage/deviceData/listLiquidData.vue @@ -60,7 +60,7 @@ import { getLiquidData, batchExportLiquidData } from '@/api/data' import DeptSelect from '../../../components/DeptSelect/index' import { parseUrl } from '@/utils/parseutils' - +import { getSearchLastWeekTime } from '@/utils/dateutils' export default { name: 'ListLiquidData', components: { DeptSelect, selectTree }, @@ -155,6 +155,7 @@ if (params && params.deviceType === '2' && params.devcode) { this.listQuery.keywords = params.devcode } + this.timeRange = getSearchLastWeekTime() this.fetchData() } }, diff --git a/src/views/dataManage/deviceData/listNoiseData.vue b/src/views/dataManage/deviceData/listNoiseData.vue index 699b56a..935f06c 100644 --- a/src/views/dataManage/deviceData/listNoiseData.vue +++ b/src/views/dataManage/deviceData/listNoiseData.vue @@ -63,7 +63,7 @@ import { getNoiseData, batchExportNoiseData } from '@/api/data' import DeptSelect from '../../../components/DeptSelect/index' import { parseUrl } from '@/utils/parseutils' - +import { getSearchLastWeekTime } from '@/utils/dateutils' export default { name: 'ListNoiseData', components: { DeptSelect, selectTree }, @@ -165,6 +165,7 @@ if (params && params.deviceType === '8' && params.devcode) { this.listQuery.keywords = params.devcode } + this.timeRange = getSearchLastWeekTime() this.fetchData() } }, @@ -193,7 +194,7 @@ const downloadElement = document.createElement('a') const href = window.URL.createObjectURL(blob) // 创建下载的链接 downloadElement.href = href - downloadElement.download = `噪声记录仪数据.xlsx` // 下载后文件名 + downloadElement.download = `供水泄漏监测仪数据.xlsx` // 下载后文件名 document.body.appendChild(downloadElement) downloadElement.click() // 点击下载 document.body.removeChild(downloadElement) // 下载完成移除元素 diff --git a/src/views/dataManage/deviceData/listWaterData.vue b/src/views/dataManage/deviceData/listWaterData.vue index 2515720..5e6a693 100644 --- a/src/views/dataManage/deviceData/listWaterData.vue +++ b/src/views/dataManage/deviceData/listWaterData.vue @@ -282,7 +282,7 @@ const downloadElement = document.createElement('a') const href = window.URL.createObjectURL(blob) // 创建下载的链接 downloadElement.href = href - downloadElement.download = `远传水表数据.xlsx` // 下载后文件名 + downloadElement.download = `远程水表数据.xlsx` // 下载后文件名 document.body.appendChild(downloadElement) downloadElement.click() // 点击下载 document.body.removeChild(downloadElement) // 下载完成移除元素 diff --git a/src/views/dataManage/deviceData/waterHistory.vue b/src/views/dataManage/deviceData/waterHistory.vue index 1330807..42e3303 100644 --- a/src/views/dataManage/deviceData/waterHistory.vue +++ b/src/views/dataManage/deviceData/waterHistory.vue @@ -88,7 +88,7 @@ const downloadElement = document.createElement('a') const href = window.URL.createObjectURL(blob) // 创建下载的链接 downloadElement.href = href - downloadElement.download = `${this.listQuery.devCode}远传水表历史数据.xlsx` // 下载后文件名 + downloadElement.download = `${this.listQuery.devCode}远程水表历史数据.xlsx` // 下载后文件名 document.body.appendChild(downloadElement) downloadElement.click() // 点击下载 document.body.removeChild(downloadElement) // 下载完成移除元素 diff --git a/src/views/gasDashboard/components/PanelGroup.vue b/src/views/gasDashboard/components/PanelGroup.vue index eead839..803b666 100644 --- a/src/views/gasDashboard/components/PanelGroup.vue +++ b/src/views/gasDashboard/components/PanelGroup.vue @@ -56,7 +56,7 @@ context: '--', icon: 'icon-watch', color: '#9694f7', - path: '/deviceList?deviceType=13', + path: '/deviceList?deviceType=15', permission: '/device/list' }, { diff --git a/src/views/gasOverview/gasOverviewSimple.vue b/src/views/gasOverview/gasOverviewSimple.vue index 585ab8a..5691e51 100644 --- a/src/views/gasOverview/gasOverviewSimple.vue +++ b/src/views/gasOverview/gasOverviewSimple.vue @@ -5,7 +5,7 @@ - + 搜索 @@ -36,7 +36,7 @@
-
+
告警列表 @@ -48,10 +48,10 @@ @@ -106,7 +106,7 @@ data() { return { screenHeight: null, - checkedCities: ['腐蚀速率监测仪', '气体流量计', '气体泄漏检测仪', '供水泄漏检测仪'], + checkedCities: ['腐蚀速率监测仪', '气体流量计', '气体泄漏监测仪', '供水泄漏监测仪'], left: '', mapMark: '-', deviceTypeList: [], // 设备类型列表 @@ -161,6 +161,7 @@ wellTypeList: [], // 井类型列表 showDeptTree: 0, // 是否显示权属单位下拉,0不显示，1显示树，2显示平面 alarmList: [], // 报警列表 + searchAlarmList: [], timer: null, deptShowTop: false, // 是否显示顶级 clock: null, // 计时器 @@ -250,9 +251,9 @@ } else if (item.indexOf('气体流量计') !== -1) { this.wellMode() this.qtModel() - } else if (item.indexOf('气体泄漏检测仪') !== -1) { + } else if (item.indexOf('气体泄漏监测仪') !== -1) { this.rqModel() - } else if (item.indexOf('供水泄漏检测仪') !== -1) { + } else if (item.indexOf('供水泄漏监测仪') !== -1) { this.wellMode() this.zsMoel() } @@ -398,41 +399,6 @@ }) }, // 初始化街道、流向线 - // async initDrawLines() { - // axios.get('./static/position.json').then((result) => { - // const positions = result.data.positions - // flow = new mars3d.layer.GraphicLayer() - // window.map.addLayer(flow) - // street = new mars3d.layer.GraphicLayer() - // window.map.addLayer(street) - // for (let j = 0; j < positions.length; j++) { - // flow.addGraphic(this.addFlow(positions[j].items, positions[j].repeat)) - // street.addGraphic(this.addStreet(positions[j].items)) - // } - // flow.show = false - // }).catch((error) => { - // console.log('get position error...' + error) - // }) - // }, - // 流向线 - // addFlow(positions, repeat) { - // console.log(positions, repeat, '====---1230') - // var style = { - // width: 10, - // material: mars3d.MaterialUtil.createMaterialProperty(mars3d.MaterialType.LineFlow, { - // color: '#215bd9', - // repeat: new Cesium.Cartesian2(repeat, 1), - // image: '../static/images/line.png', - // speed: 15 - // }) - // } - // var graphic = new mars3d.graphic.PolylineEntity({ - // positions: positions, - // style: style - // }) - // return graphic - // }, - // 初始化街道、流向线 async initDrawLines() { axios.get('./static/position2.json').then((result) => { const positions = result.data.positions @@ -533,6 +499,32 @@ }) return graphic }, + search() { + this.filterAlarmList() + this.initPoints() + }, + // 过滤报警列表 + filterAlarmList() { + const list = this.alarmList + const keywords = this.listQuery.keywords + if (keywords) { // 过滤井编号、设备编号 + this.searchAlarmList = list.filter(item => { + let flag = false + if (item.wellCode.indexOf(keywords) > -1) { + flag = true + } + if (item.devcode.indexOf(keywords) > -1) { + flag = true + } + if (item.position.indexOf(keywords) > -1) { + flag = true + } + return flag + }) + } else { + this.searchAlarmList = list + } + }, // 初始化井，设备 async initPoints() { this.wellMode() @@ -593,58 +585,10 @@ } }) }, - // 远程水表（不展示） - watchModel() { - const params = '13' - getMapping(params, this.listQuery.keywords).then(response => { - // 过滤掉该单位不支持的设备(通过部门id) - const deptIds = this.$store.getters.deptId - const responses = [] - response.data.forEach(item => { - if (item.deptid === deptIds) { - responses.push(item) - } - }) - response.data = responses - if (response.code === 200) { - if (watch_model_layer !== null) window.map.removeLayer(watch_model_layer) - watch_model_layer = new mars3d.layer.GraphicLayer() - window.map.addLayer(watch_model_layer) - if (watch_icon_layer !== null) window.map.removeLayer(watch_icon_layer) - watch_icon_layer = new mars3d.layer.GraphicLayer() - window.map.addLayer(watch_icon_layer) - for (let i = 0; i < response.data.length; i++) { - watch_model_layer.addGraphic(new mars3d.graphic.ModelPrimitive({ - position: [response.data[i].longitude, response.data[i].latitude, -0.5], - style: { - url: '../static/model/sb.glb', - scale: 2, - heading: 90 - }, - popup: `远程水表
设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` - })) - watch_icon_layer.addGraphic(new mars3d.graphic.BillboardEntity({ - id: response.data[i].devcode, - position: [response.data[i].longitude, response.data[i].latitude, 1], - style: { - image: '../static/images/icon/sb.png', - scale: 1, - horizontalOrigin: Cesium.HorizontalOrigin.CENTER, - verticalOrigin: Cesium.VerticalOrigin.BOTTOM, - scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3) - }, - popup: `远程水表
设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` - })) - } - this.refreshAlarm() - } - }) - }, // 腐蚀速率监测仪 fsModel() { const params = '14' getMapping(params, this.listQuery.keywords).then(response => { - console.log(response.data[0].latitude, '======腐蚀速率监测仪=======') // 过滤掉该单位不支持的设备(通过部门id) const deptIds = this.$store.getters.deptId const responses = [] @@ -662,29 +606,32 @@ if (fs_icon_layer !== null) window.map.removeLayer(fs_icon_layer) fs_icon_layer = new mars3d.layer.GraphicLayer() window.map.addLayer(fs_icon_layer) - for (let i = 0; i < response.data.length; i++) { - fs_model_layer.addGraphic(new mars3d.graphic.ModelPrimitive({ - position: [response.data[i].longitude, response.data[i].latitude, 0], - style: { - url: '../static/model/fs.glb', - scale: 1, - heading: 90 - }, - popup: `腐蚀速率监测仪
设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` - })) - fs_icon_layer.addGraphic(new mars3d.graphic.BillboardEntity({ - id: response.data[i].devcode, - position: [response.data[i].longitude, response.data[i].latitude, 1], - style: { - image: '../static/images/icon/fs.png', - scale: 1, - horizontalOrigin: Cesium.HorizontalOrigin.CENTER, - verticalOrigin: Cesium.VerticalOrigin.BOTTOM, - scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3) - }, - popup: `腐蚀速率监测仪
设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` - })) + if (response.data.length > 0) { + for (let i = 0; i < response.data.length; i++) { + fs_model_layer.addGraphic(new mars3d.graphic.ModelPrimitive({ + position: [response.data[i].longitude, response.data[i].latitude, 0], + style: { + url: '../static/model/fs.glb', + scale: 1, + heading: 90 + }, + popup: `设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` + })) + fs_icon_layer.addGraphic(new mars3d.graphic.BillboardEntity({ + id: response.data[i].devcode, + position: [response.data[i].longitude, response.data[i].latitude, 1], + style: { + image: '../static/images/icon/fs.png', + scale: 1, + horizontalOrigin: Cesium.HorizontalOrigin.CENTER, + verticalOrigin: Cesium.VerticalOrigin.BOTTOM, + scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3) + }, + popup: `设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` + })) + } } + this.refreshAlarm() } }) @@ -693,7 +640,6 @@ qtModel() { const params = '15' getMapping(params, this.listQuery.keywords).then(response => { - console.log(response.data[0].latitude, '======气体流量计=======') // 过滤掉该单位不支持的设备(通过部门id) const deptIds = this.$store.getters.deptId const responses = [] @@ -711,28 +657,30 @@ if (qt_icon_layer !== null) window.map.removeLayer(qt_icon_layer) qt_icon_layer = new mars3d.layer.GraphicLayer() window.map.addLayer(qt_icon_layer) - for (let i = 0; i < response.data.length; i++) { - qt_model_layer.addGraphic(new mars3d.graphic.ModelPrimitive({ - position: [response.data[i].longitude, response.data[i].latitude, 0], - style: { - url: '../static/model/qt.glb', - scale: 1, - heading: 90 - }, - popup: `气体流量计
设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` - })) - qt_icon_layer.addGraphic(new mars3d.graphic.BillboardEntity({ - id: response.data[i].devcode, - position: [response.data[i].longitude, response.data[i].latitude, 1], - style: { - image: '../static/images/icon/qt.png', - scale: 1, - horizontalOrigin: Cesium.HorizontalOrigin.CENTER, - verticalOrigin: Cesium.VerticalOrigin.BOTTOM, - scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3) - }, - popup: `气体流量计
设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` - })) + if (response.data.length > 0) { + for (let i = 0; i < response.data.length; i++) { + qt_model_layer.addGraphic(new mars3d.graphic.ModelPrimitive({ + position: [response.data[i].longitude, response.data[i].latitude, 0], + style: { + url: '../static/model/qt.glb', + scale: 1, + heading: 90 + }, + popup: `设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` + })) + qt_icon_layer.addGraphic(new mars3d.graphic.BillboardEntity({ + id: response.data[i].devcode, + position: [response.data[i].longitude, response.data[i].latitude, 1], + style: { + image: '../static/images/icon/qt.png', + scale: 1, + horizontalOrigin: Cesium.HorizontalOrigin.CENTER, + verticalOrigin: Cesium.VerticalOrigin.BOTTOM, + scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3) + }, + popup: `设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` + })) + } } this.refreshAlarm() } @@ -742,7 +690,6 @@ rqModel() { const params = '4' getMapping(params, this.listQuery.keywords).then(response => { - console.log(response.data[0].latitude, '======气体泄露监测仪（原燃气）=======') // 过滤掉该单位不支持的设备(通过部门id) const deptIds = this.$store.getters.deptId const responses = [] @@ -760,28 +707,30 @@ if (rq_icon_layer !== null) window.map.removeLayer(rq_icon_layer) rq_icon_layer = new mars3d.layer.GraphicLayer() window.map.addLayer(rq_icon_layer) - for (let i = 0; i < response.data.length; i++) { - rq_model_layer.addGraphic(new mars3d.graphic.ModelPrimitive({ - position: [response.data[i].longitude, response.data[i].latitude, 0], - style: { - url: '../static/model/rq.glb', - scale: 1, - heading: 90 - }, - popup: `气体泄露监测仪
设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` - })) - rq_icon_layer.addGraphic(new mars3d.graphic.BillboardEntity({ - id: response.data[i].devcode, - position: [response.data[i].longitude, response.data[i].latitude, 1], - style: { - image: '../static/images/icon/rq.png', - scale: 1, - horizontalOrigin: Cesium.HorizontalOrigin.CENTER, - verticalOrigin: Cesium.VerticalOrigin.BOTTOM, - scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3) - }, - popup: `气体泄露监测仪
设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` - })) + if (response.data.length > 0) { + for (let i = 0; i < response.data.length; i++) { + rq_model_layer.addGraphic(new mars3d.graphic.ModelPrimitive({ + position: [response.data[i].longitude, response.data[i].latitude, 0], + style: { + url: '../static/model/rq.glb', + scale: 1, + heading: 90 + }, + popup: `设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` + })) + rq_icon_layer.addGraphic(new mars3d.graphic.BillboardEntity({ + id: response.data[i].devcode, + position: [response.data[i].longitude, response.data[i].latitude, 1], + style: { + image: '../static/images/icon/rq.png', + scale: 1, + horizontalOrigin: Cesium.HorizontalOrigin.CENTER, + verticalOrigin: Cesium.VerticalOrigin.BOTTOM, + scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3) + }, + popup: `设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` + })) + } } this.refreshAlarm() } @@ -791,7 +740,6 @@ zsMoel() { const params = '8' getMapping(params, this.listQuery.keywords).then(response => { - console.log(response.data[0].latitude, '======供水泄露监测仪（原噪声））=======') // 过滤掉该单位不支持的设备(通过部门id) const deptIds = this.$store.getters.deptId const responses = [] @@ -810,28 +758,30 @@ if (zs_icon_layer !== null) window.map.removeLayer(zs_icon_layer) zs_icon_layer = new mars3d.layer.GraphicLayer() window.map.addLayer(zs_icon_layer) - for (let i = 0; i < response.data.length; i++) { - zs_model_layer.addGraphic(new mars3d.graphic.ModelPrimitive({ - position: [response.data[i].longitude, response.data[i].latitude, 0], - style: { - url: '../static/model/zs.glb', - scale: 1, - heading: 90 - }, - popup: `供水泄露监测仪
设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` - })) - zs_icon_layer.addGraphic(new mars3d.graphic.BillboardEntity({ - id: response.data[i].devcode, - position: [response.data[i].longitude, response.data[i].latitude, 1], - style: { - image: '../static/images/icon/zs.png', - scale: 1, - horizontalOrigin: Cesium.HorizontalOrigin.CENTER, - verticalOrigin: Cesium.VerticalOrigin.BOTTOM, - scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3) - }, - popup: `供水泄露监测仪
设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` - })) + if (response.data.length > 0) { + for (let i = 0; i < response.data.length; i++) { + zs_model_layer.addGraphic(new mars3d.graphic.ModelPrimitive({ + position: [response.data[i].longitude, response.data[i].latitude, 0], + style: { + url: '../static/model/zs.glb', + scale: 1, + heading: 90 + }, + popup: `设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` + })) + zs_icon_layer.addGraphic(new mars3d.graphic.BillboardEntity({ + id: response.data[i].devcode, + position: [response.data[i].longitude, response.data[i].latitude, 1], + style: { + image: '../static/images/icon/zs.png', + scale: 1, + horizontalOrigin: Cesium.HorizontalOrigin.CENTER, + verticalOrigin: Cesium.VerticalOrigin.BOTTOM, + scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3) + }, + popup: `设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` + })) + } } this.refreshAlarm() } @@ -859,6 +809,7 @@ if (this.alarmList.length > 0) { this.hasAlarm = true } + this.filterAlarmList() for (const alarm of response.data) { for (const watch of watch_icon_layer.graphics) { if (alarm.devcode === watch.options.id) { diff --git a/src/views/jobManage/detailJob.vue b/src/views/jobManage/detailJob.vue index 2d6aaa4..d03da8d 100644 --- a/src/views/jobManage/detailJob.vue +++ b/src/views/jobManage/detailJob.vue @@ -205,7 +205,7 @@ // 获取工单详情 getJobInfo: function(jobId) { this.loading = true - const base_url = process.env.BASE_API + '/static/' + const base_url = this.baseConfig.baseUrl + '/static/' getJobInfo(jobId).then(response => { this.loading = false if (response.code === 200) { diff --git a/config/dev.env.js b/config/dev.env.js index 36f7d4a..1cab225 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -9,6 +9,6 @@ // BASE_API: '"http://42.81.160.165:2022/smartwell"' // BASE_API: '"http://111.198.10.15:11304"' // BASE_API: '"http://111.198.10.15:11643"' - // BASE_API: '"http://111.198.10.15:11409/smartwell"' //可以用 - BASE_API: '"http://192.168.43.66:11643/smartwell"' //彭先洪 + BASE_API: '"http://111.198.10.15:11409/smartwell"' //可以用 + // BASE_API: '"http://192.168.43.66:11643/smartwell"' //彭先洪 }) diff --git a/src/utils/baseConfig.js b/src/utils/baseConfig.js index cda5175..70f4159 100644 --- a/src/utils/baseConfig.js +++ b/src/utils/baseConfig.js @@ -1,6 +1,6 @@ const project = { // title: '供水管理系统' - title: '场区能源管理系统' + title: '生产及办公能耗管理系统' } export function getProject() { return project diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js index aa41264..11dc521 100644 --- a/src/utils/dateutils.js +++ b/src/utils/dateutils.js @@ -52,3 +52,13 @@ } return fmt } + +/** + * 获取近1周日期范围 + * @returns {*[]} + */ +export function getSearchLastWeekTime() { + const startTime = getLastWeek().Format('yyyy-MM-dd hh:mm:ss') + const endTime = getToday('yyyy-MM-dd hh:mm:ss') + return [startTime, endTime] +} diff --git a/src/views/dashboard/components/AlarmByDays.vue b/src/views/dashboard/components/AlarmByDays.vue index ddfd8e3..8a9a937 100644 --- a/src/views/dashboard/components/AlarmByDays.vue +++ b/src/views/dashboard/components/AlarmByDays.vue @@ -23,11 +23,11 @@ } this.chartSettings = { labelMap: { - '远传水表': '远传水表', + '远程水表': '远程水表', '噪声记录仪': '噪声记录仪', '液位监测仪': '液位监测仪' }, - metrics: ['远传水表', '噪声记录仪', '液位监测仪'], + metrics: ['远程水表', '噪声记录仪', '液位监测仪'], dimension: ['date'] } return { @@ -37,7 +37,7 @@ endTime: '' }, chartData: { - columns: ['date', '远传水表', '噪声记录仪', '液位监测仪'], + columns: ['date', '远程水表', '噪声记录仪', '液位监测仪'], rows: [] } } @@ -65,7 +65,7 @@ delete item.data return item }) - + this.chartData.rows = arr }) }, diff --git a/src/views/dataManage/dataManage.vue b/src/views/dataManage/dataManage.vue index fa1681b..494e254 100644 --- a/src/views/dataManage/dataManage.vue +++ b/src/views/dataManage/dataManage.vue @@ -25,7 +25,7 @@ - + diff --git a/src/views/dataManage/deviceData/gasFlowHistory.vue b/src/views/dataManage/deviceData/gasFlowHistory.vue index ec65c4d..e89b673 100644 --- a/src/views/dataManage/deviceData/gasFlowHistory.vue +++ b/src/views/dataManage/deviceData/gasFlowHistory.vue @@ -124,7 +124,7 @@ const downloadElement = document.createElement('a') const href = window.URL.createObjectURL(blob) // 创建下载的链接 downloadElement.href = href - downloadElement.download = `${this.listQuery.devCode}远传水表历史数据.xlsx` // 下载后文件名 + downloadElement.download = `${this.listQuery.devCode}远程水表历史数据.xlsx` // 下载后文件名 document.body.appendChild(downloadElement) downloadElement.click() // 点击下载 document.body.removeChild(downloadElement) // 下载完成移除元素 diff --git a/src/views/dataManage/deviceData/listCorrodeData.vue b/src/views/dataManage/deviceData/listCorrodeData.vue index 3cdb1f1..63e47c7 100644 --- a/src/views/dataManage/deviceData/listCorrodeData.vue +++ b/src/views/dataManage/deviceData/listCorrodeData.vue @@ -67,7 +67,7 @@ import DeptSelect from '../../../components/DeptSelect/index' import { parseUrl } from '@/utils/parseutils' import AreaSelectTree from '@/components/AreaSelect/areaSelectTree' - +import { getSearchLastWeekTime } from '@/utils/dateutils' export default { name: 'ListCorrodeData', components: { DeptSelect, selectTree, AreaSelectTree }, @@ -155,6 +155,7 @@ if (params && params.deviceType === '8' && params.devcode) { this.listQuery.keywords = params.devcode } + this.timeRange = getSearchLastWeekTime() this.fetchData() } }, diff --git a/src/views/dataManage/deviceData/listLiquidData.vue b/src/views/dataManage/deviceData/listLiquidData.vue index 01daf72..a276d24 100644 --- a/src/views/dataManage/deviceData/listLiquidData.vue +++ b/src/views/dataManage/deviceData/listLiquidData.vue @@ -60,7 +60,7 @@ import { getLiquidData, batchExportLiquidData } from '@/api/data' import DeptSelect from '../../../components/DeptSelect/index' import { parseUrl } from '@/utils/parseutils' - +import { getSearchLastWeekTime } from '@/utils/dateutils' export default { name: 'ListLiquidData', components: { DeptSelect, selectTree }, @@ -155,6 +155,7 @@ if (params && params.deviceType === '2' && params.devcode) { this.listQuery.keywords = params.devcode } + this.timeRange = getSearchLastWeekTime() this.fetchData() } }, diff --git a/src/views/dataManage/deviceData/listNoiseData.vue b/src/views/dataManage/deviceData/listNoiseData.vue index 699b56a..935f06c 100644 --- a/src/views/dataManage/deviceData/listNoiseData.vue +++ b/src/views/dataManage/deviceData/listNoiseData.vue @@ -63,7 +63,7 @@ import { getNoiseData, batchExportNoiseData } from '@/api/data' import DeptSelect from '../../../components/DeptSelect/index' import { parseUrl } from '@/utils/parseutils' - +import { getSearchLastWeekTime } from '@/utils/dateutils' export default { name: 'ListNoiseData', components: { DeptSelect, selectTree }, @@ -165,6 +165,7 @@ if (params && params.deviceType === '8' && params.devcode) { this.listQuery.keywords = params.devcode } + this.timeRange = getSearchLastWeekTime() this.fetchData() } }, @@ -193,7 +194,7 @@ const downloadElement = document.createElement('a') const href = window.URL.createObjectURL(blob) // 创建下载的链接 downloadElement.href = href - downloadElement.download = `噪声记录仪数据.xlsx` // 下载后文件名 + downloadElement.download = `供水泄漏监测仪数据.xlsx` // 下载后文件名 document.body.appendChild(downloadElement) downloadElement.click() // 点击下载 document.body.removeChild(downloadElement) // 下载完成移除元素 diff --git a/src/views/dataManage/deviceData/listWaterData.vue b/src/views/dataManage/deviceData/listWaterData.vue index 2515720..5e6a693 100644 --- a/src/views/dataManage/deviceData/listWaterData.vue +++ b/src/views/dataManage/deviceData/listWaterData.vue @@ -282,7 +282,7 @@ const downloadElement = document.createElement('a') const href = window.URL.createObjectURL(blob) // 创建下载的链接 downloadElement.href = href - downloadElement.download = `远传水表数据.xlsx` // 下载后文件名 + downloadElement.download = `远程水表数据.xlsx` // 下载后文件名 document.body.appendChild(downloadElement) downloadElement.click() // 点击下载 document.body.removeChild(downloadElement) // 下载完成移除元素 diff --git a/src/views/dataManage/deviceData/waterHistory.vue b/src/views/dataManage/deviceData/waterHistory.vue index 1330807..42e3303 100644 --- a/src/views/dataManage/deviceData/waterHistory.vue +++ b/src/views/dataManage/deviceData/waterHistory.vue @@ -88,7 +88,7 @@ const downloadElement = document.createElement('a') const href = window.URL.createObjectURL(blob) // 创建下载的链接 downloadElement.href = href - downloadElement.download = `${this.listQuery.devCode}远传水表历史数据.xlsx` // 下载后文件名 + downloadElement.download = `${this.listQuery.devCode}远程水表历史数据.xlsx` // 下载后文件名 document.body.appendChild(downloadElement) downloadElement.click() // 点击下载 document.body.removeChild(downloadElement) // 下载完成移除元素 diff --git a/src/views/gasDashboard/components/PanelGroup.vue b/src/views/gasDashboard/components/PanelGroup.vue index eead839..803b666 100644 --- a/src/views/gasDashboard/components/PanelGroup.vue +++ b/src/views/gasDashboard/components/PanelGroup.vue @@ -56,7 +56,7 @@ context: '--', icon: 'icon-watch', color: '#9694f7', - path: '/deviceList?deviceType=13', + path: '/deviceList?deviceType=15', permission: '/device/list' }, { diff --git a/src/views/gasOverview/gasOverviewSimple.vue b/src/views/gasOverview/gasOverviewSimple.vue index 585ab8a..5691e51 100644 --- a/src/views/gasOverview/gasOverviewSimple.vue +++ b/src/views/gasOverview/gasOverviewSimple.vue @@ -5,7 +5,7 @@ - + 搜索 @@ -36,7 +36,7 @@
-
+
告警列表 @@ -48,10 +48,10 @@ @@ -106,7 +106,7 @@ data() { return { screenHeight: null, - checkedCities: ['腐蚀速率监测仪', '气体流量计', '气体泄漏检测仪', '供水泄漏检测仪'], + checkedCities: ['腐蚀速率监测仪', '气体流量计', '气体泄漏监测仪', '供水泄漏监测仪'], left: '', mapMark: '-', deviceTypeList: [], // 设备类型列表 @@ -161,6 +161,7 @@ wellTypeList: [], // 井类型列表 showDeptTree: 0, // 是否显示权属单位下拉,0不显示，1显示树，2显示平面 alarmList: [], // 报警列表 + searchAlarmList: [], timer: null, deptShowTop: false, // 是否显示顶级 clock: null, // 计时器 @@ -250,9 +251,9 @@ } else if (item.indexOf('气体流量计') !== -1) { this.wellMode() this.qtModel() - } else if (item.indexOf('气体泄漏检测仪') !== -1) { + } else if (item.indexOf('气体泄漏监测仪') !== -1) { this.rqModel() - } else if (item.indexOf('供水泄漏检测仪') !== -1) { + } else if (item.indexOf('供水泄漏监测仪') !== -1) { this.wellMode() this.zsMoel() } @@ -398,41 +399,6 @@ }) }, // 初始化街道、流向线 - // async initDrawLines() { - // axios.get('./static/position.json').then((result) => { - // const positions = result.data.positions - // flow = new mars3d.layer.GraphicLayer() - // window.map.addLayer(flow) - // street = new mars3d.layer.GraphicLayer() - // window.map.addLayer(street) - // for (let j = 0; j < positions.length; j++) { - // flow.addGraphic(this.addFlow(positions[j].items, positions[j].repeat)) - // street.addGraphic(this.addStreet(positions[j].items)) - // } - // flow.show = false - // }).catch((error) => { - // console.log('get position error...' + error) - // }) - // }, - // 流向线 - // addFlow(positions, repeat) { - // console.log(positions, repeat, '====---1230') - // var style = { - // width: 10, - // material: mars3d.MaterialUtil.createMaterialProperty(mars3d.MaterialType.LineFlow, { - // color: '#215bd9', - // repeat: new Cesium.Cartesian2(repeat, 1), - // image: '../static/images/line.png', - // speed: 15 - // }) - // } - // var graphic = new mars3d.graphic.PolylineEntity({ - // positions: positions, - // style: style - // }) - // return graphic - // }, - // 初始化街道、流向线 async initDrawLines() { axios.get('./static/position2.json').then((result) => { const positions = result.data.positions @@ -533,6 +499,32 @@ }) return graphic }, + search() { + this.filterAlarmList() + this.initPoints() + }, + // 过滤报警列表 + filterAlarmList() { + const list = this.alarmList + const keywords = this.listQuery.keywords + if (keywords) { // 过滤井编号、设备编号 + this.searchAlarmList = list.filter(item => { + let flag = false + if (item.wellCode.indexOf(keywords) > -1) { + flag = true + } + if (item.devcode.indexOf(keywords) > -1) { + flag = true + } + if (item.position.indexOf(keywords) > -1) { + flag = true + } + return flag + }) + } else { + this.searchAlarmList = list + } + }, // 初始化井，设备 async initPoints() { this.wellMode() @@ -593,58 +585,10 @@ } }) }, - // 远程水表（不展示） - watchModel() { - const params = '13' - getMapping(params, this.listQuery.keywords).then(response => { - // 过滤掉该单位不支持的设备(通过部门id) - const deptIds = this.$store.getters.deptId - const responses = [] - response.data.forEach(item => { - if (item.deptid === deptIds) { - responses.push(item) - } - }) - response.data = responses - if (response.code === 200) { - if (watch_model_layer !== null) window.map.removeLayer(watch_model_layer) - watch_model_layer = new mars3d.layer.GraphicLayer() - window.map.addLayer(watch_model_layer) - if (watch_icon_layer !== null) window.map.removeLayer(watch_icon_layer) - watch_icon_layer = new mars3d.layer.GraphicLayer() - window.map.addLayer(watch_icon_layer) - for (let i = 0; i < response.data.length; i++) { - watch_model_layer.addGraphic(new mars3d.graphic.ModelPrimitive({ - position: [response.data[i].longitude, response.data[i].latitude, -0.5], - style: { - url: '../static/model/sb.glb', - scale: 2, - heading: 90 - }, - popup: `远程水表
设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` - })) - watch_icon_layer.addGraphic(new mars3d.graphic.BillboardEntity({ - id: response.data[i].devcode, - position: [response.data[i].longitude, response.data[i].latitude, 1], - style: { - image: '../static/images/icon/sb.png', - scale: 1, - horizontalOrigin: Cesium.HorizontalOrigin.CENTER, - verticalOrigin: Cesium.VerticalOrigin.BOTTOM, - scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3) - }, - popup: `远程水表
设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` - })) - } - this.refreshAlarm() - } - }) - }, // 腐蚀速率监测仪 fsModel() { const params = '14' getMapping(params, this.listQuery.keywords).then(response => { - console.log(response.data[0].latitude, '======腐蚀速率监测仪=======') // 过滤掉该单位不支持的设备(通过部门id) const deptIds = this.$store.getters.deptId const responses = [] @@ -662,29 +606,32 @@ if (fs_icon_layer !== null) window.map.removeLayer(fs_icon_layer) fs_icon_layer = new mars3d.layer.GraphicLayer() window.map.addLayer(fs_icon_layer) - for (let i = 0; i < response.data.length; i++) { - fs_model_layer.addGraphic(new mars3d.graphic.ModelPrimitive({ - position: [response.data[i].longitude, response.data[i].latitude, 0], - style: { - url: '../static/model/fs.glb', - scale: 1, - heading: 90 - }, - popup: `腐蚀速率监测仪
设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` - })) - fs_icon_layer.addGraphic(new mars3d.graphic.BillboardEntity({ - id: response.data[i].devcode, - position: [response.data[i].longitude, response.data[i].latitude, 1], - style: { - image: '../static/images/icon/fs.png', - scale: 1, - horizontalOrigin: Cesium.HorizontalOrigin.CENTER, - verticalOrigin: Cesium.VerticalOrigin.BOTTOM, - scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3) - }, - popup: `腐蚀速率监测仪
设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` - })) + if (response.data.length > 0) { + for (let i = 0; i < response.data.length; i++) { + fs_model_layer.addGraphic(new mars3d.graphic.ModelPrimitive({ + position: [response.data[i].longitude, response.data[i].latitude, 0], + style: { + url: '../static/model/fs.glb', + scale: 1, + heading: 90 + }, + popup: `设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` + })) + fs_icon_layer.addGraphic(new mars3d.graphic.BillboardEntity({ + id: response.data[i].devcode, + position: [response.data[i].longitude, response.data[i].latitude, 1], + style: { + image: '../static/images/icon/fs.png', + scale: 1, + horizontalOrigin: Cesium.HorizontalOrigin.CENTER, + verticalOrigin: Cesium.VerticalOrigin.BOTTOM, + scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3) + }, + popup: `设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` + })) + } } + this.refreshAlarm() } }) @@ -693,7 +640,6 @@ qtModel() { const params = '15' getMapping(params, this.listQuery.keywords).then(response => { - console.log(response.data[0].latitude, '======气体流量计=======') // 过滤掉该单位不支持的设备(通过部门id) const deptIds = this.$store.getters.deptId const responses = [] @@ -711,28 +657,30 @@ if (qt_icon_layer !== null) window.map.removeLayer(qt_icon_layer) qt_icon_layer = new mars3d.layer.GraphicLayer() window.map.addLayer(qt_icon_layer) - for (let i = 0; i < response.data.length; i++) { - qt_model_layer.addGraphic(new mars3d.graphic.ModelPrimitive({ - position: [response.data[i].longitude, response.data[i].latitude, 0], - style: { - url: '../static/model/qt.glb', - scale: 1, - heading: 90 - }, - popup: `气体流量计
设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` - })) - qt_icon_layer.addGraphic(new mars3d.graphic.BillboardEntity({ - id: response.data[i].devcode, - position: [response.data[i].longitude, response.data[i].latitude, 1], - style: { - image: '../static/images/icon/qt.png', - scale: 1, - horizontalOrigin: Cesium.HorizontalOrigin.CENTER, - verticalOrigin: Cesium.VerticalOrigin.BOTTOM, - scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3) - }, - popup: `气体流量计
设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` - })) + if (response.data.length > 0) { + for (let i = 0; i < response.data.length; i++) { + qt_model_layer.addGraphic(new mars3d.graphic.ModelPrimitive({ + position: [response.data[i].longitude, response.data[i].latitude, 0], + style: { + url: '../static/model/qt.glb', + scale: 1, + heading: 90 + }, + popup: `设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` + })) + qt_icon_layer.addGraphic(new mars3d.graphic.BillboardEntity({ + id: response.data[i].devcode, + position: [response.data[i].longitude, response.data[i].latitude, 1], + style: { + image: '../static/images/icon/qt.png', + scale: 1, + horizontalOrigin: Cesium.HorizontalOrigin.CENTER, + verticalOrigin: Cesium.VerticalOrigin.BOTTOM, + scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3) + }, + popup: `设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` + })) + } } this.refreshAlarm() } @@ -742,7 +690,6 @@ rqModel() { const params = '4' getMapping(params, this.listQuery.keywords).then(response => { - console.log(response.data[0].latitude, '======气体泄露监测仪（原燃气）=======') // 过滤掉该单位不支持的设备(通过部门id) const deptIds = this.$store.getters.deptId const responses = [] @@ -760,28 +707,30 @@ if (rq_icon_layer !== null) window.map.removeLayer(rq_icon_layer) rq_icon_layer = new mars3d.layer.GraphicLayer() window.map.addLayer(rq_icon_layer) - for (let i = 0; i < response.data.length; i++) { - rq_model_layer.addGraphic(new mars3d.graphic.ModelPrimitive({ - position: [response.data[i].longitude, response.data[i].latitude, 0], - style: { - url: '../static/model/rq.glb', - scale: 1, - heading: 90 - }, - popup: `气体泄露监测仪
设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` - })) - rq_icon_layer.addGraphic(new mars3d.graphic.BillboardEntity({ - id: response.data[i].devcode, - position: [response.data[i].longitude, response.data[i].latitude, 1], - style: { - image: '../static/images/icon/rq.png', - scale: 1, - horizontalOrigin: Cesium.HorizontalOrigin.CENTER, - verticalOrigin: Cesium.VerticalOrigin.BOTTOM, - scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3) - }, - popup: `气体泄露监测仪
设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` - })) + if (response.data.length > 0) { + for (let i = 0; i < response.data.length; i++) { + rq_model_layer.addGraphic(new mars3d.graphic.ModelPrimitive({ + position: [response.data[i].longitude, response.data[i].latitude, 0], + style: { + url: '../static/model/rq.glb', + scale: 1, + heading: 90 + }, + popup: `设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` + })) + rq_icon_layer.addGraphic(new mars3d.graphic.BillboardEntity({ + id: response.data[i].devcode, + position: [response.data[i].longitude, response.data[i].latitude, 1], + style: { + image: '../static/images/icon/rq.png', + scale: 1, + horizontalOrigin: Cesium.HorizontalOrigin.CENTER, + verticalOrigin: Cesium.VerticalOrigin.BOTTOM, + scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3) + }, + popup: `设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` + })) + } } this.refreshAlarm() } @@ -791,7 +740,6 @@ zsMoel() { const params = '8' getMapping(params, this.listQuery.keywords).then(response => { - console.log(response.data[0].latitude, '======供水泄露监测仪（原噪声））=======') // 过滤掉该单位不支持的设备(通过部门id) const deptIds = this.$store.getters.deptId const responses = [] @@ -810,28 +758,30 @@ if (zs_icon_layer !== null) window.map.removeLayer(zs_icon_layer) zs_icon_layer = new mars3d.layer.GraphicLayer() window.map.addLayer(zs_icon_layer) - for (let i = 0; i < response.data.length; i++) { - zs_model_layer.addGraphic(new mars3d.graphic.ModelPrimitive({ - position: [response.data[i].longitude, response.data[i].latitude, 0], - style: { - url: '../static/model/zs.glb', - scale: 1, - heading: 90 - }, - popup: `供水泄露监测仪
设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` - })) - zs_icon_layer.addGraphic(new mars3d.graphic.BillboardEntity({ - id: response.data[i].devcode, - position: [response.data[i].longitude, response.data[i].latitude, 1], - style: { - image: '../static/images/icon/zs.png', - scale: 1, - horizontalOrigin: Cesium.HorizontalOrigin.CENTER, - verticalOrigin: Cesium.VerticalOrigin.BOTTOM, - scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3) - }, - popup: `供水泄露监测仪
设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` - })) + if (response.data.length > 0) { + for (let i = 0; i < response.data.length; i++) { + zs_model_layer.addGraphic(new mars3d.graphic.ModelPrimitive({ + position: [response.data[i].longitude, response.data[i].latitude, 0], + style: { + url: '../static/model/zs.glb', + scale: 1, + heading: 90 + }, + popup: `设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` + })) + zs_icon_layer.addGraphic(new mars3d.graphic.BillboardEntity({ + id: response.data[i].devcode, + position: [response.data[i].longitude, response.data[i].latitude, 1], + style: { + image: '../static/images/icon/zs.png', + scale: 1, + horizontalOrigin: Cesium.HorizontalOrigin.CENTER, + verticalOrigin: Cesium.VerticalOrigin.BOTTOM, + scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3) + }, + popup: `设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` + })) + } } this.refreshAlarm() } @@ -859,6 +809,7 @@ if (this.alarmList.length > 0) { this.hasAlarm = true } + this.filterAlarmList() for (const alarm of response.data) { for (const watch of watch_icon_layer.graphics) { if (alarm.devcode === watch.options.id) { diff --git a/src/views/jobManage/detailJob.vue b/src/views/jobManage/detailJob.vue index 2d6aaa4..d03da8d 100644 --- a/src/views/jobManage/detailJob.vue +++ b/src/views/jobManage/detailJob.vue @@ -205,7 +205,7 @@ // 获取工单详情 getJobInfo: function(jobId) { this.loading = true - const base_url = process.env.BASE_API + '/static/' + const base_url = this.baseConfig.baseUrl + '/static/' getJobInfo(jobId).then(response => { this.loading = false if (response.code === 200) { diff --git a/src/views/login/index.vue b/src/views/login/index.vue index 3234e3d..ac57f82 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -11,13 +11,13 @@ class="left-div" >
- +

{{ title }}

-

——海洋石油工程（青岛）有限公司

+
@@ -86,132 +86,132 @@