-
- {{ title[0] }} {{ context[0] }}{{ unit }}
-
-
- {{ title[1] }} {{ context[1] }}-->
+
+
+
@@ -41,7 +31,7 @@
props: {
title: {
type: Array,
- default: function () {
+ default: function() {
return ['标题', '标题']
}
},
@@ -55,7 +45,7 @@
},
context: {
type: Array,
- default: function () {
+ default: function() {
return ['--', '--']
}
},
@@ -83,6 +73,8 @@
height: 108px;
font-size: 12px;
position: relative;
+ display: flex;
+ align-items: center;
overflow: hidden;
color: #666;
background: #fff;
@@ -96,7 +88,6 @@
}
.card-panel-icon-wrapper {
- float: left;
margin: 14px 0 0 10px;
padding: 16px 2px;
transition: all 0.38s ease-out;
@@ -109,25 +100,22 @@
}
.card-panel-description {
- float: left;
+ flex:1;
font-weight: bold;
- margin-top: 26px;
overflow: auto;
margin-left: 5px;
.two {
.card-panel-text {
- line-height: 18px;
+ line-height: 26px;
color: rgba(0, 0, 0, 0.45);
font-size: 14px;
- margin-bottom: 12px;
+ display: flex;
+ justify-content: space-between;
}
-
.card-panel-num {
font-size: 18px;
color: #666;
- padding-left: 10px;
- float: right;
}
}
.only {
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/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/src/api/gasOverview.js b/src/api/gasOverview.js
index 559a078..0dc3442 100644
--- a/src/api/gasOverview.js
+++ b/src/api/gasOverview.js
@@ -11,14 +11,50 @@
})
}
-// 气体流量计数量
-// export function deviceCount(params) {
-// return request({
-// url: 'device/count/15',
-// method: 'get',
-// params
-// })
-// }
+// 用水量、噪声统计数据
+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({
@@ -56,7 +92,7 @@
// 查询二级分区燃气告警
export function gasAlarmBySecondArea(params) {
return request({
- url: 'dataStatistic/gasAlarmBySecondArea',
+ url: 'gas/alarm/rate',
method: 'get',
params
})
diff --git a/src/components/BigData/Card1/index.vue b/src/components/BigData/Card1/index.vue
index 748747b..c9ec32d 100644
--- a/src/components/BigData/Card1/index.vue
+++ b/src/components/BigData/Card1/index.vue
@@ -4,21 +4,11 @@
-
-
+ {{ name }} {{ context[index] }}{{ unit }}
-
-
-
- {{ title[0] }} {{ context[0] }}{{ unit }}
-
-
- {{ title[1] }} {{ context[1] }}-->
+
+
+
@@ -41,7 +31,7 @@
props: {
title: {
type: Array,
- default: function () {
+ default: function() {
return ['标题', '标题']
}
},
@@ -55,7 +45,7 @@
},
context: {
type: Array,
- default: function () {
+ default: function() {
return ['--', '--']
}
},
@@ -83,6 +73,8 @@
height: 108px;
font-size: 12px;
position: relative;
+ display: flex;
+ align-items: center;
overflow: hidden;
color: #666;
background: #fff;
@@ -96,7 +88,6 @@
}
.card-panel-icon-wrapper {
- float: left;
margin: 14px 0 0 10px;
padding: 16px 2px;
transition: all 0.38s ease-out;
@@ -109,25 +100,22 @@
}
.card-panel-description {
- float: left;
+ flex:1;
font-weight: bold;
- margin-top: 26px;
overflow: auto;
margin-left: 5px;
.two {
.card-panel-text {
- line-height: 18px;
+ line-height: 26px;
color: rgba(0, 0, 0, 0.45);
font-size: 14px;
- margin-bottom: 12px;
+ display: flex;
+ justify-content: space-between;
}
-
.card-panel-num {
font-size: 18px;
color: #666;
- padding-left: 10px;
- float: right;
}
}
.only {
diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js
index aa41264..11dc521 100644
--- a/src/utils/dateutils.js
+++ b/src/utils/dateutils.js
@@ -52,3 +52,13 @@
}
return fmt
}
+
+/**
+ * 获取近1周日期范围
+ * @returns {*[]}
+ */
+export function getSearchLastWeekTime() {
+ const startTime = getLastWeek().Format('yyyy-MM-dd hh:mm:ss')
+ const endTime = getToday('yyyy-MM-dd hh:mm:ss')
+ return [startTime, endTime]
+}
diff --git a/config/dev.env.js b/config/dev.env.js
index 36f7d4a..1cab225 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -9,6 +9,6 @@
// BASE_API: '"http://42.81.160.165:2022/smartwell"'
// BASE_API: '"http://111.198.10.15:11304"'
// BASE_API: '"http://111.198.10.15:11643"'
- // BASE_API: '"http://111.198.10.15:11409/smartwell"' //可以用
- BASE_API: '"http://192.168.43.66:11643/smartwell"' //彭先洪
+ BASE_API: '"http://111.198.10.15:11409/smartwell"' //可以用
+ // BASE_API: '"http://192.168.43.66:11643/smartwell"' //彭先洪
})
diff --git a/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/src/api/gasOverview.js b/src/api/gasOverview.js
index 559a078..0dc3442 100644
--- a/src/api/gasOverview.js
+++ b/src/api/gasOverview.js
@@ -11,14 +11,50 @@
})
}
-// 气体流量计数量
-// export function deviceCount(params) {
-// return request({
-// url: 'device/count/15',
-// method: 'get',
-// params
-// })
-// }
+// 用水量、噪声统计数据
+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({
@@ -56,7 +92,7 @@
// 查询二级分区燃气告警
export function gasAlarmBySecondArea(params) {
return request({
- url: 'dataStatistic/gasAlarmBySecondArea',
+ url: 'gas/alarm/rate',
method: 'get',
params
})
diff --git a/src/components/BigData/Card1/index.vue b/src/components/BigData/Card1/index.vue
index 748747b..c9ec32d 100644
--- a/src/components/BigData/Card1/index.vue
+++ b/src/components/BigData/Card1/index.vue
@@ -4,21 +4,11 @@
-
-
+ {{ name }} {{ context[index] }}{{ unit }}
-
-
-
- {{ title[0] }} {{ context[0] }}{{ unit }}
-
-
- {{ title[1] }} {{ context[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/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/src/api/gasOverview.js b/src/api/gasOverview.js
index 559a078..0dc3442 100644
--- a/src/api/gasOverview.js
+++ b/src/api/gasOverview.js
@@ -11,14 +11,50 @@
})
}
-// 气体流量计数量
-// export function deviceCount(params) {
-// return request({
-// url: 'device/count/15',
-// method: 'get',
-// params
-// })
-// }
+// 用水量、噪声统计数据
+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({
@@ -56,7 +92,7 @@
// 查询二级分区燃气告警
export function gasAlarmBySecondArea(params) {
return request({
- url: 'dataStatistic/gasAlarmBySecondArea',
+ url: 'gas/alarm/rate',
method: 'get',
params
})
diff --git a/src/components/BigData/Card1/index.vue b/src/components/BigData/Card1/index.vue
index 748747b..c9ec32d 100644
--- a/src/components/BigData/Card1/index.vue
+++ b/src/components/BigData/Card1/index.vue
@@ -4,21 +4,11 @@
-
-
+
@@ -41,7 +31,7 @@
props: {
title: {
type: Array,
- default: function () {
+ default: function() {
return ['标题', '标题']
}
},
@@ -55,7 +45,7 @@
},
context: {
type: Array,
- default: function () {
+ default: function() {
return ['--', '--']
}
},
@@ -83,6 +73,8 @@
height: 108px;
font-size: 12px;
position: relative;
+ display: flex;
+ align-items: center;
overflow: hidden;
color: #666;
background: #fff;
@@ -96,7 +88,6 @@
}
.card-panel-icon-wrapper {
- float: left;
margin: 14px 0 0 10px;
padding: 16px 2px;
transition: all 0.38s ease-out;
@@ -109,25 +100,22 @@
}
.card-panel-description {
- float: left;
+ flex:1;
font-weight: bold;
- margin-top: 26px;
overflow: auto;
margin-left: 5px;
.two {
.card-panel-text {
- line-height: 18px;
+ line-height: 26px;
color: rgba(0, 0, 0, 0.45);
font-size: 14px;
- margin-bottom: 12px;
+ display: flex;
+ justify-content: space-between;
}
-
.card-panel-num {
font-size: 18px;
color: #666;
- padding-left: 10px;
- float: right;
}
}
.only {
diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js
index aa41264..11dc521 100644
--- a/src/utils/dateutils.js
+++ b/src/utils/dateutils.js
@@ -52,3 +52,13 @@
}
return fmt
}
+
+/**
+ * 获取近1周日期范围
+ * @returns {*[]}
+ */
+export function getSearchLastWeekTime() {
+ const startTime = getLastWeek().Format('yyyy-MM-dd hh:mm:ss')
+ const endTime = getToday('yyyy-MM-dd hh:mm:ss')
+ return [startTime, endTime]
+}
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 97345d9..283c8ef 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -5,7 +5,7 @@
+ {{ name }} {{ context[index] }}{{ unit }}
-
-
-
- {{ title[0] }} {{ context[0] }}{{ unit }}
-
-
- {{ title[1] }} {{ context[1] }}-->
+
+
-
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index 8301f8c..03047ac 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -4,7 +4,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/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/src/api/gasOverview.js b/src/api/gasOverview.js
index 559a078..0dc3442 100644
--- a/src/api/gasOverview.js
+++ b/src/api/gasOverview.js
@@ -11,14 +11,50 @@
})
}
-// 气体流量计数量
-// export function deviceCount(params) {
-// return request({
-// url: 'device/count/15',
-// method: 'get',
-// params
-// })
-// }
+// 用水量、噪声统计数据
+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({
@@ -56,7 +92,7 @@
// 查询二级分区燃气告警
export function gasAlarmBySecondArea(params) {
return request({
- url: 'dataStatistic/gasAlarmBySecondArea',
+ url: 'gas/alarm/rate',
method: 'get',
params
})
diff --git a/src/components/BigData/Card1/index.vue b/src/components/BigData/Card1/index.vue
index 748747b..c9ec32d 100644
--- a/src/components/BigData/Card1/index.vue
+++ b/src/components/BigData/Card1/index.vue
@@ -4,21 +4,11 @@
-
-
+
@@ -41,7 +31,7 @@
props: {
title: {
type: Array,
- default: function () {
+ default: function() {
return ['标题', '标题']
}
},
@@ -55,7 +45,7 @@
},
context: {
type: Array,
- default: function () {
+ default: function() {
return ['--', '--']
}
},
@@ -83,6 +73,8 @@
height: 108px;
font-size: 12px;
position: relative;
+ display: flex;
+ align-items: center;
overflow: hidden;
color: #666;
background: #fff;
@@ -96,7 +88,6 @@
}
.card-panel-icon-wrapper {
- float: left;
margin: 14px 0 0 10px;
padding: 16px 2px;
transition: all 0.38s ease-out;
@@ -109,25 +100,22 @@
}
.card-panel-description {
- float: left;
+ flex:1;
font-weight: bold;
- margin-top: 26px;
overflow: auto;
margin-left: 5px;
.two {
.card-panel-text {
- line-height: 18px;
+ line-height: 26px;
color: rgba(0, 0, 0, 0.45);
font-size: 14px;
- margin-bottom: 12px;
+ display: flex;
+ justify-content: space-between;
}
-
.card-panel-num {
font-size: 18px;
color: #666;
- padding-left: 10px;
- float: right;
}
}
.only {
diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js
index aa41264..11dc521 100644
--- a/src/utils/dateutils.js
+++ b/src/utils/dateutils.js
@@ -52,3 +52,13 @@
}
return fmt
}
+
+/**
+ * 获取近1周日期范围
+ * @returns {*[]}
+ */
+export function getSearchLastWeekTime() {
+ const startTime = getLastWeek().Format('yyyy-MM-dd hh:mm:ss')
+ const endTime = getToday('yyyy-MM-dd hh:mm:ss')
+ return [startTime, endTime]
+}
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 97345d9..283c8ef 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -5,7 +5,7 @@
+ {{ name }} {{ context[index] }}{{ unit }}
-
-
-
- {{ title[0] }} {{ context[0] }}{{ unit }}
-
-
- {{ title[1] }} {{ context[1] }}-->
+
+
-
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index 8301f8c..03047ac 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -4,7 +4,7 @@
-
diff --git a/src/views/dashboard/components/AlarmByDays.vue b/src/views/dashboard/components/AlarmByDays.vue
index ddfd8e3..8a9a937 100644
--- a/src/views/dashboard/components/AlarmByDays.vue
+++ b/src/views/dashboard/components/AlarmByDays.vue
@@ -23,11 +23,11 @@
}
this.chartSettings = {
labelMap: {
- '远传水表': '远传水表',
+ '远程水表': '远程水表',
'噪声记录仪': '噪声记录仪',
'液位监测仪': '液位监测仪'
},
- metrics: ['远传水表', '噪声记录仪', '液位监测仪'],
+ metrics: ['远程水表', '噪声记录仪', '液位监测仪'],
dimension: ['date']
}
return {
@@ -37,7 +37,7 @@
endTime: ''
},
chartData: {
- columns: ['date', '远传水表', '噪声记录仪', '液位监测仪'],
+ columns: ['date', '远程水表', '噪声记录仪', '液位监测仪'],
rows: []
}
}
@@ -65,7 +65,7 @@
delete item.data
return item
})
-
+
this.chartData.rows = arr
})
},
diff --git a/config/dev.env.js b/config/dev.env.js
index 36f7d4a..1cab225 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -9,6 +9,6 @@
// BASE_API: '"http://42.81.160.165:2022/smartwell"'
// BASE_API: '"http://111.198.10.15:11304"'
// BASE_API: '"http://111.198.10.15:11643"'
- // BASE_API: '"http://111.198.10.15:11409/smartwell"' //可以用
- BASE_API: '"http://192.168.43.66:11643/smartwell"' //彭先洪
+ BASE_API: '"http://111.198.10.15:11409/smartwell"' //可以用
+ // BASE_API: '"http://192.168.43.66:11643/smartwell"' //彭先洪
})
diff --git a/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/src/api/gasOverview.js b/src/api/gasOverview.js
index 559a078..0dc3442 100644
--- a/src/api/gasOverview.js
+++ b/src/api/gasOverview.js
@@ -11,14 +11,50 @@
})
}
-// 气体流量计数量
-// export function deviceCount(params) {
-// return request({
-// url: 'device/count/15',
-// method: 'get',
-// params
-// })
-// }
+// 用水量、噪声统计数据
+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({
@@ -56,7 +92,7 @@
// 查询二级分区燃气告警
export function gasAlarmBySecondArea(params) {
return request({
- url: 'dataStatistic/gasAlarmBySecondArea',
+ url: 'gas/alarm/rate',
method: 'get',
params
})
diff --git a/src/components/BigData/Card1/index.vue b/src/components/BigData/Card1/index.vue
index 748747b..c9ec32d 100644
--- a/src/components/BigData/Card1/index.vue
+++ b/src/components/BigData/Card1/index.vue
@@ -4,21 +4,11 @@
-
-
+
@@ -41,7 +31,7 @@
props: {
title: {
type: Array,
- default: function () {
+ default: function() {
return ['标题', '标题']
}
},
@@ -55,7 +45,7 @@
},
context: {
type: Array,
- default: function () {
+ default: function() {
return ['--', '--']
}
},
@@ -83,6 +73,8 @@
height: 108px;
font-size: 12px;
position: relative;
+ display: flex;
+ align-items: center;
overflow: hidden;
color: #666;
background: #fff;
@@ -96,7 +88,6 @@
}
.card-panel-icon-wrapper {
- float: left;
margin: 14px 0 0 10px;
padding: 16px 2px;
transition: all 0.38s ease-out;
@@ -109,25 +100,22 @@
}
.card-panel-description {
- float: left;
+ flex:1;
font-weight: bold;
- margin-top: 26px;
overflow: auto;
margin-left: 5px;
.two {
.card-panel-text {
- line-height: 18px;
+ line-height: 26px;
color: rgba(0, 0, 0, 0.45);
font-size: 14px;
- margin-bottom: 12px;
+ display: flex;
+ justify-content: space-between;
}
-
.card-panel-num {
font-size: 18px;
color: #666;
- padding-left: 10px;
- float: right;
}
}
.only {
diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js
index aa41264..11dc521 100644
--- a/src/utils/dateutils.js
+++ b/src/utils/dateutils.js
@@ -52,3 +52,13 @@
}
return fmt
}
+
+/**
+ * 获取近1周日期范围
+ * @returns {*[]}
+ */
+export function getSearchLastWeekTime() {
+ const startTime = getLastWeek().Format('yyyy-MM-dd hh:mm:ss')
+ const endTime = getToday('yyyy-MM-dd hh:mm:ss')
+ return [startTime, endTime]
+}
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 97345d9..283c8ef 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -5,7 +5,7 @@
+ {{ name }} {{ context[index] }}{{ unit }}
-
-
-
- {{ title[0] }} {{ context[0] }}{{ unit }}
-
-
- {{ title[1] }} {{ context[1] }}-->
+
+
-
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index 8301f8c..03047ac 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -4,7 +4,7 @@
-
diff --git a/src/views/dashboard/components/AlarmByDays.vue b/src/views/dashboard/components/AlarmByDays.vue
index ddfd8e3..8a9a937 100644
--- a/src/views/dashboard/components/AlarmByDays.vue
+++ b/src/views/dashboard/components/AlarmByDays.vue
@@ -23,11 +23,11 @@
}
this.chartSettings = {
labelMap: {
- '远传水表': '远传水表',
+ '远程水表': '远程水表',
'噪声记录仪': '噪声记录仪',
'液位监测仪': '液位监测仪'
},
- metrics: ['远传水表', '噪声记录仪', '液位监测仪'],
+ metrics: ['远程水表', '噪声记录仪', '液位监测仪'],
dimension: ['date']
}
return {
@@ -37,7 +37,7 @@
endTime: ''
},
chartData: {
- columns: ['date', '远传水表', '噪声记录仪', '液位监测仪'],
+ columns: ['date', '远程水表', '噪声记录仪', '液位监测仪'],
rows: []
}
}
@@ -65,7 +65,7 @@
delete item.data
return item
})
-
+
this.chartData.rows = arr
})
},
diff --git a/src/views/dashboard/components/FunctionArea.vue b/src/views/dashboard/components/FunctionArea.vue
index 4c05cee..6401557 100644
--- a/src/views/dashboard/components/FunctionArea.vue
+++ b/src/views/dashboard/components/FunctionArea.vue
@@ -5,11 +5,11 @@
-->
+
@@ -41,7 +31,7 @@
props: {
title: {
type: Array,
- default: function () {
+ default: function() {
return ['标题', '标题']
}
},
@@ -55,7 +45,7 @@
},
context: {
type: Array,
- default: function () {
+ default: function() {
return ['--', '--']
}
},
@@ -83,6 +73,8 @@
height: 108px;
font-size: 12px;
position: relative;
+ display: flex;
+ align-items: center;
overflow: hidden;
color: #666;
background: #fff;
@@ -96,7 +88,6 @@
}
.card-panel-icon-wrapper {
- float: left;
margin: 14px 0 0 10px;
padding: 16px 2px;
transition: all 0.38s ease-out;
@@ -109,25 +100,22 @@
}
.card-panel-description {
- float: left;
+ flex:1;
font-weight: bold;
- margin-top: 26px;
overflow: auto;
margin-left: 5px;
.two {
.card-panel-text {
- line-height: 18px;
+ line-height: 26px;
color: rgba(0, 0, 0, 0.45);
font-size: 14px;
- margin-bottom: 12px;
+ display: flex;
+ justify-content: space-between;
}
-
.card-panel-num {
font-size: 18px;
color: #666;
- padding-left: 10px;
- float: right;
}
}
.only {
diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js
index aa41264..11dc521 100644
--- a/src/utils/dateutils.js
+++ b/src/utils/dateutils.js
@@ -52,3 +52,13 @@
}
return fmt
}
+
+/**
+ * 获取近1周日期范围
+ * @returns {*[]}
+ */
+export function getSearchLastWeekTime() {
+ const startTime = getLastWeek().Format('yyyy-MM-dd hh:mm:ss')
+ const endTime = getToday('yyyy-MM-dd hh:mm:ss')
+ return [startTime, endTime]
+}
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 97345d9..283c8ef 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -5,7 +5,7 @@
+ {{ name }} {{ context[index] }}{{ unit }}
- 本年度
- 本季度
- 近30日
- 近7日
- 今日
+ 本年度
+ 本季度
+ 近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/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/src/api/gasOverview.js b/src/api/gasOverview.js
index 559a078..0dc3442 100644
--- a/src/api/gasOverview.js
+++ b/src/api/gasOverview.js
@@ -11,14 +11,50 @@
})
}
-// 气体流量计数量
-// export function deviceCount(params) {
-// return request({
-// url: 'device/count/15',
-// method: 'get',
-// params
-// })
-// }
+// 用水量、噪声统计数据
+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({
@@ -56,7 +92,7 @@
// 查询二级分区燃气告警
export function gasAlarmBySecondArea(params) {
return request({
- url: 'dataStatistic/gasAlarmBySecondArea',
+ url: 'gas/alarm/rate',
method: 'get',
params
})
diff --git a/src/components/BigData/Card1/index.vue b/src/components/BigData/Card1/index.vue
index 748747b..c9ec32d 100644
--- a/src/components/BigData/Card1/index.vue
+++ b/src/components/BigData/Card1/index.vue
@@ -4,21 +4,11 @@
-
-
-
-
-
- {{ title[0] }} {{ context[0] }}{{ unit }}
-
-
- {{ title[1] }} {{ context[1] }}-->
+
+
-
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index 8301f8c..03047ac 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -4,7 +4,7 @@
-
diff --git a/src/views/dashboard/components/AlarmByDays.vue b/src/views/dashboard/components/AlarmByDays.vue
index ddfd8e3..8a9a937 100644
--- a/src/views/dashboard/components/AlarmByDays.vue
+++ b/src/views/dashboard/components/AlarmByDays.vue
@@ -23,11 +23,11 @@
}
this.chartSettings = {
labelMap: {
- '远传水表': '远传水表',
+ '远程水表': '远程水表',
'噪声记录仪': '噪声记录仪',
'液位监测仪': '液位监测仪'
},
- metrics: ['远传水表', '噪声记录仪', '液位监测仪'],
+ metrics: ['远程水表', '噪声记录仪', '液位监测仪'],
dimension: ['date']
}
return {
@@ -37,7 +37,7 @@
endTime: ''
},
chartData: {
- columns: ['date', '远传水表', '噪声记录仪', '液位监测仪'],
+ columns: ['date', '远程水表', '噪声记录仪', '液位监测仪'],
rows: []
}
}
@@ -65,7 +65,7 @@
delete item.data
return item
})
-
+
this.chartData.rows = arr
})
},
diff --git a/src/views/dashboard/components/FunctionArea.vue b/src/views/dashboard/components/FunctionArea.vue
index 4c05cee..6401557 100644
--- a/src/views/dashboard/components/FunctionArea.vue
+++ b/src/views/dashboard/components/FunctionArea.vue
@@ -5,11 +5,11 @@
-->
+
@@ -41,7 +31,7 @@
props: {
title: {
type: Array,
- default: function () {
+ default: function() {
return ['标题', '标题']
}
},
@@ -55,7 +45,7 @@
},
context: {
type: Array,
- default: function () {
+ default: function() {
return ['--', '--']
}
},
@@ -83,6 +73,8 @@
height: 108px;
font-size: 12px;
position: relative;
+ display: flex;
+ align-items: center;
overflow: hidden;
color: #666;
background: #fff;
@@ -96,7 +88,6 @@
}
.card-panel-icon-wrapper {
- float: left;
margin: 14px 0 0 10px;
padding: 16px 2px;
transition: all 0.38s ease-out;
@@ -109,25 +100,22 @@
}
.card-panel-description {
- float: left;
+ flex:1;
font-weight: bold;
- margin-top: 26px;
overflow: auto;
margin-left: 5px;
.two {
.card-panel-text {
- line-height: 18px;
+ line-height: 26px;
color: rgba(0, 0, 0, 0.45);
font-size: 14px;
- margin-bottom: 12px;
+ display: flex;
+ justify-content: space-between;
}
-
.card-panel-num {
font-size: 18px;
color: #666;
- padding-left: 10px;
- float: right;
}
}
.only {
diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js
index aa41264..11dc521 100644
--- a/src/utils/dateutils.js
+++ b/src/utils/dateutils.js
@@ -52,3 +52,13 @@
}
return fmt
}
+
+/**
+ * 获取近1周日期范围
+ * @returns {*[]}
+ */
+export function getSearchLastWeekTime() {
+ const startTime = getLastWeek().Format('yyyy-MM-dd hh:mm:ss')
+ const endTime = getToday('yyyy-MM-dd hh:mm:ss')
+ return [startTime, endTime]
+}
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 97345d9..283c8ef 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -5,7 +5,7 @@
+ {{ name }} {{ context[index] }}{{ unit }}
- 本年度
- 本季度
- 近30日
- 近7日
- 今日
+ 本年度
+ 本季度
+ 近30日
+ 近7日
+ 今日
diff --git a/src/views/gasDashboard/components/PanelGroup.vue b/src/views/gasDashboard/components/PanelGroup.vue
index eead839..5613860 100644
--- a/src/views/gasDashboard/components/PanelGroup.vue
+++ b/src/views/gasDashboard/components/PanelGroup.vue
@@ -17,6 +17,7 @@
import Card from '@/components/BigData/Card'
// 首页
import { gasStatistic, deviceCount, alarmNowStatic } from '@/api/gasOverview'
+import { gasStatistic2 } from '../../../api/gasOverview'
export default {
components: {
Card,
@@ -26,40 +27,40 @@
return {
dataGroup1: [
{
- title: ['总用气量', '本月用气量'],
- context: ['--', '--'],
+ title: ['CO₂总用气量', 'CO₂本月用气量', 'CO₂今日用气量'],
+ context: ['--', '--', '--'],
icon: '',
color: '#40c9c6',
- unit: '吨',
+ unit: 'Nm³',
index: 0
},
{
- title: ['今日用气量', '生产厂区用气量'],
- context: ['--', '--'],
+ title: ['O₂总用气量', 'O₂本月用气量', 'O₂今日用气量'],
+ context: ['--', '--', '--'],
icon: '',
color: '#36a3f7',
- unit: '吨',
+ unit: 'Nm³',
index: 1
},
{
+ title: ['燃气总用气量', '燃气本月用气量', '燃气今日用气量'],
+ context: ['--', '--', '--'],
+ icon: '',
+ color: '#36a3f7',
+ unit: 'Nm³',
+ index: 2
+ },
+ {
title: ['滑道实时噪声'],
context: ['--'],
icon: 'icon-noise',
color: '#f1c353',
unit: 'db',
- index: 2
+ index: 3
}
],
dataGroup: [
{
- title: '气体流量计',
- context: '--',
- icon: 'icon-watch',
- color: '#9694f7',
- path: '/deviceList?deviceType=13',
- permission: '/device/list'
- },
- {
title: '告警信息',
context: '--',
icon: 'icon-alarm',
@@ -73,7 +74,7 @@
mounted() {
this.getWater()
// this.getWellCount()
- this.getDeviceCount()
+ // this.getDeviceCount()
this.getAlarmCount()
},
methods: {
@@ -83,19 +84,21 @@
getWater() {
// 用气量
gasStatistic().then(response => {
- this.dataGroup1[0].context = [response.data.total ? parseFloat(response.data.total).toFixed(2) : '--', response.data.month ? parseFloat(response.data.month).toFixed(2) : '--']
- this.dataGroup1[1].context = [response.data.today ? parseFloat(response.data.today).toFixed(2) : '--', response.data.prodution ? parseFloat(response.data.prodution).toFixed(2) : '--']
- this.dataGroup1[2].context = [response.data.sound ? Number(response.data.sound).toFixed(2) : '--']
+ this.dataGroup1[3].context = [response.data.sound ? Number(response.data.sound).toFixed(2) : '--']
})
- },
- getDeviceCount() {
- deviceCount('15').then(response => {
- this.dataGroup[0].context = response.data
+ gasStatistic2('15').then(response => {
+ this.dataGroup1[0].context = [response.data.total.toFixed(2), response.data.month.toFixed(2), response.data.day === '' ? '--' : response.data.day.toFixed(2)]
+ })
+ gasStatistic2('16').then(response => {
+ this.dataGroup1[1].context = [response.data.total.toFixed(2), response.data.month.toFixed(2), response.data.day === '' ? '--' : response.data.day.toFixed(2)]
+ })
+ gasStatistic2('17').then(response => {
+ this.dataGroup1[2].context = [response.data.total.toFixed(2), response.data.month.toFixed(2), response.data.day === '' ? '--' : response.data.day.toFixed(2)]
})
},
getAlarmCount() {
alarmNowStatic().then(response => {
- this.dataGroup[1].context = response.data.total
+ this.dataGroup[0].context = 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/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/src/api/gasOverview.js b/src/api/gasOverview.js
index 559a078..0dc3442 100644
--- a/src/api/gasOverview.js
+++ b/src/api/gasOverview.js
@@ -11,14 +11,50 @@
})
}
-// 气体流量计数量
-// export function deviceCount(params) {
-// return request({
-// url: 'device/count/15',
-// method: 'get',
-// params
-// })
-// }
+// 用水量、噪声统计数据
+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({
@@ -56,7 +92,7 @@
// 查询二级分区燃气告警
export function gasAlarmBySecondArea(params) {
return request({
- url: 'dataStatistic/gasAlarmBySecondArea',
+ url: 'gas/alarm/rate',
method: 'get',
params
})
diff --git a/src/components/BigData/Card1/index.vue b/src/components/BigData/Card1/index.vue
index 748747b..c9ec32d 100644
--- a/src/components/BigData/Card1/index.vue
+++ b/src/components/BigData/Card1/index.vue
@@ -4,21 +4,11 @@
-
-
-
-
-
- {{ title[0] }} {{ context[0] }}{{ unit }}
-
-
- {{ title[1] }} {{ context[1] }}-->
+
+
-
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index 8301f8c..03047ac 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -4,7 +4,7 @@
-
diff --git a/src/views/dashboard/components/AlarmByDays.vue b/src/views/dashboard/components/AlarmByDays.vue
index ddfd8e3..8a9a937 100644
--- a/src/views/dashboard/components/AlarmByDays.vue
+++ b/src/views/dashboard/components/AlarmByDays.vue
@@ -23,11 +23,11 @@
}
this.chartSettings = {
labelMap: {
- '远传水表': '远传水表',
+ '远程水表': '远程水表',
'噪声记录仪': '噪声记录仪',
'液位监测仪': '液位监测仪'
},
- metrics: ['远传水表', '噪声记录仪', '液位监测仪'],
+ metrics: ['远程水表', '噪声记录仪', '液位监测仪'],
dimension: ['date']
}
return {
@@ -37,7 +37,7 @@
endTime: ''
},
chartData: {
- columns: ['date', '远传水表', '噪声记录仪', '液位监测仪'],
+ columns: ['date', '远程水表', '噪声记录仪', '液位监测仪'],
rows: []
}
}
@@ -65,7 +65,7 @@
delete item.data
return item
})
-
+
this.chartData.rows = arr
})
},
diff --git a/src/views/dashboard/components/FunctionArea.vue b/src/views/dashboard/components/FunctionArea.vue
index 4c05cee..6401557 100644
--- a/src/views/dashboard/components/FunctionArea.vue
+++ b/src/views/dashboard/components/FunctionArea.vue
@@ -5,11 +5,11 @@
-->
+
@@ -41,7 +31,7 @@
props: {
title: {
type: Array,
- default: function () {
+ default: function() {
return ['标题', '标题']
}
},
@@ -55,7 +45,7 @@
},
context: {
type: Array,
- default: function () {
+ default: function() {
return ['--', '--']
}
},
@@ -83,6 +73,8 @@
height: 108px;
font-size: 12px;
position: relative;
+ display: flex;
+ align-items: center;
overflow: hidden;
color: #666;
background: #fff;
@@ -96,7 +88,6 @@
}
.card-panel-icon-wrapper {
- float: left;
margin: 14px 0 0 10px;
padding: 16px 2px;
transition: all 0.38s ease-out;
@@ -109,25 +100,22 @@
}
.card-panel-description {
- float: left;
+ flex:1;
font-weight: bold;
- margin-top: 26px;
overflow: auto;
margin-left: 5px;
.two {
.card-panel-text {
- line-height: 18px;
+ line-height: 26px;
color: rgba(0, 0, 0, 0.45);
font-size: 14px;
- margin-bottom: 12px;
+ display: flex;
+ justify-content: space-between;
}
-
.card-panel-num {
font-size: 18px;
color: #666;
- padding-left: 10px;
- float: right;
}
}
.only {
diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js
index aa41264..11dc521 100644
--- a/src/utils/dateutils.js
+++ b/src/utils/dateutils.js
@@ -52,3 +52,13 @@
}
return fmt
}
+
+/**
+ * 获取近1周日期范围
+ * @returns {*[]}
+ */
+export function getSearchLastWeekTime() {
+ const startTime = getLastWeek().Format('yyyy-MM-dd hh:mm:ss')
+ const endTime = getToday('yyyy-MM-dd hh:mm:ss')
+ return [startTime, endTime]
+}
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 97345d9..283c8ef 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -5,7 +5,7 @@
+ {{ name }} {{ context[index] }}{{ unit }}
- 本年度
- 本季度
- 近30日
- 近7日
- 今日
+ 本年度
+ 本季度
+ 近30日
+ 近7日
+ 今日
diff --git a/src/views/gasDashboard/components/PanelGroup.vue b/src/views/gasDashboard/components/PanelGroup.vue
index eead839..5613860 100644
--- a/src/views/gasDashboard/components/PanelGroup.vue
+++ b/src/views/gasDashboard/components/PanelGroup.vue
@@ -17,6 +17,7 @@
import Card from '@/components/BigData/Card'
// 首页
import { gasStatistic, deviceCount, alarmNowStatic } from '@/api/gasOverview'
+import { gasStatistic2 } from '../../../api/gasOverview'
export default {
components: {
Card,
@@ -26,40 +27,40 @@
return {
dataGroup1: [
{
- title: ['总用气量', '本月用气量'],
- context: ['--', '--'],
+ title: ['CO₂总用气量', 'CO₂本月用气量', 'CO₂今日用气量'],
+ context: ['--', '--', '--'],
icon: '',
color: '#40c9c6',
- unit: '吨',
+ unit: 'Nm³',
index: 0
},
{
- title: ['今日用气量', '生产厂区用气量'],
- context: ['--', '--'],
+ title: ['O₂总用气量', 'O₂本月用气量', 'O₂今日用气量'],
+ context: ['--', '--', '--'],
icon: '',
color: '#36a3f7',
- unit: '吨',
+ unit: 'Nm³',
index: 1
},
{
+ title: ['燃气总用气量', '燃气本月用气量', '燃气今日用气量'],
+ context: ['--', '--', '--'],
+ icon: '',
+ color: '#36a3f7',
+ unit: 'Nm³',
+ index: 2
+ },
+ {
title: ['滑道实时噪声'],
context: ['--'],
icon: 'icon-noise',
color: '#f1c353',
unit: 'db',
- index: 2
+ index: 3
}
],
dataGroup: [
{
- title: '气体流量计',
- context: '--',
- icon: 'icon-watch',
- color: '#9694f7',
- path: '/deviceList?deviceType=13',
- permission: '/device/list'
- },
- {
title: '告警信息',
context: '--',
icon: 'icon-alarm',
@@ -73,7 +74,7 @@
mounted() {
this.getWater()
// this.getWellCount()
- this.getDeviceCount()
+ // this.getDeviceCount()
this.getAlarmCount()
},
methods: {
@@ -83,19 +84,21 @@
getWater() {
// 用气量
gasStatistic().then(response => {
- this.dataGroup1[0].context = [response.data.total ? parseFloat(response.data.total).toFixed(2) : '--', response.data.month ? parseFloat(response.data.month).toFixed(2) : '--']
- this.dataGroup1[1].context = [response.data.today ? parseFloat(response.data.today).toFixed(2) : '--', response.data.prodution ? parseFloat(response.data.prodution).toFixed(2) : '--']
- this.dataGroup1[2].context = [response.data.sound ? Number(response.data.sound).toFixed(2) : '--']
+ this.dataGroup1[3].context = [response.data.sound ? Number(response.data.sound).toFixed(2) : '--']
})
- },
- getDeviceCount() {
- deviceCount('15').then(response => {
- this.dataGroup[0].context = response.data
+ gasStatistic2('15').then(response => {
+ this.dataGroup1[0].context = [response.data.total.toFixed(2), response.data.month.toFixed(2), response.data.day === '' ? '--' : response.data.day.toFixed(2)]
+ })
+ gasStatistic2('16').then(response => {
+ this.dataGroup1[1].context = [response.data.total.toFixed(2), response.data.month.toFixed(2), response.data.day === '' ? '--' : response.data.day.toFixed(2)]
+ })
+ gasStatistic2('17').then(response => {
+ this.dataGroup1[2].context = [response.data.total.toFixed(2), response.data.month.toFixed(2), response.data.day === '' ? '--' : response.data.day.toFixed(2)]
})
},
getAlarmCount() {
alarmNowStatic().then(response => {
- this.dataGroup[1].context = response.data.total
+ this.dataGroup[0].context = response.data.total
})
}
}
diff --git a/src/views/gasDashboard/components/alarmGasCountByDept.vue b/src/views/gasDashboard/components/alarmGasCountByDept.vue
deleted file mode 100644
index b8bfc23..0000000
--- a/src/views/gasDashboard/components/alarmGasCountByDept.vue
+++ /dev/null
@@ -1,73 +0,0 @@
-
-
-
-
-
-
-
-
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/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/src/api/gasOverview.js b/src/api/gasOverview.js
index 559a078..0dc3442 100644
--- a/src/api/gasOverview.js
+++ b/src/api/gasOverview.js
@@ -11,14 +11,50 @@
})
}
-// 气体流量计数量
-// export function deviceCount(params) {
-// return request({
-// url: 'device/count/15',
-// method: 'get',
-// params
-// })
-// }
+// 用水量、噪声统计数据
+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({
@@ -56,7 +92,7 @@
// 查询二级分区燃气告警
export function gasAlarmBySecondArea(params) {
return request({
- url: 'dataStatistic/gasAlarmBySecondArea',
+ url: 'gas/alarm/rate',
method: 'get',
params
})
diff --git a/src/components/BigData/Card1/index.vue b/src/components/BigData/Card1/index.vue
index 748747b..c9ec32d 100644
--- a/src/components/BigData/Card1/index.vue
+++ b/src/components/BigData/Card1/index.vue
@@ -4,21 +4,11 @@
-
-
-
-
-
- {{ title[0] }} {{ context[0] }}{{ unit }}
-
-
- {{ title[1] }} {{ context[1] }}-->
+
+
-
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index 8301f8c..03047ac 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -4,7 +4,7 @@
-
diff --git a/src/views/dashboard/components/AlarmByDays.vue b/src/views/dashboard/components/AlarmByDays.vue
index ddfd8e3..8a9a937 100644
--- a/src/views/dashboard/components/AlarmByDays.vue
+++ b/src/views/dashboard/components/AlarmByDays.vue
@@ -23,11 +23,11 @@
}
this.chartSettings = {
labelMap: {
- '远传水表': '远传水表',
+ '远程水表': '远程水表',
'噪声记录仪': '噪声记录仪',
'液位监测仪': '液位监测仪'
},
- metrics: ['远传水表', '噪声记录仪', '液位监测仪'],
+ metrics: ['远程水表', '噪声记录仪', '液位监测仪'],
dimension: ['date']
}
return {
@@ -37,7 +37,7 @@
endTime: ''
},
chartData: {
- columns: ['date', '远传水表', '噪声记录仪', '液位监测仪'],
+ columns: ['date', '远程水表', '噪声记录仪', '液位监测仪'],
rows: []
}
}
@@ -65,7 +65,7 @@
delete item.data
return item
})
-
+
this.chartData.rows = arr
})
},
diff --git a/src/views/dashboard/components/FunctionArea.vue b/src/views/dashboard/components/FunctionArea.vue
index 4c05cee..6401557 100644
--- a/src/views/dashboard/components/FunctionArea.vue
+++ b/src/views/dashboard/components/FunctionArea.vue
@@ -5,11 +5,11 @@
-->
+
@@ -41,7 +31,7 @@
props: {
title: {
type: Array,
- default: function () {
+ default: function() {
return ['标题', '标题']
}
},
@@ -55,7 +45,7 @@
},
context: {
type: Array,
- default: function () {
+ default: function() {
return ['--', '--']
}
},
@@ -83,6 +73,8 @@
height: 108px;
font-size: 12px;
position: relative;
+ display: flex;
+ align-items: center;
overflow: hidden;
color: #666;
background: #fff;
@@ -96,7 +88,6 @@
}
.card-panel-icon-wrapper {
- float: left;
margin: 14px 0 0 10px;
padding: 16px 2px;
transition: all 0.38s ease-out;
@@ -109,25 +100,22 @@
}
.card-panel-description {
- float: left;
+ flex:1;
font-weight: bold;
- margin-top: 26px;
overflow: auto;
margin-left: 5px;
.two {
.card-panel-text {
- line-height: 18px;
+ line-height: 26px;
color: rgba(0, 0, 0, 0.45);
font-size: 14px;
- margin-bottom: 12px;
+ display: flex;
+ justify-content: space-between;
}
-
.card-panel-num {
font-size: 18px;
color: #666;
- padding-left: 10px;
- float: right;
}
}
.only {
diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js
index aa41264..11dc521 100644
--- a/src/utils/dateutils.js
+++ b/src/utils/dateutils.js
@@ -52,3 +52,13 @@
}
return fmt
}
+
+/**
+ * 获取近1周日期范围
+ * @returns {*[]}
+ */
+export function getSearchLastWeekTime() {
+ const startTime = getLastWeek().Format('yyyy-MM-dd hh:mm:ss')
+ const endTime = getToday('yyyy-MM-dd hh:mm:ss')
+ return [startTime, endTime]
+}
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 97345d9..283c8ef 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -5,7 +5,7 @@
+ {{ name }} {{ context[index] }}{{ unit }}
- 本年度
- 本季度
- 近30日
- 近7日
- 今日
+ 本年度
+ 本季度
+ 近30日
+ 近7日
+ 今日
diff --git a/src/views/gasDashboard/components/PanelGroup.vue b/src/views/gasDashboard/components/PanelGroup.vue
index eead839..5613860 100644
--- a/src/views/gasDashboard/components/PanelGroup.vue
+++ b/src/views/gasDashboard/components/PanelGroup.vue
@@ -17,6 +17,7 @@
import Card from '@/components/BigData/Card'
// 首页
import { gasStatistic, deviceCount, alarmNowStatic } from '@/api/gasOverview'
+import { gasStatistic2 } from '../../../api/gasOverview'
export default {
components: {
Card,
@@ -26,40 +27,40 @@
return {
dataGroup1: [
{
- title: ['总用气量', '本月用气量'],
- context: ['--', '--'],
+ title: ['CO₂总用气量', 'CO₂本月用气量', 'CO₂今日用气量'],
+ context: ['--', '--', '--'],
icon: '',
color: '#40c9c6',
- unit: '吨',
+ unit: 'Nm³',
index: 0
},
{
- title: ['今日用气量', '生产厂区用气量'],
- context: ['--', '--'],
+ title: ['O₂总用气量', 'O₂本月用气量', 'O₂今日用气量'],
+ context: ['--', '--', '--'],
icon: '',
color: '#36a3f7',
- unit: '吨',
+ unit: 'Nm³',
index: 1
},
{
+ title: ['燃气总用气量', '燃气本月用气量', '燃气今日用气量'],
+ context: ['--', '--', '--'],
+ icon: '',
+ color: '#36a3f7',
+ unit: 'Nm³',
+ index: 2
+ },
+ {
title: ['滑道实时噪声'],
context: ['--'],
icon: 'icon-noise',
color: '#f1c353',
unit: 'db',
- index: 2
+ index: 3
}
],
dataGroup: [
{
- title: '气体流量计',
- context: '--',
- icon: 'icon-watch',
- color: '#9694f7',
- path: '/deviceList?deviceType=13',
- permission: '/device/list'
- },
- {
title: '告警信息',
context: '--',
icon: 'icon-alarm',
@@ -73,7 +74,7 @@
mounted() {
this.getWater()
// this.getWellCount()
- this.getDeviceCount()
+ // this.getDeviceCount()
this.getAlarmCount()
},
methods: {
@@ -83,19 +84,21 @@
getWater() {
// 用气量
gasStatistic().then(response => {
- this.dataGroup1[0].context = [response.data.total ? parseFloat(response.data.total).toFixed(2) : '--', response.data.month ? parseFloat(response.data.month).toFixed(2) : '--']
- this.dataGroup1[1].context = [response.data.today ? parseFloat(response.data.today).toFixed(2) : '--', response.data.prodution ? parseFloat(response.data.prodution).toFixed(2) : '--']
- this.dataGroup1[2].context = [response.data.sound ? Number(response.data.sound).toFixed(2) : '--']
+ this.dataGroup1[3].context = [response.data.sound ? Number(response.data.sound).toFixed(2) : '--']
})
- },
- getDeviceCount() {
- deviceCount('15').then(response => {
- this.dataGroup[0].context = response.data
+ gasStatistic2('15').then(response => {
+ this.dataGroup1[0].context = [response.data.total.toFixed(2), response.data.month.toFixed(2), response.data.day === '' ? '--' : response.data.day.toFixed(2)]
+ })
+ gasStatistic2('16').then(response => {
+ this.dataGroup1[1].context = [response.data.total.toFixed(2), response.data.month.toFixed(2), response.data.day === '' ? '--' : response.data.day.toFixed(2)]
+ })
+ gasStatistic2('17').then(response => {
+ this.dataGroup1[2].context = [response.data.total.toFixed(2), response.data.month.toFixed(2), response.data.day === '' ? '--' : response.data.day.toFixed(2)]
})
},
getAlarmCount() {
alarmNowStatic().then(response => {
- this.dataGroup[1].context = response.data.total
+ this.dataGroup[0].context = response.data.total
})
}
}
diff --git a/src/views/gasDashboard/components/alarmGasCountByDept.vue b/src/views/gasDashboard/components/alarmGasCountByDept.vue
deleted file mode 100644
index b8bfc23..0000000
--- a/src/views/gasDashboard/components/alarmGasCountByDept.vue
+++ /dev/null
@@ -1,73 +0,0 @@
-
-
-
-
-
-
-
-
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/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/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/src/api/gasOverview.js b/src/api/gasOverview.js
index 559a078..0dc3442 100644
--- a/src/api/gasOverview.js
+++ b/src/api/gasOverview.js
@@ -11,14 +11,50 @@
})
}
-// 气体流量计数量
-// export function deviceCount(params) {
-// return request({
-// url: 'device/count/15',
-// method: 'get',
-// params
-// })
-// }
+// 用水量、噪声统计数据
+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({
@@ -56,7 +92,7 @@
// 查询二级分区燃气告警
export function gasAlarmBySecondArea(params) {
return request({
- url: 'dataStatistic/gasAlarmBySecondArea',
+ url: 'gas/alarm/rate',
method: 'get',
params
})
diff --git a/src/components/BigData/Card1/index.vue b/src/components/BigData/Card1/index.vue
index 748747b..c9ec32d 100644
--- a/src/components/BigData/Card1/index.vue
+++ b/src/components/BigData/Card1/index.vue
@@ -4,21 +4,11 @@
-
-
-
-
-
- {{ title[0] }} {{ context[0] }}{{ unit }}
-
-
- {{ title[1] }} {{ context[1] }}-->
+
+
-
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index 8301f8c..03047ac 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -4,7 +4,7 @@
-
diff --git a/src/views/dashboard/components/AlarmByDays.vue b/src/views/dashboard/components/AlarmByDays.vue
index ddfd8e3..8a9a937 100644
--- a/src/views/dashboard/components/AlarmByDays.vue
+++ b/src/views/dashboard/components/AlarmByDays.vue
@@ -23,11 +23,11 @@
}
this.chartSettings = {
labelMap: {
- '远传水表': '远传水表',
+ '远程水表': '远程水表',
'噪声记录仪': '噪声记录仪',
'液位监测仪': '液位监测仪'
},
- metrics: ['远传水表', '噪声记录仪', '液位监测仪'],
+ metrics: ['远程水表', '噪声记录仪', '液位监测仪'],
dimension: ['date']
}
return {
@@ -37,7 +37,7 @@
endTime: ''
},
chartData: {
- columns: ['date', '远传水表', '噪声记录仪', '液位监测仪'],
+ columns: ['date', '远程水表', '噪声记录仪', '液位监测仪'],
rows: []
}
}
@@ -65,7 +65,7 @@
delete item.data
return item
})
-
+
this.chartData.rows = arr
})
},
diff --git a/src/views/dashboard/components/FunctionArea.vue b/src/views/dashboard/components/FunctionArea.vue
index 4c05cee..6401557 100644
--- a/src/views/dashboard/components/FunctionArea.vue
+++ b/src/views/dashboard/components/FunctionArea.vue
@@ -5,11 +5,11 @@
-->
+
@@ -41,7 +31,7 @@
props: {
title: {
type: Array,
- default: function () {
+ default: function() {
return ['标题', '标题']
}
},
@@ -55,7 +45,7 @@
},
context: {
type: Array,
- default: function () {
+ default: function() {
return ['--', '--']
}
},
@@ -83,6 +73,8 @@
height: 108px;
font-size: 12px;
position: relative;
+ display: flex;
+ align-items: center;
overflow: hidden;
color: #666;
background: #fff;
@@ -96,7 +88,6 @@
}
.card-panel-icon-wrapper {
- float: left;
margin: 14px 0 0 10px;
padding: 16px 2px;
transition: all 0.38s ease-out;
@@ -109,25 +100,22 @@
}
.card-panel-description {
- float: left;
+ flex:1;
font-weight: bold;
- margin-top: 26px;
overflow: auto;
margin-left: 5px;
.two {
.card-panel-text {
- line-height: 18px;
+ line-height: 26px;
color: rgba(0, 0, 0, 0.45);
font-size: 14px;
- margin-bottom: 12px;
+ display: flex;
+ justify-content: space-between;
}
-
.card-panel-num {
font-size: 18px;
color: #666;
- padding-left: 10px;
- float: right;
}
}
.only {
diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js
index aa41264..11dc521 100644
--- a/src/utils/dateutils.js
+++ b/src/utils/dateutils.js
@@ -52,3 +52,13 @@
}
return fmt
}
+
+/**
+ * 获取近1周日期范围
+ * @returns {*[]}
+ */
+export function getSearchLastWeekTime() {
+ const startTime = getLastWeek().Format('yyyy-MM-dd hh:mm:ss')
+ const endTime = getToday('yyyy-MM-dd hh:mm:ss')
+ return [startTime, endTime]
+}
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 97345d9..283c8ef 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -5,7 +5,7 @@
+ {{ name }} {{ context[index] }}{{ unit }}
- 本年度
- 本季度
- 近30日
- 近7日
- 今日
+ 本年度
+ 本季度
+ 近30日
+ 近7日
+ 今日
diff --git a/src/views/gasDashboard/components/PanelGroup.vue b/src/views/gasDashboard/components/PanelGroup.vue
index eead839..5613860 100644
--- a/src/views/gasDashboard/components/PanelGroup.vue
+++ b/src/views/gasDashboard/components/PanelGroup.vue
@@ -17,6 +17,7 @@
import Card from '@/components/BigData/Card'
// 首页
import { gasStatistic, deviceCount, alarmNowStatic } from '@/api/gasOverview'
+import { gasStatistic2 } from '../../../api/gasOverview'
export default {
components: {
Card,
@@ -26,40 +27,40 @@
return {
dataGroup1: [
{
- title: ['总用气量', '本月用气量'],
- context: ['--', '--'],
+ title: ['CO₂总用气量', 'CO₂本月用气量', 'CO₂今日用气量'],
+ context: ['--', '--', '--'],
icon: '',
color: '#40c9c6',
- unit: '吨',
+ unit: 'Nm³',
index: 0
},
{
- title: ['今日用气量', '生产厂区用气量'],
- context: ['--', '--'],
+ title: ['O₂总用气量', 'O₂本月用气量', 'O₂今日用气量'],
+ context: ['--', '--', '--'],
icon: '',
color: '#36a3f7',
- unit: '吨',
+ unit: 'Nm³',
index: 1
},
{
+ title: ['燃气总用气量', '燃气本月用气量', '燃气今日用气量'],
+ context: ['--', '--', '--'],
+ icon: '',
+ color: '#36a3f7',
+ unit: 'Nm³',
+ index: 2
+ },
+ {
title: ['滑道实时噪声'],
context: ['--'],
icon: 'icon-noise',
color: '#f1c353',
unit: 'db',
- index: 2
+ index: 3
}
],
dataGroup: [
{
- title: '气体流量计',
- context: '--',
- icon: 'icon-watch',
- color: '#9694f7',
- path: '/deviceList?deviceType=13',
- permission: '/device/list'
- },
- {
title: '告警信息',
context: '--',
icon: 'icon-alarm',
@@ -73,7 +74,7 @@
mounted() {
this.getWater()
// this.getWellCount()
- this.getDeviceCount()
+ // this.getDeviceCount()
this.getAlarmCount()
},
methods: {
@@ -83,19 +84,21 @@
getWater() {
// 用气量
gasStatistic().then(response => {
- this.dataGroup1[0].context = [response.data.total ? parseFloat(response.data.total).toFixed(2) : '--', response.data.month ? parseFloat(response.data.month).toFixed(2) : '--']
- this.dataGroup1[1].context = [response.data.today ? parseFloat(response.data.today).toFixed(2) : '--', response.data.prodution ? parseFloat(response.data.prodution).toFixed(2) : '--']
- this.dataGroup1[2].context = [response.data.sound ? Number(response.data.sound).toFixed(2) : '--']
+ this.dataGroup1[3].context = [response.data.sound ? Number(response.data.sound).toFixed(2) : '--']
})
- },
- getDeviceCount() {
- deviceCount('15').then(response => {
- this.dataGroup[0].context = response.data
+ gasStatistic2('15').then(response => {
+ this.dataGroup1[0].context = [response.data.total.toFixed(2), response.data.month.toFixed(2), response.data.day === '' ? '--' : response.data.day.toFixed(2)]
+ })
+ gasStatistic2('16').then(response => {
+ this.dataGroup1[1].context = [response.data.total.toFixed(2), response.data.month.toFixed(2), response.data.day === '' ? '--' : response.data.day.toFixed(2)]
+ })
+ gasStatistic2('17').then(response => {
+ this.dataGroup1[2].context = [response.data.total.toFixed(2), response.data.month.toFixed(2), response.data.day === '' ? '--' : response.data.day.toFixed(2)]
})
},
getAlarmCount() {
alarmNowStatic().then(response => {
- this.dataGroup[1].context = response.data.total
+ this.dataGroup[0].context = response.data.total
})
}
}
diff --git a/src/views/gasDashboard/components/alarmGasCountByDept.vue b/src/views/gasDashboard/components/alarmGasCountByDept.vue
deleted file mode 100644
index b8bfc23..0000000
--- a/src/views/gasDashboard/components/alarmGasCountByDept.vue
+++ /dev/null
@@ -1,73 +0,0 @@
-
-
-
-
-
-
-
-
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/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/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/src/api/gasOverview.js b/src/api/gasOverview.js
index 559a078..0dc3442 100644
--- a/src/api/gasOverview.js
+++ b/src/api/gasOverview.js
@@ -11,14 +11,50 @@
})
}
-// 气体流量计数量
-// export function deviceCount(params) {
-// return request({
-// url: 'device/count/15',
-// method: 'get',
-// params
-// })
-// }
+// 用水量、噪声统计数据
+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({
@@ -56,7 +92,7 @@
// 查询二级分区燃气告警
export function gasAlarmBySecondArea(params) {
return request({
- url: 'dataStatistic/gasAlarmBySecondArea',
+ url: 'gas/alarm/rate',
method: 'get',
params
})
diff --git a/src/components/BigData/Card1/index.vue b/src/components/BigData/Card1/index.vue
index 748747b..c9ec32d 100644
--- a/src/components/BigData/Card1/index.vue
+++ b/src/components/BigData/Card1/index.vue
@@ -4,21 +4,11 @@
-
-
-
-
-
- {{ title[0] }} {{ context[0] }}{{ unit }}
-
-
- {{ title[1] }} {{ context[1] }}-->
+
+
-
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index 8301f8c..03047ac 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -4,7 +4,7 @@
-
diff --git a/src/views/dashboard/components/AlarmByDays.vue b/src/views/dashboard/components/AlarmByDays.vue
index ddfd8e3..8a9a937 100644
--- a/src/views/dashboard/components/AlarmByDays.vue
+++ b/src/views/dashboard/components/AlarmByDays.vue
@@ -23,11 +23,11 @@
}
this.chartSettings = {
labelMap: {
- '远传水表': '远传水表',
+ '远程水表': '远程水表',
'噪声记录仪': '噪声记录仪',
'液位监测仪': '液位监测仪'
},
- metrics: ['远传水表', '噪声记录仪', '液位监测仪'],
+ metrics: ['远程水表', '噪声记录仪', '液位监测仪'],
dimension: ['date']
}
return {
@@ -37,7 +37,7 @@
endTime: ''
},
chartData: {
- columns: ['date', '远传水表', '噪声记录仪', '液位监测仪'],
+ columns: ['date', '远程水表', '噪声记录仪', '液位监测仪'],
rows: []
}
}
@@ -65,7 +65,7 @@
delete item.data
return item
})
-
+
this.chartData.rows = arr
})
},
diff --git a/src/views/dashboard/components/FunctionArea.vue b/src/views/dashboard/components/FunctionArea.vue
index 4c05cee..6401557 100644
--- a/src/views/dashboard/components/FunctionArea.vue
+++ b/src/views/dashboard/components/FunctionArea.vue
@@ -5,11 +5,11 @@
-->
+
@@ -41,7 +31,7 @@
props: {
title: {
type: Array,
- default: function () {
+ default: function() {
return ['标题', '标题']
}
},
@@ -55,7 +45,7 @@
},
context: {
type: Array,
- default: function () {
+ default: function() {
return ['--', '--']
}
},
@@ -83,6 +73,8 @@
height: 108px;
font-size: 12px;
position: relative;
+ display: flex;
+ align-items: center;
overflow: hidden;
color: #666;
background: #fff;
@@ -96,7 +88,6 @@
}
.card-panel-icon-wrapper {
- float: left;
margin: 14px 0 0 10px;
padding: 16px 2px;
transition: all 0.38s ease-out;
@@ -109,25 +100,22 @@
}
.card-panel-description {
- float: left;
+ flex:1;
font-weight: bold;
- margin-top: 26px;
overflow: auto;
margin-left: 5px;
.two {
.card-panel-text {
- line-height: 18px;
+ line-height: 26px;
color: rgba(0, 0, 0, 0.45);
font-size: 14px;
- margin-bottom: 12px;
+ display: flex;
+ justify-content: space-between;
}
-
.card-panel-num {
font-size: 18px;
color: #666;
- padding-left: 10px;
- float: right;
}
}
.only {
diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js
index aa41264..11dc521 100644
--- a/src/utils/dateutils.js
+++ b/src/utils/dateutils.js
@@ -52,3 +52,13 @@
}
return fmt
}
+
+/**
+ * 获取近1周日期范围
+ * @returns {*[]}
+ */
+export function getSearchLastWeekTime() {
+ const startTime = getLastWeek().Format('yyyy-MM-dd hh:mm:ss')
+ const endTime = getToday('yyyy-MM-dd hh:mm:ss')
+ return [startTime, endTime]
+}
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 97345d9..283c8ef 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -5,7 +5,7 @@
+ {{ name }} {{ context[index] }}{{ unit }}
- 本年度
- 本季度
- 近30日
- 近7日
- 今日
+ 本年度
+ 本季度
+ 近30日
+ 近7日
+ 今日
diff --git a/src/views/gasDashboard/components/PanelGroup.vue b/src/views/gasDashboard/components/PanelGroup.vue
index eead839..5613860 100644
--- a/src/views/gasDashboard/components/PanelGroup.vue
+++ b/src/views/gasDashboard/components/PanelGroup.vue
@@ -17,6 +17,7 @@
import Card from '@/components/BigData/Card'
// 首页
import { gasStatistic, deviceCount, alarmNowStatic } from '@/api/gasOverview'
+import { gasStatistic2 } from '../../../api/gasOverview'
export default {
components: {
Card,
@@ -26,40 +27,40 @@
return {
dataGroup1: [
{
- title: ['总用气量', '本月用气量'],
- context: ['--', '--'],
+ title: ['CO₂总用气量', 'CO₂本月用气量', 'CO₂今日用气量'],
+ context: ['--', '--', '--'],
icon: '',
color: '#40c9c6',
- unit: '吨',
+ unit: 'Nm³',
index: 0
},
{
- title: ['今日用气量', '生产厂区用气量'],
- context: ['--', '--'],
+ title: ['O₂总用气量', 'O₂本月用气量', 'O₂今日用气量'],
+ context: ['--', '--', '--'],
icon: '',
color: '#36a3f7',
- unit: '吨',
+ unit: 'Nm³',
index: 1
},
{
+ title: ['燃气总用气量', '燃气本月用气量', '燃气今日用气量'],
+ context: ['--', '--', '--'],
+ icon: '',
+ color: '#36a3f7',
+ unit: 'Nm³',
+ index: 2
+ },
+ {
title: ['滑道实时噪声'],
context: ['--'],
icon: 'icon-noise',
color: '#f1c353',
unit: 'db',
- index: 2
+ index: 3
}
],
dataGroup: [
{
- title: '气体流量计',
- context: '--',
- icon: 'icon-watch',
- color: '#9694f7',
- path: '/deviceList?deviceType=13',
- permission: '/device/list'
- },
- {
title: '告警信息',
context: '--',
icon: 'icon-alarm',
@@ -73,7 +74,7 @@
mounted() {
this.getWater()
// this.getWellCount()
- this.getDeviceCount()
+ // this.getDeviceCount()
this.getAlarmCount()
},
methods: {
@@ -83,19 +84,21 @@
getWater() {
// 用气量
gasStatistic().then(response => {
- this.dataGroup1[0].context = [response.data.total ? parseFloat(response.data.total).toFixed(2) : '--', response.data.month ? parseFloat(response.data.month).toFixed(2) : '--']
- this.dataGroup1[1].context = [response.data.today ? parseFloat(response.data.today).toFixed(2) : '--', response.data.prodution ? parseFloat(response.data.prodution).toFixed(2) : '--']
- this.dataGroup1[2].context = [response.data.sound ? Number(response.data.sound).toFixed(2) : '--']
+ this.dataGroup1[3].context = [response.data.sound ? Number(response.data.sound).toFixed(2) : '--']
})
- },
- getDeviceCount() {
- deviceCount('15').then(response => {
- this.dataGroup[0].context = response.data
+ gasStatistic2('15').then(response => {
+ this.dataGroup1[0].context = [response.data.total.toFixed(2), response.data.month.toFixed(2), response.data.day === '' ? '--' : response.data.day.toFixed(2)]
+ })
+ gasStatistic2('16').then(response => {
+ this.dataGroup1[1].context = [response.data.total.toFixed(2), response.data.month.toFixed(2), response.data.day === '' ? '--' : response.data.day.toFixed(2)]
+ })
+ gasStatistic2('17').then(response => {
+ this.dataGroup1[2].context = [response.data.total.toFixed(2), response.data.month.toFixed(2), response.data.day === '' ? '--' : response.data.day.toFixed(2)]
})
},
getAlarmCount() {
alarmNowStatic().then(response => {
- this.dataGroup[1].context = response.data.total
+ this.dataGroup[0].context = response.data.total
})
}
}
diff --git a/src/views/gasDashboard/components/alarmGasCountByDept.vue b/src/views/gasDashboard/components/alarmGasCountByDept.vue
deleted file mode 100644
index b8bfc23..0000000
--- a/src/views/gasDashboard/components/alarmGasCountByDept.vue
+++ /dev/null
@@ -1,73 +0,0 @@
-
-
-
-
-
-
-
-
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/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
index c144bc6..a410f29 100644
--- a/src/views/gasDashboard/components/corrodeCountByDay.vue
+++ b/src/views/gasDashboard/components/corrodeCountByDay.vue
@@ -45,11 +45,14 @@
},
extend: {
grid: {
- top: 120
+ top: 120,
+ left: 30
},
yAxis: {
+ position: 'left',
+ type: 'value',
name: '腐蚀率(%)',
- position: 'left'
+ nameRotate: '0.1'
},
legend: {
// type: 'scroll',
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/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/src/api/gasOverview.js b/src/api/gasOverview.js
index 559a078..0dc3442 100644
--- a/src/api/gasOverview.js
+++ b/src/api/gasOverview.js
@@ -11,14 +11,50 @@
})
}
-// 气体流量计数量
-// export function deviceCount(params) {
-// return request({
-// url: 'device/count/15',
-// method: 'get',
-// params
-// })
-// }
+// 用水量、噪声统计数据
+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({
@@ -56,7 +92,7 @@
// 查询二级分区燃气告警
export function gasAlarmBySecondArea(params) {
return request({
- url: 'dataStatistic/gasAlarmBySecondArea',
+ url: 'gas/alarm/rate',
method: 'get',
params
})
diff --git a/src/components/BigData/Card1/index.vue b/src/components/BigData/Card1/index.vue
index 748747b..c9ec32d 100644
--- a/src/components/BigData/Card1/index.vue
+++ b/src/components/BigData/Card1/index.vue
@@ -4,21 +4,11 @@
-
-
-
-
-
- {{ title[0] }} {{ context[0] }}{{ unit }}
-
-
- {{ title[1] }} {{ context[1] }}-->
+
+
-
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index 8301f8c..03047ac 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -4,7 +4,7 @@
-
diff --git a/src/views/dashboard/components/AlarmByDays.vue b/src/views/dashboard/components/AlarmByDays.vue
index ddfd8e3..8a9a937 100644
--- a/src/views/dashboard/components/AlarmByDays.vue
+++ b/src/views/dashboard/components/AlarmByDays.vue
@@ -23,11 +23,11 @@
}
this.chartSettings = {
labelMap: {
- '远传水表': '远传水表',
+ '远程水表': '远程水表',
'噪声记录仪': '噪声记录仪',
'液位监测仪': '液位监测仪'
},
- metrics: ['远传水表', '噪声记录仪', '液位监测仪'],
+ metrics: ['远程水表', '噪声记录仪', '液位监测仪'],
dimension: ['date']
}
return {
@@ -37,7 +37,7 @@
endTime: ''
},
chartData: {
- columns: ['date', '远传水表', '噪声记录仪', '液位监测仪'],
+ columns: ['date', '远程水表', '噪声记录仪', '液位监测仪'],
rows: []
}
}
@@ -65,7 +65,7 @@
delete item.data
return item
})
-
+
this.chartData.rows = arr
})
},
diff --git a/src/views/dashboard/components/FunctionArea.vue b/src/views/dashboard/components/FunctionArea.vue
index 4c05cee..6401557 100644
--- a/src/views/dashboard/components/FunctionArea.vue
+++ b/src/views/dashboard/components/FunctionArea.vue
@@ -5,11 +5,11 @@
-->
+
@@ -41,7 +31,7 @@
props: {
title: {
type: Array,
- default: function () {
+ default: function() {
return ['标题', '标题']
}
},
@@ -55,7 +45,7 @@
},
context: {
type: Array,
- default: function () {
+ default: function() {
return ['--', '--']
}
},
@@ -83,6 +73,8 @@
height: 108px;
font-size: 12px;
position: relative;
+ display: flex;
+ align-items: center;
overflow: hidden;
color: #666;
background: #fff;
@@ -96,7 +88,6 @@
}
.card-panel-icon-wrapper {
- float: left;
margin: 14px 0 0 10px;
padding: 16px 2px;
transition: all 0.38s ease-out;
@@ -109,25 +100,22 @@
}
.card-panel-description {
- float: left;
+ flex:1;
font-weight: bold;
- margin-top: 26px;
overflow: auto;
margin-left: 5px;
.two {
.card-panel-text {
- line-height: 18px;
+ line-height: 26px;
color: rgba(0, 0, 0, 0.45);
font-size: 14px;
- margin-bottom: 12px;
+ display: flex;
+ justify-content: space-between;
}
-
.card-panel-num {
font-size: 18px;
color: #666;
- padding-left: 10px;
- float: right;
}
}
.only {
diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js
index aa41264..11dc521 100644
--- a/src/utils/dateutils.js
+++ b/src/utils/dateutils.js
@@ -52,3 +52,13 @@
}
return fmt
}
+
+/**
+ * 获取近1周日期范围
+ * @returns {*[]}
+ */
+export function getSearchLastWeekTime() {
+ const startTime = getLastWeek().Format('yyyy-MM-dd hh:mm:ss')
+ const endTime = getToday('yyyy-MM-dd hh:mm:ss')
+ return [startTime, endTime]
+}
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 97345d9..283c8ef 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -5,7 +5,7 @@
+ {{ name }} {{ context[index] }}{{ unit }}
- 本年度
- 本季度
- 近30日
- 近7日
- 今日
+ 本年度
+ 本季度
+ 近30日
+ 近7日
+ 今日
diff --git a/src/views/gasDashboard/components/PanelGroup.vue b/src/views/gasDashboard/components/PanelGroup.vue
index eead839..5613860 100644
--- a/src/views/gasDashboard/components/PanelGroup.vue
+++ b/src/views/gasDashboard/components/PanelGroup.vue
@@ -17,6 +17,7 @@
import Card from '@/components/BigData/Card'
// 首页
import { gasStatistic, deviceCount, alarmNowStatic } from '@/api/gasOverview'
+import { gasStatistic2 } from '../../../api/gasOverview'
export default {
components: {
Card,
@@ -26,40 +27,40 @@
return {
dataGroup1: [
{
- title: ['总用气量', '本月用气量'],
- context: ['--', '--'],
+ title: ['CO₂总用气量', 'CO₂本月用气量', 'CO₂今日用气量'],
+ context: ['--', '--', '--'],
icon: '',
color: '#40c9c6',
- unit: '吨',
+ unit: 'Nm³',
index: 0
},
{
- title: ['今日用气量', '生产厂区用气量'],
- context: ['--', '--'],
+ title: ['O₂总用气量', 'O₂本月用气量', 'O₂今日用气量'],
+ context: ['--', '--', '--'],
icon: '',
color: '#36a3f7',
- unit: '吨',
+ unit: 'Nm³',
index: 1
},
{
+ title: ['燃气总用气量', '燃气本月用气量', '燃气今日用气量'],
+ context: ['--', '--', '--'],
+ icon: '',
+ color: '#36a3f7',
+ unit: 'Nm³',
+ index: 2
+ },
+ {
title: ['滑道实时噪声'],
context: ['--'],
icon: 'icon-noise',
color: '#f1c353',
unit: 'db',
- index: 2
+ index: 3
}
],
dataGroup: [
{
- title: '气体流量计',
- context: '--',
- icon: 'icon-watch',
- color: '#9694f7',
- path: '/deviceList?deviceType=13',
- permission: '/device/list'
- },
- {
title: '告警信息',
context: '--',
icon: 'icon-alarm',
@@ -73,7 +74,7 @@
mounted() {
this.getWater()
// this.getWellCount()
- this.getDeviceCount()
+ // this.getDeviceCount()
this.getAlarmCount()
},
methods: {
@@ -83,19 +84,21 @@
getWater() {
// 用气量
gasStatistic().then(response => {
- this.dataGroup1[0].context = [response.data.total ? parseFloat(response.data.total).toFixed(2) : '--', response.data.month ? parseFloat(response.data.month).toFixed(2) : '--']
- this.dataGroup1[1].context = [response.data.today ? parseFloat(response.data.today).toFixed(2) : '--', response.data.prodution ? parseFloat(response.data.prodution).toFixed(2) : '--']
- this.dataGroup1[2].context = [response.data.sound ? Number(response.data.sound).toFixed(2) : '--']
+ this.dataGroup1[3].context = [response.data.sound ? Number(response.data.sound).toFixed(2) : '--']
})
- },
- getDeviceCount() {
- deviceCount('15').then(response => {
- this.dataGroup[0].context = response.data
+ gasStatistic2('15').then(response => {
+ this.dataGroup1[0].context = [response.data.total.toFixed(2), response.data.month.toFixed(2), response.data.day === '' ? '--' : response.data.day.toFixed(2)]
+ })
+ gasStatistic2('16').then(response => {
+ this.dataGroup1[1].context = [response.data.total.toFixed(2), response.data.month.toFixed(2), response.data.day === '' ? '--' : response.data.day.toFixed(2)]
+ })
+ gasStatistic2('17').then(response => {
+ this.dataGroup1[2].context = [response.data.total.toFixed(2), response.data.month.toFixed(2), response.data.day === '' ? '--' : response.data.day.toFixed(2)]
})
},
getAlarmCount() {
alarmNowStatic().then(response => {
- this.dataGroup[1].context = response.data.total
+ this.dataGroup[0].context = response.data.total
})
}
}
diff --git a/src/views/gasDashboard/components/alarmGasCountByDept.vue b/src/views/gasDashboard/components/alarmGasCountByDept.vue
deleted file mode 100644
index b8bfc23..0000000
--- a/src/views/gasDashboard/components/alarmGasCountByDept.vue
+++ /dev/null
@@ -1,73 +0,0 @@
-
-
-
-
-
-
-
-
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/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
index c144bc6..a410f29 100644
--- a/src/views/gasDashboard/components/corrodeCountByDay.vue
+++ b/src/views/gasDashboard/components/corrodeCountByDay.vue
@@ -45,11 +45,14 @@
},
extend: {
grid: {
- top: 120
+ top: 120,
+ left: 30
},
yAxis: {
+ position: 'left',
+ type: 'value',
name: '腐蚀率(%)',
- position: 'left'
+ nameRotate: '0.1'
},
legend: {
// type: 'scroll',
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/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/src/api/gasOverview.js b/src/api/gasOverview.js
index 559a078..0dc3442 100644
--- a/src/api/gasOverview.js
+++ b/src/api/gasOverview.js
@@ -11,14 +11,50 @@
})
}
-// 气体流量计数量
-// export function deviceCount(params) {
-// return request({
-// url: 'device/count/15',
-// method: 'get',
-// params
-// })
-// }
+// 用水量、噪声统计数据
+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({
@@ -56,7 +92,7 @@
// 查询二级分区燃气告警
export function gasAlarmBySecondArea(params) {
return request({
- url: 'dataStatistic/gasAlarmBySecondArea',
+ url: 'gas/alarm/rate',
method: 'get',
params
})
diff --git a/src/components/BigData/Card1/index.vue b/src/components/BigData/Card1/index.vue
index 748747b..c9ec32d 100644
--- a/src/components/BigData/Card1/index.vue
+++ b/src/components/BigData/Card1/index.vue
@@ -4,21 +4,11 @@
-
-
-
-
-
- {{ title[0] }} {{ context[0] }}{{ unit }}
-
-
- {{ title[1] }} {{ context[1] }}-->
+
+
-
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index 8301f8c..03047ac 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -4,7 +4,7 @@
-
diff --git a/src/views/dashboard/components/AlarmByDays.vue b/src/views/dashboard/components/AlarmByDays.vue
index ddfd8e3..8a9a937 100644
--- a/src/views/dashboard/components/AlarmByDays.vue
+++ b/src/views/dashboard/components/AlarmByDays.vue
@@ -23,11 +23,11 @@
}
this.chartSettings = {
labelMap: {
- '远传水表': '远传水表',
+ '远程水表': '远程水表',
'噪声记录仪': '噪声记录仪',
'液位监测仪': '液位监测仪'
},
- metrics: ['远传水表', '噪声记录仪', '液位监测仪'],
+ metrics: ['远程水表', '噪声记录仪', '液位监测仪'],
dimension: ['date']
}
return {
@@ -37,7 +37,7 @@
endTime: ''
},
chartData: {
- columns: ['date', '远传水表', '噪声记录仪', '液位监测仪'],
+ columns: ['date', '远程水表', '噪声记录仪', '液位监测仪'],
rows: []
}
}
@@ -65,7 +65,7 @@
delete item.data
return item
})
-
+
this.chartData.rows = arr
})
},
diff --git a/src/views/dashboard/components/FunctionArea.vue b/src/views/dashboard/components/FunctionArea.vue
index 4c05cee..6401557 100644
--- a/src/views/dashboard/components/FunctionArea.vue
+++ b/src/views/dashboard/components/FunctionArea.vue
@@ -5,11 +5,11 @@
-->
+
@@ -41,7 +31,7 @@
props: {
title: {
type: Array,
- default: function () {
+ default: function() {
return ['标题', '标题']
}
},
@@ -55,7 +45,7 @@
},
context: {
type: Array,
- default: function () {
+ default: function() {
return ['--', '--']
}
},
@@ -83,6 +73,8 @@
height: 108px;
font-size: 12px;
position: relative;
+ display: flex;
+ align-items: center;
overflow: hidden;
color: #666;
background: #fff;
@@ -96,7 +88,6 @@
}
.card-panel-icon-wrapper {
- float: left;
margin: 14px 0 0 10px;
padding: 16px 2px;
transition: all 0.38s ease-out;
@@ -109,25 +100,22 @@
}
.card-panel-description {
- float: left;
+ flex:1;
font-weight: bold;
- margin-top: 26px;
overflow: auto;
margin-left: 5px;
.two {
.card-panel-text {
- line-height: 18px;
+ line-height: 26px;
color: rgba(0, 0, 0, 0.45);
font-size: 14px;
- margin-bottom: 12px;
+ display: flex;
+ justify-content: space-between;
}
-
.card-panel-num {
font-size: 18px;
color: #666;
- padding-left: 10px;
- float: right;
}
}
.only {
diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js
index aa41264..11dc521 100644
--- a/src/utils/dateutils.js
+++ b/src/utils/dateutils.js
@@ -52,3 +52,13 @@
}
return fmt
}
+
+/**
+ * 获取近1周日期范围
+ * @returns {*[]}
+ */
+export function getSearchLastWeekTime() {
+ const startTime = getLastWeek().Format('yyyy-MM-dd hh:mm:ss')
+ const endTime = getToday('yyyy-MM-dd hh:mm:ss')
+ return [startTime, endTime]
+}
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 97345d9..283c8ef 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -5,7 +5,7 @@
+ {{ name }} {{ context[index] }}{{ unit }}
- 本年度
- 本季度
- 近30日
- 近7日
- 今日
+ 本年度
+ 本季度
+ 近30日
+ 近7日
+ 今日
diff --git a/src/views/gasDashboard/components/PanelGroup.vue b/src/views/gasDashboard/components/PanelGroup.vue
index eead839..5613860 100644
--- a/src/views/gasDashboard/components/PanelGroup.vue
+++ b/src/views/gasDashboard/components/PanelGroup.vue
@@ -17,6 +17,7 @@
import Card from '@/components/BigData/Card'
// 首页
import { gasStatistic, deviceCount, alarmNowStatic } from '@/api/gasOverview'
+import { gasStatistic2 } from '../../../api/gasOverview'
export default {
components: {
Card,
@@ -26,40 +27,40 @@
return {
dataGroup1: [
{
- title: ['总用气量', '本月用气量'],
- context: ['--', '--'],
+ title: ['CO₂总用气量', 'CO₂本月用气量', 'CO₂今日用气量'],
+ context: ['--', '--', '--'],
icon: '',
color: '#40c9c6',
- unit: '吨',
+ unit: 'Nm³',
index: 0
},
{
- title: ['今日用气量', '生产厂区用气量'],
- context: ['--', '--'],
+ title: ['O₂总用气量', 'O₂本月用气量', 'O₂今日用气量'],
+ context: ['--', '--', '--'],
icon: '',
color: '#36a3f7',
- unit: '吨',
+ unit: 'Nm³',
index: 1
},
{
+ title: ['燃气总用气量', '燃气本月用气量', '燃气今日用气量'],
+ context: ['--', '--', '--'],
+ icon: '',
+ color: '#36a3f7',
+ unit: 'Nm³',
+ index: 2
+ },
+ {
title: ['滑道实时噪声'],
context: ['--'],
icon: 'icon-noise',
color: '#f1c353',
unit: 'db',
- index: 2
+ index: 3
}
],
dataGroup: [
{
- title: '气体流量计',
- context: '--',
- icon: 'icon-watch',
- color: '#9694f7',
- path: '/deviceList?deviceType=13',
- permission: '/device/list'
- },
- {
title: '告警信息',
context: '--',
icon: 'icon-alarm',
@@ -73,7 +74,7 @@
mounted() {
this.getWater()
// this.getWellCount()
- this.getDeviceCount()
+ // this.getDeviceCount()
this.getAlarmCount()
},
methods: {
@@ -83,19 +84,21 @@
getWater() {
// 用气量
gasStatistic().then(response => {
- this.dataGroup1[0].context = [response.data.total ? parseFloat(response.data.total).toFixed(2) : '--', response.data.month ? parseFloat(response.data.month).toFixed(2) : '--']
- this.dataGroup1[1].context = [response.data.today ? parseFloat(response.data.today).toFixed(2) : '--', response.data.prodution ? parseFloat(response.data.prodution).toFixed(2) : '--']
- this.dataGroup1[2].context = [response.data.sound ? Number(response.data.sound).toFixed(2) : '--']
+ this.dataGroup1[3].context = [response.data.sound ? Number(response.data.sound).toFixed(2) : '--']
})
- },
- getDeviceCount() {
- deviceCount('15').then(response => {
- this.dataGroup[0].context = response.data
+ gasStatistic2('15').then(response => {
+ this.dataGroup1[0].context = [response.data.total.toFixed(2), response.data.month.toFixed(2), response.data.day === '' ? '--' : response.data.day.toFixed(2)]
+ })
+ gasStatistic2('16').then(response => {
+ this.dataGroup1[1].context = [response.data.total.toFixed(2), response.data.month.toFixed(2), response.data.day === '' ? '--' : response.data.day.toFixed(2)]
+ })
+ gasStatistic2('17').then(response => {
+ this.dataGroup1[2].context = [response.data.total.toFixed(2), response.data.month.toFixed(2), response.data.day === '' ? '--' : response.data.day.toFixed(2)]
})
},
getAlarmCount() {
alarmNowStatic().then(response => {
- this.dataGroup[1].context = response.data.total
+ this.dataGroup[0].context = response.data.total
})
}
}
diff --git a/src/views/gasDashboard/components/alarmGasCountByDept.vue b/src/views/gasDashboard/components/alarmGasCountByDept.vue
deleted file mode 100644
index b8bfc23..0000000
--- a/src/views/gasDashboard/components/alarmGasCountByDept.vue
+++ /dev/null
@@ -1,73 +0,0 @@
-
-
-
-
-
-
-
-
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/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
index c144bc6..a410f29 100644
--- a/src/views/gasDashboard/components/corrodeCountByDay.vue
+++ b/src/views/gasDashboard/components/corrodeCountByDay.vue
@@ -45,11 +45,14 @@
},
extend: {
grid: {
- top: 120
+ top: 120,
+ left: 30
},
yAxis: {
+ position: 'left',
+ type: 'value',
name: '腐蚀率(%)',
- position: 'left'
+ nameRotate: '0.1'
},
legend: {
// type: 'scroll',
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/gasCountByDay.vue b/src/views/gasDashboard/components/gasCountByDay.vue
index 79a4efb..f0a3977 100644
--- a/src/views/gasDashboard/components/gasCountByDay.vue
+++ b/src/views/gasDashboard/components/gasCountByDay.vue
@@ -1,34 +1,33 @@
-
-
+
diff --git a/src/views/gasDashboard/components/PanelGroup.vue b/src/views/gasDashboard/components/PanelGroup.vue
index eead839..5613860 100644
--- a/src/views/gasDashboard/components/PanelGroup.vue
+++ b/src/views/gasDashboard/components/PanelGroup.vue
@@ -17,6 +17,7 @@
import Card from '@/components/BigData/Card'
// 首页
import { gasStatistic, deviceCount, alarmNowStatic } from '@/api/gasOverview'
+import { gasStatistic2 } from '../../../api/gasOverview'
export default {
components: {
Card,
@@ -26,40 +27,40 @@
return {
dataGroup1: [
{
- title: ['总用气量', '本月用气量'],
- context: ['--', '--'],
+ title: ['CO₂总用气量', 'CO₂本月用气量', 'CO₂今日用气量'],
+ context: ['--', '--', '--'],
icon: '',
color: '#40c9c6',
- unit: '吨',
+ unit: 'Nm³',
index: 0
},
{
- title: ['今日用气量', '生产厂区用气量'],
- context: ['--', '--'],
+ title: ['O₂总用气量', 'O₂本月用气量', 'O₂今日用气量'],
+ context: ['--', '--', '--'],
icon: '',
color: '#36a3f7',
- unit: '吨',
+ unit: 'Nm³',
index: 1
},
{
+ title: ['燃气总用气量', '燃气本月用气量', '燃气今日用气量'],
+ context: ['--', '--', '--'],
+ icon: '',
+ color: '#36a3f7',
+ unit: 'Nm³',
+ index: 2
+ },
+ {
title: ['滑道实时噪声'],
context: ['--'],
icon: 'icon-noise',
color: '#f1c353',
unit: 'db',
- index: 2
+ index: 3
}
],
dataGroup: [
{
- title: '气体流量计',
- context: '--',
- icon: 'icon-watch',
- color: '#9694f7',
- path: '/deviceList?deviceType=13',
- permission: '/device/list'
- },
- {
title: '告警信息',
context: '--',
icon: 'icon-alarm',
@@ -73,7 +74,7 @@
mounted() {
this.getWater()
// this.getWellCount()
- this.getDeviceCount()
+ // this.getDeviceCount()
this.getAlarmCount()
},
methods: {
@@ -83,19 +84,21 @@
getWater() {
// 用气量
gasStatistic().then(response => {
- this.dataGroup1[0].context = [response.data.total ? parseFloat(response.data.total).toFixed(2) : '--', response.data.month ? parseFloat(response.data.month).toFixed(2) : '--']
- this.dataGroup1[1].context = [response.data.today ? parseFloat(response.data.today).toFixed(2) : '--', response.data.prodution ? parseFloat(response.data.prodution).toFixed(2) : '--']
- this.dataGroup1[2].context = [response.data.sound ? Number(response.data.sound).toFixed(2) : '--']
+ this.dataGroup1[3].context = [response.data.sound ? Number(response.data.sound).toFixed(2) : '--']
})
- },
- getDeviceCount() {
- deviceCount('15').then(response => {
- this.dataGroup[0].context = response.data
+ gasStatistic2('15').then(response => {
+ this.dataGroup1[0].context = [response.data.total.toFixed(2), response.data.month.toFixed(2), response.data.day === '' ? '--' : response.data.day.toFixed(2)]
+ })
+ gasStatistic2('16').then(response => {
+ this.dataGroup1[1].context = [response.data.total.toFixed(2), response.data.month.toFixed(2), response.data.day === '' ? '--' : response.data.day.toFixed(2)]
+ })
+ gasStatistic2('17').then(response => {
+ this.dataGroup1[2].context = [response.data.total.toFixed(2), response.data.month.toFixed(2), response.data.day === '' ? '--' : response.data.day.toFixed(2)]
})
},
getAlarmCount() {
alarmNowStatic().then(response => {
- this.dataGroup[1].context = response.data.total
+ this.dataGroup[0].context = response.data.total
})
}
}
diff --git a/src/views/gasDashboard/components/alarmGasCountByDept.vue b/src/views/gasDashboard/components/alarmGasCountByDept.vue
deleted file mode 100644
index b8bfc23..0000000
--- a/src/views/gasDashboard/components/alarmGasCountByDept.vue
+++ /dev/null
@@ -1,73 +0,0 @@
-
-
-
-
-
-
-
-
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/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
index c144bc6..a410f29 100644
--- a/src/views/gasDashboard/components/corrodeCountByDay.vue
+++ b/src/views/gasDashboard/components/corrodeCountByDay.vue
@@ -45,11 +45,14 @@
},
extend: {
grid: {
- top: 120
+ top: 120,
+ left: 30
},
yAxis: {
+ position: 'left',
+ type: 'value',
name: '腐蚀率(%)',
- position: 'left'
+ nameRotate: '0.1'
},
legend: {
// type: 'scroll',
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/gasCountByDay.vue b/src/views/gasDashboard/components/gasCountByDay.vue
index 79a4efb..f0a3977 100644
--- a/src/views/gasDashboard/components/gasCountByDay.vue
+++ b/src/views/gasDashboard/components/gasCountByDay.vue
@@ -1,34 +1,33 @@
-
-
+
+
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/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/src/api/gasOverview.js b/src/api/gasOverview.js
index 559a078..0dc3442 100644
--- a/src/api/gasOverview.js
+++ b/src/api/gasOverview.js
@@ -11,14 +11,50 @@
})
}
-// 气体流量计数量
-// export function deviceCount(params) {
-// return request({
-// url: 'device/count/15',
-// method: 'get',
-// params
-// })
-// }
+// 用水量、噪声统计数据
+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({
@@ -56,7 +92,7 @@
// 查询二级分区燃气告警
export function gasAlarmBySecondArea(params) {
return request({
- url: 'dataStatistic/gasAlarmBySecondArea',
+ url: 'gas/alarm/rate',
method: 'get',
params
})
diff --git a/src/components/BigData/Card1/index.vue b/src/components/BigData/Card1/index.vue
index 748747b..c9ec32d 100644
--- a/src/components/BigData/Card1/index.vue
+++ b/src/components/BigData/Card1/index.vue
@@ -4,21 +4,11 @@
-
-
-
-
-
- {{ title[0] }} {{ context[0] }}{{ unit }}
-
-
- {{ title[1] }} {{ context[1] }}-->
+
+
-
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index 8301f8c..03047ac 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -4,7 +4,7 @@
-
diff --git a/src/views/dashboard/components/AlarmByDays.vue b/src/views/dashboard/components/AlarmByDays.vue
index ddfd8e3..8a9a937 100644
--- a/src/views/dashboard/components/AlarmByDays.vue
+++ b/src/views/dashboard/components/AlarmByDays.vue
@@ -23,11 +23,11 @@
}
this.chartSettings = {
labelMap: {
- '远传水表': '远传水表',
+ '远程水表': '远程水表',
'噪声记录仪': '噪声记录仪',
'液位监测仪': '液位监测仪'
},
- metrics: ['远传水表', '噪声记录仪', '液位监测仪'],
+ metrics: ['远程水表', '噪声记录仪', '液位监测仪'],
dimension: ['date']
}
return {
@@ -37,7 +37,7 @@
endTime: ''
},
chartData: {
- columns: ['date', '远传水表', '噪声记录仪', '液位监测仪'],
+ columns: ['date', '远程水表', '噪声记录仪', '液位监测仪'],
rows: []
}
}
@@ -65,7 +65,7 @@
delete item.data
return item
})
-
+
this.chartData.rows = arr
})
},
diff --git a/src/views/dashboard/components/FunctionArea.vue b/src/views/dashboard/components/FunctionArea.vue
index 4c05cee..6401557 100644
--- a/src/views/dashboard/components/FunctionArea.vue
+++ b/src/views/dashboard/components/FunctionArea.vue
@@ -5,11 +5,11 @@
-->
+
@@ -41,7 +31,7 @@
props: {
title: {
type: Array,
- default: function () {
+ default: function() {
return ['标题', '标题']
}
},
@@ -55,7 +45,7 @@
},
context: {
type: Array,
- default: function () {
+ default: function() {
return ['--', '--']
}
},
@@ -83,6 +73,8 @@
height: 108px;
font-size: 12px;
position: relative;
+ display: flex;
+ align-items: center;
overflow: hidden;
color: #666;
background: #fff;
@@ -96,7 +88,6 @@
}
.card-panel-icon-wrapper {
- float: left;
margin: 14px 0 0 10px;
padding: 16px 2px;
transition: all 0.38s ease-out;
@@ -109,25 +100,22 @@
}
.card-panel-description {
- float: left;
+ flex:1;
font-weight: bold;
- margin-top: 26px;
overflow: auto;
margin-left: 5px;
.two {
.card-panel-text {
- line-height: 18px;
+ line-height: 26px;
color: rgba(0, 0, 0, 0.45);
font-size: 14px;
- margin-bottom: 12px;
+ display: flex;
+ justify-content: space-between;
}
-
.card-panel-num {
font-size: 18px;
color: #666;
- padding-left: 10px;
- float: right;
}
}
.only {
diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js
index aa41264..11dc521 100644
--- a/src/utils/dateutils.js
+++ b/src/utils/dateutils.js
@@ -52,3 +52,13 @@
}
return fmt
}
+
+/**
+ * 获取近1周日期范围
+ * @returns {*[]}
+ */
+export function getSearchLastWeekTime() {
+ const startTime = getLastWeek().Format('yyyy-MM-dd hh:mm:ss')
+ const endTime = getToday('yyyy-MM-dd hh:mm:ss')
+ return [startTime, endTime]
+}
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 97345d9..283c8ef 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -5,7 +5,7 @@
+ {{ name }} {{ context[index] }}{{ unit }}
- 本年度
- 本季度
- 近30日
- 近7日
- 今日
+ 本年度
+ 本季度
+ 近30日
+ 近7日
+ 今日
diff --git a/src/views/gasDashboard/components/PanelGroup.vue b/src/views/gasDashboard/components/PanelGroup.vue
index eead839..5613860 100644
--- a/src/views/gasDashboard/components/PanelGroup.vue
+++ b/src/views/gasDashboard/components/PanelGroup.vue
@@ -17,6 +17,7 @@
import Card from '@/components/BigData/Card'
// 首页
import { gasStatistic, deviceCount, alarmNowStatic } from '@/api/gasOverview'
+import { gasStatistic2 } from '../../../api/gasOverview'
export default {
components: {
Card,
@@ -26,40 +27,40 @@
return {
dataGroup1: [
{
- title: ['总用气量', '本月用气量'],
- context: ['--', '--'],
+ title: ['CO₂总用气量', 'CO₂本月用气量', 'CO₂今日用气量'],
+ context: ['--', '--', '--'],
icon: '',
color: '#40c9c6',
- unit: '吨',
+ unit: 'Nm³',
index: 0
},
{
- title: ['今日用气量', '生产厂区用气量'],
- context: ['--', '--'],
+ title: ['O₂总用气量', 'O₂本月用气量', 'O₂今日用气量'],
+ context: ['--', '--', '--'],
icon: '',
color: '#36a3f7',
- unit: '吨',
+ unit: 'Nm³',
index: 1
},
{
+ title: ['燃气总用气量', '燃气本月用气量', '燃气今日用气量'],
+ context: ['--', '--', '--'],
+ icon: '',
+ color: '#36a3f7',
+ unit: 'Nm³',
+ index: 2
+ },
+ {
title: ['滑道实时噪声'],
context: ['--'],
icon: 'icon-noise',
color: '#f1c353',
unit: 'db',
- index: 2
+ index: 3
}
],
dataGroup: [
{
- title: '气体流量计',
- context: '--',
- icon: 'icon-watch',
- color: '#9694f7',
- path: '/deviceList?deviceType=13',
- permission: '/device/list'
- },
- {
title: '告警信息',
context: '--',
icon: 'icon-alarm',
@@ -73,7 +74,7 @@
mounted() {
this.getWater()
// this.getWellCount()
- this.getDeviceCount()
+ // this.getDeviceCount()
this.getAlarmCount()
},
methods: {
@@ -83,19 +84,21 @@
getWater() {
// 用气量
gasStatistic().then(response => {
- this.dataGroup1[0].context = [response.data.total ? parseFloat(response.data.total).toFixed(2) : '--', response.data.month ? parseFloat(response.data.month).toFixed(2) : '--']
- this.dataGroup1[1].context = [response.data.today ? parseFloat(response.data.today).toFixed(2) : '--', response.data.prodution ? parseFloat(response.data.prodution).toFixed(2) : '--']
- this.dataGroup1[2].context = [response.data.sound ? Number(response.data.sound).toFixed(2) : '--']
+ this.dataGroup1[3].context = [response.data.sound ? Number(response.data.sound).toFixed(2) : '--']
})
- },
- getDeviceCount() {
- deviceCount('15').then(response => {
- this.dataGroup[0].context = response.data
+ gasStatistic2('15').then(response => {
+ this.dataGroup1[0].context = [response.data.total.toFixed(2), response.data.month.toFixed(2), response.data.day === '' ? '--' : response.data.day.toFixed(2)]
+ })
+ gasStatistic2('16').then(response => {
+ this.dataGroup1[1].context = [response.data.total.toFixed(2), response.data.month.toFixed(2), response.data.day === '' ? '--' : response.data.day.toFixed(2)]
+ })
+ gasStatistic2('17').then(response => {
+ this.dataGroup1[2].context = [response.data.total.toFixed(2), response.data.month.toFixed(2), response.data.day === '' ? '--' : response.data.day.toFixed(2)]
})
},
getAlarmCount() {
alarmNowStatic().then(response => {
- this.dataGroup[1].context = response.data.total
+ this.dataGroup[0].context = response.data.total
})
}
}
diff --git a/src/views/gasDashboard/components/alarmGasCountByDept.vue b/src/views/gasDashboard/components/alarmGasCountByDept.vue
deleted file mode 100644
index b8bfc23..0000000
--- a/src/views/gasDashboard/components/alarmGasCountByDept.vue
+++ /dev/null
@@ -1,73 +0,0 @@
-
-
-
-
-
-
-
-
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/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
index c144bc6..a410f29 100644
--- a/src/views/gasDashboard/components/corrodeCountByDay.vue
+++ b/src/views/gasDashboard/components/corrodeCountByDay.vue
@@ -45,11 +45,14 @@
},
extend: {
grid: {
- top: 120
+ top: 120,
+ left: 30
},
yAxis: {
+ position: 'left',
+ type: 'value',
name: '腐蚀率(%)',
- position: 'left'
+ nameRotate: '0.1'
},
legend: {
// type: 'scroll',
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/gasCountByDay.vue b/src/views/gasDashboard/components/gasCountByDay.vue
index 79a4efb..f0a3977 100644
--- a/src/views/gasDashboard/components/gasCountByDay.vue
+++ b/src/views/gasDashboard/components/gasCountByDay.vue
@@ -1,34 +1,33 @@
-
-
-
-
+
-
-
+
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
@@ -81,19 +69,23 @@
import DeviceCount from './components/DeviceCount'
import gasCountByDept from './components/gasCountByDept'
import gasCountByDay from './components/gasCountByDay'
-import gasCountByAreaBar from './components/gasCountByAreaBar'
+import gasCountByDeviceBar from './components/gasCountByDeviceBar'
import WatchAlarmBar from './components/watchAlarmBar'
import gasNote from './components/gasNote'
import AlarmCountByDept from './components/AlarmCountByDept'
import gasCompare from './components/gasCompare'
import watchGasAlarmBar from './components/watchGasAlarmBar'
-import alarmGasCountByDept from './components/alarmGasCountByDept'
+import alarmGasCountByType from './components/alarmGasCountByType'
import corrodeCountByDay from './components/corrodeCountByDay'
+import AlarmLeakCountPie from './components/alarmLeakCountPie'
+import GasAlarmTrend from './components/gasAlarmTrend'
export default {
name: 'Dashboard',
components: {
- gasCountByAreaBar,
+ GasAlarmTrend,
+ AlarmLeakCountPie,
+ gasCountByDeviceBar,
gasCountByDept,
gasCountByDay,
gasNote,
@@ -103,7 +95,7 @@
WatchAlarmBar,
AlarmCountByDept,
watchGasAlarmBar,
- alarmGasCountByDept,
+ alarmGasCountByType,
corrodeCountByDay
},
data() {
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/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/src/api/gasOverview.js b/src/api/gasOverview.js
index 559a078..0dc3442 100644
--- a/src/api/gasOverview.js
+++ b/src/api/gasOverview.js
@@ -11,14 +11,50 @@
})
}
-// 气体流量计数量
-// export function deviceCount(params) {
-// return request({
-// url: 'device/count/15',
-// method: 'get',
-// params
-// })
-// }
+// 用水量、噪声统计数据
+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({
@@ -56,7 +92,7 @@
// 查询二级分区燃气告警
export function gasAlarmBySecondArea(params) {
return request({
- url: 'dataStatistic/gasAlarmBySecondArea',
+ url: 'gas/alarm/rate',
method: 'get',
params
})
diff --git a/src/components/BigData/Card1/index.vue b/src/components/BigData/Card1/index.vue
index 748747b..c9ec32d 100644
--- a/src/components/BigData/Card1/index.vue
+++ b/src/components/BigData/Card1/index.vue
@@ -4,21 +4,11 @@
-
-
+
+
diff --git a/src/views/gasDashboard/index.vue b/src/views/gasDashboard/index.vue
index 6eb2d56..be583f2 100644
--- a/src/views/gasDashboard/index.vue
+++ b/src/views/gasDashboard/index.vue
@@ -2,72 +2,60 @@
-
-
-
- {{ title[0] }} {{ context[0] }}{{ unit }}
-
-
- {{ title[1] }} {{ context[1] }}-->
+
+
-
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index 8301f8c..03047ac 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -4,7 +4,7 @@
-
diff --git a/src/views/dashboard/components/AlarmByDays.vue b/src/views/dashboard/components/AlarmByDays.vue
index ddfd8e3..8a9a937 100644
--- a/src/views/dashboard/components/AlarmByDays.vue
+++ b/src/views/dashboard/components/AlarmByDays.vue
@@ -23,11 +23,11 @@
}
this.chartSettings = {
labelMap: {
- '远传水表': '远传水表',
+ '远程水表': '远程水表',
'噪声记录仪': '噪声记录仪',
'液位监测仪': '液位监测仪'
},
- metrics: ['远传水表', '噪声记录仪', '液位监测仪'],
+ metrics: ['远程水表', '噪声记录仪', '液位监测仪'],
dimension: ['date']
}
return {
@@ -37,7 +37,7 @@
endTime: ''
},
chartData: {
- columns: ['date', '远传水表', '噪声记录仪', '液位监测仪'],
+ columns: ['date', '远程水表', '噪声记录仪', '液位监测仪'],
rows: []
}
}
@@ -65,7 +65,7 @@
delete item.data
return item
})
-
+
this.chartData.rows = arr
})
},
diff --git a/src/views/dashboard/components/FunctionArea.vue b/src/views/dashboard/components/FunctionArea.vue
index 4c05cee..6401557 100644
--- a/src/views/dashboard/components/FunctionArea.vue
+++ b/src/views/dashboard/components/FunctionArea.vue
@@ -5,11 +5,11 @@
-->
+
@@ -41,7 +31,7 @@
props: {
title: {
type: Array,
- default: function () {
+ default: function() {
return ['标题', '标题']
}
},
@@ -55,7 +45,7 @@
},
context: {
type: Array,
- default: function () {
+ default: function() {
return ['--', '--']
}
},
@@ -83,6 +73,8 @@
height: 108px;
font-size: 12px;
position: relative;
+ display: flex;
+ align-items: center;
overflow: hidden;
color: #666;
background: #fff;
@@ -96,7 +88,6 @@
}
.card-panel-icon-wrapper {
- float: left;
margin: 14px 0 0 10px;
padding: 16px 2px;
transition: all 0.38s ease-out;
@@ -109,25 +100,22 @@
}
.card-panel-description {
- float: left;
+ flex:1;
font-weight: bold;
- margin-top: 26px;
overflow: auto;
margin-left: 5px;
.two {
.card-panel-text {
- line-height: 18px;
+ line-height: 26px;
color: rgba(0, 0, 0, 0.45);
font-size: 14px;
- margin-bottom: 12px;
+ display: flex;
+ justify-content: space-between;
}
-
.card-panel-num {
font-size: 18px;
color: #666;
- padding-left: 10px;
- float: right;
}
}
.only {
diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js
index aa41264..11dc521 100644
--- a/src/utils/dateutils.js
+++ b/src/utils/dateutils.js
@@ -52,3 +52,13 @@
}
return fmt
}
+
+/**
+ * 获取近1周日期范围
+ * @returns {*[]}
+ */
+export function getSearchLastWeekTime() {
+ const startTime = getLastWeek().Format('yyyy-MM-dd hh:mm:ss')
+ const endTime = getToday('yyyy-MM-dd hh:mm:ss')
+ return [startTime, endTime]
+}
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 97345d9..283c8ef 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -5,7 +5,7 @@
+ {{ name }} {{ context[index] }}{{ unit }}
- 本年度
- 本季度
- 近30日
- 近7日
- 今日
+ 本年度
+ 本季度
+ 近30日
+ 近7日
+ 今日
diff --git a/src/views/gasDashboard/components/PanelGroup.vue b/src/views/gasDashboard/components/PanelGroup.vue
index eead839..5613860 100644
--- a/src/views/gasDashboard/components/PanelGroup.vue
+++ b/src/views/gasDashboard/components/PanelGroup.vue
@@ -17,6 +17,7 @@
import Card from '@/components/BigData/Card'
// 首页
import { gasStatistic, deviceCount, alarmNowStatic } from '@/api/gasOverview'
+import { gasStatistic2 } from '../../../api/gasOverview'
export default {
components: {
Card,
@@ -26,40 +27,40 @@
return {
dataGroup1: [
{
- title: ['总用气量', '本月用气量'],
- context: ['--', '--'],
+ title: ['CO₂总用气量', 'CO₂本月用气量', 'CO₂今日用气量'],
+ context: ['--', '--', '--'],
icon: '',
color: '#40c9c6',
- unit: '吨',
+ unit: 'Nm³',
index: 0
},
{
- title: ['今日用气量', '生产厂区用气量'],
- context: ['--', '--'],
+ title: ['O₂总用气量', 'O₂本月用气量', 'O₂今日用气量'],
+ context: ['--', '--', '--'],
icon: '',
color: '#36a3f7',
- unit: '吨',
+ unit: 'Nm³',
index: 1
},
{
+ title: ['燃气总用气量', '燃气本月用气量', '燃气今日用气量'],
+ context: ['--', '--', '--'],
+ icon: '',
+ color: '#36a3f7',
+ unit: 'Nm³',
+ index: 2
+ },
+ {
title: ['滑道实时噪声'],
context: ['--'],
icon: 'icon-noise',
color: '#f1c353',
unit: 'db',
- index: 2
+ index: 3
}
],
dataGroup: [
{
- title: '气体流量计',
- context: '--',
- icon: 'icon-watch',
- color: '#9694f7',
- path: '/deviceList?deviceType=13',
- permission: '/device/list'
- },
- {
title: '告警信息',
context: '--',
icon: 'icon-alarm',
@@ -73,7 +74,7 @@
mounted() {
this.getWater()
// this.getWellCount()
- this.getDeviceCount()
+ // this.getDeviceCount()
this.getAlarmCount()
},
methods: {
@@ -83,19 +84,21 @@
getWater() {
// 用气量
gasStatistic().then(response => {
- this.dataGroup1[0].context = [response.data.total ? parseFloat(response.data.total).toFixed(2) : '--', response.data.month ? parseFloat(response.data.month).toFixed(2) : '--']
- this.dataGroup1[1].context = [response.data.today ? parseFloat(response.data.today).toFixed(2) : '--', response.data.prodution ? parseFloat(response.data.prodution).toFixed(2) : '--']
- this.dataGroup1[2].context = [response.data.sound ? Number(response.data.sound).toFixed(2) : '--']
+ this.dataGroup1[3].context = [response.data.sound ? Number(response.data.sound).toFixed(2) : '--']
})
- },
- getDeviceCount() {
- deviceCount('15').then(response => {
- this.dataGroup[0].context = response.data
+ gasStatistic2('15').then(response => {
+ this.dataGroup1[0].context = [response.data.total.toFixed(2), response.data.month.toFixed(2), response.data.day === '' ? '--' : response.data.day.toFixed(2)]
+ })
+ gasStatistic2('16').then(response => {
+ this.dataGroup1[1].context = [response.data.total.toFixed(2), response.data.month.toFixed(2), response.data.day === '' ? '--' : response.data.day.toFixed(2)]
+ })
+ gasStatistic2('17').then(response => {
+ this.dataGroup1[2].context = [response.data.total.toFixed(2), response.data.month.toFixed(2), response.data.day === '' ? '--' : response.data.day.toFixed(2)]
})
},
getAlarmCount() {
alarmNowStatic().then(response => {
- this.dataGroup[1].context = response.data.total
+ this.dataGroup[0].context = response.data.total
})
}
}
diff --git a/src/views/gasDashboard/components/alarmGasCountByDept.vue b/src/views/gasDashboard/components/alarmGasCountByDept.vue
deleted file mode 100644
index b8bfc23..0000000
--- a/src/views/gasDashboard/components/alarmGasCountByDept.vue
+++ /dev/null
@@ -1,73 +0,0 @@
-
-
-
-
-
-
-
-
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/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
index c144bc6..a410f29 100644
--- a/src/views/gasDashboard/components/corrodeCountByDay.vue
+++ b/src/views/gasDashboard/components/corrodeCountByDay.vue
@@ -45,11 +45,14 @@
},
extend: {
grid: {
- top: 120
+ top: 120,
+ left: 30
},
yAxis: {
+ position: 'left',
+ type: 'value',
name: '腐蚀率(%)',
- position: 'left'
+ nameRotate: '0.1'
},
legend: {
// type: 'scroll',
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/gasCountByDay.vue b/src/views/gasDashboard/components/gasCountByDay.vue
index 79a4efb..f0a3977 100644
--- a/src/views/gasDashboard/components/gasCountByDay.vue
+++ b/src/views/gasDashboard/components/gasCountByDay.vue
@@ -1,34 +1,33 @@
-
-
-
-
+
-
-
+
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
@@ -81,19 +69,23 @@
import DeviceCount from './components/DeviceCount'
import gasCountByDept from './components/gasCountByDept'
import gasCountByDay from './components/gasCountByDay'
-import gasCountByAreaBar from './components/gasCountByAreaBar'
+import gasCountByDeviceBar from './components/gasCountByDeviceBar'
import WatchAlarmBar from './components/watchAlarmBar'
import gasNote from './components/gasNote'
import AlarmCountByDept from './components/AlarmCountByDept'
import gasCompare from './components/gasCompare'
import watchGasAlarmBar from './components/watchGasAlarmBar'
-import alarmGasCountByDept from './components/alarmGasCountByDept'
+import alarmGasCountByType from './components/alarmGasCountByType'
import corrodeCountByDay from './components/corrodeCountByDay'
+import AlarmLeakCountPie from './components/alarmLeakCountPie'
+import GasAlarmTrend from './components/gasAlarmTrend'
export default {
name: 'Dashboard',
components: {
- gasCountByAreaBar,
+ GasAlarmTrend,
+ AlarmLeakCountPie,
+ gasCountByDeviceBar,
gasCountByDept,
gasCountByDay,
gasNote,
@@ -103,7 +95,7 @@
WatchAlarmBar,
AlarmCountByDept,
watchGasAlarmBar,
- alarmGasCountByDept,
+ alarmGasCountByType,
corrodeCountByDay
},
data() {
diff --git a/src/views/gasOverview/gasOverviewSimple.vue b/src/views/gasOverview/gasOverviewSimple.vue
index 585ab8a..764bf28 100644
--- a/src/views/gasOverview/gasOverviewSimple.vue
+++ b/src/views/gasOverview/gasOverviewSimple.vue
@@ -5,7 +5,7 @@
-
+
搜索
@@ -36,7 +36,7 @@
-
+
+
diff --git a/src/views/gasDashboard/index.vue b/src/views/gasDashboard/index.vue
index 6eb2d56..be583f2 100644
--- a/src/views/gasDashboard/index.vue
+++ b/src/views/gasDashboard/index.vue
@@ -2,72 +2,60 @@
+
告警列表
@@ -48,10 +48,10 @@
@@ -97,7 +97,11 @@
var rq_model_layer = null // 燃气模型层
var rq_icon_layer = null // 燃气图标层
var qt_model_layer = null // 气体流量计模型层
+var qt2_model_layer = null // 气体流量计模型层
+var qt3_model_layer = null // 气体流量计模型层
var qt_icon_layer = null // 气体流量计图标层
+var qt2_icon_layer = null // 气体流量计图标层
+var qt3_icon_layer = null // 气体流量计图标层
var fs_model_layer = null // 腐蚀速率监测仪模型层
var fs_icon_layer = null // 腐蚀速率监测仪图标层
export default {
@@ -106,7 +110,7 @@
data() {
return {
screenHeight: null,
- checkedCities: ['腐蚀速率监测仪', '气体流量计', '气体泄漏检测仪', '供水泄漏检测仪'],
+ checkedCities: ['腐蚀速率监测仪', '气体泄漏监测仪', '供水泄漏监测仪', 'CO2气体流量计', 'O2气体流量计', '燃气气体流量计'],
left: '',
mapMark: '-',
deviceTypeList: [], // 设备类型列表
@@ -161,6 +165,7 @@
wellTypeList: [], // 井类型列表
showDeptTree: 0, // 是否显示权属单位下拉,0不显示，1显示树，2显示平面
alarmList: [], // 报警列表
+ searchAlarmList: [],
timer: null,
deptShowTop: false, // 是否显示顶级
clock: null, // 计时器
@@ -247,12 +252,18 @@
if (item.indexOf('腐蚀速率监测仪') !== -1) {
this.wellMode()
this.fsModel()
- } else if (item.indexOf('气体流量计') !== -1) {
+ } else if (item.indexOf('CO2气体流量计') !== -1) {
this.wellMode()
this.qtModel()
- } else if (item.indexOf('气体泄漏检测仪') !== -1) {
+ } else if (item.indexOf('O2气体流量计') !== -1) {
+ this.wellMode()
+ this.qt02Model()
+ } else if (item.indexOf('燃气气体流量计') !== -1) {
+ this.wellMode()
+ this.qtgasModel()
+ } else if (item.indexOf('气体泄漏监测仪') !== -1) {
this.rqModel()
- } else if (item.indexOf('供水泄漏检测仪') !== -1) {
+ } else if (item.indexOf('供水泄漏监测仪') !== -1) {
this.wellMode()
this.zsMoel()
}
@@ -264,10 +275,14 @@
window.map.removeLayer(fs_model_layer)
window.map.removeLayer(rq_model_layer)
window.map.removeLayer(qt_model_layer)
+ window.map.removeLayer(qt2_model_layer)
+ window.map.removeLayer(qt3_model_layer)
window.map.removeLayer(fs_icon_layer)
window.map.removeLayer(zs_icon_layer)
window.map.removeLayer(rq_icon_layer)
window.map.removeLayer(qt_icon_layer)
+ window.map.removeLayer(qt2_icon_layer)
+ window.map.removeLayer(qt3_icon_layer)
window.map.removeLayer(well_model_layer)
},
// 获取设备类型
@@ -398,41 +413,6 @@
})
},
// 初始化街道、流向线
- // async initDrawLines() {
- // axios.get('./static/position.json').then((result) => {
- // const positions = result.data.positions
- // flow = new mars3d.layer.GraphicLayer()
- // window.map.addLayer(flow)
- // street = new mars3d.layer.GraphicLayer()
- // window.map.addLayer(street)
- // for (let j = 0; j < positions.length; j++) {
- // flow.addGraphic(this.addFlow(positions[j].items, positions[j].repeat))
- // street.addGraphic(this.addStreet(positions[j].items))
- // }
- // flow.show = false
- // }).catch((error) => {
- // console.log('get position error...' + error)
- // })
- // },
- // 流向线
- // addFlow(positions, repeat) {
- // console.log(positions, repeat, '====---1230')
- // var style = {
- // width: 10,
- // material: mars3d.MaterialUtil.createMaterialProperty(mars3d.MaterialType.LineFlow, {
- // color: '#215bd9',
- // repeat: new Cesium.Cartesian2(repeat, 1),
- // image: '../static/images/line.png',
- // speed: 15
- // })
- // }
- // var graphic = new mars3d.graphic.PolylineEntity({
- // positions: positions,
- // style: style
- // })
- // return graphic
- // },
- // 初始化街道、流向线
async initDrawLines() {
axios.get('./static/position2.json').then((result) => {
const positions = result.data.positions
@@ -533,12 +513,40 @@
})
return graphic
},
+ search() {
+ this.filterAlarmList()
+ this.initPoints()
+ },
+ // 过滤报警列表
+ filterAlarmList() {
+ const list = this.alarmList
+ const keywords = this.listQuery.keywords
+ if (keywords) { // 过滤井编号、设备编号
+ this.searchAlarmList = list.filter(item => {
+ let flag = false
+ if (item.wellCode.indexOf(keywords) > -1) {
+ flag = true
+ }
+ if (item.devcode.indexOf(keywords) > -1) {
+ flag = true
+ }
+ if (item.position.indexOf(keywords) > -1) {
+ flag = true
+ }
+ return flag
+ })
+ } else {
+ this.searchAlarmList = list
+ }
+ },
// 初始化井，设备
async initPoints() {
this.wellMode()
this.zsMoel()
this.rqModel()
this.qtModel()
+ this.qt02Model()
+ this.qtgasModel()
this.fsModel()
},
// 井
@@ -593,58 +601,10 @@
}
})
},
- // 远程水表（不展示）
- watchModel() {
- const params = '13'
- getMapping(params, this.listQuery.keywords).then(response => {
- // 过滤掉该单位不支持的设备(通过部门id)
- const deptIds = this.$store.getters.deptId
- const responses = []
- response.data.forEach(item => {
- if (item.deptid === deptIds) {
- responses.push(item)
- }
- })
- response.data = responses
- if (response.code === 200) {
- if (watch_model_layer !== null) window.map.removeLayer(watch_model_layer)
- watch_model_layer = new mars3d.layer.GraphicLayer()
- window.map.addLayer(watch_model_layer)
- if (watch_icon_layer !== null) window.map.removeLayer(watch_icon_layer)
- watch_icon_layer = new mars3d.layer.GraphicLayer()
- window.map.addLayer(watch_icon_layer)
- for (let i = 0; i < response.data.length; i++) {
- watch_model_layer.addGraphic(new mars3d.graphic.ModelPrimitive({
- position: [response.data[i].longitude, response.data[i].latitude, -0.5],
- style: {
- url: '../static/model/sb.glb',
- scale: 2,
- heading: 90
- },
- popup: `远程水表
设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` - })) - watch_icon_layer.addGraphic(new mars3d.graphic.BillboardEntity({ - id: response.data[i].devcode, - position: [response.data[i].longitude, response.data[i].latitude, 1], - style: { - image: '../static/images/icon/sb.png', - scale: 1, - horizontalOrigin: Cesium.HorizontalOrigin.CENTER, - verticalOrigin: Cesium.VerticalOrigin.BOTTOM, - scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3) - }, - popup: `远程水表
设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` - })) - } - this.refreshAlarm() - } - }) - }, // 腐蚀速率监测仪 fsModel() { const params = '14' getMapping(params, this.listQuery.keywords).then(response => { - console.log(response.data[0].latitude, '======腐蚀速率监测仪=======') // 过滤掉该单位不支持的设备(通过部门id) const deptIds = this.$store.getters.deptId const responses = [] @@ -662,29 +622,32 @@ if (fs_icon_layer !== null) window.map.removeLayer(fs_icon_layer) fs_icon_layer = new mars3d.layer.GraphicLayer() window.map.addLayer(fs_icon_layer) - for (let i = 0; i < response.data.length; i++) { - fs_model_layer.addGraphic(new mars3d.graphic.ModelPrimitive({ - position: [response.data[i].longitude, response.data[i].latitude, 0], - style: { - url: '../static/model/fs.glb', - scale: 1, - heading: 90 - }, - popup: `腐蚀速率监测仪
设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` - })) - fs_icon_layer.addGraphic(new mars3d.graphic.BillboardEntity({ - id: response.data[i].devcode, - position: [response.data[i].longitude, response.data[i].latitude, 1], - style: { - image: '../static/images/icon/fs.png', - scale: 1, - horizontalOrigin: Cesium.HorizontalOrigin.CENTER, - verticalOrigin: Cesium.VerticalOrigin.BOTTOM, - scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3) - }, - popup: `腐蚀速率监测仪
设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` - })) + if (response.data.length > 0) { + for (let i = 0; i < response.data.length; i++) { + fs_model_layer.addGraphic(new mars3d.graphic.ModelPrimitive({ + position: [response.data[i].longitude, response.data[i].latitude, 0], + style: { + url: '../static/model/fs.glb', + scale: 1, + heading: 90 + }, + popup: `设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` + })) + fs_icon_layer.addGraphic(new mars3d.graphic.BillboardEntity({ + id: response.data[i].devcode, + position: [response.data[i].longitude, response.data[i].latitude, 1], + style: { + image: '../static/images/icon/fs.png', + scale: 1, + horizontalOrigin: Cesium.HorizontalOrigin.CENTER, + verticalOrigin: Cesium.VerticalOrigin.BOTTOM, + scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3) + }, + popup: `设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` + })) + } } + this.refreshAlarm() } }) @@ -693,7 +656,6 @@ qtModel() { const params = '15' getMapping(params, this.listQuery.keywords).then(response => { - console.log(response.data[0].latitude, '======气体流量计=======') // 过滤掉该单位不支持的设备(通过部门id) const deptIds = this.$store.getters.deptId const responses = [] @@ -711,28 +673,128 @@ if (qt_icon_layer !== null) window.map.removeLayer(qt_icon_layer) qt_icon_layer = new mars3d.layer.GraphicLayer() window.map.addLayer(qt_icon_layer) - for (let i = 0; i < response.data.length; i++) { - qt_model_layer.addGraphic(new mars3d.graphic.ModelPrimitive({ - position: [response.data[i].longitude, response.data[i].latitude, 0], - style: { - url: '../static/model/qt.glb', - scale: 1, - heading: 90 - }, - popup: `气体流量计
设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` - })) - qt_icon_layer.addGraphic(new mars3d.graphic.BillboardEntity({ - id: response.data[i].devcode, - position: [response.data[i].longitude, response.data[i].latitude, 1], - style: { - image: '../static/images/icon/qt.png', - scale: 1, - horizontalOrigin: Cesium.HorizontalOrigin.CENTER, - verticalOrigin: Cesium.VerticalOrigin.BOTTOM, - scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3) - }, - popup: `气体流量计
设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` - })) + if (response.data.length > 0) { + for (let i = 0; i < response.data.length; i++) { + qt_model_layer.addGraphic(new mars3d.graphic.ModelPrimitive({ + position: [response.data[i].longitude, response.data[i].latitude, 0], + style: { + url: '../static/model/qt.glb', + scale: 1, + heading: 90 + }, + popup: `设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` + })) + qt_icon_layer.addGraphic(new mars3d.graphic.BillboardEntity({ + id: response.data[i].devcode, + position: [response.data[i].longitude, response.data[i].latitude, 1], + style: { + image: '../static/images/icon/qt.png', + scale: 1, + horizontalOrigin: Cesium.HorizontalOrigin.CENTER, + verticalOrigin: Cesium.VerticalOrigin.BOTTOM, + scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3) + }, + popup: `设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` + })) + } + } + this.refreshAlarm() + } + }) + }, + // 气体流量计 + qt02Model() { + const params = '16' + getMapping(params, this.listQuery.keywords).then(response => { + // 过滤掉该单位不支持的设备(通过部门id) + const deptIds = this.$store.getters.deptId + const responses = [] + response.data.forEach(item => { + if (item.deptid === deptIds) { + responses.push(item) + } + }) + response.data = responses + if (response.code === 200) { + if (qt2_model_layer !== null) window.map.removeLayer(qt2_model_layer) + qt2_model_layer = new mars3d.layer.GraphicLayer() + window.map.addLayer(qt2_model_layer) + if (qt2_icon_layer !== null) window.map.removeLayer(qt2_icon_layer) + qt2_icon_layer = new mars3d.layer.GraphicLayer() + window.map.addLayer(qt2_icon_layer) + if (response.data.length > 0) { + for (let i = 0; i < response.data.length; i++) { + qt2_model_layer.addGraphic(new mars3d.graphic.ModelPrimitive({ + position: [response.data[i].longitude, response.data[i].latitude, 0], + style: { + url: '../static/model/qt.glb', + scale: 1, + heading: 90 + }, + popup: `设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` + })) + qt2_icon_layer.addGraphic(new mars3d.graphic.BillboardEntity({ + id: response.data[i].devcode, + position: [response.data[i].longitude, response.data[i].latitude, 1], + style: { + image: '../static/images/icon/qt.png', + scale: 1, + horizontalOrigin: Cesium.HorizontalOrigin.CENTER, + verticalOrigin: Cesium.VerticalOrigin.BOTTOM, + scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3) + }, + popup: `设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` + })) + } + } + this.refreshAlarm() + } + }) + }, + // 气体流量计 + qtgasModel() { + const params = '17' + getMapping(params, this.listQuery.keywords).then(response => { + // 过滤掉该单位不支持的设备(通过部门id) + const deptIds = this.$store.getters.deptId + const responses = [] + response.data.forEach(item => { + if (item.deptid === deptIds) { + responses.push(item) + } + }) + response.data = responses + if (response.code === 200) { + if (qt3_model_layer !== null) window.map.removeLayer(qt3_model_layer) + qt3_model_layer = new mars3d.layer.GraphicLayer() + window.map.addLayer(qt3_model_layer) + if (qt3_icon_layer !== null) window.map.removeLayer(qt3_icon_layer) + qt3_icon_layer = new mars3d.layer.GraphicLayer() + window.map.addLayer(qt3_icon_layer) + if (response.data.length > 0) { + for (let i = 0; i < response.data.length; i++) { + qt3_model_layer.addGraphic(new mars3d.graphic.ModelPrimitive({ + position: [response.data[i].longitude, response.data[i].latitude, 0], + style: { + url: '../static/model/qt.glb', + scale: 1, + heading: 90 + }, + popup: `设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` + })) + qt3_icon_layer.addGraphic(new mars3d.graphic.BillboardEntity({ + id: response.data[i].devcode, + position: [response.data[i].longitude, response.data[i].latitude, 1], + style: { + image: '../static/images/icon/qt.png', + scale: 1, + horizontalOrigin: Cesium.HorizontalOrigin.CENTER, + verticalOrigin: Cesium.VerticalOrigin.BOTTOM, + scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3) + }, + popup: `设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` + })) + } } this.refreshAlarm() } @@ -742,7 +804,6 @@ rqModel() { const params = '4' getMapping(params, this.listQuery.keywords).then(response => { - console.log(response.data[0].latitude, '======气体泄露监测仪（原燃气）=======') // 过滤掉该单位不支持的设备(通过部门id) const deptIds = this.$store.getters.deptId const responses = [] @@ -760,28 +821,30 @@ if (rq_icon_layer !== null) window.map.removeLayer(rq_icon_layer) rq_icon_layer = new mars3d.layer.GraphicLayer() window.map.addLayer(rq_icon_layer) - for (let i = 0; i < response.data.length; i++) { - rq_model_layer.addGraphic(new mars3d.graphic.ModelPrimitive({ - position: [response.data[i].longitude, response.data[i].latitude, 0], - style: { - url: '../static/model/rq.glb', - scale: 1, - heading: 90 - }, - popup: `气体泄露监测仪
设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` - })) - rq_icon_layer.addGraphic(new mars3d.graphic.BillboardEntity({ - id: response.data[i].devcode, - position: [response.data[i].longitude, response.data[i].latitude, 1], - style: { - image: '../static/images/icon/rq.png', - scale: 1, - horizontalOrigin: Cesium.HorizontalOrigin.CENTER, - verticalOrigin: Cesium.VerticalOrigin.BOTTOM, - scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3) - }, - popup: `气体泄露监测仪
设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` - })) + if (response.data.length > 0) { + for (let i = 0; i < response.data.length; i++) { + rq_model_layer.addGraphic(new mars3d.graphic.ModelPrimitive({ + position: [response.data[i].longitude, response.data[i].latitude, 0], + style: { + url: '../static/model/rq.glb', + scale: 1, + heading: 90 + }, + popup: `设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` + })) + rq_icon_layer.addGraphic(new mars3d.graphic.BillboardEntity({ + id: response.data[i].devcode, + position: [response.data[i].longitude, response.data[i].latitude, 1], + style: { + image: '../static/images/icon/rq.png', + scale: 1, + horizontalOrigin: Cesium.HorizontalOrigin.CENTER, + verticalOrigin: Cesium.VerticalOrigin.BOTTOM, + scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3) + }, + popup: `设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` + })) + } } this.refreshAlarm() } @@ -791,7 +854,6 @@ zsMoel() { const params = '8' getMapping(params, this.listQuery.keywords).then(response => { - console.log(response.data[0].latitude, '======供水泄露监测仪（原噪声））=======') // 过滤掉该单位不支持的设备(通过部门id) const deptIds = this.$store.getters.deptId const responses = [] @@ -810,28 +872,30 @@ if (zs_icon_layer !== null) window.map.removeLayer(zs_icon_layer) zs_icon_layer = new mars3d.layer.GraphicLayer() window.map.addLayer(zs_icon_layer) - for (let i = 0; i < response.data.length; i++) { - zs_model_layer.addGraphic(new mars3d.graphic.ModelPrimitive({ - position: [response.data[i].longitude, response.data[i].latitude, 0], - style: { - url: '../static/model/zs.glb', - scale: 1, - heading: 90 - }, - popup: `供水泄露监测仪
设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` - })) - zs_icon_layer.addGraphic(new mars3d.graphic.BillboardEntity({ - id: response.data[i].devcode, - position: [response.data[i].longitude, response.data[i].latitude, 1], - style: { - image: '../static/images/icon/zs.png', - scale: 1, - horizontalOrigin: Cesium.HorizontalOrigin.CENTER, - verticalOrigin: Cesium.VerticalOrigin.BOTTOM, - scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3) - }, - popup: `供水泄露监测仪
设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` - })) + if (response.data.length > 0) { + for (let i = 0; i < response.data.length; i++) { + zs_model_layer.addGraphic(new mars3d.graphic.ModelPrimitive({ + position: [response.data[i].longitude, response.data[i].latitude, 0], + style: { + url: '../static/model/zs.glb', + scale: 1, + heading: 90 + }, + popup: `设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` + })) + zs_icon_layer.addGraphic(new mars3d.graphic.BillboardEntity({ + id: response.data[i].devcode, + position: [response.data[i].longitude, response.data[i].latitude, 1], + style: { + image: '../static/images/icon/zs.png', + scale: 1, + horizontalOrigin: Cesium.HorizontalOrigin.CENTER, + verticalOrigin: Cesium.VerticalOrigin.BOTTOM, + scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3) + }, + popup: `设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` + })) + } } this.refreshAlarm() } @@ -859,6 +923,7 @@ if (this.alarmList.length > 0) { this.hasAlarm = true } + this.filterAlarmList() for (const alarm of response.data) { for (const watch of watch_icon_layer.graphics) { if (alarm.devcode === watch.options.id) { diff --git a/config/dev.env.js b/config/dev.env.js index 36f7d4a..1cab225 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -9,6 +9,6 @@ // BASE_API: '"http://42.81.160.165:2022/smartwell"' // BASE_API: '"http://111.198.10.15:11304"' // BASE_API: '"http://111.198.10.15:11643"' - // BASE_API: '"http://111.198.10.15:11409/smartwell"' //可以用 - BASE_API: '"http://192.168.43.66:11643/smartwell"' //彭先洪 + BASE_API: '"http://111.198.10.15:11409/smartwell"' //可以用 + // BASE_API: '"http://192.168.43.66:11643/smartwell"' //彭先洪 }) diff --git a/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/src/api/gasOverview.js b/src/api/gasOverview.js index 559a078..0dc3442 100644 --- a/src/api/gasOverview.js +++ b/src/api/gasOverview.js @@ -11,14 +11,50 @@ }) } -// 气体流量计数量 -// export function deviceCount(params) { -// return request({ -// url: 'device/count/15', -// method: 'get', -// params -// }) -// } +// 用水量、噪声统计数据 +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({ @@ -56,7 +92,7 @@ // 查询二级分区燃气告警 export function gasAlarmBySecondArea(params) { return request({ - url: 'dataStatistic/gasAlarmBySecondArea', + url: 'gas/alarm/rate', method: 'get', params }) diff --git a/src/components/BigData/Card1/index.vue b/src/components/BigData/Card1/index.vue index 748747b..c9ec32d 100644 --- a/src/components/BigData/Card1/index.vue +++ b/src/components/BigData/Card1/index.vue @@ -4,21 +4,11 @@ - -
设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` - })) - watch_icon_layer.addGraphic(new mars3d.graphic.BillboardEntity({ - id: response.data[i].devcode, - position: [response.data[i].longitude, response.data[i].latitude, 1], - style: { - image: '../static/images/icon/sb.png', - scale: 1, - horizontalOrigin: Cesium.HorizontalOrigin.CENTER, - verticalOrigin: Cesium.VerticalOrigin.BOTTOM, - scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3) - }, - popup: `远程水表
设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` - })) - } - this.refreshAlarm() - } - }) - }, // 腐蚀速率监测仪 fsModel() { const params = '14' getMapping(params, this.listQuery.keywords).then(response => { - console.log(response.data[0].latitude, '======腐蚀速率监测仪=======') // 过滤掉该单位不支持的设备(通过部门id) const deptIds = this.$store.getters.deptId const responses = [] @@ -662,29 +622,32 @@ if (fs_icon_layer !== null) window.map.removeLayer(fs_icon_layer) fs_icon_layer = new mars3d.layer.GraphicLayer() window.map.addLayer(fs_icon_layer) - for (let i = 0; i < response.data.length; i++) { - fs_model_layer.addGraphic(new mars3d.graphic.ModelPrimitive({ - position: [response.data[i].longitude, response.data[i].latitude, 0], - style: { - url: '../static/model/fs.glb', - scale: 1, - heading: 90 - }, - popup: `腐蚀速率监测仪
设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` - })) - fs_icon_layer.addGraphic(new mars3d.graphic.BillboardEntity({ - id: response.data[i].devcode, - position: [response.data[i].longitude, response.data[i].latitude, 1], - style: { - image: '../static/images/icon/fs.png', - scale: 1, - horizontalOrigin: Cesium.HorizontalOrigin.CENTER, - verticalOrigin: Cesium.VerticalOrigin.BOTTOM, - scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3) - }, - popup: `腐蚀速率监测仪
设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` - })) + if (response.data.length > 0) { + for (let i = 0; i < response.data.length; i++) { + fs_model_layer.addGraphic(new mars3d.graphic.ModelPrimitive({ + position: [response.data[i].longitude, response.data[i].latitude, 0], + style: { + url: '../static/model/fs.glb', + scale: 1, + heading: 90 + }, + popup: `设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` + })) + fs_icon_layer.addGraphic(new mars3d.graphic.BillboardEntity({ + id: response.data[i].devcode, + position: [response.data[i].longitude, response.data[i].latitude, 1], + style: { + image: '../static/images/icon/fs.png', + scale: 1, + horizontalOrigin: Cesium.HorizontalOrigin.CENTER, + verticalOrigin: Cesium.VerticalOrigin.BOTTOM, + scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3) + }, + popup: `设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` + })) + } } + this.refreshAlarm() } }) @@ -693,7 +656,6 @@ qtModel() { const params = '15' getMapping(params, this.listQuery.keywords).then(response => { - console.log(response.data[0].latitude, '======气体流量计=======') // 过滤掉该单位不支持的设备(通过部门id) const deptIds = this.$store.getters.deptId const responses = [] @@ -711,28 +673,128 @@ if (qt_icon_layer !== null) window.map.removeLayer(qt_icon_layer) qt_icon_layer = new mars3d.layer.GraphicLayer() window.map.addLayer(qt_icon_layer) - for (let i = 0; i < response.data.length; i++) { - qt_model_layer.addGraphic(new mars3d.graphic.ModelPrimitive({ - position: [response.data[i].longitude, response.data[i].latitude, 0], - style: { - url: '../static/model/qt.glb', - scale: 1, - heading: 90 - }, - popup: `气体流量计
设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` - })) - qt_icon_layer.addGraphic(new mars3d.graphic.BillboardEntity({ - id: response.data[i].devcode, - position: [response.data[i].longitude, response.data[i].latitude, 1], - style: { - image: '../static/images/icon/qt.png', - scale: 1, - horizontalOrigin: Cesium.HorizontalOrigin.CENTER, - verticalOrigin: Cesium.VerticalOrigin.BOTTOM, - scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3) - }, - popup: `气体流量计
设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` - })) + if (response.data.length > 0) { + for (let i = 0; i < response.data.length; i++) { + qt_model_layer.addGraphic(new mars3d.graphic.ModelPrimitive({ + position: [response.data[i].longitude, response.data[i].latitude, 0], + style: { + url: '../static/model/qt.glb', + scale: 1, + heading: 90 + }, + popup: `设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` + })) + qt_icon_layer.addGraphic(new mars3d.graphic.BillboardEntity({ + id: response.data[i].devcode, + position: [response.data[i].longitude, response.data[i].latitude, 1], + style: { + image: '../static/images/icon/qt.png', + scale: 1, + horizontalOrigin: Cesium.HorizontalOrigin.CENTER, + verticalOrigin: Cesium.VerticalOrigin.BOTTOM, + scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3) + }, + popup: `设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` + })) + } + } + this.refreshAlarm() + } + }) + }, + // 气体流量计 + qt02Model() { + const params = '16' + getMapping(params, this.listQuery.keywords).then(response => { + // 过滤掉该单位不支持的设备(通过部门id) + const deptIds = this.$store.getters.deptId + const responses = [] + response.data.forEach(item => { + if (item.deptid === deptIds) { + responses.push(item) + } + }) + response.data = responses + if (response.code === 200) { + if (qt2_model_layer !== null) window.map.removeLayer(qt2_model_layer) + qt2_model_layer = new mars3d.layer.GraphicLayer() + window.map.addLayer(qt2_model_layer) + if (qt2_icon_layer !== null) window.map.removeLayer(qt2_icon_layer) + qt2_icon_layer = new mars3d.layer.GraphicLayer() + window.map.addLayer(qt2_icon_layer) + if (response.data.length > 0) { + for (let i = 0; i < response.data.length; i++) { + qt2_model_layer.addGraphic(new mars3d.graphic.ModelPrimitive({ + position: [response.data[i].longitude, response.data[i].latitude, 0], + style: { + url: '../static/model/qt.glb', + scale: 1, + heading: 90 + }, + popup: `设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` + })) + qt2_icon_layer.addGraphic(new mars3d.graphic.BillboardEntity({ + id: response.data[i].devcode, + position: [response.data[i].longitude, response.data[i].latitude, 1], + style: { + image: '../static/images/icon/qt.png', + scale: 1, + horizontalOrigin: Cesium.HorizontalOrigin.CENTER, + verticalOrigin: Cesium.VerticalOrigin.BOTTOM, + scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3) + }, + popup: `设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` + })) + } + } + this.refreshAlarm() + } + }) + }, + // 气体流量计 + qtgasModel() { + const params = '17' + getMapping(params, this.listQuery.keywords).then(response => { + // 过滤掉该单位不支持的设备(通过部门id) + const deptIds = this.$store.getters.deptId + const responses = [] + response.data.forEach(item => { + if (item.deptid === deptIds) { + responses.push(item) + } + }) + response.data = responses + if (response.code === 200) { + if (qt3_model_layer !== null) window.map.removeLayer(qt3_model_layer) + qt3_model_layer = new mars3d.layer.GraphicLayer() + window.map.addLayer(qt3_model_layer) + if (qt3_icon_layer !== null) window.map.removeLayer(qt3_icon_layer) + qt3_icon_layer = new mars3d.layer.GraphicLayer() + window.map.addLayer(qt3_icon_layer) + if (response.data.length > 0) { + for (let i = 0; i < response.data.length; i++) { + qt3_model_layer.addGraphic(new mars3d.graphic.ModelPrimitive({ + position: [response.data[i].longitude, response.data[i].latitude, 0], + style: { + url: '../static/model/qt.glb', + scale: 1, + heading: 90 + }, + popup: `设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` + })) + qt3_icon_layer.addGraphic(new mars3d.graphic.BillboardEntity({ + id: response.data[i].devcode, + position: [response.data[i].longitude, response.data[i].latitude, 1], + style: { + image: '../static/images/icon/qt.png', + scale: 1, + horizontalOrigin: Cesium.HorizontalOrigin.CENTER, + verticalOrigin: Cesium.VerticalOrigin.BOTTOM, + scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3) + }, + popup: `设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` + })) + } } this.refreshAlarm() } @@ -742,7 +804,6 @@ rqModel() { const params = '4' getMapping(params, this.listQuery.keywords).then(response => { - console.log(response.data[0].latitude, '======气体泄露监测仪（原燃气）=======') // 过滤掉该单位不支持的设备(通过部门id) const deptIds = this.$store.getters.deptId const responses = [] @@ -760,28 +821,30 @@ if (rq_icon_layer !== null) window.map.removeLayer(rq_icon_layer) rq_icon_layer = new mars3d.layer.GraphicLayer() window.map.addLayer(rq_icon_layer) - for (let i = 0; i < response.data.length; i++) { - rq_model_layer.addGraphic(new mars3d.graphic.ModelPrimitive({ - position: [response.data[i].longitude, response.data[i].latitude, 0], - style: { - url: '../static/model/rq.glb', - scale: 1, - heading: 90 - }, - popup: `气体泄露监测仪
设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` - })) - rq_icon_layer.addGraphic(new mars3d.graphic.BillboardEntity({ - id: response.data[i].devcode, - position: [response.data[i].longitude, response.data[i].latitude, 1], - style: { - image: '../static/images/icon/rq.png', - scale: 1, - horizontalOrigin: Cesium.HorizontalOrigin.CENTER, - verticalOrigin: Cesium.VerticalOrigin.BOTTOM, - scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3) - }, - popup: `气体泄露监测仪
设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` - })) + if (response.data.length > 0) { + for (let i = 0; i < response.data.length; i++) { + rq_model_layer.addGraphic(new mars3d.graphic.ModelPrimitive({ + position: [response.data[i].longitude, response.data[i].latitude, 0], + style: { + url: '../static/model/rq.glb', + scale: 1, + heading: 90 + }, + popup: `设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` + })) + rq_icon_layer.addGraphic(new mars3d.graphic.BillboardEntity({ + id: response.data[i].devcode, + position: [response.data[i].longitude, response.data[i].latitude, 1], + style: { + image: '../static/images/icon/rq.png', + scale: 1, + horizontalOrigin: Cesium.HorizontalOrigin.CENTER, + verticalOrigin: Cesium.VerticalOrigin.BOTTOM, + scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3) + }, + popup: `设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` + })) + } } this.refreshAlarm() } @@ -791,7 +854,6 @@ zsMoel() { const params = '8' getMapping(params, this.listQuery.keywords).then(response => { - console.log(response.data[0].latitude, '======供水泄露监测仪（原噪声））=======') // 过滤掉该单位不支持的设备(通过部门id) const deptIds = this.$store.getters.deptId const responses = [] @@ -810,28 +872,30 @@ if (zs_icon_layer !== null) window.map.removeLayer(zs_icon_layer) zs_icon_layer = new mars3d.layer.GraphicLayer() window.map.addLayer(zs_icon_layer) - for (let i = 0; i < response.data.length; i++) { - zs_model_layer.addGraphic(new mars3d.graphic.ModelPrimitive({ - position: [response.data[i].longitude, response.data[i].latitude, 0], - style: { - url: '../static/model/zs.glb', - scale: 1, - heading: 90 - }, - popup: `供水泄露监测仪
设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` - })) - zs_icon_layer.addGraphic(new mars3d.graphic.BillboardEntity({ - id: response.data[i].devcode, - position: [response.data[i].longitude, response.data[i].latitude, 1], - style: { - image: '../static/images/icon/zs.png', - scale: 1, - horizontalOrigin: Cesium.HorizontalOrigin.CENTER, - verticalOrigin: Cesium.VerticalOrigin.BOTTOM, - scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3) - }, - popup: `供水泄露监测仪
设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` - })) + if (response.data.length > 0) { + for (let i = 0; i < response.data.length; i++) { + zs_model_layer.addGraphic(new mars3d.graphic.ModelPrimitive({ + position: [response.data[i].longitude, response.data[i].latitude, 0], + style: { + url: '../static/model/zs.glb', + scale: 1, + heading: 90 + }, + popup: `设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` + })) + zs_icon_layer.addGraphic(new mars3d.graphic.BillboardEntity({ + id: response.data[i].devcode, + position: [response.data[i].longitude, response.data[i].latitude, 1], + style: { + image: '../static/images/icon/zs.png', + scale: 1, + horizontalOrigin: Cesium.HorizontalOrigin.CENTER, + verticalOrigin: Cesium.VerticalOrigin.BOTTOM, + scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3) + }, + popup: `设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` + })) + } } this.refreshAlarm() } @@ -859,6 +923,7 @@ if (this.alarmList.length > 0) { this.hasAlarm = true } + this.filterAlarmList() for (const alarm of response.data) { for (const watch of watch_icon_layer.graphics) { if (alarm.devcode === watch.options.id) { diff --git a/config/dev.env.js b/config/dev.env.js index 36f7d4a..1cab225 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -9,6 +9,6 @@ // BASE_API: '"http://42.81.160.165:2022/smartwell"' // BASE_API: '"http://111.198.10.15:11304"' // BASE_API: '"http://111.198.10.15:11643"' - // BASE_API: '"http://111.198.10.15:11409/smartwell"' //可以用 - BASE_API: '"http://192.168.43.66:11643/smartwell"' //彭先洪 + BASE_API: '"http://111.198.10.15:11409/smartwell"' //可以用 + // BASE_API: '"http://192.168.43.66:11643/smartwell"' //彭先洪 }) diff --git a/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/src/api/gasOverview.js b/src/api/gasOverview.js index 559a078..0dc3442 100644 --- a/src/api/gasOverview.js +++ b/src/api/gasOverview.js @@ -11,14 +11,50 @@ }) } -// 气体流量计数量 -// export function deviceCount(params) { -// return request({ -// url: 'device/count/15', -// method: 'get', -// params -// }) -// } +// 用水量、噪声统计数据 +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({ @@ -56,7 +92,7 @@ // 查询二级分区燃气告警 export function gasAlarmBySecondArea(params) { return request({ - url: 'dataStatistic/gasAlarmBySecondArea', + url: 'gas/alarm/rate', method: 'get', params }) diff --git a/src/components/BigData/Card1/index.vue b/src/components/BigData/Card1/index.vue index 748747b..c9ec32d 100644 --- a/src/components/BigData/Card1/index.vue +++ b/src/components/BigData/Card1/index.vue @@ -4,21 +4,11 @@ - -
-
-
-
- {{ title[0] }} {{ context[0] }}{{ unit }}
-
-
- {{ title[1] }} {{ context[1] }}-->
+
+
-
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index 8301f8c..03047ac 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -4,7 +4,7 @@
-
diff --git a/src/views/dashboard/components/AlarmByDays.vue b/src/views/dashboard/components/AlarmByDays.vue
index ddfd8e3..8a9a937 100644
--- a/src/views/dashboard/components/AlarmByDays.vue
+++ b/src/views/dashboard/components/AlarmByDays.vue
@@ -23,11 +23,11 @@
}
this.chartSettings = {
labelMap: {
- '远传水表': '远传水表',
+ '远程水表': '远程水表',
'噪声记录仪': '噪声记录仪',
'液位监测仪': '液位监测仪'
},
- metrics: ['远传水表', '噪声记录仪', '液位监测仪'],
+ metrics: ['远程水表', '噪声记录仪', '液位监测仪'],
dimension: ['date']
}
return {
@@ -37,7 +37,7 @@
endTime: ''
},
chartData: {
- columns: ['date', '远传水表', '噪声记录仪', '液位监测仪'],
+ columns: ['date', '远程水表', '噪声记录仪', '液位监测仪'],
rows: []
}
}
@@ -65,7 +65,7 @@
delete item.data
return item
})
-
+
this.chartData.rows = arr
})
},
diff --git a/src/views/dashboard/components/FunctionArea.vue b/src/views/dashboard/components/FunctionArea.vue
index 4c05cee..6401557 100644
--- a/src/views/dashboard/components/FunctionArea.vue
+++ b/src/views/dashboard/components/FunctionArea.vue
@@ -5,11 +5,11 @@
-->
+
@@ -41,7 +31,7 @@
props: {
title: {
type: Array,
- default: function () {
+ default: function() {
return ['标题', '标题']
}
},
@@ -55,7 +45,7 @@
},
context: {
type: Array,
- default: function () {
+ default: function() {
return ['--', '--']
}
},
@@ -83,6 +73,8 @@
height: 108px;
font-size: 12px;
position: relative;
+ display: flex;
+ align-items: center;
overflow: hidden;
color: #666;
background: #fff;
@@ -96,7 +88,6 @@
}
.card-panel-icon-wrapper {
- float: left;
margin: 14px 0 0 10px;
padding: 16px 2px;
transition: all 0.38s ease-out;
@@ -109,25 +100,22 @@
}
.card-panel-description {
- float: left;
+ flex:1;
font-weight: bold;
- margin-top: 26px;
overflow: auto;
margin-left: 5px;
.two {
.card-panel-text {
- line-height: 18px;
+ line-height: 26px;
color: rgba(0, 0, 0, 0.45);
font-size: 14px;
- margin-bottom: 12px;
+ display: flex;
+ justify-content: space-between;
}
-
.card-panel-num {
font-size: 18px;
color: #666;
- padding-left: 10px;
- float: right;
}
}
.only {
diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js
index aa41264..11dc521 100644
--- a/src/utils/dateutils.js
+++ b/src/utils/dateutils.js
@@ -52,3 +52,13 @@
}
return fmt
}
+
+/**
+ * 获取近1周日期范围
+ * @returns {*[]}
+ */
+export function getSearchLastWeekTime() {
+ const startTime = getLastWeek().Format('yyyy-MM-dd hh:mm:ss')
+ const endTime = getToday('yyyy-MM-dd hh:mm:ss')
+ return [startTime, endTime]
+}
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 97345d9..283c8ef 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -5,7 +5,7 @@
+ {{ name }} {{ context[index] }}{{ unit }}
- 本年度
- 本季度
- 近30日
- 近7日
- 今日
+ 本年度
+ 本季度
+ 近30日
+ 近7日
+ 今日
diff --git a/src/views/gasDashboard/components/PanelGroup.vue b/src/views/gasDashboard/components/PanelGroup.vue
index eead839..5613860 100644
--- a/src/views/gasDashboard/components/PanelGroup.vue
+++ b/src/views/gasDashboard/components/PanelGroup.vue
@@ -17,6 +17,7 @@
import Card from '@/components/BigData/Card'
// 首页
import { gasStatistic, deviceCount, alarmNowStatic } from '@/api/gasOverview'
+import { gasStatistic2 } from '../../../api/gasOverview'
export default {
components: {
Card,
@@ -26,40 +27,40 @@
return {
dataGroup1: [
{
- title: ['总用气量', '本月用气量'],
- context: ['--', '--'],
+ title: ['CO₂总用气量', 'CO₂本月用气量', 'CO₂今日用气量'],
+ context: ['--', '--', '--'],
icon: '',
color: '#40c9c6',
- unit: '吨',
+ unit: 'Nm³',
index: 0
},
{
- title: ['今日用气量', '生产厂区用气量'],
- context: ['--', '--'],
+ title: ['O₂总用气量', 'O₂本月用气量', 'O₂今日用气量'],
+ context: ['--', '--', '--'],
icon: '',
color: '#36a3f7',
- unit: '吨',
+ unit: 'Nm³',
index: 1
},
{
+ title: ['燃气总用气量', '燃气本月用气量', '燃气今日用气量'],
+ context: ['--', '--', '--'],
+ icon: '',
+ color: '#36a3f7',
+ unit: 'Nm³',
+ index: 2
+ },
+ {
title: ['滑道实时噪声'],
context: ['--'],
icon: 'icon-noise',
color: '#f1c353',
unit: 'db',
- index: 2
+ index: 3
}
],
dataGroup: [
{
- title: '气体流量计',
- context: '--',
- icon: 'icon-watch',
- color: '#9694f7',
- path: '/deviceList?deviceType=13',
- permission: '/device/list'
- },
- {
title: '告警信息',
context: '--',
icon: 'icon-alarm',
@@ -73,7 +74,7 @@
mounted() {
this.getWater()
// this.getWellCount()
- this.getDeviceCount()
+ // this.getDeviceCount()
this.getAlarmCount()
},
methods: {
@@ -83,19 +84,21 @@
getWater() {
// 用气量
gasStatistic().then(response => {
- this.dataGroup1[0].context = [response.data.total ? parseFloat(response.data.total).toFixed(2) : '--', response.data.month ? parseFloat(response.data.month).toFixed(2) : '--']
- this.dataGroup1[1].context = [response.data.today ? parseFloat(response.data.today).toFixed(2) : '--', response.data.prodution ? parseFloat(response.data.prodution).toFixed(2) : '--']
- this.dataGroup1[2].context = [response.data.sound ? Number(response.data.sound).toFixed(2) : '--']
+ this.dataGroup1[3].context = [response.data.sound ? Number(response.data.sound).toFixed(2) : '--']
})
- },
- getDeviceCount() {
- deviceCount('15').then(response => {
- this.dataGroup[0].context = response.data
+ gasStatistic2('15').then(response => {
+ this.dataGroup1[0].context = [response.data.total.toFixed(2), response.data.month.toFixed(2), response.data.day === '' ? '--' : response.data.day.toFixed(2)]
+ })
+ gasStatistic2('16').then(response => {
+ this.dataGroup1[1].context = [response.data.total.toFixed(2), response.data.month.toFixed(2), response.data.day === '' ? '--' : response.data.day.toFixed(2)]
+ })
+ gasStatistic2('17').then(response => {
+ this.dataGroup1[2].context = [response.data.total.toFixed(2), response.data.month.toFixed(2), response.data.day === '' ? '--' : response.data.day.toFixed(2)]
})
},
getAlarmCount() {
alarmNowStatic().then(response => {
- this.dataGroup[1].context = response.data.total
+ this.dataGroup[0].context = response.data.total
})
}
}
diff --git a/src/views/gasDashboard/components/alarmGasCountByDept.vue b/src/views/gasDashboard/components/alarmGasCountByDept.vue
deleted file mode 100644
index b8bfc23..0000000
--- a/src/views/gasDashboard/components/alarmGasCountByDept.vue
+++ /dev/null
@@ -1,73 +0,0 @@
-
-
-
-
-
-
-
-
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/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
index c144bc6..a410f29 100644
--- a/src/views/gasDashboard/components/corrodeCountByDay.vue
+++ b/src/views/gasDashboard/components/corrodeCountByDay.vue
@@ -45,11 +45,14 @@
},
extend: {
grid: {
- top: 120
+ top: 120,
+ left: 30
},
yAxis: {
+ position: 'left',
+ type: 'value',
name: '腐蚀率(%)',
- position: 'left'
+ nameRotate: '0.1'
},
legend: {
// type: 'scroll',
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/gasCountByDay.vue b/src/views/gasDashboard/components/gasCountByDay.vue
index 79a4efb..f0a3977 100644
--- a/src/views/gasDashboard/components/gasCountByDay.vue
+++ b/src/views/gasDashboard/components/gasCountByDay.vue
@@ -1,34 +1,33 @@
-
-
-
-
+
-
-
+
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
@@ -81,19 +69,23 @@
import DeviceCount from './components/DeviceCount'
import gasCountByDept from './components/gasCountByDept'
import gasCountByDay from './components/gasCountByDay'
-import gasCountByAreaBar from './components/gasCountByAreaBar'
+import gasCountByDeviceBar from './components/gasCountByDeviceBar'
import WatchAlarmBar from './components/watchAlarmBar'
import gasNote from './components/gasNote'
import AlarmCountByDept from './components/AlarmCountByDept'
import gasCompare from './components/gasCompare'
import watchGasAlarmBar from './components/watchGasAlarmBar'
-import alarmGasCountByDept from './components/alarmGasCountByDept'
+import alarmGasCountByType from './components/alarmGasCountByType'
import corrodeCountByDay from './components/corrodeCountByDay'
+import AlarmLeakCountPie from './components/alarmLeakCountPie'
+import GasAlarmTrend from './components/gasAlarmTrend'
export default {
name: 'Dashboard',
components: {
- gasCountByAreaBar,
+ GasAlarmTrend,
+ AlarmLeakCountPie,
+ gasCountByDeviceBar,
gasCountByDept,
gasCountByDay,
gasNote,
@@ -103,7 +95,7 @@
WatchAlarmBar,
AlarmCountByDept,
watchGasAlarmBar,
- alarmGasCountByDept,
+ alarmGasCountByType,
corrodeCountByDay
},
data() {
diff --git a/src/views/gasOverview/gasOverviewSimple.vue b/src/views/gasOverview/gasOverviewSimple.vue
index 585ab8a..764bf28 100644
--- a/src/views/gasOverview/gasOverviewSimple.vue
+++ b/src/views/gasOverview/gasOverviewSimple.vue
@@ -5,7 +5,7 @@
-
+
搜索
@@ -36,7 +36,7 @@
-
+
+
diff --git a/src/views/gasDashboard/index.vue b/src/views/gasDashboard/index.vue
index 6eb2d56..be583f2 100644
--- a/src/views/gasDashboard/index.vue
+++ b/src/views/gasDashboard/index.vue
@@ -2,72 +2,60 @@
+
告警列表
@@ -48,10 +48,10 @@
@@ -97,7 +97,11 @@
var rq_model_layer = null // 燃气模型层
var rq_icon_layer = null // 燃气图标层
var qt_model_layer = null // 气体流量计模型层
+var qt2_model_layer = null // 气体流量计模型层
+var qt3_model_layer = null // 气体流量计模型层
var qt_icon_layer = null // 气体流量计图标层
+var qt2_icon_layer = null // 气体流量计图标层
+var qt3_icon_layer = null // 气体流量计图标层
var fs_model_layer = null // 腐蚀速率监测仪模型层
var fs_icon_layer = null // 腐蚀速率监测仪图标层
export default {
@@ -106,7 +110,7 @@
data() {
return {
screenHeight: null,
- checkedCities: ['腐蚀速率监测仪', '气体流量计', '气体泄漏检测仪', '供水泄漏检测仪'],
+ checkedCities: ['腐蚀速率监测仪', '气体泄漏监测仪', '供水泄漏监测仪', 'CO2气体流量计', 'O2气体流量计', '燃气气体流量计'],
left: '',
mapMark: '-',
deviceTypeList: [], // 设备类型列表
@@ -161,6 +165,7 @@
wellTypeList: [], // 井类型列表
showDeptTree: 0, // 是否显示权属单位下拉,0不显示，1显示树，2显示平面
alarmList: [], // 报警列表
+ searchAlarmList: [],
timer: null,
deptShowTop: false, // 是否显示顶级
clock: null, // 计时器
@@ -247,12 +252,18 @@
if (item.indexOf('腐蚀速率监测仪') !== -1) {
this.wellMode()
this.fsModel()
- } else if (item.indexOf('气体流量计') !== -1) {
+ } else if (item.indexOf('CO2气体流量计') !== -1) {
this.wellMode()
this.qtModel()
- } else if (item.indexOf('气体泄漏检测仪') !== -1) {
+ } else if (item.indexOf('O2气体流量计') !== -1) {
+ this.wellMode()
+ this.qt02Model()
+ } else if (item.indexOf('燃气气体流量计') !== -1) {
+ this.wellMode()
+ this.qtgasModel()
+ } else if (item.indexOf('气体泄漏监测仪') !== -1) {
this.rqModel()
- } else if (item.indexOf('供水泄漏检测仪') !== -1) {
+ } else if (item.indexOf('供水泄漏监测仪') !== -1) {
this.wellMode()
this.zsMoel()
}
@@ -264,10 +275,14 @@
window.map.removeLayer(fs_model_layer)
window.map.removeLayer(rq_model_layer)
window.map.removeLayer(qt_model_layer)
+ window.map.removeLayer(qt2_model_layer)
+ window.map.removeLayer(qt3_model_layer)
window.map.removeLayer(fs_icon_layer)
window.map.removeLayer(zs_icon_layer)
window.map.removeLayer(rq_icon_layer)
window.map.removeLayer(qt_icon_layer)
+ window.map.removeLayer(qt2_icon_layer)
+ window.map.removeLayer(qt3_icon_layer)
window.map.removeLayer(well_model_layer)
},
// 获取设备类型
@@ -398,41 +413,6 @@
})
},
// 初始化街道、流向线
- // async initDrawLines() {
- // axios.get('./static/position.json').then((result) => {
- // const positions = result.data.positions
- // flow = new mars3d.layer.GraphicLayer()
- // window.map.addLayer(flow)
- // street = new mars3d.layer.GraphicLayer()
- // window.map.addLayer(street)
- // for (let j = 0; j < positions.length; j++) {
- // flow.addGraphic(this.addFlow(positions[j].items, positions[j].repeat))
- // street.addGraphic(this.addStreet(positions[j].items))
- // }
- // flow.show = false
- // }).catch((error) => {
- // console.log('get position error...' + error)
- // })
- // },
- // 流向线
- // addFlow(positions, repeat) {
- // console.log(positions, repeat, '====---1230')
- // var style = {
- // width: 10,
- // material: mars3d.MaterialUtil.createMaterialProperty(mars3d.MaterialType.LineFlow, {
- // color: '#215bd9',
- // repeat: new Cesium.Cartesian2(repeat, 1),
- // image: '../static/images/line.png',
- // speed: 15
- // })
- // }
- // var graphic = new mars3d.graphic.PolylineEntity({
- // positions: positions,
- // style: style
- // })
- // return graphic
- // },
- // 初始化街道、流向线
async initDrawLines() {
axios.get('./static/position2.json').then((result) => {
const positions = result.data.positions
@@ -533,12 +513,40 @@
})
return graphic
},
+ search() {
+ this.filterAlarmList()
+ this.initPoints()
+ },
+ // 过滤报警列表
+ filterAlarmList() {
+ const list = this.alarmList
+ const keywords = this.listQuery.keywords
+ if (keywords) { // 过滤井编号、设备编号
+ this.searchAlarmList = list.filter(item => {
+ let flag = false
+ if (item.wellCode.indexOf(keywords) > -1) {
+ flag = true
+ }
+ if (item.devcode.indexOf(keywords) > -1) {
+ flag = true
+ }
+ if (item.position.indexOf(keywords) > -1) {
+ flag = true
+ }
+ return flag
+ })
+ } else {
+ this.searchAlarmList = list
+ }
+ },
// 初始化井，设备
async initPoints() {
this.wellMode()
this.zsMoel()
this.rqModel()
this.qtModel()
+ this.qt02Model()
+ this.qtgasModel()
this.fsModel()
},
// 井
@@ -593,58 +601,10 @@
}
})
},
- // 远程水表（不展示）
- watchModel() {
- const params = '13'
- getMapping(params, this.listQuery.keywords).then(response => {
- // 过滤掉该单位不支持的设备(通过部门id)
- const deptIds = this.$store.getters.deptId
- const responses = []
- response.data.forEach(item => {
- if (item.deptid === deptIds) {
- responses.push(item)
- }
- })
- response.data = responses
- if (response.code === 200) {
- if (watch_model_layer !== null) window.map.removeLayer(watch_model_layer)
- watch_model_layer = new mars3d.layer.GraphicLayer()
- window.map.addLayer(watch_model_layer)
- if (watch_icon_layer !== null) window.map.removeLayer(watch_icon_layer)
- watch_icon_layer = new mars3d.layer.GraphicLayer()
- window.map.addLayer(watch_icon_layer)
- for (let i = 0; i < response.data.length; i++) {
- watch_model_layer.addGraphic(new mars3d.graphic.ModelPrimitive({
- position: [response.data[i].longitude, response.data[i].latitude, -0.5],
- style: {
- url: '../static/model/sb.glb',
- scale: 2,
- heading: 90
- },
- popup: `远程水表
设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` - })) - watch_icon_layer.addGraphic(new mars3d.graphic.BillboardEntity({ - id: response.data[i].devcode, - position: [response.data[i].longitude, response.data[i].latitude, 1], - style: { - image: '../static/images/icon/sb.png', - scale: 1, - horizontalOrigin: Cesium.HorizontalOrigin.CENTER, - verticalOrigin: Cesium.VerticalOrigin.BOTTOM, - scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3) - }, - popup: `远程水表
设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` - })) - } - this.refreshAlarm() - } - }) - }, // 腐蚀速率监测仪 fsModel() { const params = '14' getMapping(params, this.listQuery.keywords).then(response => { - console.log(response.data[0].latitude, '======腐蚀速率监测仪=======') // 过滤掉该单位不支持的设备(通过部门id) const deptIds = this.$store.getters.deptId const responses = [] @@ -662,29 +622,32 @@ if (fs_icon_layer !== null) window.map.removeLayer(fs_icon_layer) fs_icon_layer = new mars3d.layer.GraphicLayer() window.map.addLayer(fs_icon_layer) - for (let i = 0; i < response.data.length; i++) { - fs_model_layer.addGraphic(new mars3d.graphic.ModelPrimitive({ - position: [response.data[i].longitude, response.data[i].latitude, 0], - style: { - url: '../static/model/fs.glb', - scale: 1, - heading: 90 - }, - popup: `腐蚀速率监测仪
设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` - })) - fs_icon_layer.addGraphic(new mars3d.graphic.BillboardEntity({ - id: response.data[i].devcode, - position: [response.data[i].longitude, response.data[i].latitude, 1], - style: { - image: '../static/images/icon/fs.png', - scale: 1, - horizontalOrigin: Cesium.HorizontalOrigin.CENTER, - verticalOrigin: Cesium.VerticalOrigin.BOTTOM, - scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3) - }, - popup: `腐蚀速率监测仪
设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` - })) + if (response.data.length > 0) { + for (let i = 0; i < response.data.length; i++) { + fs_model_layer.addGraphic(new mars3d.graphic.ModelPrimitive({ + position: [response.data[i].longitude, response.data[i].latitude, 0], + style: { + url: '../static/model/fs.glb', + scale: 1, + heading: 90 + }, + popup: `设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` + })) + fs_icon_layer.addGraphic(new mars3d.graphic.BillboardEntity({ + id: response.data[i].devcode, + position: [response.data[i].longitude, response.data[i].latitude, 1], + style: { + image: '../static/images/icon/fs.png', + scale: 1, + horizontalOrigin: Cesium.HorizontalOrigin.CENTER, + verticalOrigin: Cesium.VerticalOrigin.BOTTOM, + scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3) + }, + popup: `设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` + })) + } } + this.refreshAlarm() } }) @@ -693,7 +656,6 @@ qtModel() { const params = '15' getMapping(params, this.listQuery.keywords).then(response => { - console.log(response.data[0].latitude, '======气体流量计=======') // 过滤掉该单位不支持的设备(通过部门id) const deptIds = this.$store.getters.deptId const responses = [] @@ -711,28 +673,128 @@ if (qt_icon_layer !== null) window.map.removeLayer(qt_icon_layer) qt_icon_layer = new mars3d.layer.GraphicLayer() window.map.addLayer(qt_icon_layer) - for (let i = 0; i < response.data.length; i++) { - qt_model_layer.addGraphic(new mars3d.graphic.ModelPrimitive({ - position: [response.data[i].longitude, response.data[i].latitude, 0], - style: { - url: '../static/model/qt.glb', - scale: 1, - heading: 90 - }, - popup: `气体流量计
设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` - })) - qt_icon_layer.addGraphic(new mars3d.graphic.BillboardEntity({ - id: response.data[i].devcode, - position: [response.data[i].longitude, response.data[i].latitude, 1], - style: { - image: '../static/images/icon/qt.png', - scale: 1, - horizontalOrigin: Cesium.HorizontalOrigin.CENTER, - verticalOrigin: Cesium.VerticalOrigin.BOTTOM, - scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3) - }, - popup: `气体流量计
设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` - })) + if (response.data.length > 0) { + for (let i = 0; i < response.data.length; i++) { + qt_model_layer.addGraphic(new mars3d.graphic.ModelPrimitive({ + position: [response.data[i].longitude, response.data[i].latitude, 0], + style: { + url: '../static/model/qt.glb', + scale: 1, + heading: 90 + }, + popup: `设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` + })) + qt_icon_layer.addGraphic(new mars3d.graphic.BillboardEntity({ + id: response.data[i].devcode, + position: [response.data[i].longitude, response.data[i].latitude, 1], + style: { + image: '../static/images/icon/qt.png', + scale: 1, + horizontalOrigin: Cesium.HorizontalOrigin.CENTER, + verticalOrigin: Cesium.VerticalOrigin.BOTTOM, + scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3) + }, + popup: `设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` + })) + } + } + this.refreshAlarm() + } + }) + }, + // 气体流量计 + qt02Model() { + const params = '16' + getMapping(params, this.listQuery.keywords).then(response => { + // 过滤掉该单位不支持的设备(通过部门id) + const deptIds = this.$store.getters.deptId + const responses = [] + response.data.forEach(item => { + if (item.deptid === deptIds) { + responses.push(item) + } + }) + response.data = responses + if (response.code === 200) { + if (qt2_model_layer !== null) window.map.removeLayer(qt2_model_layer) + qt2_model_layer = new mars3d.layer.GraphicLayer() + window.map.addLayer(qt2_model_layer) + if (qt2_icon_layer !== null) window.map.removeLayer(qt2_icon_layer) + qt2_icon_layer = new mars3d.layer.GraphicLayer() + window.map.addLayer(qt2_icon_layer) + if (response.data.length > 0) { + for (let i = 0; i < response.data.length; i++) { + qt2_model_layer.addGraphic(new mars3d.graphic.ModelPrimitive({ + position: [response.data[i].longitude, response.data[i].latitude, 0], + style: { + url: '../static/model/qt.glb', + scale: 1, + heading: 90 + }, + popup: `设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` + })) + qt2_icon_layer.addGraphic(new mars3d.graphic.BillboardEntity({ + id: response.data[i].devcode, + position: [response.data[i].longitude, response.data[i].latitude, 1], + style: { + image: '../static/images/icon/qt.png', + scale: 1, + horizontalOrigin: Cesium.HorizontalOrigin.CENTER, + verticalOrigin: Cesium.VerticalOrigin.BOTTOM, + scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3) + }, + popup: `设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` + })) + } + } + this.refreshAlarm() + } + }) + }, + // 气体流量计 + qtgasModel() { + const params = '17' + getMapping(params, this.listQuery.keywords).then(response => { + // 过滤掉该单位不支持的设备(通过部门id) + const deptIds = this.$store.getters.deptId + const responses = [] + response.data.forEach(item => { + if (item.deptid === deptIds) { + responses.push(item) + } + }) + response.data = responses + if (response.code === 200) { + if (qt3_model_layer !== null) window.map.removeLayer(qt3_model_layer) + qt3_model_layer = new mars3d.layer.GraphicLayer() + window.map.addLayer(qt3_model_layer) + if (qt3_icon_layer !== null) window.map.removeLayer(qt3_icon_layer) + qt3_icon_layer = new mars3d.layer.GraphicLayer() + window.map.addLayer(qt3_icon_layer) + if (response.data.length > 0) { + for (let i = 0; i < response.data.length; i++) { + qt3_model_layer.addGraphic(new mars3d.graphic.ModelPrimitive({ + position: [response.data[i].longitude, response.data[i].latitude, 0], + style: { + url: '../static/model/qt.glb', + scale: 1, + heading: 90 + }, + popup: `设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` + })) + qt3_icon_layer.addGraphic(new mars3d.graphic.BillboardEntity({ + id: response.data[i].devcode, + position: [response.data[i].longitude, response.data[i].latitude, 1], + style: { + image: '../static/images/icon/qt.png', + scale: 1, + horizontalOrigin: Cesium.HorizontalOrigin.CENTER, + verticalOrigin: Cesium.VerticalOrigin.BOTTOM, + scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3) + }, + popup: `设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` + })) + } } this.refreshAlarm() } @@ -742,7 +804,6 @@ rqModel() { const params = '4' getMapping(params, this.listQuery.keywords).then(response => { - console.log(response.data[0].latitude, '======气体泄露监测仪（原燃气）=======') // 过滤掉该单位不支持的设备(通过部门id) const deptIds = this.$store.getters.deptId const responses = [] @@ -760,28 +821,30 @@ if (rq_icon_layer !== null) window.map.removeLayer(rq_icon_layer) rq_icon_layer = new mars3d.layer.GraphicLayer() window.map.addLayer(rq_icon_layer) - for (let i = 0; i < response.data.length; i++) { - rq_model_layer.addGraphic(new mars3d.graphic.ModelPrimitive({ - position: [response.data[i].longitude, response.data[i].latitude, 0], - style: { - url: '../static/model/rq.glb', - scale: 1, - heading: 90 - }, - popup: `气体泄露监测仪
设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` - })) - rq_icon_layer.addGraphic(new mars3d.graphic.BillboardEntity({ - id: response.data[i].devcode, - position: [response.data[i].longitude, response.data[i].latitude, 1], - style: { - image: '../static/images/icon/rq.png', - scale: 1, - horizontalOrigin: Cesium.HorizontalOrigin.CENTER, - verticalOrigin: Cesium.VerticalOrigin.BOTTOM, - scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3) - }, - popup: `气体泄露监测仪
设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` - })) + if (response.data.length > 0) { + for (let i = 0; i < response.data.length; i++) { + rq_model_layer.addGraphic(new mars3d.graphic.ModelPrimitive({ + position: [response.data[i].longitude, response.data[i].latitude, 0], + style: { + url: '../static/model/rq.glb', + scale: 1, + heading: 90 + }, + popup: `设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` + })) + rq_icon_layer.addGraphic(new mars3d.graphic.BillboardEntity({ + id: response.data[i].devcode, + position: [response.data[i].longitude, response.data[i].latitude, 1], + style: { + image: '../static/images/icon/rq.png', + scale: 1, + horizontalOrigin: Cesium.HorizontalOrigin.CENTER, + verticalOrigin: Cesium.VerticalOrigin.BOTTOM, + scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3) + }, + popup: `设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` + })) + } } this.refreshAlarm() } @@ -791,7 +854,6 @@ zsMoel() { const params = '8' getMapping(params, this.listQuery.keywords).then(response => { - console.log(response.data[0].latitude, '======供水泄露监测仪（原噪声））=======') // 过滤掉该单位不支持的设备(通过部门id) const deptIds = this.$store.getters.deptId const responses = [] @@ -810,28 +872,30 @@ if (zs_icon_layer !== null) window.map.removeLayer(zs_icon_layer) zs_icon_layer = new mars3d.layer.GraphicLayer() window.map.addLayer(zs_icon_layer) - for (let i = 0; i < response.data.length; i++) { - zs_model_layer.addGraphic(new mars3d.graphic.ModelPrimitive({ - position: [response.data[i].longitude, response.data[i].latitude, 0], - style: { - url: '../static/model/zs.glb', - scale: 1, - heading: 90 - }, - popup: `供水泄露监测仪
设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` - })) - zs_icon_layer.addGraphic(new mars3d.graphic.BillboardEntity({ - id: response.data[i].devcode, - position: [response.data[i].longitude, response.data[i].latitude, 1], - style: { - image: '../static/images/icon/zs.png', - scale: 1, - horizontalOrigin: Cesium.HorizontalOrigin.CENTER, - verticalOrigin: Cesium.VerticalOrigin.BOTTOM, - scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3) - }, - popup: `供水泄露监测仪
设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` - })) + if (response.data.length > 0) { + for (let i = 0; i < response.data.length; i++) { + zs_model_layer.addGraphic(new mars3d.graphic.ModelPrimitive({ + position: [response.data[i].longitude, response.data[i].latitude, 0], + style: { + url: '../static/model/zs.glb', + scale: 1, + heading: 90 + }, + popup: `设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` + })) + zs_icon_layer.addGraphic(new mars3d.graphic.BillboardEntity({ + id: response.data[i].devcode, + position: [response.data[i].longitude, response.data[i].latitude, 1], + style: { + image: '../static/images/icon/zs.png', + scale: 1, + horizontalOrigin: Cesium.HorizontalOrigin.CENTER, + verticalOrigin: Cesium.VerticalOrigin.BOTTOM, + scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3) + }, + popup: `设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` + })) + } } this.refreshAlarm() } @@ -859,6 +923,7 @@ if (this.alarmList.length > 0) { this.hasAlarm = true } + this.filterAlarmList() for (const alarm of response.data) { for (const watch of watch_icon_layer.graphics) { if (alarm.devcode === watch.options.id) { diff --git a/src/views/jobManage/detailJob.vue b/src/views/jobManage/detailJob.vue index 2d6aaa4..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/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/src/api/gasOverview.js b/src/api/gasOverview.js index 559a078..0dc3442 100644 --- a/src/api/gasOverview.js +++ b/src/api/gasOverview.js @@ -11,14 +11,50 @@ }) } -// 气体流量计数量 -// export function deviceCount(params) { -// return request({ -// url: 'device/count/15', -// method: 'get', -// params -// }) -// } +// 用水量、噪声统计数据 +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({ @@ -56,7 +92,7 @@ // 查询二级分区燃气告警 export function gasAlarmBySecondArea(params) { return request({ - url: 'dataStatistic/gasAlarmBySecondArea', + url: 'gas/alarm/rate', method: 'get', params }) diff --git a/src/components/BigData/Card1/index.vue b/src/components/BigData/Card1/index.vue index 748747b..c9ec32d 100644 --- a/src/components/BigData/Card1/index.vue +++ b/src/components/BigData/Card1/index.vue @@ -4,21 +4,11 @@ - -
设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` - })) - watch_icon_layer.addGraphic(new mars3d.graphic.BillboardEntity({ - id: response.data[i].devcode, - position: [response.data[i].longitude, response.data[i].latitude, 1], - style: { - image: '../static/images/icon/sb.png', - scale: 1, - horizontalOrigin: Cesium.HorizontalOrigin.CENTER, - verticalOrigin: Cesium.VerticalOrigin.BOTTOM, - scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3) - }, - popup: `远程水表
设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` - })) - } - this.refreshAlarm() - } - }) - }, // 腐蚀速率监测仪 fsModel() { const params = '14' getMapping(params, this.listQuery.keywords).then(response => { - console.log(response.data[0].latitude, '======腐蚀速率监测仪=======') // 过滤掉该单位不支持的设备(通过部门id) const deptIds = this.$store.getters.deptId const responses = [] @@ -662,29 +622,32 @@ if (fs_icon_layer !== null) window.map.removeLayer(fs_icon_layer) fs_icon_layer = new mars3d.layer.GraphicLayer() window.map.addLayer(fs_icon_layer) - for (let i = 0; i < response.data.length; i++) { - fs_model_layer.addGraphic(new mars3d.graphic.ModelPrimitive({ - position: [response.data[i].longitude, response.data[i].latitude, 0], - style: { - url: '../static/model/fs.glb', - scale: 1, - heading: 90 - }, - popup: `腐蚀速率监测仪
设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` - })) - fs_icon_layer.addGraphic(new mars3d.graphic.BillboardEntity({ - id: response.data[i].devcode, - position: [response.data[i].longitude, response.data[i].latitude, 1], - style: { - image: '../static/images/icon/fs.png', - scale: 1, - horizontalOrigin: Cesium.HorizontalOrigin.CENTER, - verticalOrigin: Cesium.VerticalOrigin.BOTTOM, - scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3) - }, - popup: `腐蚀速率监测仪
设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` - })) + if (response.data.length > 0) { + for (let i = 0; i < response.data.length; i++) { + fs_model_layer.addGraphic(new mars3d.graphic.ModelPrimitive({ + position: [response.data[i].longitude, response.data[i].latitude, 0], + style: { + url: '../static/model/fs.glb', + scale: 1, + heading: 90 + }, + popup: `设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` + })) + fs_icon_layer.addGraphic(new mars3d.graphic.BillboardEntity({ + id: response.data[i].devcode, + position: [response.data[i].longitude, response.data[i].latitude, 1], + style: { + image: '../static/images/icon/fs.png', + scale: 1, + horizontalOrigin: Cesium.HorizontalOrigin.CENTER, + verticalOrigin: Cesium.VerticalOrigin.BOTTOM, + scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3) + }, + popup: `设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` + })) + } } + this.refreshAlarm() } }) @@ -693,7 +656,6 @@ qtModel() { const params = '15' getMapping(params, this.listQuery.keywords).then(response => { - console.log(response.data[0].latitude, '======气体流量计=======') // 过滤掉该单位不支持的设备(通过部门id) const deptIds = this.$store.getters.deptId const responses = [] @@ -711,28 +673,128 @@ if (qt_icon_layer !== null) window.map.removeLayer(qt_icon_layer) qt_icon_layer = new mars3d.layer.GraphicLayer() window.map.addLayer(qt_icon_layer) - for (let i = 0; i < response.data.length; i++) { - qt_model_layer.addGraphic(new mars3d.graphic.ModelPrimitive({ - position: [response.data[i].longitude, response.data[i].latitude, 0], - style: { - url: '../static/model/qt.glb', - scale: 1, - heading: 90 - }, - popup: `气体流量计
设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` - })) - qt_icon_layer.addGraphic(new mars3d.graphic.BillboardEntity({ - id: response.data[i].devcode, - position: [response.data[i].longitude, response.data[i].latitude, 1], - style: { - image: '../static/images/icon/qt.png', - scale: 1, - horizontalOrigin: Cesium.HorizontalOrigin.CENTER, - verticalOrigin: Cesium.VerticalOrigin.BOTTOM, - scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3) - }, - popup: `气体流量计
设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` - })) + if (response.data.length > 0) { + for (let i = 0; i < response.data.length; i++) { + qt_model_layer.addGraphic(new mars3d.graphic.ModelPrimitive({ + position: [response.data[i].longitude, response.data[i].latitude, 0], + style: { + url: '../static/model/qt.glb', + scale: 1, + heading: 90 + }, + popup: `设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` + })) + qt_icon_layer.addGraphic(new mars3d.graphic.BillboardEntity({ + id: response.data[i].devcode, + position: [response.data[i].longitude, response.data[i].latitude, 1], + style: { + image: '../static/images/icon/qt.png', + scale: 1, + horizontalOrigin: Cesium.HorizontalOrigin.CENTER, + verticalOrigin: Cesium.VerticalOrigin.BOTTOM, + scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3) + }, + popup: `设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` + })) + } + } + this.refreshAlarm() + } + }) + }, + // 气体流量计 + qt02Model() { + const params = '16' + getMapping(params, this.listQuery.keywords).then(response => { + // 过滤掉该单位不支持的设备(通过部门id) + const deptIds = this.$store.getters.deptId + const responses = [] + response.data.forEach(item => { + if (item.deptid === deptIds) { + responses.push(item) + } + }) + response.data = responses + if (response.code === 200) { + if (qt2_model_layer !== null) window.map.removeLayer(qt2_model_layer) + qt2_model_layer = new mars3d.layer.GraphicLayer() + window.map.addLayer(qt2_model_layer) + if (qt2_icon_layer !== null) window.map.removeLayer(qt2_icon_layer) + qt2_icon_layer = new mars3d.layer.GraphicLayer() + window.map.addLayer(qt2_icon_layer) + if (response.data.length > 0) { + for (let i = 0; i < response.data.length; i++) { + qt2_model_layer.addGraphic(new mars3d.graphic.ModelPrimitive({ + position: [response.data[i].longitude, response.data[i].latitude, 0], + style: { + url: '../static/model/qt.glb', + scale: 1, + heading: 90 + }, + popup: `设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` + })) + qt2_icon_layer.addGraphic(new mars3d.graphic.BillboardEntity({ + id: response.data[i].devcode, + position: [response.data[i].longitude, response.data[i].latitude, 1], + style: { + image: '../static/images/icon/qt.png', + scale: 1, + horizontalOrigin: Cesium.HorizontalOrigin.CENTER, + verticalOrigin: Cesium.VerticalOrigin.BOTTOM, + scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3) + }, + popup: `设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` + })) + } + } + this.refreshAlarm() + } + }) + }, + // 气体流量计 + qtgasModel() { + const params = '17' + getMapping(params, this.listQuery.keywords).then(response => { + // 过滤掉该单位不支持的设备(通过部门id) + const deptIds = this.$store.getters.deptId + const responses = [] + response.data.forEach(item => { + if (item.deptid === deptIds) { + responses.push(item) + } + }) + response.data = responses + if (response.code === 200) { + if (qt3_model_layer !== null) window.map.removeLayer(qt3_model_layer) + qt3_model_layer = new mars3d.layer.GraphicLayer() + window.map.addLayer(qt3_model_layer) + if (qt3_icon_layer !== null) window.map.removeLayer(qt3_icon_layer) + qt3_icon_layer = new mars3d.layer.GraphicLayer() + window.map.addLayer(qt3_icon_layer) + if (response.data.length > 0) { + for (let i = 0; i < response.data.length; i++) { + qt3_model_layer.addGraphic(new mars3d.graphic.ModelPrimitive({ + position: [response.data[i].longitude, response.data[i].latitude, 0], + style: { + url: '../static/model/qt.glb', + scale: 1, + heading: 90 + }, + popup: `设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` + })) + qt3_icon_layer.addGraphic(new mars3d.graphic.BillboardEntity({ + id: response.data[i].devcode, + position: [response.data[i].longitude, response.data[i].latitude, 1], + style: { + image: '../static/images/icon/qt.png', + scale: 1, + horizontalOrigin: Cesium.HorizontalOrigin.CENTER, + verticalOrigin: Cesium.VerticalOrigin.BOTTOM, + scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3) + }, + popup: `设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` + })) + } } this.refreshAlarm() } @@ -742,7 +804,6 @@ rqModel() { const params = '4' getMapping(params, this.listQuery.keywords).then(response => { - console.log(response.data[0].latitude, '======气体泄露监测仪（原燃气）=======') // 过滤掉该单位不支持的设备(通过部门id) const deptIds = this.$store.getters.deptId const responses = [] @@ -760,28 +821,30 @@ if (rq_icon_layer !== null) window.map.removeLayer(rq_icon_layer) rq_icon_layer = new mars3d.layer.GraphicLayer() window.map.addLayer(rq_icon_layer) - for (let i = 0; i < response.data.length; i++) { - rq_model_layer.addGraphic(new mars3d.graphic.ModelPrimitive({ - position: [response.data[i].longitude, response.data[i].latitude, 0], - style: { - url: '../static/model/rq.glb', - scale: 1, - heading: 90 - }, - popup: `气体泄露监测仪
设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` - })) - rq_icon_layer.addGraphic(new mars3d.graphic.BillboardEntity({ - id: response.data[i].devcode, - position: [response.data[i].longitude, response.data[i].latitude, 1], - style: { - image: '../static/images/icon/rq.png', - scale: 1, - horizontalOrigin: Cesium.HorizontalOrigin.CENTER, - verticalOrigin: Cesium.VerticalOrigin.BOTTOM, - scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3) - }, - popup: `气体泄露监测仪
设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` - })) + if (response.data.length > 0) { + for (let i = 0; i < response.data.length; i++) { + rq_model_layer.addGraphic(new mars3d.graphic.ModelPrimitive({ + position: [response.data[i].longitude, response.data[i].latitude, 0], + style: { + url: '../static/model/rq.glb', + scale: 1, + heading: 90 + }, + popup: `设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` + })) + rq_icon_layer.addGraphic(new mars3d.graphic.BillboardEntity({ + id: response.data[i].devcode, + position: [response.data[i].longitude, response.data[i].latitude, 1], + style: { + image: '../static/images/icon/rq.png', + scale: 1, + horizontalOrigin: Cesium.HorizontalOrigin.CENTER, + verticalOrigin: Cesium.VerticalOrigin.BOTTOM, + scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3) + }, + popup: `设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` + })) + } } this.refreshAlarm() } @@ -791,7 +854,6 @@ zsMoel() { const params = '8' getMapping(params, this.listQuery.keywords).then(response => { - console.log(response.data[0].latitude, '======供水泄露监测仪（原噪声））=======') // 过滤掉该单位不支持的设备(通过部门id) const deptIds = this.$store.getters.deptId const responses = [] @@ -810,28 +872,30 @@ if (zs_icon_layer !== null) window.map.removeLayer(zs_icon_layer) zs_icon_layer = new mars3d.layer.GraphicLayer() window.map.addLayer(zs_icon_layer) - for (let i = 0; i < response.data.length; i++) { - zs_model_layer.addGraphic(new mars3d.graphic.ModelPrimitive({ - position: [response.data[i].longitude, response.data[i].latitude, 0], - style: { - url: '../static/model/zs.glb', - scale: 1, - heading: 90 - }, - popup: `供水泄露监测仪
设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` - })) - zs_icon_layer.addGraphic(new mars3d.graphic.BillboardEntity({ - id: response.data[i].devcode, - position: [response.data[i].longitude, response.data[i].latitude, 1], - style: { - image: '../static/images/icon/zs.png', - scale: 1, - horizontalOrigin: Cesium.HorizontalOrigin.CENTER, - verticalOrigin: Cesium.VerticalOrigin.BOTTOM, - scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3) - }, - popup: `供水泄露监测仪
设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` - })) + if (response.data.length > 0) { + for (let i = 0; i < response.data.length; i++) { + zs_model_layer.addGraphic(new mars3d.graphic.ModelPrimitive({ + position: [response.data[i].longitude, response.data[i].latitude, 0], + style: { + url: '../static/model/zs.glb', + scale: 1, + heading: 90 + }, + popup: `设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` + })) + zs_icon_layer.addGraphic(new mars3d.graphic.BillboardEntity({ + id: response.data[i].devcode, + position: [response.data[i].longitude, response.data[i].latitude, 1], + style: { + image: '../static/images/icon/zs.png', + scale: 1, + horizontalOrigin: Cesium.HorizontalOrigin.CENTER, + verticalOrigin: Cesium.VerticalOrigin.BOTTOM, + scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3) + }, + popup: `设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` + })) + } } this.refreshAlarm() } @@ -859,6 +923,7 @@ if (this.alarmList.length > 0) { this.hasAlarm = true } + this.filterAlarmList() for (const alarm of response.data) { for (const watch of watch_icon_layer.graphics) { if (alarm.devcode === watch.options.id) { diff --git a/src/views/jobManage/detailJob.vue b/src/views/jobManage/detailJob.vue index 2d6aaa4..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/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/src/api/gasOverview.js b/src/api/gasOverview.js index 559a078..0dc3442 100644 --- a/src/api/gasOverview.js +++ b/src/api/gasOverview.js @@ -11,14 +11,50 @@ }) } -// 气体流量计数量 -// export function deviceCount(params) { -// return request({ -// url: 'device/count/15', -// method: 'get', -// params -// }) -// } +// 用水量、噪声统计数据 +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({ @@ -56,7 +92,7 @@ // 查询二级分区燃气告警 export function gasAlarmBySecondArea(params) { return request({ - url: 'dataStatistic/gasAlarmBySecondArea', + url: 'gas/alarm/rate', method: 'get', params }) diff --git a/src/components/BigData/Card1/index.vue b/src/components/BigData/Card1/index.vue index 748747b..c9ec32d 100644 --- a/src/components/BigData/Card1/index.vue +++ b/src/components/BigData/Card1/index.vue @@ -4,21 +4,11 @@ - -
-
-
-
- {{ title[0] }} {{ context[0] }}{{ unit }}
-
-
- {{ title[1] }} {{ context[1] }}-->
+
+
-
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index 8301f8c..03047ac 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -4,7 +4,7 @@
-
diff --git a/src/views/dashboard/components/AlarmByDays.vue b/src/views/dashboard/components/AlarmByDays.vue
index ddfd8e3..8a9a937 100644
--- a/src/views/dashboard/components/AlarmByDays.vue
+++ b/src/views/dashboard/components/AlarmByDays.vue
@@ -23,11 +23,11 @@
}
this.chartSettings = {
labelMap: {
- '远传水表': '远传水表',
+ '远程水表': '远程水表',
'噪声记录仪': '噪声记录仪',
'液位监测仪': '液位监测仪'
},
- metrics: ['远传水表', '噪声记录仪', '液位监测仪'],
+ metrics: ['远程水表', '噪声记录仪', '液位监测仪'],
dimension: ['date']
}
return {
@@ -37,7 +37,7 @@
endTime: ''
},
chartData: {
- columns: ['date', '远传水表', '噪声记录仪', '液位监测仪'],
+ columns: ['date', '远程水表', '噪声记录仪', '液位监测仪'],
rows: []
}
}
@@ -65,7 +65,7 @@
delete item.data
return item
})
-
+
this.chartData.rows = arr
})
},
diff --git a/src/views/dashboard/components/FunctionArea.vue b/src/views/dashboard/components/FunctionArea.vue
index 4c05cee..6401557 100644
--- a/src/views/dashboard/components/FunctionArea.vue
+++ b/src/views/dashboard/components/FunctionArea.vue
@@ -5,11 +5,11 @@
-->
+
@@ -41,7 +31,7 @@
props: {
title: {
type: Array,
- default: function () {
+ default: function() {
return ['标题', '标题']
}
},
@@ -55,7 +45,7 @@
},
context: {
type: Array,
- default: function () {
+ default: function() {
return ['--', '--']
}
},
@@ -83,6 +73,8 @@
height: 108px;
font-size: 12px;
position: relative;
+ display: flex;
+ align-items: center;
overflow: hidden;
color: #666;
background: #fff;
@@ -96,7 +88,6 @@
}
.card-panel-icon-wrapper {
- float: left;
margin: 14px 0 0 10px;
padding: 16px 2px;
transition: all 0.38s ease-out;
@@ -109,25 +100,22 @@
}
.card-panel-description {
- float: left;
+ flex:1;
font-weight: bold;
- margin-top: 26px;
overflow: auto;
margin-left: 5px;
.two {
.card-panel-text {
- line-height: 18px;
+ line-height: 26px;
color: rgba(0, 0, 0, 0.45);
font-size: 14px;
- margin-bottom: 12px;
+ display: flex;
+ justify-content: space-between;
}
-
.card-panel-num {
font-size: 18px;
color: #666;
- padding-left: 10px;
- float: right;
}
}
.only {
diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js
index aa41264..11dc521 100644
--- a/src/utils/dateutils.js
+++ b/src/utils/dateutils.js
@@ -52,3 +52,13 @@
}
return fmt
}
+
+/**
+ * 获取近1周日期范围
+ * @returns {*[]}
+ */
+export function getSearchLastWeekTime() {
+ const startTime = getLastWeek().Format('yyyy-MM-dd hh:mm:ss')
+ const endTime = getToday('yyyy-MM-dd hh:mm:ss')
+ return [startTime, endTime]
+}
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 97345d9..283c8ef 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -5,7 +5,7 @@
+ {{ name }} {{ context[index] }}{{ unit }}
- 本年度
- 本季度
- 近30日
- 近7日
- 今日
+ 本年度
+ 本季度
+ 近30日
+ 近7日
+ 今日
diff --git a/src/views/gasDashboard/components/PanelGroup.vue b/src/views/gasDashboard/components/PanelGroup.vue
index eead839..5613860 100644
--- a/src/views/gasDashboard/components/PanelGroup.vue
+++ b/src/views/gasDashboard/components/PanelGroup.vue
@@ -17,6 +17,7 @@
import Card from '@/components/BigData/Card'
// 首页
import { gasStatistic, deviceCount, alarmNowStatic } from '@/api/gasOverview'
+import { gasStatistic2 } from '../../../api/gasOverview'
export default {
components: {
Card,
@@ -26,40 +27,40 @@
return {
dataGroup1: [
{
- title: ['总用气量', '本月用气量'],
- context: ['--', '--'],
+ title: ['CO₂总用气量', 'CO₂本月用气量', 'CO₂今日用气量'],
+ context: ['--', '--', '--'],
icon: '',
color: '#40c9c6',
- unit: '吨',
+ unit: 'Nm³',
index: 0
},
{
- title: ['今日用气量', '生产厂区用气量'],
- context: ['--', '--'],
+ title: ['O₂总用气量', 'O₂本月用气量', 'O₂今日用气量'],
+ context: ['--', '--', '--'],
icon: '',
color: '#36a3f7',
- unit: '吨',
+ unit: 'Nm³',
index: 1
},
{
+ title: ['燃气总用气量', '燃气本月用气量', '燃气今日用气量'],
+ context: ['--', '--', '--'],
+ icon: '',
+ color: '#36a3f7',
+ unit: 'Nm³',
+ index: 2
+ },
+ {
title: ['滑道实时噪声'],
context: ['--'],
icon: 'icon-noise',
color: '#f1c353',
unit: 'db',
- index: 2
+ index: 3
}
],
dataGroup: [
{
- title: '气体流量计',
- context: '--',
- icon: 'icon-watch',
- color: '#9694f7',
- path: '/deviceList?deviceType=13',
- permission: '/device/list'
- },
- {
title: '告警信息',
context: '--',
icon: 'icon-alarm',
@@ -73,7 +74,7 @@
mounted() {
this.getWater()
// this.getWellCount()
- this.getDeviceCount()
+ // this.getDeviceCount()
this.getAlarmCount()
},
methods: {
@@ -83,19 +84,21 @@
getWater() {
// 用气量
gasStatistic().then(response => {
- this.dataGroup1[0].context = [response.data.total ? parseFloat(response.data.total).toFixed(2) : '--', response.data.month ? parseFloat(response.data.month).toFixed(2) : '--']
- this.dataGroup1[1].context = [response.data.today ? parseFloat(response.data.today).toFixed(2) : '--', response.data.prodution ? parseFloat(response.data.prodution).toFixed(2) : '--']
- this.dataGroup1[2].context = [response.data.sound ? Number(response.data.sound).toFixed(2) : '--']
+ this.dataGroup1[3].context = [response.data.sound ? Number(response.data.sound).toFixed(2) : '--']
})
- },
- getDeviceCount() {
- deviceCount('15').then(response => {
- this.dataGroup[0].context = response.data
+ gasStatistic2('15').then(response => {
+ this.dataGroup1[0].context = [response.data.total.toFixed(2), response.data.month.toFixed(2), response.data.day === '' ? '--' : response.data.day.toFixed(2)]
+ })
+ gasStatistic2('16').then(response => {
+ this.dataGroup1[1].context = [response.data.total.toFixed(2), response.data.month.toFixed(2), response.data.day === '' ? '--' : response.data.day.toFixed(2)]
+ })
+ gasStatistic2('17').then(response => {
+ this.dataGroup1[2].context = [response.data.total.toFixed(2), response.data.month.toFixed(2), response.data.day === '' ? '--' : response.data.day.toFixed(2)]
})
},
getAlarmCount() {
alarmNowStatic().then(response => {
- this.dataGroup[1].context = response.data.total
+ this.dataGroup[0].context = response.data.total
})
}
}
diff --git a/src/views/gasDashboard/components/alarmGasCountByDept.vue b/src/views/gasDashboard/components/alarmGasCountByDept.vue
deleted file mode 100644
index b8bfc23..0000000
--- a/src/views/gasDashboard/components/alarmGasCountByDept.vue
+++ /dev/null
@@ -1,73 +0,0 @@
-
-
-
-
-
-
-
-
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/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
index c144bc6..a410f29 100644
--- a/src/views/gasDashboard/components/corrodeCountByDay.vue
+++ b/src/views/gasDashboard/components/corrodeCountByDay.vue
@@ -45,11 +45,14 @@
},
extend: {
grid: {
- top: 120
+ top: 120,
+ left: 30
},
yAxis: {
+ position: 'left',
+ type: 'value',
name: '腐蚀率(%)',
- position: 'left'
+ nameRotate: '0.1'
},
legend: {
// type: 'scroll',
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/gasCountByDay.vue b/src/views/gasDashboard/components/gasCountByDay.vue
index 79a4efb..f0a3977 100644
--- a/src/views/gasDashboard/components/gasCountByDay.vue
+++ b/src/views/gasDashboard/components/gasCountByDay.vue
@@ -1,34 +1,33 @@
-
-
-
-
+
-
-
+
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
@@ -81,19 +69,23 @@
import DeviceCount from './components/DeviceCount'
import gasCountByDept from './components/gasCountByDept'
import gasCountByDay from './components/gasCountByDay'
-import gasCountByAreaBar from './components/gasCountByAreaBar'
+import gasCountByDeviceBar from './components/gasCountByDeviceBar'
import WatchAlarmBar from './components/watchAlarmBar'
import gasNote from './components/gasNote'
import AlarmCountByDept from './components/AlarmCountByDept'
import gasCompare from './components/gasCompare'
import watchGasAlarmBar from './components/watchGasAlarmBar'
-import alarmGasCountByDept from './components/alarmGasCountByDept'
+import alarmGasCountByType from './components/alarmGasCountByType'
import corrodeCountByDay from './components/corrodeCountByDay'
+import AlarmLeakCountPie from './components/alarmLeakCountPie'
+import GasAlarmTrend from './components/gasAlarmTrend'
export default {
name: 'Dashboard',
components: {
- gasCountByAreaBar,
+ GasAlarmTrend,
+ AlarmLeakCountPie,
+ gasCountByDeviceBar,
gasCountByDept,
gasCountByDay,
gasNote,
@@ -103,7 +95,7 @@
WatchAlarmBar,
AlarmCountByDept,
watchGasAlarmBar,
- alarmGasCountByDept,
+ alarmGasCountByType,
corrodeCountByDay
},
data() {
diff --git a/src/views/gasOverview/gasOverviewSimple.vue b/src/views/gasOverview/gasOverviewSimple.vue
index 585ab8a..764bf28 100644
--- a/src/views/gasOverview/gasOverviewSimple.vue
+++ b/src/views/gasOverview/gasOverviewSimple.vue
@@ -5,7 +5,7 @@
-
+
搜索
@@ -36,7 +36,7 @@
-
+
+
diff --git a/src/views/gasDashboard/index.vue b/src/views/gasDashboard/index.vue
index 6eb2d56..be583f2 100644
--- a/src/views/gasDashboard/index.vue
+++ b/src/views/gasDashboard/index.vue
@@ -2,72 +2,60 @@
+
告警列表
@@ -48,10 +48,10 @@
@@ -97,7 +97,11 @@
var rq_model_layer = null // 燃气模型层
var rq_icon_layer = null // 燃气图标层
var qt_model_layer = null // 气体流量计模型层
+var qt2_model_layer = null // 气体流量计模型层
+var qt3_model_layer = null // 气体流量计模型层
var qt_icon_layer = null // 气体流量计图标层
+var qt2_icon_layer = null // 气体流量计图标层
+var qt3_icon_layer = null // 气体流量计图标层
var fs_model_layer = null // 腐蚀速率监测仪模型层
var fs_icon_layer = null // 腐蚀速率监测仪图标层
export default {
@@ -106,7 +110,7 @@
data() {
return {
screenHeight: null,
- checkedCities: ['腐蚀速率监测仪', '气体流量计', '气体泄漏检测仪', '供水泄漏检测仪'],
+ checkedCities: ['腐蚀速率监测仪', '气体泄漏监测仪', '供水泄漏监测仪', 'CO2气体流量计', 'O2气体流量计', '燃气气体流量计'],
left: '',
mapMark: '-',
deviceTypeList: [], // 设备类型列表
@@ -161,6 +165,7 @@
wellTypeList: [], // 井类型列表
showDeptTree: 0, // 是否显示权属单位下拉,0不显示，1显示树，2显示平面
alarmList: [], // 报警列表
+ searchAlarmList: [],
timer: null,
deptShowTop: false, // 是否显示顶级
clock: null, // 计时器
@@ -247,12 +252,18 @@
if (item.indexOf('腐蚀速率监测仪') !== -1) {
this.wellMode()
this.fsModel()
- } else if (item.indexOf('气体流量计') !== -1) {
+ } else if (item.indexOf('CO2气体流量计') !== -1) {
this.wellMode()
this.qtModel()
- } else if (item.indexOf('气体泄漏检测仪') !== -1) {
+ } else if (item.indexOf('O2气体流量计') !== -1) {
+ this.wellMode()
+ this.qt02Model()
+ } else if (item.indexOf('燃气气体流量计') !== -1) {
+ this.wellMode()
+ this.qtgasModel()
+ } else if (item.indexOf('气体泄漏监测仪') !== -1) {
this.rqModel()
- } else if (item.indexOf('供水泄漏检测仪') !== -1) {
+ } else if (item.indexOf('供水泄漏监测仪') !== -1) {
this.wellMode()
this.zsMoel()
}
@@ -264,10 +275,14 @@
window.map.removeLayer(fs_model_layer)
window.map.removeLayer(rq_model_layer)
window.map.removeLayer(qt_model_layer)
+ window.map.removeLayer(qt2_model_layer)
+ window.map.removeLayer(qt3_model_layer)
window.map.removeLayer(fs_icon_layer)
window.map.removeLayer(zs_icon_layer)
window.map.removeLayer(rq_icon_layer)
window.map.removeLayer(qt_icon_layer)
+ window.map.removeLayer(qt2_icon_layer)
+ window.map.removeLayer(qt3_icon_layer)
window.map.removeLayer(well_model_layer)
},
// 获取设备类型
@@ -398,41 +413,6 @@
})
},
// 初始化街道、流向线
- // async initDrawLines() {
- // axios.get('./static/position.json').then((result) => {
- // const positions = result.data.positions
- // flow = new mars3d.layer.GraphicLayer()
- // window.map.addLayer(flow)
- // street = new mars3d.layer.GraphicLayer()
- // window.map.addLayer(street)
- // for (let j = 0; j < positions.length; j++) {
- // flow.addGraphic(this.addFlow(positions[j].items, positions[j].repeat))
- // street.addGraphic(this.addStreet(positions[j].items))
- // }
- // flow.show = false
- // }).catch((error) => {
- // console.log('get position error...' + error)
- // })
- // },
- // 流向线
- // addFlow(positions, repeat) {
- // console.log(positions, repeat, '====---1230')
- // var style = {
- // width: 10,
- // material: mars3d.MaterialUtil.createMaterialProperty(mars3d.MaterialType.LineFlow, {
- // color: '#215bd9',
- // repeat: new Cesium.Cartesian2(repeat, 1),
- // image: '../static/images/line.png',
- // speed: 15
- // })
- // }
- // var graphic = new mars3d.graphic.PolylineEntity({
- // positions: positions,
- // style: style
- // })
- // return graphic
- // },
- // 初始化街道、流向线
async initDrawLines() {
axios.get('./static/position2.json').then((result) => {
const positions = result.data.positions
@@ -533,12 +513,40 @@
})
return graphic
},
+ search() {
+ this.filterAlarmList()
+ this.initPoints()
+ },
+ // 过滤报警列表
+ filterAlarmList() {
+ const list = this.alarmList
+ const keywords = this.listQuery.keywords
+ if (keywords) { // 过滤井编号、设备编号
+ this.searchAlarmList = list.filter(item => {
+ let flag = false
+ if (item.wellCode.indexOf(keywords) > -1) {
+ flag = true
+ }
+ if (item.devcode.indexOf(keywords) > -1) {
+ flag = true
+ }
+ if (item.position.indexOf(keywords) > -1) {
+ flag = true
+ }
+ return flag
+ })
+ } else {
+ this.searchAlarmList = list
+ }
+ },
// 初始化井，设备
async initPoints() {
this.wellMode()
this.zsMoel()
this.rqModel()
this.qtModel()
+ this.qt02Model()
+ this.qtgasModel()
this.fsModel()
},
// 井
@@ -593,58 +601,10 @@
}
})
},
- // 远程水表（不展示）
- watchModel() {
- const params = '13'
- getMapping(params, this.listQuery.keywords).then(response => {
- // 过滤掉该单位不支持的设备(通过部门id)
- const deptIds = this.$store.getters.deptId
- const responses = []
- response.data.forEach(item => {
- if (item.deptid === deptIds) {
- responses.push(item)
- }
- })
- response.data = responses
- if (response.code === 200) {
- if (watch_model_layer !== null) window.map.removeLayer(watch_model_layer)
- watch_model_layer = new mars3d.layer.GraphicLayer()
- window.map.addLayer(watch_model_layer)
- if (watch_icon_layer !== null) window.map.removeLayer(watch_icon_layer)
- watch_icon_layer = new mars3d.layer.GraphicLayer()
- window.map.addLayer(watch_icon_layer)
- for (let i = 0; i < response.data.length; i++) {
- watch_model_layer.addGraphic(new mars3d.graphic.ModelPrimitive({
- position: [response.data[i].longitude, response.data[i].latitude, -0.5],
- style: {
- url: '../static/model/sb.glb',
- scale: 2,
- heading: 90
- },
- popup: `远程水表
设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` - })) - watch_icon_layer.addGraphic(new mars3d.graphic.BillboardEntity({ - id: response.data[i].devcode, - position: [response.data[i].longitude, response.data[i].latitude, 1], - style: { - image: '../static/images/icon/sb.png', - scale: 1, - horizontalOrigin: Cesium.HorizontalOrigin.CENTER, - verticalOrigin: Cesium.VerticalOrigin.BOTTOM, - scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3) - }, - popup: `远程水表
设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` - })) - } - this.refreshAlarm() - } - }) - }, // 腐蚀速率监测仪 fsModel() { const params = '14' getMapping(params, this.listQuery.keywords).then(response => { - console.log(response.data[0].latitude, '======腐蚀速率监测仪=======') // 过滤掉该单位不支持的设备(通过部门id) const deptIds = this.$store.getters.deptId const responses = [] @@ -662,29 +622,32 @@ if (fs_icon_layer !== null) window.map.removeLayer(fs_icon_layer) fs_icon_layer = new mars3d.layer.GraphicLayer() window.map.addLayer(fs_icon_layer) - for (let i = 0; i < response.data.length; i++) { - fs_model_layer.addGraphic(new mars3d.graphic.ModelPrimitive({ - position: [response.data[i].longitude, response.data[i].latitude, 0], - style: { - url: '../static/model/fs.glb', - scale: 1, - heading: 90 - }, - popup: `腐蚀速率监测仪
设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` - })) - fs_icon_layer.addGraphic(new mars3d.graphic.BillboardEntity({ - id: response.data[i].devcode, - position: [response.data[i].longitude, response.data[i].latitude, 1], - style: { - image: '../static/images/icon/fs.png', - scale: 1, - horizontalOrigin: Cesium.HorizontalOrigin.CENTER, - verticalOrigin: Cesium.VerticalOrigin.BOTTOM, - scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3) - }, - popup: `腐蚀速率监测仪
设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` - })) + if (response.data.length > 0) { + for (let i = 0; i < response.data.length; i++) { + fs_model_layer.addGraphic(new mars3d.graphic.ModelPrimitive({ + position: [response.data[i].longitude, response.data[i].latitude, 0], + style: { + url: '../static/model/fs.glb', + scale: 1, + heading: 90 + }, + popup: `设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` + })) + fs_icon_layer.addGraphic(new mars3d.graphic.BillboardEntity({ + id: response.data[i].devcode, + position: [response.data[i].longitude, response.data[i].latitude, 1], + style: { + image: '../static/images/icon/fs.png', + scale: 1, + horizontalOrigin: Cesium.HorizontalOrigin.CENTER, + verticalOrigin: Cesium.VerticalOrigin.BOTTOM, + scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3) + }, + popup: `设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` + })) + } } + this.refreshAlarm() } }) @@ -693,7 +656,6 @@ qtModel() { const params = '15' getMapping(params, this.listQuery.keywords).then(response => { - console.log(response.data[0].latitude, '======气体流量计=======') // 过滤掉该单位不支持的设备(通过部门id) const deptIds = this.$store.getters.deptId const responses = [] @@ -711,28 +673,128 @@ if (qt_icon_layer !== null) window.map.removeLayer(qt_icon_layer) qt_icon_layer = new mars3d.layer.GraphicLayer() window.map.addLayer(qt_icon_layer) - for (let i = 0; i < response.data.length; i++) { - qt_model_layer.addGraphic(new mars3d.graphic.ModelPrimitive({ - position: [response.data[i].longitude, response.data[i].latitude, 0], - style: { - url: '../static/model/qt.glb', - scale: 1, - heading: 90 - }, - popup: `气体流量计
设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` - })) - qt_icon_layer.addGraphic(new mars3d.graphic.BillboardEntity({ - id: response.data[i].devcode, - position: [response.data[i].longitude, response.data[i].latitude, 1], - style: { - image: '../static/images/icon/qt.png', - scale: 1, - horizontalOrigin: Cesium.HorizontalOrigin.CENTER, - verticalOrigin: Cesium.VerticalOrigin.BOTTOM, - scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3) - }, - popup: `气体流量计
设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` - })) + if (response.data.length > 0) { + for (let i = 0; i < response.data.length; i++) { + qt_model_layer.addGraphic(new mars3d.graphic.ModelPrimitive({ + position: [response.data[i].longitude, response.data[i].latitude, 0], + style: { + url: '../static/model/qt.glb', + scale: 1, + heading: 90 + }, + popup: `设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` + })) + qt_icon_layer.addGraphic(new mars3d.graphic.BillboardEntity({ + id: response.data[i].devcode, + position: [response.data[i].longitude, response.data[i].latitude, 1], + style: { + image: '../static/images/icon/qt.png', + scale: 1, + horizontalOrigin: Cesium.HorizontalOrigin.CENTER, + verticalOrigin: Cesium.VerticalOrigin.BOTTOM, + scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3) + }, + popup: `设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` + })) + } + } + this.refreshAlarm() + } + }) + }, + // 气体流量计 + qt02Model() { + const params = '16' + getMapping(params, this.listQuery.keywords).then(response => { + // 过滤掉该单位不支持的设备(通过部门id) + const deptIds = this.$store.getters.deptId + const responses = [] + response.data.forEach(item => { + if (item.deptid === deptIds) { + responses.push(item) + } + }) + response.data = responses + if (response.code === 200) { + if (qt2_model_layer !== null) window.map.removeLayer(qt2_model_layer) + qt2_model_layer = new mars3d.layer.GraphicLayer() + window.map.addLayer(qt2_model_layer) + if (qt2_icon_layer !== null) window.map.removeLayer(qt2_icon_layer) + qt2_icon_layer = new mars3d.layer.GraphicLayer() + window.map.addLayer(qt2_icon_layer) + if (response.data.length > 0) { + for (let i = 0; i < response.data.length; i++) { + qt2_model_layer.addGraphic(new mars3d.graphic.ModelPrimitive({ + position: [response.data[i].longitude, response.data[i].latitude, 0], + style: { + url: '../static/model/qt.glb', + scale: 1, + heading: 90 + }, + popup: `设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` + })) + qt2_icon_layer.addGraphic(new mars3d.graphic.BillboardEntity({ + id: response.data[i].devcode, + position: [response.data[i].longitude, response.data[i].latitude, 1], + style: { + image: '../static/images/icon/qt.png', + scale: 1, + horizontalOrigin: Cesium.HorizontalOrigin.CENTER, + verticalOrigin: Cesium.VerticalOrigin.BOTTOM, + scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3) + }, + popup: `设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` + })) + } + } + this.refreshAlarm() + } + }) + }, + // 气体流量计 + qtgasModel() { + const params = '17' + getMapping(params, this.listQuery.keywords).then(response => { + // 过滤掉该单位不支持的设备(通过部门id) + const deptIds = this.$store.getters.deptId + const responses = [] + response.data.forEach(item => { + if (item.deptid === deptIds) { + responses.push(item) + } + }) + response.data = responses + if (response.code === 200) { + if (qt3_model_layer !== null) window.map.removeLayer(qt3_model_layer) + qt3_model_layer = new mars3d.layer.GraphicLayer() + window.map.addLayer(qt3_model_layer) + if (qt3_icon_layer !== null) window.map.removeLayer(qt3_icon_layer) + qt3_icon_layer = new mars3d.layer.GraphicLayer() + window.map.addLayer(qt3_icon_layer) + if (response.data.length > 0) { + for (let i = 0; i < response.data.length; i++) { + qt3_model_layer.addGraphic(new mars3d.graphic.ModelPrimitive({ + position: [response.data[i].longitude, response.data[i].latitude, 0], + style: { + url: '../static/model/qt.glb', + scale: 1, + heading: 90 + }, + popup: `设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` + })) + qt3_icon_layer.addGraphic(new mars3d.graphic.BillboardEntity({ + id: response.data[i].devcode, + position: [response.data[i].longitude, response.data[i].latitude, 1], + style: { + image: '../static/images/icon/qt.png', + scale: 1, + horizontalOrigin: Cesium.HorizontalOrigin.CENTER, + verticalOrigin: Cesium.VerticalOrigin.BOTTOM, + scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3) + }, + popup: `设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` + })) + } } this.refreshAlarm() } @@ -742,7 +804,6 @@ rqModel() { const params = '4' getMapping(params, this.listQuery.keywords).then(response => { - console.log(response.data[0].latitude, '======气体泄露监测仪（原燃气）=======') // 过滤掉该单位不支持的设备(通过部门id) const deptIds = this.$store.getters.deptId const responses = [] @@ -760,28 +821,30 @@ if (rq_icon_layer !== null) window.map.removeLayer(rq_icon_layer) rq_icon_layer = new mars3d.layer.GraphicLayer() window.map.addLayer(rq_icon_layer) - for (let i = 0; i < response.data.length; i++) { - rq_model_layer.addGraphic(new mars3d.graphic.ModelPrimitive({ - position: [response.data[i].longitude, response.data[i].latitude, 0], - style: { - url: '../static/model/rq.glb', - scale: 1, - heading: 90 - }, - popup: `气体泄露监测仪
设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` - })) - rq_icon_layer.addGraphic(new mars3d.graphic.BillboardEntity({ - id: response.data[i].devcode, - position: [response.data[i].longitude, response.data[i].latitude, 1], - style: { - image: '../static/images/icon/rq.png', - scale: 1, - horizontalOrigin: Cesium.HorizontalOrigin.CENTER, - verticalOrigin: Cesium.VerticalOrigin.BOTTOM, - scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3) - }, - popup: `气体泄露监测仪
设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` - })) + if (response.data.length > 0) { + for (let i = 0; i < response.data.length; i++) { + rq_model_layer.addGraphic(new mars3d.graphic.ModelPrimitive({ + position: [response.data[i].longitude, response.data[i].latitude, 0], + style: { + url: '../static/model/rq.glb', + scale: 1, + heading: 90 + }, + popup: `设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` + })) + rq_icon_layer.addGraphic(new mars3d.graphic.BillboardEntity({ + id: response.data[i].devcode, + position: [response.data[i].longitude, response.data[i].latitude, 1], + style: { + image: '../static/images/icon/rq.png', + scale: 1, + horizontalOrigin: Cesium.HorizontalOrigin.CENTER, + verticalOrigin: Cesium.VerticalOrigin.BOTTOM, + scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3) + }, + popup: `设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` + })) + } } this.refreshAlarm() } @@ -791,7 +854,6 @@ zsMoel() { const params = '8' getMapping(params, this.listQuery.keywords).then(response => { - console.log(response.data[0].latitude, '======供水泄露监测仪（原噪声））=======') // 过滤掉该单位不支持的设备(通过部门id) const deptIds = this.$store.getters.deptId const responses = [] @@ -810,28 +872,30 @@ if (zs_icon_layer !== null) window.map.removeLayer(zs_icon_layer) zs_icon_layer = new mars3d.layer.GraphicLayer() window.map.addLayer(zs_icon_layer) - for (let i = 0; i < response.data.length; i++) { - zs_model_layer.addGraphic(new mars3d.graphic.ModelPrimitive({ - position: [response.data[i].longitude, response.data[i].latitude, 0], - style: { - url: '../static/model/zs.glb', - scale: 1, - heading: 90 - }, - popup: `供水泄露监测仪
设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` - })) - zs_icon_layer.addGraphic(new mars3d.graphic.BillboardEntity({ - id: response.data[i].devcode, - position: [response.data[i].longitude, response.data[i].latitude, 1], - style: { - image: '../static/images/icon/zs.png', - scale: 1, - horizontalOrigin: Cesium.HorizontalOrigin.CENTER, - verticalOrigin: Cesium.VerticalOrigin.BOTTOM, - scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3) - }, - popup: `供水泄露监测仪
设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` - })) + if (response.data.length > 0) { + for (let i = 0; i < response.data.length; i++) { + zs_model_layer.addGraphic(new mars3d.graphic.ModelPrimitive({ + position: [response.data[i].longitude, response.data[i].latitude, 0], + style: { + url: '../static/model/zs.glb', + scale: 1, + heading: 90 + }, + popup: `设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` + })) + zs_icon_layer.addGraphic(new mars3d.graphic.BillboardEntity({ + id: response.data[i].devcode, + position: [response.data[i].longitude, response.data[i].latitude, 1], + style: { + image: '../static/images/icon/zs.png', + scale: 1, + horizontalOrigin: Cesium.HorizontalOrigin.CENTER, + verticalOrigin: Cesium.VerticalOrigin.BOTTOM, + scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3) + }, + popup: `设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` + })) + } } this.refreshAlarm() } @@ -859,6 +923,7 @@ if (this.alarmList.length > 0) { this.hasAlarm = true } + this.filterAlarmList() for (const alarm of response.data) { for (const watch of watch_icon_layer.graphics) { if (alarm.devcode === watch.options.id) { diff --git a/src/views/jobManage/detailJob.vue b/src/views/jobManage/detailJob.vue index 2d6aaa4..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 1e0de1a..ac57f82 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -11,13 +11,13 @@ class="left-div" >
设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` - })) - watch_icon_layer.addGraphic(new mars3d.graphic.BillboardEntity({ - id: response.data[i].devcode, - position: [response.data[i].longitude, response.data[i].latitude, 1], - style: { - image: '../static/images/icon/sb.png', - scale: 1, - horizontalOrigin: Cesium.HorizontalOrigin.CENTER, - verticalOrigin: Cesium.VerticalOrigin.BOTTOM, - scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3) - }, - popup: `远程水表
设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` - })) - } - this.refreshAlarm() - } - }) - }, // 腐蚀速率监测仪 fsModel() { const params = '14' getMapping(params, this.listQuery.keywords).then(response => { - console.log(response.data[0].latitude, '======腐蚀速率监测仪=======') // 过滤掉该单位不支持的设备(通过部门id) const deptIds = this.$store.getters.deptId const responses = [] @@ -662,29 +622,32 @@ if (fs_icon_layer !== null) window.map.removeLayer(fs_icon_layer) fs_icon_layer = new mars3d.layer.GraphicLayer() window.map.addLayer(fs_icon_layer) - for (let i = 0; i < response.data.length; i++) { - fs_model_layer.addGraphic(new mars3d.graphic.ModelPrimitive({ - position: [response.data[i].longitude, response.data[i].latitude, 0], - style: { - url: '../static/model/fs.glb', - scale: 1, - heading: 90 - }, - popup: `腐蚀速率监测仪
设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` - })) - fs_icon_layer.addGraphic(new mars3d.graphic.BillboardEntity({ - id: response.data[i].devcode, - position: [response.data[i].longitude, response.data[i].latitude, 1], - style: { - image: '../static/images/icon/fs.png', - scale: 1, - horizontalOrigin: Cesium.HorizontalOrigin.CENTER, - verticalOrigin: Cesium.VerticalOrigin.BOTTOM, - scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3) - }, - popup: `腐蚀速率监测仪
设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` - })) + if (response.data.length > 0) { + for (let i = 0; i < response.data.length; i++) { + fs_model_layer.addGraphic(new mars3d.graphic.ModelPrimitive({ + position: [response.data[i].longitude, response.data[i].latitude, 0], + style: { + url: '../static/model/fs.glb', + scale: 1, + heading: 90 + }, + popup: `设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` + })) + fs_icon_layer.addGraphic(new mars3d.graphic.BillboardEntity({ + id: response.data[i].devcode, + position: [response.data[i].longitude, response.data[i].latitude, 1], + style: { + image: '../static/images/icon/fs.png', + scale: 1, + horizontalOrigin: Cesium.HorizontalOrigin.CENTER, + verticalOrigin: Cesium.VerticalOrigin.BOTTOM, + scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3) + }, + popup: `设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` + })) + } } + this.refreshAlarm() } }) @@ -693,7 +656,6 @@ qtModel() { const params = '15' getMapping(params, this.listQuery.keywords).then(response => { - console.log(response.data[0].latitude, '======气体流量计=======') // 过滤掉该单位不支持的设备(通过部门id) const deptIds = this.$store.getters.deptId const responses = [] @@ -711,28 +673,128 @@ if (qt_icon_layer !== null) window.map.removeLayer(qt_icon_layer) qt_icon_layer = new mars3d.layer.GraphicLayer() window.map.addLayer(qt_icon_layer) - for (let i = 0; i < response.data.length; i++) { - qt_model_layer.addGraphic(new mars3d.graphic.ModelPrimitive({ - position: [response.data[i].longitude, response.data[i].latitude, 0], - style: { - url: '../static/model/qt.glb', - scale: 1, - heading: 90 - }, - popup: `气体流量计
设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` - })) - qt_icon_layer.addGraphic(new mars3d.graphic.BillboardEntity({ - id: response.data[i].devcode, - position: [response.data[i].longitude, response.data[i].latitude, 1], - style: { - image: '../static/images/icon/qt.png', - scale: 1, - horizontalOrigin: Cesium.HorizontalOrigin.CENTER, - verticalOrigin: Cesium.VerticalOrigin.BOTTOM, - scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3) - }, - popup: `气体流量计
设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` - })) + if (response.data.length > 0) { + for (let i = 0; i < response.data.length; i++) { + qt_model_layer.addGraphic(new mars3d.graphic.ModelPrimitive({ + position: [response.data[i].longitude, response.data[i].latitude, 0], + style: { + url: '../static/model/qt.glb', + scale: 1, + heading: 90 + }, + popup: `设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` + })) + qt_icon_layer.addGraphic(new mars3d.graphic.BillboardEntity({ + id: response.data[i].devcode, + position: [response.data[i].longitude, response.data[i].latitude, 1], + style: { + image: '../static/images/icon/qt.png', + scale: 1, + horizontalOrigin: Cesium.HorizontalOrigin.CENTER, + verticalOrigin: Cesium.VerticalOrigin.BOTTOM, + scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3) + }, + popup: `设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` + })) + } + } + this.refreshAlarm() + } + }) + }, + // 气体流量计 + qt02Model() { + const params = '16' + getMapping(params, this.listQuery.keywords).then(response => { + // 过滤掉该单位不支持的设备(通过部门id) + const deptIds = this.$store.getters.deptId + const responses = [] + response.data.forEach(item => { + if (item.deptid === deptIds) { + responses.push(item) + } + }) + response.data = responses + if (response.code === 200) { + if (qt2_model_layer !== null) window.map.removeLayer(qt2_model_layer) + qt2_model_layer = new mars3d.layer.GraphicLayer() + window.map.addLayer(qt2_model_layer) + if (qt2_icon_layer !== null) window.map.removeLayer(qt2_icon_layer) + qt2_icon_layer = new mars3d.layer.GraphicLayer() + window.map.addLayer(qt2_icon_layer) + if (response.data.length > 0) { + for (let i = 0; i < response.data.length; i++) { + qt2_model_layer.addGraphic(new mars3d.graphic.ModelPrimitive({ + position: [response.data[i].longitude, response.data[i].latitude, 0], + style: { + url: '../static/model/qt.glb', + scale: 1, + heading: 90 + }, + popup: `设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` + })) + qt2_icon_layer.addGraphic(new mars3d.graphic.BillboardEntity({ + id: response.data[i].devcode, + position: [response.data[i].longitude, response.data[i].latitude, 1], + style: { + image: '../static/images/icon/qt.png', + scale: 1, + horizontalOrigin: Cesium.HorizontalOrigin.CENTER, + verticalOrigin: Cesium.VerticalOrigin.BOTTOM, + scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3) + }, + popup: `设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` + })) + } + } + this.refreshAlarm() + } + }) + }, + // 气体流量计 + qtgasModel() { + const params = '17' + getMapping(params, this.listQuery.keywords).then(response => { + // 过滤掉该单位不支持的设备(通过部门id) + const deptIds = this.$store.getters.deptId + const responses = [] + response.data.forEach(item => { + if (item.deptid === deptIds) { + responses.push(item) + } + }) + response.data = responses + if (response.code === 200) { + if (qt3_model_layer !== null) window.map.removeLayer(qt3_model_layer) + qt3_model_layer = new mars3d.layer.GraphicLayer() + window.map.addLayer(qt3_model_layer) + if (qt3_icon_layer !== null) window.map.removeLayer(qt3_icon_layer) + qt3_icon_layer = new mars3d.layer.GraphicLayer() + window.map.addLayer(qt3_icon_layer) + if (response.data.length > 0) { + for (let i = 0; i < response.data.length; i++) { + qt3_model_layer.addGraphic(new mars3d.graphic.ModelPrimitive({ + position: [response.data[i].longitude, response.data[i].latitude, 0], + style: { + url: '../static/model/qt.glb', + scale: 1, + heading: 90 + }, + popup: `设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` + })) + qt3_icon_layer.addGraphic(new mars3d.graphic.BillboardEntity({ + id: response.data[i].devcode, + position: [response.data[i].longitude, response.data[i].latitude, 1], + style: { + image: '../static/images/icon/qt.png', + scale: 1, + horizontalOrigin: Cesium.HorizontalOrigin.CENTER, + verticalOrigin: Cesium.VerticalOrigin.BOTTOM, + scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3) + }, + popup: `设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` + })) + } } this.refreshAlarm() } @@ -742,7 +804,6 @@ rqModel() { const params = '4' getMapping(params, this.listQuery.keywords).then(response => { - console.log(response.data[0].latitude, '======气体泄露监测仪（原燃气）=======') // 过滤掉该单位不支持的设备(通过部门id) const deptIds = this.$store.getters.deptId const responses = [] @@ -760,28 +821,30 @@ if (rq_icon_layer !== null) window.map.removeLayer(rq_icon_layer) rq_icon_layer = new mars3d.layer.GraphicLayer() window.map.addLayer(rq_icon_layer) - for (let i = 0; i < response.data.length; i++) { - rq_model_layer.addGraphic(new mars3d.graphic.ModelPrimitive({ - position: [response.data[i].longitude, response.data[i].latitude, 0], - style: { - url: '../static/model/rq.glb', - scale: 1, - heading: 90 - }, - popup: `气体泄露监测仪
设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` - })) - rq_icon_layer.addGraphic(new mars3d.graphic.BillboardEntity({ - id: response.data[i].devcode, - position: [response.data[i].longitude, response.data[i].latitude, 1], - style: { - image: '../static/images/icon/rq.png', - scale: 1, - horizontalOrigin: Cesium.HorizontalOrigin.CENTER, - verticalOrigin: Cesium.VerticalOrigin.BOTTOM, - scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3) - }, - popup: `气体泄露监测仪
设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` - })) + if (response.data.length > 0) { + for (let i = 0; i < response.data.length; i++) { + rq_model_layer.addGraphic(new mars3d.graphic.ModelPrimitive({ + position: [response.data[i].longitude, response.data[i].latitude, 0], + style: { + url: '../static/model/rq.glb', + scale: 1, + heading: 90 + }, + popup: `设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` + })) + rq_icon_layer.addGraphic(new mars3d.graphic.BillboardEntity({ + id: response.data[i].devcode, + position: [response.data[i].longitude, response.data[i].latitude, 1], + style: { + image: '../static/images/icon/rq.png', + scale: 1, + horizontalOrigin: Cesium.HorizontalOrigin.CENTER, + verticalOrigin: Cesium.VerticalOrigin.BOTTOM, + scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3) + }, + popup: `设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` + })) + } } this.refreshAlarm() } @@ -791,7 +854,6 @@ zsMoel() { const params = '8' getMapping(params, this.listQuery.keywords).then(response => { - console.log(response.data[0].latitude, '======供水泄露监测仪（原噪声））=======') // 过滤掉该单位不支持的设备(通过部门id) const deptIds = this.$store.getters.deptId const responses = [] @@ -810,28 +872,30 @@ if (zs_icon_layer !== null) window.map.removeLayer(zs_icon_layer) zs_icon_layer = new mars3d.layer.GraphicLayer() window.map.addLayer(zs_icon_layer) - for (let i = 0; i < response.data.length; i++) { - zs_model_layer.addGraphic(new mars3d.graphic.ModelPrimitive({ - position: [response.data[i].longitude, response.data[i].latitude, 0], - style: { - url: '../static/model/zs.glb', - scale: 1, - heading: 90 - }, - popup: `供水泄露监测仪
设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` - })) - zs_icon_layer.addGraphic(new mars3d.graphic.BillboardEntity({ - id: response.data[i].devcode, - position: [response.data[i].longitude, response.data[i].latitude, 1], - style: { - image: '../static/images/icon/zs.png', - scale: 1, - horizontalOrigin: Cesium.HorizontalOrigin.CENTER, - verticalOrigin: Cesium.VerticalOrigin.BOTTOM, - scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3) - }, - popup: `供水泄露监测仪
设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` - })) + if (response.data.length > 0) { + for (let i = 0; i < response.data.length; i++) { + zs_model_layer.addGraphic(new mars3d.graphic.ModelPrimitive({ + position: [response.data[i].longitude, response.data[i].latitude, 0], + style: { + url: '../static/model/zs.glb', + scale: 1, + heading: 90 + }, + popup: `设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` + })) + zs_icon_layer.addGraphic(new mars3d.graphic.BillboardEntity({ + id: response.data[i].devcode, + position: [response.data[i].longitude, response.data[i].latitude, 1], + style: { + image: '../static/images/icon/zs.png', + scale: 1, + horizontalOrigin: Cesium.HorizontalOrigin.CENTER, + verticalOrigin: Cesium.VerticalOrigin.BOTTOM, + scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3) + }, + popup: `设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` + })) + } } this.refreshAlarm() } @@ -859,6 +923,7 @@ if (this.alarmList.length > 0) { this.hasAlarm = true } + this.filterAlarmList() for (const alarm of response.data) { for (const watch of watch_icon_layer.graphics) { if (alarm.devcode === watch.options.id) { diff --git a/src/views/jobManage/detailJob.vue b/src/views/jobManage/detailJob.vue index 2d6aaa4..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 1e0de1a..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/gasDashboard/components/PanelGroup.vue b/src/views/gasDashboard/components/PanelGroup.vue
index eead839..5613860 100644
--- a/src/views/gasDashboard/components/PanelGroup.vue
+++ b/src/views/gasDashboard/components/PanelGroup.vue
@@ -17,6 +17,7 @@
import Card from '@/components/BigData/Card'
// 首页
import { gasStatistic, deviceCount, alarmNowStatic } from '@/api/gasOverview'
+import { gasStatistic2 } from '../../../api/gasOverview'
export default {
components: {
Card,
@@ -26,40 +27,40 @@
return {
dataGroup1: [
{
- title: ['总用气量', '本月用气量'],
- context: ['--', '--'],
+ title: ['CO₂总用气量', 'CO₂本月用气量', 'CO₂今日用气量'],
+ context: ['--', '--', '--'],
icon: '',
color: '#40c9c6',
- unit: '吨',
+ unit: 'Nm³',
index: 0
},
{
- title: ['今日用气量', '生产厂区用气量'],
- context: ['--', '--'],
+ title: ['O₂总用气量', 'O₂本月用气量', 'O₂今日用气量'],
+ context: ['--', '--', '--'],
icon: '',
color: '#36a3f7',
- unit: '吨',
+ unit: 'Nm³',
index: 1
},
{
+ title: ['燃气总用气量', '燃气本月用气量', '燃气今日用气量'],
+ context: ['--', '--', '--'],
+ icon: '',
+ color: '#36a3f7',
+ unit: 'Nm³',
+ index: 2
+ },
+ {
title: ['滑道实时噪声'],
context: ['--'],
icon: 'icon-noise',
color: '#f1c353',
unit: 'db',
- index: 2
+ index: 3
}
],
dataGroup: [
{
- title: '气体流量计',
- context: '--',
- icon: 'icon-watch',
- color: '#9694f7',
- path: '/deviceList?deviceType=13',
- permission: '/device/list'
- },
- {
title: '告警信息',
context: '--',
icon: 'icon-alarm',
@@ -73,7 +74,7 @@
mounted() {
this.getWater()
// this.getWellCount()
- this.getDeviceCount()
+ // this.getDeviceCount()
this.getAlarmCount()
},
methods: {
@@ -83,19 +84,21 @@
getWater() {
// 用气量
gasStatistic().then(response => {
- this.dataGroup1[0].context = [response.data.total ? parseFloat(response.data.total).toFixed(2) : '--', response.data.month ? parseFloat(response.data.month).toFixed(2) : '--']
- this.dataGroup1[1].context = [response.data.today ? parseFloat(response.data.today).toFixed(2) : '--', response.data.prodution ? parseFloat(response.data.prodution).toFixed(2) : '--']
- this.dataGroup1[2].context = [response.data.sound ? Number(response.data.sound).toFixed(2) : '--']
+ this.dataGroup1[3].context = [response.data.sound ? Number(response.data.sound).toFixed(2) : '--']
})
- },
- getDeviceCount() {
- deviceCount('15').then(response => {
- this.dataGroup[0].context = response.data
+ gasStatistic2('15').then(response => {
+ this.dataGroup1[0].context = [response.data.total.toFixed(2), response.data.month.toFixed(2), response.data.day === '' ? '--' : response.data.day.toFixed(2)]
+ })
+ gasStatistic2('16').then(response => {
+ this.dataGroup1[1].context = [response.data.total.toFixed(2), response.data.month.toFixed(2), response.data.day === '' ? '--' : response.data.day.toFixed(2)]
+ })
+ gasStatistic2('17').then(response => {
+ this.dataGroup1[2].context = [response.data.total.toFixed(2), response.data.month.toFixed(2), response.data.day === '' ? '--' : response.data.day.toFixed(2)]
})
},
getAlarmCount() {
alarmNowStatic().then(response => {
- this.dataGroup[1].context = response.data.total
+ this.dataGroup[0].context = response.data.total
})
}
}
diff --git a/src/views/gasDashboard/components/alarmGasCountByDept.vue b/src/views/gasDashboard/components/alarmGasCountByDept.vue
deleted file mode 100644
index b8bfc23..0000000
--- a/src/views/gasDashboard/components/alarmGasCountByDept.vue
+++ /dev/null
@@ -1,73 +0,0 @@
-
-
-
-
-
-
-
-
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/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
index c144bc6..a410f29 100644
--- a/src/views/gasDashboard/components/corrodeCountByDay.vue
+++ b/src/views/gasDashboard/components/corrodeCountByDay.vue
@@ -45,11 +45,14 @@
},
extend: {
grid: {
- top: 120
+ top: 120,
+ left: 30
},
yAxis: {
+ position: 'left',
+ type: 'value',
name: '腐蚀率(%)',
- position: 'left'
+ nameRotate: '0.1'
},
legend: {
// type: 'scroll',
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/gasCountByDay.vue b/src/views/gasDashboard/components/gasCountByDay.vue
index 79a4efb..f0a3977 100644
--- a/src/views/gasDashboard/components/gasCountByDay.vue
+++ b/src/views/gasDashboard/components/gasCountByDay.vue
@@ -1,34 +1,33 @@
-
-
-
-
+
-
-
+
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
@@ -81,19 +69,23 @@
import DeviceCount from './components/DeviceCount'
import gasCountByDept from './components/gasCountByDept'
import gasCountByDay from './components/gasCountByDay'
-import gasCountByAreaBar from './components/gasCountByAreaBar'
+import gasCountByDeviceBar from './components/gasCountByDeviceBar'
import WatchAlarmBar from './components/watchAlarmBar'
import gasNote from './components/gasNote'
import AlarmCountByDept from './components/AlarmCountByDept'
import gasCompare from './components/gasCompare'
import watchGasAlarmBar from './components/watchGasAlarmBar'
-import alarmGasCountByDept from './components/alarmGasCountByDept'
+import alarmGasCountByType from './components/alarmGasCountByType'
import corrodeCountByDay from './components/corrodeCountByDay'
+import AlarmLeakCountPie from './components/alarmLeakCountPie'
+import GasAlarmTrend from './components/gasAlarmTrend'
export default {
name: 'Dashboard',
components: {
- gasCountByAreaBar,
+ GasAlarmTrend,
+ AlarmLeakCountPie,
+ gasCountByDeviceBar,
gasCountByDept,
gasCountByDay,
gasNote,
@@ -103,7 +95,7 @@
WatchAlarmBar,
AlarmCountByDept,
watchGasAlarmBar,
- alarmGasCountByDept,
+ alarmGasCountByType,
corrodeCountByDay
},
data() {
diff --git a/src/views/gasOverview/gasOverviewSimple.vue b/src/views/gasOverview/gasOverviewSimple.vue
index 585ab8a..764bf28 100644
--- a/src/views/gasOverview/gasOverviewSimple.vue
+++ b/src/views/gasOverview/gasOverviewSimple.vue
@@ -5,7 +5,7 @@
-
+
搜索
@@ -36,7 +36,7 @@
-
+
+
diff --git a/src/views/gasDashboard/index.vue b/src/views/gasDashboard/index.vue
index 6eb2d56..be583f2 100644
--- a/src/views/gasDashboard/index.vue
+++ b/src/views/gasDashboard/index.vue
@@ -2,72 +2,60 @@
+
告警列表
@@ -48,10 +48,10 @@
@@ -97,7 +97,11 @@
var rq_model_layer = null // 燃气模型层
var rq_icon_layer = null // 燃气图标层
var qt_model_layer = null // 气体流量计模型层
+var qt2_model_layer = null // 气体流量计模型层
+var qt3_model_layer = null // 气体流量计模型层
var qt_icon_layer = null // 气体流量计图标层
+var qt2_icon_layer = null // 气体流量计图标层
+var qt3_icon_layer = null // 气体流量计图标层
var fs_model_layer = null // 腐蚀速率监测仪模型层
var fs_icon_layer = null // 腐蚀速率监测仪图标层
export default {
@@ -106,7 +110,7 @@
data() {
return {
screenHeight: null,
- checkedCities: ['腐蚀速率监测仪', '气体流量计', '气体泄漏检测仪', '供水泄漏检测仪'],
+ checkedCities: ['腐蚀速率监测仪', '气体泄漏监测仪', '供水泄漏监测仪', 'CO2气体流量计', 'O2气体流量计', '燃气气体流量计'],
left: '',
mapMark: '-',
deviceTypeList: [], // 设备类型列表
@@ -161,6 +165,7 @@
wellTypeList: [], // 井类型列表
showDeptTree: 0, // 是否显示权属单位下拉,0不显示，1显示树，2显示平面
alarmList: [], // 报警列表
+ searchAlarmList: [],
timer: null,
deptShowTop: false, // 是否显示顶级
clock: null, // 计时器
@@ -247,12 +252,18 @@
if (item.indexOf('腐蚀速率监测仪') !== -1) {
this.wellMode()
this.fsModel()
- } else if (item.indexOf('气体流量计') !== -1) {
+ } else if (item.indexOf('CO2气体流量计') !== -1) {
this.wellMode()
this.qtModel()
- } else if (item.indexOf('气体泄漏检测仪') !== -1) {
+ } else if (item.indexOf('O2气体流量计') !== -1) {
+ this.wellMode()
+ this.qt02Model()
+ } else if (item.indexOf('燃气气体流量计') !== -1) {
+ this.wellMode()
+ this.qtgasModel()
+ } else if (item.indexOf('气体泄漏监测仪') !== -1) {
this.rqModel()
- } else if (item.indexOf('供水泄漏检测仪') !== -1) {
+ } else if (item.indexOf('供水泄漏监测仪') !== -1) {
this.wellMode()
this.zsMoel()
}
@@ -264,10 +275,14 @@
window.map.removeLayer(fs_model_layer)
window.map.removeLayer(rq_model_layer)
window.map.removeLayer(qt_model_layer)
+ window.map.removeLayer(qt2_model_layer)
+ window.map.removeLayer(qt3_model_layer)
window.map.removeLayer(fs_icon_layer)
window.map.removeLayer(zs_icon_layer)
window.map.removeLayer(rq_icon_layer)
window.map.removeLayer(qt_icon_layer)
+ window.map.removeLayer(qt2_icon_layer)
+ window.map.removeLayer(qt3_icon_layer)
window.map.removeLayer(well_model_layer)
},
// 获取设备类型
@@ -398,41 +413,6 @@
})
},
// 初始化街道、流向线
- // async initDrawLines() {
- // axios.get('./static/position.json').then((result) => {
- // const positions = result.data.positions
- // flow = new mars3d.layer.GraphicLayer()
- // window.map.addLayer(flow)
- // street = new mars3d.layer.GraphicLayer()
- // window.map.addLayer(street)
- // for (let j = 0; j < positions.length; j++) {
- // flow.addGraphic(this.addFlow(positions[j].items, positions[j].repeat))
- // street.addGraphic(this.addStreet(positions[j].items))
- // }
- // flow.show = false
- // }).catch((error) => {
- // console.log('get position error...' + error)
- // })
- // },
- // 流向线
- // addFlow(positions, repeat) {
- // console.log(positions, repeat, '====---1230')
- // var style = {
- // width: 10,
- // material: mars3d.MaterialUtil.createMaterialProperty(mars3d.MaterialType.LineFlow, {
- // color: '#215bd9',
- // repeat: new Cesium.Cartesian2(repeat, 1),
- // image: '../static/images/line.png',
- // speed: 15
- // })
- // }
- // var graphic = new mars3d.graphic.PolylineEntity({
- // positions: positions,
- // style: style
- // })
- // return graphic
- // },
- // 初始化街道、流向线
async initDrawLines() {
axios.get('./static/position2.json').then((result) => {
const positions = result.data.positions
@@ -533,12 +513,40 @@
})
return graphic
},
+ search() {
+ this.filterAlarmList()
+ this.initPoints()
+ },
+ // 过滤报警列表
+ filterAlarmList() {
+ const list = this.alarmList
+ const keywords = this.listQuery.keywords
+ if (keywords) { // 过滤井编号、设备编号
+ this.searchAlarmList = list.filter(item => {
+ let flag = false
+ if (item.wellCode.indexOf(keywords) > -1) {
+ flag = true
+ }
+ if (item.devcode.indexOf(keywords) > -1) {
+ flag = true
+ }
+ if (item.position.indexOf(keywords) > -1) {
+ flag = true
+ }
+ return flag
+ })
+ } else {
+ this.searchAlarmList = list
+ }
+ },
// 初始化井，设备
async initPoints() {
this.wellMode()
this.zsMoel()
this.rqModel()
this.qtModel()
+ this.qt02Model()
+ this.qtgasModel()
this.fsModel()
},
// 井
@@ -593,58 +601,10 @@
}
})
},
- // 远程水表（不展示）
- watchModel() {
- const params = '13'
- getMapping(params, this.listQuery.keywords).then(response => {
- // 过滤掉该单位不支持的设备(通过部门id)
- const deptIds = this.$store.getters.deptId
- const responses = []
- response.data.forEach(item => {
- if (item.deptid === deptIds) {
- responses.push(item)
- }
- })
- response.data = responses
- if (response.code === 200) {
- if (watch_model_layer !== null) window.map.removeLayer(watch_model_layer)
- watch_model_layer = new mars3d.layer.GraphicLayer()
- window.map.addLayer(watch_model_layer)
- if (watch_icon_layer !== null) window.map.removeLayer(watch_icon_layer)
- watch_icon_layer = new mars3d.layer.GraphicLayer()
- window.map.addLayer(watch_icon_layer)
- for (let i = 0; i < response.data.length; i++) {
- watch_model_layer.addGraphic(new mars3d.graphic.ModelPrimitive({
- position: [response.data[i].longitude, response.data[i].latitude, -0.5],
- style: {
- url: '../static/model/sb.glb',
- scale: 2,
- heading: 90
- },
- popup: `远程水表
设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` - })) - watch_icon_layer.addGraphic(new mars3d.graphic.BillboardEntity({ - id: response.data[i].devcode, - position: [response.data[i].longitude, response.data[i].latitude, 1], - style: { - image: '../static/images/icon/sb.png', - scale: 1, - horizontalOrigin: Cesium.HorizontalOrigin.CENTER, - verticalOrigin: Cesium.VerticalOrigin.BOTTOM, - scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3) - }, - popup: `远程水表
设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` - })) - } - this.refreshAlarm() - } - }) - }, // 腐蚀速率监测仪 fsModel() { const params = '14' getMapping(params, this.listQuery.keywords).then(response => { - console.log(response.data[0].latitude, '======腐蚀速率监测仪=======') // 过滤掉该单位不支持的设备(通过部门id) const deptIds = this.$store.getters.deptId const responses = [] @@ -662,29 +622,32 @@ if (fs_icon_layer !== null) window.map.removeLayer(fs_icon_layer) fs_icon_layer = new mars3d.layer.GraphicLayer() window.map.addLayer(fs_icon_layer) - for (let i = 0; i < response.data.length; i++) { - fs_model_layer.addGraphic(new mars3d.graphic.ModelPrimitive({ - position: [response.data[i].longitude, response.data[i].latitude, 0], - style: { - url: '../static/model/fs.glb', - scale: 1, - heading: 90 - }, - popup: `腐蚀速率监测仪
设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` - })) - fs_icon_layer.addGraphic(new mars3d.graphic.BillboardEntity({ - id: response.data[i].devcode, - position: [response.data[i].longitude, response.data[i].latitude, 1], - style: { - image: '../static/images/icon/fs.png', - scale: 1, - horizontalOrigin: Cesium.HorizontalOrigin.CENTER, - verticalOrigin: Cesium.VerticalOrigin.BOTTOM, - scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3) - }, - popup: `腐蚀速率监测仪
设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` - })) + if (response.data.length > 0) { + for (let i = 0; i < response.data.length; i++) { + fs_model_layer.addGraphic(new mars3d.graphic.ModelPrimitive({ + position: [response.data[i].longitude, response.data[i].latitude, 0], + style: { + url: '../static/model/fs.glb', + scale: 1, + heading: 90 + }, + popup: `设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` + })) + fs_icon_layer.addGraphic(new mars3d.graphic.BillboardEntity({ + id: response.data[i].devcode, + position: [response.data[i].longitude, response.data[i].latitude, 1], + style: { + image: '../static/images/icon/fs.png', + scale: 1, + horizontalOrigin: Cesium.HorizontalOrigin.CENTER, + verticalOrigin: Cesium.VerticalOrigin.BOTTOM, + scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3) + }, + popup: `设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` + })) + } } + this.refreshAlarm() } }) @@ -693,7 +656,6 @@ qtModel() { const params = '15' getMapping(params, this.listQuery.keywords).then(response => { - console.log(response.data[0].latitude, '======气体流量计=======') // 过滤掉该单位不支持的设备(通过部门id) const deptIds = this.$store.getters.deptId const responses = [] @@ -711,28 +673,128 @@ if (qt_icon_layer !== null) window.map.removeLayer(qt_icon_layer) qt_icon_layer = new mars3d.layer.GraphicLayer() window.map.addLayer(qt_icon_layer) - for (let i = 0; i < response.data.length; i++) { - qt_model_layer.addGraphic(new mars3d.graphic.ModelPrimitive({ - position: [response.data[i].longitude, response.data[i].latitude, 0], - style: { - url: '../static/model/qt.glb', - scale: 1, - heading: 90 - }, - popup: `气体流量计
设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` - })) - qt_icon_layer.addGraphic(new mars3d.graphic.BillboardEntity({ - id: response.data[i].devcode, - position: [response.data[i].longitude, response.data[i].latitude, 1], - style: { - image: '../static/images/icon/qt.png', - scale: 1, - horizontalOrigin: Cesium.HorizontalOrigin.CENTER, - verticalOrigin: Cesium.VerticalOrigin.BOTTOM, - scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3) - }, - popup: `气体流量计
设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` - })) + if (response.data.length > 0) { + for (let i = 0; i < response.data.length; i++) { + qt_model_layer.addGraphic(new mars3d.graphic.ModelPrimitive({ + position: [response.data[i].longitude, response.data[i].latitude, 0], + style: { + url: '../static/model/qt.glb', + scale: 1, + heading: 90 + }, + popup: `设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` + })) + qt_icon_layer.addGraphic(new mars3d.graphic.BillboardEntity({ + id: response.data[i].devcode, + position: [response.data[i].longitude, response.data[i].latitude, 1], + style: { + image: '../static/images/icon/qt.png', + scale: 1, + horizontalOrigin: Cesium.HorizontalOrigin.CENTER, + verticalOrigin: Cesium.VerticalOrigin.BOTTOM, + scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3) + }, + popup: `设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` + })) + } + } + this.refreshAlarm() + } + }) + }, + // 气体流量计 + qt02Model() { + const params = '16' + getMapping(params, this.listQuery.keywords).then(response => { + // 过滤掉该单位不支持的设备(通过部门id) + const deptIds = this.$store.getters.deptId + const responses = [] + response.data.forEach(item => { + if (item.deptid === deptIds) { + responses.push(item) + } + }) + response.data = responses + if (response.code === 200) { + if (qt2_model_layer !== null) window.map.removeLayer(qt2_model_layer) + qt2_model_layer = new mars3d.layer.GraphicLayer() + window.map.addLayer(qt2_model_layer) + if (qt2_icon_layer !== null) window.map.removeLayer(qt2_icon_layer) + qt2_icon_layer = new mars3d.layer.GraphicLayer() + window.map.addLayer(qt2_icon_layer) + if (response.data.length > 0) { + for (let i = 0; i < response.data.length; i++) { + qt2_model_layer.addGraphic(new mars3d.graphic.ModelPrimitive({ + position: [response.data[i].longitude, response.data[i].latitude, 0], + style: { + url: '../static/model/qt.glb', + scale: 1, + heading: 90 + }, + popup: `设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` + })) + qt2_icon_layer.addGraphic(new mars3d.graphic.BillboardEntity({ + id: response.data[i].devcode, + position: [response.data[i].longitude, response.data[i].latitude, 1], + style: { + image: '../static/images/icon/qt.png', + scale: 1, + horizontalOrigin: Cesium.HorizontalOrigin.CENTER, + verticalOrigin: Cesium.VerticalOrigin.BOTTOM, + scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3) + }, + popup: `设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` + })) + } + } + this.refreshAlarm() + } + }) + }, + // 气体流量计 + qtgasModel() { + const params = '17' + getMapping(params, this.listQuery.keywords).then(response => { + // 过滤掉该单位不支持的设备(通过部门id) + const deptIds = this.$store.getters.deptId + const responses = [] + response.data.forEach(item => { + if (item.deptid === deptIds) { + responses.push(item) + } + }) + response.data = responses + if (response.code === 200) { + if (qt3_model_layer !== null) window.map.removeLayer(qt3_model_layer) + qt3_model_layer = new mars3d.layer.GraphicLayer() + window.map.addLayer(qt3_model_layer) + if (qt3_icon_layer !== null) window.map.removeLayer(qt3_icon_layer) + qt3_icon_layer = new mars3d.layer.GraphicLayer() + window.map.addLayer(qt3_icon_layer) + if (response.data.length > 0) { + for (let i = 0; i < response.data.length; i++) { + qt3_model_layer.addGraphic(new mars3d.graphic.ModelPrimitive({ + position: [response.data[i].longitude, response.data[i].latitude, 0], + style: { + url: '../static/model/qt.glb', + scale: 1, + heading: 90 + }, + popup: `设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` + })) + qt3_icon_layer.addGraphic(new mars3d.graphic.BillboardEntity({ + id: response.data[i].devcode, + position: [response.data[i].longitude, response.data[i].latitude, 1], + style: { + image: '../static/images/icon/qt.png', + scale: 1, + horizontalOrigin: Cesium.HorizontalOrigin.CENTER, + verticalOrigin: Cesium.VerticalOrigin.BOTTOM, + scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3) + }, + popup: `设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` + })) + } } this.refreshAlarm() } @@ -742,7 +804,6 @@ rqModel() { const params = '4' getMapping(params, this.listQuery.keywords).then(response => { - console.log(response.data[0].latitude, '======气体泄露监测仪（原燃气）=======') // 过滤掉该单位不支持的设备(通过部门id) const deptIds = this.$store.getters.deptId const responses = [] @@ -760,28 +821,30 @@ if (rq_icon_layer !== null) window.map.removeLayer(rq_icon_layer) rq_icon_layer = new mars3d.layer.GraphicLayer() window.map.addLayer(rq_icon_layer) - for (let i = 0; i < response.data.length; i++) { - rq_model_layer.addGraphic(new mars3d.graphic.ModelPrimitive({ - position: [response.data[i].longitude, response.data[i].latitude, 0], - style: { - url: '../static/model/rq.glb', - scale: 1, - heading: 90 - }, - popup: `气体泄露监测仪
设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` - })) - rq_icon_layer.addGraphic(new mars3d.graphic.BillboardEntity({ - id: response.data[i].devcode, - position: [response.data[i].longitude, response.data[i].latitude, 1], - style: { - image: '../static/images/icon/rq.png', - scale: 1, - horizontalOrigin: Cesium.HorizontalOrigin.CENTER, - verticalOrigin: Cesium.VerticalOrigin.BOTTOM, - scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3) - }, - popup: `气体泄露监测仪
设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` - })) + if (response.data.length > 0) { + for (let i = 0; i < response.data.length; i++) { + rq_model_layer.addGraphic(new mars3d.graphic.ModelPrimitive({ + position: [response.data[i].longitude, response.data[i].latitude, 0], + style: { + url: '../static/model/rq.glb', + scale: 1, + heading: 90 + }, + popup: `设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` + })) + rq_icon_layer.addGraphic(new mars3d.graphic.BillboardEntity({ + id: response.data[i].devcode, + position: [response.data[i].longitude, response.data[i].latitude, 1], + style: { + image: '../static/images/icon/rq.png', + scale: 1, + horizontalOrigin: Cesium.HorizontalOrigin.CENTER, + verticalOrigin: Cesium.VerticalOrigin.BOTTOM, + scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3) + }, + popup: `设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` + })) + } } this.refreshAlarm() } @@ -791,7 +854,6 @@ zsMoel() { const params = '8' getMapping(params, this.listQuery.keywords).then(response => { - console.log(response.data[0].latitude, '======供水泄露监测仪（原噪声））=======') // 过滤掉该单位不支持的设备(通过部门id) const deptIds = this.$store.getters.deptId const responses = [] @@ -810,28 +872,30 @@ if (zs_icon_layer !== null) window.map.removeLayer(zs_icon_layer) zs_icon_layer = new mars3d.layer.GraphicLayer() window.map.addLayer(zs_icon_layer) - for (let i = 0; i < response.data.length; i++) { - zs_model_layer.addGraphic(new mars3d.graphic.ModelPrimitive({ - position: [response.data[i].longitude, response.data[i].latitude, 0], - style: { - url: '../static/model/zs.glb', - scale: 1, - heading: 90 - }, - popup: `供水泄露监测仪
设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` - })) - zs_icon_layer.addGraphic(new mars3d.graphic.BillboardEntity({ - id: response.data[i].devcode, - position: [response.data[i].longitude, response.data[i].latitude, 1], - style: { - image: '../static/images/icon/zs.png', - scale: 1, - horizontalOrigin: Cesium.HorizontalOrigin.CENTER, - verticalOrigin: Cesium.VerticalOrigin.BOTTOM, - scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3) - }, - popup: `供水泄露监测仪
设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` - })) + if (response.data.length > 0) { + for (let i = 0; i < response.data.length; i++) { + zs_model_layer.addGraphic(new mars3d.graphic.ModelPrimitive({ + position: [response.data[i].longitude, response.data[i].latitude, 0], + style: { + url: '../static/model/zs.glb', + scale: 1, + heading: 90 + }, + popup: `设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` + })) + zs_icon_layer.addGraphic(new mars3d.graphic.BillboardEntity({ + id: response.data[i].devcode, + position: [response.data[i].longitude, response.data[i].latitude, 1], + style: { + image: '../static/images/icon/zs.png', + scale: 1, + horizontalOrigin: Cesium.HorizontalOrigin.CENTER, + verticalOrigin: Cesium.VerticalOrigin.BOTTOM, + scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3) + }, + popup: `设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` + })) + } } this.refreshAlarm() } @@ -859,6 +923,7 @@ if (this.alarmList.length > 0) { this.hasAlarm = true } + this.filterAlarmList() for (const alarm of response.data) { for (const watch of watch_icon_layer.graphics) { if (alarm.devcode === watch.options.id) { diff --git a/src/views/jobManage/detailJob.vue b/src/views/jobManage/detailJob.vue index 2d6aaa4..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 1e0de1a..ac57f82 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -11,13 +11,13 @@ class="left-div" >
设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` - })) - watch_icon_layer.addGraphic(new mars3d.graphic.BillboardEntity({ - id: response.data[i].devcode, - position: [response.data[i].longitude, response.data[i].latitude, 1], - style: { - image: '../static/images/icon/sb.png', - scale: 1, - horizontalOrigin: Cesium.HorizontalOrigin.CENTER, - verticalOrigin: Cesium.VerticalOrigin.BOTTOM, - scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3) - }, - popup: `远程水表
设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` - })) - } - this.refreshAlarm() - } - }) - }, // 腐蚀速率监测仪 fsModel() { const params = '14' getMapping(params, this.listQuery.keywords).then(response => { - console.log(response.data[0].latitude, '======腐蚀速率监测仪=======') // 过滤掉该单位不支持的设备(通过部门id) const deptIds = this.$store.getters.deptId const responses = [] @@ -662,29 +622,32 @@ if (fs_icon_layer !== null) window.map.removeLayer(fs_icon_layer) fs_icon_layer = new mars3d.layer.GraphicLayer() window.map.addLayer(fs_icon_layer) - for (let i = 0; i < response.data.length; i++) { - fs_model_layer.addGraphic(new mars3d.graphic.ModelPrimitive({ - position: [response.data[i].longitude, response.data[i].latitude, 0], - style: { - url: '../static/model/fs.glb', - scale: 1, - heading: 90 - }, - popup: `腐蚀速率监测仪
设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` - })) - fs_icon_layer.addGraphic(new mars3d.graphic.BillboardEntity({ - id: response.data[i].devcode, - position: [response.data[i].longitude, response.data[i].latitude, 1], - style: { - image: '../static/images/icon/fs.png', - scale: 1, - horizontalOrigin: Cesium.HorizontalOrigin.CENTER, - verticalOrigin: Cesium.VerticalOrigin.BOTTOM, - scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3) - }, - popup: `腐蚀速率监测仪
设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` - })) + if (response.data.length > 0) { + for (let i = 0; i < response.data.length; i++) { + fs_model_layer.addGraphic(new mars3d.graphic.ModelPrimitive({ + position: [response.data[i].longitude, response.data[i].latitude, 0], + style: { + url: '../static/model/fs.glb', + scale: 1, + heading: 90 + }, + popup: `设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` + })) + fs_icon_layer.addGraphic(new mars3d.graphic.BillboardEntity({ + id: response.data[i].devcode, + position: [response.data[i].longitude, response.data[i].latitude, 1], + style: { + image: '../static/images/icon/fs.png', + scale: 1, + horizontalOrigin: Cesium.HorizontalOrigin.CENTER, + verticalOrigin: Cesium.VerticalOrigin.BOTTOM, + scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3) + }, + popup: `设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` + })) + } } + this.refreshAlarm() } }) @@ -693,7 +656,6 @@ qtModel() { const params = '15' getMapping(params, this.listQuery.keywords).then(response => { - console.log(response.data[0].latitude, '======气体流量计=======') // 过滤掉该单位不支持的设备(通过部门id) const deptIds = this.$store.getters.deptId const responses = [] @@ -711,28 +673,128 @@ if (qt_icon_layer !== null) window.map.removeLayer(qt_icon_layer) qt_icon_layer = new mars3d.layer.GraphicLayer() window.map.addLayer(qt_icon_layer) - for (let i = 0; i < response.data.length; i++) { - qt_model_layer.addGraphic(new mars3d.graphic.ModelPrimitive({ - position: [response.data[i].longitude, response.data[i].latitude, 0], - style: { - url: '../static/model/qt.glb', - scale: 1, - heading: 90 - }, - popup: `气体流量计
设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` - })) - qt_icon_layer.addGraphic(new mars3d.graphic.BillboardEntity({ - id: response.data[i].devcode, - position: [response.data[i].longitude, response.data[i].latitude, 1], - style: { - image: '../static/images/icon/qt.png', - scale: 1, - horizontalOrigin: Cesium.HorizontalOrigin.CENTER, - verticalOrigin: Cesium.VerticalOrigin.BOTTOM, - scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3) - }, - popup: `气体流量计
设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` - })) + if (response.data.length > 0) { + for (let i = 0; i < response.data.length; i++) { + qt_model_layer.addGraphic(new mars3d.graphic.ModelPrimitive({ + position: [response.data[i].longitude, response.data[i].latitude, 0], + style: { + url: '../static/model/qt.glb', + scale: 1, + heading: 90 + }, + popup: `设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` + })) + qt_icon_layer.addGraphic(new mars3d.graphic.BillboardEntity({ + id: response.data[i].devcode, + position: [response.data[i].longitude, response.data[i].latitude, 1], + style: { + image: '../static/images/icon/qt.png', + scale: 1, + horizontalOrigin: Cesium.HorizontalOrigin.CENTER, + verticalOrigin: Cesium.VerticalOrigin.BOTTOM, + scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3) + }, + popup: `设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` + })) + } + } + this.refreshAlarm() + } + }) + }, + // 气体流量计 + qt02Model() { + const params = '16' + getMapping(params, this.listQuery.keywords).then(response => { + // 过滤掉该单位不支持的设备(通过部门id) + const deptIds = this.$store.getters.deptId + const responses = [] + response.data.forEach(item => { + if (item.deptid === deptIds) { + responses.push(item) + } + }) + response.data = responses + if (response.code === 200) { + if (qt2_model_layer !== null) window.map.removeLayer(qt2_model_layer) + qt2_model_layer = new mars3d.layer.GraphicLayer() + window.map.addLayer(qt2_model_layer) + if (qt2_icon_layer !== null) window.map.removeLayer(qt2_icon_layer) + qt2_icon_layer = new mars3d.layer.GraphicLayer() + window.map.addLayer(qt2_icon_layer) + if (response.data.length > 0) { + for (let i = 0; i < response.data.length; i++) { + qt2_model_layer.addGraphic(new mars3d.graphic.ModelPrimitive({ + position: [response.data[i].longitude, response.data[i].latitude, 0], + style: { + url: '../static/model/qt.glb', + scale: 1, + heading: 90 + }, + popup: `设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` + })) + qt2_icon_layer.addGraphic(new mars3d.graphic.BillboardEntity({ + id: response.data[i].devcode, + position: [response.data[i].longitude, response.data[i].latitude, 1], + style: { + image: '../static/images/icon/qt.png', + scale: 1, + horizontalOrigin: Cesium.HorizontalOrigin.CENTER, + verticalOrigin: Cesium.VerticalOrigin.BOTTOM, + scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3) + }, + popup: `设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` + })) + } + } + this.refreshAlarm() + } + }) + }, + // 气体流量计 + qtgasModel() { + const params = '17' + getMapping(params, this.listQuery.keywords).then(response => { + // 过滤掉该单位不支持的设备(通过部门id) + const deptIds = this.$store.getters.deptId + const responses = [] + response.data.forEach(item => { + if (item.deptid === deptIds) { + responses.push(item) + } + }) + response.data = responses + if (response.code === 200) { + if (qt3_model_layer !== null) window.map.removeLayer(qt3_model_layer) + qt3_model_layer = new mars3d.layer.GraphicLayer() + window.map.addLayer(qt3_model_layer) + if (qt3_icon_layer !== null) window.map.removeLayer(qt3_icon_layer) + qt3_icon_layer = new mars3d.layer.GraphicLayer() + window.map.addLayer(qt3_icon_layer) + if (response.data.length > 0) { + for (let i = 0; i < response.data.length; i++) { + qt3_model_layer.addGraphic(new mars3d.graphic.ModelPrimitive({ + position: [response.data[i].longitude, response.data[i].latitude, 0], + style: { + url: '../static/model/qt.glb', + scale: 1, + heading: 90 + }, + popup: `设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` + })) + qt3_icon_layer.addGraphic(new mars3d.graphic.BillboardEntity({ + id: response.data[i].devcode, + position: [response.data[i].longitude, response.data[i].latitude, 1], + style: { + image: '../static/images/icon/qt.png', + scale: 1, + horizontalOrigin: Cesium.HorizontalOrigin.CENTER, + verticalOrigin: Cesium.VerticalOrigin.BOTTOM, + scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3) + }, + popup: `设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` + })) + } } this.refreshAlarm() } @@ -742,7 +804,6 @@ rqModel() { const params = '4' getMapping(params, this.listQuery.keywords).then(response => { - console.log(response.data[0].latitude, '======气体泄露监测仪（原燃气）=======') // 过滤掉该单位不支持的设备(通过部门id) const deptIds = this.$store.getters.deptId const responses = [] @@ -760,28 +821,30 @@ if (rq_icon_layer !== null) window.map.removeLayer(rq_icon_layer) rq_icon_layer = new mars3d.layer.GraphicLayer() window.map.addLayer(rq_icon_layer) - for (let i = 0; i < response.data.length; i++) { - rq_model_layer.addGraphic(new mars3d.graphic.ModelPrimitive({ - position: [response.data[i].longitude, response.data[i].latitude, 0], - style: { - url: '../static/model/rq.glb', - scale: 1, - heading: 90 - }, - popup: `气体泄露监测仪
设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` - })) - rq_icon_layer.addGraphic(new mars3d.graphic.BillboardEntity({ - id: response.data[i].devcode, - position: [response.data[i].longitude, response.data[i].latitude, 1], - style: { - image: '../static/images/icon/rq.png', - scale: 1, - horizontalOrigin: Cesium.HorizontalOrigin.CENTER, - verticalOrigin: Cesium.VerticalOrigin.BOTTOM, - scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3) - }, - popup: `气体泄露监测仪
设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` - })) + if (response.data.length > 0) { + for (let i = 0; i < response.data.length; i++) { + rq_model_layer.addGraphic(new mars3d.graphic.ModelPrimitive({ + position: [response.data[i].longitude, response.data[i].latitude, 0], + style: { + url: '../static/model/rq.glb', + scale: 1, + heading: 90 + }, + popup: `设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` + })) + rq_icon_layer.addGraphic(new mars3d.graphic.BillboardEntity({ + id: response.data[i].devcode, + position: [response.data[i].longitude, response.data[i].latitude, 1], + style: { + image: '../static/images/icon/rq.png', + scale: 1, + horizontalOrigin: Cesium.HorizontalOrigin.CENTER, + verticalOrigin: Cesium.VerticalOrigin.BOTTOM, + scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3) + }, + popup: `设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` + })) + } } this.refreshAlarm() } @@ -791,7 +854,6 @@ zsMoel() { const params = '8' getMapping(params, this.listQuery.keywords).then(response => { - console.log(response.data[0].latitude, '======供水泄露监测仪（原噪声））=======') // 过滤掉该单位不支持的设备(通过部门id) const deptIds = this.$store.getters.deptId const responses = [] @@ -810,28 +872,30 @@ if (zs_icon_layer !== null) window.map.removeLayer(zs_icon_layer) zs_icon_layer = new mars3d.layer.GraphicLayer() window.map.addLayer(zs_icon_layer) - for (let i = 0; i < response.data.length; i++) { - zs_model_layer.addGraphic(new mars3d.graphic.ModelPrimitive({ - position: [response.data[i].longitude, response.data[i].latitude, 0], - style: { - url: '../static/model/zs.glb', - scale: 1, - heading: 90 - }, - popup: `供水泄露监测仪
设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` - })) - zs_icon_layer.addGraphic(new mars3d.graphic.BillboardEntity({ - id: response.data[i].devcode, - position: [response.data[i].longitude, response.data[i].latitude, 1], - style: { - image: '../static/images/icon/zs.png', - scale: 1, - horizontalOrigin: Cesium.HorizontalOrigin.CENTER, - verticalOrigin: Cesium.VerticalOrigin.BOTTOM, - scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3) - }, - popup: `供水泄露监测仪
设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` - })) + if (response.data.length > 0) { + for (let i = 0; i < response.data.length; i++) { + zs_model_layer.addGraphic(new mars3d.graphic.ModelPrimitive({ + position: [response.data[i].longitude, response.data[i].latitude, 0], + style: { + url: '../static/model/zs.glb', + scale: 1, + heading: 90 + }, + popup: `设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` + })) + zs_icon_layer.addGraphic(new mars3d.graphic.BillboardEntity({ + id: response.data[i].devcode, + position: [response.data[i].longitude, response.data[i].latitude, 1], + style: { + image: '../static/images/icon/zs.png', + scale: 1, + horizontalOrigin: Cesium.HorizontalOrigin.CENTER, + verticalOrigin: Cesium.VerticalOrigin.BOTTOM, + scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3) + }, + popup: `设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` + })) + } } this.refreshAlarm() } @@ -859,6 +923,7 @@ if (this.alarmList.length > 0) { this.hasAlarm = true } + this.filterAlarmList() for (const alarm of response.data) { for (const watch of watch_icon_layer.graphics) { if (alarm.devcode === watch.options.id) { diff --git a/src/views/jobManage/detailJob.vue b/src/views/jobManage/detailJob.vue index 2d6aaa4..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 1e0de1a..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/gasDashboard/components/PanelGroup.vue b/src/views/gasDashboard/components/PanelGroup.vue
index eead839..5613860 100644
--- a/src/views/gasDashboard/components/PanelGroup.vue
+++ b/src/views/gasDashboard/components/PanelGroup.vue
@@ -17,6 +17,7 @@
import Card from '@/components/BigData/Card'
// 首页
import { gasStatistic, deviceCount, alarmNowStatic } from '@/api/gasOverview'
+import { gasStatistic2 } from '../../../api/gasOverview'
export default {
components: {
Card,
@@ -26,40 +27,40 @@
return {
dataGroup1: [
{
- title: ['总用气量', '本月用气量'],
- context: ['--', '--'],
+ title: ['CO₂总用气量', 'CO₂本月用气量', 'CO₂今日用气量'],
+ context: ['--', '--', '--'],
icon: '',
color: '#40c9c6',
- unit: '吨',
+ unit: 'Nm³',
index: 0
},
{
- title: ['今日用气量', '生产厂区用气量'],
- context: ['--', '--'],
+ title: ['O₂总用气量', 'O₂本月用气量', 'O₂今日用气量'],
+ context: ['--', '--', '--'],
icon: '',
color: '#36a3f7',
- unit: '吨',
+ unit: 'Nm³',
index: 1
},
{
+ title: ['燃气总用气量', '燃气本月用气量', '燃气今日用气量'],
+ context: ['--', '--', '--'],
+ icon: '',
+ color: '#36a3f7',
+ unit: 'Nm³',
+ index: 2
+ },
+ {
title: ['滑道实时噪声'],
context: ['--'],
icon: 'icon-noise',
color: '#f1c353',
unit: 'db',
- index: 2
+ index: 3
}
],
dataGroup: [
{
- title: '气体流量计',
- context: '--',
- icon: 'icon-watch',
- color: '#9694f7',
- path: '/deviceList?deviceType=13',
- permission: '/device/list'
- },
- {
title: '告警信息',
context: '--',
icon: 'icon-alarm',
@@ -73,7 +74,7 @@
mounted() {
this.getWater()
// this.getWellCount()
- this.getDeviceCount()
+ // this.getDeviceCount()
this.getAlarmCount()
},
methods: {
@@ -83,19 +84,21 @@
getWater() {
// 用气量
gasStatistic().then(response => {
- this.dataGroup1[0].context = [response.data.total ? parseFloat(response.data.total).toFixed(2) : '--', response.data.month ? parseFloat(response.data.month).toFixed(2) : '--']
- this.dataGroup1[1].context = [response.data.today ? parseFloat(response.data.today).toFixed(2) : '--', response.data.prodution ? parseFloat(response.data.prodution).toFixed(2) : '--']
- this.dataGroup1[2].context = [response.data.sound ? Number(response.data.sound).toFixed(2) : '--']
+ this.dataGroup1[3].context = [response.data.sound ? Number(response.data.sound).toFixed(2) : '--']
})
- },
- getDeviceCount() {
- deviceCount('15').then(response => {
- this.dataGroup[0].context = response.data
+ gasStatistic2('15').then(response => {
+ this.dataGroup1[0].context = [response.data.total.toFixed(2), response.data.month.toFixed(2), response.data.day === '' ? '--' : response.data.day.toFixed(2)]
+ })
+ gasStatistic2('16').then(response => {
+ this.dataGroup1[1].context = [response.data.total.toFixed(2), response.data.month.toFixed(2), response.data.day === '' ? '--' : response.data.day.toFixed(2)]
+ })
+ gasStatistic2('17').then(response => {
+ this.dataGroup1[2].context = [response.data.total.toFixed(2), response.data.month.toFixed(2), response.data.day === '' ? '--' : response.data.day.toFixed(2)]
})
},
getAlarmCount() {
alarmNowStatic().then(response => {
- this.dataGroup[1].context = response.data.total
+ this.dataGroup[0].context = response.data.total
})
}
}
diff --git a/src/views/gasDashboard/components/alarmGasCountByDept.vue b/src/views/gasDashboard/components/alarmGasCountByDept.vue
deleted file mode 100644
index b8bfc23..0000000
--- a/src/views/gasDashboard/components/alarmGasCountByDept.vue
+++ /dev/null
@@ -1,73 +0,0 @@
-
-
-
-
-
-
-
-
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/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
index c144bc6..a410f29 100644
--- a/src/views/gasDashboard/components/corrodeCountByDay.vue
+++ b/src/views/gasDashboard/components/corrodeCountByDay.vue
@@ -45,11 +45,14 @@
},
extend: {
grid: {
- top: 120
+ top: 120,
+ left: 30
},
yAxis: {
+ position: 'left',
+ type: 'value',
name: '腐蚀率(%)',
- position: 'left'
+ nameRotate: '0.1'
},
legend: {
// type: 'scroll',
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/gasCountByDay.vue b/src/views/gasDashboard/components/gasCountByDay.vue
index 79a4efb..f0a3977 100644
--- a/src/views/gasDashboard/components/gasCountByDay.vue
+++ b/src/views/gasDashboard/components/gasCountByDay.vue
@@ -1,34 +1,33 @@
-
-
-
-
+
-
-
+
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
@@ -81,19 +69,23 @@
import DeviceCount from './components/DeviceCount'
import gasCountByDept from './components/gasCountByDept'
import gasCountByDay from './components/gasCountByDay'
-import gasCountByAreaBar from './components/gasCountByAreaBar'
+import gasCountByDeviceBar from './components/gasCountByDeviceBar'
import WatchAlarmBar from './components/watchAlarmBar'
import gasNote from './components/gasNote'
import AlarmCountByDept from './components/AlarmCountByDept'
import gasCompare from './components/gasCompare'
import watchGasAlarmBar from './components/watchGasAlarmBar'
-import alarmGasCountByDept from './components/alarmGasCountByDept'
+import alarmGasCountByType from './components/alarmGasCountByType'
import corrodeCountByDay from './components/corrodeCountByDay'
+import AlarmLeakCountPie from './components/alarmLeakCountPie'
+import GasAlarmTrend from './components/gasAlarmTrend'
export default {
name: 'Dashboard',
components: {
- gasCountByAreaBar,
+ GasAlarmTrend,
+ AlarmLeakCountPie,
+ gasCountByDeviceBar,
gasCountByDept,
gasCountByDay,
gasNote,
@@ -103,7 +95,7 @@
WatchAlarmBar,
AlarmCountByDept,
watchGasAlarmBar,
- alarmGasCountByDept,
+ alarmGasCountByType,
corrodeCountByDay
},
data() {
diff --git a/src/views/gasOverview/gasOverviewSimple.vue b/src/views/gasOverview/gasOverviewSimple.vue
index 585ab8a..764bf28 100644
--- a/src/views/gasOverview/gasOverviewSimple.vue
+++ b/src/views/gasOverview/gasOverviewSimple.vue
@@ -5,7 +5,7 @@
-
+
搜索
@@ -36,7 +36,7 @@
-
+
+
diff --git a/src/views/gasDashboard/index.vue b/src/views/gasDashboard/index.vue
index 6eb2d56..be583f2 100644
--- a/src/views/gasDashboard/index.vue
+++ b/src/views/gasDashboard/index.vue
@@ -2,72 +2,60 @@
+
告警列表
@@ -48,10 +48,10 @@
@@ -97,7 +97,11 @@
var rq_model_layer = null // 燃气模型层
var rq_icon_layer = null // 燃气图标层
var qt_model_layer = null // 气体流量计模型层
+var qt2_model_layer = null // 气体流量计模型层
+var qt3_model_layer = null // 气体流量计模型层
var qt_icon_layer = null // 气体流量计图标层
+var qt2_icon_layer = null // 气体流量计图标层
+var qt3_icon_layer = null // 气体流量计图标层
var fs_model_layer = null // 腐蚀速率监测仪模型层
var fs_icon_layer = null // 腐蚀速率监测仪图标层
export default {
@@ -106,7 +110,7 @@
data() {
return {
screenHeight: null,
- checkedCities: ['腐蚀速率监测仪', '气体流量计', '气体泄漏检测仪', '供水泄漏检测仪'],
+ checkedCities: ['腐蚀速率监测仪', '气体泄漏监测仪', '供水泄漏监测仪', 'CO2气体流量计', 'O2气体流量计', '燃气气体流量计'],
left: '',
mapMark: '-',
deviceTypeList: [], // 设备类型列表
@@ -161,6 +165,7 @@
wellTypeList: [], // 井类型列表
showDeptTree: 0, // 是否显示权属单位下拉,0不显示，1显示树，2显示平面
alarmList: [], // 报警列表
+ searchAlarmList: [],
timer: null,
deptShowTop: false, // 是否显示顶级
clock: null, // 计时器
@@ -247,12 +252,18 @@
if (item.indexOf('腐蚀速率监测仪') !== -1) {
this.wellMode()
this.fsModel()
- } else if (item.indexOf('气体流量计') !== -1) {
+ } else if (item.indexOf('CO2气体流量计') !== -1) {
this.wellMode()
this.qtModel()
- } else if (item.indexOf('气体泄漏检测仪') !== -1) {
+ } else if (item.indexOf('O2气体流量计') !== -1) {
+ this.wellMode()
+ this.qt02Model()
+ } else if (item.indexOf('燃气气体流量计') !== -1) {
+ this.wellMode()
+ this.qtgasModel()
+ } else if (item.indexOf('气体泄漏监测仪') !== -1) {
this.rqModel()
- } else if (item.indexOf('供水泄漏检测仪') !== -1) {
+ } else if (item.indexOf('供水泄漏监测仪') !== -1) {
this.wellMode()
this.zsMoel()
}
@@ -264,10 +275,14 @@
window.map.removeLayer(fs_model_layer)
window.map.removeLayer(rq_model_layer)
window.map.removeLayer(qt_model_layer)
+ window.map.removeLayer(qt2_model_layer)
+ window.map.removeLayer(qt3_model_layer)
window.map.removeLayer(fs_icon_layer)
window.map.removeLayer(zs_icon_layer)
window.map.removeLayer(rq_icon_layer)
window.map.removeLayer(qt_icon_layer)
+ window.map.removeLayer(qt2_icon_layer)
+ window.map.removeLayer(qt3_icon_layer)
window.map.removeLayer(well_model_layer)
},
// 获取设备类型
@@ -398,41 +413,6 @@
})
},
// 初始化街道、流向线
- // async initDrawLines() {
- // axios.get('./static/position.json').then((result) => {
- // const positions = result.data.positions
- // flow = new mars3d.layer.GraphicLayer()
- // window.map.addLayer(flow)
- // street = new mars3d.layer.GraphicLayer()
- // window.map.addLayer(street)
- // for (let j = 0; j < positions.length; j++) {
- // flow.addGraphic(this.addFlow(positions[j].items, positions[j].repeat))
- // street.addGraphic(this.addStreet(positions[j].items))
- // }
- // flow.show = false
- // }).catch((error) => {
- // console.log('get position error...' + error)
- // })
- // },
- // 流向线
- // addFlow(positions, repeat) {
- // console.log(positions, repeat, '====---1230')
- // var style = {
- // width: 10,
- // material: mars3d.MaterialUtil.createMaterialProperty(mars3d.MaterialType.LineFlow, {
- // color: '#215bd9',
- // repeat: new Cesium.Cartesian2(repeat, 1),
- // image: '../static/images/line.png',
- // speed: 15
- // })
- // }
- // var graphic = new mars3d.graphic.PolylineEntity({
- // positions: positions,
- // style: style
- // })
- // return graphic
- // },
- // 初始化街道、流向线
async initDrawLines() {
axios.get('./static/position2.json').then((result) => {
const positions = result.data.positions
@@ -533,12 +513,40 @@
})
return graphic
},
+ search() {
+ this.filterAlarmList()
+ this.initPoints()
+ },
+ // 过滤报警列表
+ filterAlarmList() {
+ const list = this.alarmList
+ const keywords = this.listQuery.keywords
+ if (keywords) { // 过滤井编号、设备编号
+ this.searchAlarmList = list.filter(item => {
+ let flag = false
+ if (item.wellCode.indexOf(keywords) > -1) {
+ flag = true
+ }
+ if (item.devcode.indexOf(keywords) > -1) {
+ flag = true
+ }
+ if (item.position.indexOf(keywords) > -1) {
+ flag = true
+ }
+ return flag
+ })
+ } else {
+ this.searchAlarmList = list
+ }
+ },
// 初始化井，设备
async initPoints() {
this.wellMode()
this.zsMoel()
this.rqModel()
this.qtModel()
+ this.qt02Model()
+ this.qtgasModel()
this.fsModel()
},
// 井
@@ -593,58 +601,10 @@
}
})
},
- // 远程水表（不展示）
- watchModel() {
- const params = '13'
- getMapping(params, this.listQuery.keywords).then(response => {
- // 过滤掉该单位不支持的设备(通过部门id)
- const deptIds = this.$store.getters.deptId
- const responses = []
- response.data.forEach(item => {
- if (item.deptid === deptIds) {
- responses.push(item)
- }
- })
- response.data = responses
- if (response.code === 200) {
- if (watch_model_layer !== null) window.map.removeLayer(watch_model_layer)
- watch_model_layer = new mars3d.layer.GraphicLayer()
- window.map.addLayer(watch_model_layer)
- if (watch_icon_layer !== null) window.map.removeLayer(watch_icon_layer)
- watch_icon_layer = new mars3d.layer.GraphicLayer()
- window.map.addLayer(watch_icon_layer)
- for (let i = 0; i < response.data.length; i++) {
- watch_model_layer.addGraphic(new mars3d.graphic.ModelPrimitive({
- position: [response.data[i].longitude, response.data[i].latitude, -0.5],
- style: {
- url: '../static/model/sb.glb',
- scale: 2,
- heading: 90
- },
- popup: `远程水表
设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` - })) - watch_icon_layer.addGraphic(new mars3d.graphic.BillboardEntity({ - id: response.data[i].devcode, - position: [response.data[i].longitude, response.data[i].latitude, 1], - style: { - image: '../static/images/icon/sb.png', - scale: 1, - horizontalOrigin: Cesium.HorizontalOrigin.CENTER, - verticalOrigin: Cesium.VerticalOrigin.BOTTOM, - scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3) - }, - popup: `远程水表
设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` - })) - } - this.refreshAlarm() - } - }) - }, // 腐蚀速率监测仪 fsModel() { const params = '14' getMapping(params, this.listQuery.keywords).then(response => { - console.log(response.data[0].latitude, '======腐蚀速率监测仪=======') // 过滤掉该单位不支持的设备(通过部门id) const deptIds = this.$store.getters.deptId const responses = [] @@ -662,29 +622,32 @@ if (fs_icon_layer !== null) window.map.removeLayer(fs_icon_layer) fs_icon_layer = new mars3d.layer.GraphicLayer() window.map.addLayer(fs_icon_layer) - for (let i = 0; i < response.data.length; i++) { - fs_model_layer.addGraphic(new mars3d.graphic.ModelPrimitive({ - position: [response.data[i].longitude, response.data[i].latitude, 0], - style: { - url: '../static/model/fs.glb', - scale: 1, - heading: 90 - }, - popup: `腐蚀速率监测仪
设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` - })) - fs_icon_layer.addGraphic(new mars3d.graphic.BillboardEntity({ - id: response.data[i].devcode, - position: [response.data[i].longitude, response.data[i].latitude, 1], - style: { - image: '../static/images/icon/fs.png', - scale: 1, - horizontalOrigin: Cesium.HorizontalOrigin.CENTER, - verticalOrigin: Cesium.VerticalOrigin.BOTTOM, - scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3) - }, - popup: `腐蚀速率监测仪
设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` - })) + if (response.data.length > 0) { + for (let i = 0; i < response.data.length; i++) { + fs_model_layer.addGraphic(new mars3d.graphic.ModelPrimitive({ + position: [response.data[i].longitude, response.data[i].latitude, 0], + style: { + url: '../static/model/fs.glb', + scale: 1, + heading: 90 + }, + popup: `设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` + })) + fs_icon_layer.addGraphic(new mars3d.graphic.BillboardEntity({ + id: response.data[i].devcode, + position: [response.data[i].longitude, response.data[i].latitude, 1], + style: { + image: '../static/images/icon/fs.png', + scale: 1, + horizontalOrigin: Cesium.HorizontalOrigin.CENTER, + verticalOrigin: Cesium.VerticalOrigin.BOTTOM, + scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3) + }, + popup: `设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` + })) + } } + this.refreshAlarm() } }) @@ -693,7 +656,6 @@ qtModel() { const params = '15' getMapping(params, this.listQuery.keywords).then(response => { - console.log(response.data[0].latitude, '======气体流量计=======') // 过滤掉该单位不支持的设备(通过部门id) const deptIds = this.$store.getters.deptId const responses = [] @@ -711,28 +673,128 @@ if (qt_icon_layer !== null) window.map.removeLayer(qt_icon_layer) qt_icon_layer = new mars3d.layer.GraphicLayer() window.map.addLayer(qt_icon_layer) - for (let i = 0; i < response.data.length; i++) { - qt_model_layer.addGraphic(new mars3d.graphic.ModelPrimitive({ - position: [response.data[i].longitude, response.data[i].latitude, 0], - style: { - url: '../static/model/qt.glb', - scale: 1, - heading: 90 - }, - popup: `气体流量计
设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` - })) - qt_icon_layer.addGraphic(new mars3d.graphic.BillboardEntity({ - id: response.data[i].devcode, - position: [response.data[i].longitude, response.data[i].latitude, 1], - style: { - image: '../static/images/icon/qt.png', - scale: 1, - horizontalOrigin: Cesium.HorizontalOrigin.CENTER, - verticalOrigin: Cesium.VerticalOrigin.BOTTOM, - scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3) - }, - popup: `气体流量计
设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` - })) + if (response.data.length > 0) { + for (let i = 0; i < response.data.length; i++) { + qt_model_layer.addGraphic(new mars3d.graphic.ModelPrimitive({ + position: [response.data[i].longitude, response.data[i].latitude, 0], + style: { + url: '../static/model/qt.glb', + scale: 1, + heading: 90 + }, + popup: `设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` + })) + qt_icon_layer.addGraphic(new mars3d.graphic.BillboardEntity({ + id: response.data[i].devcode, + position: [response.data[i].longitude, response.data[i].latitude, 1], + style: { + image: '../static/images/icon/qt.png', + scale: 1, + horizontalOrigin: Cesium.HorizontalOrigin.CENTER, + verticalOrigin: Cesium.VerticalOrigin.BOTTOM, + scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3) + }, + popup: `设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` + })) + } + } + this.refreshAlarm() + } + }) + }, + // 气体流量计 + qt02Model() { + const params = '16' + getMapping(params, this.listQuery.keywords).then(response => { + // 过滤掉该单位不支持的设备(通过部门id) + const deptIds = this.$store.getters.deptId + const responses = [] + response.data.forEach(item => { + if (item.deptid === deptIds) { + responses.push(item) + } + }) + response.data = responses + if (response.code === 200) { + if (qt2_model_layer !== null) window.map.removeLayer(qt2_model_layer) + qt2_model_layer = new mars3d.layer.GraphicLayer() + window.map.addLayer(qt2_model_layer) + if (qt2_icon_layer !== null) window.map.removeLayer(qt2_icon_layer) + qt2_icon_layer = new mars3d.layer.GraphicLayer() + window.map.addLayer(qt2_icon_layer) + if (response.data.length > 0) { + for (let i = 0; i < response.data.length; i++) { + qt2_model_layer.addGraphic(new mars3d.graphic.ModelPrimitive({ + position: [response.data[i].longitude, response.data[i].latitude, 0], + style: { + url: '../static/model/qt.glb', + scale: 1, + heading: 90 + }, + popup: `设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` + })) + qt2_icon_layer.addGraphic(new mars3d.graphic.BillboardEntity({ + id: response.data[i].devcode, + position: [response.data[i].longitude, response.data[i].latitude, 1], + style: { + image: '../static/images/icon/qt.png', + scale: 1, + horizontalOrigin: Cesium.HorizontalOrigin.CENTER, + verticalOrigin: Cesium.VerticalOrigin.BOTTOM, + scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3) + }, + popup: `设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` + })) + } + } + this.refreshAlarm() + } + }) + }, + // 气体流量计 + qtgasModel() { + const params = '17' + getMapping(params, this.listQuery.keywords).then(response => { + // 过滤掉该单位不支持的设备(通过部门id) + const deptIds = this.$store.getters.deptId + const responses = [] + response.data.forEach(item => { + if (item.deptid === deptIds) { + responses.push(item) + } + }) + response.data = responses + if (response.code === 200) { + if (qt3_model_layer !== null) window.map.removeLayer(qt3_model_layer) + qt3_model_layer = new mars3d.layer.GraphicLayer() + window.map.addLayer(qt3_model_layer) + if (qt3_icon_layer !== null) window.map.removeLayer(qt3_icon_layer) + qt3_icon_layer = new mars3d.layer.GraphicLayer() + window.map.addLayer(qt3_icon_layer) + if (response.data.length > 0) { + for (let i = 0; i < response.data.length; i++) { + qt3_model_layer.addGraphic(new mars3d.graphic.ModelPrimitive({ + position: [response.data[i].longitude, response.data[i].latitude, 0], + style: { + url: '../static/model/qt.glb', + scale: 1, + heading: 90 + }, + popup: `设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` + })) + qt3_icon_layer.addGraphic(new mars3d.graphic.BillboardEntity({ + id: response.data[i].devcode, + position: [response.data[i].longitude, response.data[i].latitude, 1], + style: { + image: '../static/images/icon/qt.png', + scale: 1, + horizontalOrigin: Cesium.HorizontalOrigin.CENTER, + verticalOrigin: Cesium.VerticalOrigin.BOTTOM, + scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3) + }, + popup: `设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` + })) + } } this.refreshAlarm() } @@ -742,7 +804,6 @@ rqModel() { const params = '4' getMapping(params, this.listQuery.keywords).then(response => { - console.log(response.data[0].latitude, '======气体泄露监测仪（原燃气）=======') // 过滤掉该单位不支持的设备(通过部门id) const deptIds = this.$store.getters.deptId const responses = [] @@ -760,28 +821,30 @@ if (rq_icon_layer !== null) window.map.removeLayer(rq_icon_layer) rq_icon_layer = new mars3d.layer.GraphicLayer() window.map.addLayer(rq_icon_layer) - for (let i = 0; i < response.data.length; i++) { - rq_model_layer.addGraphic(new mars3d.graphic.ModelPrimitive({ - position: [response.data[i].longitude, response.data[i].latitude, 0], - style: { - url: '../static/model/rq.glb', - scale: 1, - heading: 90 - }, - popup: `气体泄露监测仪
设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` - })) - rq_icon_layer.addGraphic(new mars3d.graphic.BillboardEntity({ - id: response.data[i].devcode, - position: [response.data[i].longitude, response.data[i].latitude, 1], - style: { - image: '../static/images/icon/rq.png', - scale: 1, - horizontalOrigin: Cesium.HorizontalOrigin.CENTER, - verticalOrigin: Cesium.VerticalOrigin.BOTTOM, - scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3) - }, - popup: `气体泄露监测仪
设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` - })) + if (response.data.length > 0) { + for (let i = 0; i < response.data.length; i++) { + rq_model_layer.addGraphic(new mars3d.graphic.ModelPrimitive({ + position: [response.data[i].longitude, response.data[i].latitude, 0], + style: { + url: '../static/model/rq.glb', + scale: 1, + heading: 90 + }, + popup: `设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` + })) + rq_icon_layer.addGraphic(new mars3d.graphic.BillboardEntity({ + id: response.data[i].devcode, + position: [response.data[i].longitude, response.data[i].latitude, 1], + style: { + image: '../static/images/icon/rq.png', + scale: 1, + horizontalOrigin: Cesium.HorizontalOrigin.CENTER, + verticalOrigin: Cesium.VerticalOrigin.BOTTOM, + scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3) + }, + popup: `设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` + })) + } } this.refreshAlarm() } @@ -791,7 +854,6 @@ zsMoel() { const params = '8' getMapping(params, this.listQuery.keywords).then(response => { - console.log(response.data[0].latitude, '======供水泄露监测仪（原噪声））=======') // 过滤掉该单位不支持的设备(通过部门id) const deptIds = this.$store.getters.deptId const responses = [] @@ -810,28 +872,30 @@ if (zs_icon_layer !== null) window.map.removeLayer(zs_icon_layer) zs_icon_layer = new mars3d.layer.GraphicLayer() window.map.addLayer(zs_icon_layer) - for (let i = 0; i < response.data.length; i++) { - zs_model_layer.addGraphic(new mars3d.graphic.ModelPrimitive({ - position: [response.data[i].longitude, response.data[i].latitude, 0], - style: { - url: '../static/model/zs.glb', - scale: 1, - heading: 90 - }, - popup: `供水泄露监测仪
设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` - })) - zs_icon_layer.addGraphic(new mars3d.graphic.BillboardEntity({ - id: response.data[i].devcode, - position: [response.data[i].longitude, response.data[i].latitude, 1], - style: { - image: '../static/images/icon/zs.png', - scale: 1, - horizontalOrigin: Cesium.HorizontalOrigin.CENTER, - verticalOrigin: Cesium.VerticalOrigin.BOTTOM, - scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3) - }, - popup: `供水泄露监测仪
设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` - })) + if (response.data.length > 0) { + for (let i = 0; i < response.data.length; i++) { + zs_model_layer.addGraphic(new mars3d.graphic.ModelPrimitive({ + position: [response.data[i].longitude, response.data[i].latitude, 0], + style: { + url: '../static/model/zs.glb', + scale: 1, + heading: 90 + }, + popup: `设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` + })) + zs_icon_layer.addGraphic(new mars3d.graphic.BillboardEntity({ + id: response.data[i].devcode, + position: [response.data[i].longitude, response.data[i].latitude, 1], + style: { + image: '../static/images/icon/zs.png', + scale: 1, + horizontalOrigin: Cesium.HorizontalOrigin.CENTER, + verticalOrigin: Cesium.VerticalOrigin.BOTTOM, + scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3) + }, + popup: `设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` + })) + } } this.refreshAlarm() } @@ -859,6 +923,7 @@ if (this.alarmList.length > 0) { this.hasAlarm = true } + this.filterAlarmList() for (const alarm of response.data) { for (const watch of watch_icon_layer.graphics) { if (alarm.devcode === watch.options.id) { diff --git a/src/views/jobManage/detailJob.vue b/src/views/jobManage/detailJob.vue index 2d6aaa4..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 1e0de1a..ac57f82 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -11,13 +11,13 @@ class="left-div" >
设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` - })) - watch_icon_layer.addGraphic(new mars3d.graphic.BillboardEntity({ - id: response.data[i].devcode, - position: [response.data[i].longitude, response.data[i].latitude, 1], - style: { - image: '../static/images/icon/sb.png', - scale: 1, - horizontalOrigin: Cesium.HorizontalOrigin.CENTER, - verticalOrigin: Cesium.VerticalOrigin.BOTTOM, - scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3) - }, - popup: `远程水表
设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` - })) - } - this.refreshAlarm() - } - }) - }, // 腐蚀速率监测仪 fsModel() { const params = '14' getMapping(params, this.listQuery.keywords).then(response => { - console.log(response.data[0].latitude, '======腐蚀速率监测仪=======') // 过滤掉该单位不支持的设备(通过部门id) const deptIds = this.$store.getters.deptId const responses = [] @@ -662,29 +622,32 @@ if (fs_icon_layer !== null) window.map.removeLayer(fs_icon_layer) fs_icon_layer = new mars3d.layer.GraphicLayer() window.map.addLayer(fs_icon_layer) - for (let i = 0; i < response.data.length; i++) { - fs_model_layer.addGraphic(new mars3d.graphic.ModelPrimitive({ - position: [response.data[i].longitude, response.data[i].latitude, 0], - style: { - url: '../static/model/fs.glb', - scale: 1, - heading: 90 - }, - popup: `腐蚀速率监测仪
设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` - })) - fs_icon_layer.addGraphic(new mars3d.graphic.BillboardEntity({ - id: response.data[i].devcode, - position: [response.data[i].longitude, response.data[i].latitude, 1], - style: { - image: '../static/images/icon/fs.png', - scale: 1, - horizontalOrigin: Cesium.HorizontalOrigin.CENTER, - verticalOrigin: Cesium.VerticalOrigin.BOTTOM, - scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3) - }, - popup: `腐蚀速率监测仪
设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` - })) + if (response.data.length > 0) { + for (let i = 0; i < response.data.length; i++) { + fs_model_layer.addGraphic(new mars3d.graphic.ModelPrimitive({ + position: [response.data[i].longitude, response.data[i].latitude, 0], + style: { + url: '../static/model/fs.glb', + scale: 1, + heading: 90 + }, + popup: `设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` + })) + fs_icon_layer.addGraphic(new mars3d.graphic.BillboardEntity({ + id: response.data[i].devcode, + position: [response.data[i].longitude, response.data[i].latitude, 1], + style: { + image: '../static/images/icon/fs.png', + scale: 1, + horizontalOrigin: Cesium.HorizontalOrigin.CENTER, + verticalOrigin: Cesium.VerticalOrigin.BOTTOM, + scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3) + }, + popup: `设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` + })) + } } + this.refreshAlarm() } }) @@ -693,7 +656,6 @@ qtModel() { const params = '15' getMapping(params, this.listQuery.keywords).then(response => { - console.log(response.data[0].latitude, '======气体流量计=======') // 过滤掉该单位不支持的设备(通过部门id) const deptIds = this.$store.getters.deptId const responses = [] @@ -711,28 +673,128 @@ if (qt_icon_layer !== null) window.map.removeLayer(qt_icon_layer) qt_icon_layer = new mars3d.layer.GraphicLayer() window.map.addLayer(qt_icon_layer) - for (let i = 0; i < response.data.length; i++) { - qt_model_layer.addGraphic(new mars3d.graphic.ModelPrimitive({ - position: [response.data[i].longitude, response.data[i].latitude, 0], - style: { - url: '../static/model/qt.glb', - scale: 1, - heading: 90 - }, - popup: `气体流量计
设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` - })) - qt_icon_layer.addGraphic(new mars3d.graphic.BillboardEntity({ - id: response.data[i].devcode, - position: [response.data[i].longitude, response.data[i].latitude, 1], - style: { - image: '../static/images/icon/qt.png', - scale: 1, - horizontalOrigin: Cesium.HorizontalOrigin.CENTER, - verticalOrigin: Cesium.VerticalOrigin.BOTTOM, - scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3) - }, - popup: `气体流量计
设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` - })) + if (response.data.length > 0) { + for (let i = 0; i < response.data.length; i++) { + qt_model_layer.addGraphic(new mars3d.graphic.ModelPrimitive({ + position: [response.data[i].longitude, response.data[i].latitude, 0], + style: { + url: '../static/model/qt.glb', + scale: 1, + heading: 90 + }, + popup: `设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` + })) + qt_icon_layer.addGraphic(new mars3d.graphic.BillboardEntity({ + id: response.data[i].devcode, + position: [response.data[i].longitude, response.data[i].latitude, 1], + style: { + image: '../static/images/icon/qt.png', + scale: 1, + horizontalOrigin: Cesium.HorizontalOrigin.CENTER, + verticalOrigin: Cesium.VerticalOrigin.BOTTOM, + scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3) + }, + popup: `设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` + })) + } + } + this.refreshAlarm() + } + }) + }, + // 气体流量计 + qt02Model() { + const params = '16' + getMapping(params, this.listQuery.keywords).then(response => { + // 过滤掉该单位不支持的设备(通过部门id) + const deptIds = this.$store.getters.deptId + const responses = [] + response.data.forEach(item => { + if (item.deptid === deptIds) { + responses.push(item) + } + }) + response.data = responses + if (response.code === 200) { + if (qt2_model_layer !== null) window.map.removeLayer(qt2_model_layer) + qt2_model_layer = new mars3d.layer.GraphicLayer() + window.map.addLayer(qt2_model_layer) + if (qt2_icon_layer !== null) window.map.removeLayer(qt2_icon_layer) + qt2_icon_layer = new mars3d.layer.GraphicLayer() + window.map.addLayer(qt2_icon_layer) + if (response.data.length > 0) { + for (let i = 0; i < response.data.length; i++) { + qt2_model_layer.addGraphic(new mars3d.graphic.ModelPrimitive({ + position: [response.data[i].longitude, response.data[i].latitude, 0], + style: { + url: '../static/model/qt.glb', + scale: 1, + heading: 90 + }, + popup: `设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` + })) + qt2_icon_layer.addGraphic(new mars3d.graphic.BillboardEntity({ + id: response.data[i].devcode, + position: [response.data[i].longitude, response.data[i].latitude, 1], + style: { + image: '../static/images/icon/qt.png', + scale: 1, + horizontalOrigin: Cesium.HorizontalOrigin.CENTER, + verticalOrigin: Cesium.VerticalOrigin.BOTTOM, + scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3) + }, + popup: `设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` + })) + } + } + this.refreshAlarm() + } + }) + }, + // 气体流量计 + qtgasModel() { + const params = '17' + getMapping(params, this.listQuery.keywords).then(response => { + // 过滤掉该单位不支持的设备(通过部门id) + const deptIds = this.$store.getters.deptId + const responses = [] + response.data.forEach(item => { + if (item.deptid === deptIds) { + responses.push(item) + } + }) + response.data = responses + if (response.code === 200) { + if (qt3_model_layer !== null) window.map.removeLayer(qt3_model_layer) + qt3_model_layer = new mars3d.layer.GraphicLayer() + window.map.addLayer(qt3_model_layer) + if (qt3_icon_layer !== null) window.map.removeLayer(qt3_icon_layer) + qt3_icon_layer = new mars3d.layer.GraphicLayer() + window.map.addLayer(qt3_icon_layer) + if (response.data.length > 0) { + for (let i = 0; i < response.data.length; i++) { + qt3_model_layer.addGraphic(new mars3d.graphic.ModelPrimitive({ + position: [response.data[i].longitude, response.data[i].latitude, 0], + style: { + url: '../static/model/qt.glb', + scale: 1, + heading: 90 + }, + popup: `设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` + })) + qt3_icon_layer.addGraphic(new mars3d.graphic.BillboardEntity({ + id: response.data[i].devcode, + position: [response.data[i].longitude, response.data[i].latitude, 1], + style: { + image: '../static/images/icon/qt.png', + scale: 1, + horizontalOrigin: Cesium.HorizontalOrigin.CENTER, + verticalOrigin: Cesium.VerticalOrigin.BOTTOM, + scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3) + }, + popup: `设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` + })) + } } this.refreshAlarm() } @@ -742,7 +804,6 @@ rqModel() { const params = '4' getMapping(params, this.listQuery.keywords).then(response => { - console.log(response.data[0].latitude, '======气体泄露监测仪（原燃气）=======') // 过滤掉该单位不支持的设备(通过部门id) const deptIds = this.$store.getters.deptId const responses = [] @@ -760,28 +821,30 @@ if (rq_icon_layer !== null) window.map.removeLayer(rq_icon_layer) rq_icon_layer = new mars3d.layer.GraphicLayer() window.map.addLayer(rq_icon_layer) - for (let i = 0; i < response.data.length; i++) { - rq_model_layer.addGraphic(new mars3d.graphic.ModelPrimitive({ - position: [response.data[i].longitude, response.data[i].latitude, 0], - style: { - url: '../static/model/rq.glb', - scale: 1, - heading: 90 - }, - popup: `气体泄露监测仪
设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` - })) - rq_icon_layer.addGraphic(new mars3d.graphic.BillboardEntity({ - id: response.data[i].devcode, - position: [response.data[i].longitude, response.data[i].latitude, 1], - style: { - image: '../static/images/icon/rq.png', - scale: 1, - horizontalOrigin: Cesium.HorizontalOrigin.CENTER, - verticalOrigin: Cesium.VerticalOrigin.BOTTOM, - scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3) - }, - popup: `气体泄露监测仪
设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` - })) + if (response.data.length > 0) { + for (let i = 0; i < response.data.length; i++) { + rq_model_layer.addGraphic(new mars3d.graphic.ModelPrimitive({ + position: [response.data[i].longitude, response.data[i].latitude, 0], + style: { + url: '../static/model/rq.glb', + scale: 1, + heading: 90 + }, + popup: `设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` + })) + rq_icon_layer.addGraphic(new mars3d.graphic.BillboardEntity({ + id: response.data[i].devcode, + position: [response.data[i].longitude, response.data[i].latitude, 1], + style: { + image: '../static/images/icon/rq.png', + scale: 1, + horizontalOrigin: Cesium.HorizontalOrigin.CENTER, + verticalOrigin: Cesium.VerticalOrigin.BOTTOM, + scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3) + }, + popup: `设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` + })) + } } this.refreshAlarm() } @@ -791,7 +854,6 @@ zsMoel() { const params = '8' getMapping(params, this.listQuery.keywords).then(response => { - console.log(response.data[0].latitude, '======供水泄露监测仪（原噪声））=======') // 过滤掉该单位不支持的设备(通过部门id) const deptIds = this.$store.getters.deptId const responses = [] @@ -810,28 +872,30 @@ if (zs_icon_layer !== null) window.map.removeLayer(zs_icon_layer) zs_icon_layer = new mars3d.layer.GraphicLayer() window.map.addLayer(zs_icon_layer) - for (let i = 0; i < response.data.length; i++) { - zs_model_layer.addGraphic(new mars3d.graphic.ModelPrimitive({ - position: [response.data[i].longitude, response.data[i].latitude, 0], - style: { - url: '../static/model/zs.glb', - scale: 1, - heading: 90 - }, - popup: `供水泄露监测仪
设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` - })) - zs_icon_layer.addGraphic(new mars3d.graphic.BillboardEntity({ - id: response.data[i].devcode, - position: [response.data[i].longitude, response.data[i].latitude, 1], - style: { - image: '../static/images/icon/zs.png', - scale: 1, - horizontalOrigin: Cesium.HorizontalOrigin.CENTER, - verticalOrigin: Cesium.VerticalOrigin.BOTTOM, - scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3) - }, - popup: `供水泄露监测仪
设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` - })) + if (response.data.length > 0) { + for (let i = 0; i < response.data.length; i++) { + zs_model_layer.addGraphic(new mars3d.graphic.ModelPrimitive({ + position: [response.data[i].longitude, response.data[i].latitude, 0], + style: { + url: '../static/model/zs.glb', + scale: 1, + heading: 90 + }, + popup: `设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` + })) + zs_icon_layer.addGraphic(new mars3d.graphic.BillboardEntity({ + id: response.data[i].devcode, + position: [response.data[i].longitude, response.data[i].latitude, 1], + style: { + image: '../static/images/icon/zs.png', + scale: 1, + horizontalOrigin: Cesium.HorizontalOrigin.CENTER, + verticalOrigin: Cesium.VerticalOrigin.BOTTOM, + scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3) + }, + popup: `设备编号：${response.data[i].devcode}
设备型号：${response.data[i].modelName}
设备类型：${response.data[i].deviceTypeName}
井编号：${response.data[i].wellCode}
所属单位：${response.data[i].deptName}
详细位置：${response.data[i].position}` + })) + } } this.refreshAlarm() } @@ -859,6 +923,7 @@ if (this.alarmList.length > 0) { this.hasAlarm = true } + this.filterAlarmList() for (const alarm of response.data) { for (const watch of watch_icon_layer.graphics) { if (alarm.devcode === watch.options.id) { diff --git a/src/views/jobManage/detailJob.vue b/src/views/jobManage/detailJob.vue index 2d6aaa4..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 1e0de1a..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/gasDashboard/components/PanelGroup.vue b/src/views/gasDashboard/components/PanelGroup.vue
index eead839..5613860 100644
--- a/src/views/gasDashboard/components/PanelGroup.vue
+++ b/src/views/gasDashboard/components/PanelGroup.vue
@@ -17,6 +17,7 @@
import Card from '@/components/BigData/Card'
// 首页
import { gasStatistic, deviceCount, alarmNowStatic } from '@/api/gasOverview'
+import { gasStatistic2 } from '../../../api/gasOverview'
export default {
components: {
Card,
@@ -26,40 +27,40 @@
return {
dataGroup1: [
{
- title: ['总用气量', '本月用气量'],
- context: ['--', '--'],
+ title: ['CO₂总用气量', 'CO₂本月用气量', 'CO₂今日用气量'],
+ context: ['--', '--', '--'],
icon: '',
color: '#40c9c6',
- unit: '吨',
+ unit: 'Nm³',
index: 0
},
{
- title: ['今日用气量', '生产厂区用气量'],
- context: ['--', '--'],
+ title: ['O₂总用气量', 'O₂本月用气量', 'O₂今日用气量'],
+ context: ['--', '--', '--'],
icon: '',
color: '#36a3f7',
- unit: '吨',
+ unit: 'Nm³',
index: 1
},
{
+ title: ['燃气总用气量', '燃气本月用气量', '燃气今日用气量'],
+ context: ['--', '--', '--'],
+ icon: '',
+ color: '#36a3f7',
+ unit: 'Nm³',
+ index: 2
+ },
+ {
title: ['滑道实时噪声'],
context: ['--'],
icon: 'icon-noise',
color: '#f1c353',
unit: 'db',
- index: 2
+ index: 3
}
],
dataGroup: [
{
- title: '气体流量计',
- context: '--',
- icon: 'icon-watch',
- color: '#9694f7',
- path: '/deviceList?deviceType=13',
- permission: '/device/list'
- },
- {
title: '告警信息',
context: '--',
icon: 'icon-alarm',
@@ -73,7 +74,7 @@
mounted() {
this.getWater()
// this.getWellCount()
- this.getDeviceCount()
+ // this.getDeviceCount()
this.getAlarmCount()
},
methods: {
@@ -83,19 +84,21 @@
getWater() {
// 用气量
gasStatistic().then(response => {
- this.dataGroup1[0].context = [response.data.total ? parseFloat(response.data.total).toFixed(2) : '--', response.data.month ? parseFloat(response.data.month).toFixed(2) : '--']
- this.dataGroup1[1].context = [response.data.today ? parseFloat(response.data.today).toFixed(2) : '--', response.data.prodution ? parseFloat(response.data.prodution).toFixed(2) : '--']
- this.dataGroup1[2].context = [response.data.sound ? Number(response.data.sound).toFixed(2) : '--']
+ this.dataGroup1[3].context = [response.data.sound ? Number(response.data.sound).toFixed(2) : '--']
})
- },
- getDeviceCount() {
- deviceCount('15').then(response => {
- this.dataGroup[0].context = response.data
+ gasStatistic2('15').then(response => {
+ this.dataGroup1[0].context = [response.data.total.toFixed(2), response.data.month.toFixed(2), response.data.day === '' ? '--' : response.data.day.toFixed(2)]
+ })
+ gasStatistic2('16').then(response => {
+ this.dataGroup1[1].context = [response.data.total.toFixed(2), response.data.month.toFixed(2), response.data.day === '' ? '--' : response.data.day.toFixed(2)]
+ })
+ gasStatistic2('17').then(response => {
+ this.dataGroup1[2].context = [response.data.total.toFixed(2), response.data.month.toFixed(2), response.data.day === '' ? '--' : response.data.day.toFixed(2)]
})
},
getAlarmCount() {
alarmNowStatic().then(response => {
- this.dataGroup[1].context = response.data.total
+ this.dataGroup[0].context = response.data.total
})
}
}
diff --git a/src/views/gasDashboard/components/alarmGasCountByDept.vue b/src/views/gasDashboard/components/alarmGasCountByDept.vue
deleted file mode 100644
index b8bfc23..0000000
--- a/src/views/gasDashboard/components/alarmGasCountByDept.vue
+++ /dev/null
@@ -1,73 +0,0 @@
-
-
-
-
-
-
-
-
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/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
index c144bc6..a410f29 100644
--- a/src/views/gasDashboard/components/corrodeCountByDay.vue
+++ b/src/views/gasDashboard/components/corrodeCountByDay.vue
@@ -45,11 +45,14 @@
},
extend: {
grid: {
- top: 120
+ top: 120,
+ left: 30
},
yAxis: {
+ position: 'left',
+ type: 'value',
name: '腐蚀率(%)',
- position: 'left'
+ nameRotate: '0.1'
},
legend: {
// type: 'scroll',
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/gasCountByDay.vue b/src/views/gasDashboard/components/gasCountByDay.vue
index 79a4efb..f0a3977 100644
--- a/src/views/gasDashboard/components/gasCountByDay.vue
+++ b/src/views/gasDashboard/components/gasCountByDay.vue
@@ -1,34 +1,33 @@
-
-
-
-
+
-
+
+
diff --git a/src/views/gasDashboard/index.vue b/src/views/gasDashboard/index.vue
index 6eb2d56..be583f2 100644
--- a/src/views/gasDashboard/index.vue
+++ b/src/views/gasDashboard/index.vue
@@ -2,72 +2,60 @@