-
@@ -41,9 +41,9 @@
type: String,
default: '#40c9c6'
},
- unit:{
+ unit: {
type: String,
- default:''
+ default: ''
}
},
computed: {
diff --git a/src/components/BigData/Card1/index.vue b/src/components/BigData/Card1/index.vue
index 722c24c..c9ec32d 100644
--- a/src/components/BigData/Card1/index.vue
+++ b/src/components/BigData/Card1/index.vue
@@ -4,30 +4,20 @@
-
-
- {{ title[0] }} {{ context[0] }}{{unit}}
-
-
- {{ title[1] }} {{ context[1] }}{{unit}}
+
+
+
+
-
+ {{ name }} {{ context[index] }}{{ unit }}
+
@@ -36,46 +26,46 @@
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/index.js b/config/index.js
index 106eaa6..30dda44 100644
--- a/config/index.js
+++ b/config/index.js
@@ -33,7 +33,7 @@
// Use Eslint Loader?
// If true, your code will be linted during bundling and
// linting errors and warnings will be shown in the console.
- useEslint: true,
+ useEslint: false,
// If true, eslint errors and warnings will also be shown in the error overlay
// in the browser.
showEslintErrorsInOverlay: false,
diff --git a/config/prod.env.js b/config/prod.env.js
index 3455ce7..bb20d1d 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -3,5 +3,6 @@
NODE_ENV: '"production"',
// BASE_API: '"http://111.198.10.15:11304"',
// BASE_API: '"http://42.81.160.165:2022/smartwell/"',
- BASE_API: '"http://111.198.10.15:11409/smartwell"' //11643
+ // BASE_API: '"http://111.198.10.15:11409/smartwell"' //11643
+ BASE_API: '"http://111.198.10.15:20104"' //11643
}
diff --git a/package.json b/package.json
index be3e56e..a60e7b3 100644
--- a/package.json
+++ b/package.json
@@ -86,7 +86,7 @@
"vue-template-compiler": "2.5.17",
"webpack": "4.16.5",
"webpack-bundle-analyzer": "2.13.1",
- "webpack-cli": "3.1.0",
+ "webpack-cli": "^3.1.0",
"webpack-dev-server": "3.1.14",
"webpack-merge": "4.1.4"
},
diff --git a/src/App.vue b/src/App.vue
index 721d3a3..ec9032c 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,6 +1,6 @@
{{ title[0] }}
- {{ context[0] }}{{unit}}
+ {{ context[0] }}{{ unit }}
-
diff --git a/src/api/dashboard.js b/src/api/dashboard.js
index aaadb23..6f56e28 100644
--- a/src/api/dashboard.js
+++ b/src/api/dashboard.js
@@ -79,11 +79,10 @@
})
}
-
// 用水事记查询
-export function getNoteList() {
+export function getNoteList(type) {
return request({
- url: '/note/list',
+ url: '/note/list/' + type,
method: 'get'
})
}
@@ -92,7 +91,6 @@
export function updateNoteList(data) {
return request({
url: '/note/edit',
- // url: 'waterMeterData/count',
method: 'post',
data
})
diff --git a/src/api/data.js b/src/api/data.js
index b7c9ba2..65c5071 100644
--- a/src/api/data.js
+++ b/src/api/data.js
@@ -85,6 +85,22 @@
params
})
}
+// 气体流量计数据查询
+export function getGasflowData(params) {
+ return request({
+ url: 'gasflow/list',
+ method: 'get',
+ params
+ })
+}
+// 腐蚀速率监测仪数据查询
+export function getCorrodeData(params) {
+ return request({
+ url: 'corrode/data/list',
+ method: 'get',
+ params
+ })
+}
// 批量导出井盖数据
export function batchExportWellData(params) {
@@ -183,6 +199,26 @@
responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
})
}
+// 腐蚀速率监测仪数据导出
+export function batchExportCorrodeData(params) {
+ return request({
+ url: 'corrode/data/export',
+ method: 'get',
+ timeout: 120000, // 120s，2分钟
+ params,
+ responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+ })
+}
+// 气体流量计数据导出
+export function batchExportGasflowData(params) {
+ return request({
+ url: 'gasflow/data/export',
+ method: 'get',
+ timeout: 120000, // 120s，2分钟
+ params,
+ responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+ })
+}
// 温度压力数据查询
export function getTempPressData(params) {
diff --git a/src/api/device.js b/src/api/device.js
index 00804fe..edcc1a4 100644
--- a/src/api/device.js
+++ b/src/api/device.js
@@ -100,4 +100,11 @@
params
})
}
+export function totalDataGasFlow(params) {
+ return request({
+ url: 'gasflow/listByDevice',
+ method: 'post',
+ params
+ })
+}
diff --git a/src/api/gasOverview.js b/src/api/gasOverview.js
new file mode 100644
index 0000000..0dc3442
--- /dev/null
+++ b/src/api/gasOverview.js
@@ -0,0 +1,173 @@
+/**
+ * 动力管线
+ */
+import request from '@/utils/request'
+
+// 用水量、噪声统计数据
+export function gasStatistic() {
+ return request({
+ url: 'gasStatistic/overview',
+ method: 'get'
+ })
+}
+
+// 用水量、噪声统计数据
+export function gasStatistic2(deviceType) {
+ return request({
+ url: 'gas/statistics/used',
+ method: 'get',
+ params: {
+ deviceType: deviceType
+ }
+ })
+}
+
+// 气体用气量走势图
+export function gasTrend(params) {
+ return request({
+ url: '/gas/statistics/trend',
+ method: 'get',
+ params
+ })
+}
+// 用气量超量报警统计
+export function gasAlarmTrend(params) {
+ return request({
+ url: '/gas/alarm/trend',
+ method: 'get',
+ params
+ })
+}
+// 各设备气体用气量
+export function gasUsed(params) {
+ return request({
+ url: '/gas/used',
+ method: 'get',
+ params
+ })
+}
+// 气体泄漏监测结果
+export function gasLeakStatus(params) {
+ return request({
+ url: 'gas/leakage/rate',
+ method: 'get',
+ params
+ })
+}
+
+// 气体流量计数量
+export function deviceCount(type) {
+ return request({
+ url: 'device/count/' + type,
+ method: 'get'
+ })
+}
+
+// 统计当前报警数
+export function alarmNowStatic(params) {
+ return request({
+ url: 'statics/alarmsNow',
+ method: 'get',
+ params
+ })
+}
+
+// 查询二级分区各区用气量
+export function countBySecondArea(params) {
+ return request({
+ url: 'gasStatistic/countBySecondArea',
+ method: 'get',
+ params
+ })
+}
+
+// 查询二级分区7日用气量
+export function countByDaySecond(params) {
+ return request({
+ url: 'gasStatistic/countByDay',
+ method: 'get',
+ params
+ })
+}
+// 查询二级分区燃气告警
+export function gasAlarmBySecondArea(params) {
+ return request({
+ url: 'gas/alarm/rate',
+ method: 'get',
+ params
+ })
+}
+// 各设备腐蚀速率统计
+export function corrRateByDevice(params) {
+ return request({
+ url: 'corrode/data/corrRateByDevice',
+ method: 'get',
+ params
+ })
+}
+// 查询二级分区用气对比
+export function gasCompareData(params) {
+ return request({
+ url: 'gasStatistic/gasCompare',
+ method: 'get',
+ params
+ })
+}
+
+// 根据设备类型统计设备数量
+export function deviceStaticsByType(params) {
+ return request({
+ url: 'statics/deviceStaticsByType',
+ method: 'get',
+ params
+ })
+}
+
+// 查询二级分区气体流量计告警
+export function alarmBySecondArea(params) {
+ return request({
+ url: 'gasStatistic/alarmBySecondArea',
+ method: 'get',
+ params
+ })
+}
+
+// 用气事记查询
+export function getNoteList(type) {
+ return request({
+ url: '/note/list/' + type,
+ // url: '/note/list',
+ method: 'get'
+ })
+}
+
+// 用气事记更新
+export function updateNoteList(data) {
+ return request({
+ url: '/note/edit',
+ method: 'post',
+ data
+ })
+}
+
+// 获取报警列表
+export function getAlarmsNow(params) {
+ return request({
+ url: 'overview/alarmNow',
+ method: 'get',
+ params
+ })
+}
+
+// 总览marker（真接口）
+export function getMapping(devType, keywords) {
+ return request({
+ url: 'overview/wellMapping',
+ method: 'get',
+ params: {
+ keywords: keywords,
+ devType: devType
+ }
+ })
+}
+
diff --git a/src/components/BigData/Card/index.vue b/src/components/BigData/Card/index.vue
index 8320d47..8944b44 100644
--- a/src/components/BigData/Card/index.vue
+++ b/src/components/BigData/Card/index.vue
@@ -10,7 +10,7 @@
{{ context }}
- {{unit}}
+ {{ unit }}
-
-
-
@@ -41,9 +41,9 @@
type: String,
default: '#40c9c6'
},
- unit:{
+ unit: {
type: String,
- default:''
+ default: ''
}
},
computed: {
diff --git a/src/components/BigData/Card1/index.vue b/src/components/BigData/Card1/index.vue
index 722c24c..c9ec32d 100644
--- a/src/components/BigData/Card1/index.vue
+++ b/src/components/BigData/Card1/index.vue
@@ -4,30 +4,20 @@
-
-
- {{ title[0] }} {{ context[0] }}{{unit}}
-
-
- {{ title[1] }} {{ context[1] }}{{unit}}
+
+
+
+
-
+ {{ name }} {{ context[index] }}{{ unit }}
+
@@ -36,46 +26,46 @@
diff --git a/src/views/dataManage/deviceData/listCorrodeData.vue b/src/views/dataManage/deviceData/listCorrodeData.vue
new file mode 100644
index 0000000..1a20abb
--- /dev/null
+++ b/src/views/dataManage/deviceData/listCorrodeData.vue
@@ -0,0 +1,272 @@
+
+
{{ title[0] }}
- {{ context[0] }}{{unit}}
+ {{ context[0] }}{{ unit }}
+
+
+
+
+
+
+
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/index.js b/config/index.js
index 106eaa6..30dda44 100644
--- a/config/index.js
+++ b/config/index.js
@@ -33,7 +33,7 @@
// Use Eslint Loader?
// If true, your code will be linted during bundling and
// linting errors and warnings will be shown in the console.
- useEslint: true,
+ useEslint: false,
// If true, eslint errors and warnings will also be shown in the error overlay
// in the browser.
showEslintErrorsInOverlay: false,
diff --git a/config/prod.env.js b/config/prod.env.js
index 3455ce7..bb20d1d 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -3,5 +3,6 @@
NODE_ENV: '"production"',
// BASE_API: '"http://111.198.10.15:11304"',
// BASE_API: '"http://42.81.160.165:2022/smartwell/"',
- BASE_API: '"http://111.198.10.15:11409/smartwell"' //11643
+ // BASE_API: '"http://111.198.10.15:11409/smartwell"' //11643
+ BASE_API: '"http://111.198.10.15:20104"' //11643
}
diff --git a/package.json b/package.json
index be3e56e..a60e7b3 100644
--- a/package.json
+++ b/package.json
@@ -86,7 +86,7 @@
"vue-template-compiler": "2.5.17",
"webpack": "4.16.5",
"webpack-bundle-analyzer": "2.13.1",
- "webpack-cli": "3.1.0",
+ "webpack-cli": "^3.1.0",
"webpack-dev-server": "3.1.14",
"webpack-merge": "4.1.4"
},
diff --git a/src/App.vue b/src/App.vue
index 721d3a3..ec9032c 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,6 +1,6 @@
+
+
+
+
+
+
+ 搜索
+
+
+
+
+
+
+
+ 导出记录
+
+
+
+
+
+
+ {{ scope.row[column.value] }}
+ {{ scope.row[column.value] }}
+
+
+
+
+
+ 数据列表
+
+
-
diff --git a/src/api/dashboard.js b/src/api/dashboard.js
index aaadb23..6f56e28 100644
--- a/src/api/dashboard.js
+++ b/src/api/dashboard.js
@@ -79,11 +79,10 @@
})
}
-
// 用水事记查询
-export function getNoteList() {
+export function getNoteList(type) {
return request({
- url: '/note/list',
+ url: '/note/list/' + type,
method: 'get'
})
}
@@ -92,7 +91,6 @@
export function updateNoteList(data) {
return request({
url: '/note/edit',
- // url: 'waterMeterData/count',
method: 'post',
data
})
diff --git a/src/api/data.js b/src/api/data.js
index b7c9ba2..65c5071 100644
--- a/src/api/data.js
+++ b/src/api/data.js
@@ -85,6 +85,22 @@
params
})
}
+// 气体流量计数据查询
+export function getGasflowData(params) {
+ return request({
+ url: 'gasflow/list',
+ method: 'get',
+ params
+ })
+}
+// 腐蚀速率监测仪数据查询
+export function getCorrodeData(params) {
+ return request({
+ url: 'corrode/data/list',
+ method: 'get',
+ params
+ })
+}
// 批量导出井盖数据
export function batchExportWellData(params) {
@@ -183,6 +199,26 @@
responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
})
}
+// 腐蚀速率监测仪数据导出
+export function batchExportCorrodeData(params) {
+ return request({
+ url: 'corrode/data/export',
+ method: 'get',
+ timeout: 120000, // 120s，2分钟
+ params,
+ responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+ })
+}
+// 气体流量计数据导出
+export function batchExportGasflowData(params) {
+ return request({
+ url: 'gasflow/data/export',
+ method: 'get',
+ timeout: 120000, // 120s，2分钟
+ params,
+ responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+ })
+}
// 温度压力数据查询
export function getTempPressData(params) {
diff --git a/src/api/device.js b/src/api/device.js
index 00804fe..edcc1a4 100644
--- a/src/api/device.js
+++ b/src/api/device.js
@@ -100,4 +100,11 @@
params
})
}
+export function totalDataGasFlow(params) {
+ return request({
+ url: 'gasflow/listByDevice',
+ method: 'post',
+ params
+ })
+}
diff --git a/src/api/gasOverview.js b/src/api/gasOverview.js
new file mode 100644
index 0000000..0dc3442
--- /dev/null
+++ b/src/api/gasOverview.js
@@ -0,0 +1,173 @@
+/**
+ * 动力管线
+ */
+import request from '@/utils/request'
+
+// 用水量、噪声统计数据
+export function gasStatistic() {
+ return request({
+ url: 'gasStatistic/overview',
+ method: 'get'
+ })
+}
+
+// 用水量、噪声统计数据
+export function gasStatistic2(deviceType) {
+ return request({
+ url: 'gas/statistics/used',
+ method: 'get',
+ params: {
+ deviceType: deviceType
+ }
+ })
+}
+
+// 气体用气量走势图
+export function gasTrend(params) {
+ return request({
+ url: '/gas/statistics/trend',
+ method: 'get',
+ params
+ })
+}
+// 用气量超量报警统计
+export function gasAlarmTrend(params) {
+ return request({
+ url: '/gas/alarm/trend',
+ method: 'get',
+ params
+ })
+}
+// 各设备气体用气量
+export function gasUsed(params) {
+ return request({
+ url: '/gas/used',
+ method: 'get',
+ params
+ })
+}
+// 气体泄漏监测结果
+export function gasLeakStatus(params) {
+ return request({
+ url: 'gas/leakage/rate',
+ method: 'get',
+ params
+ })
+}
+
+// 气体流量计数量
+export function deviceCount(type) {
+ return request({
+ url: 'device/count/' + type,
+ method: 'get'
+ })
+}
+
+// 统计当前报警数
+export function alarmNowStatic(params) {
+ return request({
+ url: 'statics/alarmsNow',
+ method: 'get',
+ params
+ })
+}
+
+// 查询二级分区各区用气量
+export function countBySecondArea(params) {
+ return request({
+ url: 'gasStatistic/countBySecondArea',
+ method: 'get',
+ params
+ })
+}
+
+// 查询二级分区7日用气量
+export function countByDaySecond(params) {
+ return request({
+ url: 'gasStatistic/countByDay',
+ method: 'get',
+ params
+ })
+}
+// 查询二级分区燃气告警
+export function gasAlarmBySecondArea(params) {
+ return request({
+ url: 'gas/alarm/rate',
+ method: 'get',
+ params
+ })
+}
+// 各设备腐蚀速率统计
+export function corrRateByDevice(params) {
+ return request({
+ url: 'corrode/data/corrRateByDevice',
+ method: 'get',
+ params
+ })
+}
+// 查询二级分区用气对比
+export function gasCompareData(params) {
+ return request({
+ url: 'gasStatistic/gasCompare',
+ method: 'get',
+ params
+ })
+}
+
+// 根据设备类型统计设备数量
+export function deviceStaticsByType(params) {
+ return request({
+ url: 'statics/deviceStaticsByType',
+ method: 'get',
+ params
+ })
+}
+
+// 查询二级分区气体流量计告警
+export function alarmBySecondArea(params) {
+ return request({
+ url: 'gasStatistic/alarmBySecondArea',
+ method: 'get',
+ params
+ })
+}
+
+// 用气事记查询
+export function getNoteList(type) {
+ return request({
+ url: '/note/list/' + type,
+ // url: '/note/list',
+ method: 'get'
+ })
+}
+
+// 用气事记更新
+export function updateNoteList(data) {
+ return request({
+ url: '/note/edit',
+ method: 'post',
+ data
+ })
+}
+
+// 获取报警列表
+export function getAlarmsNow(params) {
+ return request({
+ url: 'overview/alarmNow',
+ method: 'get',
+ params
+ })
+}
+
+// 总览marker（真接口）
+export function getMapping(devType, keywords) {
+ return request({
+ url: 'overview/wellMapping',
+ method: 'get',
+ params: {
+ keywords: keywords,
+ devType: devType
+ }
+ })
+}
+
diff --git a/src/components/BigData/Card/index.vue b/src/components/BigData/Card/index.vue
index 8320d47..8944b44 100644
--- a/src/components/BigData/Card/index.vue
+++ b/src/components/BigData/Card/index.vue
@@ -10,7 +10,7 @@
{{ context }}
- {{unit}}
+ {{ unit }}
-
-
-
@@ -41,9 +41,9 @@
type: String,
default: '#40c9c6'
},
- unit:{
+ unit: {
type: String,
- default:''
+ default: ''
}
},
computed: {
diff --git a/src/components/BigData/Card1/index.vue b/src/components/BigData/Card1/index.vue
index 722c24c..c9ec32d 100644
--- a/src/components/BigData/Card1/index.vue
+++ b/src/components/BigData/Card1/index.vue
@@ -4,30 +4,20 @@
-
-
- {{ title[0] }} {{ context[0] }}{{unit}}
-
-
- {{ title[1] }} {{ context[1] }}{{unit}}
+
+
+
-
-
@@ -28,7 +29,7 @@
- 导出记录
+ 导出记录
@@ -63,6 +64,7 @@
import { getGasData, batchExportGasData } from '@/api/data'
import DeptSelect from '../../../components/DeptSelect/index'
import { parseUrl } from '@/utils/parseutils'
+import { getSearchLastWeekTime } from '@/utils/dateutils'
export default {
name: 'ListGasData',
@@ -163,6 +165,7 @@
if (params && params.deviceType === '4' && params.devcode) {
this.listQuery.keywords = params.devcode
}
+ this.timeRange = getSearchLastWeekTime()
this.fetchData()
}
},
@@ -191,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/config/index.js b/config/index.js
index 106eaa6..30dda44 100644
--- a/config/index.js
+++ b/config/index.js
@@ -33,7 +33,7 @@
// Use Eslint Loader?
// If true, your code will be linted during bundling and
// linting errors and warnings will be shown in the console.
- useEslint: true,
+ useEslint: false,
// If true, eslint errors and warnings will also be shown in the error overlay
// in the browser.
showEslintErrorsInOverlay: false,
diff --git a/config/prod.env.js b/config/prod.env.js
index 3455ce7..bb20d1d 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -3,5 +3,6 @@
NODE_ENV: '"production"',
// BASE_API: '"http://111.198.10.15:11304"',
// BASE_API: '"http://42.81.160.165:2022/smartwell/"',
- BASE_API: '"http://111.198.10.15:11409/smartwell"' //11643
+ // BASE_API: '"http://111.198.10.15:11409/smartwell"' //11643
+ BASE_API: '"http://111.198.10.15:20104"' //11643
}
diff --git a/package.json b/package.json
index be3e56e..a60e7b3 100644
--- a/package.json
+++ b/package.json
@@ -86,7 +86,7 @@
"vue-template-compiler": "2.5.17",
"webpack": "4.16.5",
"webpack-bundle-analyzer": "2.13.1",
- "webpack-cli": "3.1.0",
+ "webpack-cli": "^3.1.0",
"webpack-dev-server": "3.1.14",
"webpack-merge": "4.1.4"
},
diff --git a/src/App.vue b/src/App.vue
index 721d3a3..ec9032c 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,6 +1,6 @@
+
-
+ {{ name }} {{ context[index] }}{{ unit }}
+
@@ -36,46 +26,46 @@
diff --git a/src/views/dataManage/deviceData/listCorrodeData.vue b/src/views/dataManage/deviceData/listCorrodeData.vue
new file mode 100644
index 0000000..1a20abb
--- /dev/null
+++ b/src/views/dataManage/deviceData/listCorrodeData.vue
@@ -0,0 +1,272 @@
+
+
{{ title[0] }}
- {{ context[0] }}{{unit}}
+ {{ context[0] }}{{ unit }}
+
+
+
+
+
+
+
diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue
index 97cdfdb..40b9a5e 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -5,10 +5,10 @@
+
+
+
+
+
+
+ 搜索
+
+
+
+
+
+
+
+ 导出记录
+
+
+
+
+
+
+ {{ scope.row[column.value] }}
+ {{ scope.row[column.value] }}
+
+
+
+
+
+ 数据列表
+
+ 数据列表
-
diff --git a/src/api/dashboard.js b/src/api/dashboard.js
index aaadb23..6f56e28 100644
--- a/src/api/dashboard.js
+++ b/src/api/dashboard.js
@@ -79,11 +79,10 @@
})
}
-
// 用水事记查询
-export function getNoteList() {
+export function getNoteList(type) {
return request({
- url: '/note/list',
+ url: '/note/list/' + type,
method: 'get'
})
}
@@ -92,7 +91,6 @@
export function updateNoteList(data) {
return request({
url: '/note/edit',
- // url: 'waterMeterData/count',
method: 'post',
data
})
diff --git a/src/api/data.js b/src/api/data.js
index b7c9ba2..65c5071 100644
--- a/src/api/data.js
+++ b/src/api/data.js
@@ -85,6 +85,22 @@
params
})
}
+// 气体流量计数据查询
+export function getGasflowData(params) {
+ return request({
+ url: 'gasflow/list',
+ method: 'get',
+ params
+ })
+}
+// 腐蚀速率监测仪数据查询
+export function getCorrodeData(params) {
+ return request({
+ url: 'corrode/data/list',
+ method: 'get',
+ params
+ })
+}
// 批量导出井盖数据
export function batchExportWellData(params) {
@@ -183,6 +199,26 @@
responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
})
}
+// 腐蚀速率监测仪数据导出
+export function batchExportCorrodeData(params) {
+ return request({
+ url: 'corrode/data/export',
+ method: 'get',
+ timeout: 120000, // 120s，2分钟
+ params,
+ responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+ })
+}
+// 气体流量计数据导出
+export function batchExportGasflowData(params) {
+ return request({
+ url: 'gasflow/data/export',
+ method: 'get',
+ timeout: 120000, // 120s，2分钟
+ params,
+ responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+ })
+}
// 温度压力数据查询
export function getTempPressData(params) {
diff --git a/src/api/device.js b/src/api/device.js
index 00804fe..edcc1a4 100644
--- a/src/api/device.js
+++ b/src/api/device.js
@@ -100,4 +100,11 @@
params
})
}
+export function totalDataGasFlow(params) {
+ return request({
+ url: 'gasflow/listByDevice',
+ method: 'post',
+ params
+ })
+}
diff --git a/src/api/gasOverview.js b/src/api/gasOverview.js
new file mode 100644
index 0000000..0dc3442
--- /dev/null
+++ b/src/api/gasOverview.js
@@ -0,0 +1,173 @@
+/**
+ * 动力管线
+ */
+import request from '@/utils/request'
+
+// 用水量、噪声统计数据
+export function gasStatistic() {
+ return request({
+ url: 'gasStatistic/overview',
+ method: 'get'
+ })
+}
+
+// 用水量、噪声统计数据
+export function gasStatistic2(deviceType) {
+ return request({
+ url: 'gas/statistics/used',
+ method: 'get',
+ params: {
+ deviceType: deviceType
+ }
+ })
+}
+
+// 气体用气量走势图
+export function gasTrend(params) {
+ return request({
+ url: '/gas/statistics/trend',
+ method: 'get',
+ params
+ })
+}
+// 用气量超量报警统计
+export function gasAlarmTrend(params) {
+ return request({
+ url: '/gas/alarm/trend',
+ method: 'get',
+ params
+ })
+}
+// 各设备气体用气量
+export function gasUsed(params) {
+ return request({
+ url: '/gas/used',
+ method: 'get',
+ params
+ })
+}
+// 气体泄漏监测结果
+export function gasLeakStatus(params) {
+ return request({
+ url: 'gas/leakage/rate',
+ method: 'get',
+ params
+ })
+}
+
+// 气体流量计数量
+export function deviceCount(type) {
+ return request({
+ url: 'device/count/' + type,
+ method: 'get'
+ })
+}
+
+// 统计当前报警数
+export function alarmNowStatic(params) {
+ return request({
+ url: 'statics/alarmsNow',
+ method: 'get',
+ params
+ })
+}
+
+// 查询二级分区各区用气量
+export function countBySecondArea(params) {
+ return request({
+ url: 'gasStatistic/countBySecondArea',
+ method: 'get',
+ params
+ })
+}
+
+// 查询二级分区7日用气量
+export function countByDaySecond(params) {
+ return request({
+ url: 'gasStatistic/countByDay',
+ method: 'get',
+ params
+ })
+}
+// 查询二级分区燃气告警
+export function gasAlarmBySecondArea(params) {
+ return request({
+ url: 'gas/alarm/rate',
+ method: 'get',
+ params
+ })
+}
+// 各设备腐蚀速率统计
+export function corrRateByDevice(params) {
+ return request({
+ url: 'corrode/data/corrRateByDevice',
+ method: 'get',
+ params
+ })
+}
+// 查询二级分区用气对比
+export function gasCompareData(params) {
+ return request({
+ url: 'gasStatistic/gasCompare',
+ method: 'get',
+ params
+ })
+}
+
+// 根据设备类型统计设备数量
+export function deviceStaticsByType(params) {
+ return request({
+ url: 'statics/deviceStaticsByType',
+ method: 'get',
+ params
+ })
+}
+
+// 查询二级分区气体流量计告警
+export function alarmBySecondArea(params) {
+ return request({
+ url: 'gasStatistic/alarmBySecondArea',
+ method: 'get',
+ params
+ })
+}
+
+// 用气事记查询
+export function getNoteList(type) {
+ return request({
+ url: '/note/list/' + type,
+ // url: '/note/list',
+ method: 'get'
+ })
+}
+
+// 用气事记更新
+export function updateNoteList(data) {
+ return request({
+ url: '/note/edit',
+ method: 'post',
+ data
+ })
+}
+
+// 获取报警列表
+export function getAlarmsNow(params) {
+ return request({
+ url: 'overview/alarmNow',
+ method: 'get',
+ params
+ })
+}
+
+// 总览marker（真接口）
+export function getMapping(devType, keywords) {
+ return request({
+ url: 'overview/wellMapping',
+ method: 'get',
+ params: {
+ keywords: keywords,
+ devType: devType
+ }
+ })
+}
+
diff --git a/src/components/BigData/Card/index.vue b/src/components/BigData/Card/index.vue
index 8320d47..8944b44 100644
--- a/src/components/BigData/Card/index.vue
+++ b/src/components/BigData/Card/index.vue
@@ -10,7 +10,7 @@
{{ context }}
- {{unit}}
+ {{ unit }}
-
-
-
@@ -41,9 +41,9 @@
type: String,
default: '#40c9c6'
},
- unit:{
+ unit: {
type: String,
- default:''
+ default: ''
}
},
computed: {
diff --git a/src/components/BigData/Card1/index.vue b/src/components/BigData/Card1/index.vue
index 722c24c..c9ec32d 100644
--- a/src/components/BigData/Card1/index.vue
+++ b/src/components/BigData/Card1/index.vue
@@ -4,30 +4,20 @@
-
-
- {{ title[0] }} {{ context[0] }}{{unit}}
-
-
- {{ title[1] }} {{ context[1] }}{{unit}}
+
+
+
-
-
@@ -28,7 +29,7 @@
- 导出记录
+ 导出记录
@@ -63,6 +64,7 @@
import { getGasData, batchExportGasData } from '@/api/data'
import DeptSelect from '../../../components/DeptSelect/index'
import { parseUrl } from '@/utils/parseutils'
+import { getSearchLastWeekTime } from '@/utils/dateutils'
export default {
name: 'ListGasData',
@@ -163,6 +165,7 @@
if (params && params.deviceType === '4' && params.devcode) {
this.listQuery.keywords = params.devcode
}
+ this.timeRange = getSearchLastWeekTime()
this.fetchData()
}
},
@@ -191,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/listGasflowData.vue b/src/views/dataManage/deviceData/listGasflowData.vue
new file mode 100644
index 0000000..9c5321a
--- /dev/null
+++ b/src/views/dataManage/deviceData/listGasflowData.vue
@@ -0,0 +1,311 @@
+
+
+
-
+ {{ name }} {{ context[index] }}{{ unit }}
+
@@ -36,46 +26,46 @@
diff --git a/src/views/dataManage/deviceData/listCorrodeData.vue b/src/views/dataManage/deviceData/listCorrodeData.vue
new file mode 100644
index 0000000..1a20abb
--- /dev/null
+++ b/src/views/dataManage/deviceData/listCorrodeData.vue
@@ -0,0 +1,272 @@
+
+
{{ title[0] }}
- {{ context[0] }}{{unit}}
+ {{ context[0] }}{{ unit }}
+
+
+
+
+
+
+
diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue
index 97cdfdb..40b9a5e 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -5,10 +5,10 @@
+
+
+
+
+
+
+ 搜索
+
+
+
+
+
+
+
+ 导出记录
+
+
+
+
+
+
+ {{ scope.row[column.value] }}
+ {{ scope.row[column.value] }}
+
+
+
+
+
+ 数据列表
+
+ 数据列表
+
+
+
+
+
+
+
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/index.js b/config/index.js
index 106eaa6..30dda44 100644
--- a/config/index.js
+++ b/config/index.js
@@ -33,7 +33,7 @@
// Use Eslint Loader?
// If true, your code will be linted during bundling and
// linting errors and warnings will be shown in the console.
- useEslint: true,
+ useEslint: false,
// If true, eslint errors and warnings will also be shown in the error overlay
// in the browser.
showEslintErrorsInOverlay: false,
diff --git a/config/prod.env.js b/config/prod.env.js
index 3455ce7..bb20d1d 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -3,5 +3,6 @@
NODE_ENV: '"production"',
// BASE_API: '"http://111.198.10.15:11304"',
// BASE_API: '"http://42.81.160.165:2022/smartwell/"',
- BASE_API: '"http://111.198.10.15:11409/smartwell"' //11643
+ // BASE_API: '"http://111.198.10.15:11409/smartwell"' //11643
+ BASE_API: '"http://111.198.10.15:20104"' //11643
}
diff --git a/package.json b/package.json
index be3e56e..a60e7b3 100644
--- a/package.json
+++ b/package.json
@@ -86,7 +86,7 @@
"vue-template-compiler": "2.5.17",
"webpack": "4.16.5",
"webpack-bundle-analyzer": "2.13.1",
- "webpack-cli": "3.1.0",
+ "webpack-cli": "^3.1.0",
"webpack-dev-server": "3.1.14",
"webpack-merge": "4.1.4"
},
diff --git a/src/App.vue b/src/App.vue
index 721d3a3..ec9032c 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,6 +1,6 @@
+
+
+
+
+
+
+ 搜索
+
+
+
+
+
+
+
+ 导出记录
+
+
+
+
+
+
+ {{
+ scope.row[column.value]
+ }}
+ {{
+ scope.row["areaFullName"] + '/' + scope.row[column.value]
+ }}
+ {{ scope.row[column.value] }}
+
+
+
+
+
+ 历史数据
+
+
+
+
+
+
+ 数据列表
+
+
-
diff --git a/src/api/dashboard.js b/src/api/dashboard.js
index aaadb23..6f56e28 100644
--- a/src/api/dashboard.js
+++ b/src/api/dashboard.js
@@ -79,11 +79,10 @@
})
}
-
// 用水事记查询
-export function getNoteList() {
+export function getNoteList(type) {
return request({
- url: '/note/list',
+ url: '/note/list/' + type,
method: 'get'
})
}
@@ -92,7 +91,6 @@
export function updateNoteList(data) {
return request({
url: '/note/edit',
- // url: 'waterMeterData/count',
method: 'post',
data
})
diff --git a/src/api/data.js b/src/api/data.js
index b7c9ba2..65c5071 100644
--- a/src/api/data.js
+++ b/src/api/data.js
@@ -85,6 +85,22 @@
params
})
}
+// 气体流量计数据查询
+export function getGasflowData(params) {
+ return request({
+ url: 'gasflow/list',
+ method: 'get',
+ params
+ })
+}
+// 腐蚀速率监测仪数据查询
+export function getCorrodeData(params) {
+ return request({
+ url: 'corrode/data/list',
+ method: 'get',
+ params
+ })
+}
// 批量导出井盖数据
export function batchExportWellData(params) {
@@ -183,6 +199,26 @@
responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
})
}
+// 腐蚀速率监测仪数据导出
+export function batchExportCorrodeData(params) {
+ return request({
+ url: 'corrode/data/export',
+ method: 'get',
+ timeout: 120000, // 120s，2分钟
+ params,
+ responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+ })
+}
+// 气体流量计数据导出
+export function batchExportGasflowData(params) {
+ return request({
+ url: 'gasflow/data/export',
+ method: 'get',
+ timeout: 120000, // 120s，2分钟
+ params,
+ responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+ })
+}
// 温度压力数据查询
export function getTempPressData(params) {
diff --git a/src/api/device.js b/src/api/device.js
index 00804fe..edcc1a4 100644
--- a/src/api/device.js
+++ b/src/api/device.js
@@ -100,4 +100,11 @@
params
})
}
+export function totalDataGasFlow(params) {
+ return request({
+ url: 'gasflow/listByDevice',
+ method: 'post',
+ params
+ })
+}
diff --git a/src/api/gasOverview.js b/src/api/gasOverview.js
new file mode 100644
index 0000000..0dc3442
--- /dev/null
+++ b/src/api/gasOverview.js
@@ -0,0 +1,173 @@
+/**
+ * 动力管线
+ */
+import request from '@/utils/request'
+
+// 用水量、噪声统计数据
+export function gasStatistic() {
+ return request({
+ url: 'gasStatistic/overview',
+ method: 'get'
+ })
+}
+
+// 用水量、噪声统计数据
+export function gasStatistic2(deviceType) {
+ return request({
+ url: 'gas/statistics/used',
+ method: 'get',
+ params: {
+ deviceType: deviceType
+ }
+ })
+}
+
+// 气体用气量走势图
+export function gasTrend(params) {
+ return request({
+ url: '/gas/statistics/trend',
+ method: 'get',
+ params
+ })
+}
+// 用气量超量报警统计
+export function gasAlarmTrend(params) {
+ return request({
+ url: '/gas/alarm/trend',
+ method: 'get',
+ params
+ })
+}
+// 各设备气体用气量
+export function gasUsed(params) {
+ return request({
+ url: '/gas/used',
+ method: 'get',
+ params
+ })
+}
+// 气体泄漏监测结果
+export function gasLeakStatus(params) {
+ return request({
+ url: 'gas/leakage/rate',
+ method: 'get',
+ params
+ })
+}
+
+// 气体流量计数量
+export function deviceCount(type) {
+ return request({
+ url: 'device/count/' + type,
+ method: 'get'
+ })
+}
+
+// 统计当前报警数
+export function alarmNowStatic(params) {
+ return request({
+ url: 'statics/alarmsNow',
+ method: 'get',
+ params
+ })
+}
+
+// 查询二级分区各区用气量
+export function countBySecondArea(params) {
+ return request({
+ url: 'gasStatistic/countBySecondArea',
+ method: 'get',
+ params
+ })
+}
+
+// 查询二级分区7日用气量
+export function countByDaySecond(params) {
+ return request({
+ url: 'gasStatistic/countByDay',
+ method: 'get',
+ params
+ })
+}
+// 查询二级分区燃气告警
+export function gasAlarmBySecondArea(params) {
+ return request({
+ url: 'gas/alarm/rate',
+ method: 'get',
+ params
+ })
+}
+// 各设备腐蚀速率统计
+export function corrRateByDevice(params) {
+ return request({
+ url: 'corrode/data/corrRateByDevice',
+ method: 'get',
+ params
+ })
+}
+// 查询二级分区用气对比
+export function gasCompareData(params) {
+ return request({
+ url: 'gasStatistic/gasCompare',
+ method: 'get',
+ params
+ })
+}
+
+// 根据设备类型统计设备数量
+export function deviceStaticsByType(params) {
+ return request({
+ url: 'statics/deviceStaticsByType',
+ method: 'get',
+ params
+ })
+}
+
+// 查询二级分区气体流量计告警
+export function alarmBySecondArea(params) {
+ return request({
+ url: 'gasStatistic/alarmBySecondArea',
+ method: 'get',
+ params
+ })
+}
+
+// 用气事记查询
+export function getNoteList(type) {
+ return request({
+ url: '/note/list/' + type,
+ // url: '/note/list',
+ method: 'get'
+ })
+}
+
+// 用气事记更新
+export function updateNoteList(data) {
+ return request({
+ url: '/note/edit',
+ method: 'post',
+ data
+ })
+}
+
+// 获取报警列表
+export function getAlarmsNow(params) {
+ return request({
+ url: 'overview/alarmNow',
+ method: 'get',
+ params
+ })
+}
+
+// 总览marker（真接口）
+export function getMapping(devType, keywords) {
+ return request({
+ url: 'overview/wellMapping',
+ method: 'get',
+ params: {
+ keywords: keywords,
+ devType: devType
+ }
+ })
+}
+
diff --git a/src/components/BigData/Card/index.vue b/src/components/BigData/Card/index.vue
index 8320d47..8944b44 100644
--- a/src/components/BigData/Card/index.vue
+++ b/src/components/BigData/Card/index.vue
@@ -10,7 +10,7 @@
{{ context }}
- {{unit}}
+ {{ unit }}
-
-
-
@@ -41,9 +41,9 @@
type: String,
default: '#40c9c6'
},
- unit:{
+ unit: {
type: String,
- default:''
+ default: ''
}
},
computed: {
diff --git a/src/components/BigData/Card1/index.vue b/src/components/BigData/Card1/index.vue
index 722c24c..c9ec32d 100644
--- a/src/components/BigData/Card1/index.vue
+++ b/src/components/BigData/Card1/index.vue
@@ -4,30 +4,20 @@
-
-
- {{ title[0] }} {{ context[0] }}{{unit}}
-
-
- {{ title[1] }} {{ context[1] }}{{unit}}
+
+
+
-
-
@@ -28,7 +29,7 @@
- 导出记录
+ 导出记录
@@ -63,6 +64,7 @@
import { getGasData, batchExportGasData } from '@/api/data'
import DeptSelect from '../../../components/DeptSelect/index'
import { parseUrl } from '@/utils/parseutils'
+import { getSearchLastWeekTime } from '@/utils/dateutils'
export default {
name: 'ListGasData',
@@ -163,6 +165,7 @@
if (params && params.deviceType === '4' && params.devcode) {
this.listQuery.keywords = params.devcode
}
+ this.timeRange = getSearchLastWeekTime()
this.fetchData()
}
},
@@ -191,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/listGasflowData.vue b/src/views/dataManage/deviceData/listGasflowData.vue
new file mode 100644
index 0000000..9c5321a
--- /dev/null
+++ b/src/views/dataManage/deviceData/listGasflowData.vue
@@ -0,0 +1,311 @@
+
+
+
-
+ {{ name }} {{ context[index] }}{{ unit }}
+
@@ -36,46 +26,46 @@
diff --git a/src/views/dataManage/deviceData/listCorrodeData.vue b/src/views/dataManage/deviceData/listCorrodeData.vue
new file mode 100644
index 0000000..1a20abb
--- /dev/null
+++ b/src/views/dataManage/deviceData/listCorrodeData.vue
@@ -0,0 +1,272 @@
+
+
{{ title[0] }}
- {{ context[0] }}{{unit}}
+ {{ context[0] }}{{ unit }}
+
+
+
+
+
+
+
diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue
index 97cdfdb..40b9a5e 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -5,10 +5,10 @@
+
+
+
+
+
+
+ 搜索
+
+
+
+
+
+
+
+ 导出记录
+
+
+
+
+
+
+ {{ scope.row[column.value] }}
+ {{ scope.row[column.value] }}
+
+
+
+
+
+ 数据列表
+
+ 数据列表
+
+
+
+
+
+
+
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/config/index.js b/config/index.js
index 106eaa6..30dda44 100644
--- a/config/index.js
+++ b/config/index.js
@@ -33,7 +33,7 @@
// Use Eslint Loader?
// If true, your code will be linted during bundling and
// linting errors and warnings will be shown in the console.
- useEslint: true,
+ useEslint: false,
// If true, eslint errors and warnings will also be shown in the error overlay
// in the browser.
showEslintErrorsInOverlay: false,
diff --git a/config/prod.env.js b/config/prod.env.js
index 3455ce7..bb20d1d 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -3,5 +3,6 @@
NODE_ENV: '"production"',
// BASE_API: '"http://111.198.10.15:11304"',
// BASE_API: '"http://42.81.160.165:2022/smartwell/"',
- BASE_API: '"http://111.198.10.15:11409/smartwell"' //11643
+ // BASE_API: '"http://111.198.10.15:11409/smartwell"' //11643
+ BASE_API: '"http://111.198.10.15:20104"' //11643
}
diff --git a/package.json b/package.json
index be3e56e..a60e7b3 100644
--- a/package.json
+++ b/package.json
@@ -86,7 +86,7 @@
"vue-template-compiler": "2.5.17",
"webpack": "4.16.5",
"webpack-bundle-analyzer": "2.13.1",
- "webpack-cli": "3.1.0",
+ "webpack-cli": "^3.1.0",
"webpack-dev-server": "3.1.14",
"webpack-merge": "4.1.4"
},
diff --git a/src/App.vue b/src/App.vue
index 721d3a3..ec9032c 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,6 +1,6 @@
+
+
+
+
+
+
+ 搜索
+
+
+
+
+
+
+
+ 导出记录
+
+
+
+
+
+
+ {{
+ scope.row[column.value]
+ }}
+ {{
+ scope.row["areaFullName"] + '/' + scope.row[column.value]
+ }}
+ {{ scope.row[column.value] }}
+
+
+
+
+
+ 历史数据
+
+
+
+
+
+
+ 数据列表
+
+
-
diff --git a/src/api/dashboard.js b/src/api/dashboard.js
index aaadb23..6f56e28 100644
--- a/src/api/dashboard.js
+++ b/src/api/dashboard.js
@@ -79,11 +79,10 @@
})
}
-
// 用水事记查询
-export function getNoteList() {
+export function getNoteList(type) {
return request({
- url: '/note/list',
+ url: '/note/list/' + type,
method: 'get'
})
}
@@ -92,7 +91,6 @@
export function updateNoteList(data) {
return request({
url: '/note/edit',
- // url: 'waterMeterData/count',
method: 'post',
data
})
diff --git a/src/api/data.js b/src/api/data.js
index b7c9ba2..65c5071 100644
--- a/src/api/data.js
+++ b/src/api/data.js
@@ -85,6 +85,22 @@
params
})
}
+// 气体流量计数据查询
+export function getGasflowData(params) {
+ return request({
+ url: 'gasflow/list',
+ method: 'get',
+ params
+ })
+}
+// 腐蚀速率监测仪数据查询
+export function getCorrodeData(params) {
+ return request({
+ url: 'corrode/data/list',
+ method: 'get',
+ params
+ })
+}
// 批量导出井盖数据
export function batchExportWellData(params) {
@@ -183,6 +199,26 @@
responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
})
}
+// 腐蚀速率监测仪数据导出
+export function batchExportCorrodeData(params) {
+ return request({
+ url: 'corrode/data/export',
+ method: 'get',
+ timeout: 120000, // 120s，2分钟
+ params,
+ responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+ })
+}
+// 气体流量计数据导出
+export function batchExportGasflowData(params) {
+ return request({
+ url: 'gasflow/data/export',
+ method: 'get',
+ timeout: 120000, // 120s，2分钟
+ params,
+ responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+ })
+}
// 温度压力数据查询
export function getTempPressData(params) {
diff --git a/src/api/device.js b/src/api/device.js
index 00804fe..edcc1a4 100644
--- a/src/api/device.js
+++ b/src/api/device.js
@@ -100,4 +100,11 @@
params
})
}
+export function totalDataGasFlow(params) {
+ return request({
+ url: 'gasflow/listByDevice',
+ method: 'post',
+ params
+ })
+}
diff --git a/src/api/gasOverview.js b/src/api/gasOverview.js
new file mode 100644
index 0000000..0dc3442
--- /dev/null
+++ b/src/api/gasOverview.js
@@ -0,0 +1,173 @@
+/**
+ * 动力管线
+ */
+import request from '@/utils/request'
+
+// 用水量、噪声统计数据
+export function gasStatistic() {
+ return request({
+ url: 'gasStatistic/overview',
+ method: 'get'
+ })
+}
+
+// 用水量、噪声统计数据
+export function gasStatistic2(deviceType) {
+ return request({
+ url: 'gas/statistics/used',
+ method: 'get',
+ params: {
+ deviceType: deviceType
+ }
+ })
+}
+
+// 气体用气量走势图
+export function gasTrend(params) {
+ return request({
+ url: '/gas/statistics/trend',
+ method: 'get',
+ params
+ })
+}
+// 用气量超量报警统计
+export function gasAlarmTrend(params) {
+ return request({
+ url: '/gas/alarm/trend',
+ method: 'get',
+ params
+ })
+}
+// 各设备气体用气量
+export function gasUsed(params) {
+ return request({
+ url: '/gas/used',
+ method: 'get',
+ params
+ })
+}
+// 气体泄漏监测结果
+export function gasLeakStatus(params) {
+ return request({
+ url: 'gas/leakage/rate',
+ method: 'get',
+ params
+ })
+}
+
+// 气体流量计数量
+export function deviceCount(type) {
+ return request({
+ url: 'device/count/' + type,
+ method: 'get'
+ })
+}
+
+// 统计当前报警数
+export function alarmNowStatic(params) {
+ return request({
+ url: 'statics/alarmsNow',
+ method: 'get',
+ params
+ })
+}
+
+// 查询二级分区各区用气量
+export function countBySecondArea(params) {
+ return request({
+ url: 'gasStatistic/countBySecondArea',
+ method: 'get',
+ params
+ })
+}
+
+// 查询二级分区7日用气量
+export function countByDaySecond(params) {
+ return request({
+ url: 'gasStatistic/countByDay',
+ method: 'get',
+ params
+ })
+}
+// 查询二级分区燃气告警
+export function gasAlarmBySecondArea(params) {
+ return request({
+ url: 'gas/alarm/rate',
+ method: 'get',
+ params
+ })
+}
+// 各设备腐蚀速率统计
+export function corrRateByDevice(params) {
+ return request({
+ url: 'corrode/data/corrRateByDevice',
+ method: 'get',
+ params
+ })
+}
+// 查询二级分区用气对比
+export function gasCompareData(params) {
+ return request({
+ url: 'gasStatistic/gasCompare',
+ method: 'get',
+ params
+ })
+}
+
+// 根据设备类型统计设备数量
+export function deviceStaticsByType(params) {
+ return request({
+ url: 'statics/deviceStaticsByType',
+ method: 'get',
+ params
+ })
+}
+
+// 查询二级分区气体流量计告警
+export function alarmBySecondArea(params) {
+ return request({
+ url: 'gasStatistic/alarmBySecondArea',
+ method: 'get',
+ params
+ })
+}
+
+// 用气事记查询
+export function getNoteList(type) {
+ return request({
+ url: '/note/list/' + type,
+ // url: '/note/list',
+ method: 'get'
+ })
+}
+
+// 用气事记更新
+export function updateNoteList(data) {
+ return request({
+ url: '/note/edit',
+ method: 'post',
+ data
+ })
+}
+
+// 获取报警列表
+export function getAlarmsNow(params) {
+ return request({
+ url: 'overview/alarmNow',
+ method: 'get',
+ params
+ })
+}
+
+// 总览marker（真接口）
+export function getMapping(devType, keywords) {
+ return request({
+ url: 'overview/wellMapping',
+ method: 'get',
+ params: {
+ keywords: keywords,
+ devType: devType
+ }
+ })
+}
+
diff --git a/src/components/BigData/Card/index.vue b/src/components/BigData/Card/index.vue
index 8320d47..8944b44 100644
--- a/src/components/BigData/Card/index.vue
+++ b/src/components/BigData/Card/index.vue
@@ -10,7 +10,7 @@
{{ context }}
- {{unit}}
+ {{ unit }}
-
-
-
@@ -41,9 +41,9 @@
type: String,
default: '#40c9c6'
},
- unit:{
+ unit: {
type: String,
- default:''
+ default: ''
}
},
computed: {
diff --git a/src/components/BigData/Card1/index.vue b/src/components/BigData/Card1/index.vue
index 722c24c..c9ec32d 100644
--- a/src/components/BigData/Card1/index.vue
+++ b/src/components/BigData/Card1/index.vue
@@ -4,30 +4,20 @@
-
-
- {{ title[0] }} {{ context[0] }}{{unit}}
-
-
- {{ title[1] }} {{ context[1] }}{{unit}}
+
+
+
-
-
@@ -28,7 +29,7 @@
- 导出记录
+ 导出记录
@@ -63,6 +64,7 @@
import { getGasData, batchExportGasData } from '@/api/data'
import DeptSelect from '../../../components/DeptSelect/index'
import { parseUrl } from '@/utils/parseutils'
+import { getSearchLastWeekTime } from '@/utils/dateutils'
export default {
name: 'ListGasData',
@@ -163,6 +165,7 @@
if (params && params.deviceType === '4' && params.devcode) {
this.listQuery.keywords = params.devcode
}
+ this.timeRange = getSearchLastWeekTime()
this.fetchData()
}
},
@@ -191,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/listGasflowData.vue b/src/views/dataManage/deviceData/listGasflowData.vue
new file mode 100644
index 0000000..9c5321a
--- /dev/null
+++ b/src/views/dataManage/deviceData/listGasflowData.vue
@@ -0,0 +1,311 @@
+
+
+
-
+ {{ name }} {{ context[index] }}{{ unit }}
+
@@ -36,46 +26,46 @@
diff --git a/src/views/dataManage/deviceData/listCorrodeData.vue b/src/views/dataManage/deviceData/listCorrodeData.vue
new file mode 100644
index 0000000..1a20abb
--- /dev/null
+++ b/src/views/dataManage/deviceData/listCorrodeData.vue
@@ -0,0 +1,272 @@
+
+
{{ title[0] }}
- {{ context[0] }}{{unit}}
+ {{ context[0] }}{{ unit }}
+
+
+
+
+
+
+
diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue
index 97cdfdb..40b9a5e 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -5,10 +5,10 @@
+
+
+
+
+
+
+ 搜索
+
+
+
+
+
+
+
+ 导出记录
+
+
+
+
+
+
+ {{ scope.row[column.value] }}
+ {{ scope.row[column.value] }}
+
+
+
+
+
+ 数据列表
+
+ 数据列表
+
+
+
+
+
+
+
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/config/index.js b/config/index.js
index 106eaa6..30dda44 100644
--- a/config/index.js
+++ b/config/index.js
@@ -33,7 +33,7 @@
// Use Eslint Loader?
// If true, your code will be linted during bundling and
// linting errors and warnings will be shown in the console.
- useEslint: true,
+ useEslint: false,
// If true, eslint errors and warnings will also be shown in the error overlay
// in the browser.
showEslintErrorsInOverlay: false,
diff --git a/config/prod.env.js b/config/prod.env.js
index 3455ce7..bb20d1d 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -3,5 +3,6 @@
NODE_ENV: '"production"',
// BASE_API: '"http://111.198.10.15:11304"',
// BASE_API: '"http://42.81.160.165:2022/smartwell/"',
- BASE_API: '"http://111.198.10.15:11409/smartwell"' //11643
+ // BASE_API: '"http://111.198.10.15:11409/smartwell"' //11643
+ BASE_API: '"http://111.198.10.15:20104"' //11643
}
diff --git a/package.json b/package.json
index be3e56e..a60e7b3 100644
--- a/package.json
+++ b/package.json
@@ -86,7 +86,7 @@
"vue-template-compiler": "2.5.17",
"webpack": "4.16.5",
"webpack-bundle-analyzer": "2.13.1",
- "webpack-cli": "3.1.0",
+ "webpack-cli": "^3.1.0",
"webpack-dev-server": "3.1.14",
"webpack-merge": "4.1.4"
},
diff --git a/src/App.vue b/src/App.vue
index 721d3a3..ec9032c 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,6 +1,6 @@
+
+
+
+
+
+
+ 搜索
+
+
+
+
+
+
+
+ 导出记录
+
+
+
+
+
+
+ {{
+ scope.row[column.value]
+ }}
+ {{
+ scope.row["areaFullName"] + '/' + scope.row[column.value]
+ }}
+ {{ scope.row[column.value] }}
+
+
+
+
+
+ 历史数据
+
+
+
+
+
+
+ 数据列表
+
+
-
diff --git a/src/api/dashboard.js b/src/api/dashboard.js
index aaadb23..6f56e28 100644
--- a/src/api/dashboard.js
+++ b/src/api/dashboard.js
@@ -79,11 +79,10 @@
})
}
-
// 用水事记查询
-export function getNoteList() {
+export function getNoteList(type) {
return request({
- url: '/note/list',
+ url: '/note/list/' + type,
method: 'get'
})
}
@@ -92,7 +91,6 @@
export function updateNoteList(data) {
return request({
url: '/note/edit',
- // url: 'waterMeterData/count',
method: 'post',
data
})
diff --git a/src/api/data.js b/src/api/data.js
index b7c9ba2..65c5071 100644
--- a/src/api/data.js
+++ b/src/api/data.js
@@ -85,6 +85,22 @@
params
})
}
+// 气体流量计数据查询
+export function getGasflowData(params) {
+ return request({
+ url: 'gasflow/list',
+ method: 'get',
+ params
+ })
+}
+// 腐蚀速率监测仪数据查询
+export function getCorrodeData(params) {
+ return request({
+ url: 'corrode/data/list',
+ method: 'get',
+ params
+ })
+}
// 批量导出井盖数据
export function batchExportWellData(params) {
@@ -183,6 +199,26 @@
responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
})
}
+// 腐蚀速率监测仪数据导出
+export function batchExportCorrodeData(params) {
+ return request({
+ url: 'corrode/data/export',
+ method: 'get',
+ timeout: 120000, // 120s，2分钟
+ params,
+ responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+ })
+}
+// 气体流量计数据导出
+export function batchExportGasflowData(params) {
+ return request({
+ url: 'gasflow/data/export',
+ method: 'get',
+ timeout: 120000, // 120s，2分钟
+ params,
+ responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+ })
+}
// 温度压力数据查询
export function getTempPressData(params) {
diff --git a/src/api/device.js b/src/api/device.js
index 00804fe..edcc1a4 100644
--- a/src/api/device.js
+++ b/src/api/device.js
@@ -100,4 +100,11 @@
params
})
}
+export function totalDataGasFlow(params) {
+ return request({
+ url: 'gasflow/listByDevice',
+ method: 'post',
+ params
+ })
+}
diff --git a/src/api/gasOverview.js b/src/api/gasOverview.js
new file mode 100644
index 0000000..0dc3442
--- /dev/null
+++ b/src/api/gasOverview.js
@@ -0,0 +1,173 @@
+/**
+ * 动力管线
+ */
+import request from '@/utils/request'
+
+// 用水量、噪声统计数据
+export function gasStatistic() {
+ return request({
+ url: 'gasStatistic/overview',
+ method: 'get'
+ })
+}
+
+// 用水量、噪声统计数据
+export function gasStatistic2(deviceType) {
+ return request({
+ url: 'gas/statistics/used',
+ method: 'get',
+ params: {
+ deviceType: deviceType
+ }
+ })
+}
+
+// 气体用气量走势图
+export function gasTrend(params) {
+ return request({
+ url: '/gas/statistics/trend',
+ method: 'get',
+ params
+ })
+}
+// 用气量超量报警统计
+export function gasAlarmTrend(params) {
+ return request({
+ url: '/gas/alarm/trend',
+ method: 'get',
+ params
+ })
+}
+// 各设备气体用气量
+export function gasUsed(params) {
+ return request({
+ url: '/gas/used',
+ method: 'get',
+ params
+ })
+}
+// 气体泄漏监测结果
+export function gasLeakStatus(params) {
+ return request({
+ url: 'gas/leakage/rate',
+ method: 'get',
+ params
+ })
+}
+
+// 气体流量计数量
+export function deviceCount(type) {
+ return request({
+ url: 'device/count/' + type,
+ method: 'get'
+ })
+}
+
+// 统计当前报警数
+export function alarmNowStatic(params) {
+ return request({
+ url: 'statics/alarmsNow',
+ method: 'get',
+ params
+ })
+}
+
+// 查询二级分区各区用气量
+export function countBySecondArea(params) {
+ return request({
+ url: 'gasStatistic/countBySecondArea',
+ method: 'get',
+ params
+ })
+}
+
+// 查询二级分区7日用气量
+export function countByDaySecond(params) {
+ return request({
+ url: 'gasStatistic/countByDay',
+ method: 'get',
+ params
+ })
+}
+// 查询二级分区燃气告警
+export function gasAlarmBySecondArea(params) {
+ return request({
+ url: 'gas/alarm/rate',
+ method: 'get',
+ params
+ })
+}
+// 各设备腐蚀速率统计
+export function corrRateByDevice(params) {
+ return request({
+ url: 'corrode/data/corrRateByDevice',
+ method: 'get',
+ params
+ })
+}
+// 查询二级分区用气对比
+export function gasCompareData(params) {
+ return request({
+ url: 'gasStatistic/gasCompare',
+ method: 'get',
+ params
+ })
+}
+
+// 根据设备类型统计设备数量
+export function deviceStaticsByType(params) {
+ return request({
+ url: 'statics/deviceStaticsByType',
+ method: 'get',
+ params
+ })
+}
+
+// 查询二级分区气体流量计告警
+export function alarmBySecondArea(params) {
+ return request({
+ url: 'gasStatistic/alarmBySecondArea',
+ method: 'get',
+ params
+ })
+}
+
+// 用气事记查询
+export function getNoteList(type) {
+ return request({
+ url: '/note/list/' + type,
+ // url: '/note/list',
+ method: 'get'
+ })
+}
+
+// 用气事记更新
+export function updateNoteList(data) {
+ return request({
+ url: '/note/edit',
+ method: 'post',
+ data
+ })
+}
+
+// 获取报警列表
+export function getAlarmsNow(params) {
+ return request({
+ url: 'overview/alarmNow',
+ method: 'get',
+ params
+ })
+}
+
+// 总览marker（真接口）
+export function getMapping(devType, keywords) {
+ return request({
+ url: 'overview/wellMapping',
+ method: 'get',
+ params: {
+ keywords: keywords,
+ devType: devType
+ }
+ })
+}
+
diff --git a/src/components/BigData/Card/index.vue b/src/components/BigData/Card/index.vue
index 8320d47..8944b44 100644
--- a/src/components/BigData/Card/index.vue
+++ b/src/components/BigData/Card/index.vue
@@ -10,7 +10,7 @@
{{ context }}
- {{unit}}
+ {{ unit }}
-
-
-
@@ -41,9 +41,9 @@
type: String,
default: '#40c9c6'
},
- unit:{
+ unit: {
type: String,
- default:''
+ default: ''
}
},
computed: {
diff --git a/src/components/BigData/Card1/index.vue b/src/components/BigData/Card1/index.vue
index 722c24c..c9ec32d 100644
--- a/src/components/BigData/Card1/index.vue
+++ b/src/components/BigData/Card1/index.vue
@@ -4,30 +4,20 @@
-
-
- {{ title[0] }} {{ context[0] }}{{unit}}
-
-
- {{ title[1] }} {{ context[1] }}{{unit}}
+
+
+
-
-
@@ -28,7 +29,7 @@
- 导出记录
+ 导出记录
@@ -63,6 +64,7 @@
import { getGasData, batchExportGasData } from '@/api/data'
import DeptSelect from '../../../components/DeptSelect/index'
import { parseUrl } from '@/utils/parseutils'
+import { getSearchLastWeekTime } from '@/utils/dateutils'
export default {
name: 'ListGasData',
@@ -163,6 +165,7 @@
if (params && params.deviceType === '4' && params.devcode) {
this.listQuery.keywords = params.devcode
}
+ this.timeRange = getSearchLastWeekTime()
this.fetchData()
}
},
@@ -191,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/listGasflowData.vue b/src/views/dataManage/deviceData/listGasflowData.vue
new file mode 100644
index 0000000..9c5321a
--- /dev/null
+++ b/src/views/dataManage/deviceData/listGasflowData.vue
@@ -0,0 +1,311 @@
+
+
+
-
+ {{ name }} {{ context[index] }}{{ unit }}
+
@@ -36,46 +26,46 @@
diff --git a/src/views/dataManage/deviceData/listCorrodeData.vue b/src/views/dataManage/deviceData/listCorrodeData.vue
new file mode 100644
index 0000000..1a20abb
--- /dev/null
+++ b/src/views/dataManage/deviceData/listCorrodeData.vue
@@ -0,0 +1,272 @@
+
+
{{ title[0] }}
- {{ context[0] }}{{unit}}
+ {{ context[0] }}{{ unit }}
+
+
+
+
+
+
+
diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue
index 97cdfdb..40b9a5e 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -5,10 +5,10 @@
+
+
+
+
+
+
+ 搜索
+
+
+
+
+
+
+
+ 导出记录
+
+
+
+
+
+
+ {{ scope.row[column.value] }}
+ {{ scope.row[column.value] }}
+
+
+
+
+
+ 数据列表
+
+ 数据列表
+
+
+
+
+
+
+
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 bf03fd1..dffd340 100644
--- a/src/views/dataManage/deviceData/listWaterData.vue
+++ b/src/views/dataManage/deviceData/listWaterData.vue
@@ -176,6 +176,12 @@
align: 'center'
},
{
+ text: '压力(Mpa)',
+ value: 'pressure',
+ width: 90,
+ align: 'center'
+ },
+ {
text: '今日用水量（立方米）',
value: 'dayCount',
align: 'center',
@@ -276,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) // 下载完成移除元素
@@ -311,9 +317,11 @@
}
getWatchData(this.listQuery).then((response) => {
this.list = response.data.rows.map(function(item) {
- item.areaFullName = item.areaFullName
- .replace('/', '')
- .replace('顶层', '')
+ item.totalCount = parseFloat(item.totalCount).toFixed(2)
+ item.dayCount = parseFloat(item.dayCount).toFixed(2)
+ item.monthCount = parseFloat(item.monthCount).toFixed(2)
+ item.pressure = parseFloat(item.pressure).toFixed(2)
+ item.areaFullName = item.areaFullName.replace('/', '').replace('顶层', '')
return item
})
this.total = parseInt(response.data.total)
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/index.js b/config/index.js
index 106eaa6..30dda44 100644
--- a/config/index.js
+++ b/config/index.js
@@ -33,7 +33,7 @@
// Use Eslint Loader?
// If true, your code will be linted during bundling and
// linting errors and warnings will be shown in the console.
- useEslint: true,
+ useEslint: false,
// If true, eslint errors and warnings will also be shown in the error overlay
// in the browser.
showEslintErrorsInOverlay: false,
diff --git a/config/prod.env.js b/config/prod.env.js
index 3455ce7..bb20d1d 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -3,5 +3,6 @@
NODE_ENV: '"production"',
// BASE_API: '"http://111.198.10.15:11304"',
// BASE_API: '"http://42.81.160.165:2022/smartwell/"',
- BASE_API: '"http://111.198.10.15:11409/smartwell"' //11643
+ // BASE_API: '"http://111.198.10.15:11409/smartwell"' //11643
+ BASE_API: '"http://111.198.10.15:20104"' //11643
}
diff --git a/package.json b/package.json
index be3e56e..a60e7b3 100644
--- a/package.json
+++ b/package.json
@@ -86,7 +86,7 @@
"vue-template-compiler": "2.5.17",
"webpack": "4.16.5",
"webpack-bundle-analyzer": "2.13.1",
- "webpack-cli": "3.1.0",
+ "webpack-cli": "^3.1.0",
"webpack-dev-server": "3.1.14",
"webpack-merge": "4.1.4"
},
diff --git a/src/App.vue b/src/App.vue
index 721d3a3..ec9032c 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,6 +1,6 @@
+
+
+
+
+
+
+ 搜索
+
+
+
+
+
+
+
+ 导出记录
+
+
+
+
+
+
+ {{
+ scope.row[column.value]
+ }}
+ {{
+ scope.row["areaFullName"] + '/' + scope.row[column.value]
+ }}
+ {{ scope.row[column.value] }}
+
+
+
+
+
+ 历史数据
+
+
+
+
+
+
+ 数据列表
+
+
-
diff --git a/src/api/dashboard.js b/src/api/dashboard.js
index aaadb23..6f56e28 100644
--- a/src/api/dashboard.js
+++ b/src/api/dashboard.js
@@ -79,11 +79,10 @@
})
}
-
// 用水事记查询
-export function getNoteList() {
+export function getNoteList(type) {
return request({
- url: '/note/list',
+ url: '/note/list/' + type,
method: 'get'
})
}
@@ -92,7 +91,6 @@
export function updateNoteList(data) {
return request({
url: '/note/edit',
- // url: 'waterMeterData/count',
method: 'post',
data
})
diff --git a/src/api/data.js b/src/api/data.js
index b7c9ba2..65c5071 100644
--- a/src/api/data.js
+++ b/src/api/data.js
@@ -85,6 +85,22 @@
params
})
}
+// 气体流量计数据查询
+export function getGasflowData(params) {
+ return request({
+ url: 'gasflow/list',
+ method: 'get',
+ params
+ })
+}
+// 腐蚀速率监测仪数据查询
+export function getCorrodeData(params) {
+ return request({
+ url: 'corrode/data/list',
+ method: 'get',
+ params
+ })
+}
// 批量导出井盖数据
export function batchExportWellData(params) {
@@ -183,6 +199,26 @@
responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
})
}
+// 腐蚀速率监测仪数据导出
+export function batchExportCorrodeData(params) {
+ return request({
+ url: 'corrode/data/export',
+ method: 'get',
+ timeout: 120000, // 120s，2分钟
+ params,
+ responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+ })
+}
+// 气体流量计数据导出
+export function batchExportGasflowData(params) {
+ return request({
+ url: 'gasflow/data/export',
+ method: 'get',
+ timeout: 120000, // 120s，2分钟
+ params,
+ responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+ })
+}
// 温度压力数据查询
export function getTempPressData(params) {
diff --git a/src/api/device.js b/src/api/device.js
index 00804fe..edcc1a4 100644
--- a/src/api/device.js
+++ b/src/api/device.js
@@ -100,4 +100,11 @@
params
})
}
+export function totalDataGasFlow(params) {
+ return request({
+ url: 'gasflow/listByDevice',
+ method: 'post',
+ params
+ })
+}
diff --git a/src/api/gasOverview.js b/src/api/gasOverview.js
new file mode 100644
index 0000000..0dc3442
--- /dev/null
+++ b/src/api/gasOverview.js
@@ -0,0 +1,173 @@
+/**
+ * 动力管线
+ */
+import request from '@/utils/request'
+
+// 用水量、噪声统计数据
+export function gasStatistic() {
+ return request({
+ url: 'gasStatistic/overview',
+ method: 'get'
+ })
+}
+
+// 用水量、噪声统计数据
+export function gasStatistic2(deviceType) {
+ return request({
+ url: 'gas/statistics/used',
+ method: 'get',
+ params: {
+ deviceType: deviceType
+ }
+ })
+}
+
+// 气体用气量走势图
+export function gasTrend(params) {
+ return request({
+ url: '/gas/statistics/trend',
+ method: 'get',
+ params
+ })
+}
+// 用气量超量报警统计
+export function gasAlarmTrend(params) {
+ return request({
+ url: '/gas/alarm/trend',
+ method: 'get',
+ params
+ })
+}
+// 各设备气体用气量
+export function gasUsed(params) {
+ return request({
+ url: '/gas/used',
+ method: 'get',
+ params
+ })
+}
+// 气体泄漏监测结果
+export function gasLeakStatus(params) {
+ return request({
+ url: 'gas/leakage/rate',
+ method: 'get',
+ params
+ })
+}
+
+// 气体流量计数量
+export function deviceCount(type) {
+ return request({
+ url: 'device/count/' + type,
+ method: 'get'
+ })
+}
+
+// 统计当前报警数
+export function alarmNowStatic(params) {
+ return request({
+ url: 'statics/alarmsNow',
+ method: 'get',
+ params
+ })
+}
+
+// 查询二级分区各区用气量
+export function countBySecondArea(params) {
+ return request({
+ url: 'gasStatistic/countBySecondArea',
+ method: 'get',
+ params
+ })
+}
+
+// 查询二级分区7日用气量
+export function countByDaySecond(params) {
+ return request({
+ url: 'gasStatistic/countByDay',
+ method: 'get',
+ params
+ })
+}
+// 查询二级分区燃气告警
+export function gasAlarmBySecondArea(params) {
+ return request({
+ url: 'gas/alarm/rate',
+ method: 'get',
+ params
+ })
+}
+// 各设备腐蚀速率统计
+export function corrRateByDevice(params) {
+ return request({
+ url: 'corrode/data/corrRateByDevice',
+ method: 'get',
+ params
+ })
+}
+// 查询二级分区用气对比
+export function gasCompareData(params) {
+ return request({
+ url: 'gasStatistic/gasCompare',
+ method: 'get',
+ params
+ })
+}
+
+// 根据设备类型统计设备数量
+export function deviceStaticsByType(params) {
+ return request({
+ url: 'statics/deviceStaticsByType',
+ method: 'get',
+ params
+ })
+}
+
+// 查询二级分区气体流量计告警
+export function alarmBySecondArea(params) {
+ return request({
+ url: 'gasStatistic/alarmBySecondArea',
+ method: 'get',
+ params
+ })
+}
+
+// 用气事记查询
+export function getNoteList(type) {
+ return request({
+ url: '/note/list/' + type,
+ // url: '/note/list',
+ method: 'get'
+ })
+}
+
+// 用气事记更新
+export function updateNoteList(data) {
+ return request({
+ url: '/note/edit',
+ method: 'post',
+ data
+ })
+}
+
+// 获取报警列表
+export function getAlarmsNow(params) {
+ return request({
+ url: 'overview/alarmNow',
+ method: 'get',
+ params
+ })
+}
+
+// 总览marker（真接口）
+export function getMapping(devType, keywords) {
+ return request({
+ url: 'overview/wellMapping',
+ method: 'get',
+ params: {
+ keywords: keywords,
+ devType: devType
+ }
+ })
+}
+
diff --git a/src/components/BigData/Card/index.vue b/src/components/BigData/Card/index.vue
index 8320d47..8944b44 100644
--- a/src/components/BigData/Card/index.vue
+++ b/src/components/BigData/Card/index.vue
@@ -10,7 +10,7 @@
{{ context }}
- {{unit}}
+ {{ unit }}
-
-
-
- {{ title[0] }} {{ context[0] }}{{unit}}
-
-
- {{ title[1] }} {{ context[1] }}{{unit}}
+
+
@@ -41,9 +41,9 @@
type: String,
default: '#40c9c6'
},
- unit:{
+ unit: {
type: String,
- default:''
+ default: ''
}
},
computed: {
diff --git a/src/components/BigData/Card1/index.vue b/src/components/BigData/Card1/index.vue
index 722c24c..c9ec32d 100644
--- a/src/components/BigData/Card1/index.vue
+++ b/src/components/BigData/Card1/index.vue
@@ -4,30 +4,20 @@
-
-
+
-
-
@@ -28,7 +29,7 @@
- 导出记录
+ 导出记录
@@ -63,6 +64,7 @@
import { getGasData, batchExportGasData } from '@/api/data'
import DeptSelect from '../../../components/DeptSelect/index'
import { parseUrl } from '@/utils/parseutils'
+import { getSearchLastWeekTime } from '@/utils/dateutils'
export default {
name: 'ListGasData',
@@ -163,6 +165,7 @@
if (params && params.deviceType === '4' && params.devcode) {
this.listQuery.keywords = params.devcode
}
+ this.timeRange = getSearchLastWeekTime()
this.fetchData()
}
},
@@ -191,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/listGasflowData.vue b/src/views/dataManage/deviceData/listGasflowData.vue
new file mode 100644
index 0000000..9c5321a
--- /dev/null
+++ b/src/views/dataManage/deviceData/listGasflowData.vue
@@ -0,0 +1,311 @@
+
+
+
+
-
+ {{ name }} {{ context[index] }}{{ unit }}
+
@@ -36,46 +26,46 @@
diff --git a/src/views/dataManage/deviceData/listCorrodeData.vue b/src/views/dataManage/deviceData/listCorrodeData.vue
new file mode 100644
index 0000000..1a20abb
--- /dev/null
+++ b/src/views/dataManage/deviceData/listCorrodeData.vue
@@ -0,0 +1,272 @@
+
+
{{ title[0] }}
- {{ context[0] }}{{unit}}
+ {{ context[0] }}{{ unit }}
+
+
+
+
+
+
+
diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue
index 97cdfdb..40b9a5e 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -5,10 +5,10 @@
+
+
+
+
+
+
+ 搜索
+
+
+
+
+
+
+
+ 导出记录
+
+
+
+
+
+
+ {{ scope.row[column.value] }}
+ {{ scope.row[column.value] }}
+
+
+
+
+
+ 数据列表
+
+ 数据列表
+
+
+
+
+
+
+
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 bf03fd1..dffd340 100644
--- a/src/views/dataManage/deviceData/listWaterData.vue
+++ b/src/views/dataManage/deviceData/listWaterData.vue
@@ -176,6 +176,12 @@
align: 'center'
},
{
+ text: '压力(Mpa)',
+ value: 'pressure',
+ width: 90,
+ align: 'center'
+ },
+ {
text: '今日用水量（立方米）',
value: 'dayCount',
align: 'center',
@@ -276,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) // 下载完成移除元素
@@ -311,9 +317,11 @@
}
getWatchData(this.listQuery).then((response) => {
this.list = response.data.rows.map(function(item) {
- item.areaFullName = item.areaFullName
- .replace('/', '')
- .replace('顶层', '')
+ item.totalCount = parseFloat(item.totalCount).toFixed(2)
+ item.dayCount = parseFloat(item.dayCount).toFixed(2)
+ item.monthCount = parseFloat(item.monthCount).toFixed(2)
+ item.pressure = parseFloat(item.pressure).toFixed(2)
+ item.areaFullName = item.areaFullName.replace('/', '').replace('顶层', '')
return item
})
this.total = parseInt(response.data.total)
diff --git a/src/views/dataManage/deviceData/waterHistory.vue b/src/views/dataManage/deviceData/waterHistory.vue
index 160dab7..42e3303 100644
--- a/src/views/dataManage/deviceData/waterHistory.vue
+++ b/src/views/dataManage/deviceData/waterHistory.vue
@@ -1,5 +1,5 @@
-
+
+
+
+
+
+
+ 搜索
+
+
+
+
+
+
+
+ 导出记录
+
+
+
+
+
+
+ {{
+ scope.row[column.value]
+ }}
+ {{
+ scope.row["areaFullName"] + '/' + scope.row[column.value]
+ }}
+ {{ scope.row[column.value] }}
+
+
+
+
+
+ 历史数据
+
+
+
+
+
+
+ 数据列表
+
+
-
diff --git a/src/api/dashboard.js b/src/api/dashboard.js
index aaadb23..6f56e28 100644
--- a/src/api/dashboard.js
+++ b/src/api/dashboard.js
@@ -79,11 +79,10 @@
})
}
-
// 用水事记查询
-export function getNoteList() {
+export function getNoteList(type) {
return request({
- url: '/note/list',
+ url: '/note/list/' + type,
method: 'get'
})
}
@@ -92,7 +91,6 @@
export function updateNoteList(data) {
return request({
url: '/note/edit',
- // url: 'waterMeterData/count',
method: 'post',
data
})
diff --git a/src/api/data.js b/src/api/data.js
index b7c9ba2..65c5071 100644
--- a/src/api/data.js
+++ b/src/api/data.js
@@ -85,6 +85,22 @@
params
})
}
+// 气体流量计数据查询
+export function getGasflowData(params) {
+ return request({
+ url: 'gasflow/list',
+ method: 'get',
+ params
+ })
+}
+// 腐蚀速率监测仪数据查询
+export function getCorrodeData(params) {
+ return request({
+ url: 'corrode/data/list',
+ method: 'get',
+ params
+ })
+}
// 批量导出井盖数据
export function batchExportWellData(params) {
@@ -183,6 +199,26 @@
responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
})
}
+// 腐蚀速率监测仪数据导出
+export function batchExportCorrodeData(params) {
+ return request({
+ url: 'corrode/data/export',
+ method: 'get',
+ timeout: 120000, // 120s，2分钟
+ params,
+ responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+ })
+}
+// 气体流量计数据导出
+export function batchExportGasflowData(params) {
+ return request({
+ url: 'gasflow/data/export',
+ method: 'get',
+ timeout: 120000, // 120s，2分钟
+ params,
+ responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+ })
+}
// 温度压力数据查询
export function getTempPressData(params) {
diff --git a/src/api/device.js b/src/api/device.js
index 00804fe..edcc1a4 100644
--- a/src/api/device.js
+++ b/src/api/device.js
@@ -100,4 +100,11 @@
params
})
}
+export function totalDataGasFlow(params) {
+ return request({
+ url: 'gasflow/listByDevice',
+ method: 'post',
+ params
+ })
+}
diff --git a/src/api/gasOverview.js b/src/api/gasOverview.js
new file mode 100644
index 0000000..0dc3442
--- /dev/null
+++ b/src/api/gasOverview.js
@@ -0,0 +1,173 @@
+/**
+ * 动力管线
+ */
+import request from '@/utils/request'
+
+// 用水量、噪声统计数据
+export function gasStatistic() {
+ return request({
+ url: 'gasStatistic/overview',
+ method: 'get'
+ })
+}
+
+// 用水量、噪声统计数据
+export function gasStatistic2(deviceType) {
+ return request({
+ url: 'gas/statistics/used',
+ method: 'get',
+ params: {
+ deviceType: deviceType
+ }
+ })
+}
+
+// 气体用气量走势图
+export function gasTrend(params) {
+ return request({
+ url: '/gas/statistics/trend',
+ method: 'get',
+ params
+ })
+}
+// 用气量超量报警统计
+export function gasAlarmTrend(params) {
+ return request({
+ url: '/gas/alarm/trend',
+ method: 'get',
+ params
+ })
+}
+// 各设备气体用气量
+export function gasUsed(params) {
+ return request({
+ url: '/gas/used',
+ method: 'get',
+ params
+ })
+}
+// 气体泄漏监测结果
+export function gasLeakStatus(params) {
+ return request({
+ url: 'gas/leakage/rate',
+ method: 'get',
+ params
+ })
+}
+
+// 气体流量计数量
+export function deviceCount(type) {
+ return request({
+ url: 'device/count/' + type,
+ method: 'get'
+ })
+}
+
+// 统计当前报警数
+export function alarmNowStatic(params) {
+ return request({
+ url: 'statics/alarmsNow',
+ method: 'get',
+ params
+ })
+}
+
+// 查询二级分区各区用气量
+export function countBySecondArea(params) {
+ return request({
+ url: 'gasStatistic/countBySecondArea',
+ method: 'get',
+ params
+ })
+}
+
+// 查询二级分区7日用气量
+export function countByDaySecond(params) {
+ return request({
+ url: 'gasStatistic/countByDay',
+ method: 'get',
+ params
+ })
+}
+// 查询二级分区燃气告警
+export function gasAlarmBySecondArea(params) {
+ return request({
+ url: 'gas/alarm/rate',
+ method: 'get',
+ params
+ })
+}
+// 各设备腐蚀速率统计
+export function corrRateByDevice(params) {
+ return request({
+ url: 'corrode/data/corrRateByDevice',
+ method: 'get',
+ params
+ })
+}
+// 查询二级分区用气对比
+export function gasCompareData(params) {
+ return request({
+ url: 'gasStatistic/gasCompare',
+ method: 'get',
+ params
+ })
+}
+
+// 根据设备类型统计设备数量
+export function deviceStaticsByType(params) {
+ return request({
+ url: 'statics/deviceStaticsByType',
+ method: 'get',
+ params
+ })
+}
+
+// 查询二级分区气体流量计告警
+export function alarmBySecondArea(params) {
+ return request({
+ url: 'gasStatistic/alarmBySecondArea',
+ method: 'get',
+ params
+ })
+}
+
+// 用气事记查询
+export function getNoteList(type) {
+ return request({
+ url: '/note/list/' + type,
+ // url: '/note/list',
+ method: 'get'
+ })
+}
+
+// 用气事记更新
+export function updateNoteList(data) {
+ return request({
+ url: '/note/edit',
+ method: 'post',
+ data
+ })
+}
+
+// 获取报警列表
+export function getAlarmsNow(params) {
+ return request({
+ url: 'overview/alarmNow',
+ method: 'get',
+ params
+ })
+}
+
+// 总览marker（真接口）
+export function getMapping(devType, keywords) {
+ return request({
+ url: 'overview/wellMapping',
+ method: 'get',
+ params: {
+ keywords: keywords,
+ devType: devType
+ }
+ })
+}
+
diff --git a/src/components/BigData/Card/index.vue b/src/components/BigData/Card/index.vue
index 8320d47..8944b44 100644
--- a/src/components/BigData/Card/index.vue
+++ b/src/components/BigData/Card/index.vue
@@ -10,7 +10,7 @@
{{ context }}
- {{unit}}
+ {{ unit }}
-
-
-
- {{ title[0] }} {{ context[0] }}{{unit}}
-
-
- {{ title[1] }} {{ context[1] }}{{unit}}
+
+
@@ -41,9 +41,9 @@
type: String,
default: '#40c9c6'
},
- unit:{
+ unit: {
type: String,
- default:''
+ default: ''
}
},
computed: {
diff --git a/src/components/BigData/Card1/index.vue b/src/components/BigData/Card1/index.vue
index 722c24c..c9ec32d 100644
--- a/src/components/BigData/Card1/index.vue
+++ b/src/components/BigData/Card1/index.vue
@@ -4,30 +4,20 @@
-
-
+
-
-
@@ -28,7 +29,7 @@
- 导出记录
+ 导出记录
@@ -63,6 +64,7 @@
import { getGasData, batchExportGasData } from '@/api/data'
import DeptSelect from '../../../components/DeptSelect/index'
import { parseUrl } from '@/utils/parseutils'
+import { getSearchLastWeekTime } from '@/utils/dateutils'
export default {
name: 'ListGasData',
@@ -163,6 +165,7 @@
if (params && params.deviceType === '4' && params.devcode) {
this.listQuery.keywords = params.devcode
}
+ this.timeRange = getSearchLastWeekTime()
this.fetchData()
}
},
@@ -191,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/listGasflowData.vue b/src/views/dataManage/deviceData/listGasflowData.vue
new file mode 100644
index 0000000..9c5321a
--- /dev/null
+++ b/src/views/dataManage/deviceData/listGasflowData.vue
@@ -0,0 +1,311 @@
+
+
+
+
+
+
-
+ {{ name }} {{ context[index] }}{{ unit }}
+
@@ -36,46 +26,46 @@
diff --git a/src/views/dataManage/deviceData/listCorrodeData.vue b/src/views/dataManage/deviceData/listCorrodeData.vue
new file mode 100644
index 0000000..1a20abb
--- /dev/null
+++ b/src/views/dataManage/deviceData/listCorrodeData.vue
@@ -0,0 +1,272 @@
+
+
{{ title[0] }}
- {{ context[0] }}{{unit}}
+ {{ context[0] }}{{ unit }}
+
+
+
+
+
+
+
diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue
index 97cdfdb..40b9a5e 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -5,10 +5,10 @@
+
+
+
+
+
+
+ 搜索
+
+
+
+
+
+
+
+ 导出记录
+
+
+
+
+
+
+ {{ scope.row[column.value] }}
+ {{ scope.row[column.value] }}
+
+
+
+
+
+ 数据列表
+
+ 数据列表
+
+
+
+
+
+
+
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 bf03fd1..dffd340 100644
--- a/src/views/dataManage/deviceData/listWaterData.vue
+++ b/src/views/dataManage/deviceData/listWaterData.vue
@@ -176,6 +176,12 @@
align: 'center'
},
{
+ text: '压力(Mpa)',
+ value: 'pressure',
+ width: 90,
+ align: 'center'
+ },
+ {
text: '今日用水量（立方米）',
value: 'dayCount',
align: 'center',
@@ -276,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) // 下载完成移除元素
@@ -311,9 +317,11 @@
}
getWatchData(this.listQuery).then((response) => {
this.list = response.data.rows.map(function(item) {
- item.areaFullName = item.areaFullName
- .replace('/', '')
- .replace('顶层', '')
+ item.totalCount = parseFloat(item.totalCount).toFixed(2)
+ item.dayCount = parseFloat(item.dayCount).toFixed(2)
+ item.monthCount = parseFloat(item.monthCount).toFixed(2)
+ item.pressure = parseFloat(item.pressure).toFixed(2)
+ item.areaFullName = item.areaFullName.replace('/', '').replace('顶层', '')
return item
})
this.total = parseInt(response.data.total)
diff --git a/src/views/dataManage/deviceData/waterHistory.vue b/src/views/dataManage/deviceData/waterHistory.vue
index 160dab7..42e3303 100644
--- a/src/views/dataManage/deviceData/waterHistory.vue
+++ b/src/views/dataManage/deviceData/waterHistory.vue
@@ -1,5 +1,5 @@
-
+
+
+
+
+
+
+ 搜索
+
+
+
+
+
+
+
+ 导出记录
+
+
+
+
+
+
+ {{
+ scope.row[column.value]
+ }}
+ {{
+ scope.row["areaFullName"] + '/' + scope.row[column.value]
+ }}
+ {{ scope.row[column.value] }}
+
+
+
+
+
+ 历史数据
+
+
+
+
+
+
+ 数据列表
+
+
+
+
+
+
+
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/index.js b/config/index.js
index 106eaa6..30dda44 100644
--- a/config/index.js
+++ b/config/index.js
@@ -33,7 +33,7 @@
// Use Eslint Loader?
// If true, your code will be linted during bundling and
// linting errors and warnings will be shown in the console.
- useEslint: true,
+ useEslint: false,
// If true, eslint errors and warnings will also be shown in the error overlay
// in the browser.
showEslintErrorsInOverlay: false,
diff --git a/config/prod.env.js b/config/prod.env.js
index 3455ce7..bb20d1d 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -3,5 +3,6 @@
NODE_ENV: '"production"',
// BASE_API: '"http://111.198.10.15:11304"',
// BASE_API: '"http://42.81.160.165:2022/smartwell/"',
- BASE_API: '"http://111.198.10.15:11409/smartwell"' //11643
+ // BASE_API: '"http://111.198.10.15:11409/smartwell"' //11643
+ BASE_API: '"http://111.198.10.15:20104"' //11643
}
diff --git a/package.json b/package.json
index be3e56e..a60e7b3 100644
--- a/package.json
+++ b/package.json
@@ -86,7 +86,7 @@
"vue-template-compiler": "2.5.17",
"webpack": "4.16.5",
"webpack-bundle-analyzer": "2.13.1",
- "webpack-cli": "3.1.0",
+ "webpack-cli": "^3.1.0",
"webpack-dev-server": "3.1.14",
"webpack-merge": "4.1.4"
},
diff --git a/src/App.vue b/src/App.vue
index 721d3a3..ec9032c 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,6 +1,6 @@
-
diff --git a/src/api/dashboard.js b/src/api/dashboard.js
index aaadb23..6f56e28 100644
--- a/src/api/dashboard.js
+++ b/src/api/dashboard.js
@@ -79,11 +79,10 @@
})
}
-
// 用水事记查询
-export function getNoteList() {
+export function getNoteList(type) {
return request({
- url: '/note/list',
+ url: '/note/list/' + type,
method: 'get'
})
}
@@ -92,7 +91,6 @@
export function updateNoteList(data) {
return request({
url: '/note/edit',
- // url: 'waterMeterData/count',
method: 'post',
data
})
diff --git a/src/api/data.js b/src/api/data.js
index b7c9ba2..65c5071 100644
--- a/src/api/data.js
+++ b/src/api/data.js
@@ -85,6 +85,22 @@
params
})
}
+// 气体流量计数据查询
+export function getGasflowData(params) {
+ return request({
+ url: 'gasflow/list',
+ method: 'get',
+ params
+ })
+}
+// 腐蚀速率监测仪数据查询
+export function getCorrodeData(params) {
+ return request({
+ url: 'corrode/data/list',
+ method: 'get',
+ params
+ })
+}
// 批量导出井盖数据
export function batchExportWellData(params) {
@@ -183,6 +199,26 @@
responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
})
}
+// 腐蚀速率监测仪数据导出
+export function batchExportCorrodeData(params) {
+ return request({
+ url: 'corrode/data/export',
+ method: 'get',
+ timeout: 120000, // 120s，2分钟
+ params,
+ responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+ })
+}
+// 气体流量计数据导出
+export function batchExportGasflowData(params) {
+ return request({
+ url: 'gasflow/data/export',
+ method: 'get',
+ timeout: 120000, // 120s，2分钟
+ params,
+ responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+ })
+}
// 温度压力数据查询
export function getTempPressData(params) {
diff --git a/src/api/device.js b/src/api/device.js
index 00804fe..edcc1a4 100644
--- a/src/api/device.js
+++ b/src/api/device.js
@@ -100,4 +100,11 @@
params
})
}
+export function totalDataGasFlow(params) {
+ return request({
+ url: 'gasflow/listByDevice',
+ method: 'post',
+ params
+ })
+}
diff --git a/src/api/gasOverview.js b/src/api/gasOverview.js
new file mode 100644
index 0000000..0dc3442
--- /dev/null
+++ b/src/api/gasOverview.js
@@ -0,0 +1,173 @@
+/**
+ * 动力管线
+ */
+import request from '@/utils/request'
+
+// 用水量、噪声统计数据
+export function gasStatistic() {
+ return request({
+ url: 'gasStatistic/overview',
+ method: 'get'
+ })
+}
+
+// 用水量、噪声统计数据
+export function gasStatistic2(deviceType) {
+ return request({
+ url: 'gas/statistics/used',
+ method: 'get',
+ params: {
+ deviceType: deviceType
+ }
+ })
+}
+
+// 气体用气量走势图
+export function gasTrend(params) {
+ return request({
+ url: '/gas/statistics/trend',
+ method: 'get',
+ params
+ })
+}
+// 用气量超量报警统计
+export function gasAlarmTrend(params) {
+ return request({
+ url: '/gas/alarm/trend',
+ method: 'get',
+ params
+ })
+}
+// 各设备气体用气量
+export function gasUsed(params) {
+ return request({
+ url: '/gas/used',
+ method: 'get',
+ params
+ })
+}
+// 气体泄漏监测结果
+export function gasLeakStatus(params) {
+ return request({
+ url: 'gas/leakage/rate',
+ method: 'get',
+ params
+ })
+}
+
+// 气体流量计数量
+export function deviceCount(type) {
+ return request({
+ url: 'device/count/' + type,
+ method: 'get'
+ })
+}
+
+// 统计当前报警数
+export function alarmNowStatic(params) {
+ return request({
+ url: 'statics/alarmsNow',
+ method: 'get',
+ params
+ })
+}
+
+// 查询二级分区各区用气量
+export function countBySecondArea(params) {
+ return request({
+ url: 'gasStatistic/countBySecondArea',
+ method: 'get',
+ params
+ })
+}
+
+// 查询二级分区7日用气量
+export function countByDaySecond(params) {
+ return request({
+ url: 'gasStatistic/countByDay',
+ method: 'get',
+ params
+ })
+}
+// 查询二级分区燃气告警
+export function gasAlarmBySecondArea(params) {
+ return request({
+ url: 'gas/alarm/rate',
+ method: 'get',
+ params
+ })
+}
+// 各设备腐蚀速率统计
+export function corrRateByDevice(params) {
+ return request({
+ url: 'corrode/data/corrRateByDevice',
+ method: 'get',
+ params
+ })
+}
+// 查询二级分区用气对比
+export function gasCompareData(params) {
+ return request({
+ url: 'gasStatistic/gasCompare',
+ method: 'get',
+ params
+ })
+}
+
+// 根据设备类型统计设备数量
+export function deviceStaticsByType(params) {
+ return request({
+ url: 'statics/deviceStaticsByType',
+ method: 'get',
+ params
+ })
+}
+
+// 查询二级分区气体流量计告警
+export function alarmBySecondArea(params) {
+ return request({
+ url: 'gasStatistic/alarmBySecondArea',
+ method: 'get',
+ params
+ })
+}
+
+// 用气事记查询
+export function getNoteList(type) {
+ return request({
+ url: '/note/list/' + type,
+ // url: '/note/list',
+ method: 'get'
+ })
+}
+
+// 用气事记更新
+export function updateNoteList(data) {
+ return request({
+ url: '/note/edit',
+ method: 'post',
+ data
+ })
+}
+
+// 获取报警列表
+export function getAlarmsNow(params) {
+ return request({
+ url: 'overview/alarmNow',
+ method: 'get',
+ params
+ })
+}
+
+// 总览marker（真接口）
+export function getMapping(devType, keywords) {
+ return request({
+ url: 'overview/wellMapping',
+ method: 'get',
+ params: {
+ keywords: keywords,
+ devType: devType
+ }
+ })
+}
+
diff --git a/src/components/BigData/Card/index.vue b/src/components/BigData/Card/index.vue
index 8320d47..8944b44 100644
--- a/src/components/BigData/Card/index.vue
+++ b/src/components/BigData/Card/index.vue
@@ -10,7 +10,7 @@
{{ context }}
- {{unit}}
+ {{ unit }}
-
-
-
- {{ title[0] }} {{ context[0] }}{{unit}}
-
-
- {{ title[1] }} {{ context[1] }}{{unit}}
+
+
@@ -41,9 +41,9 @@
type: String,
default: '#40c9c6'
},
- unit:{
+ unit: {
type: String,
- default:''
+ default: ''
}
},
computed: {
diff --git a/src/components/BigData/Card1/index.vue b/src/components/BigData/Card1/index.vue
index 722c24c..c9ec32d 100644
--- a/src/components/BigData/Card1/index.vue
+++ b/src/components/BigData/Card1/index.vue
@@ -4,30 +4,20 @@
-
-
+
-
-
@@ -28,7 +29,7 @@
- 导出记录
+ 导出记录
@@ -63,6 +64,7 @@
import { getGasData, batchExportGasData } from '@/api/data'
import DeptSelect from '../../../components/DeptSelect/index'
import { parseUrl } from '@/utils/parseutils'
+import { getSearchLastWeekTime } from '@/utils/dateutils'
export default {
name: 'ListGasData',
@@ -163,6 +165,7 @@
if (params && params.deviceType === '4' && params.devcode) {
this.listQuery.keywords = params.devcode
}
+ this.timeRange = getSearchLastWeekTime()
this.fetchData()
}
},
@@ -191,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/listGasflowData.vue b/src/views/dataManage/deviceData/listGasflowData.vue
new file mode 100644
index 0000000..9c5321a
--- /dev/null
+++ b/src/views/dataManage/deviceData/listGasflowData.vue
@@ -0,0 +1,311 @@
+
+
+
+
+
+
-
+ {{ name }} {{ context[index] }}{{ unit }}
+
@@ -36,46 +26,46 @@
diff --git a/src/views/dataManage/deviceData/listCorrodeData.vue b/src/views/dataManage/deviceData/listCorrodeData.vue
new file mode 100644
index 0000000..1a20abb
--- /dev/null
+++ b/src/views/dataManage/deviceData/listCorrodeData.vue
@@ -0,0 +1,272 @@
+
+
{{ title[0] }}
- {{ context[0] }}{{unit}}
+ {{ context[0] }}{{ unit }}
+
+
+
+
+
+
+
diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue
index 97cdfdb..40b9a5e 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -5,10 +5,10 @@
+
+
+
+
+
+
+ 搜索
+
+
+
+
+
+
+
+ 导出记录
+
+
+
+
+
+
+ {{ scope.row[column.value] }}
+ {{ scope.row[column.value] }}
+
+
+
+
+
+ 数据列表
+
+ 数据列表
+
+
+
+
+
+
+
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 bf03fd1..dffd340 100644
--- a/src/views/dataManage/deviceData/listWaterData.vue
+++ b/src/views/dataManage/deviceData/listWaterData.vue
@@ -176,6 +176,12 @@
align: 'center'
},
{
+ text: '压力(Mpa)',
+ value: 'pressure',
+ width: 90,
+ align: 'center'
+ },
+ {
text: '今日用水量（立方米）',
value: 'dayCount',
align: 'center',
@@ -276,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) // 下载完成移除元素
@@ -311,9 +317,11 @@
}
getWatchData(this.listQuery).then((response) => {
this.list = response.data.rows.map(function(item) {
- item.areaFullName = item.areaFullName
- .replace('/', '')
- .replace('顶层', '')
+ item.totalCount = parseFloat(item.totalCount).toFixed(2)
+ item.dayCount = parseFloat(item.dayCount).toFixed(2)
+ item.monthCount = parseFloat(item.monthCount).toFixed(2)
+ item.pressure = parseFloat(item.pressure).toFixed(2)
+ item.areaFullName = item.areaFullName.replace('/', '').replace('顶层', '')
return item
})
this.total = parseInt(response.data.total)
diff --git a/src/views/dataManage/deviceData/waterHistory.vue b/src/views/dataManage/deviceData/waterHistory.vue
index 160dab7..42e3303 100644
--- a/src/views/dataManage/deviceData/waterHistory.vue
+++ b/src/views/dataManage/deviceData/waterHistory.vue
@@ -1,5 +1,5 @@
-
+
+
+
+
+
+
+ 搜索
+
+
+
+
+
+
+
+ 导出记录
+
+
+
+
+
+
+ {{
+ scope.row[column.value]
+ }}
+ {{
+ scope.row["areaFullName"] + '/' + scope.row[column.value]
+ }}
+ {{ scope.row[column.value] }}
+
+
+
+
+
+ 历史数据
+
+
+
+
+
+
+ 数据列表
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/AlarmNowList.vue b/src/views/gasDashboard/components/AlarmNowList.vue
new file mode 100644
index 0000000..890325f
--- /dev/null
+++ b/src/views/gasDashboard/components/AlarmNowList.vue
@@ -0,0 +1,35 @@
+
+
+
+
+
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/index.js b/config/index.js
index 106eaa6..30dda44 100644
--- a/config/index.js
+++ b/config/index.js
@@ -33,7 +33,7 @@
// Use Eslint Loader?
// If true, your code will be linted during bundling and
// linting errors and warnings will be shown in the console.
- useEslint: true,
+ useEslint: false,
// If true, eslint errors and warnings will also be shown in the error overlay
// in the browser.
showEslintErrorsInOverlay: false,
diff --git a/config/prod.env.js b/config/prod.env.js
index 3455ce7..bb20d1d 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -3,5 +3,6 @@
NODE_ENV: '"production"',
// BASE_API: '"http://111.198.10.15:11304"',
// BASE_API: '"http://42.81.160.165:2022/smartwell/"',
- BASE_API: '"http://111.198.10.15:11409/smartwell"' //11643
+ // BASE_API: '"http://111.198.10.15:11409/smartwell"' //11643
+ BASE_API: '"http://111.198.10.15:20104"' //11643
}
diff --git a/package.json b/package.json
index be3e56e..a60e7b3 100644
--- a/package.json
+++ b/package.json
@@ -86,7 +86,7 @@
"vue-template-compiler": "2.5.17",
"webpack": "4.16.5",
"webpack-bundle-analyzer": "2.13.1",
- "webpack-cli": "3.1.0",
+ "webpack-cli": "^3.1.0",
"webpack-dev-server": "3.1.14",
"webpack-merge": "4.1.4"
},
diff --git a/src/App.vue b/src/App.vue
index 721d3a3..ec9032c 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,6 +1,6 @@
-
diff --git a/src/api/dashboard.js b/src/api/dashboard.js
index aaadb23..6f56e28 100644
--- a/src/api/dashboard.js
+++ b/src/api/dashboard.js
@@ -79,11 +79,10 @@
})
}
-
// 用水事记查询
-export function getNoteList() {
+export function getNoteList(type) {
return request({
- url: '/note/list',
+ url: '/note/list/' + type,
method: 'get'
})
}
@@ -92,7 +91,6 @@
export function updateNoteList(data) {
return request({
url: '/note/edit',
- // url: 'waterMeterData/count',
method: 'post',
data
})
diff --git a/src/api/data.js b/src/api/data.js
index b7c9ba2..65c5071 100644
--- a/src/api/data.js
+++ b/src/api/data.js
@@ -85,6 +85,22 @@
params
})
}
+// 气体流量计数据查询
+export function getGasflowData(params) {
+ return request({
+ url: 'gasflow/list',
+ method: 'get',
+ params
+ })
+}
+// 腐蚀速率监测仪数据查询
+export function getCorrodeData(params) {
+ return request({
+ url: 'corrode/data/list',
+ method: 'get',
+ params
+ })
+}
// 批量导出井盖数据
export function batchExportWellData(params) {
@@ -183,6 +199,26 @@
responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
})
}
+// 腐蚀速率监测仪数据导出
+export function batchExportCorrodeData(params) {
+ return request({
+ url: 'corrode/data/export',
+ method: 'get',
+ timeout: 120000, // 120s，2分钟
+ params,
+ responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+ })
+}
+// 气体流量计数据导出
+export function batchExportGasflowData(params) {
+ return request({
+ url: 'gasflow/data/export',
+ method: 'get',
+ timeout: 120000, // 120s，2分钟
+ params,
+ responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+ })
+}
// 温度压力数据查询
export function getTempPressData(params) {
diff --git a/src/api/device.js b/src/api/device.js
index 00804fe..edcc1a4 100644
--- a/src/api/device.js
+++ b/src/api/device.js
@@ -100,4 +100,11 @@
params
})
}
+export function totalDataGasFlow(params) {
+ return request({
+ url: 'gasflow/listByDevice',
+ method: 'post',
+ params
+ })
+}
diff --git a/src/api/gasOverview.js b/src/api/gasOverview.js
new file mode 100644
index 0000000..0dc3442
--- /dev/null
+++ b/src/api/gasOverview.js
@@ -0,0 +1,173 @@
+/**
+ * 动力管线
+ */
+import request from '@/utils/request'
+
+// 用水量、噪声统计数据
+export function gasStatistic() {
+ return request({
+ url: 'gasStatistic/overview',
+ method: 'get'
+ })
+}
+
+// 用水量、噪声统计数据
+export function gasStatistic2(deviceType) {
+ return request({
+ url: 'gas/statistics/used',
+ method: 'get',
+ params: {
+ deviceType: deviceType
+ }
+ })
+}
+
+// 气体用气量走势图
+export function gasTrend(params) {
+ return request({
+ url: '/gas/statistics/trend',
+ method: 'get',
+ params
+ })
+}
+// 用气量超量报警统计
+export function gasAlarmTrend(params) {
+ return request({
+ url: '/gas/alarm/trend',
+ method: 'get',
+ params
+ })
+}
+// 各设备气体用气量
+export function gasUsed(params) {
+ return request({
+ url: '/gas/used',
+ method: 'get',
+ params
+ })
+}
+// 气体泄漏监测结果
+export function gasLeakStatus(params) {
+ return request({
+ url: 'gas/leakage/rate',
+ method: 'get',
+ params
+ })
+}
+
+// 气体流量计数量
+export function deviceCount(type) {
+ return request({
+ url: 'device/count/' + type,
+ method: 'get'
+ })
+}
+
+// 统计当前报警数
+export function alarmNowStatic(params) {
+ return request({
+ url: 'statics/alarmsNow',
+ method: 'get',
+ params
+ })
+}
+
+// 查询二级分区各区用气量
+export function countBySecondArea(params) {
+ return request({
+ url: 'gasStatistic/countBySecondArea',
+ method: 'get',
+ params
+ })
+}
+
+// 查询二级分区7日用气量
+export function countByDaySecond(params) {
+ return request({
+ url: 'gasStatistic/countByDay',
+ method: 'get',
+ params
+ })
+}
+// 查询二级分区燃气告警
+export function gasAlarmBySecondArea(params) {
+ return request({
+ url: 'gas/alarm/rate',
+ method: 'get',
+ params
+ })
+}
+// 各设备腐蚀速率统计
+export function corrRateByDevice(params) {
+ return request({
+ url: 'corrode/data/corrRateByDevice',
+ method: 'get',
+ params
+ })
+}
+// 查询二级分区用气对比
+export function gasCompareData(params) {
+ return request({
+ url: 'gasStatistic/gasCompare',
+ method: 'get',
+ params
+ })
+}
+
+// 根据设备类型统计设备数量
+export function deviceStaticsByType(params) {
+ return request({
+ url: 'statics/deviceStaticsByType',
+ method: 'get',
+ params
+ })
+}
+
+// 查询二级分区气体流量计告警
+export function alarmBySecondArea(params) {
+ return request({
+ url: 'gasStatistic/alarmBySecondArea',
+ method: 'get',
+ params
+ })
+}
+
+// 用气事记查询
+export function getNoteList(type) {
+ return request({
+ url: '/note/list/' + type,
+ // url: '/note/list',
+ method: 'get'
+ })
+}
+
+// 用气事记更新
+export function updateNoteList(data) {
+ return request({
+ url: '/note/edit',
+ method: 'post',
+ data
+ })
+}
+
+// 获取报警列表
+export function getAlarmsNow(params) {
+ return request({
+ url: 'overview/alarmNow',
+ method: 'get',
+ params
+ })
+}
+
+// 总览marker（真接口）
+export function getMapping(devType, keywords) {
+ return request({
+ url: 'overview/wellMapping',
+ method: 'get',
+ params: {
+ keywords: keywords,
+ devType: devType
+ }
+ })
+}
+
diff --git a/src/components/BigData/Card/index.vue b/src/components/BigData/Card/index.vue
index 8320d47..8944b44 100644
--- a/src/components/BigData/Card/index.vue
+++ b/src/components/BigData/Card/index.vue
@@ -10,7 +10,7 @@
{{ context }}
- {{unit}}
+ {{ unit }}
-
-
-
- {{ title[0] }} {{ context[0] }}{{unit}}
-
-
- {{ title[1] }} {{ context[1] }}{{unit}}
+
+
@@ -41,9 +41,9 @@
type: String,
default: '#40c9c6'
},
- unit:{
+ unit: {
type: String,
- default:''
+ default: ''
}
},
computed: {
diff --git a/src/components/BigData/Card1/index.vue b/src/components/BigData/Card1/index.vue
index 722c24c..c9ec32d 100644
--- a/src/components/BigData/Card1/index.vue
+++ b/src/components/BigData/Card1/index.vue
@@ -4,30 +4,20 @@
-
-
+
-
-
@@ -28,7 +29,7 @@
- 导出记录
+ 导出记录
@@ -63,6 +64,7 @@
import { getGasData, batchExportGasData } from '@/api/data'
import DeptSelect from '../../../components/DeptSelect/index'
import { parseUrl } from '@/utils/parseutils'
+import { getSearchLastWeekTime } from '@/utils/dateutils'
export default {
name: 'ListGasData',
@@ -163,6 +165,7 @@
if (params && params.deviceType === '4' && params.devcode) {
this.listQuery.keywords = params.devcode
}
+ this.timeRange = getSearchLastWeekTime()
this.fetchData()
}
},
@@ -191,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/listGasflowData.vue b/src/views/dataManage/deviceData/listGasflowData.vue
new file mode 100644
index 0000000..9c5321a
--- /dev/null
+++ b/src/views/dataManage/deviceData/listGasflowData.vue
@@ -0,0 +1,311 @@
+
+
+
+
+
+
-
+ {{ name }} {{ context[index] }}{{ unit }}
+
@@ -36,46 +26,46 @@
diff --git a/src/views/dataManage/deviceData/listCorrodeData.vue b/src/views/dataManage/deviceData/listCorrodeData.vue
new file mode 100644
index 0000000..1a20abb
--- /dev/null
+++ b/src/views/dataManage/deviceData/listCorrodeData.vue
@@ -0,0 +1,272 @@
+
+
{{ title[0] }}
- {{ context[0] }}{{unit}}
+ {{ context[0] }}{{ unit }}
+
+
+
+
+
+
+
diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue
index 97cdfdb..40b9a5e 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -5,10 +5,10 @@
+
+
+
+
+
+
+ 搜索
+
+
+
+
+
+
+
+ 导出记录
+
+
+
+
+
+
+ {{ scope.row[column.value] }}
+ {{ scope.row[column.value] }}
+
+
+
+
+
+ 数据列表
+
+ 数据列表
+
+
+
+
+
+
+
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 bf03fd1..dffd340 100644
--- a/src/views/dataManage/deviceData/listWaterData.vue
+++ b/src/views/dataManage/deviceData/listWaterData.vue
@@ -176,6 +176,12 @@
align: 'center'
},
{
+ text: '压力(Mpa)',
+ value: 'pressure',
+ width: 90,
+ align: 'center'
+ },
+ {
text: '今日用水量（立方米）',
value: 'dayCount',
align: 'center',
@@ -276,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) // 下载完成移除元素
@@ -311,9 +317,11 @@
}
getWatchData(this.listQuery).then((response) => {
this.list = response.data.rows.map(function(item) {
- item.areaFullName = item.areaFullName
- .replace('/', '')
- .replace('顶层', '')
+ item.totalCount = parseFloat(item.totalCount).toFixed(2)
+ item.dayCount = parseFloat(item.dayCount).toFixed(2)
+ item.monthCount = parseFloat(item.monthCount).toFixed(2)
+ item.pressure = parseFloat(item.pressure).toFixed(2)
+ item.areaFullName = item.areaFullName.replace('/', '').replace('顶层', '')
return item
})
this.total = parseInt(response.data.total)
diff --git a/src/views/dataManage/deviceData/waterHistory.vue b/src/views/dataManage/deviceData/waterHistory.vue
index 160dab7..42e3303 100644
--- a/src/views/dataManage/deviceData/waterHistory.vue
+++ b/src/views/dataManage/deviceData/waterHistory.vue
@@ -1,5 +1,5 @@
-
+
+
+
+
+
+
+ 搜索
+
+
+
+
+
+
+
+ 导出记录
+
+
+
+
+
+
+ {{
+ scope.row[column.value]
+ }}
+ {{
+ scope.row["areaFullName"] + '/' + scope.row[column.value]
+ }}
+ {{ scope.row[column.value] }}
+
+
+
+
+
+ 历史数据
+
+
+
+
+
+
+ 数据列表
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/AlarmNowList.vue b/src/views/gasDashboard/components/AlarmNowList.vue
new file mode 100644
index 0000000..890325f
--- /dev/null
+++ b/src/views/gasDashboard/components/AlarmNowList.vue
@@ -0,0 +1,35 @@
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/DeviceCount.vue b/src/views/gasDashboard/components/DeviceCount.vue
new file mode 100644
index 0000000..bffc9e9
--- /dev/null
+++ b/src/views/gasDashboard/components/DeviceCount.vue
@@ -0,0 +1,68 @@
+
+
+
+
+
+
+
+
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/index.js b/config/index.js
index 106eaa6..30dda44 100644
--- a/config/index.js
+++ b/config/index.js
@@ -33,7 +33,7 @@
// Use Eslint Loader?
// If true, your code will be linted during bundling and
// linting errors and warnings will be shown in the console.
- useEslint: true,
+ useEslint: false,
// If true, eslint errors and warnings will also be shown in the error overlay
// in the browser.
showEslintErrorsInOverlay: false,
diff --git a/config/prod.env.js b/config/prod.env.js
index 3455ce7..bb20d1d 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -3,5 +3,6 @@
NODE_ENV: '"production"',
// BASE_API: '"http://111.198.10.15:11304"',
// BASE_API: '"http://42.81.160.165:2022/smartwell/"',
- BASE_API: '"http://111.198.10.15:11409/smartwell"' //11643
+ // BASE_API: '"http://111.198.10.15:11409/smartwell"' //11643
+ BASE_API: '"http://111.198.10.15:20104"' //11643
}
diff --git a/package.json b/package.json
index be3e56e..a60e7b3 100644
--- a/package.json
+++ b/package.json
@@ -86,7 +86,7 @@
"vue-template-compiler": "2.5.17",
"webpack": "4.16.5",
"webpack-bundle-analyzer": "2.13.1",
- "webpack-cli": "3.1.0",
+ "webpack-cli": "^3.1.0",
"webpack-dev-server": "3.1.14",
"webpack-merge": "4.1.4"
},
diff --git a/src/App.vue b/src/App.vue
index 721d3a3..ec9032c 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,6 +1,6 @@
-
diff --git a/src/api/dashboard.js b/src/api/dashboard.js
index aaadb23..6f56e28 100644
--- a/src/api/dashboard.js
+++ b/src/api/dashboard.js
@@ -79,11 +79,10 @@
})
}
-
// 用水事记查询
-export function getNoteList() {
+export function getNoteList(type) {
return request({
- url: '/note/list',
+ url: '/note/list/' + type,
method: 'get'
})
}
@@ -92,7 +91,6 @@
export function updateNoteList(data) {
return request({
url: '/note/edit',
- // url: 'waterMeterData/count',
method: 'post',
data
})
diff --git a/src/api/data.js b/src/api/data.js
index b7c9ba2..65c5071 100644
--- a/src/api/data.js
+++ b/src/api/data.js
@@ -85,6 +85,22 @@
params
})
}
+// 气体流量计数据查询
+export function getGasflowData(params) {
+ return request({
+ url: 'gasflow/list',
+ method: 'get',
+ params
+ })
+}
+// 腐蚀速率监测仪数据查询
+export function getCorrodeData(params) {
+ return request({
+ url: 'corrode/data/list',
+ method: 'get',
+ params
+ })
+}
// 批量导出井盖数据
export function batchExportWellData(params) {
@@ -183,6 +199,26 @@
responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
})
}
+// 腐蚀速率监测仪数据导出
+export function batchExportCorrodeData(params) {
+ return request({
+ url: 'corrode/data/export',
+ method: 'get',
+ timeout: 120000, // 120s，2分钟
+ params,
+ responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+ })
+}
+// 气体流量计数据导出
+export function batchExportGasflowData(params) {
+ return request({
+ url: 'gasflow/data/export',
+ method: 'get',
+ timeout: 120000, // 120s，2分钟
+ params,
+ responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+ })
+}
// 温度压力数据查询
export function getTempPressData(params) {
diff --git a/src/api/device.js b/src/api/device.js
index 00804fe..edcc1a4 100644
--- a/src/api/device.js
+++ b/src/api/device.js
@@ -100,4 +100,11 @@
params
})
}
+export function totalDataGasFlow(params) {
+ return request({
+ url: 'gasflow/listByDevice',
+ method: 'post',
+ params
+ })
+}
diff --git a/src/api/gasOverview.js b/src/api/gasOverview.js
new file mode 100644
index 0000000..0dc3442
--- /dev/null
+++ b/src/api/gasOverview.js
@@ -0,0 +1,173 @@
+/**
+ * 动力管线
+ */
+import request from '@/utils/request'
+
+// 用水量、噪声统计数据
+export function gasStatistic() {
+ return request({
+ url: 'gasStatistic/overview',
+ method: 'get'
+ })
+}
+
+// 用水量、噪声统计数据
+export function gasStatistic2(deviceType) {
+ return request({
+ url: 'gas/statistics/used',
+ method: 'get',
+ params: {
+ deviceType: deviceType
+ }
+ })
+}
+
+// 气体用气量走势图
+export function gasTrend(params) {
+ return request({
+ url: '/gas/statistics/trend',
+ method: 'get',
+ params
+ })
+}
+// 用气量超量报警统计
+export function gasAlarmTrend(params) {
+ return request({
+ url: '/gas/alarm/trend',
+ method: 'get',
+ params
+ })
+}
+// 各设备气体用气量
+export function gasUsed(params) {
+ return request({
+ url: '/gas/used',
+ method: 'get',
+ params
+ })
+}
+// 气体泄漏监测结果
+export function gasLeakStatus(params) {
+ return request({
+ url: 'gas/leakage/rate',
+ method: 'get',
+ params
+ })
+}
+
+// 气体流量计数量
+export function deviceCount(type) {
+ return request({
+ url: 'device/count/' + type,
+ method: 'get'
+ })
+}
+
+// 统计当前报警数
+export function alarmNowStatic(params) {
+ return request({
+ url: 'statics/alarmsNow',
+ method: 'get',
+ params
+ })
+}
+
+// 查询二级分区各区用气量
+export function countBySecondArea(params) {
+ return request({
+ url: 'gasStatistic/countBySecondArea',
+ method: 'get',
+ params
+ })
+}
+
+// 查询二级分区7日用气量
+export function countByDaySecond(params) {
+ return request({
+ url: 'gasStatistic/countByDay',
+ method: 'get',
+ params
+ })
+}
+// 查询二级分区燃气告警
+export function gasAlarmBySecondArea(params) {
+ return request({
+ url: 'gas/alarm/rate',
+ method: 'get',
+ params
+ })
+}
+// 各设备腐蚀速率统计
+export function corrRateByDevice(params) {
+ return request({
+ url: 'corrode/data/corrRateByDevice',
+ method: 'get',
+ params
+ })
+}
+// 查询二级分区用气对比
+export function gasCompareData(params) {
+ return request({
+ url: 'gasStatistic/gasCompare',
+ method: 'get',
+ params
+ })
+}
+
+// 根据设备类型统计设备数量
+export function deviceStaticsByType(params) {
+ return request({
+ url: 'statics/deviceStaticsByType',
+ method: 'get',
+ params
+ })
+}
+
+// 查询二级分区气体流量计告警
+export function alarmBySecondArea(params) {
+ return request({
+ url: 'gasStatistic/alarmBySecondArea',
+ method: 'get',
+ params
+ })
+}
+
+// 用气事记查询
+export function getNoteList(type) {
+ return request({
+ url: '/note/list/' + type,
+ // url: '/note/list',
+ method: 'get'
+ })
+}
+
+// 用气事记更新
+export function updateNoteList(data) {
+ return request({
+ url: '/note/edit',
+ method: 'post',
+ data
+ })
+}
+
+// 获取报警列表
+export function getAlarmsNow(params) {
+ return request({
+ url: 'overview/alarmNow',
+ method: 'get',
+ params
+ })
+}
+
+// 总览marker（真接口）
+export function getMapping(devType, keywords) {
+ return request({
+ url: 'overview/wellMapping',
+ method: 'get',
+ params: {
+ keywords: keywords,
+ devType: devType
+ }
+ })
+}
+
diff --git a/src/components/BigData/Card/index.vue b/src/components/BigData/Card/index.vue
index 8320d47..8944b44 100644
--- a/src/components/BigData/Card/index.vue
+++ b/src/components/BigData/Card/index.vue
@@ -10,7 +10,7 @@
{{ context }}
- {{unit}}
+ {{ unit }}
-
-
-
- {{ title[0] }} {{ context[0] }}{{unit}}
-
-
- {{ title[1] }} {{ context[1] }}{{unit}}
+
+
@@ -41,9 +41,9 @@
type: String,
default: '#40c9c6'
},
- unit:{
+ unit: {
type: String,
- default:''
+ default: ''
}
},
computed: {
diff --git a/src/components/BigData/Card1/index.vue b/src/components/BigData/Card1/index.vue
index 722c24c..c9ec32d 100644
--- a/src/components/BigData/Card1/index.vue
+++ b/src/components/BigData/Card1/index.vue
@@ -4,30 +4,20 @@
-
-
+
-
-
@@ -28,7 +29,7 @@
- 导出记录
+ 导出记录
@@ -63,6 +64,7 @@
import { getGasData, batchExportGasData } from '@/api/data'
import DeptSelect from '../../../components/DeptSelect/index'
import { parseUrl } from '@/utils/parseutils'
+import { getSearchLastWeekTime } from '@/utils/dateutils'
export default {
name: 'ListGasData',
@@ -163,6 +165,7 @@
if (params && params.deviceType === '4' && params.devcode) {
this.listQuery.keywords = params.devcode
}
+ this.timeRange = getSearchLastWeekTime()
this.fetchData()
}
},
@@ -191,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/listGasflowData.vue b/src/views/dataManage/deviceData/listGasflowData.vue
new file mode 100644
index 0000000..9c5321a
--- /dev/null
+++ b/src/views/dataManage/deviceData/listGasflowData.vue
@@ -0,0 +1,311 @@
+
+
+
+
+
+
-
+ {{ name }} {{ context[index] }}{{ unit }}
+
@@ -36,46 +26,46 @@
diff --git a/src/views/dataManage/deviceData/listCorrodeData.vue b/src/views/dataManage/deviceData/listCorrodeData.vue
new file mode 100644
index 0000000..1a20abb
--- /dev/null
+++ b/src/views/dataManage/deviceData/listCorrodeData.vue
@@ -0,0 +1,272 @@
+
+
{{ title[0] }}
- {{ context[0] }}{{unit}}
+ {{ context[0] }}{{ unit }}
+
+
+
+
+
+
+
diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue
index 97cdfdb..40b9a5e 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -5,10 +5,10 @@
+
+
+
+
+
+
+ 搜索
+
+
+
+
+
+
+
+ 导出记录
+
+
+
+
+
+
+ {{ scope.row[column.value] }}
+ {{ scope.row[column.value] }}
+
+
+
+
+
+ 数据列表
+
+ 数据列表
+
+
+
+
+
+
+
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 bf03fd1..dffd340 100644
--- a/src/views/dataManage/deviceData/listWaterData.vue
+++ b/src/views/dataManage/deviceData/listWaterData.vue
@@ -176,6 +176,12 @@
align: 'center'
},
{
+ text: '压力(Mpa)',
+ value: 'pressure',
+ width: 90,
+ align: 'center'
+ },
+ {
text: '今日用水量（立方米）',
value: 'dayCount',
align: 'center',
@@ -276,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) // 下载完成移除元素
@@ -311,9 +317,11 @@
}
getWatchData(this.listQuery).then((response) => {
this.list = response.data.rows.map(function(item) {
- item.areaFullName = item.areaFullName
- .replace('/', '')
- .replace('顶层', '')
+ item.totalCount = parseFloat(item.totalCount).toFixed(2)
+ item.dayCount = parseFloat(item.dayCount).toFixed(2)
+ item.monthCount = parseFloat(item.monthCount).toFixed(2)
+ item.pressure = parseFloat(item.pressure).toFixed(2)
+ item.areaFullName = item.areaFullName.replace('/', '').replace('顶层', '')
return item
})
this.total = parseInt(response.data.total)
diff --git a/src/views/dataManage/deviceData/waterHistory.vue b/src/views/dataManage/deviceData/waterHistory.vue
index 160dab7..42e3303 100644
--- a/src/views/dataManage/deviceData/waterHistory.vue
+++ b/src/views/dataManage/deviceData/waterHistory.vue
@@ -1,5 +1,5 @@
-
+
+
+
+
+
+
+ 搜索
+
+
+
+
+
+
+
+ 导出记录
+
+
+
+
+
+
+ {{
+ scope.row[column.value]
+ }}
+ {{
+ scope.row["areaFullName"] + '/' + scope.row[column.value]
+ }}
+ {{ scope.row[column.value] }}
+
+
+
+
+
+ 历史数据
+
+
+
+
+
+
+ 数据列表
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/AlarmNowList.vue b/src/views/gasDashboard/components/AlarmNowList.vue
new file mode 100644
index 0000000..890325f
--- /dev/null
+++ b/src/views/gasDashboard/components/AlarmNowList.vue
@@ -0,0 +1,35 @@
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/DeviceCount.vue b/src/views/gasDashboard/components/DeviceCount.vue
new file mode 100644
index 0000000..bffc9e9
--- /dev/null
+++ b/src/views/gasDashboard/components/DeviceCount.vue
@@ -0,0 +1,68 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/FunctionArea.vue b/src/views/gasDashboard/components/FunctionArea.vue
new file mode 100644
index 0000000..6401557
--- /dev/null
+++ b/src/views/gasDashboard/components/FunctionArea.vue
@@ -0,0 +1,140 @@
+
+
+
+ 本年度
+ 本季度
+ 近30日
+ 近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/config/index.js b/config/index.js
index 106eaa6..30dda44 100644
--- a/config/index.js
+++ b/config/index.js
@@ -33,7 +33,7 @@
// Use Eslint Loader?
// If true, your code will be linted during bundling and
// linting errors and warnings will be shown in the console.
- useEslint: true,
+ useEslint: false,
// If true, eslint errors and warnings will also be shown in the error overlay
// in the browser.
showEslintErrorsInOverlay: false,
diff --git a/config/prod.env.js b/config/prod.env.js
index 3455ce7..bb20d1d 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -3,5 +3,6 @@
NODE_ENV: '"production"',
// BASE_API: '"http://111.198.10.15:11304"',
// BASE_API: '"http://42.81.160.165:2022/smartwell/"',
- BASE_API: '"http://111.198.10.15:11409/smartwell"' //11643
+ // BASE_API: '"http://111.198.10.15:11409/smartwell"' //11643
+ BASE_API: '"http://111.198.10.15:20104"' //11643
}
diff --git a/package.json b/package.json
index be3e56e..a60e7b3 100644
--- a/package.json
+++ b/package.json
@@ -86,7 +86,7 @@
"vue-template-compiler": "2.5.17",
"webpack": "4.16.5",
"webpack-bundle-analyzer": "2.13.1",
- "webpack-cli": "3.1.0",
+ "webpack-cli": "^3.1.0",
"webpack-dev-server": "3.1.14",
"webpack-merge": "4.1.4"
},
diff --git a/src/App.vue b/src/App.vue
index 721d3a3..ec9032c 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,6 +1,6 @@
-
diff --git a/src/api/dashboard.js b/src/api/dashboard.js
index aaadb23..6f56e28 100644
--- a/src/api/dashboard.js
+++ b/src/api/dashboard.js
@@ -79,11 +79,10 @@
})
}
-
// 用水事记查询
-export function getNoteList() {
+export function getNoteList(type) {
return request({
- url: '/note/list',
+ url: '/note/list/' + type,
method: 'get'
})
}
@@ -92,7 +91,6 @@
export function updateNoteList(data) {
return request({
url: '/note/edit',
- // url: 'waterMeterData/count',
method: 'post',
data
})
diff --git a/src/api/data.js b/src/api/data.js
index b7c9ba2..65c5071 100644
--- a/src/api/data.js
+++ b/src/api/data.js
@@ -85,6 +85,22 @@
params
})
}
+// 气体流量计数据查询
+export function getGasflowData(params) {
+ return request({
+ url: 'gasflow/list',
+ method: 'get',
+ params
+ })
+}
+// 腐蚀速率监测仪数据查询
+export function getCorrodeData(params) {
+ return request({
+ url: 'corrode/data/list',
+ method: 'get',
+ params
+ })
+}
// 批量导出井盖数据
export function batchExportWellData(params) {
@@ -183,6 +199,26 @@
responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
})
}
+// 腐蚀速率监测仪数据导出
+export function batchExportCorrodeData(params) {
+ return request({
+ url: 'corrode/data/export',
+ method: 'get',
+ timeout: 120000, // 120s，2分钟
+ params,
+ responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+ })
+}
+// 气体流量计数据导出
+export function batchExportGasflowData(params) {
+ return request({
+ url: 'gasflow/data/export',
+ method: 'get',
+ timeout: 120000, // 120s，2分钟
+ params,
+ responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+ })
+}
// 温度压力数据查询
export function getTempPressData(params) {
diff --git a/src/api/device.js b/src/api/device.js
index 00804fe..edcc1a4 100644
--- a/src/api/device.js
+++ b/src/api/device.js
@@ -100,4 +100,11 @@
params
})
}
+export function totalDataGasFlow(params) {
+ return request({
+ url: 'gasflow/listByDevice',
+ method: 'post',
+ params
+ })
+}
diff --git a/src/api/gasOverview.js b/src/api/gasOverview.js
new file mode 100644
index 0000000..0dc3442
--- /dev/null
+++ b/src/api/gasOverview.js
@@ -0,0 +1,173 @@
+/**
+ * 动力管线
+ */
+import request from '@/utils/request'
+
+// 用水量、噪声统计数据
+export function gasStatistic() {
+ return request({
+ url: 'gasStatistic/overview',
+ method: 'get'
+ })
+}
+
+// 用水量、噪声统计数据
+export function gasStatistic2(deviceType) {
+ return request({
+ url: 'gas/statistics/used',
+ method: 'get',
+ params: {
+ deviceType: deviceType
+ }
+ })
+}
+
+// 气体用气量走势图
+export function gasTrend(params) {
+ return request({
+ url: '/gas/statistics/trend',
+ method: 'get',
+ params
+ })
+}
+// 用气量超量报警统计
+export function gasAlarmTrend(params) {
+ return request({
+ url: '/gas/alarm/trend',
+ method: 'get',
+ params
+ })
+}
+// 各设备气体用气量
+export function gasUsed(params) {
+ return request({
+ url: '/gas/used',
+ method: 'get',
+ params
+ })
+}
+// 气体泄漏监测结果
+export function gasLeakStatus(params) {
+ return request({
+ url: 'gas/leakage/rate',
+ method: 'get',
+ params
+ })
+}
+
+// 气体流量计数量
+export function deviceCount(type) {
+ return request({
+ url: 'device/count/' + type,
+ method: 'get'
+ })
+}
+
+// 统计当前报警数
+export function alarmNowStatic(params) {
+ return request({
+ url: 'statics/alarmsNow',
+ method: 'get',
+ params
+ })
+}
+
+// 查询二级分区各区用气量
+export function countBySecondArea(params) {
+ return request({
+ url: 'gasStatistic/countBySecondArea',
+ method: 'get',
+ params
+ })
+}
+
+// 查询二级分区7日用气量
+export function countByDaySecond(params) {
+ return request({
+ url: 'gasStatistic/countByDay',
+ method: 'get',
+ params
+ })
+}
+// 查询二级分区燃气告警
+export function gasAlarmBySecondArea(params) {
+ return request({
+ url: 'gas/alarm/rate',
+ method: 'get',
+ params
+ })
+}
+// 各设备腐蚀速率统计
+export function corrRateByDevice(params) {
+ return request({
+ url: 'corrode/data/corrRateByDevice',
+ method: 'get',
+ params
+ })
+}
+// 查询二级分区用气对比
+export function gasCompareData(params) {
+ return request({
+ url: 'gasStatistic/gasCompare',
+ method: 'get',
+ params
+ })
+}
+
+// 根据设备类型统计设备数量
+export function deviceStaticsByType(params) {
+ return request({
+ url: 'statics/deviceStaticsByType',
+ method: 'get',
+ params
+ })
+}
+
+// 查询二级分区气体流量计告警
+export function alarmBySecondArea(params) {
+ return request({
+ url: 'gasStatistic/alarmBySecondArea',
+ method: 'get',
+ params
+ })
+}
+
+// 用气事记查询
+export function getNoteList(type) {
+ return request({
+ url: '/note/list/' + type,
+ // url: '/note/list',
+ method: 'get'
+ })
+}
+
+// 用气事记更新
+export function updateNoteList(data) {
+ return request({
+ url: '/note/edit',
+ method: 'post',
+ data
+ })
+}
+
+// 获取报警列表
+export function getAlarmsNow(params) {
+ return request({
+ url: 'overview/alarmNow',
+ method: 'get',
+ params
+ })
+}
+
+// 总览marker（真接口）
+export function getMapping(devType, keywords) {
+ return request({
+ url: 'overview/wellMapping',
+ method: 'get',
+ params: {
+ keywords: keywords,
+ devType: devType
+ }
+ })
+}
+
diff --git a/src/components/BigData/Card/index.vue b/src/components/BigData/Card/index.vue
index 8320d47..8944b44 100644
--- a/src/components/BigData/Card/index.vue
+++ b/src/components/BigData/Card/index.vue
@@ -10,7 +10,7 @@
{{ context }}
- {{unit}}
+ {{ unit }}
-
-
-
- {{ title[0] }} {{ context[0] }}{{unit}}
-
-
- {{ title[1] }} {{ context[1] }}{{unit}}
+
+
@@ -41,9 +41,9 @@
type: String,
default: '#40c9c6'
},
- unit:{
+ unit: {
type: String,
- default:''
+ default: ''
}
},
computed: {
diff --git a/src/components/BigData/Card1/index.vue b/src/components/BigData/Card1/index.vue
index 722c24c..c9ec32d 100644
--- a/src/components/BigData/Card1/index.vue
+++ b/src/components/BigData/Card1/index.vue
@@ -4,30 +4,20 @@
-
-
+
-
-
@@ -28,7 +29,7 @@
- 导出记录
+ 导出记录
@@ -63,6 +64,7 @@
import { getGasData, batchExportGasData } from '@/api/data'
import DeptSelect from '../../../components/DeptSelect/index'
import { parseUrl } from '@/utils/parseutils'
+import { getSearchLastWeekTime } from '@/utils/dateutils'
export default {
name: 'ListGasData',
@@ -163,6 +165,7 @@
if (params && params.deviceType === '4' && params.devcode) {
this.listQuery.keywords = params.devcode
}
+ this.timeRange = getSearchLastWeekTime()
this.fetchData()
}
},
@@ -191,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/listGasflowData.vue b/src/views/dataManage/deviceData/listGasflowData.vue
new file mode 100644
index 0000000..9c5321a
--- /dev/null
+++ b/src/views/dataManage/deviceData/listGasflowData.vue
@@ -0,0 +1,311 @@
+
+
+
+
+
+
-
+ {{ name }} {{ context[index] }}{{ unit }}
+
@@ -36,46 +26,46 @@
diff --git a/src/views/dataManage/deviceData/listCorrodeData.vue b/src/views/dataManage/deviceData/listCorrodeData.vue
new file mode 100644
index 0000000..1a20abb
--- /dev/null
+++ b/src/views/dataManage/deviceData/listCorrodeData.vue
@@ -0,0 +1,272 @@
+
+
{{ title[0] }}
- {{ context[0] }}{{unit}}
+ {{ context[0] }}{{ unit }}
+
+
+
+
+
+
+
diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue
index 97cdfdb..40b9a5e 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -5,10 +5,10 @@
+
+
+
+
+
+
+ 搜索
+
+
+
+
+
+
+
+ 导出记录
+
+
+
+
+
+
+ {{ scope.row[column.value] }}
+ {{ scope.row[column.value] }}
+
+
+
+
+
+ 数据列表
+
+ 数据列表
+
+
+
+
+
+
+
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 bf03fd1..dffd340 100644
--- a/src/views/dataManage/deviceData/listWaterData.vue
+++ b/src/views/dataManage/deviceData/listWaterData.vue
@@ -176,6 +176,12 @@
align: 'center'
},
{
+ text: '压力(Mpa)',
+ value: 'pressure',
+ width: 90,
+ align: 'center'
+ },
+ {
text: '今日用水量（立方米）',
value: 'dayCount',
align: 'center',
@@ -276,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) // 下载完成移除元素
@@ -311,9 +317,11 @@
}
getWatchData(this.listQuery).then((response) => {
this.list = response.data.rows.map(function(item) {
- item.areaFullName = item.areaFullName
- .replace('/', '')
- .replace('顶层', '')
+ item.totalCount = parseFloat(item.totalCount).toFixed(2)
+ item.dayCount = parseFloat(item.dayCount).toFixed(2)
+ item.monthCount = parseFloat(item.monthCount).toFixed(2)
+ item.pressure = parseFloat(item.pressure).toFixed(2)
+ item.areaFullName = item.areaFullName.replace('/', '').replace('顶层', '')
return item
})
this.total = parseInt(response.data.total)
diff --git a/src/views/dataManage/deviceData/waterHistory.vue b/src/views/dataManage/deviceData/waterHistory.vue
index 160dab7..42e3303 100644
--- a/src/views/dataManage/deviceData/waterHistory.vue
+++ b/src/views/dataManage/deviceData/waterHistory.vue
@@ -1,5 +1,5 @@
-
+
+
+
+
+
+
+ 搜索
+
+
+
+
+
+
+
+ 导出记录
+
+
+
+
+
+
+ {{
+ scope.row[column.value]
+ }}
+ {{
+ scope.row["areaFullName"] + '/' + scope.row[column.value]
+ }}
+ {{ scope.row[column.value] }}
+
+
+
+
+
+ 历史数据
+
+
+
+
+
+
+ 数据列表
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/AlarmNowList.vue b/src/views/gasDashboard/components/AlarmNowList.vue
new file mode 100644
index 0000000..890325f
--- /dev/null
+++ b/src/views/gasDashboard/components/AlarmNowList.vue
@@ -0,0 +1,35 @@
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/DeviceCount.vue b/src/views/gasDashboard/components/DeviceCount.vue
new file mode 100644
index 0000000..bffc9e9
--- /dev/null
+++ b/src/views/gasDashboard/components/DeviceCount.vue
@@ -0,0 +1,68 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/FunctionArea.vue b/src/views/gasDashboard/components/FunctionArea.vue
new file mode 100644
index 0000000..6401557
--- /dev/null
+++ b/src/views/gasDashboard/components/FunctionArea.vue
@@ -0,0 +1,140 @@
+
+
+
+ 本年度
+ 本季度
+ 近30日
+ 近7日
+ 今日
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/FunctionArea2.vue b/src/views/gasDashboard/components/FunctionArea2.vue
new file mode 100644
index 0000000..26a9f82
--- /dev/null
+++ b/src/views/gasDashboard/components/FunctionArea2.vue
@@ -0,0 +1,107 @@
+
+
+
+ 本年度
+ 本季度
+ 近30日
+ 近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/config/index.js b/config/index.js
index 106eaa6..30dda44 100644
--- a/config/index.js
+++ b/config/index.js
@@ -33,7 +33,7 @@
// Use Eslint Loader?
// If true, your code will be linted during bundling and
// linting errors and warnings will be shown in the console.
- useEslint: true,
+ useEslint: false,
// If true, eslint errors and warnings will also be shown in the error overlay
// in the browser.
showEslintErrorsInOverlay: false,
diff --git a/config/prod.env.js b/config/prod.env.js
index 3455ce7..bb20d1d 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -3,5 +3,6 @@
NODE_ENV: '"production"',
// BASE_API: '"http://111.198.10.15:11304"',
// BASE_API: '"http://42.81.160.165:2022/smartwell/"',
- BASE_API: '"http://111.198.10.15:11409/smartwell"' //11643
+ // BASE_API: '"http://111.198.10.15:11409/smartwell"' //11643
+ BASE_API: '"http://111.198.10.15:20104"' //11643
}
diff --git a/package.json b/package.json
index be3e56e..a60e7b3 100644
--- a/package.json
+++ b/package.json
@@ -86,7 +86,7 @@
"vue-template-compiler": "2.5.17",
"webpack": "4.16.5",
"webpack-bundle-analyzer": "2.13.1",
- "webpack-cli": "3.1.0",
+ "webpack-cli": "^3.1.0",
"webpack-dev-server": "3.1.14",
"webpack-merge": "4.1.4"
},
diff --git a/src/App.vue b/src/App.vue
index 721d3a3..ec9032c 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,6 +1,6 @@
-
diff --git a/src/api/dashboard.js b/src/api/dashboard.js
index aaadb23..6f56e28 100644
--- a/src/api/dashboard.js
+++ b/src/api/dashboard.js
@@ -79,11 +79,10 @@
})
}
-
// 用水事记查询
-export function getNoteList() {
+export function getNoteList(type) {
return request({
- url: '/note/list',
+ url: '/note/list/' + type,
method: 'get'
})
}
@@ -92,7 +91,6 @@
export function updateNoteList(data) {
return request({
url: '/note/edit',
- // url: 'waterMeterData/count',
method: 'post',
data
})
diff --git a/src/api/data.js b/src/api/data.js
index b7c9ba2..65c5071 100644
--- a/src/api/data.js
+++ b/src/api/data.js
@@ -85,6 +85,22 @@
params
})
}
+// 气体流量计数据查询
+export function getGasflowData(params) {
+ return request({
+ url: 'gasflow/list',
+ method: 'get',
+ params
+ })
+}
+// 腐蚀速率监测仪数据查询
+export function getCorrodeData(params) {
+ return request({
+ url: 'corrode/data/list',
+ method: 'get',
+ params
+ })
+}
// 批量导出井盖数据
export function batchExportWellData(params) {
@@ -183,6 +199,26 @@
responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
})
}
+// 腐蚀速率监测仪数据导出
+export function batchExportCorrodeData(params) {
+ return request({
+ url: 'corrode/data/export',
+ method: 'get',
+ timeout: 120000, // 120s，2分钟
+ params,
+ responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+ })
+}
+// 气体流量计数据导出
+export function batchExportGasflowData(params) {
+ return request({
+ url: 'gasflow/data/export',
+ method: 'get',
+ timeout: 120000, // 120s，2分钟
+ params,
+ responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+ })
+}
// 温度压力数据查询
export function getTempPressData(params) {
diff --git a/src/api/device.js b/src/api/device.js
index 00804fe..edcc1a4 100644
--- a/src/api/device.js
+++ b/src/api/device.js
@@ -100,4 +100,11 @@
params
})
}
+export function totalDataGasFlow(params) {
+ return request({
+ url: 'gasflow/listByDevice',
+ method: 'post',
+ params
+ })
+}
diff --git a/src/api/gasOverview.js b/src/api/gasOverview.js
new file mode 100644
index 0000000..0dc3442
--- /dev/null
+++ b/src/api/gasOverview.js
@@ -0,0 +1,173 @@
+/**
+ * 动力管线
+ */
+import request from '@/utils/request'
+
+// 用水量、噪声统计数据
+export function gasStatistic() {
+ return request({
+ url: 'gasStatistic/overview',
+ method: 'get'
+ })
+}
+
+// 用水量、噪声统计数据
+export function gasStatistic2(deviceType) {
+ return request({
+ url: 'gas/statistics/used',
+ method: 'get',
+ params: {
+ deviceType: deviceType
+ }
+ })
+}
+
+// 气体用气量走势图
+export function gasTrend(params) {
+ return request({
+ url: '/gas/statistics/trend',
+ method: 'get',
+ params
+ })
+}
+// 用气量超量报警统计
+export function gasAlarmTrend(params) {
+ return request({
+ url: '/gas/alarm/trend',
+ method: 'get',
+ params
+ })
+}
+// 各设备气体用气量
+export function gasUsed(params) {
+ return request({
+ url: '/gas/used',
+ method: 'get',
+ params
+ })
+}
+// 气体泄漏监测结果
+export function gasLeakStatus(params) {
+ return request({
+ url: 'gas/leakage/rate',
+ method: 'get',
+ params
+ })
+}
+
+// 气体流量计数量
+export function deviceCount(type) {
+ return request({
+ url: 'device/count/' + type,
+ method: 'get'
+ })
+}
+
+// 统计当前报警数
+export function alarmNowStatic(params) {
+ return request({
+ url: 'statics/alarmsNow',
+ method: 'get',
+ params
+ })
+}
+
+// 查询二级分区各区用气量
+export function countBySecondArea(params) {
+ return request({
+ url: 'gasStatistic/countBySecondArea',
+ method: 'get',
+ params
+ })
+}
+
+// 查询二级分区7日用气量
+export function countByDaySecond(params) {
+ return request({
+ url: 'gasStatistic/countByDay',
+ method: 'get',
+ params
+ })
+}
+// 查询二级分区燃气告警
+export function gasAlarmBySecondArea(params) {
+ return request({
+ url: 'gas/alarm/rate',
+ method: 'get',
+ params
+ })
+}
+// 各设备腐蚀速率统计
+export function corrRateByDevice(params) {
+ return request({
+ url: 'corrode/data/corrRateByDevice',
+ method: 'get',
+ params
+ })
+}
+// 查询二级分区用气对比
+export function gasCompareData(params) {
+ return request({
+ url: 'gasStatistic/gasCompare',
+ method: 'get',
+ params
+ })
+}
+
+// 根据设备类型统计设备数量
+export function deviceStaticsByType(params) {
+ return request({
+ url: 'statics/deviceStaticsByType',
+ method: 'get',
+ params
+ })
+}
+
+// 查询二级分区气体流量计告警
+export function alarmBySecondArea(params) {
+ return request({
+ url: 'gasStatistic/alarmBySecondArea',
+ method: 'get',
+ params
+ })
+}
+
+// 用气事记查询
+export function getNoteList(type) {
+ return request({
+ url: '/note/list/' + type,
+ // url: '/note/list',
+ method: 'get'
+ })
+}
+
+// 用气事记更新
+export function updateNoteList(data) {
+ return request({
+ url: '/note/edit',
+ method: 'post',
+ data
+ })
+}
+
+// 获取报警列表
+export function getAlarmsNow(params) {
+ return request({
+ url: 'overview/alarmNow',
+ method: 'get',
+ params
+ })
+}
+
+// 总览marker（真接口）
+export function getMapping(devType, keywords) {
+ return request({
+ url: 'overview/wellMapping',
+ method: 'get',
+ params: {
+ keywords: keywords,
+ devType: devType
+ }
+ })
+}
+
diff --git a/src/components/BigData/Card/index.vue b/src/components/BigData/Card/index.vue
index 8320d47..8944b44 100644
--- a/src/components/BigData/Card/index.vue
+++ b/src/components/BigData/Card/index.vue
@@ -10,7 +10,7 @@
{{ context }}
- {{unit}}
+ {{ unit }}
-
-
-
- {{ title[0] }} {{ context[0] }}{{unit}}
-
-
- {{ title[1] }} {{ context[1] }}{{unit}}
+
+
@@ -41,9 +41,9 @@
type: String,
default: '#40c9c6'
},
- unit:{
+ unit: {
type: String,
- default:''
+ default: ''
}
},
computed: {
diff --git a/src/components/BigData/Card1/index.vue b/src/components/BigData/Card1/index.vue
index 722c24c..c9ec32d 100644
--- a/src/components/BigData/Card1/index.vue
+++ b/src/components/BigData/Card1/index.vue
@@ -4,30 +4,20 @@
-
-
+
-
-
@@ -28,7 +29,7 @@
- 导出记录
+ 导出记录
@@ -63,6 +64,7 @@
import { getGasData, batchExportGasData } from '@/api/data'
import DeptSelect from '../../../components/DeptSelect/index'
import { parseUrl } from '@/utils/parseutils'
+import { getSearchLastWeekTime } from '@/utils/dateutils'
export default {
name: 'ListGasData',
@@ -163,6 +165,7 @@
if (params && params.deviceType === '4' && params.devcode) {
this.listQuery.keywords = params.devcode
}
+ this.timeRange = getSearchLastWeekTime()
this.fetchData()
}
},
@@ -191,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/listGasflowData.vue b/src/views/dataManage/deviceData/listGasflowData.vue
new file mode 100644
index 0000000..9c5321a
--- /dev/null
+++ b/src/views/dataManage/deviceData/listGasflowData.vue
@@ -0,0 +1,311 @@
+
+
+
+
+
+
+
+
+
+
+
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/index.js b/config/index.js
index 106eaa6..30dda44 100644
--- a/config/index.js
+++ b/config/index.js
@@ -33,7 +33,7 @@
// Use Eslint Loader?
// If true, your code will be linted during bundling and
// linting errors and warnings will be shown in the console.
- useEslint: true,
+ useEslint: false,
// If true, eslint errors and warnings will also be shown in the error overlay
// in the browser.
showEslintErrorsInOverlay: false,
diff --git a/config/prod.env.js b/config/prod.env.js
index 3455ce7..bb20d1d 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -3,5 +3,6 @@
NODE_ENV: '"production"',
// BASE_API: '"http://111.198.10.15:11304"',
// BASE_API: '"http://42.81.160.165:2022/smartwell/"',
- BASE_API: '"http://111.198.10.15:11409/smartwell"' //11643
+ // BASE_API: '"http://111.198.10.15:11409/smartwell"' //11643
+ BASE_API: '"http://111.198.10.15:20104"' //11643
}
diff --git a/package.json b/package.json
index be3e56e..a60e7b3 100644
--- a/package.json
+++ b/package.json
@@ -86,7 +86,7 @@
"vue-template-compiler": "2.5.17",
"webpack": "4.16.5",
"webpack-bundle-analyzer": "2.13.1",
- "webpack-cli": "3.1.0",
+ "webpack-cli": "^3.1.0",
"webpack-dev-server": "3.1.14",
"webpack-merge": "4.1.4"
},
diff --git a/src/App.vue b/src/App.vue
index 721d3a3..ec9032c 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,6 +1,6 @@
+
-
+ {{ name }} {{ context[index] }}{{ unit }}
+
@@ -36,46 +26,46 @@
diff --git a/src/views/dataManage/deviceData/listCorrodeData.vue b/src/views/dataManage/deviceData/listCorrodeData.vue
new file mode 100644
index 0000000..1a20abb
--- /dev/null
+++ b/src/views/dataManage/deviceData/listCorrodeData.vue
@@ -0,0 +1,272 @@
+
+
{{ title[0] }}
- {{ context[0] }}{{unit}}
+ {{ context[0] }}{{ unit }}
+
+
+
+
+
+
+
diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue
index 97cdfdb..40b9a5e 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -5,10 +5,10 @@
+
+
+
+
+
+
+ 搜索
+
+
+
+
+
+
+
+ 导出记录
+
+
+
+
+
+
+ {{ scope.row[column.value] }}
+ {{ scope.row[column.value] }}
+
+
+
+
+
+ 数据列表
+
+ 数据列表
+
+
+
+
+
+
+
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 bf03fd1..dffd340 100644
--- a/src/views/dataManage/deviceData/listWaterData.vue
+++ b/src/views/dataManage/deviceData/listWaterData.vue
@@ -176,6 +176,12 @@
align: 'center'
},
{
+ text: '压力(Mpa)',
+ value: 'pressure',
+ width: 90,
+ align: 'center'
+ },
+ {
text: '今日用水量（立方米）',
value: 'dayCount',
align: 'center',
@@ -276,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) // 下载完成移除元素
@@ -311,9 +317,11 @@
}
getWatchData(this.listQuery).then((response) => {
this.list = response.data.rows.map(function(item) {
- item.areaFullName = item.areaFullName
- .replace('/', '')
- .replace('顶层', '')
+ item.totalCount = parseFloat(item.totalCount).toFixed(2)
+ item.dayCount = parseFloat(item.dayCount).toFixed(2)
+ item.monthCount = parseFloat(item.monthCount).toFixed(2)
+ item.pressure = parseFloat(item.pressure).toFixed(2)
+ item.areaFullName = item.areaFullName.replace('/', '').replace('顶层', '')
return item
})
this.total = parseInt(response.data.total)
diff --git a/src/views/dataManage/deviceData/waterHistory.vue b/src/views/dataManage/deviceData/waterHistory.vue
index 160dab7..42e3303 100644
--- a/src/views/dataManage/deviceData/waterHistory.vue
+++ b/src/views/dataManage/deviceData/waterHistory.vue
@@ -1,5 +1,5 @@
-
+
+
+
+
+
+
+ 搜索
+
+
+
+
+
+
+
+ 导出记录
+
+
+
+
+
+
+ {{
+ scope.row[column.value]
+ }}
+ {{
+ scope.row["areaFullName"] + '/' + scope.row[column.value]
+ }}
+ {{ scope.row[column.value] }}
+
+
+
+
+
+ 历史数据
+
+
+
+
+
+
+ 数据列表
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/AlarmNowList.vue b/src/views/gasDashboard/components/AlarmNowList.vue
new file mode 100644
index 0000000..890325f
--- /dev/null
+++ b/src/views/gasDashboard/components/AlarmNowList.vue
@@ -0,0 +1,35 @@
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/DeviceCount.vue b/src/views/gasDashboard/components/DeviceCount.vue
new file mode 100644
index 0000000..bffc9e9
--- /dev/null
+++ b/src/views/gasDashboard/components/DeviceCount.vue
@@ -0,0 +1,68 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/FunctionArea.vue b/src/views/gasDashboard/components/FunctionArea.vue
new file mode 100644
index 0000000..6401557
--- /dev/null
+++ b/src/views/gasDashboard/components/FunctionArea.vue
@@ -0,0 +1,140 @@
+
+
+
+ 本年度
+ 本季度
+ 近30日
+ 近7日
+ 今日
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/FunctionArea2.vue b/src/views/gasDashboard/components/FunctionArea2.vue
new file mode 100644
index 0000000..26a9f82
--- /dev/null
+++ b/src/views/gasDashboard/components/FunctionArea2.vue
@@ -0,0 +1,107 @@
+
+
+
+ 本年度
+ 本季度
+ 近30日
+ 近7日
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/PanelGroup.vue b/src/views/gasDashboard/components/PanelGroup.vue
new file mode 100644
index 0000000..103486e
--- /dev/null
+++ b/src/views/gasDashboard/components/PanelGroup.vue
@@ -0,0 +1,137 @@
+
+
+
+
+
+
+
+
+
-
diff --git a/src/api/dashboard.js b/src/api/dashboard.js
index aaadb23..6f56e28 100644
--- a/src/api/dashboard.js
+++ b/src/api/dashboard.js
@@ -79,11 +79,10 @@
})
}
-
// 用水事记查询
-export function getNoteList() {
+export function getNoteList(type) {
return request({
- url: '/note/list',
+ url: '/note/list/' + type,
method: 'get'
})
}
@@ -92,7 +91,6 @@
export function updateNoteList(data) {
return request({
url: '/note/edit',
- // url: 'waterMeterData/count',
method: 'post',
data
})
diff --git a/src/api/data.js b/src/api/data.js
index b7c9ba2..65c5071 100644
--- a/src/api/data.js
+++ b/src/api/data.js
@@ -85,6 +85,22 @@
params
})
}
+// 气体流量计数据查询
+export function getGasflowData(params) {
+ return request({
+ url: 'gasflow/list',
+ method: 'get',
+ params
+ })
+}
+// 腐蚀速率监测仪数据查询
+export function getCorrodeData(params) {
+ return request({
+ url: 'corrode/data/list',
+ method: 'get',
+ params
+ })
+}
// 批量导出井盖数据
export function batchExportWellData(params) {
@@ -183,6 +199,26 @@
responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
})
}
+// 腐蚀速率监测仪数据导出
+export function batchExportCorrodeData(params) {
+ return request({
+ url: 'corrode/data/export',
+ method: 'get',
+ timeout: 120000, // 120s，2分钟
+ params,
+ responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+ })
+}
+// 气体流量计数据导出
+export function batchExportGasflowData(params) {
+ return request({
+ url: 'gasflow/data/export',
+ method: 'get',
+ timeout: 120000, // 120s，2分钟
+ params,
+ responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+ })
+}
// 温度压力数据查询
export function getTempPressData(params) {
diff --git a/src/api/device.js b/src/api/device.js
index 00804fe..edcc1a4 100644
--- a/src/api/device.js
+++ b/src/api/device.js
@@ -100,4 +100,11 @@
params
})
}
+export function totalDataGasFlow(params) {
+ return request({
+ url: 'gasflow/listByDevice',
+ method: 'post',
+ params
+ })
+}
diff --git a/src/api/gasOverview.js b/src/api/gasOverview.js
new file mode 100644
index 0000000..0dc3442
--- /dev/null
+++ b/src/api/gasOverview.js
@@ -0,0 +1,173 @@
+/**
+ * 动力管线
+ */
+import request from '@/utils/request'
+
+// 用水量、噪声统计数据
+export function gasStatistic() {
+ return request({
+ url: 'gasStatistic/overview',
+ method: 'get'
+ })
+}
+
+// 用水量、噪声统计数据
+export function gasStatistic2(deviceType) {
+ return request({
+ url: 'gas/statistics/used',
+ method: 'get',
+ params: {
+ deviceType: deviceType
+ }
+ })
+}
+
+// 气体用气量走势图
+export function gasTrend(params) {
+ return request({
+ url: '/gas/statistics/trend',
+ method: 'get',
+ params
+ })
+}
+// 用气量超量报警统计
+export function gasAlarmTrend(params) {
+ return request({
+ url: '/gas/alarm/trend',
+ method: 'get',
+ params
+ })
+}
+// 各设备气体用气量
+export function gasUsed(params) {
+ return request({
+ url: '/gas/used',
+ method: 'get',
+ params
+ })
+}
+// 气体泄漏监测结果
+export function gasLeakStatus(params) {
+ return request({
+ url: 'gas/leakage/rate',
+ method: 'get',
+ params
+ })
+}
+
+// 气体流量计数量
+export function deviceCount(type) {
+ return request({
+ url: 'device/count/' + type,
+ method: 'get'
+ })
+}
+
+// 统计当前报警数
+export function alarmNowStatic(params) {
+ return request({
+ url: 'statics/alarmsNow',
+ method: 'get',
+ params
+ })
+}
+
+// 查询二级分区各区用气量
+export function countBySecondArea(params) {
+ return request({
+ url: 'gasStatistic/countBySecondArea',
+ method: 'get',
+ params
+ })
+}
+
+// 查询二级分区7日用气量
+export function countByDaySecond(params) {
+ return request({
+ url: 'gasStatistic/countByDay',
+ method: 'get',
+ params
+ })
+}
+// 查询二级分区燃气告警
+export function gasAlarmBySecondArea(params) {
+ return request({
+ url: 'gas/alarm/rate',
+ method: 'get',
+ params
+ })
+}
+// 各设备腐蚀速率统计
+export function corrRateByDevice(params) {
+ return request({
+ url: 'corrode/data/corrRateByDevice',
+ method: 'get',
+ params
+ })
+}
+// 查询二级分区用气对比
+export function gasCompareData(params) {
+ return request({
+ url: 'gasStatistic/gasCompare',
+ method: 'get',
+ params
+ })
+}
+
+// 根据设备类型统计设备数量
+export function deviceStaticsByType(params) {
+ return request({
+ url: 'statics/deviceStaticsByType',
+ method: 'get',
+ params
+ })
+}
+
+// 查询二级分区气体流量计告警
+export function alarmBySecondArea(params) {
+ return request({
+ url: 'gasStatistic/alarmBySecondArea',
+ method: 'get',
+ params
+ })
+}
+
+// 用气事记查询
+export function getNoteList(type) {
+ return request({
+ url: '/note/list/' + type,
+ // url: '/note/list',
+ method: 'get'
+ })
+}
+
+// 用气事记更新
+export function updateNoteList(data) {
+ return request({
+ url: '/note/edit',
+ method: 'post',
+ data
+ })
+}
+
+// 获取报警列表
+export function getAlarmsNow(params) {
+ return request({
+ url: 'overview/alarmNow',
+ method: 'get',
+ params
+ })
+}
+
+// 总览marker（真接口）
+export function getMapping(devType, keywords) {
+ return request({
+ url: 'overview/wellMapping',
+ method: 'get',
+ params: {
+ keywords: keywords,
+ devType: devType
+ }
+ })
+}
+
diff --git a/src/components/BigData/Card/index.vue b/src/components/BigData/Card/index.vue
index 8320d47..8944b44 100644
--- a/src/components/BigData/Card/index.vue
+++ b/src/components/BigData/Card/index.vue
@@ -10,7 +10,7 @@
{{ context }}
- {{unit}}
+ {{ unit }}
-
-
-
- {{ title[0] }} {{ context[0] }}{{unit}}
-
-
- {{ title[1] }} {{ context[1] }}{{unit}}
+
+
@@ -41,9 +41,9 @@
type: String,
default: '#40c9c6'
},
- unit:{
+ unit: {
type: String,
- default:''
+ default: ''
}
},
computed: {
diff --git a/src/components/BigData/Card1/index.vue b/src/components/BigData/Card1/index.vue
index 722c24c..c9ec32d 100644
--- a/src/components/BigData/Card1/index.vue
+++ b/src/components/BigData/Card1/index.vue
@@ -4,30 +4,20 @@
-
-
+
-
-
@@ -28,7 +29,7 @@
- 导出记录
+ 导出记录
@@ -63,6 +64,7 @@
import { getGasData, batchExportGasData } from '@/api/data'
import DeptSelect from '../../../components/DeptSelect/index'
import { parseUrl } from '@/utils/parseutils'
+import { getSearchLastWeekTime } from '@/utils/dateutils'
export default {
name: 'ListGasData',
@@ -163,6 +165,7 @@
if (params && params.deviceType === '4' && params.devcode) {
this.listQuery.keywords = params.devcode
}
+ this.timeRange = getSearchLastWeekTime()
this.fetchData()
}
},
@@ -191,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/listGasflowData.vue b/src/views/dataManage/deviceData/listGasflowData.vue
new file mode 100644
index 0000000..9c5321a
--- /dev/null
+++ b/src/views/dataManage/deviceData/listGasflowData.vue
@@ -0,0 +1,311 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/alarmGasCountByType.vue b/src/views/gasDashboard/components/alarmGasCountByType.vue
new file mode 100644
index 0000000..4f80d3a
--- /dev/null
+++ b/src/views/gasDashboard/components/alarmGasCountByType.vue
@@ -0,0 +1,72 @@
+
+
+
+
-
+ {{ name }} {{ context[index] }}{{ unit }}
+
@@ -36,46 +26,46 @@
diff --git a/src/views/dataManage/deviceData/listCorrodeData.vue b/src/views/dataManage/deviceData/listCorrodeData.vue
new file mode 100644
index 0000000..1a20abb
--- /dev/null
+++ b/src/views/dataManage/deviceData/listCorrodeData.vue
@@ -0,0 +1,272 @@
+
+
{{ title[0] }}
- {{ context[0] }}{{unit}}
+ {{ context[0] }}{{ unit }}
+
+
+
+
+
+
+
diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue
index 97cdfdb..40b9a5e 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -5,10 +5,10 @@
+
+
+
+
+
+
+ 搜索
+
+
+
+
+
+
+
+ 导出记录
+
+
+
+
+
+
+ {{ scope.row[column.value] }}
+ {{ scope.row[column.value] }}
+
+
+
+
+
+ 数据列表
+
+ 数据列表
+
+
+
+
+
+
+
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 bf03fd1..dffd340 100644
--- a/src/views/dataManage/deviceData/listWaterData.vue
+++ b/src/views/dataManage/deviceData/listWaterData.vue
@@ -176,6 +176,12 @@
align: 'center'
},
{
+ text: '压力(Mpa)',
+ value: 'pressure',
+ width: 90,
+ align: 'center'
+ },
+ {
text: '今日用水量（立方米）',
value: 'dayCount',
align: 'center',
@@ -276,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) // 下载完成移除元素
@@ -311,9 +317,11 @@
}
getWatchData(this.listQuery).then((response) => {
this.list = response.data.rows.map(function(item) {
- item.areaFullName = item.areaFullName
- .replace('/', '')
- .replace('顶层', '')
+ item.totalCount = parseFloat(item.totalCount).toFixed(2)
+ item.dayCount = parseFloat(item.dayCount).toFixed(2)
+ item.monthCount = parseFloat(item.monthCount).toFixed(2)
+ item.pressure = parseFloat(item.pressure).toFixed(2)
+ item.areaFullName = item.areaFullName.replace('/', '').replace('顶层', '')
return item
})
this.total = parseInt(response.data.total)
diff --git a/src/views/dataManage/deviceData/waterHistory.vue b/src/views/dataManage/deviceData/waterHistory.vue
index 160dab7..42e3303 100644
--- a/src/views/dataManage/deviceData/waterHistory.vue
+++ b/src/views/dataManage/deviceData/waterHistory.vue
@@ -1,5 +1,5 @@
-
+
+
+
+
+
+
+ 搜索
+
+
+
+
+
+
+
+ 导出记录
+
+
+
+
+
+
+ {{
+ scope.row[column.value]
+ }}
+ {{
+ scope.row["areaFullName"] + '/' + scope.row[column.value]
+ }}
+ {{ scope.row[column.value] }}
+
+
+
+
+
+ 历史数据
+
+
+
+
+
+
+ 数据列表
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/AlarmNowList.vue b/src/views/gasDashboard/components/AlarmNowList.vue
new file mode 100644
index 0000000..890325f
--- /dev/null
+++ b/src/views/gasDashboard/components/AlarmNowList.vue
@@ -0,0 +1,35 @@
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/DeviceCount.vue b/src/views/gasDashboard/components/DeviceCount.vue
new file mode 100644
index 0000000..bffc9e9
--- /dev/null
+++ b/src/views/gasDashboard/components/DeviceCount.vue
@@ -0,0 +1,68 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/FunctionArea.vue b/src/views/gasDashboard/components/FunctionArea.vue
new file mode 100644
index 0000000..6401557
--- /dev/null
+++ b/src/views/gasDashboard/components/FunctionArea.vue
@@ -0,0 +1,140 @@
+
+
+
+ 本年度
+ 本季度
+ 近30日
+ 近7日
+ 今日
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/FunctionArea2.vue b/src/views/gasDashboard/components/FunctionArea2.vue
new file mode 100644
index 0000000..26a9f82
--- /dev/null
+++ b/src/views/gasDashboard/components/FunctionArea2.vue
@@ -0,0 +1,107 @@
+
+
+
+ 本年度
+ 本季度
+ 近30日
+ 近7日
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/PanelGroup.vue b/src/views/gasDashboard/components/PanelGroup.vue
new file mode 100644
index 0000000..103486e
--- /dev/null
+++ b/src/views/gasDashboard/components/PanelGroup.vue
@@ -0,0 +1,137 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
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/index.js b/config/index.js
index 106eaa6..30dda44 100644
--- a/config/index.js
+++ b/config/index.js
@@ -33,7 +33,7 @@
// Use Eslint Loader?
// If true, your code will be linted during bundling and
// linting errors and warnings will be shown in the console.
- useEslint: true,
+ useEslint: false,
// If true, eslint errors and warnings will also be shown in the error overlay
// in the browser.
showEslintErrorsInOverlay: false,
diff --git a/config/prod.env.js b/config/prod.env.js
index 3455ce7..bb20d1d 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -3,5 +3,6 @@
NODE_ENV: '"production"',
// BASE_API: '"http://111.198.10.15:11304"',
// BASE_API: '"http://42.81.160.165:2022/smartwell/"',
- BASE_API: '"http://111.198.10.15:11409/smartwell"' //11643
+ // BASE_API: '"http://111.198.10.15:11409/smartwell"' //11643
+ BASE_API: '"http://111.198.10.15:20104"' //11643
}
diff --git a/package.json b/package.json
index be3e56e..a60e7b3 100644
--- a/package.json
+++ b/package.json
@@ -86,7 +86,7 @@
"vue-template-compiler": "2.5.17",
"webpack": "4.16.5",
"webpack-bundle-analyzer": "2.13.1",
- "webpack-cli": "3.1.0",
+ "webpack-cli": "^3.1.0",
"webpack-dev-server": "3.1.14",
"webpack-merge": "4.1.4"
},
diff --git a/src/App.vue b/src/App.vue
index 721d3a3..ec9032c 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,6 +1,6 @@
-
diff --git a/src/api/dashboard.js b/src/api/dashboard.js
index aaadb23..6f56e28 100644
--- a/src/api/dashboard.js
+++ b/src/api/dashboard.js
@@ -79,11 +79,10 @@
})
}
-
// 用水事记查询
-export function getNoteList() {
+export function getNoteList(type) {
return request({
- url: '/note/list',
+ url: '/note/list/' + type,
method: 'get'
})
}
@@ -92,7 +91,6 @@
export function updateNoteList(data) {
return request({
url: '/note/edit',
- // url: 'waterMeterData/count',
method: 'post',
data
})
diff --git a/src/api/data.js b/src/api/data.js
index b7c9ba2..65c5071 100644
--- a/src/api/data.js
+++ b/src/api/data.js
@@ -85,6 +85,22 @@
params
})
}
+// 气体流量计数据查询
+export function getGasflowData(params) {
+ return request({
+ url: 'gasflow/list',
+ method: 'get',
+ params
+ })
+}
+// 腐蚀速率监测仪数据查询
+export function getCorrodeData(params) {
+ return request({
+ url: 'corrode/data/list',
+ method: 'get',
+ params
+ })
+}
// 批量导出井盖数据
export function batchExportWellData(params) {
@@ -183,6 +199,26 @@
responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
})
}
+// 腐蚀速率监测仪数据导出
+export function batchExportCorrodeData(params) {
+ return request({
+ url: 'corrode/data/export',
+ method: 'get',
+ timeout: 120000, // 120s，2分钟
+ params,
+ responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+ })
+}
+// 气体流量计数据导出
+export function batchExportGasflowData(params) {
+ return request({
+ url: 'gasflow/data/export',
+ method: 'get',
+ timeout: 120000, // 120s，2分钟
+ params,
+ responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+ })
+}
// 温度压力数据查询
export function getTempPressData(params) {
diff --git a/src/api/device.js b/src/api/device.js
index 00804fe..edcc1a4 100644
--- a/src/api/device.js
+++ b/src/api/device.js
@@ -100,4 +100,11 @@
params
})
}
+export function totalDataGasFlow(params) {
+ return request({
+ url: 'gasflow/listByDevice',
+ method: 'post',
+ params
+ })
+}
diff --git a/src/api/gasOverview.js b/src/api/gasOverview.js
new file mode 100644
index 0000000..0dc3442
--- /dev/null
+++ b/src/api/gasOverview.js
@@ -0,0 +1,173 @@
+/**
+ * 动力管线
+ */
+import request from '@/utils/request'
+
+// 用水量、噪声统计数据
+export function gasStatistic() {
+ return request({
+ url: 'gasStatistic/overview',
+ method: 'get'
+ })
+}
+
+// 用水量、噪声统计数据
+export function gasStatistic2(deviceType) {
+ return request({
+ url: 'gas/statistics/used',
+ method: 'get',
+ params: {
+ deviceType: deviceType
+ }
+ })
+}
+
+// 气体用气量走势图
+export function gasTrend(params) {
+ return request({
+ url: '/gas/statistics/trend',
+ method: 'get',
+ params
+ })
+}
+// 用气量超量报警统计
+export function gasAlarmTrend(params) {
+ return request({
+ url: '/gas/alarm/trend',
+ method: 'get',
+ params
+ })
+}
+// 各设备气体用气量
+export function gasUsed(params) {
+ return request({
+ url: '/gas/used',
+ method: 'get',
+ params
+ })
+}
+// 气体泄漏监测结果
+export function gasLeakStatus(params) {
+ return request({
+ url: 'gas/leakage/rate',
+ method: 'get',
+ params
+ })
+}
+
+// 气体流量计数量
+export function deviceCount(type) {
+ return request({
+ url: 'device/count/' + type,
+ method: 'get'
+ })
+}
+
+// 统计当前报警数
+export function alarmNowStatic(params) {
+ return request({
+ url: 'statics/alarmsNow',
+ method: 'get',
+ params
+ })
+}
+
+// 查询二级分区各区用气量
+export function countBySecondArea(params) {
+ return request({
+ url: 'gasStatistic/countBySecondArea',
+ method: 'get',
+ params
+ })
+}
+
+// 查询二级分区7日用气量
+export function countByDaySecond(params) {
+ return request({
+ url: 'gasStatistic/countByDay',
+ method: 'get',
+ params
+ })
+}
+// 查询二级分区燃气告警
+export function gasAlarmBySecondArea(params) {
+ return request({
+ url: 'gas/alarm/rate',
+ method: 'get',
+ params
+ })
+}
+// 各设备腐蚀速率统计
+export function corrRateByDevice(params) {
+ return request({
+ url: 'corrode/data/corrRateByDevice',
+ method: 'get',
+ params
+ })
+}
+// 查询二级分区用气对比
+export function gasCompareData(params) {
+ return request({
+ url: 'gasStatistic/gasCompare',
+ method: 'get',
+ params
+ })
+}
+
+// 根据设备类型统计设备数量
+export function deviceStaticsByType(params) {
+ return request({
+ url: 'statics/deviceStaticsByType',
+ method: 'get',
+ params
+ })
+}
+
+// 查询二级分区气体流量计告警
+export function alarmBySecondArea(params) {
+ return request({
+ url: 'gasStatistic/alarmBySecondArea',
+ method: 'get',
+ params
+ })
+}
+
+// 用气事记查询
+export function getNoteList(type) {
+ return request({
+ url: '/note/list/' + type,
+ // url: '/note/list',
+ method: 'get'
+ })
+}
+
+// 用气事记更新
+export function updateNoteList(data) {
+ return request({
+ url: '/note/edit',
+ method: 'post',
+ data
+ })
+}
+
+// 获取报警列表
+export function getAlarmsNow(params) {
+ return request({
+ url: 'overview/alarmNow',
+ method: 'get',
+ params
+ })
+}
+
+// 总览marker（真接口）
+export function getMapping(devType, keywords) {
+ return request({
+ url: 'overview/wellMapping',
+ method: 'get',
+ params: {
+ keywords: keywords,
+ devType: devType
+ }
+ })
+}
+
diff --git a/src/components/BigData/Card/index.vue b/src/components/BigData/Card/index.vue
index 8320d47..8944b44 100644
--- a/src/components/BigData/Card/index.vue
+++ b/src/components/BigData/Card/index.vue
@@ -10,7 +10,7 @@
{{ context }}
- {{unit}}
+ {{ unit }}
-
-
-
- {{ title[0] }} {{ context[0] }}{{unit}}
-
-
- {{ title[1] }} {{ context[1] }}{{unit}}
+
+
@@ -41,9 +41,9 @@
type: String,
default: '#40c9c6'
},
- unit:{
+ unit: {
type: String,
- default:''
+ default: ''
}
},
computed: {
diff --git a/src/components/BigData/Card1/index.vue b/src/components/BigData/Card1/index.vue
index 722c24c..c9ec32d 100644
--- a/src/components/BigData/Card1/index.vue
+++ b/src/components/BigData/Card1/index.vue
@@ -4,30 +4,20 @@
-
-
+
-
-
@@ -28,7 +29,7 @@
- 导出记录
+ 导出记录
@@ -63,6 +64,7 @@
import { getGasData, batchExportGasData } from '@/api/data'
import DeptSelect from '../../../components/DeptSelect/index'
import { parseUrl } from '@/utils/parseutils'
+import { getSearchLastWeekTime } from '@/utils/dateutils'
export default {
name: 'ListGasData',
@@ -163,6 +165,7 @@
if (params && params.deviceType === '4' && params.devcode) {
this.listQuery.keywords = params.devcode
}
+ this.timeRange = getSearchLastWeekTime()
this.fetchData()
}
},
@@ -191,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/listGasflowData.vue b/src/views/dataManage/deviceData/listGasflowData.vue
new file mode 100644
index 0000000..9c5321a
--- /dev/null
+++ b/src/views/dataManage/deviceData/listGasflowData.vue
@@ -0,0 +1,311 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/alarmGasCountByType.vue b/src/views/gasDashboard/components/alarmGasCountByType.vue
new file mode 100644
index 0000000..4f80d3a
--- /dev/null
+++ b/src/views/gasDashboard/components/alarmGasCountByType.vue
@@ -0,0 +1,72 @@
+
+
+
+
-
+ {{ name }} {{ context[index] }}{{ unit }}
+
@@ -36,46 +26,46 @@
diff --git a/src/views/dataManage/deviceData/listCorrodeData.vue b/src/views/dataManage/deviceData/listCorrodeData.vue
new file mode 100644
index 0000000..1a20abb
--- /dev/null
+++ b/src/views/dataManage/deviceData/listCorrodeData.vue
@@ -0,0 +1,272 @@
+
+
{{ title[0] }}
- {{ context[0] }}{{unit}}
+ {{ context[0] }}{{ unit }}
+
+
+
+
+
+
+
diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue
index 97cdfdb..40b9a5e 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -5,10 +5,10 @@
+
+
+
+
+
+
+ 搜索
+
+
+
+
+
+
+
+ 导出记录
+
+
+
+
+
+
+ {{ scope.row[column.value] }}
+ {{ scope.row[column.value] }}
+
+
+
+
+
+ 数据列表
+
+ 数据列表
+
+
+
+
+
+
+
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 bf03fd1..dffd340 100644
--- a/src/views/dataManage/deviceData/listWaterData.vue
+++ b/src/views/dataManage/deviceData/listWaterData.vue
@@ -176,6 +176,12 @@
align: 'center'
},
{
+ text: '压力(Mpa)',
+ value: 'pressure',
+ width: 90,
+ align: 'center'
+ },
+ {
text: '今日用水量（立方米）',
value: 'dayCount',
align: 'center',
@@ -276,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) // 下载完成移除元素
@@ -311,9 +317,11 @@
}
getWatchData(this.listQuery).then((response) => {
this.list = response.data.rows.map(function(item) {
- item.areaFullName = item.areaFullName
- .replace('/', '')
- .replace('顶层', '')
+ item.totalCount = parseFloat(item.totalCount).toFixed(2)
+ item.dayCount = parseFloat(item.dayCount).toFixed(2)
+ item.monthCount = parseFloat(item.monthCount).toFixed(2)
+ item.pressure = parseFloat(item.pressure).toFixed(2)
+ item.areaFullName = item.areaFullName.replace('/', '').replace('顶层', '')
return item
})
this.total = parseInt(response.data.total)
diff --git a/src/views/dataManage/deviceData/waterHistory.vue b/src/views/dataManage/deviceData/waterHistory.vue
index 160dab7..42e3303 100644
--- a/src/views/dataManage/deviceData/waterHistory.vue
+++ b/src/views/dataManage/deviceData/waterHistory.vue
@@ -1,5 +1,5 @@
-
+
+
+
+
+
+
+ 搜索
+
+
+
+
+
+
+
+ 导出记录
+
+
+
+
+
+
+ {{
+ scope.row[column.value]
+ }}
+ {{
+ scope.row["areaFullName"] + '/' + scope.row[column.value]
+ }}
+ {{ scope.row[column.value] }}
+
+
+
+
+
+ 历史数据
+
+
+
+
+
+
+ 数据列表
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/AlarmNowList.vue b/src/views/gasDashboard/components/AlarmNowList.vue
new file mode 100644
index 0000000..890325f
--- /dev/null
+++ b/src/views/gasDashboard/components/AlarmNowList.vue
@@ -0,0 +1,35 @@
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/DeviceCount.vue b/src/views/gasDashboard/components/DeviceCount.vue
new file mode 100644
index 0000000..bffc9e9
--- /dev/null
+++ b/src/views/gasDashboard/components/DeviceCount.vue
@@ -0,0 +1,68 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/FunctionArea.vue b/src/views/gasDashboard/components/FunctionArea.vue
new file mode 100644
index 0000000..6401557
--- /dev/null
+++ b/src/views/gasDashboard/components/FunctionArea.vue
@@ -0,0 +1,140 @@
+
+
+
+ 本年度
+ 本季度
+ 近30日
+ 近7日
+ 今日
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/FunctionArea2.vue b/src/views/gasDashboard/components/FunctionArea2.vue
new file mode 100644
index 0000000..26a9f82
--- /dev/null
+++ b/src/views/gasDashboard/components/FunctionArea2.vue
@@ -0,0 +1,107 @@
+
+
+
+ 本年度
+ 本季度
+ 近30日
+ 近7日
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/PanelGroup.vue b/src/views/gasDashboard/components/PanelGroup.vue
new file mode 100644
index 0000000..103486e
--- /dev/null
+++ b/src/views/gasDashboard/components/PanelGroup.vue
@@ -0,0 +1,137 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/alarmLeakCountPie.vue b/src/views/gasDashboard/components/alarmLeakCountPie.vue
new file mode 100644
index 0000000..abfbc2d
--- /dev/null
+++ b/src/views/gasDashboard/components/alarmLeakCountPie.vue
@@ -0,0 +1,74 @@
+
+
+
+
+
+
+
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/index.js b/config/index.js
index 106eaa6..30dda44 100644
--- a/config/index.js
+++ b/config/index.js
@@ -33,7 +33,7 @@
// Use Eslint Loader?
// If true, your code will be linted during bundling and
// linting errors and warnings will be shown in the console.
- useEslint: true,
+ useEslint: false,
// If true, eslint errors and warnings will also be shown in the error overlay
// in the browser.
showEslintErrorsInOverlay: false,
diff --git a/config/prod.env.js b/config/prod.env.js
index 3455ce7..bb20d1d 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -3,5 +3,6 @@
NODE_ENV: '"production"',
// BASE_API: '"http://111.198.10.15:11304"',
// BASE_API: '"http://42.81.160.165:2022/smartwell/"',
- BASE_API: '"http://111.198.10.15:11409/smartwell"' //11643
+ // BASE_API: '"http://111.198.10.15:11409/smartwell"' //11643
+ BASE_API: '"http://111.198.10.15:20104"' //11643
}
diff --git a/package.json b/package.json
index be3e56e..a60e7b3 100644
--- a/package.json
+++ b/package.json
@@ -86,7 +86,7 @@
"vue-template-compiler": "2.5.17",
"webpack": "4.16.5",
"webpack-bundle-analyzer": "2.13.1",
- "webpack-cli": "3.1.0",
+ "webpack-cli": "^3.1.0",
"webpack-dev-server": "3.1.14",
"webpack-merge": "4.1.4"
},
diff --git a/src/App.vue b/src/App.vue
index 721d3a3..ec9032c 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,6 +1,6 @@
-
diff --git a/src/api/dashboard.js b/src/api/dashboard.js
index aaadb23..6f56e28 100644
--- a/src/api/dashboard.js
+++ b/src/api/dashboard.js
@@ -79,11 +79,10 @@
})
}
-
// 用水事记查询
-export function getNoteList() {
+export function getNoteList(type) {
return request({
- url: '/note/list',
+ url: '/note/list/' + type,
method: 'get'
})
}
@@ -92,7 +91,6 @@
export function updateNoteList(data) {
return request({
url: '/note/edit',
- // url: 'waterMeterData/count',
method: 'post',
data
})
diff --git a/src/api/data.js b/src/api/data.js
index b7c9ba2..65c5071 100644
--- a/src/api/data.js
+++ b/src/api/data.js
@@ -85,6 +85,22 @@
params
})
}
+// 气体流量计数据查询
+export function getGasflowData(params) {
+ return request({
+ url: 'gasflow/list',
+ method: 'get',
+ params
+ })
+}
+// 腐蚀速率监测仪数据查询
+export function getCorrodeData(params) {
+ return request({
+ url: 'corrode/data/list',
+ method: 'get',
+ params
+ })
+}
// 批量导出井盖数据
export function batchExportWellData(params) {
@@ -183,6 +199,26 @@
responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
})
}
+// 腐蚀速率监测仪数据导出
+export function batchExportCorrodeData(params) {
+ return request({
+ url: 'corrode/data/export',
+ method: 'get',
+ timeout: 120000, // 120s，2分钟
+ params,
+ responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+ })
+}
+// 气体流量计数据导出
+export function batchExportGasflowData(params) {
+ return request({
+ url: 'gasflow/data/export',
+ method: 'get',
+ timeout: 120000, // 120s，2分钟
+ params,
+ responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+ })
+}
// 温度压力数据查询
export function getTempPressData(params) {
diff --git a/src/api/device.js b/src/api/device.js
index 00804fe..edcc1a4 100644
--- a/src/api/device.js
+++ b/src/api/device.js
@@ -100,4 +100,11 @@
params
})
}
+export function totalDataGasFlow(params) {
+ return request({
+ url: 'gasflow/listByDevice',
+ method: 'post',
+ params
+ })
+}
diff --git a/src/api/gasOverview.js b/src/api/gasOverview.js
new file mode 100644
index 0000000..0dc3442
--- /dev/null
+++ b/src/api/gasOverview.js
@@ -0,0 +1,173 @@
+/**
+ * 动力管线
+ */
+import request from '@/utils/request'
+
+// 用水量、噪声统计数据
+export function gasStatistic() {
+ return request({
+ url: 'gasStatistic/overview',
+ method: 'get'
+ })
+}
+
+// 用水量、噪声统计数据
+export function gasStatistic2(deviceType) {
+ return request({
+ url: 'gas/statistics/used',
+ method: 'get',
+ params: {
+ deviceType: deviceType
+ }
+ })
+}
+
+// 气体用气量走势图
+export function gasTrend(params) {
+ return request({
+ url: '/gas/statistics/trend',
+ method: 'get',
+ params
+ })
+}
+// 用气量超量报警统计
+export function gasAlarmTrend(params) {
+ return request({
+ url: '/gas/alarm/trend',
+ method: 'get',
+ params
+ })
+}
+// 各设备气体用气量
+export function gasUsed(params) {
+ return request({
+ url: '/gas/used',
+ method: 'get',
+ params
+ })
+}
+// 气体泄漏监测结果
+export function gasLeakStatus(params) {
+ return request({
+ url: 'gas/leakage/rate',
+ method: 'get',
+ params
+ })
+}
+
+// 气体流量计数量
+export function deviceCount(type) {
+ return request({
+ url: 'device/count/' + type,
+ method: 'get'
+ })
+}
+
+// 统计当前报警数
+export function alarmNowStatic(params) {
+ return request({
+ url: 'statics/alarmsNow',
+ method: 'get',
+ params
+ })
+}
+
+// 查询二级分区各区用气量
+export function countBySecondArea(params) {
+ return request({
+ url: 'gasStatistic/countBySecondArea',
+ method: 'get',
+ params
+ })
+}
+
+// 查询二级分区7日用气量
+export function countByDaySecond(params) {
+ return request({
+ url: 'gasStatistic/countByDay',
+ method: 'get',
+ params
+ })
+}
+// 查询二级分区燃气告警
+export function gasAlarmBySecondArea(params) {
+ return request({
+ url: 'gas/alarm/rate',
+ method: 'get',
+ params
+ })
+}
+// 各设备腐蚀速率统计
+export function corrRateByDevice(params) {
+ return request({
+ url: 'corrode/data/corrRateByDevice',
+ method: 'get',
+ params
+ })
+}
+// 查询二级分区用气对比
+export function gasCompareData(params) {
+ return request({
+ url: 'gasStatistic/gasCompare',
+ method: 'get',
+ params
+ })
+}
+
+// 根据设备类型统计设备数量
+export function deviceStaticsByType(params) {
+ return request({
+ url: 'statics/deviceStaticsByType',
+ method: 'get',
+ params
+ })
+}
+
+// 查询二级分区气体流量计告警
+export function alarmBySecondArea(params) {
+ return request({
+ url: 'gasStatistic/alarmBySecondArea',
+ method: 'get',
+ params
+ })
+}
+
+// 用气事记查询
+export function getNoteList(type) {
+ return request({
+ url: '/note/list/' + type,
+ // url: '/note/list',
+ method: 'get'
+ })
+}
+
+// 用气事记更新
+export function updateNoteList(data) {
+ return request({
+ url: '/note/edit',
+ method: 'post',
+ data
+ })
+}
+
+// 获取报警列表
+export function getAlarmsNow(params) {
+ return request({
+ url: 'overview/alarmNow',
+ method: 'get',
+ params
+ })
+}
+
+// 总览marker（真接口）
+export function getMapping(devType, keywords) {
+ return request({
+ url: 'overview/wellMapping',
+ method: 'get',
+ params: {
+ keywords: keywords,
+ devType: devType
+ }
+ })
+}
+
diff --git a/src/components/BigData/Card/index.vue b/src/components/BigData/Card/index.vue
index 8320d47..8944b44 100644
--- a/src/components/BigData/Card/index.vue
+++ b/src/components/BigData/Card/index.vue
@@ -10,7 +10,7 @@
{{ context }}
- {{unit}}
+ {{ unit }}
-
-
-
- {{ title[0] }} {{ context[0] }}{{unit}}
-
-
- {{ title[1] }} {{ context[1] }}{{unit}}
+
+
@@ -41,9 +41,9 @@
type: String,
default: '#40c9c6'
},
- unit:{
+ unit: {
type: String,
- default:''
+ default: ''
}
},
computed: {
diff --git a/src/components/BigData/Card1/index.vue b/src/components/BigData/Card1/index.vue
index 722c24c..c9ec32d 100644
--- a/src/components/BigData/Card1/index.vue
+++ b/src/components/BigData/Card1/index.vue
@@ -4,30 +4,20 @@
-
-
+
-
-
@@ -28,7 +29,7 @@
- 导出记录
+ 导出记录
@@ -63,6 +64,7 @@
import { getGasData, batchExportGasData } from '@/api/data'
import DeptSelect from '../../../components/DeptSelect/index'
import { parseUrl } from '@/utils/parseutils'
+import { getSearchLastWeekTime } from '@/utils/dateutils'
export default {
name: 'ListGasData',
@@ -163,6 +165,7 @@
if (params && params.deviceType === '4' && params.devcode) {
this.listQuery.keywords = params.devcode
}
+ this.timeRange = getSearchLastWeekTime()
this.fetchData()
}
},
@@ -191,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/listGasflowData.vue b/src/views/dataManage/deviceData/listGasflowData.vue
new file mode 100644
index 0000000..9c5321a
--- /dev/null
+++ b/src/views/dataManage/deviceData/listGasflowData.vue
@@ -0,0 +1,311 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/alarmGasCountByType.vue b/src/views/gasDashboard/components/alarmGasCountByType.vue
new file mode 100644
index 0000000..4f80d3a
--- /dev/null
+++ b/src/views/gasDashboard/components/alarmGasCountByType.vue
@@ -0,0 +1,72 @@
+
+
+
+
-
+ {{ name }} {{ context[index] }}{{ unit }}
+
@@ -36,46 +26,46 @@
diff --git a/src/views/dataManage/deviceData/listCorrodeData.vue b/src/views/dataManage/deviceData/listCorrodeData.vue
new file mode 100644
index 0000000..1a20abb
--- /dev/null
+++ b/src/views/dataManage/deviceData/listCorrodeData.vue
@@ -0,0 +1,272 @@
+
+
{{ title[0] }}
- {{ context[0] }}{{unit}}
+ {{ context[0] }}{{ unit }}
+
+
+
+
+
+
+
diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue
index 97cdfdb..40b9a5e 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -5,10 +5,10 @@
+
+
+
+
+
+
+ 搜索
+
+
+
+
+
+
+
+ 导出记录
+
+
+
+
+
+
+ {{ scope.row[column.value] }}
+ {{ scope.row[column.value] }}
+
+
+
+
+
+ 数据列表
+
+ 数据列表
+
+
+
+
+
+
+
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 bf03fd1..dffd340 100644
--- a/src/views/dataManage/deviceData/listWaterData.vue
+++ b/src/views/dataManage/deviceData/listWaterData.vue
@@ -176,6 +176,12 @@
align: 'center'
},
{
+ text: '压力(Mpa)',
+ value: 'pressure',
+ width: 90,
+ align: 'center'
+ },
+ {
text: '今日用水量（立方米）',
value: 'dayCount',
align: 'center',
@@ -276,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) // 下载完成移除元素
@@ -311,9 +317,11 @@
}
getWatchData(this.listQuery).then((response) => {
this.list = response.data.rows.map(function(item) {
- item.areaFullName = item.areaFullName
- .replace('/', '')
- .replace('顶层', '')
+ item.totalCount = parseFloat(item.totalCount).toFixed(2)
+ item.dayCount = parseFloat(item.dayCount).toFixed(2)
+ item.monthCount = parseFloat(item.monthCount).toFixed(2)
+ item.pressure = parseFloat(item.pressure).toFixed(2)
+ item.areaFullName = item.areaFullName.replace('/', '').replace('顶层', '')
return item
})
this.total = parseInt(response.data.total)
diff --git a/src/views/dataManage/deviceData/waterHistory.vue b/src/views/dataManage/deviceData/waterHistory.vue
index 160dab7..42e3303 100644
--- a/src/views/dataManage/deviceData/waterHistory.vue
+++ b/src/views/dataManage/deviceData/waterHistory.vue
@@ -1,5 +1,5 @@
-
+
+
+
+
+
+
+ 搜索
+
+
+
+
+
+
+
+ 导出记录
+
+
+
+
+
+
+ {{
+ scope.row[column.value]
+ }}
+ {{
+ scope.row["areaFullName"] + '/' + scope.row[column.value]
+ }}
+ {{ scope.row[column.value] }}
+
+
+
+
+
+ 历史数据
+
+
+
+
+
+
+ 数据列表
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/AlarmNowList.vue b/src/views/gasDashboard/components/AlarmNowList.vue
new file mode 100644
index 0000000..890325f
--- /dev/null
+++ b/src/views/gasDashboard/components/AlarmNowList.vue
@@ -0,0 +1,35 @@
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/DeviceCount.vue b/src/views/gasDashboard/components/DeviceCount.vue
new file mode 100644
index 0000000..bffc9e9
--- /dev/null
+++ b/src/views/gasDashboard/components/DeviceCount.vue
@@ -0,0 +1,68 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/FunctionArea.vue b/src/views/gasDashboard/components/FunctionArea.vue
new file mode 100644
index 0000000..6401557
--- /dev/null
+++ b/src/views/gasDashboard/components/FunctionArea.vue
@@ -0,0 +1,140 @@
+
+
+
+ 本年度
+ 本季度
+ 近30日
+ 近7日
+ 今日
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/FunctionArea2.vue b/src/views/gasDashboard/components/FunctionArea2.vue
new file mode 100644
index 0000000..26a9f82
--- /dev/null
+++ b/src/views/gasDashboard/components/FunctionArea2.vue
@@ -0,0 +1,107 @@
+
+
+
+ 本年度
+ 本季度
+ 近30日
+ 近7日
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/PanelGroup.vue b/src/views/gasDashboard/components/PanelGroup.vue
new file mode 100644
index 0000000..103486e
--- /dev/null
+++ b/src/views/gasDashboard/components/PanelGroup.vue
@@ -0,0 +1,137 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/alarmLeakCountPie.vue b/src/views/gasDashboard/components/alarmLeakCountPie.vue
new file mode 100644
index 0000000..abfbc2d
--- /dev/null
+++ b/src/views/gasDashboard/components/alarmLeakCountPie.vue
@@ -0,0 +1,74 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/corrodeCountByDay.vue b/src/views/gasDashboard/components/corrodeCountByDay.vue
new file mode 100644
index 0000000..a410f29
--- /dev/null
+++ b/src/views/gasDashboard/components/corrodeCountByDay.vue
@@ -0,0 +1,100 @@
+
+
+
+
+
+
+
+
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/index.js b/config/index.js
index 106eaa6..30dda44 100644
--- a/config/index.js
+++ b/config/index.js
@@ -33,7 +33,7 @@
// Use Eslint Loader?
// If true, your code will be linted during bundling and
// linting errors and warnings will be shown in the console.
- useEslint: true,
+ useEslint: false,
// If true, eslint errors and warnings will also be shown in the error overlay
// in the browser.
showEslintErrorsInOverlay: false,
diff --git a/config/prod.env.js b/config/prod.env.js
index 3455ce7..bb20d1d 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -3,5 +3,6 @@
NODE_ENV: '"production"',
// BASE_API: '"http://111.198.10.15:11304"',
// BASE_API: '"http://42.81.160.165:2022/smartwell/"',
- BASE_API: '"http://111.198.10.15:11409/smartwell"' //11643
+ // BASE_API: '"http://111.198.10.15:11409/smartwell"' //11643
+ BASE_API: '"http://111.198.10.15:20104"' //11643
}
diff --git a/package.json b/package.json
index be3e56e..a60e7b3 100644
--- a/package.json
+++ b/package.json
@@ -86,7 +86,7 @@
"vue-template-compiler": "2.5.17",
"webpack": "4.16.5",
"webpack-bundle-analyzer": "2.13.1",
- "webpack-cli": "3.1.0",
+ "webpack-cli": "^3.1.0",
"webpack-dev-server": "3.1.14",
"webpack-merge": "4.1.4"
},
diff --git a/src/App.vue b/src/App.vue
index 721d3a3..ec9032c 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,6 +1,6 @@
-
diff --git a/src/api/dashboard.js b/src/api/dashboard.js
index aaadb23..6f56e28 100644
--- a/src/api/dashboard.js
+++ b/src/api/dashboard.js
@@ -79,11 +79,10 @@
})
}
-
// 用水事记查询
-export function getNoteList() {
+export function getNoteList(type) {
return request({
- url: '/note/list',
+ url: '/note/list/' + type,
method: 'get'
})
}
@@ -92,7 +91,6 @@
export function updateNoteList(data) {
return request({
url: '/note/edit',
- // url: 'waterMeterData/count',
method: 'post',
data
})
diff --git a/src/api/data.js b/src/api/data.js
index b7c9ba2..65c5071 100644
--- a/src/api/data.js
+++ b/src/api/data.js
@@ -85,6 +85,22 @@
params
})
}
+// 气体流量计数据查询
+export function getGasflowData(params) {
+ return request({
+ url: 'gasflow/list',
+ method: 'get',
+ params
+ })
+}
+// 腐蚀速率监测仪数据查询
+export function getCorrodeData(params) {
+ return request({
+ url: 'corrode/data/list',
+ method: 'get',
+ params
+ })
+}
// 批量导出井盖数据
export function batchExportWellData(params) {
@@ -183,6 +199,26 @@
responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
})
}
+// 腐蚀速率监测仪数据导出
+export function batchExportCorrodeData(params) {
+ return request({
+ url: 'corrode/data/export',
+ method: 'get',
+ timeout: 120000, // 120s，2分钟
+ params,
+ responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+ })
+}
+// 气体流量计数据导出
+export function batchExportGasflowData(params) {
+ return request({
+ url: 'gasflow/data/export',
+ method: 'get',
+ timeout: 120000, // 120s，2分钟
+ params,
+ responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+ })
+}
// 温度压力数据查询
export function getTempPressData(params) {
diff --git a/src/api/device.js b/src/api/device.js
index 00804fe..edcc1a4 100644
--- a/src/api/device.js
+++ b/src/api/device.js
@@ -100,4 +100,11 @@
params
})
}
+export function totalDataGasFlow(params) {
+ return request({
+ url: 'gasflow/listByDevice',
+ method: 'post',
+ params
+ })
+}
diff --git a/src/api/gasOverview.js b/src/api/gasOverview.js
new file mode 100644
index 0000000..0dc3442
--- /dev/null
+++ b/src/api/gasOverview.js
@@ -0,0 +1,173 @@
+/**
+ * 动力管线
+ */
+import request from '@/utils/request'
+
+// 用水量、噪声统计数据
+export function gasStatistic() {
+ return request({
+ url: 'gasStatistic/overview',
+ method: 'get'
+ })
+}
+
+// 用水量、噪声统计数据
+export function gasStatistic2(deviceType) {
+ return request({
+ url: 'gas/statistics/used',
+ method: 'get',
+ params: {
+ deviceType: deviceType
+ }
+ })
+}
+
+// 气体用气量走势图
+export function gasTrend(params) {
+ return request({
+ url: '/gas/statistics/trend',
+ method: 'get',
+ params
+ })
+}
+// 用气量超量报警统计
+export function gasAlarmTrend(params) {
+ return request({
+ url: '/gas/alarm/trend',
+ method: 'get',
+ params
+ })
+}
+// 各设备气体用气量
+export function gasUsed(params) {
+ return request({
+ url: '/gas/used',
+ method: 'get',
+ params
+ })
+}
+// 气体泄漏监测结果
+export function gasLeakStatus(params) {
+ return request({
+ url: 'gas/leakage/rate',
+ method: 'get',
+ params
+ })
+}
+
+// 气体流量计数量
+export function deviceCount(type) {
+ return request({
+ url: 'device/count/' + type,
+ method: 'get'
+ })
+}
+
+// 统计当前报警数
+export function alarmNowStatic(params) {
+ return request({
+ url: 'statics/alarmsNow',
+ method: 'get',
+ params
+ })
+}
+
+// 查询二级分区各区用气量
+export function countBySecondArea(params) {
+ return request({
+ url: 'gasStatistic/countBySecondArea',
+ method: 'get',
+ params
+ })
+}
+
+// 查询二级分区7日用气量
+export function countByDaySecond(params) {
+ return request({
+ url: 'gasStatistic/countByDay',
+ method: 'get',
+ params
+ })
+}
+// 查询二级分区燃气告警
+export function gasAlarmBySecondArea(params) {
+ return request({
+ url: 'gas/alarm/rate',
+ method: 'get',
+ params
+ })
+}
+// 各设备腐蚀速率统计
+export function corrRateByDevice(params) {
+ return request({
+ url: 'corrode/data/corrRateByDevice',
+ method: 'get',
+ params
+ })
+}
+// 查询二级分区用气对比
+export function gasCompareData(params) {
+ return request({
+ url: 'gasStatistic/gasCompare',
+ method: 'get',
+ params
+ })
+}
+
+// 根据设备类型统计设备数量
+export function deviceStaticsByType(params) {
+ return request({
+ url: 'statics/deviceStaticsByType',
+ method: 'get',
+ params
+ })
+}
+
+// 查询二级分区气体流量计告警
+export function alarmBySecondArea(params) {
+ return request({
+ url: 'gasStatistic/alarmBySecondArea',
+ method: 'get',
+ params
+ })
+}
+
+// 用气事记查询
+export function getNoteList(type) {
+ return request({
+ url: '/note/list/' + type,
+ // url: '/note/list',
+ method: 'get'
+ })
+}
+
+// 用气事记更新
+export function updateNoteList(data) {
+ return request({
+ url: '/note/edit',
+ method: 'post',
+ data
+ })
+}
+
+// 获取报警列表
+export function getAlarmsNow(params) {
+ return request({
+ url: 'overview/alarmNow',
+ method: 'get',
+ params
+ })
+}
+
+// 总览marker（真接口）
+export function getMapping(devType, keywords) {
+ return request({
+ url: 'overview/wellMapping',
+ method: 'get',
+ params: {
+ keywords: keywords,
+ devType: devType
+ }
+ })
+}
+
diff --git a/src/components/BigData/Card/index.vue b/src/components/BigData/Card/index.vue
index 8320d47..8944b44 100644
--- a/src/components/BigData/Card/index.vue
+++ b/src/components/BigData/Card/index.vue
@@ -10,7 +10,7 @@
{{ context }}
- {{unit}}
+ {{ unit }}
-
-
-
- {{ title[0] }} {{ context[0] }}{{unit}}
-
-
- {{ title[1] }} {{ context[1] }}{{unit}}
+
+
@@ -41,9 +41,9 @@
type: String,
default: '#40c9c6'
},
- unit:{
+ unit: {
type: String,
- default:''
+ default: ''
}
},
computed: {
diff --git a/src/components/BigData/Card1/index.vue b/src/components/BigData/Card1/index.vue
index 722c24c..c9ec32d 100644
--- a/src/components/BigData/Card1/index.vue
+++ b/src/components/BigData/Card1/index.vue
@@ -4,30 +4,20 @@
-
-
+
-
-
@@ -28,7 +29,7 @@
- 导出记录
+ 导出记录
@@ -63,6 +64,7 @@
import { getGasData, batchExportGasData } from '@/api/data'
import DeptSelect from '../../../components/DeptSelect/index'
import { parseUrl } from '@/utils/parseutils'
+import { getSearchLastWeekTime } from '@/utils/dateutils'
export default {
name: 'ListGasData',
@@ -163,6 +165,7 @@
if (params && params.deviceType === '4' && params.devcode) {
this.listQuery.keywords = params.devcode
}
+ this.timeRange = getSearchLastWeekTime()
this.fetchData()
}
},
@@ -191,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/listGasflowData.vue b/src/views/dataManage/deviceData/listGasflowData.vue
new file mode 100644
index 0000000..9c5321a
--- /dev/null
+++ b/src/views/dataManage/deviceData/listGasflowData.vue
@@ -0,0 +1,311 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/alarmGasCountByType.vue b/src/views/gasDashboard/components/alarmGasCountByType.vue
new file mode 100644
index 0000000..4f80d3a
--- /dev/null
+++ b/src/views/gasDashboard/components/alarmGasCountByType.vue
@@ -0,0 +1,72 @@
+
+
+
+
-
+ {{ name }} {{ context[index] }}{{ unit }}
+
@@ -36,46 +26,46 @@
diff --git a/src/views/dataManage/deviceData/listCorrodeData.vue b/src/views/dataManage/deviceData/listCorrodeData.vue
new file mode 100644
index 0000000..1a20abb
--- /dev/null
+++ b/src/views/dataManage/deviceData/listCorrodeData.vue
@@ -0,0 +1,272 @@
+
+
{{ title[0] }}
- {{ context[0] }}{{unit}}
+ {{ context[0] }}{{ unit }}
+
+
+
+
+
+
+
diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue
index 97cdfdb..40b9a5e 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -5,10 +5,10 @@
+
+
+
+
+
+
+ 搜索
+
+
+
+
+
+
+
+ 导出记录
+
+
+
+
+
+
+ {{ scope.row[column.value] }}
+ {{ scope.row[column.value] }}
+
+
+
+
+
+ 数据列表
+
+ 数据列表
+
+
+
+
+
+
+
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 bf03fd1..dffd340 100644
--- a/src/views/dataManage/deviceData/listWaterData.vue
+++ b/src/views/dataManage/deviceData/listWaterData.vue
@@ -176,6 +176,12 @@
align: 'center'
},
{
+ text: '压力(Mpa)',
+ value: 'pressure',
+ width: 90,
+ align: 'center'
+ },
+ {
text: '今日用水量（立方米）',
value: 'dayCount',
align: 'center',
@@ -276,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) // 下载完成移除元素
@@ -311,9 +317,11 @@
}
getWatchData(this.listQuery).then((response) => {
this.list = response.data.rows.map(function(item) {
- item.areaFullName = item.areaFullName
- .replace('/', '')
- .replace('顶层', '')
+ item.totalCount = parseFloat(item.totalCount).toFixed(2)
+ item.dayCount = parseFloat(item.dayCount).toFixed(2)
+ item.monthCount = parseFloat(item.monthCount).toFixed(2)
+ item.pressure = parseFloat(item.pressure).toFixed(2)
+ item.areaFullName = item.areaFullName.replace('/', '').replace('顶层', '')
return item
})
this.total = parseInt(response.data.total)
diff --git a/src/views/dataManage/deviceData/waterHistory.vue b/src/views/dataManage/deviceData/waterHistory.vue
index 160dab7..42e3303 100644
--- a/src/views/dataManage/deviceData/waterHistory.vue
+++ b/src/views/dataManage/deviceData/waterHistory.vue
@@ -1,5 +1,5 @@
-
+
+
+
+
+
+
+ 搜索
+
+
+
+
+
+
+
+ 导出记录
+
+
+
+
+
+
+ {{
+ scope.row[column.value]
+ }}
+ {{
+ scope.row["areaFullName"] + '/' + scope.row[column.value]
+ }}
+ {{ scope.row[column.value] }}
+
+
+
+
+
+ 历史数据
+
+
+
+
+
+
+ 数据列表
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/AlarmNowList.vue b/src/views/gasDashboard/components/AlarmNowList.vue
new file mode 100644
index 0000000..890325f
--- /dev/null
+++ b/src/views/gasDashboard/components/AlarmNowList.vue
@@ -0,0 +1,35 @@
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/DeviceCount.vue b/src/views/gasDashboard/components/DeviceCount.vue
new file mode 100644
index 0000000..bffc9e9
--- /dev/null
+++ b/src/views/gasDashboard/components/DeviceCount.vue
@@ -0,0 +1,68 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/FunctionArea.vue b/src/views/gasDashboard/components/FunctionArea.vue
new file mode 100644
index 0000000..6401557
--- /dev/null
+++ b/src/views/gasDashboard/components/FunctionArea.vue
@@ -0,0 +1,140 @@
+
+
+
+ 本年度
+ 本季度
+ 近30日
+ 近7日
+ 今日
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/FunctionArea2.vue b/src/views/gasDashboard/components/FunctionArea2.vue
new file mode 100644
index 0000000..26a9f82
--- /dev/null
+++ b/src/views/gasDashboard/components/FunctionArea2.vue
@@ -0,0 +1,107 @@
+
+
+
+ 本年度
+ 本季度
+ 近30日
+ 近7日
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/PanelGroup.vue b/src/views/gasDashboard/components/PanelGroup.vue
new file mode 100644
index 0000000..103486e
--- /dev/null
+++ b/src/views/gasDashboard/components/PanelGroup.vue
@@ -0,0 +1,137 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/alarmLeakCountPie.vue b/src/views/gasDashboard/components/alarmLeakCountPie.vue
new file mode 100644
index 0000000..abfbc2d
--- /dev/null
+++ b/src/views/gasDashboard/components/alarmLeakCountPie.vue
@@ -0,0 +1,74 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/corrodeCountByDay.vue b/src/views/gasDashboard/components/corrodeCountByDay.vue
new file mode 100644
index 0000000..a410f29
--- /dev/null
+++ b/src/views/gasDashboard/components/corrodeCountByDay.vue
@@ -0,0 +1,100 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasAlarmTrend.vue b/src/views/gasDashboard/components/gasAlarmTrend.vue
new file mode 100644
index 0000000..a1d422e
--- /dev/null
+++ b/src/views/gasDashboard/components/gasAlarmTrend.vue
@@ -0,0 +1,100 @@
+
+
+
+
+
+
+
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/index.js b/config/index.js
index 106eaa6..30dda44 100644
--- a/config/index.js
+++ b/config/index.js
@@ -33,7 +33,7 @@
// Use Eslint Loader?
// If true, your code will be linted during bundling and
// linting errors and warnings will be shown in the console.
- useEslint: true,
+ useEslint: false,
// If true, eslint errors and warnings will also be shown in the error overlay
// in the browser.
showEslintErrorsInOverlay: false,
diff --git a/config/prod.env.js b/config/prod.env.js
index 3455ce7..bb20d1d 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -3,5 +3,6 @@
NODE_ENV: '"production"',
// BASE_API: '"http://111.198.10.15:11304"',
// BASE_API: '"http://42.81.160.165:2022/smartwell/"',
- BASE_API: '"http://111.198.10.15:11409/smartwell"' //11643
+ // BASE_API: '"http://111.198.10.15:11409/smartwell"' //11643
+ BASE_API: '"http://111.198.10.15:20104"' //11643
}
diff --git a/package.json b/package.json
index be3e56e..a60e7b3 100644
--- a/package.json
+++ b/package.json
@@ -86,7 +86,7 @@
"vue-template-compiler": "2.5.17",
"webpack": "4.16.5",
"webpack-bundle-analyzer": "2.13.1",
- "webpack-cli": "3.1.0",
+ "webpack-cli": "^3.1.0",
"webpack-dev-server": "3.1.14",
"webpack-merge": "4.1.4"
},
diff --git a/src/App.vue b/src/App.vue
index 721d3a3..ec9032c 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,6 +1,6 @@
-
diff --git a/src/api/dashboard.js b/src/api/dashboard.js
index aaadb23..6f56e28 100644
--- a/src/api/dashboard.js
+++ b/src/api/dashboard.js
@@ -79,11 +79,10 @@
})
}
-
// 用水事记查询
-export function getNoteList() {
+export function getNoteList(type) {
return request({
- url: '/note/list',
+ url: '/note/list/' + type,
method: 'get'
})
}
@@ -92,7 +91,6 @@
export function updateNoteList(data) {
return request({
url: '/note/edit',
- // url: 'waterMeterData/count',
method: 'post',
data
})
diff --git a/src/api/data.js b/src/api/data.js
index b7c9ba2..65c5071 100644
--- a/src/api/data.js
+++ b/src/api/data.js
@@ -85,6 +85,22 @@
params
})
}
+// 气体流量计数据查询
+export function getGasflowData(params) {
+ return request({
+ url: 'gasflow/list',
+ method: 'get',
+ params
+ })
+}
+// 腐蚀速率监测仪数据查询
+export function getCorrodeData(params) {
+ return request({
+ url: 'corrode/data/list',
+ method: 'get',
+ params
+ })
+}
// 批量导出井盖数据
export function batchExportWellData(params) {
@@ -183,6 +199,26 @@
responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
})
}
+// 腐蚀速率监测仪数据导出
+export function batchExportCorrodeData(params) {
+ return request({
+ url: 'corrode/data/export',
+ method: 'get',
+ timeout: 120000, // 120s，2分钟
+ params,
+ responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+ })
+}
+// 气体流量计数据导出
+export function batchExportGasflowData(params) {
+ return request({
+ url: 'gasflow/data/export',
+ method: 'get',
+ timeout: 120000, // 120s，2分钟
+ params,
+ responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+ })
+}
// 温度压力数据查询
export function getTempPressData(params) {
diff --git a/src/api/device.js b/src/api/device.js
index 00804fe..edcc1a4 100644
--- a/src/api/device.js
+++ b/src/api/device.js
@@ -100,4 +100,11 @@
params
})
}
+export function totalDataGasFlow(params) {
+ return request({
+ url: 'gasflow/listByDevice',
+ method: 'post',
+ params
+ })
+}
diff --git a/src/api/gasOverview.js b/src/api/gasOverview.js
new file mode 100644
index 0000000..0dc3442
--- /dev/null
+++ b/src/api/gasOverview.js
@@ -0,0 +1,173 @@
+/**
+ * 动力管线
+ */
+import request from '@/utils/request'
+
+// 用水量、噪声统计数据
+export function gasStatistic() {
+ return request({
+ url: 'gasStatistic/overview',
+ method: 'get'
+ })
+}
+
+// 用水量、噪声统计数据
+export function gasStatistic2(deviceType) {
+ return request({
+ url: 'gas/statistics/used',
+ method: 'get',
+ params: {
+ deviceType: deviceType
+ }
+ })
+}
+
+// 气体用气量走势图
+export function gasTrend(params) {
+ return request({
+ url: '/gas/statistics/trend',
+ method: 'get',
+ params
+ })
+}
+// 用气量超量报警统计
+export function gasAlarmTrend(params) {
+ return request({
+ url: '/gas/alarm/trend',
+ method: 'get',
+ params
+ })
+}
+// 各设备气体用气量
+export function gasUsed(params) {
+ return request({
+ url: '/gas/used',
+ method: 'get',
+ params
+ })
+}
+// 气体泄漏监测结果
+export function gasLeakStatus(params) {
+ return request({
+ url: 'gas/leakage/rate',
+ method: 'get',
+ params
+ })
+}
+
+// 气体流量计数量
+export function deviceCount(type) {
+ return request({
+ url: 'device/count/' + type,
+ method: 'get'
+ })
+}
+
+// 统计当前报警数
+export function alarmNowStatic(params) {
+ return request({
+ url: 'statics/alarmsNow',
+ method: 'get',
+ params
+ })
+}
+
+// 查询二级分区各区用气量
+export function countBySecondArea(params) {
+ return request({
+ url: 'gasStatistic/countBySecondArea',
+ method: 'get',
+ params
+ })
+}
+
+// 查询二级分区7日用气量
+export function countByDaySecond(params) {
+ return request({
+ url: 'gasStatistic/countByDay',
+ method: 'get',
+ params
+ })
+}
+// 查询二级分区燃气告警
+export function gasAlarmBySecondArea(params) {
+ return request({
+ url: 'gas/alarm/rate',
+ method: 'get',
+ params
+ })
+}
+// 各设备腐蚀速率统计
+export function corrRateByDevice(params) {
+ return request({
+ url: 'corrode/data/corrRateByDevice',
+ method: 'get',
+ params
+ })
+}
+// 查询二级分区用气对比
+export function gasCompareData(params) {
+ return request({
+ url: 'gasStatistic/gasCompare',
+ method: 'get',
+ params
+ })
+}
+
+// 根据设备类型统计设备数量
+export function deviceStaticsByType(params) {
+ return request({
+ url: 'statics/deviceStaticsByType',
+ method: 'get',
+ params
+ })
+}
+
+// 查询二级分区气体流量计告警
+export function alarmBySecondArea(params) {
+ return request({
+ url: 'gasStatistic/alarmBySecondArea',
+ method: 'get',
+ params
+ })
+}
+
+// 用气事记查询
+export function getNoteList(type) {
+ return request({
+ url: '/note/list/' + type,
+ // url: '/note/list',
+ method: 'get'
+ })
+}
+
+// 用气事记更新
+export function updateNoteList(data) {
+ return request({
+ url: '/note/edit',
+ method: 'post',
+ data
+ })
+}
+
+// 获取报警列表
+export function getAlarmsNow(params) {
+ return request({
+ url: 'overview/alarmNow',
+ method: 'get',
+ params
+ })
+}
+
+// 总览marker（真接口）
+export function getMapping(devType, keywords) {
+ return request({
+ url: 'overview/wellMapping',
+ method: 'get',
+ params: {
+ keywords: keywords,
+ devType: devType
+ }
+ })
+}
+
diff --git a/src/components/BigData/Card/index.vue b/src/components/BigData/Card/index.vue
index 8320d47..8944b44 100644
--- a/src/components/BigData/Card/index.vue
+++ b/src/components/BigData/Card/index.vue
@@ -10,7 +10,7 @@
{{ context }}
- {{unit}}
+ {{ unit }}
-
-
-
- {{ title[0] }} {{ context[0] }}{{unit}}
-
-
- {{ title[1] }} {{ context[1] }}{{unit}}
+
+
@@ -41,9 +41,9 @@
type: String,
default: '#40c9c6'
},
- unit:{
+ unit: {
type: String,
- default:''
+ default: ''
}
},
computed: {
diff --git a/src/components/BigData/Card1/index.vue b/src/components/BigData/Card1/index.vue
index 722c24c..c9ec32d 100644
--- a/src/components/BigData/Card1/index.vue
+++ b/src/components/BigData/Card1/index.vue
@@ -4,30 +4,20 @@
-
-
+
-
-
@@ -28,7 +29,7 @@
- 导出记录
+ 导出记录
@@ -63,6 +64,7 @@
import { getGasData, batchExportGasData } from '@/api/data'
import DeptSelect from '../../../components/DeptSelect/index'
import { parseUrl } from '@/utils/parseutils'
+import { getSearchLastWeekTime } from '@/utils/dateutils'
export default {
name: 'ListGasData',
@@ -163,6 +165,7 @@
if (params && params.deviceType === '4' && params.devcode) {
this.listQuery.keywords = params.devcode
}
+ this.timeRange = getSearchLastWeekTime()
this.fetchData()
}
},
@@ -191,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/listGasflowData.vue b/src/views/dataManage/deviceData/listGasflowData.vue
new file mode 100644
index 0000000..9c5321a
--- /dev/null
+++ b/src/views/dataManage/deviceData/listGasflowData.vue
@@ -0,0 +1,311 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/alarmGasCountByType.vue b/src/views/gasDashboard/components/alarmGasCountByType.vue
new file mode 100644
index 0000000..4f80d3a
--- /dev/null
+++ b/src/views/gasDashboard/components/alarmGasCountByType.vue
@@ -0,0 +1,72 @@
+
+
+
+
-
+ {{ name }} {{ context[index] }}{{ unit }}
+
@@ -36,46 +26,46 @@
diff --git a/src/views/dataManage/deviceData/listCorrodeData.vue b/src/views/dataManage/deviceData/listCorrodeData.vue
new file mode 100644
index 0000000..1a20abb
--- /dev/null
+++ b/src/views/dataManage/deviceData/listCorrodeData.vue
@@ -0,0 +1,272 @@
+
+
{{ title[0] }}
- {{ context[0] }}{{unit}}
+ {{ context[0] }}{{ unit }}
+
+
+
+
+
+
+
diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue
index 97cdfdb..40b9a5e 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -5,10 +5,10 @@
+
+
+
+
+
+
+ 搜索
+
+
+
+
+
+
+
+ 导出记录
+
+
+
+
+
+
+ {{ scope.row[column.value] }}
+ {{ scope.row[column.value] }}
+
+
+
+
+
+ 数据列表
+
+ 数据列表
+
+
+
+
+
+
+
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 bf03fd1..dffd340 100644
--- a/src/views/dataManage/deviceData/listWaterData.vue
+++ b/src/views/dataManage/deviceData/listWaterData.vue
@@ -176,6 +176,12 @@
align: 'center'
},
{
+ text: '压力(Mpa)',
+ value: 'pressure',
+ width: 90,
+ align: 'center'
+ },
+ {
text: '今日用水量（立方米）',
value: 'dayCount',
align: 'center',
@@ -276,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) // 下载完成移除元素
@@ -311,9 +317,11 @@
}
getWatchData(this.listQuery).then((response) => {
this.list = response.data.rows.map(function(item) {
- item.areaFullName = item.areaFullName
- .replace('/', '')
- .replace('顶层', '')
+ item.totalCount = parseFloat(item.totalCount).toFixed(2)
+ item.dayCount = parseFloat(item.dayCount).toFixed(2)
+ item.monthCount = parseFloat(item.monthCount).toFixed(2)
+ item.pressure = parseFloat(item.pressure).toFixed(2)
+ item.areaFullName = item.areaFullName.replace('/', '').replace('顶层', '')
return item
})
this.total = parseInt(response.data.total)
diff --git a/src/views/dataManage/deviceData/waterHistory.vue b/src/views/dataManage/deviceData/waterHistory.vue
index 160dab7..42e3303 100644
--- a/src/views/dataManage/deviceData/waterHistory.vue
+++ b/src/views/dataManage/deviceData/waterHistory.vue
@@ -1,5 +1,5 @@
-
+
+
+
+
+
+
+ 搜索
+
+
+
+
+
+
+
+ 导出记录
+
+
+
+
+
+
+ {{
+ scope.row[column.value]
+ }}
+ {{
+ scope.row["areaFullName"] + '/' + scope.row[column.value]
+ }}
+ {{ scope.row[column.value] }}
+
+
+
+
+
+ 历史数据
+
+
+
+
+
+
+ 数据列表
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/AlarmNowList.vue b/src/views/gasDashboard/components/AlarmNowList.vue
new file mode 100644
index 0000000..890325f
--- /dev/null
+++ b/src/views/gasDashboard/components/AlarmNowList.vue
@@ -0,0 +1,35 @@
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/DeviceCount.vue b/src/views/gasDashboard/components/DeviceCount.vue
new file mode 100644
index 0000000..bffc9e9
--- /dev/null
+++ b/src/views/gasDashboard/components/DeviceCount.vue
@@ -0,0 +1,68 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/FunctionArea.vue b/src/views/gasDashboard/components/FunctionArea.vue
new file mode 100644
index 0000000..6401557
--- /dev/null
+++ b/src/views/gasDashboard/components/FunctionArea.vue
@@ -0,0 +1,140 @@
+
+
+
+ 本年度
+ 本季度
+ 近30日
+ 近7日
+ 今日
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/FunctionArea2.vue b/src/views/gasDashboard/components/FunctionArea2.vue
new file mode 100644
index 0000000..26a9f82
--- /dev/null
+++ b/src/views/gasDashboard/components/FunctionArea2.vue
@@ -0,0 +1,107 @@
+
+
+
+ 本年度
+ 本季度
+ 近30日
+ 近7日
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/PanelGroup.vue b/src/views/gasDashboard/components/PanelGroup.vue
new file mode 100644
index 0000000..103486e
--- /dev/null
+++ b/src/views/gasDashboard/components/PanelGroup.vue
@@ -0,0 +1,137 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/alarmLeakCountPie.vue b/src/views/gasDashboard/components/alarmLeakCountPie.vue
new file mode 100644
index 0000000..abfbc2d
--- /dev/null
+++ b/src/views/gasDashboard/components/alarmLeakCountPie.vue
@@ -0,0 +1,74 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/corrodeCountByDay.vue b/src/views/gasDashboard/components/corrodeCountByDay.vue
new file mode 100644
index 0000000..a410f29
--- /dev/null
+++ b/src/views/gasDashboard/components/corrodeCountByDay.vue
@@ -0,0 +1,100 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasAlarmTrend.vue b/src/views/gasDashboard/components/gasAlarmTrend.vue
new file mode 100644
index 0000000..a1d422e
--- /dev/null
+++ b/src/views/gasDashboard/components/gasAlarmTrend.vue
@@ -0,0 +1,100 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasCompare.vue b/src/views/gasDashboard/components/gasCompare.vue
new file mode 100644
index 0000000..19a4398
--- /dev/null
+++ b/src/views/gasDashboard/components/gasCompare.vue
@@ -0,0 +1,121 @@
+
+
+
+
+
+
+
+
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/index.js b/config/index.js
index 106eaa6..30dda44 100644
--- a/config/index.js
+++ b/config/index.js
@@ -33,7 +33,7 @@
// Use Eslint Loader?
// If true, your code will be linted during bundling and
// linting errors and warnings will be shown in the console.
- useEslint: true,
+ useEslint: false,
// If true, eslint errors and warnings will also be shown in the error overlay
// in the browser.
showEslintErrorsInOverlay: false,
diff --git a/config/prod.env.js b/config/prod.env.js
index 3455ce7..bb20d1d 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -3,5 +3,6 @@
NODE_ENV: '"production"',
// BASE_API: '"http://111.198.10.15:11304"',
// BASE_API: '"http://42.81.160.165:2022/smartwell/"',
- BASE_API: '"http://111.198.10.15:11409/smartwell"' //11643
+ // BASE_API: '"http://111.198.10.15:11409/smartwell"' //11643
+ BASE_API: '"http://111.198.10.15:20104"' //11643
}
diff --git a/package.json b/package.json
index be3e56e..a60e7b3 100644
--- a/package.json
+++ b/package.json
@@ -86,7 +86,7 @@
"vue-template-compiler": "2.5.17",
"webpack": "4.16.5",
"webpack-bundle-analyzer": "2.13.1",
- "webpack-cli": "3.1.0",
+ "webpack-cli": "^3.1.0",
"webpack-dev-server": "3.1.14",
"webpack-merge": "4.1.4"
},
diff --git a/src/App.vue b/src/App.vue
index 721d3a3..ec9032c 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,6 +1,6 @@
-
diff --git a/src/api/dashboard.js b/src/api/dashboard.js
index aaadb23..6f56e28 100644
--- a/src/api/dashboard.js
+++ b/src/api/dashboard.js
@@ -79,11 +79,10 @@
})
}
-
// 用水事记查询
-export function getNoteList() {
+export function getNoteList(type) {
return request({
- url: '/note/list',
+ url: '/note/list/' + type,
method: 'get'
})
}
@@ -92,7 +91,6 @@
export function updateNoteList(data) {
return request({
url: '/note/edit',
- // url: 'waterMeterData/count',
method: 'post',
data
})
diff --git a/src/api/data.js b/src/api/data.js
index b7c9ba2..65c5071 100644
--- a/src/api/data.js
+++ b/src/api/data.js
@@ -85,6 +85,22 @@
params
})
}
+// 气体流量计数据查询
+export function getGasflowData(params) {
+ return request({
+ url: 'gasflow/list',
+ method: 'get',
+ params
+ })
+}
+// 腐蚀速率监测仪数据查询
+export function getCorrodeData(params) {
+ return request({
+ url: 'corrode/data/list',
+ method: 'get',
+ params
+ })
+}
// 批量导出井盖数据
export function batchExportWellData(params) {
@@ -183,6 +199,26 @@
responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
})
}
+// 腐蚀速率监测仪数据导出
+export function batchExportCorrodeData(params) {
+ return request({
+ url: 'corrode/data/export',
+ method: 'get',
+ timeout: 120000, // 120s，2分钟
+ params,
+ responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+ })
+}
+// 气体流量计数据导出
+export function batchExportGasflowData(params) {
+ return request({
+ url: 'gasflow/data/export',
+ method: 'get',
+ timeout: 120000, // 120s，2分钟
+ params,
+ responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+ })
+}
// 温度压力数据查询
export function getTempPressData(params) {
diff --git a/src/api/device.js b/src/api/device.js
index 00804fe..edcc1a4 100644
--- a/src/api/device.js
+++ b/src/api/device.js
@@ -100,4 +100,11 @@
params
})
}
+export function totalDataGasFlow(params) {
+ return request({
+ url: 'gasflow/listByDevice',
+ method: 'post',
+ params
+ })
+}
diff --git a/src/api/gasOverview.js b/src/api/gasOverview.js
new file mode 100644
index 0000000..0dc3442
--- /dev/null
+++ b/src/api/gasOverview.js
@@ -0,0 +1,173 @@
+/**
+ * 动力管线
+ */
+import request from '@/utils/request'
+
+// 用水量、噪声统计数据
+export function gasStatistic() {
+ return request({
+ url: 'gasStatistic/overview',
+ method: 'get'
+ })
+}
+
+// 用水量、噪声统计数据
+export function gasStatistic2(deviceType) {
+ return request({
+ url: 'gas/statistics/used',
+ method: 'get',
+ params: {
+ deviceType: deviceType
+ }
+ })
+}
+
+// 气体用气量走势图
+export function gasTrend(params) {
+ return request({
+ url: '/gas/statistics/trend',
+ method: 'get',
+ params
+ })
+}
+// 用气量超量报警统计
+export function gasAlarmTrend(params) {
+ return request({
+ url: '/gas/alarm/trend',
+ method: 'get',
+ params
+ })
+}
+// 各设备气体用气量
+export function gasUsed(params) {
+ return request({
+ url: '/gas/used',
+ method: 'get',
+ params
+ })
+}
+// 气体泄漏监测结果
+export function gasLeakStatus(params) {
+ return request({
+ url: 'gas/leakage/rate',
+ method: 'get',
+ params
+ })
+}
+
+// 气体流量计数量
+export function deviceCount(type) {
+ return request({
+ url: 'device/count/' + type,
+ method: 'get'
+ })
+}
+
+// 统计当前报警数
+export function alarmNowStatic(params) {
+ return request({
+ url: 'statics/alarmsNow',
+ method: 'get',
+ params
+ })
+}
+
+// 查询二级分区各区用气量
+export function countBySecondArea(params) {
+ return request({
+ url: 'gasStatistic/countBySecondArea',
+ method: 'get',
+ params
+ })
+}
+
+// 查询二级分区7日用气量
+export function countByDaySecond(params) {
+ return request({
+ url: 'gasStatistic/countByDay',
+ method: 'get',
+ params
+ })
+}
+// 查询二级分区燃气告警
+export function gasAlarmBySecondArea(params) {
+ return request({
+ url: 'gas/alarm/rate',
+ method: 'get',
+ params
+ })
+}
+// 各设备腐蚀速率统计
+export function corrRateByDevice(params) {
+ return request({
+ url: 'corrode/data/corrRateByDevice',
+ method: 'get',
+ params
+ })
+}
+// 查询二级分区用气对比
+export function gasCompareData(params) {
+ return request({
+ url: 'gasStatistic/gasCompare',
+ method: 'get',
+ params
+ })
+}
+
+// 根据设备类型统计设备数量
+export function deviceStaticsByType(params) {
+ return request({
+ url: 'statics/deviceStaticsByType',
+ method: 'get',
+ params
+ })
+}
+
+// 查询二级分区气体流量计告警
+export function alarmBySecondArea(params) {
+ return request({
+ url: 'gasStatistic/alarmBySecondArea',
+ method: 'get',
+ params
+ })
+}
+
+// 用气事记查询
+export function getNoteList(type) {
+ return request({
+ url: '/note/list/' + type,
+ // url: '/note/list',
+ method: 'get'
+ })
+}
+
+// 用气事记更新
+export function updateNoteList(data) {
+ return request({
+ url: '/note/edit',
+ method: 'post',
+ data
+ })
+}
+
+// 获取报警列表
+export function getAlarmsNow(params) {
+ return request({
+ url: 'overview/alarmNow',
+ method: 'get',
+ params
+ })
+}
+
+// 总览marker（真接口）
+export function getMapping(devType, keywords) {
+ return request({
+ url: 'overview/wellMapping',
+ method: 'get',
+ params: {
+ keywords: keywords,
+ devType: devType
+ }
+ })
+}
+
diff --git a/src/components/BigData/Card/index.vue b/src/components/BigData/Card/index.vue
index 8320d47..8944b44 100644
--- a/src/components/BigData/Card/index.vue
+++ b/src/components/BigData/Card/index.vue
@@ -10,7 +10,7 @@
{{ context }}
- {{unit}}
+ {{ unit }}
-
-
-
- {{ title[0] }} {{ context[0] }}{{unit}}
-
-
- {{ title[1] }} {{ context[1] }}{{unit}}
+
+
@@ -41,9 +41,9 @@
type: String,
default: '#40c9c6'
},
- unit:{
+ unit: {
type: String,
- default:''
+ default: ''
}
},
computed: {
diff --git a/src/components/BigData/Card1/index.vue b/src/components/BigData/Card1/index.vue
index 722c24c..c9ec32d 100644
--- a/src/components/BigData/Card1/index.vue
+++ b/src/components/BigData/Card1/index.vue
@@ -4,30 +4,20 @@
-
-
+
-
-
@@ -28,7 +29,7 @@
- 导出记录
+ 导出记录
@@ -63,6 +64,7 @@
import { getGasData, batchExportGasData } from '@/api/data'
import DeptSelect from '../../../components/DeptSelect/index'
import { parseUrl } from '@/utils/parseutils'
+import { getSearchLastWeekTime } from '@/utils/dateutils'
export default {
name: 'ListGasData',
@@ -163,6 +165,7 @@
if (params && params.deviceType === '4' && params.devcode) {
this.listQuery.keywords = params.devcode
}
+ this.timeRange = getSearchLastWeekTime()
this.fetchData()
}
},
@@ -191,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/listGasflowData.vue b/src/views/dataManage/deviceData/listGasflowData.vue
new file mode 100644
index 0000000..9c5321a
--- /dev/null
+++ b/src/views/dataManage/deviceData/listGasflowData.vue
@@ -0,0 +1,311 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/alarmGasCountByType.vue b/src/views/gasDashboard/components/alarmGasCountByType.vue
new file mode 100644
index 0000000..4f80d3a
--- /dev/null
+++ b/src/views/gasDashboard/components/alarmGasCountByType.vue
@@ -0,0 +1,72 @@
+
+
+
+
-
+ {{ name }} {{ context[index] }}{{ unit }}
+
@@ -36,46 +26,46 @@
diff --git a/src/views/dataManage/deviceData/listCorrodeData.vue b/src/views/dataManage/deviceData/listCorrodeData.vue
new file mode 100644
index 0000000..1a20abb
--- /dev/null
+++ b/src/views/dataManage/deviceData/listCorrodeData.vue
@@ -0,0 +1,272 @@
+
+
{{ title[0] }}
- {{ context[0] }}{{unit}}
+ {{ context[0] }}{{ unit }}
+
+
+
+
+
+
+
diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue
index 97cdfdb..40b9a5e 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -5,10 +5,10 @@
+
+
+
+
+
+
+ 搜索
+
+
+
+
+
+
+
+ 导出记录
+
+
+
+
+
+
+ {{ scope.row[column.value] }}
+ {{ scope.row[column.value] }}
+
+
+
+
+
+ 数据列表
+
+ 数据列表
+
+
+
+
+
+
+
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 bf03fd1..dffd340 100644
--- a/src/views/dataManage/deviceData/listWaterData.vue
+++ b/src/views/dataManage/deviceData/listWaterData.vue
@@ -176,6 +176,12 @@
align: 'center'
},
{
+ text: '压力(Mpa)',
+ value: 'pressure',
+ width: 90,
+ align: 'center'
+ },
+ {
text: '今日用水量（立方米）',
value: 'dayCount',
align: 'center',
@@ -276,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) // 下载完成移除元素
@@ -311,9 +317,11 @@
}
getWatchData(this.listQuery).then((response) => {
this.list = response.data.rows.map(function(item) {
- item.areaFullName = item.areaFullName
- .replace('/', '')
- .replace('顶层', '')
+ item.totalCount = parseFloat(item.totalCount).toFixed(2)
+ item.dayCount = parseFloat(item.dayCount).toFixed(2)
+ item.monthCount = parseFloat(item.monthCount).toFixed(2)
+ item.pressure = parseFloat(item.pressure).toFixed(2)
+ item.areaFullName = item.areaFullName.replace('/', '').replace('顶层', '')
return item
})
this.total = parseInt(response.data.total)
diff --git a/src/views/dataManage/deviceData/waterHistory.vue b/src/views/dataManage/deviceData/waterHistory.vue
index 160dab7..42e3303 100644
--- a/src/views/dataManage/deviceData/waterHistory.vue
+++ b/src/views/dataManage/deviceData/waterHistory.vue
@@ -1,5 +1,5 @@
-
+
+
+
+
+
+
+ 搜索
+
+
+
+
+
+
+
+ 导出记录
+
+
+
+
+
+
+ {{
+ scope.row[column.value]
+ }}
+ {{
+ scope.row["areaFullName"] + '/' + scope.row[column.value]
+ }}
+ {{ scope.row[column.value] }}
+
+
+
+
+
+ 历史数据
+
+
+
+
+
+
+ 数据列表
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/AlarmNowList.vue b/src/views/gasDashboard/components/AlarmNowList.vue
new file mode 100644
index 0000000..890325f
--- /dev/null
+++ b/src/views/gasDashboard/components/AlarmNowList.vue
@@ -0,0 +1,35 @@
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/DeviceCount.vue b/src/views/gasDashboard/components/DeviceCount.vue
new file mode 100644
index 0000000..bffc9e9
--- /dev/null
+++ b/src/views/gasDashboard/components/DeviceCount.vue
@@ -0,0 +1,68 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/FunctionArea.vue b/src/views/gasDashboard/components/FunctionArea.vue
new file mode 100644
index 0000000..6401557
--- /dev/null
+++ b/src/views/gasDashboard/components/FunctionArea.vue
@@ -0,0 +1,140 @@
+
+
+
+ 本年度
+ 本季度
+ 近30日
+ 近7日
+ 今日
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/FunctionArea2.vue b/src/views/gasDashboard/components/FunctionArea2.vue
new file mode 100644
index 0000000..26a9f82
--- /dev/null
+++ b/src/views/gasDashboard/components/FunctionArea2.vue
@@ -0,0 +1,107 @@
+
+
+
+ 本年度
+ 本季度
+ 近30日
+ 近7日
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/PanelGroup.vue b/src/views/gasDashboard/components/PanelGroup.vue
new file mode 100644
index 0000000..103486e
--- /dev/null
+++ b/src/views/gasDashboard/components/PanelGroup.vue
@@ -0,0 +1,137 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/alarmLeakCountPie.vue b/src/views/gasDashboard/components/alarmLeakCountPie.vue
new file mode 100644
index 0000000..abfbc2d
--- /dev/null
+++ b/src/views/gasDashboard/components/alarmLeakCountPie.vue
@@ -0,0 +1,74 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/corrodeCountByDay.vue b/src/views/gasDashboard/components/corrodeCountByDay.vue
new file mode 100644
index 0000000..a410f29
--- /dev/null
+++ b/src/views/gasDashboard/components/corrodeCountByDay.vue
@@ -0,0 +1,100 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasAlarmTrend.vue b/src/views/gasDashboard/components/gasAlarmTrend.vue
new file mode 100644
index 0000000..a1d422e
--- /dev/null
+++ b/src/views/gasDashboard/components/gasAlarmTrend.vue
@@ -0,0 +1,100 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasCompare.vue b/src/views/gasDashboard/components/gasCompare.vue
new file mode 100644
index 0000000..19a4398
--- /dev/null
+++ b/src/views/gasDashboard/components/gasCompare.vue
@@ -0,0 +1,121 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasCountByAreaBar.vue b/src/views/gasDashboard/components/gasCountByAreaBar.vue
new file mode 100644
index 0000000..456a6c6
--- /dev/null
+++ b/src/views/gasDashboard/components/gasCountByAreaBar.vue
@@ -0,0 +1,198 @@
+
+
+
+
+
+
+
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/index.js b/config/index.js
index 106eaa6..30dda44 100644
--- a/config/index.js
+++ b/config/index.js
@@ -33,7 +33,7 @@
// Use Eslint Loader?
// If true, your code will be linted during bundling and
// linting errors and warnings will be shown in the console.
- useEslint: true,
+ useEslint: false,
// If true, eslint errors and warnings will also be shown in the error overlay
// in the browser.
showEslintErrorsInOverlay: false,
diff --git a/config/prod.env.js b/config/prod.env.js
index 3455ce7..bb20d1d 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -3,5 +3,6 @@
NODE_ENV: '"production"',
// BASE_API: '"http://111.198.10.15:11304"',
// BASE_API: '"http://42.81.160.165:2022/smartwell/"',
- BASE_API: '"http://111.198.10.15:11409/smartwell"' //11643
+ // BASE_API: '"http://111.198.10.15:11409/smartwell"' //11643
+ BASE_API: '"http://111.198.10.15:20104"' //11643
}
diff --git a/package.json b/package.json
index be3e56e..a60e7b3 100644
--- a/package.json
+++ b/package.json
@@ -86,7 +86,7 @@
"vue-template-compiler": "2.5.17",
"webpack": "4.16.5",
"webpack-bundle-analyzer": "2.13.1",
- "webpack-cli": "3.1.0",
+ "webpack-cli": "^3.1.0",
"webpack-dev-server": "3.1.14",
"webpack-merge": "4.1.4"
},
diff --git a/src/App.vue b/src/App.vue
index 721d3a3..ec9032c 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,6 +1,6 @@
-
diff --git a/src/api/dashboard.js b/src/api/dashboard.js
index aaadb23..6f56e28 100644
--- a/src/api/dashboard.js
+++ b/src/api/dashboard.js
@@ -79,11 +79,10 @@
})
}
-
// 用水事记查询
-export function getNoteList() {
+export function getNoteList(type) {
return request({
- url: '/note/list',
+ url: '/note/list/' + type,
method: 'get'
})
}
@@ -92,7 +91,6 @@
export function updateNoteList(data) {
return request({
url: '/note/edit',
- // url: 'waterMeterData/count',
method: 'post',
data
})
diff --git a/src/api/data.js b/src/api/data.js
index b7c9ba2..65c5071 100644
--- a/src/api/data.js
+++ b/src/api/data.js
@@ -85,6 +85,22 @@
params
})
}
+// 气体流量计数据查询
+export function getGasflowData(params) {
+ return request({
+ url: 'gasflow/list',
+ method: 'get',
+ params
+ })
+}
+// 腐蚀速率监测仪数据查询
+export function getCorrodeData(params) {
+ return request({
+ url: 'corrode/data/list',
+ method: 'get',
+ params
+ })
+}
// 批量导出井盖数据
export function batchExportWellData(params) {
@@ -183,6 +199,26 @@
responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
})
}
+// 腐蚀速率监测仪数据导出
+export function batchExportCorrodeData(params) {
+ return request({
+ url: 'corrode/data/export',
+ method: 'get',
+ timeout: 120000, // 120s，2分钟
+ params,
+ responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+ })
+}
+// 气体流量计数据导出
+export function batchExportGasflowData(params) {
+ return request({
+ url: 'gasflow/data/export',
+ method: 'get',
+ timeout: 120000, // 120s，2分钟
+ params,
+ responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+ })
+}
// 温度压力数据查询
export function getTempPressData(params) {
diff --git a/src/api/device.js b/src/api/device.js
index 00804fe..edcc1a4 100644
--- a/src/api/device.js
+++ b/src/api/device.js
@@ -100,4 +100,11 @@
params
})
}
+export function totalDataGasFlow(params) {
+ return request({
+ url: 'gasflow/listByDevice',
+ method: 'post',
+ params
+ })
+}
diff --git a/src/api/gasOverview.js b/src/api/gasOverview.js
new file mode 100644
index 0000000..0dc3442
--- /dev/null
+++ b/src/api/gasOverview.js
@@ -0,0 +1,173 @@
+/**
+ * 动力管线
+ */
+import request from '@/utils/request'
+
+// 用水量、噪声统计数据
+export function gasStatistic() {
+ return request({
+ url: 'gasStatistic/overview',
+ method: 'get'
+ })
+}
+
+// 用水量、噪声统计数据
+export function gasStatistic2(deviceType) {
+ return request({
+ url: 'gas/statistics/used',
+ method: 'get',
+ params: {
+ deviceType: deviceType
+ }
+ })
+}
+
+// 气体用气量走势图
+export function gasTrend(params) {
+ return request({
+ url: '/gas/statistics/trend',
+ method: 'get',
+ params
+ })
+}
+// 用气量超量报警统计
+export function gasAlarmTrend(params) {
+ return request({
+ url: '/gas/alarm/trend',
+ method: 'get',
+ params
+ })
+}
+// 各设备气体用气量
+export function gasUsed(params) {
+ return request({
+ url: '/gas/used',
+ method: 'get',
+ params
+ })
+}
+// 气体泄漏监测结果
+export function gasLeakStatus(params) {
+ return request({
+ url: 'gas/leakage/rate',
+ method: 'get',
+ params
+ })
+}
+
+// 气体流量计数量
+export function deviceCount(type) {
+ return request({
+ url: 'device/count/' + type,
+ method: 'get'
+ })
+}
+
+// 统计当前报警数
+export function alarmNowStatic(params) {
+ return request({
+ url: 'statics/alarmsNow',
+ method: 'get',
+ params
+ })
+}
+
+// 查询二级分区各区用气量
+export function countBySecondArea(params) {
+ return request({
+ url: 'gasStatistic/countBySecondArea',
+ method: 'get',
+ params
+ })
+}
+
+// 查询二级分区7日用气量
+export function countByDaySecond(params) {
+ return request({
+ url: 'gasStatistic/countByDay',
+ method: 'get',
+ params
+ })
+}
+// 查询二级分区燃气告警
+export function gasAlarmBySecondArea(params) {
+ return request({
+ url: 'gas/alarm/rate',
+ method: 'get',
+ params
+ })
+}
+// 各设备腐蚀速率统计
+export function corrRateByDevice(params) {
+ return request({
+ url: 'corrode/data/corrRateByDevice',
+ method: 'get',
+ params
+ })
+}
+// 查询二级分区用气对比
+export function gasCompareData(params) {
+ return request({
+ url: 'gasStatistic/gasCompare',
+ method: 'get',
+ params
+ })
+}
+
+// 根据设备类型统计设备数量
+export function deviceStaticsByType(params) {
+ return request({
+ url: 'statics/deviceStaticsByType',
+ method: 'get',
+ params
+ })
+}
+
+// 查询二级分区气体流量计告警
+export function alarmBySecondArea(params) {
+ return request({
+ url: 'gasStatistic/alarmBySecondArea',
+ method: 'get',
+ params
+ })
+}
+
+// 用气事记查询
+export function getNoteList(type) {
+ return request({
+ url: '/note/list/' + type,
+ // url: '/note/list',
+ method: 'get'
+ })
+}
+
+// 用气事记更新
+export function updateNoteList(data) {
+ return request({
+ url: '/note/edit',
+ method: 'post',
+ data
+ })
+}
+
+// 获取报警列表
+export function getAlarmsNow(params) {
+ return request({
+ url: 'overview/alarmNow',
+ method: 'get',
+ params
+ })
+}
+
+// 总览marker（真接口）
+export function getMapping(devType, keywords) {
+ return request({
+ url: 'overview/wellMapping',
+ method: 'get',
+ params: {
+ keywords: keywords,
+ devType: devType
+ }
+ })
+}
+
diff --git a/src/components/BigData/Card/index.vue b/src/components/BigData/Card/index.vue
index 8320d47..8944b44 100644
--- a/src/components/BigData/Card/index.vue
+++ b/src/components/BigData/Card/index.vue
@@ -10,7 +10,7 @@
{{ context }}
- {{unit}}
+ {{ unit }}
-
-
-
- {{ title[0] }} {{ context[0] }}{{unit}}
-
-
- {{ title[1] }} {{ context[1] }}{{unit}}
+
+
@@ -41,9 +41,9 @@
type: String,
default: '#40c9c6'
},
- unit:{
+ unit: {
type: String,
- default:''
+ default: ''
}
},
computed: {
diff --git a/src/components/BigData/Card1/index.vue b/src/components/BigData/Card1/index.vue
index 722c24c..c9ec32d 100644
--- a/src/components/BigData/Card1/index.vue
+++ b/src/components/BigData/Card1/index.vue
@@ -4,30 +4,20 @@
-
-
+
-
-
@@ -28,7 +29,7 @@
- 导出记录
+ 导出记录
@@ -63,6 +64,7 @@
import { getGasData, batchExportGasData } from '@/api/data'
import DeptSelect from '../../../components/DeptSelect/index'
import { parseUrl } from '@/utils/parseutils'
+import { getSearchLastWeekTime } from '@/utils/dateutils'
export default {
name: 'ListGasData',
@@ -163,6 +165,7 @@
if (params && params.deviceType === '4' && params.devcode) {
this.listQuery.keywords = params.devcode
}
+ this.timeRange = getSearchLastWeekTime()
this.fetchData()
}
},
@@ -191,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/listGasflowData.vue b/src/views/dataManage/deviceData/listGasflowData.vue
new file mode 100644
index 0000000..9c5321a
--- /dev/null
+++ b/src/views/dataManage/deviceData/listGasflowData.vue
@@ -0,0 +1,311 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/alarmGasCountByType.vue b/src/views/gasDashboard/components/alarmGasCountByType.vue
new file mode 100644
index 0000000..4f80d3a
--- /dev/null
+++ b/src/views/gasDashboard/components/alarmGasCountByType.vue
@@ -0,0 +1,72 @@
+
+
+
+
-
+ {{ name }} {{ context[index] }}{{ unit }}
+
@@ -36,46 +26,46 @@
diff --git a/src/views/dataManage/deviceData/listCorrodeData.vue b/src/views/dataManage/deviceData/listCorrodeData.vue
new file mode 100644
index 0000000..1a20abb
--- /dev/null
+++ b/src/views/dataManage/deviceData/listCorrodeData.vue
@@ -0,0 +1,272 @@
+
+
{{ title[0] }}
- {{ context[0] }}{{unit}}
+ {{ context[0] }}{{ unit }}
+
+
+
+
+
+
+
diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue
index 97cdfdb..40b9a5e 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -5,10 +5,10 @@
+
+
+
+
+
+
+ 搜索
+
+
+
+
+
+
+
+ 导出记录
+
+
+
+
+
+
+ {{ scope.row[column.value] }}
+ {{ scope.row[column.value] }}
+
+
+
+
+
+ 数据列表
+
+ 数据列表
+
+
+
+
+
+
+
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 bf03fd1..dffd340 100644
--- a/src/views/dataManage/deviceData/listWaterData.vue
+++ b/src/views/dataManage/deviceData/listWaterData.vue
@@ -176,6 +176,12 @@
align: 'center'
},
{
+ text: '压力(Mpa)',
+ value: 'pressure',
+ width: 90,
+ align: 'center'
+ },
+ {
text: '今日用水量（立方米）',
value: 'dayCount',
align: 'center',
@@ -276,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) // 下载完成移除元素
@@ -311,9 +317,11 @@
}
getWatchData(this.listQuery).then((response) => {
this.list = response.data.rows.map(function(item) {
- item.areaFullName = item.areaFullName
- .replace('/', '')
- .replace('顶层', '')
+ item.totalCount = parseFloat(item.totalCount).toFixed(2)
+ item.dayCount = parseFloat(item.dayCount).toFixed(2)
+ item.monthCount = parseFloat(item.monthCount).toFixed(2)
+ item.pressure = parseFloat(item.pressure).toFixed(2)
+ item.areaFullName = item.areaFullName.replace('/', '').replace('顶层', '')
return item
})
this.total = parseInt(response.data.total)
diff --git a/src/views/dataManage/deviceData/waterHistory.vue b/src/views/dataManage/deviceData/waterHistory.vue
index 160dab7..42e3303 100644
--- a/src/views/dataManage/deviceData/waterHistory.vue
+++ b/src/views/dataManage/deviceData/waterHistory.vue
@@ -1,5 +1,5 @@
-
+
+
+
+
+
+
+ 搜索
+
+
+
+
+
+
+
+ 导出记录
+
+
+
+
+
+
+ {{
+ scope.row[column.value]
+ }}
+ {{
+ scope.row["areaFullName"] + '/' + scope.row[column.value]
+ }}
+ {{ scope.row[column.value] }}
+
+
+
+
+
+ 历史数据
+
+
+
+
+
+
+ 数据列表
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/AlarmNowList.vue b/src/views/gasDashboard/components/AlarmNowList.vue
new file mode 100644
index 0000000..890325f
--- /dev/null
+++ b/src/views/gasDashboard/components/AlarmNowList.vue
@@ -0,0 +1,35 @@
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/DeviceCount.vue b/src/views/gasDashboard/components/DeviceCount.vue
new file mode 100644
index 0000000..bffc9e9
--- /dev/null
+++ b/src/views/gasDashboard/components/DeviceCount.vue
@@ -0,0 +1,68 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/FunctionArea.vue b/src/views/gasDashboard/components/FunctionArea.vue
new file mode 100644
index 0000000..6401557
--- /dev/null
+++ b/src/views/gasDashboard/components/FunctionArea.vue
@@ -0,0 +1,140 @@
+
+
+
+ 本年度
+ 本季度
+ 近30日
+ 近7日
+ 今日
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/FunctionArea2.vue b/src/views/gasDashboard/components/FunctionArea2.vue
new file mode 100644
index 0000000..26a9f82
--- /dev/null
+++ b/src/views/gasDashboard/components/FunctionArea2.vue
@@ -0,0 +1,107 @@
+
+
+
+ 本年度
+ 本季度
+ 近30日
+ 近7日
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/PanelGroup.vue b/src/views/gasDashboard/components/PanelGroup.vue
new file mode 100644
index 0000000..103486e
--- /dev/null
+++ b/src/views/gasDashboard/components/PanelGroup.vue
@@ -0,0 +1,137 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/alarmLeakCountPie.vue b/src/views/gasDashboard/components/alarmLeakCountPie.vue
new file mode 100644
index 0000000..abfbc2d
--- /dev/null
+++ b/src/views/gasDashboard/components/alarmLeakCountPie.vue
@@ -0,0 +1,74 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/corrodeCountByDay.vue b/src/views/gasDashboard/components/corrodeCountByDay.vue
new file mode 100644
index 0000000..a410f29
--- /dev/null
+++ b/src/views/gasDashboard/components/corrodeCountByDay.vue
@@ -0,0 +1,100 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasAlarmTrend.vue b/src/views/gasDashboard/components/gasAlarmTrend.vue
new file mode 100644
index 0000000..a1d422e
--- /dev/null
+++ b/src/views/gasDashboard/components/gasAlarmTrend.vue
@@ -0,0 +1,100 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasCompare.vue b/src/views/gasDashboard/components/gasCompare.vue
new file mode 100644
index 0000000..19a4398
--- /dev/null
+++ b/src/views/gasDashboard/components/gasCompare.vue
@@ -0,0 +1,121 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasCountByAreaBar.vue b/src/views/gasDashboard/components/gasCountByAreaBar.vue
new file mode 100644
index 0000000..456a6c6
--- /dev/null
+++ b/src/views/gasDashboard/components/gasCountByAreaBar.vue
@@ -0,0 +1,198 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasCountByDay.vue b/src/views/gasDashboard/components/gasCountByDay.vue
new file mode 100644
index 0000000..f0a3977
--- /dev/null
+++ b/src/views/gasDashboard/components/gasCountByDay.vue
@@ -0,0 +1,114 @@
+
+
+
+
+
+
+
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/index.js b/config/index.js
index 106eaa6..30dda44 100644
--- a/config/index.js
+++ b/config/index.js
@@ -33,7 +33,7 @@
// Use Eslint Loader?
// If true, your code will be linted during bundling and
// linting errors and warnings will be shown in the console.
- useEslint: true,
+ useEslint: false,
// If true, eslint errors and warnings will also be shown in the error overlay
// in the browser.
showEslintErrorsInOverlay: false,
diff --git a/config/prod.env.js b/config/prod.env.js
index 3455ce7..bb20d1d 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -3,5 +3,6 @@
NODE_ENV: '"production"',
// BASE_API: '"http://111.198.10.15:11304"',
// BASE_API: '"http://42.81.160.165:2022/smartwell/"',
- BASE_API: '"http://111.198.10.15:11409/smartwell"' //11643
+ // BASE_API: '"http://111.198.10.15:11409/smartwell"' //11643
+ BASE_API: '"http://111.198.10.15:20104"' //11643
}
diff --git a/package.json b/package.json
index be3e56e..a60e7b3 100644
--- a/package.json
+++ b/package.json
@@ -86,7 +86,7 @@
"vue-template-compiler": "2.5.17",
"webpack": "4.16.5",
"webpack-bundle-analyzer": "2.13.1",
- "webpack-cli": "3.1.0",
+ "webpack-cli": "^3.1.0",
"webpack-dev-server": "3.1.14",
"webpack-merge": "4.1.4"
},
diff --git a/src/App.vue b/src/App.vue
index 721d3a3..ec9032c 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,6 +1,6 @@
-
diff --git a/src/api/dashboard.js b/src/api/dashboard.js
index aaadb23..6f56e28 100644
--- a/src/api/dashboard.js
+++ b/src/api/dashboard.js
@@ -79,11 +79,10 @@
})
}
-
// 用水事记查询
-export function getNoteList() {
+export function getNoteList(type) {
return request({
- url: '/note/list',
+ url: '/note/list/' + type,
method: 'get'
})
}
@@ -92,7 +91,6 @@
export function updateNoteList(data) {
return request({
url: '/note/edit',
- // url: 'waterMeterData/count',
method: 'post',
data
})
diff --git a/src/api/data.js b/src/api/data.js
index b7c9ba2..65c5071 100644
--- a/src/api/data.js
+++ b/src/api/data.js
@@ -85,6 +85,22 @@
params
})
}
+// 气体流量计数据查询
+export function getGasflowData(params) {
+ return request({
+ url: 'gasflow/list',
+ method: 'get',
+ params
+ })
+}
+// 腐蚀速率监测仪数据查询
+export function getCorrodeData(params) {
+ return request({
+ url: 'corrode/data/list',
+ method: 'get',
+ params
+ })
+}
// 批量导出井盖数据
export function batchExportWellData(params) {
@@ -183,6 +199,26 @@
responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
})
}
+// 腐蚀速率监测仪数据导出
+export function batchExportCorrodeData(params) {
+ return request({
+ url: 'corrode/data/export',
+ method: 'get',
+ timeout: 120000, // 120s，2分钟
+ params,
+ responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+ })
+}
+// 气体流量计数据导出
+export function batchExportGasflowData(params) {
+ return request({
+ url: 'gasflow/data/export',
+ method: 'get',
+ timeout: 120000, // 120s，2分钟
+ params,
+ responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+ })
+}
// 温度压力数据查询
export function getTempPressData(params) {
diff --git a/src/api/device.js b/src/api/device.js
index 00804fe..edcc1a4 100644
--- a/src/api/device.js
+++ b/src/api/device.js
@@ -100,4 +100,11 @@
params
})
}
+export function totalDataGasFlow(params) {
+ return request({
+ url: 'gasflow/listByDevice',
+ method: 'post',
+ params
+ })
+}
diff --git a/src/api/gasOverview.js b/src/api/gasOverview.js
new file mode 100644
index 0000000..0dc3442
--- /dev/null
+++ b/src/api/gasOverview.js
@@ -0,0 +1,173 @@
+/**
+ * 动力管线
+ */
+import request from '@/utils/request'
+
+// 用水量、噪声统计数据
+export function gasStatistic() {
+ return request({
+ url: 'gasStatistic/overview',
+ method: 'get'
+ })
+}
+
+// 用水量、噪声统计数据
+export function gasStatistic2(deviceType) {
+ return request({
+ url: 'gas/statistics/used',
+ method: 'get',
+ params: {
+ deviceType: deviceType
+ }
+ })
+}
+
+// 气体用气量走势图
+export function gasTrend(params) {
+ return request({
+ url: '/gas/statistics/trend',
+ method: 'get',
+ params
+ })
+}
+// 用气量超量报警统计
+export function gasAlarmTrend(params) {
+ return request({
+ url: '/gas/alarm/trend',
+ method: 'get',
+ params
+ })
+}
+// 各设备气体用气量
+export function gasUsed(params) {
+ return request({
+ url: '/gas/used',
+ method: 'get',
+ params
+ })
+}
+// 气体泄漏监测结果
+export function gasLeakStatus(params) {
+ return request({
+ url: 'gas/leakage/rate',
+ method: 'get',
+ params
+ })
+}
+
+// 气体流量计数量
+export function deviceCount(type) {
+ return request({
+ url: 'device/count/' + type,
+ method: 'get'
+ })
+}
+
+// 统计当前报警数
+export function alarmNowStatic(params) {
+ return request({
+ url: 'statics/alarmsNow',
+ method: 'get',
+ params
+ })
+}
+
+// 查询二级分区各区用气量
+export function countBySecondArea(params) {
+ return request({
+ url: 'gasStatistic/countBySecondArea',
+ method: 'get',
+ params
+ })
+}
+
+// 查询二级分区7日用气量
+export function countByDaySecond(params) {
+ return request({
+ url: 'gasStatistic/countByDay',
+ method: 'get',
+ params
+ })
+}
+// 查询二级分区燃气告警
+export function gasAlarmBySecondArea(params) {
+ return request({
+ url: 'gas/alarm/rate',
+ method: 'get',
+ params
+ })
+}
+// 各设备腐蚀速率统计
+export function corrRateByDevice(params) {
+ return request({
+ url: 'corrode/data/corrRateByDevice',
+ method: 'get',
+ params
+ })
+}
+// 查询二级分区用气对比
+export function gasCompareData(params) {
+ return request({
+ url: 'gasStatistic/gasCompare',
+ method: 'get',
+ params
+ })
+}
+
+// 根据设备类型统计设备数量
+export function deviceStaticsByType(params) {
+ return request({
+ url: 'statics/deviceStaticsByType',
+ method: 'get',
+ params
+ })
+}
+
+// 查询二级分区气体流量计告警
+export function alarmBySecondArea(params) {
+ return request({
+ url: 'gasStatistic/alarmBySecondArea',
+ method: 'get',
+ params
+ })
+}
+
+// 用气事记查询
+export function getNoteList(type) {
+ return request({
+ url: '/note/list/' + type,
+ // url: '/note/list',
+ method: 'get'
+ })
+}
+
+// 用气事记更新
+export function updateNoteList(data) {
+ return request({
+ url: '/note/edit',
+ method: 'post',
+ data
+ })
+}
+
+// 获取报警列表
+export function getAlarmsNow(params) {
+ return request({
+ url: 'overview/alarmNow',
+ method: 'get',
+ params
+ })
+}
+
+// 总览marker（真接口）
+export function getMapping(devType, keywords) {
+ return request({
+ url: 'overview/wellMapping',
+ method: 'get',
+ params: {
+ keywords: keywords,
+ devType: devType
+ }
+ })
+}
+
diff --git a/src/components/BigData/Card/index.vue b/src/components/BigData/Card/index.vue
index 8320d47..8944b44 100644
--- a/src/components/BigData/Card/index.vue
+++ b/src/components/BigData/Card/index.vue
@@ -10,7 +10,7 @@
{{ context }}
- {{unit}}
+ {{ unit }}
-
-
-
- {{ title[0] }} {{ context[0] }}{{unit}}
-
-
- {{ title[1] }} {{ context[1] }}{{unit}}
+
+
@@ -41,9 +41,9 @@
type: String,
default: '#40c9c6'
},
- unit:{
+ unit: {
type: String,
- default:''
+ default: ''
}
},
computed: {
diff --git a/src/components/BigData/Card1/index.vue b/src/components/BigData/Card1/index.vue
index 722c24c..c9ec32d 100644
--- a/src/components/BigData/Card1/index.vue
+++ b/src/components/BigData/Card1/index.vue
@@ -4,30 +4,20 @@
-
-
+
-
-
@@ -28,7 +29,7 @@
- 导出记录
+ 导出记录
@@ -63,6 +64,7 @@
import { getGasData, batchExportGasData } from '@/api/data'
import DeptSelect from '../../../components/DeptSelect/index'
import { parseUrl } from '@/utils/parseutils'
+import { getSearchLastWeekTime } from '@/utils/dateutils'
export default {
name: 'ListGasData',
@@ -163,6 +165,7 @@
if (params && params.deviceType === '4' && params.devcode) {
this.listQuery.keywords = params.devcode
}
+ this.timeRange = getSearchLastWeekTime()
this.fetchData()
}
},
@@ -191,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/listGasflowData.vue b/src/views/dataManage/deviceData/listGasflowData.vue
new file mode 100644
index 0000000..9c5321a
--- /dev/null
+++ b/src/views/dataManage/deviceData/listGasflowData.vue
@@ -0,0 +1,311 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/alarmGasCountByType.vue b/src/views/gasDashboard/components/alarmGasCountByType.vue
new file mode 100644
index 0000000..4f80d3a
--- /dev/null
+++ b/src/views/gasDashboard/components/alarmGasCountByType.vue
@@ -0,0 +1,72 @@
+
+
+
+
-
+ {{ name }} {{ context[index] }}{{ unit }}
+
@@ -36,46 +26,46 @@
diff --git a/src/views/dataManage/deviceData/listCorrodeData.vue b/src/views/dataManage/deviceData/listCorrodeData.vue
new file mode 100644
index 0000000..1a20abb
--- /dev/null
+++ b/src/views/dataManage/deviceData/listCorrodeData.vue
@@ -0,0 +1,272 @@
+
+
{{ title[0] }}
- {{ context[0] }}{{unit}}
+ {{ context[0] }}{{ unit }}
+
+
+
+
+
+
+
diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue
index 97cdfdb..40b9a5e 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -5,10 +5,10 @@
+
+
+
+
+
+
+ 搜索
+
+
+
+
+
+
+
+ 导出记录
+
+
+
+
+
+
+ {{ scope.row[column.value] }}
+ {{ scope.row[column.value] }}
+
+
+
+
+
+ 数据列表
+
+ 数据列表
+
+
+
+
+
+
+
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 bf03fd1..dffd340 100644
--- a/src/views/dataManage/deviceData/listWaterData.vue
+++ b/src/views/dataManage/deviceData/listWaterData.vue
@@ -176,6 +176,12 @@
align: 'center'
},
{
+ text: '压力(Mpa)',
+ value: 'pressure',
+ width: 90,
+ align: 'center'
+ },
+ {
text: '今日用水量（立方米）',
value: 'dayCount',
align: 'center',
@@ -276,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) // 下载完成移除元素
@@ -311,9 +317,11 @@
}
getWatchData(this.listQuery).then((response) => {
this.list = response.data.rows.map(function(item) {
- item.areaFullName = item.areaFullName
- .replace('/', '')
- .replace('顶层', '')
+ item.totalCount = parseFloat(item.totalCount).toFixed(2)
+ item.dayCount = parseFloat(item.dayCount).toFixed(2)
+ item.monthCount = parseFloat(item.monthCount).toFixed(2)
+ item.pressure = parseFloat(item.pressure).toFixed(2)
+ item.areaFullName = item.areaFullName.replace('/', '').replace('顶层', '')
return item
})
this.total = parseInt(response.data.total)
diff --git a/src/views/dataManage/deviceData/waterHistory.vue b/src/views/dataManage/deviceData/waterHistory.vue
index 160dab7..42e3303 100644
--- a/src/views/dataManage/deviceData/waterHistory.vue
+++ b/src/views/dataManage/deviceData/waterHistory.vue
@@ -1,5 +1,5 @@
-
+
+
+
+
+
+
+ 搜索
+
+
+
+
+
+
+
+ 导出记录
+
+
+
+
+
+
+ {{
+ scope.row[column.value]
+ }}
+ {{
+ scope.row["areaFullName"] + '/' + scope.row[column.value]
+ }}
+ {{ scope.row[column.value] }}
+
+
+
+
+
+ 历史数据
+
+
+
+
+
+
+ 数据列表
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/AlarmNowList.vue b/src/views/gasDashboard/components/AlarmNowList.vue
new file mode 100644
index 0000000..890325f
--- /dev/null
+++ b/src/views/gasDashboard/components/AlarmNowList.vue
@@ -0,0 +1,35 @@
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/DeviceCount.vue b/src/views/gasDashboard/components/DeviceCount.vue
new file mode 100644
index 0000000..bffc9e9
--- /dev/null
+++ b/src/views/gasDashboard/components/DeviceCount.vue
@@ -0,0 +1,68 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/FunctionArea.vue b/src/views/gasDashboard/components/FunctionArea.vue
new file mode 100644
index 0000000..6401557
--- /dev/null
+++ b/src/views/gasDashboard/components/FunctionArea.vue
@@ -0,0 +1,140 @@
+
+
+
+ 本年度
+ 本季度
+ 近30日
+ 近7日
+ 今日
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/FunctionArea2.vue b/src/views/gasDashboard/components/FunctionArea2.vue
new file mode 100644
index 0000000..26a9f82
--- /dev/null
+++ b/src/views/gasDashboard/components/FunctionArea2.vue
@@ -0,0 +1,107 @@
+
+
+
+ 本年度
+ 本季度
+ 近30日
+ 近7日
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/PanelGroup.vue b/src/views/gasDashboard/components/PanelGroup.vue
new file mode 100644
index 0000000..103486e
--- /dev/null
+++ b/src/views/gasDashboard/components/PanelGroup.vue
@@ -0,0 +1,137 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/alarmLeakCountPie.vue b/src/views/gasDashboard/components/alarmLeakCountPie.vue
new file mode 100644
index 0000000..abfbc2d
--- /dev/null
+++ b/src/views/gasDashboard/components/alarmLeakCountPie.vue
@@ -0,0 +1,74 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/corrodeCountByDay.vue b/src/views/gasDashboard/components/corrodeCountByDay.vue
new file mode 100644
index 0000000..a410f29
--- /dev/null
+++ b/src/views/gasDashboard/components/corrodeCountByDay.vue
@@ -0,0 +1,100 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasAlarmTrend.vue b/src/views/gasDashboard/components/gasAlarmTrend.vue
new file mode 100644
index 0000000..a1d422e
--- /dev/null
+++ b/src/views/gasDashboard/components/gasAlarmTrend.vue
@@ -0,0 +1,100 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasCompare.vue b/src/views/gasDashboard/components/gasCompare.vue
new file mode 100644
index 0000000..19a4398
--- /dev/null
+++ b/src/views/gasDashboard/components/gasCompare.vue
@@ -0,0 +1,121 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasCountByAreaBar.vue b/src/views/gasDashboard/components/gasCountByAreaBar.vue
new file mode 100644
index 0000000..456a6c6
--- /dev/null
+++ b/src/views/gasDashboard/components/gasCountByAreaBar.vue
@@ -0,0 +1,198 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasCountByDay.vue b/src/views/gasDashboard/components/gasCountByDay.vue
new file mode 100644
index 0000000..f0a3977
--- /dev/null
+++ b/src/views/gasDashboard/components/gasCountByDay.vue
@@ -0,0 +1,114 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasCountByDept.vue b/src/views/gasDashboard/components/gasCountByDept.vue
new file mode 100644
index 0000000..31c8508
--- /dev/null
+++ b/src/views/gasDashboard/components/gasCountByDept.vue
@@ -0,0 +1,126 @@
+
+
+
+
+
+
+
+
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/index.js b/config/index.js
index 106eaa6..30dda44 100644
--- a/config/index.js
+++ b/config/index.js
@@ -33,7 +33,7 @@
// Use Eslint Loader?
// If true, your code will be linted during bundling and
// linting errors and warnings will be shown in the console.
- useEslint: true,
+ useEslint: false,
// If true, eslint errors and warnings will also be shown in the error overlay
// in the browser.
showEslintErrorsInOverlay: false,
diff --git a/config/prod.env.js b/config/prod.env.js
index 3455ce7..bb20d1d 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -3,5 +3,6 @@
NODE_ENV: '"production"',
// BASE_API: '"http://111.198.10.15:11304"',
// BASE_API: '"http://42.81.160.165:2022/smartwell/"',
- BASE_API: '"http://111.198.10.15:11409/smartwell"' //11643
+ // BASE_API: '"http://111.198.10.15:11409/smartwell"' //11643
+ BASE_API: '"http://111.198.10.15:20104"' //11643
}
diff --git a/package.json b/package.json
index be3e56e..a60e7b3 100644
--- a/package.json
+++ b/package.json
@@ -86,7 +86,7 @@
"vue-template-compiler": "2.5.17",
"webpack": "4.16.5",
"webpack-bundle-analyzer": "2.13.1",
- "webpack-cli": "3.1.0",
+ "webpack-cli": "^3.1.0",
"webpack-dev-server": "3.1.14",
"webpack-merge": "4.1.4"
},
diff --git a/src/App.vue b/src/App.vue
index 721d3a3..ec9032c 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,6 +1,6 @@
-
diff --git a/src/api/dashboard.js b/src/api/dashboard.js
index aaadb23..6f56e28 100644
--- a/src/api/dashboard.js
+++ b/src/api/dashboard.js
@@ -79,11 +79,10 @@
})
}
-
// 用水事记查询
-export function getNoteList() {
+export function getNoteList(type) {
return request({
- url: '/note/list',
+ url: '/note/list/' + type,
method: 'get'
})
}
@@ -92,7 +91,6 @@
export function updateNoteList(data) {
return request({
url: '/note/edit',
- // url: 'waterMeterData/count',
method: 'post',
data
})
diff --git a/src/api/data.js b/src/api/data.js
index b7c9ba2..65c5071 100644
--- a/src/api/data.js
+++ b/src/api/data.js
@@ -85,6 +85,22 @@
params
})
}
+// 气体流量计数据查询
+export function getGasflowData(params) {
+ return request({
+ url: 'gasflow/list',
+ method: 'get',
+ params
+ })
+}
+// 腐蚀速率监测仪数据查询
+export function getCorrodeData(params) {
+ return request({
+ url: 'corrode/data/list',
+ method: 'get',
+ params
+ })
+}
// 批量导出井盖数据
export function batchExportWellData(params) {
@@ -183,6 +199,26 @@
responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
})
}
+// 腐蚀速率监测仪数据导出
+export function batchExportCorrodeData(params) {
+ return request({
+ url: 'corrode/data/export',
+ method: 'get',
+ timeout: 120000, // 120s，2分钟
+ params,
+ responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+ })
+}
+// 气体流量计数据导出
+export function batchExportGasflowData(params) {
+ return request({
+ url: 'gasflow/data/export',
+ method: 'get',
+ timeout: 120000, // 120s，2分钟
+ params,
+ responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+ })
+}
// 温度压力数据查询
export function getTempPressData(params) {
diff --git a/src/api/device.js b/src/api/device.js
index 00804fe..edcc1a4 100644
--- a/src/api/device.js
+++ b/src/api/device.js
@@ -100,4 +100,11 @@
params
})
}
+export function totalDataGasFlow(params) {
+ return request({
+ url: 'gasflow/listByDevice',
+ method: 'post',
+ params
+ })
+}
diff --git a/src/api/gasOverview.js b/src/api/gasOverview.js
new file mode 100644
index 0000000..0dc3442
--- /dev/null
+++ b/src/api/gasOverview.js
@@ -0,0 +1,173 @@
+/**
+ * 动力管线
+ */
+import request from '@/utils/request'
+
+// 用水量、噪声统计数据
+export function gasStatistic() {
+ return request({
+ url: 'gasStatistic/overview',
+ method: 'get'
+ })
+}
+
+// 用水量、噪声统计数据
+export function gasStatistic2(deviceType) {
+ return request({
+ url: 'gas/statistics/used',
+ method: 'get',
+ params: {
+ deviceType: deviceType
+ }
+ })
+}
+
+// 气体用气量走势图
+export function gasTrend(params) {
+ return request({
+ url: '/gas/statistics/trend',
+ method: 'get',
+ params
+ })
+}
+// 用气量超量报警统计
+export function gasAlarmTrend(params) {
+ return request({
+ url: '/gas/alarm/trend',
+ method: 'get',
+ params
+ })
+}
+// 各设备气体用气量
+export function gasUsed(params) {
+ return request({
+ url: '/gas/used',
+ method: 'get',
+ params
+ })
+}
+// 气体泄漏监测结果
+export function gasLeakStatus(params) {
+ return request({
+ url: 'gas/leakage/rate',
+ method: 'get',
+ params
+ })
+}
+
+// 气体流量计数量
+export function deviceCount(type) {
+ return request({
+ url: 'device/count/' + type,
+ method: 'get'
+ })
+}
+
+// 统计当前报警数
+export function alarmNowStatic(params) {
+ return request({
+ url: 'statics/alarmsNow',
+ method: 'get',
+ params
+ })
+}
+
+// 查询二级分区各区用气量
+export function countBySecondArea(params) {
+ return request({
+ url: 'gasStatistic/countBySecondArea',
+ method: 'get',
+ params
+ })
+}
+
+// 查询二级分区7日用气量
+export function countByDaySecond(params) {
+ return request({
+ url: 'gasStatistic/countByDay',
+ method: 'get',
+ params
+ })
+}
+// 查询二级分区燃气告警
+export function gasAlarmBySecondArea(params) {
+ return request({
+ url: 'gas/alarm/rate',
+ method: 'get',
+ params
+ })
+}
+// 各设备腐蚀速率统计
+export function corrRateByDevice(params) {
+ return request({
+ url: 'corrode/data/corrRateByDevice',
+ method: 'get',
+ params
+ })
+}
+// 查询二级分区用气对比
+export function gasCompareData(params) {
+ return request({
+ url: 'gasStatistic/gasCompare',
+ method: 'get',
+ params
+ })
+}
+
+// 根据设备类型统计设备数量
+export function deviceStaticsByType(params) {
+ return request({
+ url: 'statics/deviceStaticsByType',
+ method: 'get',
+ params
+ })
+}
+
+// 查询二级分区气体流量计告警
+export function alarmBySecondArea(params) {
+ return request({
+ url: 'gasStatistic/alarmBySecondArea',
+ method: 'get',
+ params
+ })
+}
+
+// 用气事记查询
+export function getNoteList(type) {
+ return request({
+ url: '/note/list/' + type,
+ // url: '/note/list',
+ method: 'get'
+ })
+}
+
+// 用气事记更新
+export function updateNoteList(data) {
+ return request({
+ url: '/note/edit',
+ method: 'post',
+ data
+ })
+}
+
+// 获取报警列表
+export function getAlarmsNow(params) {
+ return request({
+ url: 'overview/alarmNow',
+ method: 'get',
+ params
+ })
+}
+
+// 总览marker（真接口）
+export function getMapping(devType, keywords) {
+ return request({
+ url: 'overview/wellMapping',
+ method: 'get',
+ params: {
+ keywords: keywords,
+ devType: devType
+ }
+ })
+}
+
diff --git a/src/components/BigData/Card/index.vue b/src/components/BigData/Card/index.vue
index 8320d47..8944b44 100644
--- a/src/components/BigData/Card/index.vue
+++ b/src/components/BigData/Card/index.vue
@@ -10,7 +10,7 @@
{{ context }}
- {{unit}}
+ {{ unit }}
-
-
-
- {{ title[0] }} {{ context[0] }}{{unit}}
-
-
- {{ title[1] }} {{ context[1] }}{{unit}}
+
+
@@ -41,9 +41,9 @@
type: String,
default: '#40c9c6'
},
- unit:{
+ unit: {
type: String,
- default:''
+ default: ''
}
},
computed: {
diff --git a/src/components/BigData/Card1/index.vue b/src/components/BigData/Card1/index.vue
index 722c24c..c9ec32d 100644
--- a/src/components/BigData/Card1/index.vue
+++ b/src/components/BigData/Card1/index.vue
@@ -4,30 +4,20 @@
-
-
+
-
-
@@ -28,7 +29,7 @@
- 导出记录
+ 导出记录
@@ -63,6 +64,7 @@
import { getGasData, batchExportGasData } from '@/api/data'
import DeptSelect from '../../../components/DeptSelect/index'
import { parseUrl } from '@/utils/parseutils'
+import { getSearchLastWeekTime } from '@/utils/dateutils'
export default {
name: 'ListGasData',
@@ -163,6 +165,7 @@
if (params && params.deviceType === '4' && params.devcode) {
this.listQuery.keywords = params.devcode
}
+ this.timeRange = getSearchLastWeekTime()
this.fetchData()
}
},
@@ -191,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/listGasflowData.vue b/src/views/dataManage/deviceData/listGasflowData.vue
new file mode 100644
index 0000000..9c5321a
--- /dev/null
+++ b/src/views/dataManage/deviceData/listGasflowData.vue
@@ -0,0 +1,311 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/alarmGasCountByType.vue b/src/views/gasDashboard/components/alarmGasCountByType.vue
new file mode 100644
index 0000000..4f80d3a
--- /dev/null
+++ b/src/views/gasDashboard/components/alarmGasCountByType.vue
@@ -0,0 +1,72 @@
+
+
+
+
-
+ {{ name }} {{ context[index] }}{{ unit }}
+
@@ -36,46 +26,46 @@
diff --git a/src/views/dataManage/deviceData/listCorrodeData.vue b/src/views/dataManage/deviceData/listCorrodeData.vue
new file mode 100644
index 0000000..1a20abb
--- /dev/null
+++ b/src/views/dataManage/deviceData/listCorrodeData.vue
@@ -0,0 +1,272 @@
+
+
{{ title[0] }}
- {{ context[0] }}{{unit}}
+ {{ context[0] }}{{ unit }}
+
+
+
+
+
+
+
diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue
index 97cdfdb..40b9a5e 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -5,10 +5,10 @@
+
+
+
+
+
+
+ 搜索
+
+
+
+
+
+
+
+ 导出记录
+
+
+
+
+
+
+ {{ scope.row[column.value] }}
+ {{ scope.row[column.value] }}
+
+
+
+
+
+ 数据列表
+
+ 数据列表
+
+
+
+
+
+
+
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 bf03fd1..dffd340 100644
--- a/src/views/dataManage/deviceData/listWaterData.vue
+++ b/src/views/dataManage/deviceData/listWaterData.vue
@@ -176,6 +176,12 @@
align: 'center'
},
{
+ text: '压力(Mpa)',
+ value: 'pressure',
+ width: 90,
+ align: 'center'
+ },
+ {
text: '今日用水量（立方米）',
value: 'dayCount',
align: 'center',
@@ -276,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) // 下载完成移除元素
@@ -311,9 +317,11 @@
}
getWatchData(this.listQuery).then((response) => {
this.list = response.data.rows.map(function(item) {
- item.areaFullName = item.areaFullName
- .replace('/', '')
- .replace('顶层', '')
+ item.totalCount = parseFloat(item.totalCount).toFixed(2)
+ item.dayCount = parseFloat(item.dayCount).toFixed(2)
+ item.monthCount = parseFloat(item.monthCount).toFixed(2)
+ item.pressure = parseFloat(item.pressure).toFixed(2)
+ item.areaFullName = item.areaFullName.replace('/', '').replace('顶层', '')
return item
})
this.total = parseInt(response.data.total)
diff --git a/src/views/dataManage/deviceData/waterHistory.vue b/src/views/dataManage/deviceData/waterHistory.vue
index 160dab7..42e3303 100644
--- a/src/views/dataManage/deviceData/waterHistory.vue
+++ b/src/views/dataManage/deviceData/waterHistory.vue
@@ -1,5 +1,5 @@
-
+
+
+
+
+
+
+ 搜索
+
+
+
+
+
+
+
+ 导出记录
+
+
+
+
+
+
+ {{
+ scope.row[column.value]
+ }}
+ {{
+ scope.row["areaFullName"] + '/' + scope.row[column.value]
+ }}
+ {{ scope.row[column.value] }}
+
+
+
+
+
+ 历史数据
+
+
+
+
+
+
+ 数据列表
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/AlarmNowList.vue b/src/views/gasDashboard/components/AlarmNowList.vue
new file mode 100644
index 0000000..890325f
--- /dev/null
+++ b/src/views/gasDashboard/components/AlarmNowList.vue
@@ -0,0 +1,35 @@
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/DeviceCount.vue b/src/views/gasDashboard/components/DeviceCount.vue
new file mode 100644
index 0000000..bffc9e9
--- /dev/null
+++ b/src/views/gasDashboard/components/DeviceCount.vue
@@ -0,0 +1,68 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/FunctionArea.vue b/src/views/gasDashboard/components/FunctionArea.vue
new file mode 100644
index 0000000..6401557
--- /dev/null
+++ b/src/views/gasDashboard/components/FunctionArea.vue
@@ -0,0 +1,140 @@
+
+
+
+ 本年度
+ 本季度
+ 近30日
+ 近7日
+ 今日
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/FunctionArea2.vue b/src/views/gasDashboard/components/FunctionArea2.vue
new file mode 100644
index 0000000..26a9f82
--- /dev/null
+++ b/src/views/gasDashboard/components/FunctionArea2.vue
@@ -0,0 +1,107 @@
+
+
+
+ 本年度
+ 本季度
+ 近30日
+ 近7日
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/PanelGroup.vue b/src/views/gasDashboard/components/PanelGroup.vue
new file mode 100644
index 0000000..103486e
--- /dev/null
+++ b/src/views/gasDashboard/components/PanelGroup.vue
@@ -0,0 +1,137 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/alarmLeakCountPie.vue b/src/views/gasDashboard/components/alarmLeakCountPie.vue
new file mode 100644
index 0000000..abfbc2d
--- /dev/null
+++ b/src/views/gasDashboard/components/alarmLeakCountPie.vue
@@ -0,0 +1,74 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/corrodeCountByDay.vue b/src/views/gasDashboard/components/corrodeCountByDay.vue
new file mode 100644
index 0000000..a410f29
--- /dev/null
+++ b/src/views/gasDashboard/components/corrodeCountByDay.vue
@@ -0,0 +1,100 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasAlarmTrend.vue b/src/views/gasDashboard/components/gasAlarmTrend.vue
new file mode 100644
index 0000000..a1d422e
--- /dev/null
+++ b/src/views/gasDashboard/components/gasAlarmTrend.vue
@@ -0,0 +1,100 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasCompare.vue b/src/views/gasDashboard/components/gasCompare.vue
new file mode 100644
index 0000000..19a4398
--- /dev/null
+++ b/src/views/gasDashboard/components/gasCompare.vue
@@ -0,0 +1,121 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasCountByAreaBar.vue b/src/views/gasDashboard/components/gasCountByAreaBar.vue
new file mode 100644
index 0000000..456a6c6
--- /dev/null
+++ b/src/views/gasDashboard/components/gasCountByAreaBar.vue
@@ -0,0 +1,198 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasCountByDay.vue b/src/views/gasDashboard/components/gasCountByDay.vue
new file mode 100644
index 0000000..f0a3977
--- /dev/null
+++ b/src/views/gasDashboard/components/gasCountByDay.vue
@@ -0,0 +1,114 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasCountByDept.vue b/src/views/gasDashboard/components/gasCountByDept.vue
new file mode 100644
index 0000000..31c8508
--- /dev/null
+++ b/src/views/gasDashboard/components/gasCountByDept.vue
@@ -0,0 +1,126 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasCountByDeviceBar.vue b/src/views/gasDashboard/components/gasCountByDeviceBar.vue
new file mode 100644
index 0000000..dc211e3
--- /dev/null
+++ b/src/views/gasDashboard/components/gasCountByDeviceBar.vue
@@ -0,0 +1,130 @@
+
+
+
+
+
+
+
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/index.js b/config/index.js
index 106eaa6..30dda44 100644
--- a/config/index.js
+++ b/config/index.js
@@ -33,7 +33,7 @@
// Use Eslint Loader?
// If true, your code will be linted during bundling and
// linting errors and warnings will be shown in the console.
- useEslint: true,
+ useEslint: false,
// If true, eslint errors and warnings will also be shown in the error overlay
// in the browser.
showEslintErrorsInOverlay: false,
diff --git a/config/prod.env.js b/config/prod.env.js
index 3455ce7..bb20d1d 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -3,5 +3,6 @@
NODE_ENV: '"production"',
// BASE_API: '"http://111.198.10.15:11304"',
// BASE_API: '"http://42.81.160.165:2022/smartwell/"',
- BASE_API: '"http://111.198.10.15:11409/smartwell"' //11643
+ // BASE_API: '"http://111.198.10.15:11409/smartwell"' //11643
+ BASE_API: '"http://111.198.10.15:20104"' //11643
}
diff --git a/package.json b/package.json
index be3e56e..a60e7b3 100644
--- a/package.json
+++ b/package.json
@@ -86,7 +86,7 @@
"vue-template-compiler": "2.5.17",
"webpack": "4.16.5",
"webpack-bundle-analyzer": "2.13.1",
- "webpack-cli": "3.1.0",
+ "webpack-cli": "^3.1.0",
"webpack-dev-server": "3.1.14",
"webpack-merge": "4.1.4"
},
diff --git a/src/App.vue b/src/App.vue
index 721d3a3..ec9032c 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,6 +1,6 @@
-
diff --git a/src/api/dashboard.js b/src/api/dashboard.js
index aaadb23..6f56e28 100644
--- a/src/api/dashboard.js
+++ b/src/api/dashboard.js
@@ -79,11 +79,10 @@
})
}
-
// 用水事记查询
-export function getNoteList() {
+export function getNoteList(type) {
return request({
- url: '/note/list',
+ url: '/note/list/' + type,
method: 'get'
})
}
@@ -92,7 +91,6 @@
export function updateNoteList(data) {
return request({
url: '/note/edit',
- // url: 'waterMeterData/count',
method: 'post',
data
})
diff --git a/src/api/data.js b/src/api/data.js
index b7c9ba2..65c5071 100644
--- a/src/api/data.js
+++ b/src/api/data.js
@@ -85,6 +85,22 @@
params
})
}
+// 气体流量计数据查询
+export function getGasflowData(params) {
+ return request({
+ url: 'gasflow/list',
+ method: 'get',
+ params
+ })
+}
+// 腐蚀速率监测仪数据查询
+export function getCorrodeData(params) {
+ return request({
+ url: 'corrode/data/list',
+ method: 'get',
+ params
+ })
+}
// 批量导出井盖数据
export function batchExportWellData(params) {
@@ -183,6 +199,26 @@
responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
})
}
+// 腐蚀速率监测仪数据导出
+export function batchExportCorrodeData(params) {
+ return request({
+ url: 'corrode/data/export',
+ method: 'get',
+ timeout: 120000, // 120s，2分钟
+ params,
+ responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+ })
+}
+// 气体流量计数据导出
+export function batchExportGasflowData(params) {
+ return request({
+ url: 'gasflow/data/export',
+ method: 'get',
+ timeout: 120000, // 120s，2分钟
+ params,
+ responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+ })
+}
// 温度压力数据查询
export function getTempPressData(params) {
diff --git a/src/api/device.js b/src/api/device.js
index 00804fe..edcc1a4 100644
--- a/src/api/device.js
+++ b/src/api/device.js
@@ -100,4 +100,11 @@
params
})
}
+export function totalDataGasFlow(params) {
+ return request({
+ url: 'gasflow/listByDevice',
+ method: 'post',
+ params
+ })
+}
diff --git a/src/api/gasOverview.js b/src/api/gasOverview.js
new file mode 100644
index 0000000..0dc3442
--- /dev/null
+++ b/src/api/gasOverview.js
@@ -0,0 +1,173 @@
+/**
+ * 动力管线
+ */
+import request from '@/utils/request'
+
+// 用水量、噪声统计数据
+export function gasStatistic() {
+ return request({
+ url: 'gasStatistic/overview',
+ method: 'get'
+ })
+}
+
+// 用水量、噪声统计数据
+export function gasStatistic2(deviceType) {
+ return request({
+ url: 'gas/statistics/used',
+ method: 'get',
+ params: {
+ deviceType: deviceType
+ }
+ })
+}
+
+// 气体用气量走势图
+export function gasTrend(params) {
+ return request({
+ url: '/gas/statistics/trend',
+ method: 'get',
+ params
+ })
+}
+// 用气量超量报警统计
+export function gasAlarmTrend(params) {
+ return request({
+ url: '/gas/alarm/trend',
+ method: 'get',
+ params
+ })
+}
+// 各设备气体用气量
+export function gasUsed(params) {
+ return request({
+ url: '/gas/used',
+ method: 'get',
+ params
+ })
+}
+// 气体泄漏监测结果
+export function gasLeakStatus(params) {
+ return request({
+ url: 'gas/leakage/rate',
+ method: 'get',
+ params
+ })
+}
+
+// 气体流量计数量
+export function deviceCount(type) {
+ return request({
+ url: 'device/count/' + type,
+ method: 'get'
+ })
+}
+
+// 统计当前报警数
+export function alarmNowStatic(params) {
+ return request({
+ url: 'statics/alarmsNow',
+ method: 'get',
+ params
+ })
+}
+
+// 查询二级分区各区用气量
+export function countBySecondArea(params) {
+ return request({
+ url: 'gasStatistic/countBySecondArea',
+ method: 'get',
+ params
+ })
+}
+
+// 查询二级分区7日用气量
+export function countByDaySecond(params) {
+ return request({
+ url: 'gasStatistic/countByDay',
+ method: 'get',
+ params
+ })
+}
+// 查询二级分区燃气告警
+export function gasAlarmBySecondArea(params) {
+ return request({
+ url: 'gas/alarm/rate',
+ method: 'get',
+ params
+ })
+}
+// 各设备腐蚀速率统计
+export function corrRateByDevice(params) {
+ return request({
+ url: 'corrode/data/corrRateByDevice',
+ method: 'get',
+ params
+ })
+}
+// 查询二级分区用气对比
+export function gasCompareData(params) {
+ return request({
+ url: 'gasStatistic/gasCompare',
+ method: 'get',
+ params
+ })
+}
+
+// 根据设备类型统计设备数量
+export function deviceStaticsByType(params) {
+ return request({
+ url: 'statics/deviceStaticsByType',
+ method: 'get',
+ params
+ })
+}
+
+// 查询二级分区气体流量计告警
+export function alarmBySecondArea(params) {
+ return request({
+ url: 'gasStatistic/alarmBySecondArea',
+ method: 'get',
+ params
+ })
+}
+
+// 用气事记查询
+export function getNoteList(type) {
+ return request({
+ url: '/note/list/' + type,
+ // url: '/note/list',
+ method: 'get'
+ })
+}
+
+// 用气事记更新
+export function updateNoteList(data) {
+ return request({
+ url: '/note/edit',
+ method: 'post',
+ data
+ })
+}
+
+// 获取报警列表
+export function getAlarmsNow(params) {
+ return request({
+ url: 'overview/alarmNow',
+ method: 'get',
+ params
+ })
+}
+
+// 总览marker（真接口）
+export function getMapping(devType, keywords) {
+ return request({
+ url: 'overview/wellMapping',
+ method: 'get',
+ params: {
+ keywords: keywords,
+ devType: devType
+ }
+ })
+}
+
diff --git a/src/components/BigData/Card/index.vue b/src/components/BigData/Card/index.vue
index 8320d47..8944b44 100644
--- a/src/components/BigData/Card/index.vue
+++ b/src/components/BigData/Card/index.vue
@@ -10,7 +10,7 @@
{{ context }}
- {{unit}}
+ {{ unit }}
-
-
-
- {{ title[0] }} {{ context[0] }}{{unit}}
-
-
- {{ title[1] }} {{ context[1] }}{{unit}}
+
+
@@ -41,9 +41,9 @@
type: String,
default: '#40c9c6'
},
- unit:{
+ unit: {
type: String,
- default:''
+ default: ''
}
},
computed: {
diff --git a/src/components/BigData/Card1/index.vue b/src/components/BigData/Card1/index.vue
index 722c24c..c9ec32d 100644
--- a/src/components/BigData/Card1/index.vue
+++ b/src/components/BigData/Card1/index.vue
@@ -4,30 +4,20 @@
-
-
+
-
-
@@ -28,7 +29,7 @@
- 导出记录
+ 导出记录
@@ -63,6 +64,7 @@
import { getGasData, batchExportGasData } from '@/api/data'
import DeptSelect from '../../../components/DeptSelect/index'
import { parseUrl } from '@/utils/parseutils'
+import { getSearchLastWeekTime } from '@/utils/dateutils'
export default {
name: 'ListGasData',
@@ -163,6 +165,7 @@
if (params && params.deviceType === '4' && params.devcode) {
this.listQuery.keywords = params.devcode
}
+ this.timeRange = getSearchLastWeekTime()
this.fetchData()
}
},
@@ -191,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/listGasflowData.vue b/src/views/dataManage/deviceData/listGasflowData.vue
new file mode 100644
index 0000000..9c5321a
--- /dev/null
+++ b/src/views/dataManage/deviceData/listGasflowData.vue
@@ -0,0 +1,311 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/alarmGasCountByType.vue b/src/views/gasDashboard/components/alarmGasCountByType.vue
new file mode 100644
index 0000000..4f80d3a
--- /dev/null
+++ b/src/views/gasDashboard/components/alarmGasCountByType.vue
@@ -0,0 +1,72 @@
+
+
+
+
-
+ {{ name }} {{ context[index] }}{{ unit }}
+
@@ -36,46 +26,46 @@
diff --git a/src/views/dataManage/deviceData/listCorrodeData.vue b/src/views/dataManage/deviceData/listCorrodeData.vue
new file mode 100644
index 0000000..1a20abb
--- /dev/null
+++ b/src/views/dataManage/deviceData/listCorrodeData.vue
@@ -0,0 +1,272 @@
+
+
{{ title[0] }}
- {{ context[0] }}{{unit}}
+ {{ context[0] }}{{ unit }}
+
+
+
+
+
+
+
diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue
index 97cdfdb..40b9a5e 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -5,10 +5,10 @@
+
+
+
+
+
+
+ 搜索
+
+
+
+
+
+
+
+ 导出记录
+
+
+
+
+
+
+ {{ scope.row[column.value] }}
+ {{ scope.row[column.value] }}
+
+
+
+
+
+ 数据列表
+
+ 数据列表
+
+
+
+
+
+
+
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 bf03fd1..dffd340 100644
--- a/src/views/dataManage/deviceData/listWaterData.vue
+++ b/src/views/dataManage/deviceData/listWaterData.vue
@@ -176,6 +176,12 @@
align: 'center'
},
{
+ text: '压力(Mpa)',
+ value: 'pressure',
+ width: 90,
+ align: 'center'
+ },
+ {
text: '今日用水量（立方米）',
value: 'dayCount',
align: 'center',
@@ -276,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) // 下载完成移除元素
@@ -311,9 +317,11 @@
}
getWatchData(this.listQuery).then((response) => {
this.list = response.data.rows.map(function(item) {
- item.areaFullName = item.areaFullName
- .replace('/', '')
- .replace('顶层', '')
+ item.totalCount = parseFloat(item.totalCount).toFixed(2)
+ item.dayCount = parseFloat(item.dayCount).toFixed(2)
+ item.monthCount = parseFloat(item.monthCount).toFixed(2)
+ item.pressure = parseFloat(item.pressure).toFixed(2)
+ item.areaFullName = item.areaFullName.replace('/', '').replace('顶层', '')
return item
})
this.total = parseInt(response.data.total)
diff --git a/src/views/dataManage/deviceData/waterHistory.vue b/src/views/dataManage/deviceData/waterHistory.vue
index 160dab7..42e3303 100644
--- a/src/views/dataManage/deviceData/waterHistory.vue
+++ b/src/views/dataManage/deviceData/waterHistory.vue
@@ -1,5 +1,5 @@
-
+
+
+
+
+
+
+ 搜索
+
+
+
+
+
+
+
+ 导出记录
+
+
+
+
+
+
+ {{
+ scope.row[column.value]
+ }}
+ {{
+ scope.row["areaFullName"] + '/' + scope.row[column.value]
+ }}
+ {{ scope.row[column.value] }}
+
+
+
+
+
+ 历史数据
+
+
+
+
+
+
+ 数据列表
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/AlarmNowList.vue b/src/views/gasDashboard/components/AlarmNowList.vue
new file mode 100644
index 0000000..890325f
--- /dev/null
+++ b/src/views/gasDashboard/components/AlarmNowList.vue
@@ -0,0 +1,35 @@
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/DeviceCount.vue b/src/views/gasDashboard/components/DeviceCount.vue
new file mode 100644
index 0000000..bffc9e9
--- /dev/null
+++ b/src/views/gasDashboard/components/DeviceCount.vue
@@ -0,0 +1,68 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/FunctionArea.vue b/src/views/gasDashboard/components/FunctionArea.vue
new file mode 100644
index 0000000..6401557
--- /dev/null
+++ b/src/views/gasDashboard/components/FunctionArea.vue
@@ -0,0 +1,140 @@
+
+
+
+ 本年度
+ 本季度
+ 近30日
+ 近7日
+ 今日
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/FunctionArea2.vue b/src/views/gasDashboard/components/FunctionArea2.vue
new file mode 100644
index 0000000..26a9f82
--- /dev/null
+++ b/src/views/gasDashboard/components/FunctionArea2.vue
@@ -0,0 +1,107 @@
+
+
+
+ 本年度
+ 本季度
+ 近30日
+ 近7日
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/PanelGroup.vue b/src/views/gasDashboard/components/PanelGroup.vue
new file mode 100644
index 0000000..103486e
--- /dev/null
+++ b/src/views/gasDashboard/components/PanelGroup.vue
@@ -0,0 +1,137 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/alarmLeakCountPie.vue b/src/views/gasDashboard/components/alarmLeakCountPie.vue
new file mode 100644
index 0000000..abfbc2d
--- /dev/null
+++ b/src/views/gasDashboard/components/alarmLeakCountPie.vue
@@ -0,0 +1,74 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/corrodeCountByDay.vue b/src/views/gasDashboard/components/corrodeCountByDay.vue
new file mode 100644
index 0000000..a410f29
--- /dev/null
+++ b/src/views/gasDashboard/components/corrodeCountByDay.vue
@@ -0,0 +1,100 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasAlarmTrend.vue b/src/views/gasDashboard/components/gasAlarmTrend.vue
new file mode 100644
index 0000000..a1d422e
--- /dev/null
+++ b/src/views/gasDashboard/components/gasAlarmTrend.vue
@@ -0,0 +1,100 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasCompare.vue b/src/views/gasDashboard/components/gasCompare.vue
new file mode 100644
index 0000000..19a4398
--- /dev/null
+++ b/src/views/gasDashboard/components/gasCompare.vue
@@ -0,0 +1,121 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasCountByAreaBar.vue b/src/views/gasDashboard/components/gasCountByAreaBar.vue
new file mode 100644
index 0000000..456a6c6
--- /dev/null
+++ b/src/views/gasDashboard/components/gasCountByAreaBar.vue
@@ -0,0 +1,198 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasCountByDay.vue b/src/views/gasDashboard/components/gasCountByDay.vue
new file mode 100644
index 0000000..f0a3977
--- /dev/null
+++ b/src/views/gasDashboard/components/gasCountByDay.vue
@@ -0,0 +1,114 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasCountByDept.vue b/src/views/gasDashboard/components/gasCountByDept.vue
new file mode 100644
index 0000000..31c8508
--- /dev/null
+++ b/src/views/gasDashboard/components/gasCountByDept.vue
@@ -0,0 +1,126 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasCountByDeviceBar.vue b/src/views/gasDashboard/components/gasCountByDeviceBar.vue
new file mode 100644
index 0000000..dc211e3
--- /dev/null
+++ b/src/views/gasDashboard/components/gasCountByDeviceBar.vue
@@ -0,0 +1,130 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasNote.vue b/src/views/gasDashboard/components/gasNote.vue
new file mode 100644
index 0000000..5ade90f
--- /dev/null
+++ b/src/views/gasDashboard/components/gasNote.vue
@@ -0,0 +1,149 @@
+
+
+
+
+
+
+
+
+
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/index.js b/config/index.js
index 106eaa6..30dda44 100644
--- a/config/index.js
+++ b/config/index.js
@@ -33,7 +33,7 @@
// Use Eslint Loader?
// If true, your code will be linted during bundling and
// linting errors and warnings will be shown in the console.
- useEslint: true,
+ useEslint: false,
// If true, eslint errors and warnings will also be shown in the error overlay
// in the browser.
showEslintErrorsInOverlay: false,
diff --git a/config/prod.env.js b/config/prod.env.js
index 3455ce7..bb20d1d 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -3,5 +3,6 @@
NODE_ENV: '"production"',
// BASE_API: '"http://111.198.10.15:11304"',
// BASE_API: '"http://42.81.160.165:2022/smartwell/"',
- BASE_API: '"http://111.198.10.15:11409/smartwell"' //11643
+ // BASE_API: '"http://111.198.10.15:11409/smartwell"' //11643
+ BASE_API: '"http://111.198.10.15:20104"' //11643
}
diff --git a/package.json b/package.json
index be3e56e..a60e7b3 100644
--- a/package.json
+++ b/package.json
@@ -86,7 +86,7 @@
"vue-template-compiler": "2.5.17",
"webpack": "4.16.5",
"webpack-bundle-analyzer": "2.13.1",
- "webpack-cli": "3.1.0",
+ "webpack-cli": "^3.1.0",
"webpack-dev-server": "3.1.14",
"webpack-merge": "4.1.4"
},
diff --git a/src/App.vue b/src/App.vue
index 721d3a3..ec9032c 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,6 +1,6 @@
+ 场区用气事记
+
+
+
+
+
+
+
+
+
+ {{ index+1 }}. {{ item.content }}
+
+
+ {{ index+1 }}.
+
+
+
+
+
+
+
+
+
-
diff --git a/src/api/dashboard.js b/src/api/dashboard.js
index aaadb23..6f56e28 100644
--- a/src/api/dashboard.js
+++ b/src/api/dashboard.js
@@ -79,11 +79,10 @@
})
}
-
// 用水事记查询
-export function getNoteList() {
+export function getNoteList(type) {
return request({
- url: '/note/list',
+ url: '/note/list/' + type,
method: 'get'
})
}
@@ -92,7 +91,6 @@
export function updateNoteList(data) {
return request({
url: '/note/edit',
- // url: 'waterMeterData/count',
method: 'post',
data
})
diff --git a/src/api/data.js b/src/api/data.js
index b7c9ba2..65c5071 100644
--- a/src/api/data.js
+++ b/src/api/data.js
@@ -85,6 +85,22 @@
params
})
}
+// 气体流量计数据查询
+export function getGasflowData(params) {
+ return request({
+ url: 'gasflow/list',
+ method: 'get',
+ params
+ })
+}
+// 腐蚀速率监测仪数据查询
+export function getCorrodeData(params) {
+ return request({
+ url: 'corrode/data/list',
+ method: 'get',
+ params
+ })
+}
// 批量导出井盖数据
export function batchExportWellData(params) {
@@ -183,6 +199,26 @@
responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
})
}
+// 腐蚀速率监测仪数据导出
+export function batchExportCorrodeData(params) {
+ return request({
+ url: 'corrode/data/export',
+ method: 'get',
+ timeout: 120000, // 120s，2分钟
+ params,
+ responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+ })
+}
+// 气体流量计数据导出
+export function batchExportGasflowData(params) {
+ return request({
+ url: 'gasflow/data/export',
+ method: 'get',
+ timeout: 120000, // 120s，2分钟
+ params,
+ responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+ })
+}
// 温度压力数据查询
export function getTempPressData(params) {
diff --git a/src/api/device.js b/src/api/device.js
index 00804fe..edcc1a4 100644
--- a/src/api/device.js
+++ b/src/api/device.js
@@ -100,4 +100,11 @@
params
})
}
+export function totalDataGasFlow(params) {
+ return request({
+ url: 'gasflow/listByDevice',
+ method: 'post',
+ params
+ })
+}
diff --git a/src/api/gasOverview.js b/src/api/gasOverview.js
new file mode 100644
index 0000000..0dc3442
--- /dev/null
+++ b/src/api/gasOverview.js
@@ -0,0 +1,173 @@
+/**
+ * 动力管线
+ */
+import request from '@/utils/request'
+
+// 用水量、噪声统计数据
+export function gasStatistic() {
+ return request({
+ url: 'gasStatistic/overview',
+ method: 'get'
+ })
+}
+
+// 用水量、噪声统计数据
+export function gasStatistic2(deviceType) {
+ return request({
+ url: 'gas/statistics/used',
+ method: 'get',
+ params: {
+ deviceType: deviceType
+ }
+ })
+}
+
+// 气体用气量走势图
+export function gasTrend(params) {
+ return request({
+ url: '/gas/statistics/trend',
+ method: 'get',
+ params
+ })
+}
+// 用气量超量报警统计
+export function gasAlarmTrend(params) {
+ return request({
+ url: '/gas/alarm/trend',
+ method: 'get',
+ params
+ })
+}
+// 各设备气体用气量
+export function gasUsed(params) {
+ return request({
+ url: '/gas/used',
+ method: 'get',
+ params
+ })
+}
+// 气体泄漏监测结果
+export function gasLeakStatus(params) {
+ return request({
+ url: 'gas/leakage/rate',
+ method: 'get',
+ params
+ })
+}
+
+// 气体流量计数量
+export function deviceCount(type) {
+ return request({
+ url: 'device/count/' + type,
+ method: 'get'
+ })
+}
+
+// 统计当前报警数
+export function alarmNowStatic(params) {
+ return request({
+ url: 'statics/alarmsNow',
+ method: 'get',
+ params
+ })
+}
+
+// 查询二级分区各区用气量
+export function countBySecondArea(params) {
+ return request({
+ url: 'gasStatistic/countBySecondArea',
+ method: 'get',
+ params
+ })
+}
+
+// 查询二级分区7日用气量
+export function countByDaySecond(params) {
+ return request({
+ url: 'gasStatistic/countByDay',
+ method: 'get',
+ params
+ })
+}
+// 查询二级分区燃气告警
+export function gasAlarmBySecondArea(params) {
+ return request({
+ url: 'gas/alarm/rate',
+ method: 'get',
+ params
+ })
+}
+// 各设备腐蚀速率统计
+export function corrRateByDevice(params) {
+ return request({
+ url: 'corrode/data/corrRateByDevice',
+ method: 'get',
+ params
+ })
+}
+// 查询二级分区用气对比
+export function gasCompareData(params) {
+ return request({
+ url: 'gasStatistic/gasCompare',
+ method: 'get',
+ params
+ })
+}
+
+// 根据设备类型统计设备数量
+export function deviceStaticsByType(params) {
+ return request({
+ url: 'statics/deviceStaticsByType',
+ method: 'get',
+ params
+ })
+}
+
+// 查询二级分区气体流量计告警
+export function alarmBySecondArea(params) {
+ return request({
+ url: 'gasStatistic/alarmBySecondArea',
+ method: 'get',
+ params
+ })
+}
+
+// 用气事记查询
+export function getNoteList(type) {
+ return request({
+ url: '/note/list/' + type,
+ // url: '/note/list',
+ method: 'get'
+ })
+}
+
+// 用气事记更新
+export function updateNoteList(data) {
+ return request({
+ url: '/note/edit',
+ method: 'post',
+ data
+ })
+}
+
+// 获取报警列表
+export function getAlarmsNow(params) {
+ return request({
+ url: 'overview/alarmNow',
+ method: 'get',
+ params
+ })
+}
+
+// 总览marker（真接口）
+export function getMapping(devType, keywords) {
+ return request({
+ url: 'overview/wellMapping',
+ method: 'get',
+ params: {
+ keywords: keywords,
+ devType: devType
+ }
+ })
+}
+
diff --git a/src/components/BigData/Card/index.vue b/src/components/BigData/Card/index.vue
index 8320d47..8944b44 100644
--- a/src/components/BigData/Card/index.vue
+++ b/src/components/BigData/Card/index.vue
@@ -10,7 +10,7 @@
{{ context }}
- {{unit}}
+ {{ unit }}
-
-
-
- {{ title[0] }} {{ context[0] }}{{unit}}
-
-
- {{ title[1] }} {{ context[1] }}{{unit}}
+
+
@@ -41,9 +41,9 @@
type: String,
default: '#40c9c6'
},
- unit:{
+ unit: {
type: String,
- default:''
+ default: ''
}
},
computed: {
diff --git a/src/components/BigData/Card1/index.vue b/src/components/BigData/Card1/index.vue
index 722c24c..c9ec32d 100644
--- a/src/components/BigData/Card1/index.vue
+++ b/src/components/BigData/Card1/index.vue
@@ -4,30 +4,20 @@
-
-
+
-
-
@@ -28,7 +29,7 @@
- 导出记录
+ 导出记录
@@ -63,6 +64,7 @@
import { getGasData, batchExportGasData } from '@/api/data'
import DeptSelect from '../../../components/DeptSelect/index'
import { parseUrl } from '@/utils/parseutils'
+import { getSearchLastWeekTime } from '@/utils/dateutils'
export default {
name: 'ListGasData',
@@ -163,6 +165,7 @@
if (params && params.deviceType === '4' && params.devcode) {
this.listQuery.keywords = params.devcode
}
+ this.timeRange = getSearchLastWeekTime()
this.fetchData()
}
},
@@ -191,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/listGasflowData.vue b/src/views/dataManage/deviceData/listGasflowData.vue
new file mode 100644
index 0000000..9c5321a
--- /dev/null
+++ b/src/views/dataManage/deviceData/listGasflowData.vue
@@ -0,0 +1,311 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/alarmGasCountByType.vue b/src/views/gasDashboard/components/alarmGasCountByType.vue
new file mode 100644
index 0000000..4f80d3a
--- /dev/null
+++ b/src/views/gasDashboard/components/alarmGasCountByType.vue
@@ -0,0 +1,72 @@
+
+
+
+
-
+ {{ name }} {{ context[index] }}{{ unit }}
+
@@ -36,46 +26,46 @@
diff --git a/src/views/dataManage/deviceData/listCorrodeData.vue b/src/views/dataManage/deviceData/listCorrodeData.vue
new file mode 100644
index 0000000..1a20abb
--- /dev/null
+++ b/src/views/dataManage/deviceData/listCorrodeData.vue
@@ -0,0 +1,272 @@
+
+
{{ title[0] }}
- {{ context[0] }}{{unit}}
+ {{ context[0] }}{{ unit }}
+
+
+
+
+
+
+
diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue
index 97cdfdb..40b9a5e 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -5,10 +5,10 @@
+
+
+
+
+
+
+ 搜索
+
+
+
+
+
+
+
+ 导出记录
+
+
+
+
+
+
+ {{ scope.row[column.value] }}
+ {{ scope.row[column.value] }}
+
+
+
+
+
+ 数据列表
+
+ 数据列表
+
+
+
+
+
+
+
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 bf03fd1..dffd340 100644
--- a/src/views/dataManage/deviceData/listWaterData.vue
+++ b/src/views/dataManage/deviceData/listWaterData.vue
@@ -176,6 +176,12 @@
align: 'center'
},
{
+ text: '压力(Mpa)',
+ value: 'pressure',
+ width: 90,
+ align: 'center'
+ },
+ {
text: '今日用水量（立方米）',
value: 'dayCount',
align: 'center',
@@ -276,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) // 下载完成移除元素
@@ -311,9 +317,11 @@
}
getWatchData(this.listQuery).then((response) => {
this.list = response.data.rows.map(function(item) {
- item.areaFullName = item.areaFullName
- .replace('/', '')
- .replace('顶层', '')
+ item.totalCount = parseFloat(item.totalCount).toFixed(2)
+ item.dayCount = parseFloat(item.dayCount).toFixed(2)
+ item.monthCount = parseFloat(item.monthCount).toFixed(2)
+ item.pressure = parseFloat(item.pressure).toFixed(2)
+ item.areaFullName = item.areaFullName.replace('/', '').replace('顶层', '')
return item
})
this.total = parseInt(response.data.total)
diff --git a/src/views/dataManage/deviceData/waterHistory.vue b/src/views/dataManage/deviceData/waterHistory.vue
index 160dab7..42e3303 100644
--- a/src/views/dataManage/deviceData/waterHistory.vue
+++ b/src/views/dataManage/deviceData/waterHistory.vue
@@ -1,5 +1,5 @@
-
+
+
+
+
+
+
+ 搜索
+
+
+
+
+
+
+
+ 导出记录
+
+
+
+
+
+
+ {{
+ scope.row[column.value]
+ }}
+ {{
+ scope.row["areaFullName"] + '/' + scope.row[column.value]
+ }}
+ {{ scope.row[column.value] }}
+
+
+
+
+
+ 历史数据
+
+
+
+
+
+
+ 数据列表
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/AlarmNowList.vue b/src/views/gasDashboard/components/AlarmNowList.vue
new file mode 100644
index 0000000..890325f
--- /dev/null
+++ b/src/views/gasDashboard/components/AlarmNowList.vue
@@ -0,0 +1,35 @@
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/DeviceCount.vue b/src/views/gasDashboard/components/DeviceCount.vue
new file mode 100644
index 0000000..bffc9e9
--- /dev/null
+++ b/src/views/gasDashboard/components/DeviceCount.vue
@@ -0,0 +1,68 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/FunctionArea.vue b/src/views/gasDashboard/components/FunctionArea.vue
new file mode 100644
index 0000000..6401557
--- /dev/null
+++ b/src/views/gasDashboard/components/FunctionArea.vue
@@ -0,0 +1,140 @@
+
+
+
+ 本年度
+ 本季度
+ 近30日
+ 近7日
+ 今日
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/FunctionArea2.vue b/src/views/gasDashboard/components/FunctionArea2.vue
new file mode 100644
index 0000000..26a9f82
--- /dev/null
+++ b/src/views/gasDashboard/components/FunctionArea2.vue
@@ -0,0 +1,107 @@
+
+
+
+ 本年度
+ 本季度
+ 近30日
+ 近7日
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/PanelGroup.vue b/src/views/gasDashboard/components/PanelGroup.vue
new file mode 100644
index 0000000..103486e
--- /dev/null
+++ b/src/views/gasDashboard/components/PanelGroup.vue
@@ -0,0 +1,137 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/alarmLeakCountPie.vue b/src/views/gasDashboard/components/alarmLeakCountPie.vue
new file mode 100644
index 0000000..abfbc2d
--- /dev/null
+++ b/src/views/gasDashboard/components/alarmLeakCountPie.vue
@@ -0,0 +1,74 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/corrodeCountByDay.vue b/src/views/gasDashboard/components/corrodeCountByDay.vue
new file mode 100644
index 0000000..a410f29
--- /dev/null
+++ b/src/views/gasDashboard/components/corrodeCountByDay.vue
@@ -0,0 +1,100 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasAlarmTrend.vue b/src/views/gasDashboard/components/gasAlarmTrend.vue
new file mode 100644
index 0000000..a1d422e
--- /dev/null
+++ b/src/views/gasDashboard/components/gasAlarmTrend.vue
@@ -0,0 +1,100 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasCompare.vue b/src/views/gasDashboard/components/gasCompare.vue
new file mode 100644
index 0000000..19a4398
--- /dev/null
+++ b/src/views/gasDashboard/components/gasCompare.vue
@@ -0,0 +1,121 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasCountByAreaBar.vue b/src/views/gasDashboard/components/gasCountByAreaBar.vue
new file mode 100644
index 0000000..456a6c6
--- /dev/null
+++ b/src/views/gasDashboard/components/gasCountByAreaBar.vue
@@ -0,0 +1,198 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasCountByDay.vue b/src/views/gasDashboard/components/gasCountByDay.vue
new file mode 100644
index 0000000..f0a3977
--- /dev/null
+++ b/src/views/gasDashboard/components/gasCountByDay.vue
@@ -0,0 +1,114 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasCountByDept.vue b/src/views/gasDashboard/components/gasCountByDept.vue
new file mode 100644
index 0000000..31c8508
--- /dev/null
+++ b/src/views/gasDashboard/components/gasCountByDept.vue
@@ -0,0 +1,126 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasCountByDeviceBar.vue b/src/views/gasDashboard/components/gasCountByDeviceBar.vue
new file mode 100644
index 0000000..dc211e3
--- /dev/null
+++ b/src/views/gasDashboard/components/gasCountByDeviceBar.vue
@@ -0,0 +1,130 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasNote.vue b/src/views/gasDashboard/components/gasNote.vue
new file mode 100644
index 0000000..5ade90f
--- /dev/null
+++ b/src/views/gasDashboard/components/gasNote.vue
@@ -0,0 +1,149 @@
+
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/watchAlarmBar.vue b/src/views/gasDashboard/components/watchAlarmBar.vue
new file mode 100644
index 0000000..4279440
--- /dev/null
+++ b/src/views/gasDashboard/components/watchAlarmBar.vue
@@ -0,0 +1,180 @@
+
+
+
+ 场区用气事记
+
+
+
+
+
+
+
+
+
+ {{ index+1 }}. {{ item.content }}
+
+
+ {{ index+1 }}.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
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/index.js b/config/index.js
index 106eaa6..30dda44 100644
--- a/config/index.js
+++ b/config/index.js
@@ -33,7 +33,7 @@
// Use Eslint Loader?
// If true, your code will be linted during bundling and
// linting errors and warnings will be shown in the console.
- useEslint: true,
+ useEslint: false,
// If true, eslint errors and warnings will also be shown in the error overlay
// in the browser.
showEslintErrorsInOverlay: false,
diff --git a/config/prod.env.js b/config/prod.env.js
index 3455ce7..bb20d1d 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -3,5 +3,6 @@
NODE_ENV: '"production"',
// BASE_API: '"http://111.198.10.15:11304"',
// BASE_API: '"http://42.81.160.165:2022/smartwell/"',
- BASE_API: '"http://111.198.10.15:11409/smartwell"' //11643
+ // BASE_API: '"http://111.198.10.15:11409/smartwell"' //11643
+ BASE_API: '"http://111.198.10.15:20104"' //11643
}
diff --git a/package.json b/package.json
index be3e56e..a60e7b3 100644
--- a/package.json
+++ b/package.json
@@ -86,7 +86,7 @@
"vue-template-compiler": "2.5.17",
"webpack": "4.16.5",
"webpack-bundle-analyzer": "2.13.1",
- "webpack-cli": "3.1.0",
+ "webpack-cli": "^3.1.0",
"webpack-dev-server": "3.1.14",
"webpack-merge": "4.1.4"
},
diff --git a/src/App.vue b/src/App.vue
index 721d3a3..ec9032c 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,6 +1,6 @@
-
diff --git a/src/api/dashboard.js b/src/api/dashboard.js
index aaadb23..6f56e28 100644
--- a/src/api/dashboard.js
+++ b/src/api/dashboard.js
@@ -79,11 +79,10 @@
})
}
-
// 用水事记查询
-export function getNoteList() {
+export function getNoteList(type) {
return request({
- url: '/note/list',
+ url: '/note/list/' + type,
method: 'get'
})
}
@@ -92,7 +91,6 @@
export function updateNoteList(data) {
return request({
url: '/note/edit',
- // url: 'waterMeterData/count',
method: 'post',
data
})
diff --git a/src/api/data.js b/src/api/data.js
index b7c9ba2..65c5071 100644
--- a/src/api/data.js
+++ b/src/api/data.js
@@ -85,6 +85,22 @@
params
})
}
+// 气体流量计数据查询
+export function getGasflowData(params) {
+ return request({
+ url: 'gasflow/list',
+ method: 'get',
+ params
+ })
+}
+// 腐蚀速率监测仪数据查询
+export function getCorrodeData(params) {
+ return request({
+ url: 'corrode/data/list',
+ method: 'get',
+ params
+ })
+}
// 批量导出井盖数据
export function batchExportWellData(params) {
@@ -183,6 +199,26 @@
responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
})
}
+// 腐蚀速率监测仪数据导出
+export function batchExportCorrodeData(params) {
+ return request({
+ url: 'corrode/data/export',
+ method: 'get',
+ timeout: 120000, // 120s，2分钟
+ params,
+ responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+ })
+}
+// 气体流量计数据导出
+export function batchExportGasflowData(params) {
+ return request({
+ url: 'gasflow/data/export',
+ method: 'get',
+ timeout: 120000, // 120s，2分钟
+ params,
+ responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+ })
+}
// 温度压力数据查询
export function getTempPressData(params) {
diff --git a/src/api/device.js b/src/api/device.js
index 00804fe..edcc1a4 100644
--- a/src/api/device.js
+++ b/src/api/device.js
@@ -100,4 +100,11 @@
params
})
}
+export function totalDataGasFlow(params) {
+ return request({
+ url: 'gasflow/listByDevice',
+ method: 'post',
+ params
+ })
+}
diff --git a/src/api/gasOverview.js b/src/api/gasOverview.js
new file mode 100644
index 0000000..0dc3442
--- /dev/null
+++ b/src/api/gasOverview.js
@@ -0,0 +1,173 @@
+/**
+ * 动力管线
+ */
+import request from '@/utils/request'
+
+// 用水量、噪声统计数据
+export function gasStatistic() {
+ return request({
+ url: 'gasStatistic/overview',
+ method: 'get'
+ })
+}
+
+// 用水量、噪声统计数据
+export function gasStatistic2(deviceType) {
+ return request({
+ url: 'gas/statistics/used',
+ method: 'get',
+ params: {
+ deviceType: deviceType
+ }
+ })
+}
+
+// 气体用气量走势图
+export function gasTrend(params) {
+ return request({
+ url: '/gas/statistics/trend',
+ method: 'get',
+ params
+ })
+}
+// 用气量超量报警统计
+export function gasAlarmTrend(params) {
+ return request({
+ url: '/gas/alarm/trend',
+ method: 'get',
+ params
+ })
+}
+// 各设备气体用气量
+export function gasUsed(params) {
+ return request({
+ url: '/gas/used',
+ method: 'get',
+ params
+ })
+}
+// 气体泄漏监测结果
+export function gasLeakStatus(params) {
+ return request({
+ url: 'gas/leakage/rate',
+ method: 'get',
+ params
+ })
+}
+
+// 气体流量计数量
+export function deviceCount(type) {
+ return request({
+ url: 'device/count/' + type,
+ method: 'get'
+ })
+}
+
+// 统计当前报警数
+export function alarmNowStatic(params) {
+ return request({
+ url: 'statics/alarmsNow',
+ method: 'get',
+ params
+ })
+}
+
+// 查询二级分区各区用气量
+export function countBySecondArea(params) {
+ return request({
+ url: 'gasStatistic/countBySecondArea',
+ method: 'get',
+ params
+ })
+}
+
+// 查询二级分区7日用气量
+export function countByDaySecond(params) {
+ return request({
+ url: 'gasStatistic/countByDay',
+ method: 'get',
+ params
+ })
+}
+// 查询二级分区燃气告警
+export function gasAlarmBySecondArea(params) {
+ return request({
+ url: 'gas/alarm/rate',
+ method: 'get',
+ params
+ })
+}
+// 各设备腐蚀速率统计
+export function corrRateByDevice(params) {
+ return request({
+ url: 'corrode/data/corrRateByDevice',
+ method: 'get',
+ params
+ })
+}
+// 查询二级分区用气对比
+export function gasCompareData(params) {
+ return request({
+ url: 'gasStatistic/gasCompare',
+ method: 'get',
+ params
+ })
+}
+
+// 根据设备类型统计设备数量
+export function deviceStaticsByType(params) {
+ return request({
+ url: 'statics/deviceStaticsByType',
+ method: 'get',
+ params
+ })
+}
+
+// 查询二级分区气体流量计告警
+export function alarmBySecondArea(params) {
+ return request({
+ url: 'gasStatistic/alarmBySecondArea',
+ method: 'get',
+ params
+ })
+}
+
+// 用气事记查询
+export function getNoteList(type) {
+ return request({
+ url: '/note/list/' + type,
+ // url: '/note/list',
+ method: 'get'
+ })
+}
+
+// 用气事记更新
+export function updateNoteList(data) {
+ return request({
+ url: '/note/edit',
+ method: 'post',
+ data
+ })
+}
+
+// 获取报警列表
+export function getAlarmsNow(params) {
+ return request({
+ url: 'overview/alarmNow',
+ method: 'get',
+ params
+ })
+}
+
+// 总览marker（真接口）
+export function getMapping(devType, keywords) {
+ return request({
+ url: 'overview/wellMapping',
+ method: 'get',
+ params: {
+ keywords: keywords,
+ devType: devType
+ }
+ })
+}
+
diff --git a/src/components/BigData/Card/index.vue b/src/components/BigData/Card/index.vue
index 8320d47..8944b44 100644
--- a/src/components/BigData/Card/index.vue
+++ b/src/components/BigData/Card/index.vue
@@ -10,7 +10,7 @@
{{ context }}
- {{unit}}
+ {{ unit }}
-
-
-
- {{ title[0] }} {{ context[0] }}{{unit}}
-
-
- {{ title[1] }} {{ context[1] }}{{unit}}
+
+
@@ -41,9 +41,9 @@
type: String,
default: '#40c9c6'
},
- unit:{
+ unit: {
type: String,
- default:''
+ default: ''
}
},
computed: {
diff --git a/src/components/BigData/Card1/index.vue b/src/components/BigData/Card1/index.vue
index 722c24c..c9ec32d 100644
--- a/src/components/BigData/Card1/index.vue
+++ b/src/components/BigData/Card1/index.vue
@@ -4,30 +4,20 @@
-
-
+
-
-
@@ -28,7 +29,7 @@
- 导出记录
+ 导出记录
@@ -63,6 +64,7 @@
import { getGasData, batchExportGasData } from '@/api/data'
import DeptSelect from '../../../components/DeptSelect/index'
import { parseUrl } from '@/utils/parseutils'
+import { getSearchLastWeekTime } from '@/utils/dateutils'
export default {
name: 'ListGasData',
@@ -163,6 +165,7 @@
if (params && params.deviceType === '4' && params.devcode) {
this.listQuery.keywords = params.devcode
}
+ this.timeRange = getSearchLastWeekTime()
this.fetchData()
}
},
@@ -191,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/listGasflowData.vue b/src/views/dataManage/deviceData/listGasflowData.vue
new file mode 100644
index 0000000..9c5321a
--- /dev/null
+++ b/src/views/dataManage/deviceData/listGasflowData.vue
@@ -0,0 +1,311 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/alarmGasCountByType.vue b/src/views/gasDashboard/components/alarmGasCountByType.vue
new file mode 100644
index 0000000..4f80d3a
--- /dev/null
+++ b/src/views/gasDashboard/components/alarmGasCountByType.vue
@@ -0,0 +1,72 @@
+
+
+
+
-
+ {{ name }} {{ context[index] }}{{ unit }}
+
@@ -36,46 +26,46 @@
diff --git a/src/views/dataManage/deviceData/listCorrodeData.vue b/src/views/dataManage/deviceData/listCorrodeData.vue
new file mode 100644
index 0000000..1a20abb
--- /dev/null
+++ b/src/views/dataManage/deviceData/listCorrodeData.vue
@@ -0,0 +1,272 @@
+
+
{{ title[0] }}
- {{ context[0] }}{{unit}}
+ {{ context[0] }}{{ unit }}
+
+
+
+
+
+
+
diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue
index 97cdfdb..40b9a5e 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -5,10 +5,10 @@
+
+
+
+
+
+
+ 搜索
+
+
+
+
+
+
+
+ 导出记录
+
+
+
+
+
+
+ {{ scope.row[column.value] }}
+ {{ scope.row[column.value] }}
+
+
+
+
+
+ 数据列表
+
+ 数据列表
+
+
+
+
+
+
+
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 bf03fd1..dffd340 100644
--- a/src/views/dataManage/deviceData/listWaterData.vue
+++ b/src/views/dataManage/deviceData/listWaterData.vue
@@ -176,6 +176,12 @@
align: 'center'
},
{
+ text: '压力(Mpa)',
+ value: 'pressure',
+ width: 90,
+ align: 'center'
+ },
+ {
text: '今日用水量（立方米）',
value: 'dayCount',
align: 'center',
@@ -276,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) // 下载完成移除元素
@@ -311,9 +317,11 @@
}
getWatchData(this.listQuery).then((response) => {
this.list = response.data.rows.map(function(item) {
- item.areaFullName = item.areaFullName
- .replace('/', '')
- .replace('顶层', '')
+ item.totalCount = parseFloat(item.totalCount).toFixed(2)
+ item.dayCount = parseFloat(item.dayCount).toFixed(2)
+ item.monthCount = parseFloat(item.monthCount).toFixed(2)
+ item.pressure = parseFloat(item.pressure).toFixed(2)
+ item.areaFullName = item.areaFullName.replace('/', '').replace('顶层', '')
return item
})
this.total = parseInt(response.data.total)
diff --git a/src/views/dataManage/deviceData/waterHistory.vue b/src/views/dataManage/deviceData/waterHistory.vue
index 160dab7..42e3303 100644
--- a/src/views/dataManage/deviceData/waterHistory.vue
+++ b/src/views/dataManage/deviceData/waterHistory.vue
@@ -1,5 +1,5 @@
-
+
+
+
+
+
+
+ 搜索
+
+
+
+
+
+
+
+ 导出记录
+
+
+
+
+
+
+ {{
+ scope.row[column.value]
+ }}
+ {{
+ scope.row["areaFullName"] + '/' + scope.row[column.value]
+ }}
+ {{ scope.row[column.value] }}
+
+
+
+
+
+ 历史数据
+
+
+
+
+
+
+ 数据列表
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/AlarmNowList.vue b/src/views/gasDashboard/components/AlarmNowList.vue
new file mode 100644
index 0000000..890325f
--- /dev/null
+++ b/src/views/gasDashboard/components/AlarmNowList.vue
@@ -0,0 +1,35 @@
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/DeviceCount.vue b/src/views/gasDashboard/components/DeviceCount.vue
new file mode 100644
index 0000000..bffc9e9
--- /dev/null
+++ b/src/views/gasDashboard/components/DeviceCount.vue
@@ -0,0 +1,68 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/FunctionArea.vue b/src/views/gasDashboard/components/FunctionArea.vue
new file mode 100644
index 0000000..6401557
--- /dev/null
+++ b/src/views/gasDashboard/components/FunctionArea.vue
@@ -0,0 +1,140 @@
+
+
+
+ 本年度
+ 本季度
+ 近30日
+ 近7日
+ 今日
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/FunctionArea2.vue b/src/views/gasDashboard/components/FunctionArea2.vue
new file mode 100644
index 0000000..26a9f82
--- /dev/null
+++ b/src/views/gasDashboard/components/FunctionArea2.vue
@@ -0,0 +1,107 @@
+
+
+
+ 本年度
+ 本季度
+ 近30日
+ 近7日
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/PanelGroup.vue b/src/views/gasDashboard/components/PanelGroup.vue
new file mode 100644
index 0000000..103486e
--- /dev/null
+++ b/src/views/gasDashboard/components/PanelGroup.vue
@@ -0,0 +1,137 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/alarmLeakCountPie.vue b/src/views/gasDashboard/components/alarmLeakCountPie.vue
new file mode 100644
index 0000000..abfbc2d
--- /dev/null
+++ b/src/views/gasDashboard/components/alarmLeakCountPie.vue
@@ -0,0 +1,74 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/corrodeCountByDay.vue b/src/views/gasDashboard/components/corrodeCountByDay.vue
new file mode 100644
index 0000000..a410f29
--- /dev/null
+++ b/src/views/gasDashboard/components/corrodeCountByDay.vue
@@ -0,0 +1,100 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasAlarmTrend.vue b/src/views/gasDashboard/components/gasAlarmTrend.vue
new file mode 100644
index 0000000..a1d422e
--- /dev/null
+++ b/src/views/gasDashboard/components/gasAlarmTrend.vue
@@ -0,0 +1,100 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasCompare.vue b/src/views/gasDashboard/components/gasCompare.vue
new file mode 100644
index 0000000..19a4398
--- /dev/null
+++ b/src/views/gasDashboard/components/gasCompare.vue
@@ -0,0 +1,121 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasCountByAreaBar.vue b/src/views/gasDashboard/components/gasCountByAreaBar.vue
new file mode 100644
index 0000000..456a6c6
--- /dev/null
+++ b/src/views/gasDashboard/components/gasCountByAreaBar.vue
@@ -0,0 +1,198 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasCountByDay.vue b/src/views/gasDashboard/components/gasCountByDay.vue
new file mode 100644
index 0000000..f0a3977
--- /dev/null
+++ b/src/views/gasDashboard/components/gasCountByDay.vue
@@ -0,0 +1,114 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasCountByDept.vue b/src/views/gasDashboard/components/gasCountByDept.vue
new file mode 100644
index 0000000..31c8508
--- /dev/null
+++ b/src/views/gasDashboard/components/gasCountByDept.vue
@@ -0,0 +1,126 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasCountByDeviceBar.vue b/src/views/gasDashboard/components/gasCountByDeviceBar.vue
new file mode 100644
index 0000000..dc211e3
--- /dev/null
+++ b/src/views/gasDashboard/components/gasCountByDeviceBar.vue
@@ -0,0 +1,130 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasNote.vue b/src/views/gasDashboard/components/gasNote.vue
new file mode 100644
index 0000000..5ade90f
--- /dev/null
+++ b/src/views/gasDashboard/components/gasNote.vue
@@ -0,0 +1,149 @@
+
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/watchAlarmBar.vue b/src/views/gasDashboard/components/watchAlarmBar.vue
new file mode 100644
index 0000000..4279440
--- /dev/null
+++ b/src/views/gasDashboard/components/watchAlarmBar.vue
@@ -0,0 +1,180 @@
+
+
+
+ 场区用气事记
+
+
+
+
+
+
+
+
+
+ {{ index+1 }}. {{ item.content }}
+
+
+ {{ index+1 }}.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/watchGasAlarmBar.vue b/src/views/gasDashboard/components/watchGasAlarmBar.vue
new file mode 100644
index 0000000..0113341
--- /dev/null
+++ b/src/views/gasDashboard/components/watchGasAlarmBar.vue
@@ -0,0 +1,132 @@
+
+
+
+
+
+
+
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/index.js b/config/index.js
index 106eaa6..30dda44 100644
--- a/config/index.js
+++ b/config/index.js
@@ -33,7 +33,7 @@
// Use Eslint Loader?
// If true, your code will be linted during bundling and
// linting errors and warnings will be shown in the console.
- useEslint: true,
+ useEslint: false,
// If true, eslint errors and warnings will also be shown in the error overlay
// in the browser.
showEslintErrorsInOverlay: false,
diff --git a/config/prod.env.js b/config/prod.env.js
index 3455ce7..bb20d1d 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -3,5 +3,6 @@
NODE_ENV: '"production"',
// BASE_API: '"http://111.198.10.15:11304"',
// BASE_API: '"http://42.81.160.165:2022/smartwell/"',
- BASE_API: '"http://111.198.10.15:11409/smartwell"' //11643
+ // BASE_API: '"http://111.198.10.15:11409/smartwell"' //11643
+ BASE_API: '"http://111.198.10.15:20104"' //11643
}
diff --git a/package.json b/package.json
index be3e56e..a60e7b3 100644
--- a/package.json
+++ b/package.json
@@ -86,7 +86,7 @@
"vue-template-compiler": "2.5.17",
"webpack": "4.16.5",
"webpack-bundle-analyzer": "2.13.1",
- "webpack-cli": "3.1.0",
+ "webpack-cli": "^3.1.0",
"webpack-dev-server": "3.1.14",
"webpack-merge": "4.1.4"
},
diff --git a/src/App.vue b/src/App.vue
index 721d3a3..ec9032c 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,6 +1,6 @@
-
diff --git a/src/api/dashboard.js b/src/api/dashboard.js
index aaadb23..6f56e28 100644
--- a/src/api/dashboard.js
+++ b/src/api/dashboard.js
@@ -79,11 +79,10 @@
})
}
-
// 用水事记查询
-export function getNoteList() {
+export function getNoteList(type) {
return request({
- url: '/note/list',
+ url: '/note/list/' + type,
method: 'get'
})
}
@@ -92,7 +91,6 @@
export function updateNoteList(data) {
return request({
url: '/note/edit',
- // url: 'waterMeterData/count',
method: 'post',
data
})
diff --git a/src/api/data.js b/src/api/data.js
index b7c9ba2..65c5071 100644
--- a/src/api/data.js
+++ b/src/api/data.js
@@ -85,6 +85,22 @@
params
})
}
+// 气体流量计数据查询
+export function getGasflowData(params) {
+ return request({
+ url: 'gasflow/list',
+ method: 'get',
+ params
+ })
+}
+// 腐蚀速率监测仪数据查询
+export function getCorrodeData(params) {
+ return request({
+ url: 'corrode/data/list',
+ method: 'get',
+ params
+ })
+}
// 批量导出井盖数据
export function batchExportWellData(params) {
@@ -183,6 +199,26 @@
responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
})
}
+// 腐蚀速率监测仪数据导出
+export function batchExportCorrodeData(params) {
+ return request({
+ url: 'corrode/data/export',
+ method: 'get',
+ timeout: 120000, // 120s，2分钟
+ params,
+ responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+ })
+}
+// 气体流量计数据导出
+export function batchExportGasflowData(params) {
+ return request({
+ url: 'gasflow/data/export',
+ method: 'get',
+ timeout: 120000, // 120s，2分钟
+ params,
+ responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+ })
+}
// 温度压力数据查询
export function getTempPressData(params) {
diff --git a/src/api/device.js b/src/api/device.js
index 00804fe..edcc1a4 100644
--- a/src/api/device.js
+++ b/src/api/device.js
@@ -100,4 +100,11 @@
params
})
}
+export function totalDataGasFlow(params) {
+ return request({
+ url: 'gasflow/listByDevice',
+ method: 'post',
+ params
+ })
+}
diff --git a/src/api/gasOverview.js b/src/api/gasOverview.js
new file mode 100644
index 0000000..0dc3442
--- /dev/null
+++ b/src/api/gasOverview.js
@@ -0,0 +1,173 @@
+/**
+ * 动力管线
+ */
+import request from '@/utils/request'
+
+// 用水量、噪声统计数据
+export function gasStatistic() {
+ return request({
+ url: 'gasStatistic/overview',
+ method: 'get'
+ })
+}
+
+// 用水量、噪声统计数据
+export function gasStatistic2(deviceType) {
+ return request({
+ url: 'gas/statistics/used',
+ method: 'get',
+ params: {
+ deviceType: deviceType
+ }
+ })
+}
+
+// 气体用气量走势图
+export function gasTrend(params) {
+ return request({
+ url: '/gas/statistics/trend',
+ method: 'get',
+ params
+ })
+}
+// 用气量超量报警统计
+export function gasAlarmTrend(params) {
+ return request({
+ url: '/gas/alarm/trend',
+ method: 'get',
+ params
+ })
+}
+// 各设备气体用气量
+export function gasUsed(params) {
+ return request({
+ url: '/gas/used',
+ method: 'get',
+ params
+ })
+}
+// 气体泄漏监测结果
+export function gasLeakStatus(params) {
+ return request({
+ url: 'gas/leakage/rate',
+ method: 'get',
+ params
+ })
+}
+
+// 气体流量计数量
+export function deviceCount(type) {
+ return request({
+ url: 'device/count/' + type,
+ method: 'get'
+ })
+}
+
+// 统计当前报警数
+export function alarmNowStatic(params) {
+ return request({
+ url: 'statics/alarmsNow',
+ method: 'get',
+ params
+ })
+}
+
+// 查询二级分区各区用气量
+export function countBySecondArea(params) {
+ return request({
+ url: 'gasStatistic/countBySecondArea',
+ method: 'get',
+ params
+ })
+}
+
+// 查询二级分区7日用气量
+export function countByDaySecond(params) {
+ return request({
+ url: 'gasStatistic/countByDay',
+ method: 'get',
+ params
+ })
+}
+// 查询二级分区燃气告警
+export function gasAlarmBySecondArea(params) {
+ return request({
+ url: 'gas/alarm/rate',
+ method: 'get',
+ params
+ })
+}
+// 各设备腐蚀速率统计
+export function corrRateByDevice(params) {
+ return request({
+ url: 'corrode/data/corrRateByDevice',
+ method: 'get',
+ params
+ })
+}
+// 查询二级分区用气对比
+export function gasCompareData(params) {
+ return request({
+ url: 'gasStatistic/gasCompare',
+ method: 'get',
+ params
+ })
+}
+
+// 根据设备类型统计设备数量
+export function deviceStaticsByType(params) {
+ return request({
+ url: 'statics/deviceStaticsByType',
+ method: 'get',
+ params
+ })
+}
+
+// 查询二级分区气体流量计告警
+export function alarmBySecondArea(params) {
+ return request({
+ url: 'gasStatistic/alarmBySecondArea',
+ method: 'get',
+ params
+ })
+}
+
+// 用气事记查询
+export function getNoteList(type) {
+ return request({
+ url: '/note/list/' + type,
+ // url: '/note/list',
+ method: 'get'
+ })
+}
+
+// 用气事记更新
+export function updateNoteList(data) {
+ return request({
+ url: '/note/edit',
+ method: 'post',
+ data
+ })
+}
+
+// 获取报警列表
+export function getAlarmsNow(params) {
+ return request({
+ url: 'overview/alarmNow',
+ method: 'get',
+ params
+ })
+}
+
+// 总览marker（真接口）
+export function getMapping(devType, keywords) {
+ return request({
+ url: 'overview/wellMapping',
+ method: 'get',
+ params: {
+ keywords: keywords,
+ devType: devType
+ }
+ })
+}
+
diff --git a/src/components/BigData/Card/index.vue b/src/components/BigData/Card/index.vue
index 8320d47..8944b44 100644
--- a/src/components/BigData/Card/index.vue
+++ b/src/components/BigData/Card/index.vue
@@ -10,7 +10,7 @@
{{ context }}
- {{unit}}
+ {{ unit }}
-
-
-
- {{ title[0] }} {{ context[0] }}{{unit}}
-
-
- {{ title[1] }} {{ context[1] }}{{unit}}
+
+
@@ -41,9 +41,9 @@
type: String,
default: '#40c9c6'
},
- unit:{
+ unit: {
type: String,
- default:''
+ default: ''
}
},
computed: {
diff --git a/src/components/BigData/Card1/index.vue b/src/components/BigData/Card1/index.vue
index 722c24c..c9ec32d 100644
--- a/src/components/BigData/Card1/index.vue
+++ b/src/components/BigData/Card1/index.vue
@@ -4,30 +4,20 @@
-
-
+
-
-
@@ -28,7 +29,7 @@
- 导出记录
+ 导出记录
@@ -63,6 +64,7 @@
import { getGasData, batchExportGasData } from '@/api/data'
import DeptSelect from '../../../components/DeptSelect/index'
import { parseUrl } from '@/utils/parseutils'
+import { getSearchLastWeekTime } from '@/utils/dateutils'
export default {
name: 'ListGasData',
@@ -163,6 +165,7 @@
if (params && params.deviceType === '4' && params.devcode) {
this.listQuery.keywords = params.devcode
}
+ this.timeRange = getSearchLastWeekTime()
this.fetchData()
}
},
@@ -191,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/listGasflowData.vue b/src/views/dataManage/deviceData/listGasflowData.vue
new file mode 100644
index 0000000..9c5321a
--- /dev/null
+++ b/src/views/dataManage/deviceData/listGasflowData.vue
@@ -0,0 +1,311 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/alarmGasCountByType.vue b/src/views/gasDashboard/components/alarmGasCountByType.vue
new file mode 100644
index 0000000..4f80d3a
--- /dev/null
+++ b/src/views/gasDashboard/components/alarmGasCountByType.vue
@@ -0,0 +1,72 @@
+
+
+
+
-
+ {{ name }} {{ context[index] }}{{ unit }}
+
@@ -36,46 +26,46 @@
diff --git a/src/views/dataManage/deviceData/listCorrodeData.vue b/src/views/dataManage/deviceData/listCorrodeData.vue
new file mode 100644
index 0000000..1a20abb
--- /dev/null
+++ b/src/views/dataManage/deviceData/listCorrodeData.vue
@@ -0,0 +1,272 @@
+
+
{{ title[0] }}
- {{ context[0] }}{{unit}}
+ {{ context[0] }}{{ unit }}
+
+
+
+
+
+
+
diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue
index 97cdfdb..40b9a5e 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -5,10 +5,10 @@
+
+
+
+
+
+
+ 搜索
+
+
+
+
+
+
+
+ 导出记录
+
+
+
+
+
+
+ {{ scope.row[column.value] }}
+ {{ scope.row[column.value] }}
+
+
+
+
+
+ 数据列表
+
+ 数据列表
+
+
+
+
+
+
+
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 bf03fd1..dffd340 100644
--- a/src/views/dataManage/deviceData/listWaterData.vue
+++ b/src/views/dataManage/deviceData/listWaterData.vue
@@ -176,6 +176,12 @@
align: 'center'
},
{
+ text: '压力(Mpa)',
+ value: 'pressure',
+ width: 90,
+ align: 'center'
+ },
+ {
text: '今日用水量（立方米）',
value: 'dayCount',
align: 'center',
@@ -276,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) // 下载完成移除元素
@@ -311,9 +317,11 @@
}
getWatchData(this.listQuery).then((response) => {
this.list = response.data.rows.map(function(item) {
- item.areaFullName = item.areaFullName
- .replace('/', '')
- .replace('顶层', '')
+ item.totalCount = parseFloat(item.totalCount).toFixed(2)
+ item.dayCount = parseFloat(item.dayCount).toFixed(2)
+ item.monthCount = parseFloat(item.monthCount).toFixed(2)
+ item.pressure = parseFloat(item.pressure).toFixed(2)
+ item.areaFullName = item.areaFullName.replace('/', '').replace('顶层', '')
return item
})
this.total = parseInt(response.data.total)
diff --git a/src/views/dataManage/deviceData/waterHistory.vue b/src/views/dataManage/deviceData/waterHistory.vue
index 160dab7..42e3303 100644
--- a/src/views/dataManage/deviceData/waterHistory.vue
+++ b/src/views/dataManage/deviceData/waterHistory.vue
@@ -1,5 +1,5 @@
-
+
+
+
+
+
+
+ 搜索
+
+
+
+
+
+
+
+ 导出记录
+
+
+
+
+
+
+ {{
+ scope.row[column.value]
+ }}
+ {{
+ scope.row["areaFullName"] + '/' + scope.row[column.value]
+ }}
+ {{ scope.row[column.value] }}
+
+
+
+
+
+ 历史数据
+
+
+
+
+
+
+ 数据列表
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/AlarmNowList.vue b/src/views/gasDashboard/components/AlarmNowList.vue
new file mode 100644
index 0000000..890325f
--- /dev/null
+++ b/src/views/gasDashboard/components/AlarmNowList.vue
@@ -0,0 +1,35 @@
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/DeviceCount.vue b/src/views/gasDashboard/components/DeviceCount.vue
new file mode 100644
index 0000000..bffc9e9
--- /dev/null
+++ b/src/views/gasDashboard/components/DeviceCount.vue
@@ -0,0 +1,68 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/FunctionArea.vue b/src/views/gasDashboard/components/FunctionArea.vue
new file mode 100644
index 0000000..6401557
--- /dev/null
+++ b/src/views/gasDashboard/components/FunctionArea.vue
@@ -0,0 +1,140 @@
+
+
+
+ 本年度
+ 本季度
+ 近30日
+ 近7日
+ 今日
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/FunctionArea2.vue b/src/views/gasDashboard/components/FunctionArea2.vue
new file mode 100644
index 0000000..26a9f82
--- /dev/null
+++ b/src/views/gasDashboard/components/FunctionArea2.vue
@@ -0,0 +1,107 @@
+
+
+
+ 本年度
+ 本季度
+ 近30日
+ 近7日
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/PanelGroup.vue b/src/views/gasDashboard/components/PanelGroup.vue
new file mode 100644
index 0000000..103486e
--- /dev/null
+++ b/src/views/gasDashboard/components/PanelGroup.vue
@@ -0,0 +1,137 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/alarmLeakCountPie.vue b/src/views/gasDashboard/components/alarmLeakCountPie.vue
new file mode 100644
index 0000000..abfbc2d
--- /dev/null
+++ b/src/views/gasDashboard/components/alarmLeakCountPie.vue
@@ -0,0 +1,74 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/corrodeCountByDay.vue b/src/views/gasDashboard/components/corrodeCountByDay.vue
new file mode 100644
index 0000000..a410f29
--- /dev/null
+++ b/src/views/gasDashboard/components/corrodeCountByDay.vue
@@ -0,0 +1,100 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasAlarmTrend.vue b/src/views/gasDashboard/components/gasAlarmTrend.vue
new file mode 100644
index 0000000..a1d422e
--- /dev/null
+++ b/src/views/gasDashboard/components/gasAlarmTrend.vue
@@ -0,0 +1,100 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasCompare.vue b/src/views/gasDashboard/components/gasCompare.vue
new file mode 100644
index 0000000..19a4398
--- /dev/null
+++ b/src/views/gasDashboard/components/gasCompare.vue
@@ -0,0 +1,121 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasCountByAreaBar.vue b/src/views/gasDashboard/components/gasCountByAreaBar.vue
new file mode 100644
index 0000000..456a6c6
--- /dev/null
+++ b/src/views/gasDashboard/components/gasCountByAreaBar.vue
@@ -0,0 +1,198 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasCountByDay.vue b/src/views/gasDashboard/components/gasCountByDay.vue
new file mode 100644
index 0000000..f0a3977
--- /dev/null
+++ b/src/views/gasDashboard/components/gasCountByDay.vue
@@ -0,0 +1,114 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasCountByDept.vue b/src/views/gasDashboard/components/gasCountByDept.vue
new file mode 100644
index 0000000..31c8508
--- /dev/null
+++ b/src/views/gasDashboard/components/gasCountByDept.vue
@@ -0,0 +1,126 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasCountByDeviceBar.vue b/src/views/gasDashboard/components/gasCountByDeviceBar.vue
new file mode 100644
index 0000000..dc211e3
--- /dev/null
+++ b/src/views/gasDashboard/components/gasCountByDeviceBar.vue
@@ -0,0 +1,130 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasNote.vue b/src/views/gasDashboard/components/gasNote.vue
new file mode 100644
index 0000000..5ade90f
--- /dev/null
+++ b/src/views/gasDashboard/components/gasNote.vue
@@ -0,0 +1,149 @@
+
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/watchAlarmBar.vue b/src/views/gasDashboard/components/watchAlarmBar.vue
new file mode 100644
index 0000000..4279440
--- /dev/null
+++ b/src/views/gasDashboard/components/watchAlarmBar.vue
@@ -0,0 +1,180 @@
+
+
+
+ 场区用气事记
+
+
+
+
+
+
+
+
+
+ {{ index+1 }}. {{ item.content }}
+
+
+ {{ index+1 }}.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/watchGasAlarmBar.vue b/src/views/gasDashboard/components/watchGasAlarmBar.vue
new file mode 100644
index 0000000..0113341
--- /dev/null
+++ b/src/views/gasDashboard/components/watchGasAlarmBar.vue
@@ -0,0 +1,132 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/index.vue b/src/views/gasDashboard/index.vue
new file mode 100644
index 0000000..be583f2
--- /dev/null
+++ b/src/views/gasDashboard/index.vue
@@ -0,0 +1,191 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
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/index.js b/config/index.js
index 106eaa6..30dda44 100644
--- a/config/index.js
+++ b/config/index.js
@@ -33,7 +33,7 @@
// Use Eslint Loader?
// If true, your code will be linted during bundling and
// linting errors and warnings will be shown in the console.
- useEslint: true,
+ useEslint: false,
// If true, eslint errors and warnings will also be shown in the error overlay
// in the browser.
showEslintErrorsInOverlay: false,
diff --git a/config/prod.env.js b/config/prod.env.js
index 3455ce7..bb20d1d 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -3,5 +3,6 @@
NODE_ENV: '"production"',
// BASE_API: '"http://111.198.10.15:11304"',
// BASE_API: '"http://42.81.160.165:2022/smartwell/"',
- BASE_API: '"http://111.198.10.15:11409/smartwell"' //11643
+ // BASE_API: '"http://111.198.10.15:11409/smartwell"' //11643
+ BASE_API: '"http://111.198.10.15:20104"' //11643
}
diff --git a/package.json b/package.json
index be3e56e..a60e7b3 100644
--- a/package.json
+++ b/package.json
@@ -86,7 +86,7 @@
"vue-template-compiler": "2.5.17",
"webpack": "4.16.5",
"webpack-bundle-analyzer": "2.13.1",
- "webpack-cli": "3.1.0",
+ "webpack-cli": "^3.1.0",
"webpack-dev-server": "3.1.14",
"webpack-merge": "4.1.4"
},
diff --git a/src/App.vue b/src/App.vue
index 721d3a3..ec9032c 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,6 +1,6 @@
-
diff --git a/src/api/dashboard.js b/src/api/dashboard.js
index aaadb23..6f56e28 100644
--- a/src/api/dashboard.js
+++ b/src/api/dashboard.js
@@ -79,11 +79,10 @@
})
}
-
// 用水事记查询
-export function getNoteList() {
+export function getNoteList(type) {
return request({
- url: '/note/list',
+ url: '/note/list/' + type,
method: 'get'
})
}
@@ -92,7 +91,6 @@
export function updateNoteList(data) {
return request({
url: '/note/edit',
- // url: 'waterMeterData/count',
method: 'post',
data
})
diff --git a/src/api/data.js b/src/api/data.js
index b7c9ba2..65c5071 100644
--- a/src/api/data.js
+++ b/src/api/data.js
@@ -85,6 +85,22 @@
params
})
}
+// 气体流量计数据查询
+export function getGasflowData(params) {
+ return request({
+ url: 'gasflow/list',
+ method: 'get',
+ params
+ })
+}
+// 腐蚀速率监测仪数据查询
+export function getCorrodeData(params) {
+ return request({
+ url: 'corrode/data/list',
+ method: 'get',
+ params
+ })
+}
// 批量导出井盖数据
export function batchExportWellData(params) {
@@ -183,6 +199,26 @@
responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
})
}
+// 腐蚀速率监测仪数据导出
+export function batchExportCorrodeData(params) {
+ return request({
+ url: 'corrode/data/export',
+ method: 'get',
+ timeout: 120000, // 120s，2分钟
+ params,
+ responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+ })
+}
+// 气体流量计数据导出
+export function batchExportGasflowData(params) {
+ return request({
+ url: 'gasflow/data/export',
+ method: 'get',
+ timeout: 120000, // 120s，2分钟
+ params,
+ responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+ })
+}
// 温度压力数据查询
export function getTempPressData(params) {
diff --git a/src/api/device.js b/src/api/device.js
index 00804fe..edcc1a4 100644
--- a/src/api/device.js
+++ b/src/api/device.js
@@ -100,4 +100,11 @@
params
})
}
+export function totalDataGasFlow(params) {
+ return request({
+ url: 'gasflow/listByDevice',
+ method: 'post',
+ params
+ })
+}
diff --git a/src/api/gasOverview.js b/src/api/gasOverview.js
new file mode 100644
index 0000000..0dc3442
--- /dev/null
+++ b/src/api/gasOverview.js
@@ -0,0 +1,173 @@
+/**
+ * 动力管线
+ */
+import request from '@/utils/request'
+
+// 用水量、噪声统计数据
+export function gasStatistic() {
+ return request({
+ url: 'gasStatistic/overview',
+ method: 'get'
+ })
+}
+
+// 用水量、噪声统计数据
+export function gasStatistic2(deviceType) {
+ return request({
+ url: 'gas/statistics/used',
+ method: 'get',
+ params: {
+ deviceType: deviceType
+ }
+ })
+}
+
+// 气体用气量走势图
+export function gasTrend(params) {
+ return request({
+ url: '/gas/statistics/trend',
+ method: 'get',
+ params
+ })
+}
+// 用气量超量报警统计
+export function gasAlarmTrend(params) {
+ return request({
+ url: '/gas/alarm/trend',
+ method: 'get',
+ params
+ })
+}
+// 各设备气体用气量
+export function gasUsed(params) {
+ return request({
+ url: '/gas/used',
+ method: 'get',
+ params
+ })
+}
+// 气体泄漏监测结果
+export function gasLeakStatus(params) {
+ return request({
+ url: 'gas/leakage/rate',
+ method: 'get',
+ params
+ })
+}
+
+// 气体流量计数量
+export function deviceCount(type) {
+ return request({
+ url: 'device/count/' + type,
+ method: 'get'
+ })
+}
+
+// 统计当前报警数
+export function alarmNowStatic(params) {
+ return request({
+ url: 'statics/alarmsNow',
+ method: 'get',
+ params
+ })
+}
+
+// 查询二级分区各区用气量
+export function countBySecondArea(params) {
+ return request({
+ url: 'gasStatistic/countBySecondArea',
+ method: 'get',
+ params
+ })
+}
+
+// 查询二级分区7日用气量
+export function countByDaySecond(params) {
+ return request({
+ url: 'gasStatistic/countByDay',
+ method: 'get',
+ params
+ })
+}
+// 查询二级分区燃气告警
+export function gasAlarmBySecondArea(params) {
+ return request({
+ url: 'gas/alarm/rate',
+ method: 'get',
+ params
+ })
+}
+// 各设备腐蚀速率统计
+export function corrRateByDevice(params) {
+ return request({
+ url: 'corrode/data/corrRateByDevice',
+ method: 'get',
+ params
+ })
+}
+// 查询二级分区用气对比
+export function gasCompareData(params) {
+ return request({
+ url: 'gasStatistic/gasCompare',
+ method: 'get',
+ params
+ })
+}
+
+// 根据设备类型统计设备数量
+export function deviceStaticsByType(params) {
+ return request({
+ url: 'statics/deviceStaticsByType',
+ method: 'get',
+ params
+ })
+}
+
+// 查询二级分区气体流量计告警
+export function alarmBySecondArea(params) {
+ return request({
+ url: 'gasStatistic/alarmBySecondArea',
+ method: 'get',
+ params
+ })
+}
+
+// 用气事记查询
+export function getNoteList(type) {
+ return request({
+ url: '/note/list/' + type,
+ // url: '/note/list',
+ method: 'get'
+ })
+}
+
+// 用气事记更新
+export function updateNoteList(data) {
+ return request({
+ url: '/note/edit',
+ method: 'post',
+ data
+ })
+}
+
+// 获取报警列表
+export function getAlarmsNow(params) {
+ return request({
+ url: 'overview/alarmNow',
+ method: 'get',
+ params
+ })
+}
+
+// 总览marker（真接口）
+export function getMapping(devType, keywords) {
+ return request({
+ url: 'overview/wellMapping',
+ method: 'get',
+ params: {
+ keywords: keywords,
+ devType: devType
+ }
+ })
+}
+
diff --git a/src/components/BigData/Card/index.vue b/src/components/BigData/Card/index.vue
index 8320d47..8944b44 100644
--- a/src/components/BigData/Card/index.vue
+++ b/src/components/BigData/Card/index.vue
@@ -10,7 +10,7 @@
{{ context }}
- {{unit}}
+ {{ unit }}
-
-
-
- {{ title[0] }} {{ context[0] }}{{unit}}
-
-
- {{ title[1] }} {{ context[1] }}{{unit}}
+
+
@@ -41,9 +41,9 @@
type: String,
default: '#40c9c6'
},
- unit:{
+ unit: {
type: String,
- default:''
+ default: ''
}
},
computed: {
diff --git a/src/components/BigData/Card1/index.vue b/src/components/BigData/Card1/index.vue
index 722c24c..c9ec32d 100644
--- a/src/components/BigData/Card1/index.vue
+++ b/src/components/BigData/Card1/index.vue
@@ -4,30 +4,20 @@
-
-
+
-
-
@@ -28,7 +29,7 @@
- 导出记录
+ 导出记录
@@ -63,6 +64,7 @@
import { getGasData, batchExportGasData } from '@/api/data'
import DeptSelect from '../../../components/DeptSelect/index'
import { parseUrl } from '@/utils/parseutils'
+import { getSearchLastWeekTime } from '@/utils/dateutils'
export default {
name: 'ListGasData',
@@ -163,6 +165,7 @@
if (params && params.deviceType === '4' && params.devcode) {
this.listQuery.keywords = params.devcode
}
+ this.timeRange = getSearchLastWeekTime()
this.fetchData()
}
},
@@ -191,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/listGasflowData.vue b/src/views/dataManage/deviceData/listGasflowData.vue
new file mode 100644
index 0000000..9c5321a
--- /dev/null
+++ b/src/views/dataManage/deviceData/listGasflowData.vue
@@ -0,0 +1,311 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/alarmGasCountByType.vue b/src/views/gasDashboard/components/alarmGasCountByType.vue
new file mode 100644
index 0000000..4f80d3a
--- /dev/null
+++ b/src/views/gasDashboard/components/alarmGasCountByType.vue
@@ -0,0 +1,72 @@
+
+
+
+
-
+ {{ name }} {{ context[index] }}{{ unit }}
+
@@ -36,46 +26,46 @@
diff --git a/src/views/dataManage/deviceData/listCorrodeData.vue b/src/views/dataManage/deviceData/listCorrodeData.vue
new file mode 100644
index 0000000..1a20abb
--- /dev/null
+++ b/src/views/dataManage/deviceData/listCorrodeData.vue
@@ -0,0 +1,272 @@
+
+
{{ title[0] }}
- {{ context[0] }}{{unit}}
+ {{ context[0] }}{{ unit }}
+
+
+
+
+
+
+
diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue
index 97cdfdb..40b9a5e 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -5,10 +5,10 @@
+
+
+
+
+
+
+ 搜索
+
+
+
+
+
+
+
+ 导出记录
+
+
+
+
+
+
+ {{ scope.row[column.value] }}
+ {{ scope.row[column.value] }}
+
+
+
+
+
+ 数据列表
+
+ 数据列表
+
+
+
+
+
+
+
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 bf03fd1..dffd340 100644
--- a/src/views/dataManage/deviceData/listWaterData.vue
+++ b/src/views/dataManage/deviceData/listWaterData.vue
@@ -176,6 +176,12 @@
align: 'center'
},
{
+ text: '压力(Mpa)',
+ value: 'pressure',
+ width: 90,
+ align: 'center'
+ },
+ {
text: '今日用水量（立方米）',
value: 'dayCount',
align: 'center',
@@ -276,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) // 下载完成移除元素
@@ -311,9 +317,11 @@
}
getWatchData(this.listQuery).then((response) => {
this.list = response.data.rows.map(function(item) {
- item.areaFullName = item.areaFullName
- .replace('/', '')
- .replace('顶层', '')
+ item.totalCount = parseFloat(item.totalCount).toFixed(2)
+ item.dayCount = parseFloat(item.dayCount).toFixed(2)
+ item.monthCount = parseFloat(item.monthCount).toFixed(2)
+ item.pressure = parseFloat(item.pressure).toFixed(2)
+ item.areaFullName = item.areaFullName.replace('/', '').replace('顶层', '')
return item
})
this.total = parseInt(response.data.total)
diff --git a/src/views/dataManage/deviceData/waterHistory.vue b/src/views/dataManage/deviceData/waterHistory.vue
index 160dab7..42e3303 100644
--- a/src/views/dataManage/deviceData/waterHistory.vue
+++ b/src/views/dataManage/deviceData/waterHistory.vue
@@ -1,5 +1,5 @@
-
+
+
+
+
+
+
+ 搜索
+
+
+
+
+
+
+
+ 导出记录
+
+
+
+
+
+
+ {{
+ scope.row[column.value]
+ }}
+ {{
+ scope.row["areaFullName"] + '/' + scope.row[column.value]
+ }}
+ {{ scope.row[column.value] }}
+
+
+
+
+
+ 历史数据
+
+
+
+
+
+
+ 数据列表
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/AlarmNowList.vue b/src/views/gasDashboard/components/AlarmNowList.vue
new file mode 100644
index 0000000..890325f
--- /dev/null
+++ b/src/views/gasDashboard/components/AlarmNowList.vue
@@ -0,0 +1,35 @@
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/DeviceCount.vue b/src/views/gasDashboard/components/DeviceCount.vue
new file mode 100644
index 0000000..bffc9e9
--- /dev/null
+++ b/src/views/gasDashboard/components/DeviceCount.vue
@@ -0,0 +1,68 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/FunctionArea.vue b/src/views/gasDashboard/components/FunctionArea.vue
new file mode 100644
index 0000000..6401557
--- /dev/null
+++ b/src/views/gasDashboard/components/FunctionArea.vue
@@ -0,0 +1,140 @@
+
+
+
+ 本年度
+ 本季度
+ 近30日
+ 近7日
+ 今日
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/FunctionArea2.vue b/src/views/gasDashboard/components/FunctionArea2.vue
new file mode 100644
index 0000000..26a9f82
--- /dev/null
+++ b/src/views/gasDashboard/components/FunctionArea2.vue
@@ -0,0 +1,107 @@
+
+
+
+ 本年度
+ 本季度
+ 近30日
+ 近7日
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/PanelGroup.vue b/src/views/gasDashboard/components/PanelGroup.vue
new file mode 100644
index 0000000..103486e
--- /dev/null
+++ b/src/views/gasDashboard/components/PanelGroup.vue
@@ -0,0 +1,137 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/alarmLeakCountPie.vue b/src/views/gasDashboard/components/alarmLeakCountPie.vue
new file mode 100644
index 0000000..abfbc2d
--- /dev/null
+++ b/src/views/gasDashboard/components/alarmLeakCountPie.vue
@@ -0,0 +1,74 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/corrodeCountByDay.vue b/src/views/gasDashboard/components/corrodeCountByDay.vue
new file mode 100644
index 0000000..a410f29
--- /dev/null
+++ b/src/views/gasDashboard/components/corrodeCountByDay.vue
@@ -0,0 +1,100 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasAlarmTrend.vue b/src/views/gasDashboard/components/gasAlarmTrend.vue
new file mode 100644
index 0000000..a1d422e
--- /dev/null
+++ b/src/views/gasDashboard/components/gasAlarmTrend.vue
@@ -0,0 +1,100 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasCompare.vue b/src/views/gasDashboard/components/gasCompare.vue
new file mode 100644
index 0000000..19a4398
--- /dev/null
+++ b/src/views/gasDashboard/components/gasCompare.vue
@@ -0,0 +1,121 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasCountByAreaBar.vue b/src/views/gasDashboard/components/gasCountByAreaBar.vue
new file mode 100644
index 0000000..456a6c6
--- /dev/null
+++ b/src/views/gasDashboard/components/gasCountByAreaBar.vue
@@ -0,0 +1,198 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasCountByDay.vue b/src/views/gasDashboard/components/gasCountByDay.vue
new file mode 100644
index 0000000..f0a3977
--- /dev/null
+++ b/src/views/gasDashboard/components/gasCountByDay.vue
@@ -0,0 +1,114 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasCountByDept.vue b/src/views/gasDashboard/components/gasCountByDept.vue
new file mode 100644
index 0000000..31c8508
--- /dev/null
+++ b/src/views/gasDashboard/components/gasCountByDept.vue
@@ -0,0 +1,126 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasCountByDeviceBar.vue b/src/views/gasDashboard/components/gasCountByDeviceBar.vue
new file mode 100644
index 0000000..dc211e3
--- /dev/null
+++ b/src/views/gasDashboard/components/gasCountByDeviceBar.vue
@@ -0,0 +1,130 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasNote.vue b/src/views/gasDashboard/components/gasNote.vue
new file mode 100644
index 0000000..5ade90f
--- /dev/null
+++ b/src/views/gasDashboard/components/gasNote.vue
@@ -0,0 +1,149 @@
+
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/watchAlarmBar.vue b/src/views/gasDashboard/components/watchAlarmBar.vue
new file mode 100644
index 0000000..4279440
--- /dev/null
+++ b/src/views/gasDashboard/components/watchAlarmBar.vue
@@ -0,0 +1,180 @@
+
+
+
+ 场区用气事记
+
+
+
+
+
+
+
+
+
+ {{ index+1 }}. {{ item.content }}
+
+
+ {{ index+1 }}.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/watchGasAlarmBar.vue b/src/views/gasDashboard/components/watchGasAlarmBar.vue
new file mode 100644
index 0000000..0113341
--- /dev/null
+++ b/src/views/gasDashboard/components/watchGasAlarmBar.vue
@@ -0,0 +1,132 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/index.vue b/src/views/gasDashboard/index.vue
new file mode 100644
index 0000000..be583f2
--- /dev/null
+++ b/src/views/gasDashboard/index.vue
@@ -0,0 +1,191 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/gasOverview/gasOverviewSimple.vue b/src/views/gasOverview/gasOverviewSimple.vue
new file mode 100644
index 0000000..8ff468f
--- /dev/null
+++ b/src/views/gasOverview/gasOverviewSimple.vue
@@ -0,0 +1,1189 @@
+
+
+
+
+
+
+
+
+
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/index.js b/config/index.js
index 106eaa6..30dda44 100644
--- a/config/index.js
+++ b/config/index.js
@@ -33,7 +33,7 @@
// Use Eslint Loader?
// If true, your code will be linted during bundling and
// linting errors and warnings will be shown in the console.
- useEslint: true,
+ useEslint: false,
// If true, eslint errors and warnings will also be shown in the error overlay
// in the browser.
showEslintErrorsInOverlay: false,
diff --git a/config/prod.env.js b/config/prod.env.js
index 3455ce7..bb20d1d 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -3,5 +3,6 @@
NODE_ENV: '"production"',
// BASE_API: '"http://111.198.10.15:11304"',
// BASE_API: '"http://42.81.160.165:2022/smartwell/"',
- BASE_API: '"http://111.198.10.15:11409/smartwell"' //11643
+ // BASE_API: '"http://111.198.10.15:11409/smartwell"' //11643
+ BASE_API: '"http://111.198.10.15:20104"' //11643
}
diff --git a/package.json b/package.json
index be3e56e..a60e7b3 100644
--- a/package.json
+++ b/package.json
@@ -86,7 +86,7 @@
"vue-template-compiler": "2.5.17",
"webpack": "4.16.5",
"webpack-bundle-analyzer": "2.13.1",
- "webpack-cli": "3.1.0",
+ "webpack-cli": "^3.1.0",
"webpack-dev-server": "3.1.14",
"webpack-merge": "4.1.4"
},
diff --git a/src/App.vue b/src/App.vue
index 721d3a3..ec9032c 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,6 +1,6 @@
-
diff --git a/src/api/dashboard.js b/src/api/dashboard.js
index aaadb23..6f56e28 100644
--- a/src/api/dashboard.js
+++ b/src/api/dashboard.js
@@ -79,11 +79,10 @@
})
}
-
// 用水事记查询
-export function getNoteList() {
+export function getNoteList(type) {
return request({
- url: '/note/list',
+ url: '/note/list/' + type,
method: 'get'
})
}
@@ -92,7 +91,6 @@
export function updateNoteList(data) {
return request({
url: '/note/edit',
- // url: 'waterMeterData/count',
method: 'post',
data
})
diff --git a/src/api/data.js b/src/api/data.js
index b7c9ba2..65c5071 100644
--- a/src/api/data.js
+++ b/src/api/data.js
@@ -85,6 +85,22 @@
params
})
}
+// 气体流量计数据查询
+export function getGasflowData(params) {
+ return request({
+ url: 'gasflow/list',
+ method: 'get',
+ params
+ })
+}
+// 腐蚀速率监测仪数据查询
+export function getCorrodeData(params) {
+ return request({
+ url: 'corrode/data/list',
+ method: 'get',
+ params
+ })
+}
// 批量导出井盖数据
export function batchExportWellData(params) {
@@ -183,6 +199,26 @@
responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
})
}
+// 腐蚀速率监测仪数据导出
+export function batchExportCorrodeData(params) {
+ return request({
+ url: 'corrode/data/export',
+ method: 'get',
+ timeout: 120000, // 120s，2分钟
+ params,
+ responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+ })
+}
+// 气体流量计数据导出
+export function batchExportGasflowData(params) {
+ return request({
+ url: 'gasflow/data/export',
+ method: 'get',
+ timeout: 120000, // 120s，2分钟
+ params,
+ responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+ })
+}
// 温度压力数据查询
export function getTempPressData(params) {
diff --git a/src/api/device.js b/src/api/device.js
index 00804fe..edcc1a4 100644
--- a/src/api/device.js
+++ b/src/api/device.js
@@ -100,4 +100,11 @@
params
})
}
+export function totalDataGasFlow(params) {
+ return request({
+ url: 'gasflow/listByDevice',
+ method: 'post',
+ params
+ })
+}
diff --git a/src/api/gasOverview.js b/src/api/gasOverview.js
new file mode 100644
index 0000000..0dc3442
--- /dev/null
+++ b/src/api/gasOverview.js
@@ -0,0 +1,173 @@
+/**
+ * 动力管线
+ */
+import request from '@/utils/request'
+
+// 用水量、噪声统计数据
+export function gasStatistic() {
+ return request({
+ url: 'gasStatistic/overview',
+ method: 'get'
+ })
+}
+
+// 用水量、噪声统计数据
+export function gasStatistic2(deviceType) {
+ return request({
+ url: 'gas/statistics/used',
+ method: 'get',
+ params: {
+ deviceType: deviceType
+ }
+ })
+}
+
+// 气体用气量走势图
+export function gasTrend(params) {
+ return request({
+ url: '/gas/statistics/trend',
+ method: 'get',
+ params
+ })
+}
+// 用气量超量报警统计
+export function gasAlarmTrend(params) {
+ return request({
+ url: '/gas/alarm/trend',
+ method: 'get',
+ params
+ })
+}
+// 各设备气体用气量
+export function gasUsed(params) {
+ return request({
+ url: '/gas/used',
+ method: 'get',
+ params
+ })
+}
+// 气体泄漏监测结果
+export function gasLeakStatus(params) {
+ return request({
+ url: 'gas/leakage/rate',
+ method: 'get',
+ params
+ })
+}
+
+// 气体流量计数量
+export function deviceCount(type) {
+ return request({
+ url: 'device/count/' + type,
+ method: 'get'
+ })
+}
+
+// 统计当前报警数
+export function alarmNowStatic(params) {
+ return request({
+ url: 'statics/alarmsNow',
+ method: 'get',
+ params
+ })
+}
+
+// 查询二级分区各区用气量
+export function countBySecondArea(params) {
+ return request({
+ url: 'gasStatistic/countBySecondArea',
+ method: 'get',
+ params
+ })
+}
+
+// 查询二级分区7日用气量
+export function countByDaySecond(params) {
+ return request({
+ url: 'gasStatistic/countByDay',
+ method: 'get',
+ params
+ })
+}
+// 查询二级分区燃气告警
+export function gasAlarmBySecondArea(params) {
+ return request({
+ url: 'gas/alarm/rate',
+ method: 'get',
+ params
+ })
+}
+// 各设备腐蚀速率统计
+export function corrRateByDevice(params) {
+ return request({
+ url: 'corrode/data/corrRateByDevice',
+ method: 'get',
+ params
+ })
+}
+// 查询二级分区用气对比
+export function gasCompareData(params) {
+ return request({
+ url: 'gasStatistic/gasCompare',
+ method: 'get',
+ params
+ })
+}
+
+// 根据设备类型统计设备数量
+export function deviceStaticsByType(params) {
+ return request({
+ url: 'statics/deviceStaticsByType',
+ method: 'get',
+ params
+ })
+}
+
+// 查询二级分区气体流量计告警
+export function alarmBySecondArea(params) {
+ return request({
+ url: 'gasStatistic/alarmBySecondArea',
+ method: 'get',
+ params
+ })
+}
+
+// 用气事记查询
+export function getNoteList(type) {
+ return request({
+ url: '/note/list/' + type,
+ // url: '/note/list',
+ method: 'get'
+ })
+}
+
+// 用气事记更新
+export function updateNoteList(data) {
+ return request({
+ url: '/note/edit',
+ method: 'post',
+ data
+ })
+}
+
+// 获取报警列表
+export function getAlarmsNow(params) {
+ return request({
+ url: 'overview/alarmNow',
+ method: 'get',
+ params
+ })
+}
+
+// 总览marker（真接口）
+export function getMapping(devType, keywords) {
+ return request({
+ url: 'overview/wellMapping',
+ method: 'get',
+ params: {
+ keywords: keywords,
+ devType: devType
+ }
+ })
+}
+
diff --git a/src/components/BigData/Card/index.vue b/src/components/BigData/Card/index.vue
index 8320d47..8944b44 100644
--- a/src/components/BigData/Card/index.vue
+++ b/src/components/BigData/Card/index.vue
@@ -10,7 +10,7 @@
{{ context }}
- {{unit}}
+ {{ unit }}
-
-
-
- {{ title[0] }} {{ context[0] }}{{unit}}
-
-
- {{ title[1] }} {{ context[1] }}{{unit}}
+
+
@@ -41,9 +41,9 @@
type: String,
default: '#40c9c6'
},
- unit:{
+ unit: {
type: String,
- default:''
+ default: ''
}
},
computed: {
diff --git a/src/components/BigData/Card1/index.vue b/src/components/BigData/Card1/index.vue
index 722c24c..c9ec32d 100644
--- a/src/components/BigData/Card1/index.vue
+++ b/src/components/BigData/Card1/index.vue
@@ -4,30 +4,20 @@
-
-
+
-
-
@@ -28,7 +29,7 @@
- 导出记录
+ 导出记录
@@ -63,6 +64,7 @@
import { getGasData, batchExportGasData } from '@/api/data'
import DeptSelect from '../../../components/DeptSelect/index'
import { parseUrl } from '@/utils/parseutils'
+import { getSearchLastWeekTime } from '@/utils/dateutils'
export default {
name: 'ListGasData',
@@ -163,6 +165,7 @@
if (params && params.deviceType === '4' && params.devcode) {
this.listQuery.keywords = params.devcode
}
+ this.timeRange = getSearchLastWeekTime()
this.fetchData()
}
},
@@ -191,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/listGasflowData.vue b/src/views/dataManage/deviceData/listGasflowData.vue
new file mode 100644
index 0000000..9c5321a
--- /dev/null
+++ b/src/views/dataManage/deviceData/listGasflowData.vue
@@ -0,0 +1,311 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/alarmGasCountByType.vue b/src/views/gasDashboard/components/alarmGasCountByType.vue
new file mode 100644
index 0000000..4f80d3a
--- /dev/null
+++ b/src/views/gasDashboard/components/alarmGasCountByType.vue
@@ -0,0 +1,72 @@
+
+
+
+
-
+ {{ name }} {{ context[index] }}{{ unit }}
+
@@ -36,46 +26,46 @@
diff --git a/src/views/dataManage/deviceData/listCorrodeData.vue b/src/views/dataManage/deviceData/listCorrodeData.vue
new file mode 100644
index 0000000..1a20abb
--- /dev/null
+++ b/src/views/dataManage/deviceData/listCorrodeData.vue
@@ -0,0 +1,272 @@
+
+
{{ title[0] }}
- {{ context[0] }}{{unit}}
+ {{ context[0] }}{{ unit }}
+
+
+
+
+
+
+
diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue
index 97cdfdb..40b9a5e 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -5,10 +5,10 @@
+
+
+
+
+
+
+ 搜索
+
+
+
+
+
+
+
+ 导出记录
+
+
+
+
+
+
+ {{ scope.row[column.value] }}
+ {{ scope.row[column.value] }}
+
+
+
+
+
+ 数据列表
+
+ 数据列表
+
+
+
+
+
+
+
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 bf03fd1..dffd340 100644
--- a/src/views/dataManage/deviceData/listWaterData.vue
+++ b/src/views/dataManage/deviceData/listWaterData.vue
@@ -176,6 +176,12 @@
align: 'center'
},
{
+ text: '压力(Mpa)',
+ value: 'pressure',
+ width: 90,
+ align: 'center'
+ },
+ {
text: '今日用水量（立方米）',
value: 'dayCount',
align: 'center',
@@ -276,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) // 下载完成移除元素
@@ -311,9 +317,11 @@
}
getWatchData(this.listQuery).then((response) => {
this.list = response.data.rows.map(function(item) {
- item.areaFullName = item.areaFullName
- .replace('/', '')
- .replace('顶层', '')
+ item.totalCount = parseFloat(item.totalCount).toFixed(2)
+ item.dayCount = parseFloat(item.dayCount).toFixed(2)
+ item.monthCount = parseFloat(item.monthCount).toFixed(2)
+ item.pressure = parseFloat(item.pressure).toFixed(2)
+ item.areaFullName = item.areaFullName.replace('/', '').replace('顶层', '')
return item
})
this.total = parseInt(response.data.total)
diff --git a/src/views/dataManage/deviceData/waterHistory.vue b/src/views/dataManage/deviceData/waterHistory.vue
index 160dab7..42e3303 100644
--- a/src/views/dataManage/deviceData/waterHistory.vue
+++ b/src/views/dataManage/deviceData/waterHistory.vue
@@ -1,5 +1,5 @@
-
+
+
+
+
+
+
+ 搜索
+
+
+
+
+
+
+
+ 导出记录
+
+
+
+
+
+
+ {{
+ scope.row[column.value]
+ }}
+ {{
+ scope.row["areaFullName"] + '/' + scope.row[column.value]
+ }}
+ {{ scope.row[column.value] }}
+
+
+
+
+
+ 历史数据
+
+
+
+
+
+
+ 数据列表
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/AlarmNowList.vue b/src/views/gasDashboard/components/AlarmNowList.vue
new file mode 100644
index 0000000..890325f
--- /dev/null
+++ b/src/views/gasDashboard/components/AlarmNowList.vue
@@ -0,0 +1,35 @@
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/DeviceCount.vue b/src/views/gasDashboard/components/DeviceCount.vue
new file mode 100644
index 0000000..bffc9e9
--- /dev/null
+++ b/src/views/gasDashboard/components/DeviceCount.vue
@@ -0,0 +1,68 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/FunctionArea.vue b/src/views/gasDashboard/components/FunctionArea.vue
new file mode 100644
index 0000000..6401557
--- /dev/null
+++ b/src/views/gasDashboard/components/FunctionArea.vue
@@ -0,0 +1,140 @@
+
+
+
+ 本年度
+ 本季度
+ 近30日
+ 近7日
+ 今日
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/FunctionArea2.vue b/src/views/gasDashboard/components/FunctionArea2.vue
new file mode 100644
index 0000000..26a9f82
--- /dev/null
+++ b/src/views/gasDashboard/components/FunctionArea2.vue
@@ -0,0 +1,107 @@
+
+
+
+ 本年度
+ 本季度
+ 近30日
+ 近7日
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/PanelGroup.vue b/src/views/gasDashboard/components/PanelGroup.vue
new file mode 100644
index 0000000..103486e
--- /dev/null
+++ b/src/views/gasDashboard/components/PanelGroup.vue
@@ -0,0 +1,137 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/alarmLeakCountPie.vue b/src/views/gasDashboard/components/alarmLeakCountPie.vue
new file mode 100644
index 0000000..abfbc2d
--- /dev/null
+++ b/src/views/gasDashboard/components/alarmLeakCountPie.vue
@@ -0,0 +1,74 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/corrodeCountByDay.vue b/src/views/gasDashboard/components/corrodeCountByDay.vue
new file mode 100644
index 0000000..a410f29
--- /dev/null
+++ b/src/views/gasDashboard/components/corrodeCountByDay.vue
@@ -0,0 +1,100 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasAlarmTrend.vue b/src/views/gasDashboard/components/gasAlarmTrend.vue
new file mode 100644
index 0000000..a1d422e
--- /dev/null
+++ b/src/views/gasDashboard/components/gasAlarmTrend.vue
@@ -0,0 +1,100 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasCompare.vue b/src/views/gasDashboard/components/gasCompare.vue
new file mode 100644
index 0000000..19a4398
--- /dev/null
+++ b/src/views/gasDashboard/components/gasCompare.vue
@@ -0,0 +1,121 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasCountByAreaBar.vue b/src/views/gasDashboard/components/gasCountByAreaBar.vue
new file mode 100644
index 0000000..456a6c6
--- /dev/null
+++ b/src/views/gasDashboard/components/gasCountByAreaBar.vue
@@ -0,0 +1,198 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasCountByDay.vue b/src/views/gasDashboard/components/gasCountByDay.vue
new file mode 100644
index 0000000..f0a3977
--- /dev/null
+++ b/src/views/gasDashboard/components/gasCountByDay.vue
@@ -0,0 +1,114 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasCountByDept.vue b/src/views/gasDashboard/components/gasCountByDept.vue
new file mode 100644
index 0000000..31c8508
--- /dev/null
+++ b/src/views/gasDashboard/components/gasCountByDept.vue
@@ -0,0 +1,126 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasCountByDeviceBar.vue b/src/views/gasDashboard/components/gasCountByDeviceBar.vue
new file mode 100644
index 0000000..dc211e3
--- /dev/null
+++ b/src/views/gasDashboard/components/gasCountByDeviceBar.vue
@@ -0,0 +1,130 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasNote.vue b/src/views/gasDashboard/components/gasNote.vue
new file mode 100644
index 0000000..5ade90f
--- /dev/null
+++ b/src/views/gasDashboard/components/gasNote.vue
@@ -0,0 +1,149 @@
+
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/watchAlarmBar.vue b/src/views/gasDashboard/components/watchAlarmBar.vue
new file mode 100644
index 0000000..4279440
--- /dev/null
+++ b/src/views/gasDashboard/components/watchAlarmBar.vue
@@ -0,0 +1,180 @@
+
+
+
+ 场区用气事记
+
+
+
+
+
+
+
+
+
+ {{ index+1 }}. {{ item.content }}
+
+
+ {{ index+1 }}.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/watchGasAlarmBar.vue b/src/views/gasDashboard/components/watchGasAlarmBar.vue
new file mode 100644
index 0000000..0113341
--- /dev/null
+++ b/src/views/gasDashboard/components/watchGasAlarmBar.vue
@@ -0,0 +1,132 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/index.vue b/src/views/gasDashboard/index.vue
new file mode 100644
index 0000000..be583f2
--- /dev/null
+++ b/src/views/gasDashboard/index.vue
@@ -0,0 +1,191 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/gasOverview/gasOverviewSimple.vue b/src/views/gasOverview/gasOverviewSimple.vue
new file mode 100644
index 0000000..8ff468f
--- /dev/null
+++ b/src/views/gasOverview/gasOverviewSimple.vue
@@ -0,0 +1,1189 @@
+
+
+
+
+
+
+
+
+
diff --git a/src/views/jobManage/detailJob.vue b/src/views/jobManage/detailJob.vue
index 2d6aaa4..fe7e68e 100644
--- a/src/views/jobManage/detailJob.vue
+++ b/src/views/jobManage/detailJob.vue
@@ -205,8 +205,9 @@
// 获取工单详情
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 => {
+ console.log(response, ' ============response=')
this.loading = false
if (response.code === 200) {
if (response.data.length <= 0) {
@@ -217,26 +218,28 @@
// 处理现场图片
if (job.firstStatePhotos !== '') {
this.firstImageList = []
- const urls = job.firstStatePhotos.split(';')
+ const urls = job.firstStatePhotos.split(',')
for (const url of urls) {
if (url) {
// this.firstImageList.push({ name: url, url: base_url + url })
this.firstImageList.push(base_url + url)
}
}
+ console.log(this.firstImageList)
} else {
this.firstImageList = []
}
// 处理维护图片
if (job.handlePhotos.length !== '') {
this.handleImageList = []
- const urls = job.handlePhotos.split(';')
+ const urls = job.handlePhotos.split(',')
for (const url of urls) {
if (url) {
// this.handleImageList.push({ name: url, url: base_url + url })
this.handleImageList.push(base_url + url)
}
}
+ console.log(this.handleImageList)
} else {
this.handleImageList = []
}
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/index.js b/config/index.js
index 106eaa6..30dda44 100644
--- a/config/index.js
+++ b/config/index.js
@@ -33,7 +33,7 @@
// Use Eslint Loader?
// If true, your code will be linted during bundling and
// linting errors and warnings will be shown in the console.
- useEslint: true,
+ useEslint: false,
// If true, eslint errors and warnings will also be shown in the error overlay
// in the browser.
showEslintErrorsInOverlay: false,
diff --git a/config/prod.env.js b/config/prod.env.js
index 3455ce7..bb20d1d 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -3,5 +3,6 @@
NODE_ENV: '"production"',
// BASE_API: '"http://111.198.10.15:11304"',
// BASE_API: '"http://42.81.160.165:2022/smartwell/"',
- BASE_API: '"http://111.198.10.15:11409/smartwell"' //11643
+ // BASE_API: '"http://111.198.10.15:11409/smartwell"' //11643
+ BASE_API: '"http://111.198.10.15:20104"' //11643
}
diff --git a/package.json b/package.json
index be3e56e..a60e7b3 100644
--- a/package.json
+++ b/package.json
@@ -86,7 +86,7 @@
"vue-template-compiler": "2.5.17",
"webpack": "4.16.5",
"webpack-bundle-analyzer": "2.13.1",
- "webpack-cli": "3.1.0",
+ "webpack-cli": "^3.1.0",
"webpack-dev-server": "3.1.14",
"webpack-merge": "4.1.4"
},
diff --git a/src/App.vue b/src/App.vue
index 721d3a3..ec9032c 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,6 +1,6 @@
-
diff --git a/src/api/dashboard.js b/src/api/dashboard.js
index aaadb23..6f56e28 100644
--- a/src/api/dashboard.js
+++ b/src/api/dashboard.js
@@ -79,11 +79,10 @@
})
}
-
// 用水事记查询
-export function getNoteList() {
+export function getNoteList(type) {
return request({
- url: '/note/list',
+ url: '/note/list/' + type,
method: 'get'
})
}
@@ -92,7 +91,6 @@
export function updateNoteList(data) {
return request({
url: '/note/edit',
- // url: 'waterMeterData/count',
method: 'post',
data
})
diff --git a/src/api/data.js b/src/api/data.js
index b7c9ba2..65c5071 100644
--- a/src/api/data.js
+++ b/src/api/data.js
@@ -85,6 +85,22 @@
params
})
}
+// 气体流量计数据查询
+export function getGasflowData(params) {
+ return request({
+ url: 'gasflow/list',
+ method: 'get',
+ params
+ })
+}
+// 腐蚀速率监测仪数据查询
+export function getCorrodeData(params) {
+ return request({
+ url: 'corrode/data/list',
+ method: 'get',
+ params
+ })
+}
// 批量导出井盖数据
export function batchExportWellData(params) {
@@ -183,6 +199,26 @@
responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
})
}
+// 腐蚀速率监测仪数据导出
+export function batchExportCorrodeData(params) {
+ return request({
+ url: 'corrode/data/export',
+ method: 'get',
+ timeout: 120000, // 120s，2分钟
+ params,
+ responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+ })
+}
+// 气体流量计数据导出
+export function batchExportGasflowData(params) {
+ return request({
+ url: 'gasflow/data/export',
+ method: 'get',
+ timeout: 120000, // 120s，2分钟
+ params,
+ responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+ })
+}
// 温度压力数据查询
export function getTempPressData(params) {
diff --git a/src/api/device.js b/src/api/device.js
index 00804fe..edcc1a4 100644
--- a/src/api/device.js
+++ b/src/api/device.js
@@ -100,4 +100,11 @@
params
})
}
+export function totalDataGasFlow(params) {
+ return request({
+ url: 'gasflow/listByDevice',
+ method: 'post',
+ params
+ })
+}
diff --git a/src/api/gasOverview.js b/src/api/gasOverview.js
new file mode 100644
index 0000000..0dc3442
--- /dev/null
+++ b/src/api/gasOverview.js
@@ -0,0 +1,173 @@
+/**
+ * 动力管线
+ */
+import request from '@/utils/request'
+
+// 用水量、噪声统计数据
+export function gasStatistic() {
+ return request({
+ url: 'gasStatistic/overview',
+ method: 'get'
+ })
+}
+
+// 用水量、噪声统计数据
+export function gasStatistic2(deviceType) {
+ return request({
+ url: 'gas/statistics/used',
+ method: 'get',
+ params: {
+ deviceType: deviceType
+ }
+ })
+}
+
+// 气体用气量走势图
+export function gasTrend(params) {
+ return request({
+ url: '/gas/statistics/trend',
+ method: 'get',
+ params
+ })
+}
+// 用气量超量报警统计
+export function gasAlarmTrend(params) {
+ return request({
+ url: '/gas/alarm/trend',
+ method: 'get',
+ params
+ })
+}
+// 各设备气体用气量
+export function gasUsed(params) {
+ return request({
+ url: '/gas/used',
+ method: 'get',
+ params
+ })
+}
+// 气体泄漏监测结果
+export function gasLeakStatus(params) {
+ return request({
+ url: 'gas/leakage/rate',
+ method: 'get',
+ params
+ })
+}
+
+// 气体流量计数量
+export function deviceCount(type) {
+ return request({
+ url: 'device/count/' + type,
+ method: 'get'
+ })
+}
+
+// 统计当前报警数
+export function alarmNowStatic(params) {
+ return request({
+ url: 'statics/alarmsNow',
+ method: 'get',
+ params
+ })
+}
+
+// 查询二级分区各区用气量
+export function countBySecondArea(params) {
+ return request({
+ url: 'gasStatistic/countBySecondArea',
+ method: 'get',
+ params
+ })
+}
+
+// 查询二级分区7日用气量
+export function countByDaySecond(params) {
+ return request({
+ url: 'gasStatistic/countByDay',
+ method: 'get',
+ params
+ })
+}
+// 查询二级分区燃气告警
+export function gasAlarmBySecondArea(params) {
+ return request({
+ url: 'gas/alarm/rate',
+ method: 'get',
+ params
+ })
+}
+// 各设备腐蚀速率统计
+export function corrRateByDevice(params) {
+ return request({
+ url: 'corrode/data/corrRateByDevice',
+ method: 'get',
+ params
+ })
+}
+// 查询二级分区用气对比
+export function gasCompareData(params) {
+ return request({
+ url: 'gasStatistic/gasCompare',
+ method: 'get',
+ params
+ })
+}
+
+// 根据设备类型统计设备数量
+export function deviceStaticsByType(params) {
+ return request({
+ url: 'statics/deviceStaticsByType',
+ method: 'get',
+ params
+ })
+}
+
+// 查询二级分区气体流量计告警
+export function alarmBySecondArea(params) {
+ return request({
+ url: 'gasStatistic/alarmBySecondArea',
+ method: 'get',
+ params
+ })
+}
+
+// 用气事记查询
+export function getNoteList(type) {
+ return request({
+ url: '/note/list/' + type,
+ // url: '/note/list',
+ method: 'get'
+ })
+}
+
+// 用气事记更新
+export function updateNoteList(data) {
+ return request({
+ url: '/note/edit',
+ method: 'post',
+ data
+ })
+}
+
+// 获取报警列表
+export function getAlarmsNow(params) {
+ return request({
+ url: 'overview/alarmNow',
+ method: 'get',
+ params
+ })
+}
+
+// 总览marker（真接口）
+export function getMapping(devType, keywords) {
+ return request({
+ url: 'overview/wellMapping',
+ method: 'get',
+ params: {
+ keywords: keywords,
+ devType: devType
+ }
+ })
+}
+
diff --git a/src/components/BigData/Card/index.vue b/src/components/BigData/Card/index.vue
index 8320d47..8944b44 100644
--- a/src/components/BigData/Card/index.vue
+++ b/src/components/BigData/Card/index.vue
@@ -10,7 +10,7 @@
{{ context }}
- {{unit}}
+ {{ unit }}
-
-
-
- {{ title[0] }} {{ context[0] }}{{unit}}
-
-
- {{ title[1] }} {{ context[1] }}{{unit}}
+
+
+
-
-
@@ -28,7 +29,7 @@
- 导出记录
+ 导出记录
@@ -63,6 +64,7 @@
import { getGasData, batchExportGasData } from '@/api/data'
import DeptSelect from '../../../components/DeptSelect/index'
import { parseUrl } from '@/utils/parseutils'
+import { getSearchLastWeekTime } from '@/utils/dateutils'
export default {
name: 'ListGasData',
@@ -163,6 +165,7 @@
if (params && params.deviceType === '4' && params.devcode) {
this.listQuery.keywords = params.devcode
}
+ this.timeRange = getSearchLastWeekTime()
this.fetchData()
}
},
@@ -191,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/listGasflowData.vue b/src/views/dataManage/deviceData/listGasflowData.vue
new file mode 100644
index 0000000..9c5321a
--- /dev/null
+++ b/src/views/dataManage/deviceData/listGasflowData.vue
@@ -0,0 +1,311 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/alarmGasCountByType.vue b/src/views/gasDashboard/components/alarmGasCountByType.vue
new file mode 100644
index 0000000..4f80d3a
--- /dev/null
+++ b/src/views/gasDashboard/components/alarmGasCountByType.vue
@@ -0,0 +1,72 @@
+
+
+
+
-
+ {{ name }} {{ context[index] }}{{ unit }}
+
@@ -36,46 +26,46 @@
diff --git a/src/views/dataManage/deviceData/listCorrodeData.vue b/src/views/dataManage/deviceData/listCorrodeData.vue
new file mode 100644
index 0000000..1a20abb
--- /dev/null
+++ b/src/views/dataManage/deviceData/listCorrodeData.vue
@@ -0,0 +1,272 @@
+
+
{{ title[0] }}
- {{ context[0] }}{{unit}}
+ {{ context[0] }}{{ unit }}
+
+
+
+
+
+
+
diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue
index 97cdfdb..40b9a5e 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -5,10 +5,10 @@
+
+
+
+
+
+
+ 搜索
+
+
+
+
+
+
+
+ 导出记录
+
+
+
+
+
+
+ {{ scope.row[column.value] }}
+ {{ scope.row[column.value] }}
+
+
+
+
+
+ 数据列表
+
+ 数据列表
+
+
+
+
+
+
+
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 bf03fd1..dffd340 100644
--- a/src/views/dataManage/deviceData/listWaterData.vue
+++ b/src/views/dataManage/deviceData/listWaterData.vue
@@ -176,6 +176,12 @@
align: 'center'
},
{
+ text: '压力(Mpa)',
+ value: 'pressure',
+ width: 90,
+ align: 'center'
+ },
+ {
text: '今日用水量（立方米）',
value: 'dayCount',
align: 'center',
@@ -276,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) // 下载完成移除元素
@@ -311,9 +317,11 @@
}
getWatchData(this.listQuery).then((response) => {
this.list = response.data.rows.map(function(item) {
- item.areaFullName = item.areaFullName
- .replace('/', '')
- .replace('顶层', '')
+ item.totalCount = parseFloat(item.totalCount).toFixed(2)
+ item.dayCount = parseFloat(item.dayCount).toFixed(2)
+ item.monthCount = parseFloat(item.monthCount).toFixed(2)
+ item.pressure = parseFloat(item.pressure).toFixed(2)
+ item.areaFullName = item.areaFullName.replace('/', '').replace('顶层', '')
return item
})
this.total = parseInt(response.data.total)
diff --git a/src/views/dataManage/deviceData/waterHistory.vue b/src/views/dataManage/deviceData/waterHistory.vue
index 160dab7..42e3303 100644
--- a/src/views/dataManage/deviceData/waterHistory.vue
+++ b/src/views/dataManage/deviceData/waterHistory.vue
@@ -1,5 +1,5 @@
-
+
+
+
+
+
+
+ 搜索
+
+
+
+
+
+
+
+ 导出记录
+
+
+
+
+
+
+ {{
+ scope.row[column.value]
+ }}
+ {{
+ scope.row["areaFullName"] + '/' + scope.row[column.value]
+ }}
+ {{ scope.row[column.value] }}
+
+
+
+
+
+ 历史数据
+
+
+
+
+
+
+ 数据列表
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/AlarmNowList.vue b/src/views/gasDashboard/components/AlarmNowList.vue
new file mode 100644
index 0000000..890325f
--- /dev/null
+++ b/src/views/gasDashboard/components/AlarmNowList.vue
@@ -0,0 +1,35 @@
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/DeviceCount.vue b/src/views/gasDashboard/components/DeviceCount.vue
new file mode 100644
index 0000000..bffc9e9
--- /dev/null
+++ b/src/views/gasDashboard/components/DeviceCount.vue
@@ -0,0 +1,68 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/FunctionArea.vue b/src/views/gasDashboard/components/FunctionArea.vue
new file mode 100644
index 0000000..6401557
--- /dev/null
+++ b/src/views/gasDashboard/components/FunctionArea.vue
@@ -0,0 +1,140 @@
+
+
+
+ 本年度
+ 本季度
+ 近30日
+ 近7日
+ 今日
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/FunctionArea2.vue b/src/views/gasDashboard/components/FunctionArea2.vue
new file mode 100644
index 0000000..26a9f82
--- /dev/null
+++ b/src/views/gasDashboard/components/FunctionArea2.vue
@@ -0,0 +1,107 @@
+
+
+
+ 本年度
+ 本季度
+ 近30日
+ 近7日
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/PanelGroup.vue b/src/views/gasDashboard/components/PanelGroup.vue
new file mode 100644
index 0000000..103486e
--- /dev/null
+++ b/src/views/gasDashboard/components/PanelGroup.vue
@@ -0,0 +1,137 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/alarmLeakCountPie.vue b/src/views/gasDashboard/components/alarmLeakCountPie.vue
new file mode 100644
index 0000000..abfbc2d
--- /dev/null
+++ b/src/views/gasDashboard/components/alarmLeakCountPie.vue
@@ -0,0 +1,74 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/corrodeCountByDay.vue b/src/views/gasDashboard/components/corrodeCountByDay.vue
new file mode 100644
index 0000000..a410f29
--- /dev/null
+++ b/src/views/gasDashboard/components/corrodeCountByDay.vue
@@ -0,0 +1,100 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasAlarmTrend.vue b/src/views/gasDashboard/components/gasAlarmTrend.vue
new file mode 100644
index 0000000..a1d422e
--- /dev/null
+++ b/src/views/gasDashboard/components/gasAlarmTrend.vue
@@ -0,0 +1,100 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasCompare.vue b/src/views/gasDashboard/components/gasCompare.vue
new file mode 100644
index 0000000..19a4398
--- /dev/null
+++ b/src/views/gasDashboard/components/gasCompare.vue
@@ -0,0 +1,121 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasCountByAreaBar.vue b/src/views/gasDashboard/components/gasCountByAreaBar.vue
new file mode 100644
index 0000000..456a6c6
--- /dev/null
+++ b/src/views/gasDashboard/components/gasCountByAreaBar.vue
@@ -0,0 +1,198 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasCountByDay.vue b/src/views/gasDashboard/components/gasCountByDay.vue
new file mode 100644
index 0000000..f0a3977
--- /dev/null
+++ b/src/views/gasDashboard/components/gasCountByDay.vue
@@ -0,0 +1,114 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasCountByDept.vue b/src/views/gasDashboard/components/gasCountByDept.vue
new file mode 100644
index 0000000..31c8508
--- /dev/null
+++ b/src/views/gasDashboard/components/gasCountByDept.vue
@@ -0,0 +1,126 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasCountByDeviceBar.vue b/src/views/gasDashboard/components/gasCountByDeviceBar.vue
new file mode 100644
index 0000000..dc211e3
--- /dev/null
+++ b/src/views/gasDashboard/components/gasCountByDeviceBar.vue
@@ -0,0 +1,130 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasNote.vue b/src/views/gasDashboard/components/gasNote.vue
new file mode 100644
index 0000000..5ade90f
--- /dev/null
+++ b/src/views/gasDashboard/components/gasNote.vue
@@ -0,0 +1,149 @@
+
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/watchAlarmBar.vue b/src/views/gasDashboard/components/watchAlarmBar.vue
new file mode 100644
index 0000000..4279440
--- /dev/null
+++ b/src/views/gasDashboard/components/watchAlarmBar.vue
@@ -0,0 +1,180 @@
+
+
+
+ 场区用气事记
+
+
+
+
+
+
+
+
+
+ {{ index+1 }}. {{ item.content }}
+
+
+ {{ index+1 }}.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/watchGasAlarmBar.vue b/src/views/gasDashboard/components/watchGasAlarmBar.vue
new file mode 100644
index 0000000..0113341
--- /dev/null
+++ b/src/views/gasDashboard/components/watchGasAlarmBar.vue
@@ -0,0 +1,132 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/index.vue b/src/views/gasDashboard/index.vue
new file mode 100644
index 0000000..be583f2
--- /dev/null
+++ b/src/views/gasDashboard/index.vue
@@ -0,0 +1,191 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/gasOverview/gasOverviewSimple.vue b/src/views/gasOverview/gasOverviewSimple.vue
new file mode 100644
index 0000000..8ff468f
--- /dev/null
+++ b/src/views/gasOverview/gasOverviewSimple.vue
@@ -0,0 +1,1189 @@
+
+
+
+
+
+
+
+
+
diff --git a/src/views/jobManage/detailJob.vue b/src/views/jobManage/detailJob.vue
index 2d6aaa4..fe7e68e 100644
--- a/src/views/jobManage/detailJob.vue
+++ b/src/views/jobManage/detailJob.vue
@@ -205,8 +205,9 @@
// 获取工单详情
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 => {
+ console.log(response, ' ============response=')
this.loading = false
if (response.code === 200) {
if (response.data.length <= 0) {
@@ -217,26 +218,28 @@
// 处理现场图片
if (job.firstStatePhotos !== '') {
this.firstImageList = []
- const urls = job.firstStatePhotos.split(';')
+ const urls = job.firstStatePhotos.split(',')
for (const url of urls) {
if (url) {
// this.firstImageList.push({ name: url, url: base_url + url })
this.firstImageList.push(base_url + url)
}
}
+ console.log(this.firstImageList)
} else {
this.firstImageList = []
}
// 处理维护图片
if (job.handlePhotos.length !== '') {
this.handleImageList = []
- const urls = job.handlePhotos.split(';')
+ const urls = job.handlePhotos.split(',')
for (const url of urls) {
if (url) {
// this.handleImageList.push({ name: url, url: base_url + url })
this.handleImageList.push(base_url + url)
}
}
+ console.log(this.handleImageList)
} else {
this.handleImageList = []
}
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 @@
diff --git a/src/views/dataManage/deviceData/listCorrodeData.vue b/src/views/dataManage/deviceData/listCorrodeData.vue
new file mode 100644
index 0000000..1a20abb
--- /dev/null
+++ b/src/views/dataManage/deviceData/listCorrodeData.vue
@@ -0,0 +1,272 @@
+
+
-
-
@@ -28,7 +29,7 @@
- 导出记录
+ 导出记录
@@ -63,6 +64,7 @@
import { getGasData, batchExportGasData } from '@/api/data'
import DeptSelect from '../../../components/DeptSelect/index'
import { parseUrl } from '@/utils/parseutils'
+import { getSearchLastWeekTime } from '@/utils/dateutils'
export default {
name: 'ListGasData',
@@ -163,6 +165,7 @@
if (params && params.deviceType === '4' && params.devcode) {
this.listQuery.keywords = params.devcode
}
+ this.timeRange = getSearchLastWeekTime()
this.fetchData()
}
},
@@ -191,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/listGasflowData.vue b/src/views/dataManage/deviceData/listGasflowData.vue
new file mode 100644
index 0000000..9c5321a
--- /dev/null
+++ b/src/views/dataManage/deviceData/listGasflowData.vue
@@ -0,0 +1,311 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/alarmGasCountByType.vue b/src/views/gasDashboard/components/alarmGasCountByType.vue
new file mode 100644
index 0000000..4f80d3a
--- /dev/null
+++ b/src/views/gasDashboard/components/alarmGasCountByType.vue
@@ -0,0 +1,72 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue
index 97cdfdb..40b9a5e 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -5,10 +5,10 @@
+
+
+
+
+
+
+ 搜索
+
+
+
+
+
+
+
+ 导出记录
+
+
+
+
+
+
+ {{ scope.row[column.value] }}
+ {{ scope.row[column.value] }}
+
+
+
+
+
+ 数据列表
+
+ 数据列表
+
+
+
+
+
+
+
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 bf03fd1..dffd340 100644
--- a/src/views/dataManage/deviceData/listWaterData.vue
+++ b/src/views/dataManage/deviceData/listWaterData.vue
@@ -176,6 +176,12 @@
align: 'center'
},
{
+ text: '压力(Mpa)',
+ value: 'pressure',
+ width: 90,
+ align: 'center'
+ },
+ {
text: '今日用水量（立方米）',
value: 'dayCount',
align: 'center',
@@ -276,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) // 下载完成移除元素
@@ -311,9 +317,11 @@
}
getWatchData(this.listQuery).then((response) => {
this.list = response.data.rows.map(function(item) {
- item.areaFullName = item.areaFullName
- .replace('/', '')
- .replace('顶层', '')
+ item.totalCount = parseFloat(item.totalCount).toFixed(2)
+ item.dayCount = parseFloat(item.dayCount).toFixed(2)
+ item.monthCount = parseFloat(item.monthCount).toFixed(2)
+ item.pressure = parseFloat(item.pressure).toFixed(2)
+ item.areaFullName = item.areaFullName.replace('/', '').replace('顶层', '')
return item
})
this.total = parseInt(response.data.total)
diff --git a/src/views/dataManage/deviceData/waterHistory.vue b/src/views/dataManage/deviceData/waterHistory.vue
index 160dab7..42e3303 100644
--- a/src/views/dataManage/deviceData/waterHistory.vue
+++ b/src/views/dataManage/deviceData/waterHistory.vue
@@ -1,5 +1,5 @@
-
+
+
+
+
+
+
+ 搜索
+
+
+
+
+
+
+
+ 导出记录
+
+
+
+
+
+
+ {{
+ scope.row[column.value]
+ }}
+ {{
+ scope.row["areaFullName"] + '/' + scope.row[column.value]
+ }}
+ {{ scope.row[column.value] }}
+
+
+
+
+
+ 历史数据
+
+
+
+
+
+
+ 数据列表
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/AlarmNowList.vue b/src/views/gasDashboard/components/AlarmNowList.vue
new file mode 100644
index 0000000..890325f
--- /dev/null
+++ b/src/views/gasDashboard/components/AlarmNowList.vue
@@ -0,0 +1,35 @@
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/DeviceCount.vue b/src/views/gasDashboard/components/DeviceCount.vue
new file mode 100644
index 0000000..bffc9e9
--- /dev/null
+++ b/src/views/gasDashboard/components/DeviceCount.vue
@@ -0,0 +1,68 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/FunctionArea.vue b/src/views/gasDashboard/components/FunctionArea.vue
new file mode 100644
index 0000000..6401557
--- /dev/null
+++ b/src/views/gasDashboard/components/FunctionArea.vue
@@ -0,0 +1,140 @@
+
+
+
+ 本年度
+ 本季度
+ 近30日
+ 近7日
+ 今日
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/FunctionArea2.vue b/src/views/gasDashboard/components/FunctionArea2.vue
new file mode 100644
index 0000000..26a9f82
--- /dev/null
+++ b/src/views/gasDashboard/components/FunctionArea2.vue
@@ -0,0 +1,107 @@
+
+
+
+ 本年度
+ 本季度
+ 近30日
+ 近7日
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/PanelGroup.vue b/src/views/gasDashboard/components/PanelGroup.vue
new file mode 100644
index 0000000..103486e
--- /dev/null
+++ b/src/views/gasDashboard/components/PanelGroup.vue
@@ -0,0 +1,137 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/alarmLeakCountPie.vue b/src/views/gasDashboard/components/alarmLeakCountPie.vue
new file mode 100644
index 0000000..abfbc2d
--- /dev/null
+++ b/src/views/gasDashboard/components/alarmLeakCountPie.vue
@@ -0,0 +1,74 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/corrodeCountByDay.vue b/src/views/gasDashboard/components/corrodeCountByDay.vue
new file mode 100644
index 0000000..a410f29
--- /dev/null
+++ b/src/views/gasDashboard/components/corrodeCountByDay.vue
@@ -0,0 +1,100 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasAlarmTrend.vue b/src/views/gasDashboard/components/gasAlarmTrend.vue
new file mode 100644
index 0000000..a1d422e
--- /dev/null
+++ b/src/views/gasDashboard/components/gasAlarmTrend.vue
@@ -0,0 +1,100 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasCompare.vue b/src/views/gasDashboard/components/gasCompare.vue
new file mode 100644
index 0000000..19a4398
--- /dev/null
+++ b/src/views/gasDashboard/components/gasCompare.vue
@@ -0,0 +1,121 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasCountByAreaBar.vue b/src/views/gasDashboard/components/gasCountByAreaBar.vue
new file mode 100644
index 0000000..456a6c6
--- /dev/null
+++ b/src/views/gasDashboard/components/gasCountByAreaBar.vue
@@ -0,0 +1,198 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasCountByDay.vue b/src/views/gasDashboard/components/gasCountByDay.vue
new file mode 100644
index 0000000..f0a3977
--- /dev/null
+++ b/src/views/gasDashboard/components/gasCountByDay.vue
@@ -0,0 +1,114 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasCountByDept.vue b/src/views/gasDashboard/components/gasCountByDept.vue
new file mode 100644
index 0000000..31c8508
--- /dev/null
+++ b/src/views/gasDashboard/components/gasCountByDept.vue
@@ -0,0 +1,126 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasCountByDeviceBar.vue b/src/views/gasDashboard/components/gasCountByDeviceBar.vue
new file mode 100644
index 0000000..dc211e3
--- /dev/null
+++ b/src/views/gasDashboard/components/gasCountByDeviceBar.vue
@@ -0,0 +1,130 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasNote.vue b/src/views/gasDashboard/components/gasNote.vue
new file mode 100644
index 0000000..5ade90f
--- /dev/null
+++ b/src/views/gasDashboard/components/gasNote.vue
@@ -0,0 +1,149 @@
+
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/watchAlarmBar.vue b/src/views/gasDashboard/components/watchAlarmBar.vue
new file mode 100644
index 0000000..4279440
--- /dev/null
+++ b/src/views/gasDashboard/components/watchAlarmBar.vue
@@ -0,0 +1,180 @@
+
+
+
+ 场区用气事记
+
+
+
+
+
+
+
+
+
+ {{ index+1 }}. {{ item.content }}
+
+
+ {{ index+1 }}.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/watchGasAlarmBar.vue b/src/views/gasDashboard/components/watchGasAlarmBar.vue
new file mode 100644
index 0000000..0113341
--- /dev/null
+++ b/src/views/gasDashboard/components/watchGasAlarmBar.vue
@@ -0,0 +1,132 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/index.vue b/src/views/gasDashboard/index.vue
new file mode 100644
index 0000000..be583f2
--- /dev/null
+++ b/src/views/gasDashboard/index.vue
@@ -0,0 +1,191 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/gasOverview/gasOverviewSimple.vue b/src/views/gasOverview/gasOverviewSimple.vue
new file mode 100644
index 0000000..8ff468f
--- /dev/null
+++ b/src/views/gasOverview/gasOverviewSimple.vue
@@ -0,0 +1,1189 @@
+
+
+
+
+
+
+
+
+
diff --git a/src/views/jobManage/detailJob.vue b/src/views/jobManage/detailJob.vue
index 2d6aaa4..fe7e68e 100644
--- a/src/views/jobManage/detailJob.vue
+++ b/src/views/jobManage/detailJob.vue
@@ -205,8 +205,9 @@
// 获取工单详情
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 => {
+ console.log(response, ' ============response=')
this.loading = false
if (response.code === 200) {
if (response.data.length <= 0) {
@@ -217,26 +218,28 @@
// 处理现场图片
if (job.firstStatePhotos !== '') {
this.firstImageList = []
- const urls = job.firstStatePhotos.split(';')
+ const urls = job.firstStatePhotos.split(',')
for (const url of urls) {
if (url) {
// this.firstImageList.push({ name: url, url: base_url + url })
this.firstImageList.push(base_url + url)
}
}
+ console.log(this.firstImageList)
} else {
this.firstImageList = []
}
// 处理维护图片
if (job.handlePhotos.length !== '') {
this.handleImageList = []
- const urls = job.handlePhotos.split(';')
+ const urls = job.handlePhotos.split(',')
for (const url of urls) {
if (url) {
// this.handleImageList.push({ name: url, url: base_url + url })
this.handleImageList.push(base_url + url)
}
}
+ console.log(this.handleImageList)
} else {
this.handleImageList = []
}
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 @@
diff --git a/src/views/dataManage/deviceData/listCorrodeData.vue b/src/views/dataManage/deviceData/listCorrodeData.vue
new file mode 100644
index 0000000..1a20abb
--- /dev/null
+++ b/src/views/dataManage/deviceData/listCorrodeData.vue
@@ -0,0 +1,272 @@
+
+
-
-
@@ -28,7 +29,7 @@
- 导出记录
+ 导出记录
@@ -63,6 +64,7 @@
import { getGasData, batchExportGasData } from '@/api/data'
import DeptSelect from '../../../components/DeptSelect/index'
import { parseUrl } from '@/utils/parseutils'
+import { getSearchLastWeekTime } from '@/utils/dateutils'
export default {
name: 'ListGasData',
@@ -163,6 +165,7 @@
if (params && params.deviceType === '4' && params.devcode) {
this.listQuery.keywords = params.devcode
}
+ this.timeRange = getSearchLastWeekTime()
this.fetchData()
}
},
@@ -191,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/listGasflowData.vue b/src/views/dataManage/deviceData/listGasflowData.vue
new file mode 100644
index 0000000..9c5321a
--- /dev/null
+++ b/src/views/dataManage/deviceData/listGasflowData.vue
@@ -0,0 +1,311 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/alarmGasCountByType.vue b/src/views/gasDashboard/components/alarmGasCountByType.vue
new file mode 100644
index 0000000..4f80d3a
--- /dev/null
+++ b/src/views/gasDashboard/components/alarmGasCountByType.vue
@@ -0,0 +1,72 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue
index 97cdfdb..40b9a5e 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -5,10 +5,10 @@
+
+
+
+
+
+
+ 搜索
+
+
+
+
+
+
+
+ 导出记录
+
+
+
+
+
+
+ {{ scope.row[column.value] }}
+ {{ scope.row[column.value] }}
+
+
+
+
+
+ 数据列表
+
+ 数据列表
+
+
+
+
+
+
+
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 bf03fd1..dffd340 100644
--- a/src/views/dataManage/deviceData/listWaterData.vue
+++ b/src/views/dataManage/deviceData/listWaterData.vue
@@ -176,6 +176,12 @@
align: 'center'
},
{
+ text: '压力(Mpa)',
+ value: 'pressure',
+ width: 90,
+ align: 'center'
+ },
+ {
text: '今日用水量（立方米）',
value: 'dayCount',
align: 'center',
@@ -276,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) // 下载完成移除元素
@@ -311,9 +317,11 @@
}
getWatchData(this.listQuery).then((response) => {
this.list = response.data.rows.map(function(item) {
- item.areaFullName = item.areaFullName
- .replace('/', '')
- .replace('顶层', '')
+ item.totalCount = parseFloat(item.totalCount).toFixed(2)
+ item.dayCount = parseFloat(item.dayCount).toFixed(2)
+ item.monthCount = parseFloat(item.monthCount).toFixed(2)
+ item.pressure = parseFloat(item.pressure).toFixed(2)
+ item.areaFullName = item.areaFullName.replace('/', '').replace('顶层', '')
return item
})
this.total = parseInt(response.data.total)
diff --git a/src/views/dataManage/deviceData/waterHistory.vue b/src/views/dataManage/deviceData/waterHistory.vue
index 160dab7..42e3303 100644
--- a/src/views/dataManage/deviceData/waterHistory.vue
+++ b/src/views/dataManage/deviceData/waterHistory.vue
@@ -1,5 +1,5 @@
-
+
+
+
+
+
+
+ 搜索
+
+
+
+
+
+
+
+ 导出记录
+
+
+
+
+
+
+ {{
+ scope.row[column.value]
+ }}
+ {{
+ scope.row["areaFullName"] + '/' + scope.row[column.value]
+ }}
+ {{ scope.row[column.value] }}
+
+
+
+
+
+ 历史数据
+
+
+
+
+
+
+ 数据列表
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/AlarmNowList.vue b/src/views/gasDashboard/components/AlarmNowList.vue
new file mode 100644
index 0000000..890325f
--- /dev/null
+++ b/src/views/gasDashboard/components/AlarmNowList.vue
@@ -0,0 +1,35 @@
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/DeviceCount.vue b/src/views/gasDashboard/components/DeviceCount.vue
new file mode 100644
index 0000000..bffc9e9
--- /dev/null
+++ b/src/views/gasDashboard/components/DeviceCount.vue
@@ -0,0 +1,68 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/FunctionArea.vue b/src/views/gasDashboard/components/FunctionArea.vue
new file mode 100644
index 0000000..6401557
--- /dev/null
+++ b/src/views/gasDashboard/components/FunctionArea.vue
@@ -0,0 +1,140 @@
+
+
+
+ 本年度
+ 本季度
+ 近30日
+ 近7日
+ 今日
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/FunctionArea2.vue b/src/views/gasDashboard/components/FunctionArea2.vue
new file mode 100644
index 0000000..26a9f82
--- /dev/null
+++ b/src/views/gasDashboard/components/FunctionArea2.vue
@@ -0,0 +1,107 @@
+
+
+
+ 本年度
+ 本季度
+ 近30日
+ 近7日
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/PanelGroup.vue b/src/views/gasDashboard/components/PanelGroup.vue
new file mode 100644
index 0000000..103486e
--- /dev/null
+++ b/src/views/gasDashboard/components/PanelGroup.vue
@@ -0,0 +1,137 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/alarmLeakCountPie.vue b/src/views/gasDashboard/components/alarmLeakCountPie.vue
new file mode 100644
index 0000000..abfbc2d
--- /dev/null
+++ b/src/views/gasDashboard/components/alarmLeakCountPie.vue
@@ -0,0 +1,74 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/corrodeCountByDay.vue b/src/views/gasDashboard/components/corrodeCountByDay.vue
new file mode 100644
index 0000000..a410f29
--- /dev/null
+++ b/src/views/gasDashboard/components/corrodeCountByDay.vue
@@ -0,0 +1,100 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasAlarmTrend.vue b/src/views/gasDashboard/components/gasAlarmTrend.vue
new file mode 100644
index 0000000..a1d422e
--- /dev/null
+++ b/src/views/gasDashboard/components/gasAlarmTrend.vue
@@ -0,0 +1,100 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasCompare.vue b/src/views/gasDashboard/components/gasCompare.vue
new file mode 100644
index 0000000..19a4398
--- /dev/null
+++ b/src/views/gasDashboard/components/gasCompare.vue
@@ -0,0 +1,121 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasCountByAreaBar.vue b/src/views/gasDashboard/components/gasCountByAreaBar.vue
new file mode 100644
index 0000000..456a6c6
--- /dev/null
+++ b/src/views/gasDashboard/components/gasCountByAreaBar.vue
@@ -0,0 +1,198 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasCountByDay.vue b/src/views/gasDashboard/components/gasCountByDay.vue
new file mode 100644
index 0000000..f0a3977
--- /dev/null
+++ b/src/views/gasDashboard/components/gasCountByDay.vue
@@ -0,0 +1,114 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasCountByDept.vue b/src/views/gasDashboard/components/gasCountByDept.vue
new file mode 100644
index 0000000..31c8508
--- /dev/null
+++ b/src/views/gasDashboard/components/gasCountByDept.vue
@@ -0,0 +1,126 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasCountByDeviceBar.vue b/src/views/gasDashboard/components/gasCountByDeviceBar.vue
new file mode 100644
index 0000000..dc211e3
--- /dev/null
+++ b/src/views/gasDashboard/components/gasCountByDeviceBar.vue
@@ -0,0 +1,130 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasNote.vue b/src/views/gasDashboard/components/gasNote.vue
new file mode 100644
index 0000000..5ade90f
--- /dev/null
+++ b/src/views/gasDashboard/components/gasNote.vue
@@ -0,0 +1,149 @@
+
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/watchAlarmBar.vue b/src/views/gasDashboard/components/watchAlarmBar.vue
new file mode 100644
index 0000000..4279440
--- /dev/null
+++ b/src/views/gasDashboard/components/watchAlarmBar.vue
@@ -0,0 +1,180 @@
+
+
+
+ 场区用气事记
+
+
+
+
+
+
+
+
+
+ {{ index+1 }}. {{ item.content }}
+
+
+ {{ index+1 }}.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/watchGasAlarmBar.vue b/src/views/gasDashboard/components/watchGasAlarmBar.vue
new file mode 100644
index 0000000..0113341
--- /dev/null
+++ b/src/views/gasDashboard/components/watchGasAlarmBar.vue
@@ -0,0 +1,132 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/index.vue b/src/views/gasDashboard/index.vue
new file mode 100644
index 0000000..be583f2
--- /dev/null
+++ b/src/views/gasDashboard/index.vue
@@ -0,0 +1,191 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/gasOverview/gasOverviewSimple.vue b/src/views/gasOverview/gasOverviewSimple.vue
new file mode 100644
index 0000000..8ff468f
--- /dev/null
+++ b/src/views/gasOverview/gasOverviewSimple.vue
@@ -0,0 +1,1189 @@
+
+
+
+
+
+
+
+
+
diff --git a/src/views/jobManage/detailJob.vue b/src/views/jobManage/detailJob.vue
index 2d6aaa4..fe7e68e 100644
--- a/src/views/jobManage/detailJob.vue
+++ b/src/views/jobManage/detailJob.vue
@@ -205,8 +205,9 @@
// 获取工单详情
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 => {
+ console.log(response, ' ============response=')
this.loading = false
if (response.code === 200) {
if (response.data.length <= 0) {
@@ -217,26 +218,28 @@
// 处理现场图片
if (job.firstStatePhotos !== '') {
this.firstImageList = []
- const urls = job.firstStatePhotos.split(';')
+ const urls = job.firstStatePhotos.split(',')
for (const url of urls) {
if (url) {
// this.firstImageList.push({ name: url, url: base_url + url })
this.firstImageList.push(base_url + url)
}
}
+ console.log(this.firstImageList)
} else {
this.firstImageList = []
}
// 处理维护图片
if (job.handlePhotos.length !== '') {
this.handleImageList = []
- const urls = job.handlePhotos.split(';')
+ const urls = job.handlePhotos.split(',')
for (const url of urls) {
if (url) {
// this.handleImageList.push({ name: url, url: base_url + url })
this.handleImageList.push(base_url + url)
}
}
+ console.log(this.handleImageList)
} else {
this.handleImageList = []
}
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 @@
diff --git a/src/views/dataManage/deviceData/listCorrodeData.vue b/src/views/dataManage/deviceData/listCorrodeData.vue
new file mode 100644
index 0000000..1a20abb
--- /dev/null
+++ b/src/views/dataManage/deviceData/listCorrodeData.vue
@@ -0,0 +1,272 @@
+
+
-
-
@@ -28,7 +29,7 @@
- 导出记录
+ 导出记录
@@ -63,6 +64,7 @@
import { getGasData, batchExportGasData } from '@/api/data'
import DeptSelect from '../../../components/DeptSelect/index'
import { parseUrl } from '@/utils/parseutils'
+import { getSearchLastWeekTime } from '@/utils/dateutils'
export default {
name: 'ListGasData',
@@ -163,6 +165,7 @@
if (params && params.deviceType === '4' && params.devcode) {
this.listQuery.keywords = params.devcode
}
+ this.timeRange = getSearchLastWeekTime()
this.fetchData()
}
},
@@ -191,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/listGasflowData.vue b/src/views/dataManage/deviceData/listGasflowData.vue
new file mode 100644
index 0000000..9c5321a
--- /dev/null
+++ b/src/views/dataManage/deviceData/listGasflowData.vue
@@ -0,0 +1,311 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/alarmGasCountByType.vue b/src/views/gasDashboard/components/alarmGasCountByType.vue
new file mode 100644
index 0000000..4f80d3a
--- /dev/null
+++ b/src/views/gasDashboard/components/alarmGasCountByType.vue
@@ -0,0 +1,72 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue
index 97cdfdb..40b9a5e 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -5,10 +5,10 @@
+
+
+
+
+
+
+ 搜索
+
+
+
+
+
+
+
+ 导出记录
+
+
+
+
+
+
+ {{ scope.row[column.value] }}
+ {{ scope.row[column.value] }}
+
+
+
+
+
+ 数据列表
+
+ 数据列表
+
+
+
+
+
+
+
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 bf03fd1..dffd340 100644
--- a/src/views/dataManage/deviceData/listWaterData.vue
+++ b/src/views/dataManage/deviceData/listWaterData.vue
@@ -176,6 +176,12 @@
align: 'center'
},
{
+ text: '压力(Mpa)',
+ value: 'pressure',
+ width: 90,
+ align: 'center'
+ },
+ {
text: '今日用水量（立方米）',
value: 'dayCount',
align: 'center',
@@ -276,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) // 下载完成移除元素
@@ -311,9 +317,11 @@
}
getWatchData(this.listQuery).then((response) => {
this.list = response.data.rows.map(function(item) {
- item.areaFullName = item.areaFullName
- .replace('/', '')
- .replace('顶层', '')
+ item.totalCount = parseFloat(item.totalCount).toFixed(2)
+ item.dayCount = parseFloat(item.dayCount).toFixed(2)
+ item.monthCount = parseFloat(item.monthCount).toFixed(2)
+ item.pressure = parseFloat(item.pressure).toFixed(2)
+ item.areaFullName = item.areaFullName.replace('/', '').replace('顶层', '')
return item
})
this.total = parseInt(response.data.total)
diff --git a/src/views/dataManage/deviceData/waterHistory.vue b/src/views/dataManage/deviceData/waterHistory.vue
index 160dab7..42e3303 100644
--- a/src/views/dataManage/deviceData/waterHistory.vue
+++ b/src/views/dataManage/deviceData/waterHistory.vue
@@ -1,5 +1,5 @@
-
+
+
+
+
+
+
+ 搜索
+
+
+
+
+
+
+
+ 导出记录
+
+
+
+
+
+
+ {{
+ scope.row[column.value]
+ }}
+ {{
+ scope.row["areaFullName"] + '/' + scope.row[column.value]
+ }}
+ {{ scope.row[column.value] }}
+
+
+
+
+
+ 历史数据
+
+
+
+
+
+
+ 数据列表
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/AlarmNowList.vue b/src/views/gasDashboard/components/AlarmNowList.vue
new file mode 100644
index 0000000..890325f
--- /dev/null
+++ b/src/views/gasDashboard/components/AlarmNowList.vue
@@ -0,0 +1,35 @@
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/DeviceCount.vue b/src/views/gasDashboard/components/DeviceCount.vue
new file mode 100644
index 0000000..bffc9e9
--- /dev/null
+++ b/src/views/gasDashboard/components/DeviceCount.vue
@@ -0,0 +1,68 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/FunctionArea.vue b/src/views/gasDashboard/components/FunctionArea.vue
new file mode 100644
index 0000000..6401557
--- /dev/null
+++ b/src/views/gasDashboard/components/FunctionArea.vue
@@ -0,0 +1,140 @@
+
+
+
+ 本年度
+ 本季度
+ 近30日
+ 近7日
+ 今日
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/FunctionArea2.vue b/src/views/gasDashboard/components/FunctionArea2.vue
new file mode 100644
index 0000000..26a9f82
--- /dev/null
+++ b/src/views/gasDashboard/components/FunctionArea2.vue
@@ -0,0 +1,107 @@
+
+
+
+ 本年度
+ 本季度
+ 近30日
+ 近7日
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/PanelGroup.vue b/src/views/gasDashboard/components/PanelGroup.vue
new file mode 100644
index 0000000..103486e
--- /dev/null
+++ b/src/views/gasDashboard/components/PanelGroup.vue
@@ -0,0 +1,137 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/alarmLeakCountPie.vue b/src/views/gasDashboard/components/alarmLeakCountPie.vue
new file mode 100644
index 0000000..abfbc2d
--- /dev/null
+++ b/src/views/gasDashboard/components/alarmLeakCountPie.vue
@@ -0,0 +1,74 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/corrodeCountByDay.vue b/src/views/gasDashboard/components/corrodeCountByDay.vue
new file mode 100644
index 0000000..a410f29
--- /dev/null
+++ b/src/views/gasDashboard/components/corrodeCountByDay.vue
@@ -0,0 +1,100 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasAlarmTrend.vue b/src/views/gasDashboard/components/gasAlarmTrend.vue
new file mode 100644
index 0000000..a1d422e
--- /dev/null
+++ b/src/views/gasDashboard/components/gasAlarmTrend.vue
@@ -0,0 +1,100 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasCompare.vue b/src/views/gasDashboard/components/gasCompare.vue
new file mode 100644
index 0000000..19a4398
--- /dev/null
+++ b/src/views/gasDashboard/components/gasCompare.vue
@@ -0,0 +1,121 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasCountByAreaBar.vue b/src/views/gasDashboard/components/gasCountByAreaBar.vue
new file mode 100644
index 0000000..456a6c6
--- /dev/null
+++ b/src/views/gasDashboard/components/gasCountByAreaBar.vue
@@ -0,0 +1,198 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasCountByDay.vue b/src/views/gasDashboard/components/gasCountByDay.vue
new file mode 100644
index 0000000..f0a3977
--- /dev/null
+++ b/src/views/gasDashboard/components/gasCountByDay.vue
@@ -0,0 +1,114 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasCountByDept.vue b/src/views/gasDashboard/components/gasCountByDept.vue
new file mode 100644
index 0000000..31c8508
--- /dev/null
+++ b/src/views/gasDashboard/components/gasCountByDept.vue
@@ -0,0 +1,126 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasCountByDeviceBar.vue b/src/views/gasDashboard/components/gasCountByDeviceBar.vue
new file mode 100644
index 0000000..dc211e3
--- /dev/null
+++ b/src/views/gasDashboard/components/gasCountByDeviceBar.vue
@@ -0,0 +1,130 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasNote.vue b/src/views/gasDashboard/components/gasNote.vue
new file mode 100644
index 0000000..5ade90f
--- /dev/null
+++ b/src/views/gasDashboard/components/gasNote.vue
@@ -0,0 +1,149 @@
+
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/watchAlarmBar.vue b/src/views/gasDashboard/components/watchAlarmBar.vue
new file mode 100644
index 0000000..4279440
--- /dev/null
+++ b/src/views/gasDashboard/components/watchAlarmBar.vue
@@ -0,0 +1,180 @@
+
+
+
+ 场区用气事记
+
+
+
+
+
+
+
+
+
+ {{ index+1 }}. {{ item.content }}
+
+
+ {{ index+1 }}.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/watchGasAlarmBar.vue b/src/views/gasDashboard/components/watchGasAlarmBar.vue
new file mode 100644
index 0000000..0113341
--- /dev/null
+++ b/src/views/gasDashboard/components/watchGasAlarmBar.vue
@@ -0,0 +1,132 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/index.vue b/src/views/gasDashboard/index.vue
new file mode 100644
index 0000000..be583f2
--- /dev/null
+++ b/src/views/gasDashboard/index.vue
@@ -0,0 +1,191 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/gasOverview/gasOverviewSimple.vue b/src/views/gasOverview/gasOverviewSimple.vue
new file mode 100644
index 0000000..8ff468f
--- /dev/null
+++ b/src/views/gasOverview/gasOverviewSimple.vue
@@ -0,0 +1,1189 @@
+
+
+
+
+
+
+
+
+
diff --git a/src/views/jobManage/detailJob.vue b/src/views/jobManage/detailJob.vue
index 2d6aaa4..fe7e68e 100644
--- a/src/views/jobManage/detailJob.vue
+++ b/src/views/jobManage/detailJob.vue
@@ -205,8 +205,9 @@
// 获取工单详情
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 => {
+ console.log(response, ' ============response=')
this.loading = false
if (response.code === 200) {
if (response.data.length <= 0) {
@@ -217,26 +218,28 @@
// 处理现场图片
if (job.firstStatePhotos !== '') {
this.firstImageList = []
- const urls = job.firstStatePhotos.split(';')
+ const urls = job.firstStatePhotos.split(',')
for (const url of urls) {
if (url) {
// this.firstImageList.push({ name: url, url: base_url + url })
this.firstImageList.push(base_url + url)
}
}
+ console.log(this.firstImageList)
} else {
this.firstImageList = []
}
// 处理维护图片
if (job.handlePhotos.length !== '') {
this.handleImageList = []
- const urls = job.handlePhotos.split(';')
+ const urls = job.handlePhotos.split(',')
for (const url of urls) {
if (url) {
// this.handleImageList.push({ name: url, url: base_url + url })
this.handleImageList.push(base_url + url)
}
}
+ console.log(this.handleImageList)
} else {
this.handleImageList = []
}
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 @@
diff --git a/src/views/dataManage/deviceData/listCorrodeData.vue b/src/views/dataManage/deviceData/listCorrodeData.vue
new file mode 100644
index 0000000..1a20abb
--- /dev/null
+++ b/src/views/dataManage/deviceData/listCorrodeData.vue
@@ -0,0 +1,272 @@
+
+
-
-
@@ -28,7 +29,7 @@
- 导出记录
+ 导出记录
@@ -63,6 +64,7 @@
import { getGasData, batchExportGasData } from '@/api/data'
import DeptSelect from '../../../components/DeptSelect/index'
import { parseUrl } from '@/utils/parseutils'
+import { getSearchLastWeekTime } from '@/utils/dateutils'
export default {
name: 'ListGasData',
@@ -163,6 +165,7 @@
if (params && params.deviceType === '4' && params.devcode) {
this.listQuery.keywords = params.devcode
}
+ this.timeRange = getSearchLastWeekTime()
this.fetchData()
}
},
@@ -191,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/listGasflowData.vue b/src/views/dataManage/deviceData/listGasflowData.vue
new file mode 100644
index 0000000..9c5321a
--- /dev/null
+++ b/src/views/dataManage/deviceData/listGasflowData.vue
@@ -0,0 +1,311 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/alarmGasCountByType.vue b/src/views/gasDashboard/components/alarmGasCountByType.vue
new file mode 100644
index 0000000..4f80d3a
--- /dev/null
+++ b/src/views/gasDashboard/components/alarmGasCountByType.vue
@@ -0,0 +1,72 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue
index 97cdfdb..40b9a5e 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -5,10 +5,10 @@
+
+
+
+
+
+
+ 搜索
+
+
+
+
+
+
+
+ 导出记录
+
+
+
+
+
+
+ {{ scope.row[column.value] }}
+ {{ scope.row[column.value] }}
+
+
+
+
+
+ 数据列表
+
+ 数据列表
+
+
+
+
+
+
+
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 bf03fd1..dffd340 100644
--- a/src/views/dataManage/deviceData/listWaterData.vue
+++ b/src/views/dataManage/deviceData/listWaterData.vue
@@ -176,6 +176,12 @@
align: 'center'
},
{
+ text: '压力(Mpa)',
+ value: 'pressure',
+ width: 90,
+ align: 'center'
+ },
+ {
text: '今日用水量（立方米）',
value: 'dayCount',
align: 'center',
@@ -276,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) // 下载完成移除元素
@@ -311,9 +317,11 @@
}
getWatchData(this.listQuery).then((response) => {
this.list = response.data.rows.map(function(item) {
- item.areaFullName = item.areaFullName
- .replace('/', '')
- .replace('顶层', '')
+ item.totalCount = parseFloat(item.totalCount).toFixed(2)
+ item.dayCount = parseFloat(item.dayCount).toFixed(2)
+ item.monthCount = parseFloat(item.monthCount).toFixed(2)
+ item.pressure = parseFloat(item.pressure).toFixed(2)
+ item.areaFullName = item.areaFullName.replace('/', '').replace('顶层', '')
return item
})
this.total = parseInt(response.data.total)
diff --git a/src/views/dataManage/deviceData/waterHistory.vue b/src/views/dataManage/deviceData/waterHistory.vue
index 160dab7..42e3303 100644
--- a/src/views/dataManage/deviceData/waterHistory.vue
+++ b/src/views/dataManage/deviceData/waterHistory.vue
@@ -1,5 +1,5 @@
-
+
+
+
+
+
+
+ 搜索
+
+
+
+
+
+
+
+ 导出记录
+
+
+
+
+
+
+ {{
+ scope.row[column.value]
+ }}
+ {{
+ scope.row["areaFullName"] + '/' + scope.row[column.value]
+ }}
+ {{ scope.row[column.value] }}
+
+
+
+
+
+ 历史数据
+
+
+
+
+
+
+ 数据列表
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/AlarmNowList.vue b/src/views/gasDashboard/components/AlarmNowList.vue
new file mode 100644
index 0000000..890325f
--- /dev/null
+++ b/src/views/gasDashboard/components/AlarmNowList.vue
@@ -0,0 +1,35 @@
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/DeviceCount.vue b/src/views/gasDashboard/components/DeviceCount.vue
new file mode 100644
index 0000000..bffc9e9
--- /dev/null
+++ b/src/views/gasDashboard/components/DeviceCount.vue
@@ -0,0 +1,68 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/FunctionArea.vue b/src/views/gasDashboard/components/FunctionArea.vue
new file mode 100644
index 0000000..6401557
--- /dev/null
+++ b/src/views/gasDashboard/components/FunctionArea.vue
@@ -0,0 +1,140 @@
+
+
+
+ 本年度
+ 本季度
+ 近30日
+ 近7日
+ 今日
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/FunctionArea2.vue b/src/views/gasDashboard/components/FunctionArea2.vue
new file mode 100644
index 0000000..26a9f82
--- /dev/null
+++ b/src/views/gasDashboard/components/FunctionArea2.vue
@@ -0,0 +1,107 @@
+
+
+
+ 本年度
+ 本季度
+ 近30日
+ 近7日
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/PanelGroup.vue b/src/views/gasDashboard/components/PanelGroup.vue
new file mode 100644
index 0000000..103486e
--- /dev/null
+++ b/src/views/gasDashboard/components/PanelGroup.vue
@@ -0,0 +1,137 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/alarmLeakCountPie.vue b/src/views/gasDashboard/components/alarmLeakCountPie.vue
new file mode 100644
index 0000000..abfbc2d
--- /dev/null
+++ b/src/views/gasDashboard/components/alarmLeakCountPie.vue
@@ -0,0 +1,74 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/corrodeCountByDay.vue b/src/views/gasDashboard/components/corrodeCountByDay.vue
new file mode 100644
index 0000000..a410f29
--- /dev/null
+++ b/src/views/gasDashboard/components/corrodeCountByDay.vue
@@ -0,0 +1,100 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasAlarmTrend.vue b/src/views/gasDashboard/components/gasAlarmTrend.vue
new file mode 100644
index 0000000..a1d422e
--- /dev/null
+++ b/src/views/gasDashboard/components/gasAlarmTrend.vue
@@ -0,0 +1,100 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasCompare.vue b/src/views/gasDashboard/components/gasCompare.vue
new file mode 100644
index 0000000..19a4398
--- /dev/null
+++ b/src/views/gasDashboard/components/gasCompare.vue
@@ -0,0 +1,121 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasCountByAreaBar.vue b/src/views/gasDashboard/components/gasCountByAreaBar.vue
new file mode 100644
index 0000000..456a6c6
--- /dev/null
+++ b/src/views/gasDashboard/components/gasCountByAreaBar.vue
@@ -0,0 +1,198 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasCountByDay.vue b/src/views/gasDashboard/components/gasCountByDay.vue
new file mode 100644
index 0000000..f0a3977
--- /dev/null
+++ b/src/views/gasDashboard/components/gasCountByDay.vue
@@ -0,0 +1,114 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasCountByDept.vue b/src/views/gasDashboard/components/gasCountByDept.vue
new file mode 100644
index 0000000..31c8508
--- /dev/null
+++ b/src/views/gasDashboard/components/gasCountByDept.vue
@@ -0,0 +1,126 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasCountByDeviceBar.vue b/src/views/gasDashboard/components/gasCountByDeviceBar.vue
new file mode 100644
index 0000000..dc211e3
--- /dev/null
+++ b/src/views/gasDashboard/components/gasCountByDeviceBar.vue
@@ -0,0 +1,130 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasNote.vue b/src/views/gasDashboard/components/gasNote.vue
new file mode 100644
index 0000000..5ade90f
--- /dev/null
+++ b/src/views/gasDashboard/components/gasNote.vue
@@ -0,0 +1,149 @@
+
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/watchAlarmBar.vue b/src/views/gasDashboard/components/watchAlarmBar.vue
new file mode 100644
index 0000000..4279440
--- /dev/null
+++ b/src/views/gasDashboard/components/watchAlarmBar.vue
@@ -0,0 +1,180 @@
+
+
+
+ 场区用气事记
+
+
+
+
+
+
+
+
+
+ {{ index+1 }}. {{ item.content }}
+
+
+ {{ index+1 }}.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/watchGasAlarmBar.vue b/src/views/gasDashboard/components/watchGasAlarmBar.vue
new file mode 100644
index 0000000..0113341
--- /dev/null
+++ b/src/views/gasDashboard/components/watchGasAlarmBar.vue
@@ -0,0 +1,132 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/index.vue b/src/views/gasDashboard/index.vue
new file mode 100644
index 0000000..be583f2
--- /dev/null
+++ b/src/views/gasDashboard/index.vue
@@ -0,0 +1,191 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/gasOverview/gasOverviewSimple.vue b/src/views/gasOverview/gasOverviewSimple.vue
new file mode 100644
index 0000000..8ff468f
--- /dev/null
+++ b/src/views/gasOverview/gasOverviewSimple.vue
@@ -0,0 +1,1189 @@
+
+
+
+
+
+
+
+
+
diff --git a/src/views/jobManage/detailJob.vue b/src/views/jobManage/detailJob.vue
index 2d6aaa4..fe7e68e 100644
--- a/src/views/jobManage/detailJob.vue
+++ b/src/views/jobManage/detailJob.vue
@@ -205,8 +205,9 @@
// 获取工单详情
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 => {
+ console.log(response, ' ============response=')
this.loading = false
if (response.code === 200) {
if (response.data.length <= 0) {
@@ -217,26 +218,28 @@
// 处理现场图片
if (job.firstStatePhotos !== '') {
this.firstImageList = []
- const urls = job.firstStatePhotos.split(';')
+ const urls = job.firstStatePhotos.split(',')
for (const url of urls) {
if (url) {
// this.firstImageList.push({ name: url, url: base_url + url })
this.firstImageList.push(base_url + url)
}
}
+ console.log(this.firstImageList)
} else {
this.firstImageList = []
}
// 处理维护图片
if (job.handlePhotos.length !== '') {
this.handleImageList = []
- const urls = job.handlePhotos.split(';')
+ const urls = job.handlePhotos.split(',')
for (const url of urls) {
if (url) {
// this.handleImageList.push({ name: url, url: base_url + url })
this.handleImageList.push(base_url + url)
}
}
+ console.log(this.handleImageList)
} else {
this.handleImageList = []
}
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 @@
diff --git a/src/views/dataManage/deviceData/listCorrodeData.vue b/src/views/dataManage/deviceData/listCorrodeData.vue
new file mode 100644
index 0000000..1a20abb
--- /dev/null
+++ b/src/views/dataManage/deviceData/listCorrodeData.vue
@@ -0,0 +1,272 @@
+
+
-
-
@@ -28,7 +29,7 @@
- 导出记录
+ 导出记录
@@ -63,6 +64,7 @@
import { getGasData, batchExportGasData } from '@/api/data'
import DeptSelect from '../../../components/DeptSelect/index'
import { parseUrl } from '@/utils/parseutils'
+import { getSearchLastWeekTime } from '@/utils/dateutils'
export default {
name: 'ListGasData',
@@ -163,6 +165,7 @@
if (params && params.deviceType === '4' && params.devcode) {
this.listQuery.keywords = params.devcode
}
+ this.timeRange = getSearchLastWeekTime()
this.fetchData()
}
},
@@ -191,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/listGasflowData.vue b/src/views/dataManage/deviceData/listGasflowData.vue
new file mode 100644
index 0000000..9c5321a
--- /dev/null
+++ b/src/views/dataManage/deviceData/listGasflowData.vue
@@ -0,0 +1,311 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/alarmGasCountByType.vue b/src/views/gasDashboard/components/alarmGasCountByType.vue
new file mode 100644
index 0000000..4f80d3a
--- /dev/null
+++ b/src/views/gasDashboard/components/alarmGasCountByType.vue
@@ -0,0 +1,72 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue
index 97cdfdb..40b9a5e 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -5,10 +5,10 @@
+
+
+
+
+
+
+ 搜索
+
+
+
+
+
+
+
+ 导出记录
+
+
+
+
+
+
+ {{ scope.row[column.value] }}
+ {{ scope.row[column.value] }}
+
+
+
+
+
+ 数据列表
+
+ 数据列表
+
+
+
+
+
+
+
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 bf03fd1..dffd340 100644
--- a/src/views/dataManage/deviceData/listWaterData.vue
+++ b/src/views/dataManage/deviceData/listWaterData.vue
@@ -176,6 +176,12 @@
align: 'center'
},
{
+ text: '压力(Mpa)',
+ value: 'pressure',
+ width: 90,
+ align: 'center'
+ },
+ {
text: '今日用水量（立方米）',
value: 'dayCount',
align: 'center',
@@ -276,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) // 下载完成移除元素
@@ -311,9 +317,11 @@
}
getWatchData(this.listQuery).then((response) => {
this.list = response.data.rows.map(function(item) {
- item.areaFullName = item.areaFullName
- .replace('/', '')
- .replace('顶层', '')
+ item.totalCount = parseFloat(item.totalCount).toFixed(2)
+ item.dayCount = parseFloat(item.dayCount).toFixed(2)
+ item.monthCount = parseFloat(item.monthCount).toFixed(2)
+ item.pressure = parseFloat(item.pressure).toFixed(2)
+ item.areaFullName = item.areaFullName.replace('/', '').replace('顶层', '')
return item
})
this.total = parseInt(response.data.total)
diff --git a/src/views/dataManage/deviceData/waterHistory.vue b/src/views/dataManage/deviceData/waterHistory.vue
index 160dab7..42e3303 100644
--- a/src/views/dataManage/deviceData/waterHistory.vue
+++ b/src/views/dataManage/deviceData/waterHistory.vue
@@ -1,5 +1,5 @@
-
+
+
+
+
+
+
+ 搜索
+
+
+
+
+
+
+
+ 导出记录
+
+
+
+
+
+
+ {{
+ scope.row[column.value]
+ }}
+ {{
+ scope.row["areaFullName"] + '/' + scope.row[column.value]
+ }}
+ {{ scope.row[column.value] }}
+
+
+
+
+
+ 历史数据
+
+
+
+
+
+
+ 数据列表
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/AlarmNowList.vue b/src/views/gasDashboard/components/AlarmNowList.vue
new file mode 100644
index 0000000..890325f
--- /dev/null
+++ b/src/views/gasDashboard/components/AlarmNowList.vue
@@ -0,0 +1,35 @@
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/DeviceCount.vue b/src/views/gasDashboard/components/DeviceCount.vue
new file mode 100644
index 0000000..bffc9e9
--- /dev/null
+++ b/src/views/gasDashboard/components/DeviceCount.vue
@@ -0,0 +1,68 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/FunctionArea.vue b/src/views/gasDashboard/components/FunctionArea.vue
new file mode 100644
index 0000000..6401557
--- /dev/null
+++ b/src/views/gasDashboard/components/FunctionArea.vue
@@ -0,0 +1,140 @@
+
+
+
+ 本年度
+ 本季度
+ 近30日
+ 近7日
+ 今日
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/FunctionArea2.vue b/src/views/gasDashboard/components/FunctionArea2.vue
new file mode 100644
index 0000000..26a9f82
--- /dev/null
+++ b/src/views/gasDashboard/components/FunctionArea2.vue
@@ -0,0 +1,107 @@
+
+
+
+ 本年度
+ 本季度
+ 近30日
+ 近7日
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/PanelGroup.vue b/src/views/gasDashboard/components/PanelGroup.vue
new file mode 100644
index 0000000..103486e
--- /dev/null
+++ b/src/views/gasDashboard/components/PanelGroup.vue
@@ -0,0 +1,137 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/alarmLeakCountPie.vue b/src/views/gasDashboard/components/alarmLeakCountPie.vue
new file mode 100644
index 0000000..abfbc2d
--- /dev/null
+++ b/src/views/gasDashboard/components/alarmLeakCountPie.vue
@@ -0,0 +1,74 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/corrodeCountByDay.vue b/src/views/gasDashboard/components/corrodeCountByDay.vue
new file mode 100644
index 0000000..a410f29
--- /dev/null
+++ b/src/views/gasDashboard/components/corrodeCountByDay.vue
@@ -0,0 +1,100 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasAlarmTrend.vue b/src/views/gasDashboard/components/gasAlarmTrend.vue
new file mode 100644
index 0000000..a1d422e
--- /dev/null
+++ b/src/views/gasDashboard/components/gasAlarmTrend.vue
@@ -0,0 +1,100 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasCompare.vue b/src/views/gasDashboard/components/gasCompare.vue
new file mode 100644
index 0000000..19a4398
--- /dev/null
+++ b/src/views/gasDashboard/components/gasCompare.vue
@@ -0,0 +1,121 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasCountByAreaBar.vue b/src/views/gasDashboard/components/gasCountByAreaBar.vue
new file mode 100644
index 0000000..456a6c6
--- /dev/null
+++ b/src/views/gasDashboard/components/gasCountByAreaBar.vue
@@ -0,0 +1,198 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasCountByDay.vue b/src/views/gasDashboard/components/gasCountByDay.vue
new file mode 100644
index 0000000..f0a3977
--- /dev/null
+++ b/src/views/gasDashboard/components/gasCountByDay.vue
@@ -0,0 +1,114 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasCountByDept.vue b/src/views/gasDashboard/components/gasCountByDept.vue
new file mode 100644
index 0000000..31c8508
--- /dev/null
+++ b/src/views/gasDashboard/components/gasCountByDept.vue
@@ -0,0 +1,126 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasCountByDeviceBar.vue b/src/views/gasDashboard/components/gasCountByDeviceBar.vue
new file mode 100644
index 0000000..dc211e3
--- /dev/null
+++ b/src/views/gasDashboard/components/gasCountByDeviceBar.vue
@@ -0,0 +1,130 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasNote.vue b/src/views/gasDashboard/components/gasNote.vue
new file mode 100644
index 0000000..5ade90f
--- /dev/null
+++ b/src/views/gasDashboard/components/gasNote.vue
@@ -0,0 +1,149 @@
+
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/watchAlarmBar.vue b/src/views/gasDashboard/components/watchAlarmBar.vue
new file mode 100644
index 0000000..4279440
--- /dev/null
+++ b/src/views/gasDashboard/components/watchAlarmBar.vue
@@ -0,0 +1,180 @@
+
+
+
+ 场区用气事记
+
+
+
+
+
+
+
+
+
+ {{ index+1 }}. {{ item.content }}
+
+
+ {{ index+1 }}.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/watchGasAlarmBar.vue b/src/views/gasDashboard/components/watchGasAlarmBar.vue
new file mode 100644
index 0000000..0113341
--- /dev/null
+++ b/src/views/gasDashboard/components/watchGasAlarmBar.vue
@@ -0,0 +1,132 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/index.vue b/src/views/gasDashboard/index.vue
new file mode 100644
index 0000000..be583f2
--- /dev/null
+++ b/src/views/gasDashboard/index.vue
@@ -0,0 +1,191 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/gasOverview/gasOverviewSimple.vue b/src/views/gasOverview/gasOverviewSimple.vue
new file mode 100644
index 0000000..8ff468f
--- /dev/null
+++ b/src/views/gasOverview/gasOverviewSimple.vue
@@ -0,0 +1,1189 @@
+
+
+
+
+
+
+
+
+
diff --git a/src/views/jobManage/detailJob.vue b/src/views/jobManage/detailJob.vue
index 2d6aaa4..fe7e68e 100644
--- a/src/views/jobManage/detailJob.vue
+++ b/src/views/jobManage/detailJob.vue
@@ -205,8 +205,9 @@
// 获取工单详情
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 => {
+ console.log(response, ' ============response=')
this.loading = false
if (response.code === 200) {
if (response.data.length <= 0) {
@@ -217,26 +218,28 @@
// 处理现场图片
if (job.firstStatePhotos !== '') {
this.firstImageList = []
- const urls = job.firstStatePhotos.split(';')
+ const urls = job.firstStatePhotos.split(',')
for (const url of urls) {
if (url) {
// this.firstImageList.push({ name: url, url: base_url + url })
this.firstImageList.push(base_url + url)
}
}
+ console.log(this.firstImageList)
} else {
this.firstImageList = []
}
// 处理维护图片
if (job.handlePhotos.length !== '') {
this.handleImageList = []
- const urls = job.handlePhotos.split(';')
+ const urls = job.handlePhotos.split(',')
for (const url of urls) {
if (url) {
// this.handleImageList.push({ name: url, url: base_url + url })
this.handleImageList.push(base_url + url)
}
}
+ console.log(this.handleImageList)
} else {
this.handleImageList = []
}
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 @@
diff --git a/src/views/dataManage/deviceData/listCorrodeData.vue b/src/views/dataManage/deviceData/listCorrodeData.vue
new file mode 100644
index 0000000..1a20abb
--- /dev/null
+++ b/src/views/dataManage/deviceData/listCorrodeData.vue
@@ -0,0 +1,272 @@
+
+
-
-
@@ -28,7 +29,7 @@
- 导出记录
+ 导出记录
@@ -63,6 +64,7 @@
import { getGasData, batchExportGasData } from '@/api/data'
import DeptSelect from '../../../components/DeptSelect/index'
import { parseUrl } from '@/utils/parseutils'
+import { getSearchLastWeekTime } from '@/utils/dateutils'
export default {
name: 'ListGasData',
@@ -163,6 +165,7 @@
if (params && params.deviceType === '4' && params.devcode) {
this.listQuery.keywords = params.devcode
}
+ this.timeRange = getSearchLastWeekTime()
this.fetchData()
}
},
@@ -191,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/listGasflowData.vue b/src/views/dataManage/deviceData/listGasflowData.vue
new file mode 100644
index 0000000..9c5321a
--- /dev/null
+++ b/src/views/dataManage/deviceData/listGasflowData.vue
@@ -0,0 +1,311 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/alarmGasCountByType.vue b/src/views/gasDashboard/components/alarmGasCountByType.vue
new file mode 100644
index 0000000..4f80d3a
--- /dev/null
+++ b/src/views/gasDashboard/components/alarmGasCountByType.vue
@@ -0,0 +1,72 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue
index 97cdfdb..40b9a5e 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -5,10 +5,10 @@
+
+
+
+
+
+
+ 搜索
+
+
+
+
+
+
+
+ 导出记录
+
+
+
+
+
+
+ {{ scope.row[column.value] }}
+ {{ scope.row[column.value] }}
+
+
+
+
+
+ 数据列表
+
+ 数据列表
+
+
+
+
+
+
+
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 bf03fd1..dffd340 100644
--- a/src/views/dataManage/deviceData/listWaterData.vue
+++ b/src/views/dataManage/deviceData/listWaterData.vue
@@ -176,6 +176,12 @@
align: 'center'
},
{
+ text: '压力(Mpa)',
+ value: 'pressure',
+ width: 90,
+ align: 'center'
+ },
+ {
text: '今日用水量（立方米）',
value: 'dayCount',
align: 'center',
@@ -276,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) // 下载完成移除元素
@@ -311,9 +317,11 @@
}
getWatchData(this.listQuery).then((response) => {
this.list = response.data.rows.map(function(item) {
- item.areaFullName = item.areaFullName
- .replace('/', '')
- .replace('顶层', '')
+ item.totalCount = parseFloat(item.totalCount).toFixed(2)
+ item.dayCount = parseFloat(item.dayCount).toFixed(2)
+ item.monthCount = parseFloat(item.monthCount).toFixed(2)
+ item.pressure = parseFloat(item.pressure).toFixed(2)
+ item.areaFullName = item.areaFullName.replace('/', '').replace('顶层', '')
return item
})
this.total = parseInt(response.data.total)
diff --git a/src/views/dataManage/deviceData/waterHistory.vue b/src/views/dataManage/deviceData/waterHistory.vue
index 160dab7..42e3303 100644
--- a/src/views/dataManage/deviceData/waterHistory.vue
+++ b/src/views/dataManage/deviceData/waterHistory.vue
@@ -1,5 +1,5 @@
-
+
+
+
+
+
+
+ 搜索
+
+
+
+
+
+
+
+ 导出记录
+
+
+
+
+
+
+ {{
+ scope.row[column.value]
+ }}
+ {{
+ scope.row["areaFullName"] + '/' + scope.row[column.value]
+ }}
+ {{ scope.row[column.value] }}
+
+
+
+
+
+ 历史数据
+
+
+
+
+
+
+ 数据列表
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/AlarmNowList.vue b/src/views/gasDashboard/components/AlarmNowList.vue
new file mode 100644
index 0000000..890325f
--- /dev/null
+++ b/src/views/gasDashboard/components/AlarmNowList.vue
@@ -0,0 +1,35 @@
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/DeviceCount.vue b/src/views/gasDashboard/components/DeviceCount.vue
new file mode 100644
index 0000000..bffc9e9
--- /dev/null
+++ b/src/views/gasDashboard/components/DeviceCount.vue
@@ -0,0 +1,68 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/FunctionArea.vue b/src/views/gasDashboard/components/FunctionArea.vue
new file mode 100644
index 0000000..6401557
--- /dev/null
+++ b/src/views/gasDashboard/components/FunctionArea.vue
@@ -0,0 +1,140 @@
+
+
+
+ 本年度
+ 本季度
+ 近30日
+ 近7日
+ 今日
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/FunctionArea2.vue b/src/views/gasDashboard/components/FunctionArea2.vue
new file mode 100644
index 0000000..26a9f82
--- /dev/null
+++ b/src/views/gasDashboard/components/FunctionArea2.vue
@@ -0,0 +1,107 @@
+
+
+
+ 本年度
+ 本季度
+ 近30日
+ 近7日
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/PanelGroup.vue b/src/views/gasDashboard/components/PanelGroup.vue
new file mode 100644
index 0000000..103486e
--- /dev/null
+++ b/src/views/gasDashboard/components/PanelGroup.vue
@@ -0,0 +1,137 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/alarmLeakCountPie.vue b/src/views/gasDashboard/components/alarmLeakCountPie.vue
new file mode 100644
index 0000000..abfbc2d
--- /dev/null
+++ b/src/views/gasDashboard/components/alarmLeakCountPie.vue
@@ -0,0 +1,74 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/corrodeCountByDay.vue b/src/views/gasDashboard/components/corrodeCountByDay.vue
new file mode 100644
index 0000000..a410f29
--- /dev/null
+++ b/src/views/gasDashboard/components/corrodeCountByDay.vue
@@ -0,0 +1,100 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasAlarmTrend.vue b/src/views/gasDashboard/components/gasAlarmTrend.vue
new file mode 100644
index 0000000..a1d422e
--- /dev/null
+++ b/src/views/gasDashboard/components/gasAlarmTrend.vue
@@ -0,0 +1,100 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasCompare.vue b/src/views/gasDashboard/components/gasCompare.vue
new file mode 100644
index 0000000..19a4398
--- /dev/null
+++ b/src/views/gasDashboard/components/gasCompare.vue
@@ -0,0 +1,121 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasCountByAreaBar.vue b/src/views/gasDashboard/components/gasCountByAreaBar.vue
new file mode 100644
index 0000000..456a6c6
--- /dev/null
+++ b/src/views/gasDashboard/components/gasCountByAreaBar.vue
@@ -0,0 +1,198 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasCountByDay.vue b/src/views/gasDashboard/components/gasCountByDay.vue
new file mode 100644
index 0000000..f0a3977
--- /dev/null
+++ b/src/views/gasDashboard/components/gasCountByDay.vue
@@ -0,0 +1,114 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasCountByDept.vue b/src/views/gasDashboard/components/gasCountByDept.vue
new file mode 100644
index 0000000..31c8508
--- /dev/null
+++ b/src/views/gasDashboard/components/gasCountByDept.vue
@@ -0,0 +1,126 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasCountByDeviceBar.vue b/src/views/gasDashboard/components/gasCountByDeviceBar.vue
new file mode 100644
index 0000000..dc211e3
--- /dev/null
+++ b/src/views/gasDashboard/components/gasCountByDeviceBar.vue
@@ -0,0 +1,130 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasNote.vue b/src/views/gasDashboard/components/gasNote.vue
new file mode 100644
index 0000000..5ade90f
--- /dev/null
+++ b/src/views/gasDashboard/components/gasNote.vue
@@ -0,0 +1,149 @@
+
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/watchAlarmBar.vue b/src/views/gasDashboard/components/watchAlarmBar.vue
new file mode 100644
index 0000000..4279440
--- /dev/null
+++ b/src/views/gasDashboard/components/watchAlarmBar.vue
@@ -0,0 +1,180 @@
+
+
+
+ 场区用气事记
+
+
+
+
+
+
+
+
+
+ {{ index+1 }}. {{ item.content }}
+
+
+ {{ index+1 }}.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/watchGasAlarmBar.vue b/src/views/gasDashboard/components/watchGasAlarmBar.vue
new file mode 100644
index 0000000..0113341
--- /dev/null
+++ b/src/views/gasDashboard/components/watchGasAlarmBar.vue
@@ -0,0 +1,132 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/index.vue b/src/views/gasDashboard/index.vue
new file mode 100644
index 0000000..be583f2
--- /dev/null
+++ b/src/views/gasDashboard/index.vue
@@ -0,0 +1,191 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/gasOverview/gasOverviewSimple.vue b/src/views/gasOverview/gasOverviewSimple.vue
new file mode 100644
index 0000000..8ff468f
--- /dev/null
+++ b/src/views/gasOverview/gasOverviewSimple.vue
@@ -0,0 +1,1189 @@
+
+
+
+
+
+
+
+
+
diff --git a/src/views/jobManage/detailJob.vue b/src/views/jobManage/detailJob.vue
index 2d6aaa4..fe7e68e 100644
--- a/src/views/jobManage/detailJob.vue
+++ b/src/views/jobManage/detailJob.vue
@@ -205,8 +205,9 @@
// 获取工单详情
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 => {
+ console.log(response, ' ============response=')
this.loading = false
if (response.code === 200) {
if (response.data.length <= 0) {
@@ -217,26 +218,28 @@
// 处理现场图片
if (job.firstStatePhotos !== '') {
this.firstImageList = []
- const urls = job.firstStatePhotos.split(';')
+ const urls = job.firstStatePhotos.split(',')
for (const url of urls) {
if (url) {
// this.firstImageList.push({ name: url, url: base_url + url })
this.firstImageList.push(base_url + url)
}
}
+ console.log(this.firstImageList)
} else {
this.firstImageList = []
}
// 处理维护图片
if (job.handlePhotos.length !== '') {
this.handleImageList = []
- const urls = job.handlePhotos.split(';')
+ const urls = job.handlePhotos.split(',')
for (const url of urls) {
if (url) {
// this.handleImageList.push({ name: url, url: base_url + url })
this.handleImageList.push(base_url + url)
}
}
+ console.log(this.handleImageList)
} else {
this.handleImageList = []
}
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 @@
diff --git a/src/views/dataManage/deviceData/listCorrodeData.vue b/src/views/dataManage/deviceData/listCorrodeData.vue
new file mode 100644
index 0000000..1a20abb
--- /dev/null
+++ b/src/views/dataManage/deviceData/listCorrodeData.vue
@@ -0,0 +1,272 @@
+
+
-
-
@@ -28,7 +29,7 @@
- 导出记录
+ 导出记录
@@ -63,6 +64,7 @@
import { getGasData, batchExportGasData } from '@/api/data'
import DeptSelect from '../../../components/DeptSelect/index'
import { parseUrl } from '@/utils/parseutils'
+import { getSearchLastWeekTime } from '@/utils/dateutils'
export default {
name: 'ListGasData',
@@ -163,6 +165,7 @@
if (params && params.deviceType === '4' && params.devcode) {
this.listQuery.keywords = params.devcode
}
+ this.timeRange = getSearchLastWeekTime()
this.fetchData()
}
},
@@ -191,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/listGasflowData.vue b/src/views/dataManage/deviceData/listGasflowData.vue
new file mode 100644
index 0000000..9c5321a
--- /dev/null
+++ b/src/views/dataManage/deviceData/listGasflowData.vue
@@ -0,0 +1,311 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/alarmGasCountByType.vue b/src/views/gasDashboard/components/alarmGasCountByType.vue
new file mode 100644
index 0000000..4f80d3a
--- /dev/null
+++ b/src/views/gasDashboard/components/alarmGasCountByType.vue
@@ -0,0 +1,72 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue
index 97cdfdb..40b9a5e 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -5,10 +5,10 @@
+
+
+
+
+
+
+ 搜索
+
+
+
+
+
+
+
+ 导出记录
+
+
+
+
+
+
+ {{ scope.row[column.value] }}
+ {{ scope.row[column.value] }}
+
+
+
+
+
+ 数据列表
+
+ 数据列表
+
+
+
+
+
+
+
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 bf03fd1..dffd340 100644
--- a/src/views/dataManage/deviceData/listWaterData.vue
+++ b/src/views/dataManage/deviceData/listWaterData.vue
@@ -176,6 +176,12 @@
align: 'center'
},
{
+ text: '压力(Mpa)',
+ value: 'pressure',
+ width: 90,
+ align: 'center'
+ },
+ {
text: '今日用水量（立方米）',
value: 'dayCount',
align: 'center',
@@ -276,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) // 下载完成移除元素
@@ -311,9 +317,11 @@
}
getWatchData(this.listQuery).then((response) => {
this.list = response.data.rows.map(function(item) {
- item.areaFullName = item.areaFullName
- .replace('/', '')
- .replace('顶层', '')
+ item.totalCount = parseFloat(item.totalCount).toFixed(2)
+ item.dayCount = parseFloat(item.dayCount).toFixed(2)
+ item.monthCount = parseFloat(item.monthCount).toFixed(2)
+ item.pressure = parseFloat(item.pressure).toFixed(2)
+ item.areaFullName = item.areaFullName.replace('/', '').replace('顶层', '')
return item
})
this.total = parseInt(response.data.total)
diff --git a/src/views/dataManage/deviceData/waterHistory.vue b/src/views/dataManage/deviceData/waterHistory.vue
index 160dab7..42e3303 100644
--- a/src/views/dataManage/deviceData/waterHistory.vue
+++ b/src/views/dataManage/deviceData/waterHistory.vue
@@ -1,5 +1,5 @@
-
+
+
+
+
+
+
+ 搜索
+
+
+
+
+
+
+
+ 导出记录
+
+
+
+
+
+
+ {{
+ scope.row[column.value]
+ }}
+ {{
+ scope.row["areaFullName"] + '/' + scope.row[column.value]
+ }}
+ {{ scope.row[column.value] }}
+
+
+
+
+
+ 历史数据
+
+
+
+
+
+
+ 数据列表
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/AlarmNowList.vue b/src/views/gasDashboard/components/AlarmNowList.vue
new file mode 100644
index 0000000..890325f
--- /dev/null
+++ b/src/views/gasDashboard/components/AlarmNowList.vue
@@ -0,0 +1,35 @@
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/DeviceCount.vue b/src/views/gasDashboard/components/DeviceCount.vue
new file mode 100644
index 0000000..bffc9e9
--- /dev/null
+++ b/src/views/gasDashboard/components/DeviceCount.vue
@@ -0,0 +1,68 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/FunctionArea.vue b/src/views/gasDashboard/components/FunctionArea.vue
new file mode 100644
index 0000000..6401557
--- /dev/null
+++ b/src/views/gasDashboard/components/FunctionArea.vue
@@ -0,0 +1,140 @@
+
+
+
+ 本年度
+ 本季度
+ 近30日
+ 近7日
+ 今日
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/FunctionArea2.vue b/src/views/gasDashboard/components/FunctionArea2.vue
new file mode 100644
index 0000000..26a9f82
--- /dev/null
+++ b/src/views/gasDashboard/components/FunctionArea2.vue
@@ -0,0 +1,107 @@
+
+
+
+ 本年度
+ 本季度
+ 近30日
+ 近7日
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/PanelGroup.vue b/src/views/gasDashboard/components/PanelGroup.vue
new file mode 100644
index 0000000..103486e
--- /dev/null
+++ b/src/views/gasDashboard/components/PanelGroup.vue
@@ -0,0 +1,137 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/alarmLeakCountPie.vue b/src/views/gasDashboard/components/alarmLeakCountPie.vue
new file mode 100644
index 0000000..abfbc2d
--- /dev/null
+++ b/src/views/gasDashboard/components/alarmLeakCountPie.vue
@@ -0,0 +1,74 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/corrodeCountByDay.vue b/src/views/gasDashboard/components/corrodeCountByDay.vue
new file mode 100644
index 0000000..a410f29
--- /dev/null
+++ b/src/views/gasDashboard/components/corrodeCountByDay.vue
@@ -0,0 +1,100 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasAlarmTrend.vue b/src/views/gasDashboard/components/gasAlarmTrend.vue
new file mode 100644
index 0000000..a1d422e
--- /dev/null
+++ b/src/views/gasDashboard/components/gasAlarmTrend.vue
@@ -0,0 +1,100 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasCompare.vue b/src/views/gasDashboard/components/gasCompare.vue
new file mode 100644
index 0000000..19a4398
--- /dev/null
+++ b/src/views/gasDashboard/components/gasCompare.vue
@@ -0,0 +1,121 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasCountByAreaBar.vue b/src/views/gasDashboard/components/gasCountByAreaBar.vue
new file mode 100644
index 0000000..456a6c6
--- /dev/null
+++ b/src/views/gasDashboard/components/gasCountByAreaBar.vue
@@ -0,0 +1,198 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasCountByDay.vue b/src/views/gasDashboard/components/gasCountByDay.vue
new file mode 100644
index 0000000..f0a3977
--- /dev/null
+++ b/src/views/gasDashboard/components/gasCountByDay.vue
@@ -0,0 +1,114 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasCountByDept.vue b/src/views/gasDashboard/components/gasCountByDept.vue
new file mode 100644
index 0000000..31c8508
--- /dev/null
+++ b/src/views/gasDashboard/components/gasCountByDept.vue
@@ -0,0 +1,126 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasCountByDeviceBar.vue b/src/views/gasDashboard/components/gasCountByDeviceBar.vue
new file mode 100644
index 0000000..dc211e3
--- /dev/null
+++ b/src/views/gasDashboard/components/gasCountByDeviceBar.vue
@@ -0,0 +1,130 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasNote.vue b/src/views/gasDashboard/components/gasNote.vue
new file mode 100644
index 0000000..5ade90f
--- /dev/null
+++ b/src/views/gasDashboard/components/gasNote.vue
@@ -0,0 +1,149 @@
+
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/watchAlarmBar.vue b/src/views/gasDashboard/components/watchAlarmBar.vue
new file mode 100644
index 0000000..4279440
--- /dev/null
+++ b/src/views/gasDashboard/components/watchAlarmBar.vue
@@ -0,0 +1,180 @@
+
+
+
+ 场区用气事记
+
+
+
+
+
+
+
+
+
+ {{ index+1 }}. {{ item.content }}
+
+
+ {{ index+1 }}.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/watchGasAlarmBar.vue b/src/views/gasDashboard/components/watchGasAlarmBar.vue
new file mode 100644
index 0000000..0113341
--- /dev/null
+++ b/src/views/gasDashboard/components/watchGasAlarmBar.vue
@@ -0,0 +1,132 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/index.vue b/src/views/gasDashboard/index.vue
new file mode 100644
index 0000000..be583f2
--- /dev/null
+++ b/src/views/gasDashboard/index.vue
@@ -0,0 +1,191 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/gasOverview/gasOverviewSimple.vue b/src/views/gasOverview/gasOverviewSimple.vue
new file mode 100644
index 0000000..8ff468f
--- /dev/null
+++ b/src/views/gasOverview/gasOverviewSimple.vue
@@ -0,0 +1,1189 @@
+
+
+
+
+
+
+
+
+
diff --git a/src/views/jobManage/detailJob.vue b/src/views/jobManage/detailJob.vue
index 2d6aaa4..fe7e68e 100644
--- a/src/views/jobManage/detailJob.vue
+++ b/src/views/jobManage/detailJob.vue
@@ -205,8 +205,9 @@
// 获取工单详情
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 => {
+ console.log(response, ' ============response=')
this.loading = false
if (response.code === 200) {
if (response.data.length <= 0) {
@@ -217,26 +218,28 @@
// 处理现场图片
if (job.firstStatePhotos !== '') {
this.firstImageList = []
- const urls = job.firstStatePhotos.split(';')
+ const urls = job.firstStatePhotos.split(',')
for (const url of urls) {
if (url) {
// this.firstImageList.push({ name: url, url: base_url + url })
this.firstImageList.push(base_url + url)
}
}
+ console.log(this.firstImageList)
} else {
this.firstImageList = []
}
// 处理维护图片
if (job.handlePhotos.length !== '') {
this.handleImageList = []
- const urls = job.handlePhotos.split(';')
+ const urls = job.handlePhotos.split(',')
for (const url of urls) {
if (url) {
// this.handleImageList.push({ name: url, url: base_url + url })
this.handleImageList.push(base_url + url)
}
}
+ console.log(this.handleImageList)
} else {
this.handleImageList = []
}
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 @@
diff --git a/src/views/dataManage/deviceData/listCorrodeData.vue b/src/views/dataManage/deviceData/listCorrodeData.vue
new file mode 100644
index 0000000..1a20abb
--- /dev/null
+++ b/src/views/dataManage/deviceData/listCorrodeData.vue
@@ -0,0 +1,272 @@
+
+
-
-
@@ -28,7 +29,7 @@
- 导出记录
+ 导出记录
@@ -63,6 +64,7 @@
import { getGasData, batchExportGasData } from '@/api/data'
import DeptSelect from '../../../components/DeptSelect/index'
import { parseUrl } from '@/utils/parseutils'
+import { getSearchLastWeekTime } from '@/utils/dateutils'
export default {
name: 'ListGasData',
@@ -163,6 +165,7 @@
if (params && params.deviceType === '4' && params.devcode) {
this.listQuery.keywords = params.devcode
}
+ this.timeRange = getSearchLastWeekTime()
this.fetchData()
}
},
@@ -191,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/listGasflowData.vue b/src/views/dataManage/deviceData/listGasflowData.vue
new file mode 100644
index 0000000..9c5321a
--- /dev/null
+++ b/src/views/dataManage/deviceData/listGasflowData.vue
@@ -0,0 +1,311 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/alarmGasCountByType.vue b/src/views/gasDashboard/components/alarmGasCountByType.vue
new file mode 100644
index 0000000..4f80d3a
--- /dev/null
+++ b/src/views/gasDashboard/components/alarmGasCountByType.vue
@@ -0,0 +1,72 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue
index 97cdfdb..40b9a5e 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -5,10 +5,10 @@
+
+
+
+
+
+
+ 搜索
+
+
+
+
+
+
+
+ 导出记录
+
+
+
+
+
+
+ {{ scope.row[column.value] }}
+ {{ scope.row[column.value] }}
+
+
+
+
+
+ 数据列表
+
+ 数据列表
+
+
+
+
+
+
+
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 bf03fd1..dffd340 100644
--- a/src/views/dataManage/deviceData/listWaterData.vue
+++ b/src/views/dataManage/deviceData/listWaterData.vue
@@ -176,6 +176,12 @@
align: 'center'
},
{
+ text: '压力(Mpa)',
+ value: 'pressure',
+ width: 90,
+ align: 'center'
+ },
+ {
text: '今日用水量（立方米）',
value: 'dayCount',
align: 'center',
@@ -276,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) // 下载完成移除元素
@@ -311,9 +317,11 @@
}
getWatchData(this.listQuery).then((response) => {
this.list = response.data.rows.map(function(item) {
- item.areaFullName = item.areaFullName
- .replace('/', '')
- .replace('顶层', '')
+ item.totalCount = parseFloat(item.totalCount).toFixed(2)
+ item.dayCount = parseFloat(item.dayCount).toFixed(2)
+ item.monthCount = parseFloat(item.monthCount).toFixed(2)
+ item.pressure = parseFloat(item.pressure).toFixed(2)
+ item.areaFullName = item.areaFullName.replace('/', '').replace('顶层', '')
return item
})
this.total = parseInt(response.data.total)
diff --git a/src/views/dataManage/deviceData/waterHistory.vue b/src/views/dataManage/deviceData/waterHistory.vue
index 160dab7..42e3303 100644
--- a/src/views/dataManage/deviceData/waterHistory.vue
+++ b/src/views/dataManage/deviceData/waterHistory.vue
@@ -1,5 +1,5 @@
-
+
+
+
+
+
+
+ 搜索
+
+
+
+
+
+
+
+ 导出记录
+
+
+
+
+
+
+ {{
+ scope.row[column.value]
+ }}
+ {{
+ scope.row["areaFullName"] + '/' + scope.row[column.value]
+ }}
+ {{ scope.row[column.value] }}
+
+
+
+
+
+ 历史数据
+
+
+
+
+
+
+ 数据列表
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/AlarmNowList.vue b/src/views/gasDashboard/components/AlarmNowList.vue
new file mode 100644
index 0000000..890325f
--- /dev/null
+++ b/src/views/gasDashboard/components/AlarmNowList.vue
@@ -0,0 +1,35 @@
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/DeviceCount.vue b/src/views/gasDashboard/components/DeviceCount.vue
new file mode 100644
index 0000000..bffc9e9
--- /dev/null
+++ b/src/views/gasDashboard/components/DeviceCount.vue
@@ -0,0 +1,68 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/FunctionArea.vue b/src/views/gasDashboard/components/FunctionArea.vue
new file mode 100644
index 0000000..6401557
--- /dev/null
+++ b/src/views/gasDashboard/components/FunctionArea.vue
@@ -0,0 +1,140 @@
+
+
+
+ 本年度
+ 本季度
+ 近30日
+ 近7日
+ 今日
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/FunctionArea2.vue b/src/views/gasDashboard/components/FunctionArea2.vue
new file mode 100644
index 0000000..26a9f82
--- /dev/null
+++ b/src/views/gasDashboard/components/FunctionArea2.vue
@@ -0,0 +1,107 @@
+
+
+
+ 本年度
+ 本季度
+ 近30日
+ 近7日
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/PanelGroup.vue b/src/views/gasDashboard/components/PanelGroup.vue
new file mode 100644
index 0000000..103486e
--- /dev/null
+++ b/src/views/gasDashboard/components/PanelGroup.vue
@@ -0,0 +1,137 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/alarmLeakCountPie.vue b/src/views/gasDashboard/components/alarmLeakCountPie.vue
new file mode 100644
index 0000000..abfbc2d
--- /dev/null
+++ b/src/views/gasDashboard/components/alarmLeakCountPie.vue
@@ -0,0 +1,74 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/corrodeCountByDay.vue b/src/views/gasDashboard/components/corrodeCountByDay.vue
new file mode 100644
index 0000000..a410f29
--- /dev/null
+++ b/src/views/gasDashboard/components/corrodeCountByDay.vue
@@ -0,0 +1,100 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasAlarmTrend.vue b/src/views/gasDashboard/components/gasAlarmTrend.vue
new file mode 100644
index 0000000..a1d422e
--- /dev/null
+++ b/src/views/gasDashboard/components/gasAlarmTrend.vue
@@ -0,0 +1,100 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasCompare.vue b/src/views/gasDashboard/components/gasCompare.vue
new file mode 100644
index 0000000..19a4398
--- /dev/null
+++ b/src/views/gasDashboard/components/gasCompare.vue
@@ -0,0 +1,121 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasCountByAreaBar.vue b/src/views/gasDashboard/components/gasCountByAreaBar.vue
new file mode 100644
index 0000000..456a6c6
--- /dev/null
+++ b/src/views/gasDashboard/components/gasCountByAreaBar.vue
@@ -0,0 +1,198 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasCountByDay.vue b/src/views/gasDashboard/components/gasCountByDay.vue
new file mode 100644
index 0000000..f0a3977
--- /dev/null
+++ b/src/views/gasDashboard/components/gasCountByDay.vue
@@ -0,0 +1,114 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasCountByDept.vue b/src/views/gasDashboard/components/gasCountByDept.vue
new file mode 100644
index 0000000..31c8508
--- /dev/null
+++ b/src/views/gasDashboard/components/gasCountByDept.vue
@@ -0,0 +1,126 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasCountByDeviceBar.vue b/src/views/gasDashboard/components/gasCountByDeviceBar.vue
new file mode 100644
index 0000000..dc211e3
--- /dev/null
+++ b/src/views/gasDashboard/components/gasCountByDeviceBar.vue
@@ -0,0 +1,130 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasNote.vue b/src/views/gasDashboard/components/gasNote.vue
new file mode 100644
index 0000000..5ade90f
--- /dev/null
+++ b/src/views/gasDashboard/components/gasNote.vue
@@ -0,0 +1,149 @@
+
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/watchAlarmBar.vue b/src/views/gasDashboard/components/watchAlarmBar.vue
new file mode 100644
index 0000000..4279440
--- /dev/null
+++ b/src/views/gasDashboard/components/watchAlarmBar.vue
@@ -0,0 +1,180 @@
+
+
+
+ 场区用气事记
+
+
+
+
+
+
+
+
+
+ {{ index+1 }}. {{ item.content }}
+
+
+ {{ index+1 }}.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/watchGasAlarmBar.vue b/src/views/gasDashboard/components/watchGasAlarmBar.vue
new file mode 100644
index 0000000..0113341
--- /dev/null
+++ b/src/views/gasDashboard/components/watchGasAlarmBar.vue
@@ -0,0 +1,132 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/index.vue b/src/views/gasDashboard/index.vue
new file mode 100644
index 0000000..be583f2
--- /dev/null
+++ b/src/views/gasDashboard/index.vue
@@ -0,0 +1,191 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/gasOverview/gasOverviewSimple.vue b/src/views/gasOverview/gasOverviewSimple.vue
new file mode 100644
index 0000000..8ff468f
--- /dev/null
+++ b/src/views/gasOverview/gasOverviewSimple.vue
@@ -0,0 +1,1189 @@
+
+
+
+
+
+
+
+
+
diff --git a/src/views/jobManage/detailJob.vue b/src/views/jobManage/detailJob.vue
index 2d6aaa4..fe7e68e 100644
--- a/src/views/jobManage/detailJob.vue
+++ b/src/views/jobManage/detailJob.vue
@@ -205,8 +205,9 @@
// 获取工单详情
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 => {
+ console.log(response, ' ============response=')
this.loading = false
if (response.code === 200) {
if (response.data.length <= 0) {
@@ -217,26 +218,28 @@
// 处理现场图片
if (job.firstStatePhotos !== '') {
this.firstImageList = []
- const urls = job.firstStatePhotos.split(';')
+ const urls = job.firstStatePhotos.split(',')
for (const url of urls) {
if (url) {
// this.firstImageList.push({ name: url, url: base_url + url })
this.firstImageList.push(base_url + url)
}
}
+ console.log(this.firstImageList)
} else {
this.firstImageList = []
}
// 处理维护图片
if (job.handlePhotos.length !== '') {
this.handleImageList = []
- const urls = job.handlePhotos.split(';')
+ const urls = job.handlePhotos.split(',')
for (const url of urls) {
if (url) {
// this.handleImageList.push({ name: url, url: base_url + url })
this.handleImageList.push(base_url + url)
}
}
+ console.log(this.handleImageList)
} else {
this.handleImageList = []
}
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 @@
diff --git a/src/views/dataManage/deviceData/listCorrodeData.vue b/src/views/dataManage/deviceData/listCorrodeData.vue
new file mode 100644
index 0000000..1a20abb
--- /dev/null
+++ b/src/views/dataManage/deviceData/listCorrodeData.vue
@@ -0,0 +1,272 @@
+
+
-
-
@@ -28,7 +29,7 @@
- 导出记录
+ 导出记录
@@ -63,6 +64,7 @@
import { getGasData, batchExportGasData } from '@/api/data'
import DeptSelect from '../../../components/DeptSelect/index'
import { parseUrl } from '@/utils/parseutils'
+import { getSearchLastWeekTime } from '@/utils/dateutils'
export default {
name: 'ListGasData',
@@ -163,6 +165,7 @@
if (params && params.deviceType === '4' && params.devcode) {
this.listQuery.keywords = params.devcode
}
+ this.timeRange = getSearchLastWeekTime()
this.fetchData()
}
},
@@ -191,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/listGasflowData.vue b/src/views/dataManage/deviceData/listGasflowData.vue
new file mode 100644
index 0000000..9c5321a
--- /dev/null
+++ b/src/views/dataManage/deviceData/listGasflowData.vue
@@ -0,0 +1,311 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/alarmGasCountByType.vue b/src/views/gasDashboard/components/alarmGasCountByType.vue
new file mode 100644
index 0000000..4f80d3a
--- /dev/null
+++ b/src/views/gasDashboard/components/alarmGasCountByType.vue
@@ -0,0 +1,72 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue
index 97cdfdb..40b9a5e 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -5,10 +5,10 @@
+
+
+
+
+
+
+ 搜索
+
+
+
+
+
+
+
+ 导出记录
+
+
+
+
+
+
+ {{ scope.row[column.value] }}
+ {{ scope.row[column.value] }}
+
+
+
+
+
+ 数据列表
+
+ 数据列表
+
+
+
+
+
+
+
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 bf03fd1..dffd340 100644
--- a/src/views/dataManage/deviceData/listWaterData.vue
+++ b/src/views/dataManage/deviceData/listWaterData.vue
@@ -176,6 +176,12 @@
align: 'center'
},
{
+ text: '压力(Mpa)',
+ value: 'pressure',
+ width: 90,
+ align: 'center'
+ },
+ {
text: '今日用水量（立方米）',
value: 'dayCount',
align: 'center',
@@ -276,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) // 下载完成移除元素
@@ -311,9 +317,11 @@
}
getWatchData(this.listQuery).then((response) => {
this.list = response.data.rows.map(function(item) {
- item.areaFullName = item.areaFullName
- .replace('/', '')
- .replace('顶层', '')
+ item.totalCount = parseFloat(item.totalCount).toFixed(2)
+ item.dayCount = parseFloat(item.dayCount).toFixed(2)
+ item.monthCount = parseFloat(item.monthCount).toFixed(2)
+ item.pressure = parseFloat(item.pressure).toFixed(2)
+ item.areaFullName = item.areaFullName.replace('/', '').replace('顶层', '')
return item
})
this.total = parseInt(response.data.total)
diff --git a/src/views/dataManage/deviceData/waterHistory.vue b/src/views/dataManage/deviceData/waterHistory.vue
index 160dab7..42e3303 100644
--- a/src/views/dataManage/deviceData/waterHistory.vue
+++ b/src/views/dataManage/deviceData/waterHistory.vue
@@ -1,5 +1,5 @@
-
+
+
+
+
+
+
+ 搜索
+
+
+
+
+
+
+
+ 导出记录
+
+
+
+
+
+
+ {{
+ scope.row[column.value]
+ }}
+ {{
+ scope.row["areaFullName"] + '/' + scope.row[column.value]
+ }}
+ {{ scope.row[column.value] }}
+
+
+
+
+
+ 历史数据
+
+
+
+
+
+
+ 数据列表
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/AlarmNowList.vue b/src/views/gasDashboard/components/AlarmNowList.vue
new file mode 100644
index 0000000..890325f
--- /dev/null
+++ b/src/views/gasDashboard/components/AlarmNowList.vue
@@ -0,0 +1,35 @@
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/DeviceCount.vue b/src/views/gasDashboard/components/DeviceCount.vue
new file mode 100644
index 0000000..bffc9e9
--- /dev/null
+++ b/src/views/gasDashboard/components/DeviceCount.vue
@@ -0,0 +1,68 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/FunctionArea.vue b/src/views/gasDashboard/components/FunctionArea.vue
new file mode 100644
index 0000000..6401557
--- /dev/null
+++ b/src/views/gasDashboard/components/FunctionArea.vue
@@ -0,0 +1,140 @@
+
+
+
+ 本年度
+ 本季度
+ 近30日
+ 近7日
+ 今日
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/FunctionArea2.vue b/src/views/gasDashboard/components/FunctionArea2.vue
new file mode 100644
index 0000000..26a9f82
--- /dev/null
+++ b/src/views/gasDashboard/components/FunctionArea2.vue
@@ -0,0 +1,107 @@
+
+
+
+ 本年度
+ 本季度
+ 近30日
+ 近7日
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/PanelGroup.vue b/src/views/gasDashboard/components/PanelGroup.vue
new file mode 100644
index 0000000..103486e
--- /dev/null
+++ b/src/views/gasDashboard/components/PanelGroup.vue
@@ -0,0 +1,137 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/alarmLeakCountPie.vue b/src/views/gasDashboard/components/alarmLeakCountPie.vue
new file mode 100644
index 0000000..abfbc2d
--- /dev/null
+++ b/src/views/gasDashboard/components/alarmLeakCountPie.vue
@@ -0,0 +1,74 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/corrodeCountByDay.vue b/src/views/gasDashboard/components/corrodeCountByDay.vue
new file mode 100644
index 0000000..a410f29
--- /dev/null
+++ b/src/views/gasDashboard/components/corrodeCountByDay.vue
@@ -0,0 +1,100 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasAlarmTrend.vue b/src/views/gasDashboard/components/gasAlarmTrend.vue
new file mode 100644
index 0000000..a1d422e
--- /dev/null
+++ b/src/views/gasDashboard/components/gasAlarmTrend.vue
@@ -0,0 +1,100 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasCompare.vue b/src/views/gasDashboard/components/gasCompare.vue
new file mode 100644
index 0000000..19a4398
--- /dev/null
+++ b/src/views/gasDashboard/components/gasCompare.vue
@@ -0,0 +1,121 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasCountByAreaBar.vue b/src/views/gasDashboard/components/gasCountByAreaBar.vue
new file mode 100644
index 0000000..456a6c6
--- /dev/null
+++ b/src/views/gasDashboard/components/gasCountByAreaBar.vue
@@ -0,0 +1,198 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasCountByDay.vue b/src/views/gasDashboard/components/gasCountByDay.vue
new file mode 100644
index 0000000..f0a3977
--- /dev/null
+++ b/src/views/gasDashboard/components/gasCountByDay.vue
@@ -0,0 +1,114 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasCountByDept.vue b/src/views/gasDashboard/components/gasCountByDept.vue
new file mode 100644
index 0000000..31c8508
--- /dev/null
+++ b/src/views/gasDashboard/components/gasCountByDept.vue
@@ -0,0 +1,126 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasCountByDeviceBar.vue b/src/views/gasDashboard/components/gasCountByDeviceBar.vue
new file mode 100644
index 0000000..dc211e3
--- /dev/null
+++ b/src/views/gasDashboard/components/gasCountByDeviceBar.vue
@@ -0,0 +1,130 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasNote.vue b/src/views/gasDashboard/components/gasNote.vue
new file mode 100644
index 0000000..5ade90f
--- /dev/null
+++ b/src/views/gasDashboard/components/gasNote.vue
@@ -0,0 +1,149 @@
+
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/watchAlarmBar.vue b/src/views/gasDashboard/components/watchAlarmBar.vue
new file mode 100644
index 0000000..4279440
--- /dev/null
+++ b/src/views/gasDashboard/components/watchAlarmBar.vue
@@ -0,0 +1,180 @@
+
+
+
+ 场区用气事记
+
+
+
+
+
+
+
+
+
+ {{ index+1 }}. {{ item.content }}
+
+
+ {{ index+1 }}.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/watchGasAlarmBar.vue b/src/views/gasDashboard/components/watchGasAlarmBar.vue
new file mode 100644
index 0000000..0113341
--- /dev/null
+++ b/src/views/gasDashboard/components/watchGasAlarmBar.vue
@@ -0,0 +1,132 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/index.vue b/src/views/gasDashboard/index.vue
new file mode 100644
index 0000000..be583f2
--- /dev/null
+++ b/src/views/gasDashboard/index.vue
@@ -0,0 +1,191 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/gasOverview/gasOverviewSimple.vue b/src/views/gasOverview/gasOverviewSimple.vue
new file mode 100644
index 0000000..8ff468f
--- /dev/null
+++ b/src/views/gasOverview/gasOverviewSimple.vue
@@ -0,0 +1,1189 @@
+
+
+
+
+
+
+
+
+
diff --git a/src/views/jobManage/detailJob.vue b/src/views/jobManage/detailJob.vue
index 2d6aaa4..fe7e68e 100644
--- a/src/views/jobManage/detailJob.vue
+++ b/src/views/jobManage/detailJob.vue
@@ -205,8 +205,9 @@
// 获取工单详情
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 => {
+ console.log(response, ' ============response=')
this.loading = false
if (response.code === 200) {
if (response.data.length <= 0) {
@@ -217,26 +218,28 @@
// 处理现场图片
if (job.firstStatePhotos !== '') {
this.firstImageList = []
- const urls = job.firstStatePhotos.split(';')
+ const urls = job.firstStatePhotos.split(',')
for (const url of urls) {
if (url) {
// this.firstImageList.push({ name: url, url: base_url + url })
this.firstImageList.push(base_url + url)
}
}
+ console.log(this.firstImageList)
} else {
this.firstImageList = []
}
// 处理维护图片
if (job.handlePhotos.length !== '') {
this.handleImageList = []
- const urls = job.handlePhotos.split(';')
+ const urls = job.handlePhotos.split(',')
for (const url of urls) {
if (url) {
// this.handleImageList.push({ name: url, url: base_url + url })
this.handleImageList.push(base_url + url)
}
}
+ console.log(this.handleImageList)
} else {
this.handleImageList = []
}
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 @@
diff --git a/src/views/dataManage/deviceData/listCorrodeData.vue b/src/views/dataManage/deviceData/listCorrodeData.vue
new file mode 100644
index 0000000..1a20abb
--- /dev/null
+++ b/src/views/dataManage/deviceData/listCorrodeData.vue
@@ -0,0 +1,272 @@
+
+
-
-
@@ -28,7 +29,7 @@
- 导出记录
+ 导出记录
@@ -63,6 +64,7 @@
import { getGasData, batchExportGasData } from '@/api/data'
import DeptSelect from '../../../components/DeptSelect/index'
import { parseUrl } from '@/utils/parseutils'
+import { getSearchLastWeekTime } from '@/utils/dateutils'
export default {
name: 'ListGasData',
@@ -163,6 +165,7 @@
if (params && params.deviceType === '4' && params.devcode) {
this.listQuery.keywords = params.devcode
}
+ this.timeRange = getSearchLastWeekTime()
this.fetchData()
}
},
@@ -191,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/listGasflowData.vue b/src/views/dataManage/deviceData/listGasflowData.vue
new file mode 100644
index 0000000..9c5321a
--- /dev/null
+++ b/src/views/dataManage/deviceData/listGasflowData.vue
@@ -0,0 +1,311 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/alarmGasCountByType.vue b/src/views/gasDashboard/components/alarmGasCountByType.vue
new file mode 100644
index 0000000..4f80d3a
--- /dev/null
+++ b/src/views/gasDashboard/components/alarmGasCountByType.vue
@@ -0,0 +1,72 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue
index 97cdfdb..40b9a5e 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -5,10 +5,10 @@
+
+
+
+
+
+
+ 搜索
+
+
+
+
+
+
+
+ 导出记录
+
+
+
+
+
+
+ {{ scope.row[column.value] }}
+ {{ scope.row[column.value] }}
+
+
+
+
+
+ 数据列表
+
+ 数据列表
+
+
+
+
+
+
+
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 bf03fd1..dffd340 100644
--- a/src/views/dataManage/deviceData/listWaterData.vue
+++ b/src/views/dataManage/deviceData/listWaterData.vue
@@ -176,6 +176,12 @@
align: 'center'
},
{
+ text: '压力(Mpa)',
+ value: 'pressure',
+ width: 90,
+ align: 'center'
+ },
+ {
text: '今日用水量（立方米）',
value: 'dayCount',
align: 'center',
@@ -276,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) // 下载完成移除元素
@@ -311,9 +317,11 @@
}
getWatchData(this.listQuery).then((response) => {
this.list = response.data.rows.map(function(item) {
- item.areaFullName = item.areaFullName
- .replace('/', '')
- .replace('顶层', '')
+ item.totalCount = parseFloat(item.totalCount).toFixed(2)
+ item.dayCount = parseFloat(item.dayCount).toFixed(2)
+ item.monthCount = parseFloat(item.monthCount).toFixed(2)
+ item.pressure = parseFloat(item.pressure).toFixed(2)
+ item.areaFullName = item.areaFullName.replace('/', '').replace('顶层', '')
return item
})
this.total = parseInt(response.data.total)
diff --git a/src/views/dataManage/deviceData/waterHistory.vue b/src/views/dataManage/deviceData/waterHistory.vue
index 160dab7..42e3303 100644
--- a/src/views/dataManage/deviceData/waterHistory.vue
+++ b/src/views/dataManage/deviceData/waterHistory.vue
@@ -1,5 +1,5 @@
-
+
+
+
+
+
+
+ 搜索
+
+
+
+
+
+
+
+ 导出记录
+
+
+
+
+
+
+ {{
+ scope.row[column.value]
+ }}
+ {{
+ scope.row["areaFullName"] + '/' + scope.row[column.value]
+ }}
+ {{ scope.row[column.value] }}
+
+
+
+
+
+ 历史数据
+
+
+
+
+
+
+ 数据列表
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/AlarmNowList.vue b/src/views/gasDashboard/components/AlarmNowList.vue
new file mode 100644
index 0000000..890325f
--- /dev/null
+++ b/src/views/gasDashboard/components/AlarmNowList.vue
@@ -0,0 +1,35 @@
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/DeviceCount.vue b/src/views/gasDashboard/components/DeviceCount.vue
new file mode 100644
index 0000000..bffc9e9
--- /dev/null
+++ b/src/views/gasDashboard/components/DeviceCount.vue
@@ -0,0 +1,68 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/FunctionArea.vue b/src/views/gasDashboard/components/FunctionArea.vue
new file mode 100644
index 0000000..6401557
--- /dev/null
+++ b/src/views/gasDashboard/components/FunctionArea.vue
@@ -0,0 +1,140 @@
+
+
+
+ 本年度
+ 本季度
+ 近30日
+ 近7日
+ 今日
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/FunctionArea2.vue b/src/views/gasDashboard/components/FunctionArea2.vue
new file mode 100644
index 0000000..26a9f82
--- /dev/null
+++ b/src/views/gasDashboard/components/FunctionArea2.vue
@@ -0,0 +1,107 @@
+
+
+
+ 本年度
+ 本季度
+ 近30日
+ 近7日
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/PanelGroup.vue b/src/views/gasDashboard/components/PanelGroup.vue
new file mode 100644
index 0000000..103486e
--- /dev/null
+++ b/src/views/gasDashboard/components/PanelGroup.vue
@@ -0,0 +1,137 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/alarmLeakCountPie.vue b/src/views/gasDashboard/components/alarmLeakCountPie.vue
new file mode 100644
index 0000000..abfbc2d
--- /dev/null
+++ b/src/views/gasDashboard/components/alarmLeakCountPie.vue
@@ -0,0 +1,74 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/corrodeCountByDay.vue b/src/views/gasDashboard/components/corrodeCountByDay.vue
new file mode 100644
index 0000000..a410f29
--- /dev/null
+++ b/src/views/gasDashboard/components/corrodeCountByDay.vue
@@ -0,0 +1,100 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasAlarmTrend.vue b/src/views/gasDashboard/components/gasAlarmTrend.vue
new file mode 100644
index 0000000..a1d422e
--- /dev/null
+++ b/src/views/gasDashboard/components/gasAlarmTrend.vue
@@ -0,0 +1,100 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasCompare.vue b/src/views/gasDashboard/components/gasCompare.vue
new file mode 100644
index 0000000..19a4398
--- /dev/null
+++ b/src/views/gasDashboard/components/gasCompare.vue
@@ -0,0 +1,121 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasCountByAreaBar.vue b/src/views/gasDashboard/components/gasCountByAreaBar.vue
new file mode 100644
index 0000000..456a6c6
--- /dev/null
+++ b/src/views/gasDashboard/components/gasCountByAreaBar.vue
@@ -0,0 +1,198 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasCountByDay.vue b/src/views/gasDashboard/components/gasCountByDay.vue
new file mode 100644
index 0000000..f0a3977
--- /dev/null
+++ b/src/views/gasDashboard/components/gasCountByDay.vue
@@ -0,0 +1,114 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasCountByDept.vue b/src/views/gasDashboard/components/gasCountByDept.vue
new file mode 100644
index 0000000..31c8508
--- /dev/null
+++ b/src/views/gasDashboard/components/gasCountByDept.vue
@@ -0,0 +1,126 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasCountByDeviceBar.vue b/src/views/gasDashboard/components/gasCountByDeviceBar.vue
new file mode 100644
index 0000000..dc211e3
--- /dev/null
+++ b/src/views/gasDashboard/components/gasCountByDeviceBar.vue
@@ -0,0 +1,130 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasNote.vue b/src/views/gasDashboard/components/gasNote.vue
new file mode 100644
index 0000000..5ade90f
--- /dev/null
+++ b/src/views/gasDashboard/components/gasNote.vue
@@ -0,0 +1,149 @@
+
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/watchAlarmBar.vue b/src/views/gasDashboard/components/watchAlarmBar.vue
new file mode 100644
index 0000000..4279440
--- /dev/null
+++ b/src/views/gasDashboard/components/watchAlarmBar.vue
@@ -0,0 +1,180 @@
+
+
+
+ 场区用气事记
+
+
+
+
+
+
+
+
+
+ {{ index+1 }}. {{ item.content }}
+
+
+ {{ index+1 }}.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/watchGasAlarmBar.vue b/src/views/gasDashboard/components/watchGasAlarmBar.vue
new file mode 100644
index 0000000..0113341
--- /dev/null
+++ b/src/views/gasDashboard/components/watchGasAlarmBar.vue
@@ -0,0 +1,132 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/index.vue b/src/views/gasDashboard/index.vue
new file mode 100644
index 0000000..be583f2
--- /dev/null
+++ b/src/views/gasDashboard/index.vue
@@ -0,0 +1,191 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/gasOverview/gasOverviewSimple.vue b/src/views/gasOverview/gasOverviewSimple.vue
new file mode 100644
index 0000000..8ff468f
--- /dev/null
+++ b/src/views/gasOverview/gasOverviewSimple.vue
@@ -0,0 +1,1189 @@
+
+
+
+
+
+
+
+
+
diff --git a/src/views/jobManage/detailJob.vue b/src/views/jobManage/detailJob.vue
index 2d6aaa4..fe7e68e 100644
--- a/src/views/jobManage/detailJob.vue
+++ b/src/views/jobManage/detailJob.vue
@@ -205,8 +205,9 @@
// 获取工单详情
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 => {
+ console.log(response, ' ============response=')
this.loading = false
if (response.code === 200) {
if (response.data.length <= 0) {
@@ -217,26 +218,28 @@
// 处理现场图片
if (job.firstStatePhotos !== '') {
this.firstImageList = []
- const urls = job.firstStatePhotos.split(';')
+ const urls = job.firstStatePhotos.split(',')
for (const url of urls) {
if (url) {
// this.firstImageList.push({ name: url, url: base_url + url })
this.firstImageList.push(base_url + url)
}
}
+ console.log(this.firstImageList)
} else {
this.firstImageList = []
}
// 处理维护图片
if (job.handlePhotos.length !== '') {
this.handleImageList = []
- const urls = job.handlePhotos.split(';')
+ const urls = job.handlePhotos.split(',')
for (const url of urls) {
if (url) {
// this.handleImageList.push({ name: url, url: base_url + url })
this.handleImageList.push(base_url + url)
}
}
+ console.log(this.handleImageList)
} else {
this.handleImageList = []
}
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 @@
diff --git a/src/views/dataManage/deviceData/listCorrodeData.vue b/src/views/dataManage/deviceData/listCorrodeData.vue
new file mode 100644
index 0000000..1a20abb
--- /dev/null
+++ b/src/views/dataManage/deviceData/listCorrodeData.vue
@@ -0,0 +1,272 @@
+
+
-
-
@@ -28,7 +29,7 @@
- 导出记录
+ 导出记录
@@ -63,6 +64,7 @@
import { getGasData, batchExportGasData } from '@/api/data'
import DeptSelect from '../../../components/DeptSelect/index'
import { parseUrl } from '@/utils/parseutils'
+import { getSearchLastWeekTime } from '@/utils/dateutils'
export default {
name: 'ListGasData',
@@ -163,6 +165,7 @@
if (params && params.deviceType === '4' && params.devcode) {
this.listQuery.keywords = params.devcode
}
+ this.timeRange = getSearchLastWeekTime()
this.fetchData()
}
},
@@ -191,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/listGasflowData.vue b/src/views/dataManage/deviceData/listGasflowData.vue
new file mode 100644
index 0000000..9c5321a
--- /dev/null
+++ b/src/views/dataManage/deviceData/listGasflowData.vue
@@ -0,0 +1,311 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/alarmGasCountByType.vue b/src/views/gasDashboard/components/alarmGasCountByType.vue
new file mode 100644
index 0000000..4f80d3a
--- /dev/null
+++ b/src/views/gasDashboard/components/alarmGasCountByType.vue
@@ -0,0 +1,72 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue
index 97cdfdb..40b9a5e 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -5,10 +5,10 @@
+
+
+
+
+
+
+ 搜索
+
+
+
+
+
+
+
+ 导出记录
+
+
+
+
+
+
+ {{ scope.row[column.value] }}
+ {{ scope.row[column.value] }}
+
+
+
+
+
+ 数据列表
+
+ 数据列表
+
+
+
+
+
+
+
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 bf03fd1..dffd340 100644
--- a/src/views/dataManage/deviceData/listWaterData.vue
+++ b/src/views/dataManage/deviceData/listWaterData.vue
@@ -176,6 +176,12 @@
align: 'center'
},
{
+ text: '压力(Mpa)',
+ value: 'pressure',
+ width: 90,
+ align: 'center'
+ },
+ {
text: '今日用水量（立方米）',
value: 'dayCount',
align: 'center',
@@ -276,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) // 下载完成移除元素
@@ -311,9 +317,11 @@
}
getWatchData(this.listQuery).then((response) => {
this.list = response.data.rows.map(function(item) {
- item.areaFullName = item.areaFullName
- .replace('/', '')
- .replace('顶层', '')
+ item.totalCount = parseFloat(item.totalCount).toFixed(2)
+ item.dayCount = parseFloat(item.dayCount).toFixed(2)
+ item.monthCount = parseFloat(item.monthCount).toFixed(2)
+ item.pressure = parseFloat(item.pressure).toFixed(2)
+ item.areaFullName = item.areaFullName.replace('/', '').replace('顶层', '')
return item
})
this.total = parseInt(response.data.total)
diff --git a/src/views/dataManage/deviceData/waterHistory.vue b/src/views/dataManage/deviceData/waterHistory.vue
index 160dab7..42e3303 100644
--- a/src/views/dataManage/deviceData/waterHistory.vue
+++ b/src/views/dataManage/deviceData/waterHistory.vue
@@ -1,5 +1,5 @@
-
+
+
+
+
+
+
+ 搜索
+
+
+
+
+
+
+
+ 导出记录
+
+
+
+
+
+
+ {{
+ scope.row[column.value]
+ }}
+ {{
+ scope.row["areaFullName"] + '/' + scope.row[column.value]
+ }}
+ {{ scope.row[column.value] }}
+
+
+
+
+
+ 历史数据
+
+
+
+
+
+
+ 数据列表
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/AlarmNowList.vue b/src/views/gasDashboard/components/AlarmNowList.vue
new file mode 100644
index 0000000..890325f
--- /dev/null
+++ b/src/views/gasDashboard/components/AlarmNowList.vue
@@ -0,0 +1,35 @@
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/DeviceCount.vue b/src/views/gasDashboard/components/DeviceCount.vue
new file mode 100644
index 0000000..bffc9e9
--- /dev/null
+++ b/src/views/gasDashboard/components/DeviceCount.vue
@@ -0,0 +1,68 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/FunctionArea.vue b/src/views/gasDashboard/components/FunctionArea.vue
new file mode 100644
index 0000000..6401557
--- /dev/null
+++ b/src/views/gasDashboard/components/FunctionArea.vue
@@ -0,0 +1,140 @@
+
+
+
+ 本年度
+ 本季度
+ 近30日
+ 近7日
+ 今日
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/FunctionArea2.vue b/src/views/gasDashboard/components/FunctionArea2.vue
new file mode 100644
index 0000000..26a9f82
--- /dev/null
+++ b/src/views/gasDashboard/components/FunctionArea2.vue
@@ -0,0 +1,107 @@
+
+
+
+ 本年度
+ 本季度
+ 近30日
+ 近7日
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/PanelGroup.vue b/src/views/gasDashboard/components/PanelGroup.vue
new file mode 100644
index 0000000..103486e
--- /dev/null
+++ b/src/views/gasDashboard/components/PanelGroup.vue
@@ -0,0 +1,137 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/alarmLeakCountPie.vue b/src/views/gasDashboard/components/alarmLeakCountPie.vue
new file mode 100644
index 0000000..abfbc2d
--- /dev/null
+++ b/src/views/gasDashboard/components/alarmLeakCountPie.vue
@@ -0,0 +1,74 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/corrodeCountByDay.vue b/src/views/gasDashboard/components/corrodeCountByDay.vue
new file mode 100644
index 0000000..a410f29
--- /dev/null
+++ b/src/views/gasDashboard/components/corrodeCountByDay.vue
@@ -0,0 +1,100 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasAlarmTrend.vue b/src/views/gasDashboard/components/gasAlarmTrend.vue
new file mode 100644
index 0000000..a1d422e
--- /dev/null
+++ b/src/views/gasDashboard/components/gasAlarmTrend.vue
@@ -0,0 +1,100 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasCompare.vue b/src/views/gasDashboard/components/gasCompare.vue
new file mode 100644
index 0000000..19a4398
--- /dev/null
+++ b/src/views/gasDashboard/components/gasCompare.vue
@@ -0,0 +1,121 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasCountByAreaBar.vue b/src/views/gasDashboard/components/gasCountByAreaBar.vue
new file mode 100644
index 0000000..456a6c6
--- /dev/null
+++ b/src/views/gasDashboard/components/gasCountByAreaBar.vue
@@ -0,0 +1,198 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasCountByDay.vue b/src/views/gasDashboard/components/gasCountByDay.vue
new file mode 100644
index 0000000..f0a3977
--- /dev/null
+++ b/src/views/gasDashboard/components/gasCountByDay.vue
@@ -0,0 +1,114 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasCountByDept.vue b/src/views/gasDashboard/components/gasCountByDept.vue
new file mode 100644
index 0000000..31c8508
--- /dev/null
+++ b/src/views/gasDashboard/components/gasCountByDept.vue
@@ -0,0 +1,126 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasCountByDeviceBar.vue b/src/views/gasDashboard/components/gasCountByDeviceBar.vue
new file mode 100644
index 0000000..dc211e3
--- /dev/null
+++ b/src/views/gasDashboard/components/gasCountByDeviceBar.vue
@@ -0,0 +1,130 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasNote.vue b/src/views/gasDashboard/components/gasNote.vue
new file mode 100644
index 0000000..5ade90f
--- /dev/null
+++ b/src/views/gasDashboard/components/gasNote.vue
@@ -0,0 +1,149 @@
+
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/watchAlarmBar.vue b/src/views/gasDashboard/components/watchAlarmBar.vue
new file mode 100644
index 0000000..4279440
--- /dev/null
+++ b/src/views/gasDashboard/components/watchAlarmBar.vue
@@ -0,0 +1,180 @@
+
+
+
+ 场区用气事记
+
+
+
+
+
+
+
+
+
+ {{ index+1 }}. {{ item.content }}
+
+
+ {{ index+1 }}.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/watchGasAlarmBar.vue b/src/views/gasDashboard/components/watchGasAlarmBar.vue
new file mode 100644
index 0000000..0113341
--- /dev/null
+++ b/src/views/gasDashboard/components/watchGasAlarmBar.vue
@@ -0,0 +1,132 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/index.vue b/src/views/gasDashboard/index.vue
new file mode 100644
index 0000000..be583f2
--- /dev/null
+++ b/src/views/gasDashboard/index.vue
@@ -0,0 +1,191 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/gasOverview/gasOverviewSimple.vue b/src/views/gasOverview/gasOverviewSimple.vue
new file mode 100644
index 0000000..8ff468f
--- /dev/null
+++ b/src/views/gasOverview/gasOverviewSimple.vue
@@ -0,0 +1,1189 @@
+
+
+
+
+
+
+
+
+
diff --git a/src/views/jobManage/detailJob.vue b/src/views/jobManage/detailJob.vue
index 2d6aaa4..fe7e68e 100644
--- a/src/views/jobManage/detailJob.vue
+++ b/src/views/jobManage/detailJob.vue
@@ -205,8 +205,9 @@
// 获取工单详情
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 => {
+ console.log(response, ' ============response=')
this.loading = false
if (response.code === 200) {
if (response.data.length <= 0) {
@@ -217,26 +218,28 @@
// 处理现场图片
if (job.firstStatePhotos !== '') {
this.firstImageList = []
- const urls = job.firstStatePhotos.split(';')
+ const urls = job.firstStatePhotos.split(',')
for (const url of urls) {
if (url) {
// this.firstImageList.push({ name: url, url: base_url + url })
this.firstImageList.push(base_url + url)
}
}
+ console.log(this.firstImageList)
} else {
this.firstImageList = []
}
// 处理维护图片
if (job.handlePhotos.length !== '') {
this.handleImageList = []
- const urls = job.handlePhotos.split(';')
+ const urls = job.handlePhotos.split(',')
for (const url of urls) {
if (url) {
// this.handleImageList.push({ name: url, url: base_url + url })
this.handleImageList.push(base_url + url)
}
}
+ console.log(this.handleImageList)
} else {
this.handleImageList = []
}
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 @@
diff --git a/src/views/dataManage/deviceData/listCorrodeData.vue b/src/views/dataManage/deviceData/listCorrodeData.vue
new file mode 100644
index 0000000..1a20abb
--- /dev/null
+++ b/src/views/dataManage/deviceData/listCorrodeData.vue
@@ -0,0 +1,272 @@
+
+
-
-
@@ -28,7 +29,7 @@
- 导出记录
+ 导出记录
@@ -63,6 +64,7 @@
import { getGasData, batchExportGasData } from '@/api/data'
import DeptSelect from '../../../components/DeptSelect/index'
import { parseUrl } from '@/utils/parseutils'
+import { getSearchLastWeekTime } from '@/utils/dateutils'
export default {
name: 'ListGasData',
@@ -163,6 +165,7 @@
if (params && params.deviceType === '4' && params.devcode) {
this.listQuery.keywords = params.devcode
}
+ this.timeRange = getSearchLastWeekTime()
this.fetchData()
}
},
@@ -191,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/listGasflowData.vue b/src/views/dataManage/deviceData/listGasflowData.vue
new file mode 100644
index 0000000..9c5321a
--- /dev/null
+++ b/src/views/dataManage/deviceData/listGasflowData.vue
@@ -0,0 +1,311 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/alarmGasCountByType.vue b/src/views/gasDashboard/components/alarmGasCountByType.vue
new file mode 100644
index 0000000..4f80d3a
--- /dev/null
+++ b/src/views/gasDashboard/components/alarmGasCountByType.vue
@@ -0,0 +1,72 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue
index 97cdfdb..40b9a5e 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -5,10 +5,10 @@
+
+
+
+
+
+
+ 搜索
+
+
+
+
+
+
+
+ 导出记录
+
+
+
+
+
+
+ {{ scope.row[column.value] }}
+ {{ scope.row[column.value] }}
+
+
+
+
+
+ 数据列表
+
+ 数据列表
+
+
+
+
+
+
+
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 bf03fd1..dffd340 100644
--- a/src/views/dataManage/deviceData/listWaterData.vue
+++ b/src/views/dataManage/deviceData/listWaterData.vue
@@ -176,6 +176,12 @@
align: 'center'
},
{
+ text: '压力(Mpa)',
+ value: 'pressure',
+ width: 90,
+ align: 'center'
+ },
+ {
text: '今日用水量（立方米）',
value: 'dayCount',
align: 'center',
@@ -276,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) // 下载完成移除元素
@@ -311,9 +317,11 @@
}
getWatchData(this.listQuery).then((response) => {
this.list = response.data.rows.map(function(item) {
- item.areaFullName = item.areaFullName
- .replace('/', '')
- .replace('顶层', '')
+ item.totalCount = parseFloat(item.totalCount).toFixed(2)
+ item.dayCount = parseFloat(item.dayCount).toFixed(2)
+ item.monthCount = parseFloat(item.monthCount).toFixed(2)
+ item.pressure = parseFloat(item.pressure).toFixed(2)
+ item.areaFullName = item.areaFullName.replace('/', '').replace('顶层', '')
return item
})
this.total = parseInt(response.data.total)
diff --git a/src/views/dataManage/deviceData/waterHistory.vue b/src/views/dataManage/deviceData/waterHistory.vue
index 160dab7..42e3303 100644
--- a/src/views/dataManage/deviceData/waterHistory.vue
+++ b/src/views/dataManage/deviceData/waterHistory.vue
@@ -1,5 +1,5 @@
-
+
+
+
+
+
+
+ 搜索
+
+
+
+
+
+
+
+ 导出记录
+
+
+
+
+
+
+ {{
+ scope.row[column.value]
+ }}
+ {{
+ scope.row["areaFullName"] + '/' + scope.row[column.value]
+ }}
+ {{ scope.row[column.value] }}
+
+
+
+
+
+ 历史数据
+
+
+
+
+
+
+ 数据列表
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/AlarmNowList.vue b/src/views/gasDashboard/components/AlarmNowList.vue
new file mode 100644
index 0000000..890325f
--- /dev/null
+++ b/src/views/gasDashboard/components/AlarmNowList.vue
@@ -0,0 +1,35 @@
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/DeviceCount.vue b/src/views/gasDashboard/components/DeviceCount.vue
new file mode 100644
index 0000000..bffc9e9
--- /dev/null
+++ b/src/views/gasDashboard/components/DeviceCount.vue
@@ -0,0 +1,68 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/FunctionArea.vue b/src/views/gasDashboard/components/FunctionArea.vue
new file mode 100644
index 0000000..6401557
--- /dev/null
+++ b/src/views/gasDashboard/components/FunctionArea.vue
@@ -0,0 +1,140 @@
+
+
+
+ 本年度
+ 本季度
+ 近30日
+ 近7日
+ 今日
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/FunctionArea2.vue b/src/views/gasDashboard/components/FunctionArea2.vue
new file mode 100644
index 0000000..26a9f82
--- /dev/null
+++ b/src/views/gasDashboard/components/FunctionArea2.vue
@@ -0,0 +1,107 @@
+
+
+
+ 本年度
+ 本季度
+ 近30日
+ 近7日
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/PanelGroup.vue b/src/views/gasDashboard/components/PanelGroup.vue
new file mode 100644
index 0000000..103486e
--- /dev/null
+++ b/src/views/gasDashboard/components/PanelGroup.vue
@@ -0,0 +1,137 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/alarmLeakCountPie.vue b/src/views/gasDashboard/components/alarmLeakCountPie.vue
new file mode 100644
index 0000000..abfbc2d
--- /dev/null
+++ b/src/views/gasDashboard/components/alarmLeakCountPie.vue
@@ -0,0 +1,74 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/corrodeCountByDay.vue b/src/views/gasDashboard/components/corrodeCountByDay.vue
new file mode 100644
index 0000000..a410f29
--- /dev/null
+++ b/src/views/gasDashboard/components/corrodeCountByDay.vue
@@ -0,0 +1,100 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasAlarmTrend.vue b/src/views/gasDashboard/components/gasAlarmTrend.vue
new file mode 100644
index 0000000..a1d422e
--- /dev/null
+++ b/src/views/gasDashboard/components/gasAlarmTrend.vue
@@ -0,0 +1,100 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasCompare.vue b/src/views/gasDashboard/components/gasCompare.vue
new file mode 100644
index 0000000..19a4398
--- /dev/null
+++ b/src/views/gasDashboard/components/gasCompare.vue
@@ -0,0 +1,121 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasCountByAreaBar.vue b/src/views/gasDashboard/components/gasCountByAreaBar.vue
new file mode 100644
index 0000000..456a6c6
--- /dev/null
+++ b/src/views/gasDashboard/components/gasCountByAreaBar.vue
@@ -0,0 +1,198 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasCountByDay.vue b/src/views/gasDashboard/components/gasCountByDay.vue
new file mode 100644
index 0000000..f0a3977
--- /dev/null
+++ b/src/views/gasDashboard/components/gasCountByDay.vue
@@ -0,0 +1,114 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasCountByDept.vue b/src/views/gasDashboard/components/gasCountByDept.vue
new file mode 100644
index 0000000..31c8508
--- /dev/null
+++ b/src/views/gasDashboard/components/gasCountByDept.vue
@@ -0,0 +1,126 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasCountByDeviceBar.vue b/src/views/gasDashboard/components/gasCountByDeviceBar.vue
new file mode 100644
index 0000000..dc211e3
--- /dev/null
+++ b/src/views/gasDashboard/components/gasCountByDeviceBar.vue
@@ -0,0 +1,130 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasNote.vue b/src/views/gasDashboard/components/gasNote.vue
new file mode 100644
index 0000000..5ade90f
--- /dev/null
+++ b/src/views/gasDashboard/components/gasNote.vue
@@ -0,0 +1,149 @@
+
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/watchAlarmBar.vue b/src/views/gasDashboard/components/watchAlarmBar.vue
new file mode 100644
index 0000000..4279440
--- /dev/null
+++ b/src/views/gasDashboard/components/watchAlarmBar.vue
@@ -0,0 +1,180 @@
+
+
+
+ 场区用气事记
+
+
+
+
+
+
+
+
+
+ {{ index+1 }}. {{ item.content }}
+
+
+ {{ index+1 }}.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/watchGasAlarmBar.vue b/src/views/gasDashboard/components/watchGasAlarmBar.vue
new file mode 100644
index 0000000..0113341
--- /dev/null
+++ b/src/views/gasDashboard/components/watchGasAlarmBar.vue
@@ -0,0 +1,132 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/index.vue b/src/views/gasDashboard/index.vue
new file mode 100644
index 0000000..be583f2
--- /dev/null
+++ b/src/views/gasDashboard/index.vue
@@ -0,0 +1,191 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/gasOverview/gasOverviewSimple.vue b/src/views/gasOverview/gasOverviewSimple.vue
new file mode 100644
index 0000000..8ff468f
--- /dev/null
+++ b/src/views/gasOverview/gasOverviewSimple.vue
@@ -0,0 +1,1189 @@
+
+
+
+
+
+
+
+
+
diff --git a/src/views/jobManage/detailJob.vue b/src/views/jobManage/detailJob.vue
index 2d6aaa4..fe7e68e 100644
--- a/src/views/jobManage/detailJob.vue
+++ b/src/views/jobManage/detailJob.vue
@@ -205,8 +205,9 @@
// 获取工单详情
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 => {
+ console.log(response, ' ============response=')
this.loading = false
if (response.code === 200) {
if (response.data.length <= 0) {
@@ -217,26 +218,28 @@
// 处理现场图片
if (job.firstStatePhotos !== '') {
this.firstImageList = []
- const urls = job.firstStatePhotos.split(';')
+ const urls = job.firstStatePhotos.split(',')
for (const url of urls) {
if (url) {
// this.firstImageList.push({ name: url, url: base_url + url })
this.firstImageList.push(base_url + url)
}
}
+ console.log(this.firstImageList)
} else {
this.firstImageList = []
}
// 处理维护图片
if (job.handlePhotos.length !== '') {
this.handleImageList = []
- const urls = job.handlePhotos.split(';')
+ const urls = job.handlePhotos.split(',')
for (const url of urls) {
if (url) {
// this.handleImageList.push({ name: url, url: base_url + url })
this.handleImageList.push(base_url + url)
}
}
+ console.log(this.handleImageList)
} else {
this.handleImageList = []
}
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 @@
diff --git a/src/views/dataManage/deviceData/listCorrodeData.vue b/src/views/dataManage/deviceData/listCorrodeData.vue
new file mode 100644
index 0000000..1a20abb
--- /dev/null
+++ b/src/views/dataManage/deviceData/listCorrodeData.vue
@@ -0,0 +1,272 @@
+
+
-
-
@@ -28,7 +29,7 @@
- 导出记录
+ 导出记录
@@ -63,6 +64,7 @@
import { getGasData, batchExportGasData } from '@/api/data'
import DeptSelect from '../../../components/DeptSelect/index'
import { parseUrl } from '@/utils/parseutils'
+import { getSearchLastWeekTime } from '@/utils/dateutils'
export default {
name: 'ListGasData',
@@ -163,6 +165,7 @@
if (params && params.deviceType === '4' && params.devcode) {
this.listQuery.keywords = params.devcode
}
+ this.timeRange = getSearchLastWeekTime()
this.fetchData()
}
},
@@ -191,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/listGasflowData.vue b/src/views/dataManage/deviceData/listGasflowData.vue
new file mode 100644
index 0000000..9c5321a
--- /dev/null
+++ b/src/views/dataManage/deviceData/listGasflowData.vue
@@ -0,0 +1,311 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/alarmGasCountByType.vue b/src/views/gasDashboard/components/alarmGasCountByType.vue
new file mode 100644
index 0000000..4f80d3a
--- /dev/null
+++ b/src/views/gasDashboard/components/alarmGasCountByType.vue
@@ -0,0 +1,72 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue
index 97cdfdb..40b9a5e 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -5,10 +5,10 @@
+
+
+
+
+
+
+ 搜索
+
+
+
+
+
+
+
+ 导出记录
+
+
+
+
+
+
+ {{ scope.row[column.value] }}
+ {{ scope.row[column.value] }}
+
+
+
+
+
+ 数据列表
+
+ 数据列表
+
+
+
+
+
+
+
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 bf03fd1..dffd340 100644
--- a/src/views/dataManage/deviceData/listWaterData.vue
+++ b/src/views/dataManage/deviceData/listWaterData.vue
@@ -176,6 +176,12 @@
align: 'center'
},
{
+ text: '压力(Mpa)',
+ value: 'pressure',
+ width: 90,
+ align: 'center'
+ },
+ {
text: '今日用水量（立方米）',
value: 'dayCount',
align: 'center',
@@ -276,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) // 下载完成移除元素
@@ -311,9 +317,11 @@
}
getWatchData(this.listQuery).then((response) => {
this.list = response.data.rows.map(function(item) {
- item.areaFullName = item.areaFullName
- .replace('/', '')
- .replace('顶层', '')
+ item.totalCount = parseFloat(item.totalCount).toFixed(2)
+ item.dayCount = parseFloat(item.dayCount).toFixed(2)
+ item.monthCount = parseFloat(item.monthCount).toFixed(2)
+ item.pressure = parseFloat(item.pressure).toFixed(2)
+ item.areaFullName = item.areaFullName.replace('/', '').replace('顶层', '')
return item
})
this.total = parseInt(response.data.total)
diff --git a/src/views/dataManage/deviceData/waterHistory.vue b/src/views/dataManage/deviceData/waterHistory.vue
index 160dab7..42e3303 100644
--- a/src/views/dataManage/deviceData/waterHistory.vue
+++ b/src/views/dataManage/deviceData/waterHistory.vue
@@ -1,5 +1,5 @@
-
+
+
+
+
+
+
+ 搜索
+
+
+
+
+
+
+
+ 导出记录
+
+
+
+
+
+
+ {{
+ scope.row[column.value]
+ }}
+ {{
+ scope.row["areaFullName"] + '/' + scope.row[column.value]
+ }}
+ {{ scope.row[column.value] }}
+
+
+
+
+
+ 历史数据
+
+
+
+
+
+
+ 数据列表
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/AlarmNowList.vue b/src/views/gasDashboard/components/AlarmNowList.vue
new file mode 100644
index 0000000..890325f
--- /dev/null
+++ b/src/views/gasDashboard/components/AlarmNowList.vue
@@ -0,0 +1,35 @@
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/DeviceCount.vue b/src/views/gasDashboard/components/DeviceCount.vue
new file mode 100644
index 0000000..bffc9e9
--- /dev/null
+++ b/src/views/gasDashboard/components/DeviceCount.vue
@@ -0,0 +1,68 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/FunctionArea.vue b/src/views/gasDashboard/components/FunctionArea.vue
new file mode 100644
index 0000000..6401557
--- /dev/null
+++ b/src/views/gasDashboard/components/FunctionArea.vue
@@ -0,0 +1,140 @@
+
+
+
+ 本年度
+ 本季度
+ 近30日
+ 近7日
+ 今日
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/FunctionArea2.vue b/src/views/gasDashboard/components/FunctionArea2.vue
new file mode 100644
index 0000000..26a9f82
--- /dev/null
+++ b/src/views/gasDashboard/components/FunctionArea2.vue
@@ -0,0 +1,107 @@
+
+
+
+ 本年度
+ 本季度
+ 近30日
+ 近7日
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/PanelGroup.vue b/src/views/gasDashboard/components/PanelGroup.vue
new file mode 100644
index 0000000..103486e
--- /dev/null
+++ b/src/views/gasDashboard/components/PanelGroup.vue
@@ -0,0 +1,137 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/alarmLeakCountPie.vue b/src/views/gasDashboard/components/alarmLeakCountPie.vue
new file mode 100644
index 0000000..abfbc2d
--- /dev/null
+++ b/src/views/gasDashboard/components/alarmLeakCountPie.vue
@@ -0,0 +1,74 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/corrodeCountByDay.vue b/src/views/gasDashboard/components/corrodeCountByDay.vue
new file mode 100644
index 0000000..a410f29
--- /dev/null
+++ b/src/views/gasDashboard/components/corrodeCountByDay.vue
@@ -0,0 +1,100 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasAlarmTrend.vue b/src/views/gasDashboard/components/gasAlarmTrend.vue
new file mode 100644
index 0000000..a1d422e
--- /dev/null
+++ b/src/views/gasDashboard/components/gasAlarmTrend.vue
@@ -0,0 +1,100 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasCompare.vue b/src/views/gasDashboard/components/gasCompare.vue
new file mode 100644
index 0000000..19a4398
--- /dev/null
+++ b/src/views/gasDashboard/components/gasCompare.vue
@@ -0,0 +1,121 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasCountByAreaBar.vue b/src/views/gasDashboard/components/gasCountByAreaBar.vue
new file mode 100644
index 0000000..456a6c6
--- /dev/null
+++ b/src/views/gasDashboard/components/gasCountByAreaBar.vue
@@ -0,0 +1,198 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasCountByDay.vue b/src/views/gasDashboard/components/gasCountByDay.vue
new file mode 100644
index 0000000..f0a3977
--- /dev/null
+++ b/src/views/gasDashboard/components/gasCountByDay.vue
@@ -0,0 +1,114 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasCountByDept.vue b/src/views/gasDashboard/components/gasCountByDept.vue
new file mode 100644
index 0000000..31c8508
--- /dev/null
+++ b/src/views/gasDashboard/components/gasCountByDept.vue
@@ -0,0 +1,126 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasCountByDeviceBar.vue b/src/views/gasDashboard/components/gasCountByDeviceBar.vue
new file mode 100644
index 0000000..dc211e3
--- /dev/null
+++ b/src/views/gasDashboard/components/gasCountByDeviceBar.vue
@@ -0,0 +1,130 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasNote.vue b/src/views/gasDashboard/components/gasNote.vue
new file mode 100644
index 0000000..5ade90f
--- /dev/null
+++ b/src/views/gasDashboard/components/gasNote.vue
@@ -0,0 +1,149 @@
+
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/watchAlarmBar.vue b/src/views/gasDashboard/components/watchAlarmBar.vue
new file mode 100644
index 0000000..4279440
--- /dev/null
+++ b/src/views/gasDashboard/components/watchAlarmBar.vue
@@ -0,0 +1,180 @@
+
+
+
+ 场区用气事记
+
+
+
+
+
+
+
+
+
+ {{ index+1 }}. {{ item.content }}
+
+
+ {{ index+1 }}.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/watchGasAlarmBar.vue b/src/views/gasDashboard/components/watchGasAlarmBar.vue
new file mode 100644
index 0000000..0113341
--- /dev/null
+++ b/src/views/gasDashboard/components/watchGasAlarmBar.vue
@@ -0,0 +1,132 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/index.vue b/src/views/gasDashboard/index.vue
new file mode 100644
index 0000000..be583f2
--- /dev/null
+++ b/src/views/gasDashboard/index.vue
@@ -0,0 +1,191 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/gasOverview/gasOverviewSimple.vue b/src/views/gasOverview/gasOverviewSimple.vue
new file mode 100644
index 0000000..8ff468f
--- /dev/null
+++ b/src/views/gasOverview/gasOverviewSimple.vue
@@ -0,0 +1,1189 @@
+
+
+
+
+
+
+
+
+
diff --git a/src/views/jobManage/detailJob.vue b/src/views/jobManage/detailJob.vue
index 2d6aaa4..fe7e68e 100644
--- a/src/views/jobManage/detailJob.vue
+++ b/src/views/jobManage/detailJob.vue
@@ -205,8 +205,9 @@
// 获取工单详情
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 => {
+ console.log(response, ' ============response=')
this.loading = false
if (response.code === 200) {
if (response.data.length <= 0) {
@@ -217,26 +218,28 @@
// 处理现场图片
if (job.firstStatePhotos !== '') {
this.firstImageList = []
- const urls = job.firstStatePhotos.split(';')
+ const urls = job.firstStatePhotos.split(',')
for (const url of urls) {
if (url) {
// this.firstImageList.push({ name: url, url: base_url + url })
this.firstImageList.push(base_url + url)
}
}
+ console.log(this.firstImageList)
} else {
this.firstImageList = []
}
// 处理维护图片
if (job.handlePhotos.length !== '') {
this.handleImageList = []
- const urls = job.handlePhotos.split(';')
+ const urls = job.handlePhotos.split(',')
for (const url of urls) {
if (url) {
// this.handleImageList.push({ name: url, url: base_url + url })
this.handleImageList.push(base_url + url)
}
}
+ console.log(this.handleImageList)
} else {
this.handleImageList = []
}
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 @@
diff --git a/src/views/dataManage/deviceData/listCorrodeData.vue b/src/views/dataManage/deviceData/listCorrodeData.vue
new file mode 100644
index 0000000..1a20abb
--- /dev/null
+++ b/src/views/dataManage/deviceData/listCorrodeData.vue
@@ -0,0 +1,272 @@
+
+
-
-
@@ -28,7 +29,7 @@
- 导出记录
+ 导出记录
@@ -63,6 +64,7 @@
import { getGasData, batchExportGasData } from '@/api/data'
import DeptSelect from '../../../components/DeptSelect/index'
import { parseUrl } from '@/utils/parseutils'
+import { getSearchLastWeekTime } from '@/utils/dateutils'
export default {
name: 'ListGasData',
@@ -163,6 +165,7 @@
if (params && params.deviceType === '4' && params.devcode) {
this.listQuery.keywords = params.devcode
}
+ this.timeRange = getSearchLastWeekTime()
this.fetchData()
}
},
@@ -191,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/listGasflowData.vue b/src/views/dataManage/deviceData/listGasflowData.vue
new file mode 100644
index 0000000..9c5321a
--- /dev/null
+++ b/src/views/dataManage/deviceData/listGasflowData.vue
@@ -0,0 +1,311 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/alarmGasCountByType.vue b/src/views/gasDashboard/components/alarmGasCountByType.vue
new file mode 100644
index 0000000..4f80d3a
--- /dev/null
+++ b/src/views/gasDashboard/components/alarmGasCountByType.vue
@@ -0,0 +1,72 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue
index 97cdfdb..40b9a5e 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -5,10 +5,10 @@
+
+
+
+
+
+
+ 搜索
+
+
+
+
+
+
+
+ 导出记录
+
+
+
+
+
+
+ {{ scope.row[column.value] }}
+ {{ scope.row[column.value] }}
+
+
+
+
+
+ 数据列表
+
+ 数据列表
+
+
+
+
+
+
+
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 bf03fd1..dffd340 100644
--- a/src/views/dataManage/deviceData/listWaterData.vue
+++ b/src/views/dataManage/deviceData/listWaterData.vue
@@ -176,6 +176,12 @@
align: 'center'
},
{
+ text: '压力(Mpa)',
+ value: 'pressure',
+ width: 90,
+ align: 'center'
+ },
+ {
text: '今日用水量（立方米）',
value: 'dayCount',
align: 'center',
@@ -276,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) // 下载完成移除元素
@@ -311,9 +317,11 @@
}
getWatchData(this.listQuery).then((response) => {
this.list = response.data.rows.map(function(item) {
- item.areaFullName = item.areaFullName
- .replace('/', '')
- .replace('顶层', '')
+ item.totalCount = parseFloat(item.totalCount).toFixed(2)
+ item.dayCount = parseFloat(item.dayCount).toFixed(2)
+ item.monthCount = parseFloat(item.monthCount).toFixed(2)
+ item.pressure = parseFloat(item.pressure).toFixed(2)
+ item.areaFullName = item.areaFullName.replace('/', '').replace('顶层', '')
return item
})
this.total = parseInt(response.data.total)
diff --git a/src/views/dataManage/deviceData/waterHistory.vue b/src/views/dataManage/deviceData/waterHistory.vue
index 160dab7..42e3303 100644
--- a/src/views/dataManage/deviceData/waterHistory.vue
+++ b/src/views/dataManage/deviceData/waterHistory.vue
@@ -1,5 +1,5 @@
-
+
+
+
+
+
+
+ 搜索
+
+
+
+
+
+
+
+ 导出记录
+
+
+
+
+
+
+ {{
+ scope.row[column.value]
+ }}
+ {{
+ scope.row["areaFullName"] + '/' + scope.row[column.value]
+ }}
+ {{ scope.row[column.value] }}
+
+
+
+
+
+ 历史数据
+
+
+
+
+
+
+ 数据列表
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/AlarmNowList.vue b/src/views/gasDashboard/components/AlarmNowList.vue
new file mode 100644
index 0000000..890325f
--- /dev/null
+++ b/src/views/gasDashboard/components/AlarmNowList.vue
@@ -0,0 +1,35 @@
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/DeviceCount.vue b/src/views/gasDashboard/components/DeviceCount.vue
new file mode 100644
index 0000000..bffc9e9
--- /dev/null
+++ b/src/views/gasDashboard/components/DeviceCount.vue
@@ -0,0 +1,68 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/FunctionArea.vue b/src/views/gasDashboard/components/FunctionArea.vue
new file mode 100644
index 0000000..6401557
--- /dev/null
+++ b/src/views/gasDashboard/components/FunctionArea.vue
@@ -0,0 +1,140 @@
+
+
+
+ 本年度
+ 本季度
+ 近30日
+ 近7日
+ 今日
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/FunctionArea2.vue b/src/views/gasDashboard/components/FunctionArea2.vue
new file mode 100644
index 0000000..26a9f82
--- /dev/null
+++ b/src/views/gasDashboard/components/FunctionArea2.vue
@@ -0,0 +1,107 @@
+
+
+
+ 本年度
+ 本季度
+ 近30日
+ 近7日
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/PanelGroup.vue b/src/views/gasDashboard/components/PanelGroup.vue
new file mode 100644
index 0000000..103486e
--- /dev/null
+++ b/src/views/gasDashboard/components/PanelGroup.vue
@@ -0,0 +1,137 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/alarmLeakCountPie.vue b/src/views/gasDashboard/components/alarmLeakCountPie.vue
new file mode 100644
index 0000000..abfbc2d
--- /dev/null
+++ b/src/views/gasDashboard/components/alarmLeakCountPie.vue
@@ -0,0 +1,74 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/corrodeCountByDay.vue b/src/views/gasDashboard/components/corrodeCountByDay.vue
new file mode 100644
index 0000000..a410f29
--- /dev/null
+++ b/src/views/gasDashboard/components/corrodeCountByDay.vue
@@ -0,0 +1,100 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasAlarmTrend.vue b/src/views/gasDashboard/components/gasAlarmTrend.vue
new file mode 100644
index 0000000..a1d422e
--- /dev/null
+++ b/src/views/gasDashboard/components/gasAlarmTrend.vue
@@ -0,0 +1,100 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasCompare.vue b/src/views/gasDashboard/components/gasCompare.vue
new file mode 100644
index 0000000..19a4398
--- /dev/null
+++ b/src/views/gasDashboard/components/gasCompare.vue
@@ -0,0 +1,121 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasCountByAreaBar.vue b/src/views/gasDashboard/components/gasCountByAreaBar.vue
new file mode 100644
index 0000000..456a6c6
--- /dev/null
+++ b/src/views/gasDashboard/components/gasCountByAreaBar.vue
@@ -0,0 +1,198 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasCountByDay.vue b/src/views/gasDashboard/components/gasCountByDay.vue
new file mode 100644
index 0000000..f0a3977
--- /dev/null
+++ b/src/views/gasDashboard/components/gasCountByDay.vue
@@ -0,0 +1,114 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasCountByDept.vue b/src/views/gasDashboard/components/gasCountByDept.vue
new file mode 100644
index 0000000..31c8508
--- /dev/null
+++ b/src/views/gasDashboard/components/gasCountByDept.vue
@@ -0,0 +1,126 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasCountByDeviceBar.vue b/src/views/gasDashboard/components/gasCountByDeviceBar.vue
new file mode 100644
index 0000000..dc211e3
--- /dev/null
+++ b/src/views/gasDashboard/components/gasCountByDeviceBar.vue
@@ -0,0 +1,130 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasNote.vue b/src/views/gasDashboard/components/gasNote.vue
new file mode 100644
index 0000000..5ade90f
--- /dev/null
+++ b/src/views/gasDashboard/components/gasNote.vue
@@ -0,0 +1,149 @@
+
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/watchAlarmBar.vue b/src/views/gasDashboard/components/watchAlarmBar.vue
new file mode 100644
index 0000000..4279440
--- /dev/null
+++ b/src/views/gasDashboard/components/watchAlarmBar.vue
@@ -0,0 +1,180 @@
+
+
+
+ 场区用气事记
+
+
+
+
+
+
+
+
+
+ {{ index+1 }}. {{ item.content }}
+
+
+ {{ index+1 }}.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/watchGasAlarmBar.vue b/src/views/gasDashboard/components/watchGasAlarmBar.vue
new file mode 100644
index 0000000..0113341
--- /dev/null
+++ b/src/views/gasDashboard/components/watchGasAlarmBar.vue
@@ -0,0 +1,132 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/index.vue b/src/views/gasDashboard/index.vue
new file mode 100644
index 0000000..be583f2
--- /dev/null
+++ b/src/views/gasDashboard/index.vue
@@ -0,0 +1,191 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/gasOverview/gasOverviewSimple.vue b/src/views/gasOverview/gasOverviewSimple.vue
new file mode 100644
index 0000000..8ff468f
--- /dev/null
+++ b/src/views/gasOverview/gasOverviewSimple.vue
@@ -0,0 +1,1189 @@
+
+
+
+
+
+
+
+
+
diff --git a/src/views/jobManage/detailJob.vue b/src/views/jobManage/detailJob.vue
index 2d6aaa4..fe7e68e 100644
--- a/src/views/jobManage/detailJob.vue
+++ b/src/views/jobManage/detailJob.vue
@@ -205,8 +205,9 @@
// 获取工单详情
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 => {
+ console.log(response, ' ============response=')
this.loading = false
if (response.code === 200) {
if (response.data.length <= 0) {
@@ -217,26 +218,28 @@
// 处理现场图片
if (job.firstStatePhotos !== '') {
this.firstImageList = []
- const urls = job.firstStatePhotos.split(';')
+ const urls = job.firstStatePhotos.split(',')
for (const url of urls) {
if (url) {
// this.firstImageList.push({ name: url, url: base_url + url })
this.firstImageList.push(base_url + url)
}
}
+ console.log(this.firstImageList)
} else {
this.firstImageList = []
}
// 处理维护图片
if (job.handlePhotos.length !== '') {
this.handleImageList = []
- const urls = job.handlePhotos.split(';')
+ const urls = job.handlePhotos.split(',')
for (const url of urls) {
if (url) {
// this.handleImageList.push({ name: url, url: base_url + url })
this.handleImageList.push(base_url + url)
}
}
+ console.log(this.handleImageList)
} else {
this.handleImageList = []
}
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 @@
diff --git a/src/views/dataManage/deviceData/listCorrodeData.vue b/src/views/dataManage/deviceData/listCorrodeData.vue
new file mode 100644
index 0000000..1a20abb
--- /dev/null
+++ b/src/views/dataManage/deviceData/listCorrodeData.vue
@@ -0,0 +1,272 @@
+
+
-
-
@@ -28,7 +29,7 @@
- 导出记录
+ 导出记录
@@ -63,6 +64,7 @@
import { getGasData, batchExportGasData } from '@/api/data'
import DeptSelect from '../../../components/DeptSelect/index'
import { parseUrl } from '@/utils/parseutils'
+import { getSearchLastWeekTime } from '@/utils/dateutils'
export default {
name: 'ListGasData',
@@ -163,6 +165,7 @@
if (params && params.deviceType === '4' && params.devcode) {
this.listQuery.keywords = params.devcode
}
+ this.timeRange = getSearchLastWeekTime()
this.fetchData()
}
},
@@ -191,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/listGasflowData.vue b/src/views/dataManage/deviceData/listGasflowData.vue
new file mode 100644
index 0000000..9c5321a
--- /dev/null
+++ b/src/views/dataManage/deviceData/listGasflowData.vue
@@ -0,0 +1,311 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/alarmGasCountByType.vue b/src/views/gasDashboard/components/alarmGasCountByType.vue
new file mode 100644
index 0000000..4f80d3a
--- /dev/null
+++ b/src/views/gasDashboard/components/alarmGasCountByType.vue
@@ -0,0 +1,72 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue
index 97cdfdb..40b9a5e 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -5,10 +5,10 @@
+
+
+
+
+
+
+ 搜索
+
+
+
+
+
+
+
+ 导出记录
+
+
+
+
+
+
+ {{ scope.row[column.value] }}
+ {{ scope.row[column.value] }}
+
+
+
+
+
+ 数据列表
+
+ 数据列表
+
+
+
+
+
+
+
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 bf03fd1..dffd340 100644
--- a/src/views/dataManage/deviceData/listWaterData.vue
+++ b/src/views/dataManage/deviceData/listWaterData.vue
@@ -176,6 +176,12 @@
align: 'center'
},
{
+ text: '压力(Mpa)',
+ value: 'pressure',
+ width: 90,
+ align: 'center'
+ },
+ {
text: '今日用水量（立方米）',
value: 'dayCount',
align: 'center',
@@ -276,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) // 下载完成移除元素
@@ -311,9 +317,11 @@
}
getWatchData(this.listQuery).then((response) => {
this.list = response.data.rows.map(function(item) {
- item.areaFullName = item.areaFullName
- .replace('/', '')
- .replace('顶层', '')
+ item.totalCount = parseFloat(item.totalCount).toFixed(2)
+ item.dayCount = parseFloat(item.dayCount).toFixed(2)
+ item.monthCount = parseFloat(item.monthCount).toFixed(2)
+ item.pressure = parseFloat(item.pressure).toFixed(2)
+ item.areaFullName = item.areaFullName.replace('/', '').replace('顶层', '')
return item
})
this.total = parseInt(response.data.total)
diff --git a/src/views/dataManage/deviceData/waterHistory.vue b/src/views/dataManage/deviceData/waterHistory.vue
index 160dab7..42e3303 100644
--- a/src/views/dataManage/deviceData/waterHistory.vue
+++ b/src/views/dataManage/deviceData/waterHistory.vue
@@ -1,5 +1,5 @@
-
+
+
+
+
+
+
+ 搜索
+
+
+
+
+
+
+
+ 导出记录
+
+
+
+
+
+
+ {{
+ scope.row[column.value]
+ }}
+ {{
+ scope.row["areaFullName"] + '/' + scope.row[column.value]
+ }}
+ {{ scope.row[column.value] }}
+
+
+
+
+
+ 历史数据
+
+
+
+
+
+
+ 数据列表
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/AlarmNowList.vue b/src/views/gasDashboard/components/AlarmNowList.vue
new file mode 100644
index 0000000..890325f
--- /dev/null
+++ b/src/views/gasDashboard/components/AlarmNowList.vue
@@ -0,0 +1,35 @@
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/DeviceCount.vue b/src/views/gasDashboard/components/DeviceCount.vue
new file mode 100644
index 0000000..bffc9e9
--- /dev/null
+++ b/src/views/gasDashboard/components/DeviceCount.vue
@@ -0,0 +1,68 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/FunctionArea.vue b/src/views/gasDashboard/components/FunctionArea.vue
new file mode 100644
index 0000000..6401557
--- /dev/null
+++ b/src/views/gasDashboard/components/FunctionArea.vue
@@ -0,0 +1,140 @@
+
+
+
+ 本年度
+ 本季度
+ 近30日
+ 近7日
+ 今日
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/FunctionArea2.vue b/src/views/gasDashboard/components/FunctionArea2.vue
new file mode 100644
index 0000000..26a9f82
--- /dev/null
+++ b/src/views/gasDashboard/components/FunctionArea2.vue
@@ -0,0 +1,107 @@
+
+
+
+ 本年度
+ 本季度
+ 近30日
+ 近7日
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/PanelGroup.vue b/src/views/gasDashboard/components/PanelGroup.vue
new file mode 100644
index 0000000..103486e
--- /dev/null
+++ b/src/views/gasDashboard/components/PanelGroup.vue
@@ -0,0 +1,137 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/alarmLeakCountPie.vue b/src/views/gasDashboard/components/alarmLeakCountPie.vue
new file mode 100644
index 0000000..abfbc2d
--- /dev/null
+++ b/src/views/gasDashboard/components/alarmLeakCountPie.vue
@@ -0,0 +1,74 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/corrodeCountByDay.vue b/src/views/gasDashboard/components/corrodeCountByDay.vue
new file mode 100644
index 0000000..a410f29
--- /dev/null
+++ b/src/views/gasDashboard/components/corrodeCountByDay.vue
@@ -0,0 +1,100 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasAlarmTrend.vue b/src/views/gasDashboard/components/gasAlarmTrend.vue
new file mode 100644
index 0000000..a1d422e
--- /dev/null
+++ b/src/views/gasDashboard/components/gasAlarmTrend.vue
@@ -0,0 +1,100 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasCompare.vue b/src/views/gasDashboard/components/gasCompare.vue
new file mode 100644
index 0000000..19a4398
--- /dev/null
+++ b/src/views/gasDashboard/components/gasCompare.vue
@@ -0,0 +1,121 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasCountByAreaBar.vue b/src/views/gasDashboard/components/gasCountByAreaBar.vue
new file mode 100644
index 0000000..456a6c6
--- /dev/null
+++ b/src/views/gasDashboard/components/gasCountByAreaBar.vue
@@ -0,0 +1,198 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasCountByDay.vue b/src/views/gasDashboard/components/gasCountByDay.vue
new file mode 100644
index 0000000..f0a3977
--- /dev/null
+++ b/src/views/gasDashboard/components/gasCountByDay.vue
@@ -0,0 +1,114 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasCountByDept.vue b/src/views/gasDashboard/components/gasCountByDept.vue
new file mode 100644
index 0000000..31c8508
--- /dev/null
+++ b/src/views/gasDashboard/components/gasCountByDept.vue
@@ -0,0 +1,126 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasCountByDeviceBar.vue b/src/views/gasDashboard/components/gasCountByDeviceBar.vue
new file mode 100644
index 0000000..dc211e3
--- /dev/null
+++ b/src/views/gasDashboard/components/gasCountByDeviceBar.vue
@@ -0,0 +1,130 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasNote.vue b/src/views/gasDashboard/components/gasNote.vue
new file mode 100644
index 0000000..5ade90f
--- /dev/null
+++ b/src/views/gasDashboard/components/gasNote.vue
@@ -0,0 +1,149 @@
+
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/watchAlarmBar.vue b/src/views/gasDashboard/components/watchAlarmBar.vue
new file mode 100644
index 0000000..4279440
--- /dev/null
+++ b/src/views/gasDashboard/components/watchAlarmBar.vue
@@ -0,0 +1,180 @@
+
+
+
+ 场区用气事记
+
+
+
+
+
+
+
+
+
+ {{ index+1 }}. {{ item.content }}
+
+
+ {{ index+1 }}.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/watchGasAlarmBar.vue b/src/views/gasDashboard/components/watchGasAlarmBar.vue
new file mode 100644
index 0000000..0113341
--- /dev/null
+++ b/src/views/gasDashboard/components/watchGasAlarmBar.vue
@@ -0,0 +1,132 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/index.vue b/src/views/gasDashboard/index.vue
new file mode 100644
index 0000000..be583f2
--- /dev/null
+++ b/src/views/gasDashboard/index.vue
@@ -0,0 +1,191 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/gasOverview/gasOverviewSimple.vue b/src/views/gasOverview/gasOverviewSimple.vue
new file mode 100644
index 0000000..8ff468f
--- /dev/null
+++ b/src/views/gasOverview/gasOverviewSimple.vue
@@ -0,0 +1,1189 @@
+
+
+
+
+
+
+
+
+
diff --git a/src/views/jobManage/detailJob.vue b/src/views/jobManage/detailJob.vue
index 2d6aaa4..fe7e68e 100644
--- a/src/views/jobManage/detailJob.vue
+++ b/src/views/jobManage/detailJob.vue
@@ -205,8 +205,9 @@
// 获取工单详情
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 => {
+ console.log(response, ' ============response=')
this.loading = false
if (response.code === 200) {
if (response.data.length <= 0) {
@@ -217,26 +218,28 @@
// 处理现场图片
if (job.firstStatePhotos !== '') {
this.firstImageList = []
- const urls = job.firstStatePhotos.split(';')
+ const urls = job.firstStatePhotos.split(',')
for (const url of urls) {
if (url) {
// this.firstImageList.push({ name: url, url: base_url + url })
this.firstImageList.push(base_url + url)
}
}
+ console.log(this.firstImageList)
} else {
this.firstImageList = []
}
// 处理维护图片
if (job.handlePhotos.length !== '') {
this.handleImageList = []
- const urls = job.handlePhotos.split(';')
+ const urls = job.handlePhotos.split(',')
for (const url of urls) {
if (url) {
// this.handleImageList.push({ name: url, url: base_url + url })
this.handleImageList.push(base_url + url)
}
}
+ console.log(this.handleImageList)
} else {
this.handleImageList = []
}
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 @@
diff --git a/src/views/dataManage/deviceData/listCorrodeData.vue b/src/views/dataManage/deviceData/listCorrodeData.vue
new file mode 100644
index 0000000..1a20abb
--- /dev/null
+++ b/src/views/dataManage/deviceData/listCorrodeData.vue
@@ -0,0 +1,272 @@
+
+
-
-
@@ -28,7 +29,7 @@
- 导出记录
+ 导出记录
@@ -63,6 +64,7 @@
import { getGasData, batchExportGasData } from '@/api/data'
import DeptSelect from '../../../components/DeptSelect/index'
import { parseUrl } from '@/utils/parseutils'
+import { getSearchLastWeekTime } from '@/utils/dateutils'
export default {
name: 'ListGasData',
@@ -163,6 +165,7 @@
if (params && params.deviceType === '4' && params.devcode) {
this.listQuery.keywords = params.devcode
}
+ this.timeRange = getSearchLastWeekTime()
this.fetchData()
}
},
@@ -191,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/listGasflowData.vue b/src/views/dataManage/deviceData/listGasflowData.vue
new file mode 100644
index 0000000..9c5321a
--- /dev/null
+++ b/src/views/dataManage/deviceData/listGasflowData.vue
@@ -0,0 +1,311 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/alarmGasCountByType.vue b/src/views/gasDashboard/components/alarmGasCountByType.vue
new file mode 100644
index 0000000..4f80d3a
--- /dev/null
+++ b/src/views/gasDashboard/components/alarmGasCountByType.vue
@@ -0,0 +1,72 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue
index 97cdfdb..40b9a5e 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -5,10 +5,10 @@
+
+
+
+
+
+
+ 搜索
+
+
+
+
+
+
+
+ 导出记录
+
+
+
+
+
+
+ {{ scope.row[column.value] }}
+ {{ scope.row[column.value] }}
+
+
+
+
+
+ 数据列表
+
+ 数据列表
+
+
+
+
+
+
+
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 bf03fd1..dffd340 100644
--- a/src/views/dataManage/deviceData/listWaterData.vue
+++ b/src/views/dataManage/deviceData/listWaterData.vue
@@ -176,6 +176,12 @@
align: 'center'
},
{
+ text: '压力(Mpa)',
+ value: 'pressure',
+ width: 90,
+ align: 'center'
+ },
+ {
text: '今日用水量（立方米）',
value: 'dayCount',
align: 'center',
@@ -276,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) // 下载完成移除元素
@@ -311,9 +317,11 @@
}
getWatchData(this.listQuery).then((response) => {
this.list = response.data.rows.map(function(item) {
- item.areaFullName = item.areaFullName
- .replace('/', '')
- .replace('顶层', '')
+ item.totalCount = parseFloat(item.totalCount).toFixed(2)
+ item.dayCount = parseFloat(item.dayCount).toFixed(2)
+ item.monthCount = parseFloat(item.monthCount).toFixed(2)
+ item.pressure = parseFloat(item.pressure).toFixed(2)
+ item.areaFullName = item.areaFullName.replace('/', '').replace('顶层', '')
return item
})
this.total = parseInt(response.data.total)
diff --git a/src/views/dataManage/deviceData/waterHistory.vue b/src/views/dataManage/deviceData/waterHistory.vue
index 160dab7..42e3303 100644
--- a/src/views/dataManage/deviceData/waterHistory.vue
+++ b/src/views/dataManage/deviceData/waterHistory.vue
@@ -1,5 +1,5 @@
-
+
+
+
+
+
+
+ 搜索
+
+
+
+
+
+
+
+ 导出记录
+
+
+
+
+
+
+ {{
+ scope.row[column.value]
+ }}
+ {{
+ scope.row["areaFullName"] + '/' + scope.row[column.value]
+ }}
+ {{ scope.row[column.value] }}
+
+
+
+
+
+ 历史数据
+
+
+
+
+
+
+ 数据列表
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/AlarmNowList.vue b/src/views/gasDashboard/components/AlarmNowList.vue
new file mode 100644
index 0000000..890325f
--- /dev/null
+++ b/src/views/gasDashboard/components/AlarmNowList.vue
@@ -0,0 +1,35 @@
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/DeviceCount.vue b/src/views/gasDashboard/components/DeviceCount.vue
new file mode 100644
index 0000000..bffc9e9
--- /dev/null
+++ b/src/views/gasDashboard/components/DeviceCount.vue
@@ -0,0 +1,68 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/FunctionArea.vue b/src/views/gasDashboard/components/FunctionArea.vue
new file mode 100644
index 0000000..6401557
--- /dev/null
+++ b/src/views/gasDashboard/components/FunctionArea.vue
@@ -0,0 +1,140 @@
+
+
+
+ 本年度
+ 本季度
+ 近30日
+ 近7日
+ 今日
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/FunctionArea2.vue b/src/views/gasDashboard/components/FunctionArea2.vue
new file mode 100644
index 0000000..26a9f82
--- /dev/null
+++ b/src/views/gasDashboard/components/FunctionArea2.vue
@@ -0,0 +1,107 @@
+
+
+
+ 本年度
+ 本季度
+ 近30日
+ 近7日
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/PanelGroup.vue b/src/views/gasDashboard/components/PanelGroup.vue
new file mode 100644
index 0000000..103486e
--- /dev/null
+++ b/src/views/gasDashboard/components/PanelGroup.vue
@@ -0,0 +1,137 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/alarmLeakCountPie.vue b/src/views/gasDashboard/components/alarmLeakCountPie.vue
new file mode 100644
index 0000000..abfbc2d
--- /dev/null
+++ b/src/views/gasDashboard/components/alarmLeakCountPie.vue
@@ -0,0 +1,74 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/corrodeCountByDay.vue b/src/views/gasDashboard/components/corrodeCountByDay.vue
new file mode 100644
index 0000000..a410f29
--- /dev/null
+++ b/src/views/gasDashboard/components/corrodeCountByDay.vue
@@ -0,0 +1,100 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasAlarmTrend.vue b/src/views/gasDashboard/components/gasAlarmTrend.vue
new file mode 100644
index 0000000..a1d422e
--- /dev/null
+++ b/src/views/gasDashboard/components/gasAlarmTrend.vue
@@ -0,0 +1,100 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasCompare.vue b/src/views/gasDashboard/components/gasCompare.vue
new file mode 100644
index 0000000..19a4398
--- /dev/null
+++ b/src/views/gasDashboard/components/gasCompare.vue
@@ -0,0 +1,121 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasCountByAreaBar.vue b/src/views/gasDashboard/components/gasCountByAreaBar.vue
new file mode 100644
index 0000000..456a6c6
--- /dev/null
+++ b/src/views/gasDashboard/components/gasCountByAreaBar.vue
@@ -0,0 +1,198 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasCountByDay.vue b/src/views/gasDashboard/components/gasCountByDay.vue
new file mode 100644
index 0000000..f0a3977
--- /dev/null
+++ b/src/views/gasDashboard/components/gasCountByDay.vue
@@ -0,0 +1,114 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasCountByDept.vue b/src/views/gasDashboard/components/gasCountByDept.vue
new file mode 100644
index 0000000..31c8508
--- /dev/null
+++ b/src/views/gasDashboard/components/gasCountByDept.vue
@@ -0,0 +1,126 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasCountByDeviceBar.vue b/src/views/gasDashboard/components/gasCountByDeviceBar.vue
new file mode 100644
index 0000000..dc211e3
--- /dev/null
+++ b/src/views/gasDashboard/components/gasCountByDeviceBar.vue
@@ -0,0 +1,130 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasNote.vue b/src/views/gasDashboard/components/gasNote.vue
new file mode 100644
index 0000000..5ade90f
--- /dev/null
+++ b/src/views/gasDashboard/components/gasNote.vue
@@ -0,0 +1,149 @@
+
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/watchAlarmBar.vue b/src/views/gasDashboard/components/watchAlarmBar.vue
new file mode 100644
index 0000000..4279440
--- /dev/null
+++ b/src/views/gasDashboard/components/watchAlarmBar.vue
@@ -0,0 +1,180 @@
+
+
+
+ 场区用气事记
+
+
+
+
+
+
+
+
+
+ {{ index+1 }}. {{ item.content }}
+
+
+ {{ index+1 }}.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/watchGasAlarmBar.vue b/src/views/gasDashboard/components/watchGasAlarmBar.vue
new file mode 100644
index 0000000..0113341
--- /dev/null
+++ b/src/views/gasDashboard/components/watchGasAlarmBar.vue
@@ -0,0 +1,132 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/index.vue b/src/views/gasDashboard/index.vue
new file mode 100644
index 0000000..be583f2
--- /dev/null
+++ b/src/views/gasDashboard/index.vue
@@ -0,0 +1,191 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/gasOverview/gasOverviewSimple.vue b/src/views/gasOverview/gasOverviewSimple.vue
new file mode 100644
index 0000000..8ff468f
--- /dev/null
+++ b/src/views/gasOverview/gasOverviewSimple.vue
@@ -0,0 +1,1189 @@
+
+
+
+
+
+
+
+
+
diff --git a/src/views/jobManage/detailJob.vue b/src/views/jobManage/detailJob.vue
index 2d6aaa4..fe7e68e 100644
--- a/src/views/jobManage/detailJob.vue
+++ b/src/views/jobManage/detailJob.vue
@@ -205,8 +205,9 @@
// 获取工单详情
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 => {
+ console.log(response, ' ============response=')
this.loading = false
if (response.code === 200) {
if (response.data.length <= 0) {
@@ -217,26 +218,28 @@
// 处理现场图片
if (job.firstStatePhotos !== '') {
this.firstImageList = []
- const urls = job.firstStatePhotos.split(';')
+ const urls = job.firstStatePhotos.split(',')
for (const url of urls) {
if (url) {
// this.firstImageList.push({ name: url, url: base_url + url })
this.firstImageList.push(base_url + url)
}
}
+ console.log(this.firstImageList)
} else {
this.firstImageList = []
}
// 处理维护图片
if (job.handlePhotos.length !== '') {
this.handleImageList = []
- const urls = job.handlePhotos.split(';')
+ const urls = job.handlePhotos.split(',')
for (const url of urls) {
if (url) {
// this.handleImageList.push({ name: url, url: base_url + url })
this.handleImageList.push(base_url + url)
}
}
+ console.log(this.handleImageList)
} else {
this.handleImageList = []
}
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 @@
diff --git a/src/views/dataManage/deviceData/listCorrodeData.vue b/src/views/dataManage/deviceData/listCorrodeData.vue
new file mode 100644
index 0000000..1a20abb
--- /dev/null
+++ b/src/views/dataManage/deviceData/listCorrodeData.vue
@@ -0,0 +1,272 @@
+
+
-
-
@@ -28,7 +29,7 @@
- 导出记录
+ 导出记录
@@ -63,6 +64,7 @@
import { getGasData, batchExportGasData } from '@/api/data'
import DeptSelect from '../../../components/DeptSelect/index'
import { parseUrl } from '@/utils/parseutils'
+import { getSearchLastWeekTime } from '@/utils/dateutils'
export default {
name: 'ListGasData',
@@ -163,6 +165,7 @@
if (params && params.deviceType === '4' && params.devcode) {
this.listQuery.keywords = params.devcode
}
+ this.timeRange = getSearchLastWeekTime()
this.fetchData()
}
},
@@ -191,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/listGasflowData.vue b/src/views/dataManage/deviceData/listGasflowData.vue
new file mode 100644
index 0000000..9c5321a
--- /dev/null
+++ b/src/views/dataManage/deviceData/listGasflowData.vue
@@ -0,0 +1,311 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/alarmGasCountByType.vue b/src/views/gasDashboard/components/alarmGasCountByType.vue
new file mode 100644
index 0000000..4f80d3a
--- /dev/null
+++ b/src/views/gasDashboard/components/alarmGasCountByType.vue
@@ -0,0 +1,72 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue
index 97cdfdb..40b9a5e 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -5,10 +5,10 @@
+
+
+
+
+
+
+ 搜索
+
+
+
+
+
+
+
+ 导出记录
+
+
+
+
+
+
+ {{ scope.row[column.value] }}
+ {{ scope.row[column.value] }}
+
+
+
+
+
+ 数据列表
+
+ 数据列表
+
+
+
+
+
+
+
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 bf03fd1..dffd340 100644
--- a/src/views/dataManage/deviceData/listWaterData.vue
+++ b/src/views/dataManage/deviceData/listWaterData.vue
@@ -176,6 +176,12 @@
align: 'center'
},
{
+ text: '压力(Mpa)',
+ value: 'pressure',
+ width: 90,
+ align: 'center'
+ },
+ {
text: '今日用水量（立方米）',
value: 'dayCount',
align: 'center',
@@ -276,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) // 下载完成移除元素
@@ -311,9 +317,11 @@
}
getWatchData(this.listQuery).then((response) => {
this.list = response.data.rows.map(function(item) {
- item.areaFullName = item.areaFullName
- .replace('/', '')
- .replace('顶层', '')
+ item.totalCount = parseFloat(item.totalCount).toFixed(2)
+ item.dayCount = parseFloat(item.dayCount).toFixed(2)
+ item.monthCount = parseFloat(item.monthCount).toFixed(2)
+ item.pressure = parseFloat(item.pressure).toFixed(2)
+ item.areaFullName = item.areaFullName.replace('/', '').replace('顶层', '')
return item
})
this.total = parseInt(response.data.total)
diff --git a/src/views/dataManage/deviceData/waterHistory.vue b/src/views/dataManage/deviceData/waterHistory.vue
index 160dab7..42e3303 100644
--- a/src/views/dataManage/deviceData/waterHistory.vue
+++ b/src/views/dataManage/deviceData/waterHistory.vue
@@ -1,5 +1,5 @@
-
+
+
+
+
+
+
+ 搜索
+
+
+
+
+
+
+
+ 导出记录
+
+
+
+
+
+
+ {{
+ scope.row[column.value]
+ }}
+ {{
+ scope.row["areaFullName"] + '/' + scope.row[column.value]
+ }}
+ {{ scope.row[column.value] }}
+
+
+
+
+
+ 历史数据
+
+
+
+
+
+
+ 数据列表
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/AlarmNowList.vue b/src/views/gasDashboard/components/AlarmNowList.vue
new file mode 100644
index 0000000..890325f
--- /dev/null
+++ b/src/views/gasDashboard/components/AlarmNowList.vue
@@ -0,0 +1,35 @@
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/DeviceCount.vue b/src/views/gasDashboard/components/DeviceCount.vue
new file mode 100644
index 0000000..bffc9e9
--- /dev/null
+++ b/src/views/gasDashboard/components/DeviceCount.vue
@@ -0,0 +1,68 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/FunctionArea.vue b/src/views/gasDashboard/components/FunctionArea.vue
new file mode 100644
index 0000000..6401557
--- /dev/null
+++ b/src/views/gasDashboard/components/FunctionArea.vue
@@ -0,0 +1,140 @@
+
+
+
+ 本年度
+ 本季度
+ 近30日
+ 近7日
+ 今日
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/FunctionArea2.vue b/src/views/gasDashboard/components/FunctionArea2.vue
new file mode 100644
index 0000000..26a9f82
--- /dev/null
+++ b/src/views/gasDashboard/components/FunctionArea2.vue
@@ -0,0 +1,107 @@
+
+
+
+ 本年度
+ 本季度
+ 近30日
+ 近7日
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/PanelGroup.vue b/src/views/gasDashboard/components/PanelGroup.vue
new file mode 100644
index 0000000..103486e
--- /dev/null
+++ b/src/views/gasDashboard/components/PanelGroup.vue
@@ -0,0 +1,137 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/alarmLeakCountPie.vue b/src/views/gasDashboard/components/alarmLeakCountPie.vue
new file mode 100644
index 0000000..abfbc2d
--- /dev/null
+++ b/src/views/gasDashboard/components/alarmLeakCountPie.vue
@@ -0,0 +1,74 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/corrodeCountByDay.vue b/src/views/gasDashboard/components/corrodeCountByDay.vue
new file mode 100644
index 0000000..a410f29
--- /dev/null
+++ b/src/views/gasDashboard/components/corrodeCountByDay.vue
@@ -0,0 +1,100 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasAlarmTrend.vue b/src/views/gasDashboard/components/gasAlarmTrend.vue
new file mode 100644
index 0000000..a1d422e
--- /dev/null
+++ b/src/views/gasDashboard/components/gasAlarmTrend.vue
@@ -0,0 +1,100 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasCompare.vue b/src/views/gasDashboard/components/gasCompare.vue
new file mode 100644
index 0000000..19a4398
--- /dev/null
+++ b/src/views/gasDashboard/components/gasCompare.vue
@@ -0,0 +1,121 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasCountByAreaBar.vue b/src/views/gasDashboard/components/gasCountByAreaBar.vue
new file mode 100644
index 0000000..456a6c6
--- /dev/null
+++ b/src/views/gasDashboard/components/gasCountByAreaBar.vue
@@ -0,0 +1,198 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasCountByDay.vue b/src/views/gasDashboard/components/gasCountByDay.vue
new file mode 100644
index 0000000..f0a3977
--- /dev/null
+++ b/src/views/gasDashboard/components/gasCountByDay.vue
@@ -0,0 +1,114 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasCountByDept.vue b/src/views/gasDashboard/components/gasCountByDept.vue
new file mode 100644
index 0000000..31c8508
--- /dev/null
+++ b/src/views/gasDashboard/components/gasCountByDept.vue
@@ -0,0 +1,126 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasCountByDeviceBar.vue b/src/views/gasDashboard/components/gasCountByDeviceBar.vue
new file mode 100644
index 0000000..dc211e3
--- /dev/null
+++ b/src/views/gasDashboard/components/gasCountByDeviceBar.vue
@@ -0,0 +1,130 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasNote.vue b/src/views/gasDashboard/components/gasNote.vue
new file mode 100644
index 0000000..5ade90f
--- /dev/null
+++ b/src/views/gasDashboard/components/gasNote.vue
@@ -0,0 +1,149 @@
+
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/watchAlarmBar.vue b/src/views/gasDashboard/components/watchAlarmBar.vue
new file mode 100644
index 0000000..4279440
--- /dev/null
+++ b/src/views/gasDashboard/components/watchAlarmBar.vue
@@ -0,0 +1,180 @@
+
+
+
+ 场区用气事记
+
+
+
+
+
+
+
+
+
+ {{ index+1 }}. {{ item.content }}
+
+
+ {{ index+1 }}.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/watchGasAlarmBar.vue b/src/views/gasDashboard/components/watchGasAlarmBar.vue
new file mode 100644
index 0000000..0113341
--- /dev/null
+++ b/src/views/gasDashboard/components/watchGasAlarmBar.vue
@@ -0,0 +1,132 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/index.vue b/src/views/gasDashboard/index.vue
new file mode 100644
index 0000000..be583f2
--- /dev/null
+++ b/src/views/gasDashboard/index.vue
@@ -0,0 +1,191 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/gasOverview/gasOverviewSimple.vue b/src/views/gasOverview/gasOverviewSimple.vue
new file mode 100644
index 0000000..8ff468f
--- /dev/null
+++ b/src/views/gasOverview/gasOverviewSimple.vue
@@ -0,0 +1,1189 @@
+
+
+
+
+
+
+
+
+
diff --git a/src/views/jobManage/detailJob.vue b/src/views/jobManage/detailJob.vue
index 2d6aaa4..fe7e68e 100644
--- a/src/views/jobManage/detailJob.vue
+++ b/src/views/jobManage/detailJob.vue
@@ -205,8 +205,9 @@
// 获取工单详情
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 => {
+ console.log(response, ' ============response=')
this.loading = false
if (response.code === 200) {
if (response.data.length <= 0) {
@@ -217,26 +218,28 @@
// 处理现场图片
if (job.firstStatePhotos !== '') {
this.firstImageList = []
- const urls = job.firstStatePhotos.split(';')
+ const urls = job.firstStatePhotos.split(',')
for (const url of urls) {
if (url) {
// this.firstImageList.push({ name: url, url: base_url + url })
this.firstImageList.push(base_url + url)
}
}
+ console.log(this.firstImageList)
} else {
this.firstImageList = []
}
// 处理维护图片
if (job.handlePhotos.length !== '') {
this.handleImageList = []
- const urls = job.handlePhotos.split(';')
+ const urls = job.handlePhotos.split(',')
for (const url of urls) {
if (url) {
// this.handleImageList.push({ name: url, url: base_url + url })
this.handleImageList.push(base_url + url)
}
}
+ console.log(this.handleImageList)
} else {
this.handleImageList = []
}
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 @@
diff --git a/src/views/dataManage/deviceData/listCorrodeData.vue b/src/views/dataManage/deviceData/listCorrodeData.vue
new file mode 100644
index 0000000..1a20abb
--- /dev/null
+++ b/src/views/dataManage/deviceData/listCorrodeData.vue
@@ -0,0 +1,272 @@
+
+
-
-
@@ -28,7 +29,7 @@
- 导出记录
+ 导出记录
@@ -63,6 +64,7 @@
import { getGasData, batchExportGasData } from '@/api/data'
import DeptSelect from '../../../components/DeptSelect/index'
import { parseUrl } from '@/utils/parseutils'
+import { getSearchLastWeekTime } from '@/utils/dateutils'
export default {
name: 'ListGasData',
@@ -163,6 +165,7 @@
if (params && params.deviceType === '4' && params.devcode) {
this.listQuery.keywords = params.devcode
}
+ this.timeRange = getSearchLastWeekTime()
this.fetchData()
}
},
@@ -191,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/listGasflowData.vue b/src/views/dataManage/deviceData/listGasflowData.vue
new file mode 100644
index 0000000..9c5321a
--- /dev/null
+++ b/src/views/dataManage/deviceData/listGasflowData.vue
@@ -0,0 +1,311 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/alarmGasCountByType.vue b/src/views/gasDashboard/components/alarmGasCountByType.vue
new file mode 100644
index 0000000..4f80d3a
--- /dev/null
+++ b/src/views/gasDashboard/components/alarmGasCountByType.vue
@@ -0,0 +1,72 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue
index 97cdfdb..40b9a5e 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -5,10 +5,10 @@
+
+
+
+
+
+
+ 搜索
+
+
+
+
+
+
+
+ 导出记录
+
+
+
+
+
+
+ {{ scope.row[column.value] }}
+ {{ scope.row[column.value] }}
+
+
+
+
+
+ 数据列表
+
+ 数据列表
+
+
+
+
+
+
+
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 bf03fd1..dffd340 100644
--- a/src/views/dataManage/deviceData/listWaterData.vue
+++ b/src/views/dataManage/deviceData/listWaterData.vue
@@ -176,6 +176,12 @@
align: 'center'
},
{
+ text: '压力(Mpa)',
+ value: 'pressure',
+ width: 90,
+ align: 'center'
+ },
+ {
text: '今日用水量（立方米）',
value: 'dayCount',
align: 'center',
@@ -276,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) // 下载完成移除元素
@@ -311,9 +317,11 @@
}
getWatchData(this.listQuery).then((response) => {
this.list = response.data.rows.map(function(item) {
- item.areaFullName = item.areaFullName
- .replace('/', '')
- .replace('顶层', '')
+ item.totalCount = parseFloat(item.totalCount).toFixed(2)
+ item.dayCount = parseFloat(item.dayCount).toFixed(2)
+ item.monthCount = parseFloat(item.monthCount).toFixed(2)
+ item.pressure = parseFloat(item.pressure).toFixed(2)
+ item.areaFullName = item.areaFullName.replace('/', '').replace('顶层', '')
return item
})
this.total = parseInt(response.data.total)
diff --git a/src/views/dataManage/deviceData/waterHistory.vue b/src/views/dataManage/deviceData/waterHistory.vue
index 160dab7..42e3303 100644
--- a/src/views/dataManage/deviceData/waterHistory.vue
+++ b/src/views/dataManage/deviceData/waterHistory.vue
@@ -1,5 +1,5 @@
-
+
+
+
+
+
+
+ 搜索
+
+
+
+
+
+
+
+ 导出记录
+
+
+
+
+
+
+ {{
+ scope.row[column.value]
+ }}
+ {{
+ scope.row["areaFullName"] + '/' + scope.row[column.value]
+ }}
+ {{ scope.row[column.value] }}
+
+
+
+
+
+ 历史数据
+
+
+
+
+
+
+ 数据列表
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/AlarmNowList.vue b/src/views/gasDashboard/components/AlarmNowList.vue
new file mode 100644
index 0000000..890325f
--- /dev/null
+++ b/src/views/gasDashboard/components/AlarmNowList.vue
@@ -0,0 +1,35 @@
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/DeviceCount.vue b/src/views/gasDashboard/components/DeviceCount.vue
new file mode 100644
index 0000000..bffc9e9
--- /dev/null
+++ b/src/views/gasDashboard/components/DeviceCount.vue
@@ -0,0 +1,68 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/FunctionArea.vue b/src/views/gasDashboard/components/FunctionArea.vue
new file mode 100644
index 0000000..6401557
--- /dev/null
+++ b/src/views/gasDashboard/components/FunctionArea.vue
@@ -0,0 +1,140 @@
+
+
+
+ 本年度
+ 本季度
+ 近30日
+ 近7日
+ 今日
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/FunctionArea2.vue b/src/views/gasDashboard/components/FunctionArea2.vue
new file mode 100644
index 0000000..26a9f82
--- /dev/null
+++ b/src/views/gasDashboard/components/FunctionArea2.vue
@@ -0,0 +1,107 @@
+
+
+
+ 本年度
+ 本季度
+ 近30日
+ 近7日
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/PanelGroup.vue b/src/views/gasDashboard/components/PanelGroup.vue
new file mode 100644
index 0000000..103486e
--- /dev/null
+++ b/src/views/gasDashboard/components/PanelGroup.vue
@@ -0,0 +1,137 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/alarmLeakCountPie.vue b/src/views/gasDashboard/components/alarmLeakCountPie.vue
new file mode 100644
index 0000000..abfbc2d
--- /dev/null
+++ b/src/views/gasDashboard/components/alarmLeakCountPie.vue
@@ -0,0 +1,74 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/corrodeCountByDay.vue b/src/views/gasDashboard/components/corrodeCountByDay.vue
new file mode 100644
index 0000000..a410f29
--- /dev/null
+++ b/src/views/gasDashboard/components/corrodeCountByDay.vue
@@ -0,0 +1,100 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasAlarmTrend.vue b/src/views/gasDashboard/components/gasAlarmTrend.vue
new file mode 100644
index 0000000..a1d422e
--- /dev/null
+++ b/src/views/gasDashboard/components/gasAlarmTrend.vue
@@ -0,0 +1,100 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasCompare.vue b/src/views/gasDashboard/components/gasCompare.vue
new file mode 100644
index 0000000..19a4398
--- /dev/null
+++ b/src/views/gasDashboard/components/gasCompare.vue
@@ -0,0 +1,121 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasCountByAreaBar.vue b/src/views/gasDashboard/components/gasCountByAreaBar.vue
new file mode 100644
index 0000000..456a6c6
--- /dev/null
+++ b/src/views/gasDashboard/components/gasCountByAreaBar.vue
@@ -0,0 +1,198 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasCountByDay.vue b/src/views/gasDashboard/components/gasCountByDay.vue
new file mode 100644
index 0000000..f0a3977
--- /dev/null
+++ b/src/views/gasDashboard/components/gasCountByDay.vue
@@ -0,0 +1,114 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasCountByDept.vue b/src/views/gasDashboard/components/gasCountByDept.vue
new file mode 100644
index 0000000..31c8508
--- /dev/null
+++ b/src/views/gasDashboard/components/gasCountByDept.vue
@@ -0,0 +1,126 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasCountByDeviceBar.vue b/src/views/gasDashboard/components/gasCountByDeviceBar.vue
new file mode 100644
index 0000000..dc211e3
--- /dev/null
+++ b/src/views/gasDashboard/components/gasCountByDeviceBar.vue
@@ -0,0 +1,130 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasNote.vue b/src/views/gasDashboard/components/gasNote.vue
new file mode 100644
index 0000000..5ade90f
--- /dev/null
+++ b/src/views/gasDashboard/components/gasNote.vue
@@ -0,0 +1,149 @@
+
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/watchAlarmBar.vue b/src/views/gasDashboard/components/watchAlarmBar.vue
new file mode 100644
index 0000000..4279440
--- /dev/null
+++ b/src/views/gasDashboard/components/watchAlarmBar.vue
@@ -0,0 +1,180 @@
+
+
+
+ 场区用气事记
+
+
+
+
+
+
+
+
+
+ {{ index+1 }}. {{ item.content }}
+
+
+ {{ index+1 }}.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/watchGasAlarmBar.vue b/src/views/gasDashboard/components/watchGasAlarmBar.vue
new file mode 100644
index 0000000..0113341
--- /dev/null
+++ b/src/views/gasDashboard/components/watchGasAlarmBar.vue
@@ -0,0 +1,132 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/index.vue b/src/views/gasDashboard/index.vue
new file mode 100644
index 0000000..be583f2
--- /dev/null
+++ b/src/views/gasDashboard/index.vue
@@ -0,0 +1,191 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/gasOverview/gasOverviewSimple.vue b/src/views/gasOverview/gasOverviewSimple.vue
new file mode 100644
index 0000000..8ff468f
--- /dev/null
+++ b/src/views/gasOverview/gasOverviewSimple.vue
@@ -0,0 +1,1189 @@
+
+
+
+
+
+
+
+
+
diff --git a/src/views/jobManage/detailJob.vue b/src/views/jobManage/detailJob.vue
index 2d6aaa4..fe7e68e 100644
--- a/src/views/jobManage/detailJob.vue
+++ b/src/views/jobManage/detailJob.vue
@@ -205,8 +205,9 @@
// 获取工单详情
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 => {
+ console.log(response, ' ============response=')
this.loading = false
if (response.code === 200) {
if (response.data.length <= 0) {
@@ -217,26 +218,28 @@
// 处理现场图片
if (job.firstStatePhotos !== '') {
this.firstImageList = []
- const urls = job.firstStatePhotos.split(';')
+ const urls = job.firstStatePhotos.split(',')
for (const url of urls) {
if (url) {
// this.firstImageList.push({ name: url, url: base_url + url })
this.firstImageList.push(base_url + url)
}
}
+ console.log(this.firstImageList)
} else {
this.firstImageList = []
}
// 处理维护图片
if (job.handlePhotos.length !== '') {
this.handleImageList = []
- const urls = job.handlePhotos.split(';')
+ const urls = job.handlePhotos.split(',')
for (const url of urls) {
if (url) {
// this.handleImageList.push({ name: url, url: base_url + url })
this.handleImageList.push(base_url + url)
}
}
+ console.log(this.handleImageList)
} else {
this.handleImageList = []
}
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 @@
diff --git a/src/views/dataManage/deviceData/listCorrodeData.vue b/src/views/dataManage/deviceData/listCorrodeData.vue
new file mode 100644
index 0000000..1a20abb
--- /dev/null
+++ b/src/views/dataManage/deviceData/listCorrodeData.vue
@@ -0,0 +1,272 @@
+
+
-
-
@@ -28,7 +29,7 @@
- 导出记录
+ 导出记录
@@ -63,6 +64,7 @@
import { getGasData, batchExportGasData } from '@/api/data'
import DeptSelect from '../../../components/DeptSelect/index'
import { parseUrl } from '@/utils/parseutils'
+import { getSearchLastWeekTime } from '@/utils/dateutils'
export default {
name: 'ListGasData',
@@ -163,6 +165,7 @@
if (params && params.deviceType === '4' && params.devcode) {
this.listQuery.keywords = params.devcode
}
+ this.timeRange = getSearchLastWeekTime()
this.fetchData()
}
},
@@ -191,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/listGasflowData.vue b/src/views/dataManage/deviceData/listGasflowData.vue
new file mode 100644
index 0000000..9c5321a
--- /dev/null
+++ b/src/views/dataManage/deviceData/listGasflowData.vue
@@ -0,0 +1,311 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/alarmGasCountByType.vue b/src/views/gasDashboard/components/alarmGasCountByType.vue
new file mode 100644
index 0000000..4f80d3a
--- /dev/null
+++ b/src/views/gasDashboard/components/alarmGasCountByType.vue
@@ -0,0 +1,72 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue
index 97cdfdb..40b9a5e 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -5,10 +5,10 @@
+
+
+
+
+
+
+ 搜索
+
+
+
+
+
+
+
+ 导出记录
+
+
+
+
+
+
+ {{ scope.row[column.value] }}
+ {{ scope.row[column.value] }}
+
+
+
+
+
+ 数据列表
+
+ 数据列表
+
+
+
+
+
+
+
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 bf03fd1..dffd340 100644
--- a/src/views/dataManage/deviceData/listWaterData.vue
+++ b/src/views/dataManage/deviceData/listWaterData.vue
@@ -176,6 +176,12 @@
align: 'center'
},
{
+ text: '压力(Mpa)',
+ value: 'pressure',
+ width: 90,
+ align: 'center'
+ },
+ {
text: '今日用水量（立方米）',
value: 'dayCount',
align: 'center',
@@ -276,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) // 下载完成移除元素
@@ -311,9 +317,11 @@
}
getWatchData(this.listQuery).then((response) => {
this.list = response.data.rows.map(function(item) {
- item.areaFullName = item.areaFullName
- .replace('/', '')
- .replace('顶层', '')
+ item.totalCount = parseFloat(item.totalCount).toFixed(2)
+ item.dayCount = parseFloat(item.dayCount).toFixed(2)
+ item.monthCount = parseFloat(item.monthCount).toFixed(2)
+ item.pressure = parseFloat(item.pressure).toFixed(2)
+ item.areaFullName = item.areaFullName.replace('/', '').replace('顶层', '')
return item
})
this.total = parseInt(response.data.total)
diff --git a/src/views/dataManage/deviceData/waterHistory.vue b/src/views/dataManage/deviceData/waterHistory.vue
index 160dab7..42e3303 100644
--- a/src/views/dataManage/deviceData/waterHistory.vue
+++ b/src/views/dataManage/deviceData/waterHistory.vue
@@ -1,5 +1,5 @@
-
+
+
+
+
+
+
+ 搜索
+
+
+
+
+
+
+
+ 导出记录
+
+
+
+
+
+
+ {{
+ scope.row[column.value]
+ }}
+ {{
+ scope.row["areaFullName"] + '/' + scope.row[column.value]
+ }}
+ {{ scope.row[column.value] }}
+
+
+
+
+
+ 历史数据
+
+
+
+
+
+
+ 数据列表
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/AlarmNowList.vue b/src/views/gasDashboard/components/AlarmNowList.vue
new file mode 100644
index 0000000..890325f
--- /dev/null
+++ b/src/views/gasDashboard/components/AlarmNowList.vue
@@ -0,0 +1,35 @@
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/DeviceCount.vue b/src/views/gasDashboard/components/DeviceCount.vue
new file mode 100644
index 0000000..bffc9e9
--- /dev/null
+++ b/src/views/gasDashboard/components/DeviceCount.vue
@@ -0,0 +1,68 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/FunctionArea.vue b/src/views/gasDashboard/components/FunctionArea.vue
new file mode 100644
index 0000000..6401557
--- /dev/null
+++ b/src/views/gasDashboard/components/FunctionArea.vue
@@ -0,0 +1,140 @@
+
+
+
+ 本年度
+ 本季度
+ 近30日
+ 近7日
+ 今日
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/FunctionArea2.vue b/src/views/gasDashboard/components/FunctionArea2.vue
new file mode 100644
index 0000000..26a9f82
--- /dev/null
+++ b/src/views/gasDashboard/components/FunctionArea2.vue
@@ -0,0 +1,107 @@
+
+
+
+ 本年度
+ 本季度
+ 近30日
+ 近7日
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/PanelGroup.vue b/src/views/gasDashboard/components/PanelGroup.vue
new file mode 100644
index 0000000..103486e
--- /dev/null
+++ b/src/views/gasDashboard/components/PanelGroup.vue
@@ -0,0 +1,137 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/alarmLeakCountPie.vue b/src/views/gasDashboard/components/alarmLeakCountPie.vue
new file mode 100644
index 0000000..abfbc2d
--- /dev/null
+++ b/src/views/gasDashboard/components/alarmLeakCountPie.vue
@@ -0,0 +1,74 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/corrodeCountByDay.vue b/src/views/gasDashboard/components/corrodeCountByDay.vue
new file mode 100644
index 0000000..a410f29
--- /dev/null
+++ b/src/views/gasDashboard/components/corrodeCountByDay.vue
@@ -0,0 +1,100 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasAlarmTrend.vue b/src/views/gasDashboard/components/gasAlarmTrend.vue
new file mode 100644
index 0000000..a1d422e
--- /dev/null
+++ b/src/views/gasDashboard/components/gasAlarmTrend.vue
@@ -0,0 +1,100 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasCompare.vue b/src/views/gasDashboard/components/gasCompare.vue
new file mode 100644
index 0000000..19a4398
--- /dev/null
+++ b/src/views/gasDashboard/components/gasCompare.vue
@@ -0,0 +1,121 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasCountByAreaBar.vue b/src/views/gasDashboard/components/gasCountByAreaBar.vue
new file mode 100644
index 0000000..456a6c6
--- /dev/null
+++ b/src/views/gasDashboard/components/gasCountByAreaBar.vue
@@ -0,0 +1,198 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasCountByDay.vue b/src/views/gasDashboard/components/gasCountByDay.vue
new file mode 100644
index 0000000..f0a3977
--- /dev/null
+++ b/src/views/gasDashboard/components/gasCountByDay.vue
@@ -0,0 +1,114 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasCountByDept.vue b/src/views/gasDashboard/components/gasCountByDept.vue
new file mode 100644
index 0000000..31c8508
--- /dev/null
+++ b/src/views/gasDashboard/components/gasCountByDept.vue
@@ -0,0 +1,126 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasCountByDeviceBar.vue b/src/views/gasDashboard/components/gasCountByDeviceBar.vue
new file mode 100644
index 0000000..dc211e3
--- /dev/null
+++ b/src/views/gasDashboard/components/gasCountByDeviceBar.vue
@@ -0,0 +1,130 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasNote.vue b/src/views/gasDashboard/components/gasNote.vue
new file mode 100644
index 0000000..5ade90f
--- /dev/null
+++ b/src/views/gasDashboard/components/gasNote.vue
@@ -0,0 +1,149 @@
+
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/watchAlarmBar.vue b/src/views/gasDashboard/components/watchAlarmBar.vue
new file mode 100644
index 0000000..4279440
--- /dev/null
+++ b/src/views/gasDashboard/components/watchAlarmBar.vue
@@ -0,0 +1,180 @@
+
+
+
+ 场区用气事记
+
+
+
+
+
+
+
+
+
+ {{ index+1 }}. {{ item.content }}
+
+
+ {{ index+1 }}.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/watchGasAlarmBar.vue b/src/views/gasDashboard/components/watchGasAlarmBar.vue
new file mode 100644
index 0000000..0113341
--- /dev/null
+++ b/src/views/gasDashboard/components/watchGasAlarmBar.vue
@@ -0,0 +1,132 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/index.vue b/src/views/gasDashboard/index.vue
new file mode 100644
index 0000000..be583f2
--- /dev/null
+++ b/src/views/gasDashboard/index.vue
@@ -0,0 +1,191 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/gasOverview/gasOverviewSimple.vue b/src/views/gasOverview/gasOverviewSimple.vue
new file mode 100644
index 0000000..8ff468f
--- /dev/null
+++ b/src/views/gasOverview/gasOverviewSimple.vue
@@ -0,0 +1,1189 @@
+
+
+
+
+
+
+
+
+
diff --git a/src/views/jobManage/detailJob.vue b/src/views/jobManage/detailJob.vue
index 2d6aaa4..fe7e68e 100644
--- a/src/views/jobManage/detailJob.vue
+++ b/src/views/jobManage/detailJob.vue
@@ -205,8 +205,9 @@
// 获取工单详情
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 => {
+ console.log(response, ' ============response=')
this.loading = false
if (response.code === 200) {
if (response.data.length <= 0) {
@@ -217,26 +218,28 @@
// 处理现场图片
if (job.firstStatePhotos !== '') {
this.firstImageList = []
- const urls = job.firstStatePhotos.split(';')
+ const urls = job.firstStatePhotos.split(',')
for (const url of urls) {
if (url) {
// this.firstImageList.push({ name: url, url: base_url + url })
this.firstImageList.push(base_url + url)
}
}
+ console.log(this.firstImageList)
} else {
this.firstImageList = []
}
// 处理维护图片
if (job.handlePhotos.length !== '') {
this.handleImageList = []
- const urls = job.handlePhotos.split(';')
+ const urls = job.handlePhotos.split(',')
for (const url of urls) {
if (url) {
// this.handleImageList.push({ name: url, url: base_url + url })
this.handleImageList.push(base_url + url)
}
}
+ console.log(this.handleImageList)
} else {
this.handleImageList = []
}
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 @@
diff --git a/src/views/dataManage/deviceData/listCorrodeData.vue b/src/views/dataManage/deviceData/listCorrodeData.vue
new file mode 100644
index 0000000..1a20abb
--- /dev/null
+++ b/src/views/dataManage/deviceData/listCorrodeData.vue
@@ -0,0 +1,272 @@
+
+
-
-
@@ -28,7 +29,7 @@
- 导出记录
+ 导出记录
@@ -63,6 +64,7 @@
import { getGasData, batchExportGasData } from '@/api/data'
import DeptSelect from '../../../components/DeptSelect/index'
import { parseUrl } from '@/utils/parseutils'
+import { getSearchLastWeekTime } from '@/utils/dateutils'
export default {
name: 'ListGasData',
@@ -163,6 +165,7 @@
if (params && params.deviceType === '4' && params.devcode) {
this.listQuery.keywords = params.devcode
}
+ this.timeRange = getSearchLastWeekTime()
this.fetchData()
}
},
@@ -191,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/listGasflowData.vue b/src/views/dataManage/deviceData/listGasflowData.vue
new file mode 100644
index 0000000..9c5321a
--- /dev/null
+++ b/src/views/dataManage/deviceData/listGasflowData.vue
@@ -0,0 +1,311 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/alarmGasCountByType.vue b/src/views/gasDashboard/components/alarmGasCountByType.vue
new file mode 100644
index 0000000..4f80d3a
--- /dev/null
+++ b/src/views/gasDashboard/components/alarmGasCountByType.vue
@@ -0,0 +1,72 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue
index 97cdfdb..40b9a5e 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -5,10 +5,10 @@
+
+
+
+
+
+
+ 搜索
+
+
+
+
+
+
+
+ 导出记录
+
+
+
+
+
+
+ {{ scope.row[column.value] }}
+ {{ scope.row[column.value] }}
+
+
+
+
+
+ 数据列表
+
+ 数据列表
+
+
+
+
+
+
+
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 bf03fd1..dffd340 100644
--- a/src/views/dataManage/deviceData/listWaterData.vue
+++ b/src/views/dataManage/deviceData/listWaterData.vue
@@ -176,6 +176,12 @@
align: 'center'
},
{
+ text: '压力(Mpa)',
+ value: 'pressure',
+ width: 90,
+ align: 'center'
+ },
+ {
text: '今日用水量（立方米）',
value: 'dayCount',
align: 'center',
@@ -276,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) // 下载完成移除元素
@@ -311,9 +317,11 @@
}
getWatchData(this.listQuery).then((response) => {
this.list = response.data.rows.map(function(item) {
- item.areaFullName = item.areaFullName
- .replace('/', '')
- .replace('顶层', '')
+ item.totalCount = parseFloat(item.totalCount).toFixed(2)
+ item.dayCount = parseFloat(item.dayCount).toFixed(2)
+ item.monthCount = parseFloat(item.monthCount).toFixed(2)
+ item.pressure = parseFloat(item.pressure).toFixed(2)
+ item.areaFullName = item.areaFullName.replace('/', '').replace('顶层', '')
return item
})
this.total = parseInt(response.data.total)
diff --git a/src/views/dataManage/deviceData/waterHistory.vue b/src/views/dataManage/deviceData/waterHistory.vue
index 160dab7..42e3303 100644
--- a/src/views/dataManage/deviceData/waterHistory.vue
+++ b/src/views/dataManage/deviceData/waterHistory.vue
@@ -1,5 +1,5 @@
-
+
+
+
+
+
+
+ 搜索
+
+
+
+
+
+
+
+ 导出记录
+
+
+
+
+
+
+ {{
+ scope.row[column.value]
+ }}
+ {{
+ scope.row["areaFullName"] + '/' + scope.row[column.value]
+ }}
+ {{ scope.row[column.value] }}
+
+
+
+
+
+ 历史数据
+
+
+
+
+
+
+ 数据列表
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/AlarmNowList.vue b/src/views/gasDashboard/components/AlarmNowList.vue
new file mode 100644
index 0000000..890325f
--- /dev/null
+++ b/src/views/gasDashboard/components/AlarmNowList.vue
@@ -0,0 +1,35 @@
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/DeviceCount.vue b/src/views/gasDashboard/components/DeviceCount.vue
new file mode 100644
index 0000000..bffc9e9
--- /dev/null
+++ b/src/views/gasDashboard/components/DeviceCount.vue
@@ -0,0 +1,68 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/FunctionArea.vue b/src/views/gasDashboard/components/FunctionArea.vue
new file mode 100644
index 0000000..6401557
--- /dev/null
+++ b/src/views/gasDashboard/components/FunctionArea.vue
@@ -0,0 +1,140 @@
+
+
+
+ 本年度
+ 本季度
+ 近30日
+ 近7日
+ 今日
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/FunctionArea2.vue b/src/views/gasDashboard/components/FunctionArea2.vue
new file mode 100644
index 0000000..26a9f82
--- /dev/null
+++ b/src/views/gasDashboard/components/FunctionArea2.vue
@@ -0,0 +1,107 @@
+
+
+
+ 本年度
+ 本季度
+ 近30日
+ 近7日
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/PanelGroup.vue b/src/views/gasDashboard/components/PanelGroup.vue
new file mode 100644
index 0000000..103486e
--- /dev/null
+++ b/src/views/gasDashboard/components/PanelGroup.vue
@@ -0,0 +1,137 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/alarmLeakCountPie.vue b/src/views/gasDashboard/components/alarmLeakCountPie.vue
new file mode 100644
index 0000000..abfbc2d
--- /dev/null
+++ b/src/views/gasDashboard/components/alarmLeakCountPie.vue
@@ -0,0 +1,74 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/corrodeCountByDay.vue b/src/views/gasDashboard/components/corrodeCountByDay.vue
new file mode 100644
index 0000000..a410f29
--- /dev/null
+++ b/src/views/gasDashboard/components/corrodeCountByDay.vue
@@ -0,0 +1,100 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasAlarmTrend.vue b/src/views/gasDashboard/components/gasAlarmTrend.vue
new file mode 100644
index 0000000..a1d422e
--- /dev/null
+++ b/src/views/gasDashboard/components/gasAlarmTrend.vue
@@ -0,0 +1,100 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasCompare.vue b/src/views/gasDashboard/components/gasCompare.vue
new file mode 100644
index 0000000..19a4398
--- /dev/null
+++ b/src/views/gasDashboard/components/gasCompare.vue
@@ -0,0 +1,121 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasCountByAreaBar.vue b/src/views/gasDashboard/components/gasCountByAreaBar.vue
new file mode 100644
index 0000000..456a6c6
--- /dev/null
+++ b/src/views/gasDashboard/components/gasCountByAreaBar.vue
@@ -0,0 +1,198 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasCountByDay.vue b/src/views/gasDashboard/components/gasCountByDay.vue
new file mode 100644
index 0000000..f0a3977
--- /dev/null
+++ b/src/views/gasDashboard/components/gasCountByDay.vue
@@ -0,0 +1,114 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasCountByDept.vue b/src/views/gasDashboard/components/gasCountByDept.vue
new file mode 100644
index 0000000..31c8508
--- /dev/null
+++ b/src/views/gasDashboard/components/gasCountByDept.vue
@@ -0,0 +1,126 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasCountByDeviceBar.vue b/src/views/gasDashboard/components/gasCountByDeviceBar.vue
new file mode 100644
index 0000000..dc211e3
--- /dev/null
+++ b/src/views/gasDashboard/components/gasCountByDeviceBar.vue
@@ -0,0 +1,130 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasNote.vue b/src/views/gasDashboard/components/gasNote.vue
new file mode 100644
index 0000000..5ade90f
--- /dev/null
+++ b/src/views/gasDashboard/components/gasNote.vue
@@ -0,0 +1,149 @@
+
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/watchAlarmBar.vue b/src/views/gasDashboard/components/watchAlarmBar.vue
new file mode 100644
index 0000000..4279440
--- /dev/null
+++ b/src/views/gasDashboard/components/watchAlarmBar.vue
@@ -0,0 +1,180 @@
+
+
+
+ 场区用气事记
+
+
+
+
+
+
+
+
+
+ {{ index+1 }}. {{ item.content }}
+
+
+ {{ index+1 }}.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/watchGasAlarmBar.vue b/src/views/gasDashboard/components/watchGasAlarmBar.vue
new file mode 100644
index 0000000..0113341
--- /dev/null
+++ b/src/views/gasDashboard/components/watchGasAlarmBar.vue
@@ -0,0 +1,132 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/index.vue b/src/views/gasDashboard/index.vue
new file mode 100644
index 0000000..be583f2
--- /dev/null
+++ b/src/views/gasDashboard/index.vue
@@ -0,0 +1,191 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/gasOverview/gasOverviewSimple.vue b/src/views/gasOverview/gasOverviewSimple.vue
new file mode 100644
index 0000000..8ff468f
--- /dev/null
+++ b/src/views/gasOverview/gasOverviewSimple.vue
@@ -0,0 +1,1189 @@
+
+
+
+
+
+
+
+
+
diff --git a/src/views/jobManage/detailJob.vue b/src/views/jobManage/detailJob.vue
index 2d6aaa4..fe7e68e 100644
--- a/src/views/jobManage/detailJob.vue
+++ b/src/views/jobManage/detailJob.vue
@@ -205,8 +205,9 @@
// 获取工单详情
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 => {
+ console.log(response, ' ============response=')
this.loading = false
if (response.code === 200) {
if (response.data.length <= 0) {
@@ -217,26 +218,28 @@
// 处理现场图片
if (job.firstStatePhotos !== '') {
this.firstImageList = []
- const urls = job.firstStatePhotos.split(';')
+ const urls = job.firstStatePhotos.split(',')
for (const url of urls) {
if (url) {
// this.firstImageList.push({ name: url, url: base_url + url })
this.firstImageList.push(base_url + url)
}
}
+ console.log(this.firstImageList)
} else {
this.firstImageList = []
}
// 处理维护图片
if (job.handlePhotos.length !== '') {
this.handleImageList = []
- const urls = job.handlePhotos.split(';')
+ const urls = job.handlePhotos.split(',')
for (const url of urls) {
if (url) {
// this.handleImageList.push({ name: url, url: base_url + url })
this.handleImageList.push(base_url + url)
}
}
+ console.log(this.handleImageList)
} else {
this.handleImageList = []
}
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 @@
diff --git a/src/views/dataManage/deviceData/listCorrodeData.vue b/src/views/dataManage/deviceData/listCorrodeData.vue
new file mode 100644
index 0000000..1a20abb
--- /dev/null
+++ b/src/views/dataManage/deviceData/listCorrodeData.vue
@@ -0,0 +1,272 @@
+
+
-
-
@@ -28,7 +29,7 @@
- 导出记录
+ 导出记录
@@ -63,6 +64,7 @@
import { getGasData, batchExportGasData } from '@/api/data'
import DeptSelect from '../../../components/DeptSelect/index'
import { parseUrl } from '@/utils/parseutils'
+import { getSearchLastWeekTime } from '@/utils/dateutils'
export default {
name: 'ListGasData',
@@ -163,6 +165,7 @@
if (params && params.deviceType === '4' && params.devcode) {
this.listQuery.keywords = params.devcode
}
+ this.timeRange = getSearchLastWeekTime()
this.fetchData()
}
},
@@ -191,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/listGasflowData.vue b/src/views/dataManage/deviceData/listGasflowData.vue
new file mode 100644
index 0000000..9c5321a
--- /dev/null
+++ b/src/views/dataManage/deviceData/listGasflowData.vue
@@ -0,0 +1,311 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/alarmGasCountByType.vue b/src/views/gasDashboard/components/alarmGasCountByType.vue
new file mode 100644
index 0000000..4f80d3a
--- /dev/null
+++ b/src/views/gasDashboard/components/alarmGasCountByType.vue
@@ -0,0 +1,72 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue
index 97cdfdb..40b9a5e 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -5,10 +5,10 @@
+
+
+
+
+
+
+ 搜索
+
+
+
+
+
+
+
+ 导出记录
+
+
+
+
+
+
+ {{ scope.row[column.value] }}
+ {{ scope.row[column.value] }}
+
+
+
+
+
+ 数据列表
+
+ 数据列表
+
+
+
+
+
+
+
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 bf03fd1..dffd340 100644
--- a/src/views/dataManage/deviceData/listWaterData.vue
+++ b/src/views/dataManage/deviceData/listWaterData.vue
@@ -176,6 +176,12 @@
align: 'center'
},
{
+ text: '压力(Mpa)',
+ value: 'pressure',
+ width: 90,
+ align: 'center'
+ },
+ {
text: '今日用水量（立方米）',
value: 'dayCount',
align: 'center',
@@ -276,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) // 下载完成移除元素
@@ -311,9 +317,11 @@
}
getWatchData(this.listQuery).then((response) => {
this.list = response.data.rows.map(function(item) {
- item.areaFullName = item.areaFullName
- .replace('/', '')
- .replace('顶层', '')
+ item.totalCount = parseFloat(item.totalCount).toFixed(2)
+ item.dayCount = parseFloat(item.dayCount).toFixed(2)
+ item.monthCount = parseFloat(item.monthCount).toFixed(2)
+ item.pressure = parseFloat(item.pressure).toFixed(2)
+ item.areaFullName = item.areaFullName.replace('/', '').replace('顶层', '')
return item
})
this.total = parseInt(response.data.total)
diff --git a/src/views/dataManage/deviceData/waterHistory.vue b/src/views/dataManage/deviceData/waterHistory.vue
index 160dab7..42e3303 100644
--- a/src/views/dataManage/deviceData/waterHistory.vue
+++ b/src/views/dataManage/deviceData/waterHistory.vue
@@ -1,5 +1,5 @@
-
+
+
+
+
+
+
+ 搜索
+
+
+
+
+
+
+
+ 导出记录
+
+
+
+
+
+
+ {{
+ scope.row[column.value]
+ }}
+ {{
+ scope.row["areaFullName"] + '/' + scope.row[column.value]
+ }}
+ {{ scope.row[column.value] }}
+
+
+
+
+
+ 历史数据
+
+
+
+
+
+
+ 数据列表
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/AlarmNowList.vue b/src/views/gasDashboard/components/AlarmNowList.vue
new file mode 100644
index 0000000..890325f
--- /dev/null
+++ b/src/views/gasDashboard/components/AlarmNowList.vue
@@ -0,0 +1,35 @@
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/DeviceCount.vue b/src/views/gasDashboard/components/DeviceCount.vue
new file mode 100644
index 0000000..bffc9e9
--- /dev/null
+++ b/src/views/gasDashboard/components/DeviceCount.vue
@@ -0,0 +1,68 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/FunctionArea.vue b/src/views/gasDashboard/components/FunctionArea.vue
new file mode 100644
index 0000000..6401557
--- /dev/null
+++ b/src/views/gasDashboard/components/FunctionArea.vue
@@ -0,0 +1,140 @@
+
+
+
+ 本年度
+ 本季度
+ 近30日
+ 近7日
+ 今日
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/FunctionArea2.vue b/src/views/gasDashboard/components/FunctionArea2.vue
new file mode 100644
index 0000000..26a9f82
--- /dev/null
+++ b/src/views/gasDashboard/components/FunctionArea2.vue
@@ -0,0 +1,107 @@
+
+
+
+ 本年度
+ 本季度
+ 近30日
+ 近7日
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/PanelGroup.vue b/src/views/gasDashboard/components/PanelGroup.vue
new file mode 100644
index 0000000..103486e
--- /dev/null
+++ b/src/views/gasDashboard/components/PanelGroup.vue
@@ -0,0 +1,137 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/alarmLeakCountPie.vue b/src/views/gasDashboard/components/alarmLeakCountPie.vue
new file mode 100644
index 0000000..abfbc2d
--- /dev/null
+++ b/src/views/gasDashboard/components/alarmLeakCountPie.vue
@@ -0,0 +1,74 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/corrodeCountByDay.vue b/src/views/gasDashboard/components/corrodeCountByDay.vue
new file mode 100644
index 0000000..a410f29
--- /dev/null
+++ b/src/views/gasDashboard/components/corrodeCountByDay.vue
@@ -0,0 +1,100 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasAlarmTrend.vue b/src/views/gasDashboard/components/gasAlarmTrend.vue
new file mode 100644
index 0000000..a1d422e
--- /dev/null
+++ b/src/views/gasDashboard/components/gasAlarmTrend.vue
@@ -0,0 +1,100 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasCompare.vue b/src/views/gasDashboard/components/gasCompare.vue
new file mode 100644
index 0000000..19a4398
--- /dev/null
+++ b/src/views/gasDashboard/components/gasCompare.vue
@@ -0,0 +1,121 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasCountByAreaBar.vue b/src/views/gasDashboard/components/gasCountByAreaBar.vue
new file mode 100644
index 0000000..456a6c6
--- /dev/null
+++ b/src/views/gasDashboard/components/gasCountByAreaBar.vue
@@ -0,0 +1,198 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasCountByDay.vue b/src/views/gasDashboard/components/gasCountByDay.vue
new file mode 100644
index 0000000..f0a3977
--- /dev/null
+++ b/src/views/gasDashboard/components/gasCountByDay.vue
@@ -0,0 +1,114 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasCountByDept.vue b/src/views/gasDashboard/components/gasCountByDept.vue
new file mode 100644
index 0000000..31c8508
--- /dev/null
+++ b/src/views/gasDashboard/components/gasCountByDept.vue
@@ -0,0 +1,126 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasCountByDeviceBar.vue b/src/views/gasDashboard/components/gasCountByDeviceBar.vue
new file mode 100644
index 0000000..dc211e3
--- /dev/null
+++ b/src/views/gasDashboard/components/gasCountByDeviceBar.vue
@@ -0,0 +1,130 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasNote.vue b/src/views/gasDashboard/components/gasNote.vue
new file mode 100644
index 0000000..5ade90f
--- /dev/null
+++ b/src/views/gasDashboard/components/gasNote.vue
@@ -0,0 +1,149 @@
+
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/watchAlarmBar.vue b/src/views/gasDashboard/components/watchAlarmBar.vue
new file mode 100644
index 0000000..4279440
--- /dev/null
+++ b/src/views/gasDashboard/components/watchAlarmBar.vue
@@ -0,0 +1,180 @@
+
+
+
+ 场区用气事记
+
+
+
+
+
+
+
+
+
+ {{ index+1 }}. {{ item.content }}
+
+
+ {{ index+1 }}.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/watchGasAlarmBar.vue b/src/views/gasDashboard/components/watchGasAlarmBar.vue
new file mode 100644
index 0000000..0113341
--- /dev/null
+++ b/src/views/gasDashboard/components/watchGasAlarmBar.vue
@@ -0,0 +1,132 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/index.vue b/src/views/gasDashboard/index.vue
new file mode 100644
index 0000000..be583f2
--- /dev/null
+++ b/src/views/gasDashboard/index.vue
@@ -0,0 +1,191 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/gasOverview/gasOverviewSimple.vue b/src/views/gasOverview/gasOverviewSimple.vue
new file mode 100644
index 0000000..8ff468f
--- /dev/null
+++ b/src/views/gasOverview/gasOverviewSimple.vue
@@ -0,0 +1,1189 @@
+
+
+
+
+
+
+
+
+
diff --git a/src/views/jobManage/detailJob.vue b/src/views/jobManage/detailJob.vue
index 2d6aaa4..fe7e68e 100644
--- a/src/views/jobManage/detailJob.vue
+++ b/src/views/jobManage/detailJob.vue
@@ -205,8 +205,9 @@
// 获取工单详情
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 => {
+ console.log(response, ' ============response=')
this.loading = false
if (response.code === 200) {
if (response.data.length <= 0) {
@@ -217,26 +218,28 @@
// 处理现场图片
if (job.firstStatePhotos !== '') {
this.firstImageList = []
- const urls = job.firstStatePhotos.split(';')
+ const urls = job.firstStatePhotos.split(',')
for (const url of urls) {
if (url) {
// this.firstImageList.push({ name: url, url: base_url + url })
this.firstImageList.push(base_url + url)
}
}
+ console.log(this.firstImageList)
} else {
this.firstImageList = []
}
// 处理维护图片
if (job.handlePhotos.length !== '') {
this.handleImageList = []
- const urls = job.handlePhotos.split(';')
+ const urls = job.handlePhotos.split(',')
for (const url of urls) {
if (url) {
// this.handleImageList.push({ name: url, url: base_url + url })
this.handleImageList.push(base_url + url)
}
}
+ console.log(this.handleImageList)
} else {
this.handleImageList = []
}
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 @@
diff --git a/src/views/dataManage/deviceData/listCorrodeData.vue b/src/views/dataManage/deviceData/listCorrodeData.vue
new file mode 100644
index 0000000..1a20abb
--- /dev/null
+++ b/src/views/dataManage/deviceData/listCorrodeData.vue
@@ -0,0 +1,272 @@
+
+
-
-
@@ -28,7 +29,7 @@
- 导出记录
+ 导出记录
@@ -63,6 +64,7 @@
import { getGasData, batchExportGasData } from '@/api/data'
import DeptSelect from '../../../components/DeptSelect/index'
import { parseUrl } from '@/utils/parseutils'
+import { getSearchLastWeekTime } from '@/utils/dateutils'
export default {
name: 'ListGasData',
@@ -163,6 +165,7 @@
if (params && params.deviceType === '4' && params.devcode) {
this.listQuery.keywords = params.devcode
}
+ this.timeRange = getSearchLastWeekTime()
this.fetchData()
}
},
@@ -191,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/listGasflowData.vue b/src/views/dataManage/deviceData/listGasflowData.vue
new file mode 100644
index 0000000..9c5321a
--- /dev/null
+++ b/src/views/dataManage/deviceData/listGasflowData.vue
@@ -0,0 +1,311 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/alarmGasCountByType.vue b/src/views/gasDashboard/components/alarmGasCountByType.vue
new file mode 100644
index 0000000..4f80d3a
--- /dev/null
+++ b/src/views/gasDashboard/components/alarmGasCountByType.vue
@@ -0,0 +1,72 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue
index 97cdfdb..40b9a5e 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -5,10 +5,10 @@
+
+
+
+
+
+
+ 搜索
+
+
+
+
+
+
+
+ 导出记录
+
+
+
+
+
+
+ {{ scope.row[column.value] }}
+ {{ scope.row[column.value] }}
+
+
+
+
+
+ 数据列表
+
+ 数据列表
+
+
+
+
+
+
+
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 bf03fd1..dffd340 100644
--- a/src/views/dataManage/deviceData/listWaterData.vue
+++ b/src/views/dataManage/deviceData/listWaterData.vue
@@ -176,6 +176,12 @@
align: 'center'
},
{
+ text: '压力(Mpa)',
+ value: 'pressure',
+ width: 90,
+ align: 'center'
+ },
+ {
text: '今日用水量（立方米）',
value: 'dayCount',
align: 'center',
@@ -276,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) // 下载完成移除元素
@@ -311,9 +317,11 @@
}
getWatchData(this.listQuery).then((response) => {
this.list = response.data.rows.map(function(item) {
- item.areaFullName = item.areaFullName
- .replace('/', '')
- .replace('顶层', '')
+ item.totalCount = parseFloat(item.totalCount).toFixed(2)
+ item.dayCount = parseFloat(item.dayCount).toFixed(2)
+ item.monthCount = parseFloat(item.monthCount).toFixed(2)
+ item.pressure = parseFloat(item.pressure).toFixed(2)
+ item.areaFullName = item.areaFullName.replace('/', '').replace('顶层', '')
return item
})
this.total = parseInt(response.data.total)
diff --git a/src/views/dataManage/deviceData/waterHistory.vue b/src/views/dataManage/deviceData/waterHistory.vue
index 160dab7..42e3303 100644
--- a/src/views/dataManage/deviceData/waterHistory.vue
+++ b/src/views/dataManage/deviceData/waterHistory.vue
@@ -1,5 +1,5 @@
-
+
+
+
+
+
+
+ 搜索
+
+
+
+
+
+
+
+ 导出记录
+
+
+
+
+
+
+ {{
+ scope.row[column.value]
+ }}
+ {{
+ scope.row["areaFullName"] + '/' + scope.row[column.value]
+ }}
+ {{ scope.row[column.value] }}
+
+
+
+
+
+ 历史数据
+
+
+
+
+
+
+ 数据列表
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/AlarmNowList.vue b/src/views/gasDashboard/components/AlarmNowList.vue
new file mode 100644
index 0000000..890325f
--- /dev/null
+++ b/src/views/gasDashboard/components/AlarmNowList.vue
@@ -0,0 +1,35 @@
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/DeviceCount.vue b/src/views/gasDashboard/components/DeviceCount.vue
new file mode 100644
index 0000000..bffc9e9
--- /dev/null
+++ b/src/views/gasDashboard/components/DeviceCount.vue
@@ -0,0 +1,68 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/FunctionArea.vue b/src/views/gasDashboard/components/FunctionArea.vue
new file mode 100644
index 0000000..6401557
--- /dev/null
+++ b/src/views/gasDashboard/components/FunctionArea.vue
@@ -0,0 +1,140 @@
+
+
+
+ 本年度
+ 本季度
+ 近30日
+ 近7日
+ 今日
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/FunctionArea2.vue b/src/views/gasDashboard/components/FunctionArea2.vue
new file mode 100644
index 0000000..26a9f82
--- /dev/null
+++ b/src/views/gasDashboard/components/FunctionArea2.vue
@@ -0,0 +1,107 @@
+
+
+
+ 本年度
+ 本季度
+ 近30日
+ 近7日
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/PanelGroup.vue b/src/views/gasDashboard/components/PanelGroup.vue
new file mode 100644
index 0000000..103486e
--- /dev/null
+++ b/src/views/gasDashboard/components/PanelGroup.vue
@@ -0,0 +1,137 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/alarmLeakCountPie.vue b/src/views/gasDashboard/components/alarmLeakCountPie.vue
new file mode 100644
index 0000000..abfbc2d
--- /dev/null
+++ b/src/views/gasDashboard/components/alarmLeakCountPie.vue
@@ -0,0 +1,74 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/corrodeCountByDay.vue b/src/views/gasDashboard/components/corrodeCountByDay.vue
new file mode 100644
index 0000000..a410f29
--- /dev/null
+++ b/src/views/gasDashboard/components/corrodeCountByDay.vue
@@ -0,0 +1,100 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasAlarmTrend.vue b/src/views/gasDashboard/components/gasAlarmTrend.vue
new file mode 100644
index 0000000..a1d422e
--- /dev/null
+++ b/src/views/gasDashboard/components/gasAlarmTrend.vue
@@ -0,0 +1,100 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasCompare.vue b/src/views/gasDashboard/components/gasCompare.vue
new file mode 100644
index 0000000..19a4398
--- /dev/null
+++ b/src/views/gasDashboard/components/gasCompare.vue
@@ -0,0 +1,121 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasCountByAreaBar.vue b/src/views/gasDashboard/components/gasCountByAreaBar.vue
new file mode 100644
index 0000000..456a6c6
--- /dev/null
+++ b/src/views/gasDashboard/components/gasCountByAreaBar.vue
@@ -0,0 +1,198 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasCountByDay.vue b/src/views/gasDashboard/components/gasCountByDay.vue
new file mode 100644
index 0000000..f0a3977
--- /dev/null
+++ b/src/views/gasDashboard/components/gasCountByDay.vue
@@ -0,0 +1,114 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasCountByDept.vue b/src/views/gasDashboard/components/gasCountByDept.vue
new file mode 100644
index 0000000..31c8508
--- /dev/null
+++ b/src/views/gasDashboard/components/gasCountByDept.vue
@@ -0,0 +1,126 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasCountByDeviceBar.vue b/src/views/gasDashboard/components/gasCountByDeviceBar.vue
new file mode 100644
index 0000000..dc211e3
--- /dev/null
+++ b/src/views/gasDashboard/components/gasCountByDeviceBar.vue
@@ -0,0 +1,130 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/gasNote.vue b/src/views/gasDashboard/components/gasNote.vue
new file mode 100644
index 0000000..5ade90f
--- /dev/null
+++ b/src/views/gasDashboard/components/gasNote.vue
@@ -0,0 +1,149 @@
+
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/watchAlarmBar.vue b/src/views/gasDashboard/components/watchAlarmBar.vue
new file mode 100644
index 0000000..4279440
--- /dev/null
+++ b/src/views/gasDashboard/components/watchAlarmBar.vue
@@ -0,0 +1,180 @@
+
+
+
+ 场区用气事记
+
+
+
+
+
+
+
+
+
+ {{ index+1 }}. {{ item.content }}
+
+
+ {{ index+1 }}.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/components/watchGasAlarmBar.vue b/src/views/gasDashboard/components/watchGasAlarmBar.vue
new file mode 100644
index 0000000..0113341
--- /dev/null
+++ b/src/views/gasDashboard/components/watchGasAlarmBar.vue
@@ -0,0 +1,132 @@
+
+
+
+
+
+
+
diff --git a/src/views/gasDashboard/index.vue b/src/views/gasDashboard/index.vue
new file mode 100644
index 0000000..be583f2
--- /dev/null
+++ b/src/views/gasDashboard/index.vue
@@ -0,0 +1,191 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/gasOverview/gasOverviewSimple.vue b/src/views/gasOverview/gasOverviewSimple.vue
new file mode 100644
index 0000000..8ff468f
--- /dev/null
+++ b/src/views/gasOverview/gasOverviewSimple.vue
@@ -0,0 +1,1189 @@
+
+
+
+
+
+
+
+
+
diff --git a/src/views/jobManage/detailJob.vue b/src/views/jobManage/detailJob.vue
index 2d6aaa4..fe7e68e 100644
--- a/src/views/jobManage/detailJob.vue
+++ b/src/views/jobManage/detailJob.vue
@@ -205,8 +205,9 @@
// 获取工单详情
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 => {
+ console.log(response, ' ============response=')
this.loading = false
if (response.code === 200) {
if (response.data.length <= 0) {
@@ -217,26 +218,28 @@
// 处理现场图片
if (job.firstStatePhotos !== '') {
this.firstImageList = []
- const urls = job.firstStatePhotos.split(';')
+ const urls = job.firstStatePhotos.split(',')
for (const url of urls) {
if (url) {
// this.firstImageList.push({ name: url, url: base_url + url })
this.firstImageList.push(base_url + url)
}
}
+ console.log(this.firstImageList)
} else {
this.firstImageList = []
}
// 处理维护图片
if (job.handlePhotos.length !== '') {
this.handleImageList = []
- const urls = job.handlePhotos.split(';')
+ const urls = job.handlePhotos.split(',')
for (const url of urls) {
if (url) {
// this.handleImageList.push({ name: url, url: base_url + url })
this.handleImageList.push(base_url + url)
}
}
+ console.log(this.handleImageList)
} else {
this.handleImageList = []
}
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 @@