diff --git a/src/views/dashboard/components/watchAlarmBar.vue b/src/views/dashboard/components/watchAlarmBar.vue
index 5fe709d..867ad8d 100644
--- a/src/views/dashboard/components/watchAlarmBar.vue
+++ b/src/views/dashboard/components/watchAlarmBar.vue
@@ -3,31 +3,31 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
@@ -38,16 +38,16 @@
import { alarmBySecondArea } from '@/api/overview'
import { getDayTime } from '@/utils/dateutils'
import { getDoorAreaTree } from '@/api/system/area'
-import FunctionArea from "./FunctionArea";
+import FunctionArea from './FunctionArea'
export default {
name: 'WatchAlarmBar',
- components: {FunctionArea},
+ components: { FunctionArea },
data() {
return {
- title:{
+ title: {
text: '水表告警统计'
},
- chartSettings:{
+ chartSettings: {
itemStyle: {
barCategoryGap: 0
},
@@ -85,7 +85,7 @@
series: {
label: { show: true, position: 'top', formatter: '{c}' },
barWidth: 20
- },
+ }
// tooltip: { trigger: 'item', formatter: '{b}
报警次数：{c}次' }
},
areaId: '',
@@ -137,14 +137,14 @@
fetchData(timeRange) {
const params = {
areaId: '110000',
- startTime: timeRange[0],
- endTime: timeRange[1]
+ startTime: timeRange[0] + ' 00:00:00',
+ endTime: timeRange[1] + ' 23:59:59'
}
this.$emit('change', params)
alarmBySecondArea(params).then(response => {
this.isShow = false
this.chartData.rows = response.data
- const maxValue = Math.max.apply(Math, response.data.map(item=> {return item.alarm>item.warning?item.alarm: item.warning}))
+ const maxValue = Math.max.apply(Math, response.data.map(item => { return item.alarm > item.warning ? item.alarm : item.warning }))
if (maxValue < 10) {
this.extend.yAxis.max = 10
} else {
diff --git a/src/views/dashboard/components/watchAlarmBar.vue b/src/views/dashboard/components/watchAlarmBar.vue
index 5fe709d..867ad8d 100644
--- a/src/views/dashboard/components/watchAlarmBar.vue
+++ b/src/views/dashboard/components/watchAlarmBar.vue
@@ -3,31 +3,31 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
@@ -38,16 +38,16 @@
import { alarmBySecondArea } from '@/api/overview'
import { getDayTime } from '@/utils/dateutils'
import { getDoorAreaTree } from '@/api/system/area'
-import FunctionArea from "./FunctionArea";
+import FunctionArea from './FunctionArea'
export default {
name: 'WatchAlarmBar',
- components: {FunctionArea},
+ components: { FunctionArea },
data() {
return {
- title:{
+ title: {
text: '水表告警统计'
},
- chartSettings:{
+ chartSettings: {
itemStyle: {
barCategoryGap: 0
},
@@ -85,7 +85,7 @@
series: {
label: { show: true, position: 'top', formatter: '{c}' },
barWidth: 20
- },
+ }
// tooltip: { trigger: 'item', formatter: '{b}
报警次数：{c}次' }
},
areaId: '',
@@ -137,14 +137,14 @@
fetchData(timeRange) {
const params = {
areaId: '110000',
- startTime: timeRange[0],
- endTime: timeRange[1]
+ startTime: timeRange[0] + ' 00:00:00',
+ endTime: timeRange[1] + ' 23:59:59'
}
this.$emit('change', params)
alarmBySecondArea(params).then(response => {
this.isShow = false
this.chartData.rows = response.data
- const maxValue = Math.max.apply(Math, response.data.map(item=> {return item.alarm>item.warning?item.alarm: item.warning}))
+ const maxValue = Math.max.apply(Math, response.data.map(item => { return item.alarm > item.warning ? item.alarm : item.warning }))
if (maxValue < 10) {
this.extend.yAxis.max = 10
} else {
diff --git a/src/views/gasOverview/gasOverviewSimple.vue b/src/views/gasOverview/gasOverviewSimple.vue
index 5691e51..764bf28 100644
--- a/src/views/gasOverview/gasOverviewSimple.vue
+++ b/src/views/gasOverview/gasOverviewSimple.vue
@@ -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: [], // 设备类型列表
@@ -248,9 +252,15 @@
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('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) {
@@ -265,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)
},
// 获取设备类型
@@ -531,6 +545,8 @@
this.zsMoel()
this.rqModel()
this.qtModel()
+ this.qt02Model()
+ this.qtgasModel()
this.fsModel()
},
// 井
@@ -686,6 +702,104 @@
}
})
},
+ // 气体流量计
+ 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()
+ }
+ })
+ },
// 气体泄露监测仪（原燃气）
rqModel() {
const params = '4'