From cd30be52166abfb113629434cbf3ef8a611c7b7d Mon Sep 17 00:00:00 2001
From: 陈泽平 <chenzeping>
Date: 星期五, 28 五月 2021 16:41:01 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/LayerController/logic/EnvironmentRisk.js | 30 ++++++++++-----
src/utils/axios.js | 5 +-
src/api/mapApi.js | 9 ++--
src/components/LayerController/logic/WasteWater.js | 15 +++++++
src/components/base-page/WasteWater/Detail.vue | 15 ++++++-
src/components/base-page/WasteWater/WasteWaterDayChart.vue | 3 +
src/api/mapUrl.js | 6 +-
src/components/base-page/WasteWater/WasteWaterHoursChart.vue | 21 ++++++----
8 files changed, 74 insertions(+), 30 deletions(-)
diff --git a/src/api/mapApi.js b/src/api/mapApi.js
index 62bd5f3..1d73ab5 100644
--- a/src/api/mapApi.js
+++ b/src/api/mapApi.js
@@ -4,6 +4,7 @@
// 娴嬭瘯鐜IP锛歨ttp://10.238.221.113
import axios from '@utils/axios'
import * as mapUrl from './mapUrl'
+import qs from 'qs' // 瑙ｆ瀽鍙傛暟
/**
* 璇ユ柟娉曢厤缃�
@@ -46,19 +47,19 @@
},
// 搴熸按鐐�
getWasteWater (data) {
- return axios.get(mapUrl.getWasteWater, data)
+ return axios.post(mapUrl.getWasteWater, qs.stringify(data), { 'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8' })
},
// 搴熸按鐐规槑缁嗚〃
getWasteWaterMonitoringDetails (data) {
return axios.get(mapUrl.getWasteWaterMonitoringDetails, data)
},
// 搴熸按鏃ユ暟鎹拰灏忔椂鏁版嵁鍙婃槑缁嗚〃
- getQueryOnlineMonData (data) {
- return axios.get(mapUrl.getQueryOnlineMonData, data)
+ getQueryOnlineMonData (data, setHeaders) {
+ return axios.post(mapUrl.getQueryOnlineMonData, qs.stringify(data), { 'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8' })
},
// 搴熸按浜哄伐鏁版嵁
getQueryLabMonData (data) {
- return axios.get(mapUrl.getQueryLabMonData, data)
+ return axios.post(mapUrl.getQueryLabMonData, qs.stringify(data), { 'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8' })
},
// 搴熸按瀹炴椂鏁版嵁
getDataItems (data) {
diff --git a/src/api/mapUrl.js b/src/api/mapUrl.js
index b29d8aa..4ce8883 100644
--- a/src/api/mapUrl.js
+++ b/src/api/mapUrl.js
@@ -19,11 +19,11 @@
export const getWasteGasManualData = $HOST + '/wasteGas/QueryLabMonData'
// 搴熸按
-export const getWasteWater = $HOST + '/wasteWater/getWasteWater' // 搴熸按鐐逛俊鎭�
+export const getWasteWater = 'http://10.246.162.140:8080/EPInterface/DataService/EPMapService.asmx/ObtainningConInfo' // 搴熸按鐐逛俊鎭�
export const getWasteWaterMonitoring = $HOST + '/wasteWater/getWasteWaterMonitoring' // 搴熸按鐩戞祴鏁版嵁
export const getWasteWaterMonitoringDetails = $HOST + '/wasteWater/getWasteWaterMonitoringDetails' // 搴熸按鐩戞祴鏁版嵁鏄庣粏琛�
-export const getQueryOnlineMonData = $HOST + '/wasteWater/QueryOnlineMonData' // 搴熸按鏃ユ暟鎹皬鏃舵暟鎹強鏄庣粏琛ㄦ暟鎹�
-export const getQueryLabMonData = $HOST + '/wasteWater/QueryLabMonData' // 浜哄伐鏁版嵁
+export const getQueryOnlineMonData = 'http://10.246.162.140:8080/EPInterface/DataService/EPMapService.asmx/QueryOnlineMonData' // 搴熸按鏃ユ暟鎹皬鏃舵暟鎹強鏄庣粏琛ㄦ暟鎹�
+export const getQueryLabMonData = 'http://10.246.162.140:8080/EPInterface/DataService/EPMapService.asmx/QueryLabMonData' // 浜哄伐鏁版嵁
export const getDataItems = $HOST + '/wasteWater/RTDB/DataItems' // 瀹炴椂鏁版嵁
// 鍏徃
diff --git a/src/components/LayerController/logic/EnvironmentRisk.js b/src/components/LayerController/logic/EnvironmentRisk.js
index df5cc76..e7478e7 100644
--- a/src/components/LayerController/logic/EnvironmentRisk.js
+++ b/src/components/LayerController/logic/EnvironmentRisk.js
@@ -11,6 +11,8 @@
const echarts = require('echarts/lib/echarts')
module.exports = function () {
+ // 瀛樻斁鐜舰鍥剧殑鏁扮粍
+ let riskLayerGroup = []
/**
* 杩斿洖marker瀵硅薄鏁扮粍
* @param L leaflet瀵硅薄
@@ -20,6 +22,11 @@
L: L,
layer: layer
})
+ layer.addLayer(riskLayerGroup)
+ }
+
+ this.start = async () => {
+ riskLayerGroup = window.layerFactory.L.featureGroup().addTo(window.layerFactory.map)
const result = await mapApi.getRiskEnterprise()
const features = result.features
for (var i = 0; i < features.length; i++) {
@@ -33,25 +40,30 @@
if (distract !== '闀挎睙娌跨嚎') {
continue
}
- const bgMarker = L.marker([coordinates[1], coordinates[0]], {
- icon: L.divIcon({
+ window.layerFactory.L.marker([coordinates[1], coordinates[0]], {
+ icon: this.animalService.L.divIcon({
className: '',
iconAnchor: [15, 45],
iconSize: [40, 40],
html: '<div style="width: 40px; height: 40px; background-color: rgba(255,255,255,1); position: relative; border-radius: 50%;"></div>'
})
- })
- layer.addLayer(bgMarker)
- const chartMarker = L.marker([coordinates[1], coordinates[0]], {
- icon: L.divIcon({
+ }).addTo(riskLayerGroup)
+ // this.animalService.layer.addLayer(bgMarker)
+ window.layerFactory.L.marker([coordinates[1], coordinates[0]], {
+ icon: this.animalService.L.divIcon({
className: '',
iconAnchor: [30, 60],
iconSize: [70, 70],
html: '<div id="qy_id_' + qyId + '" style="width: 70px; height: 70px; background-color: transparent; position: relative; border-radius: 50%;"></div>'
})
- })
- layer.addLayer(chartMarker)
+ }).addTo(riskLayerGroup)
chartRender(properties)
+ }
+ }
+
+ this.destory = () => {
+ if (riskLayerGroup) {
+ riskLayerGroup.remove()
}
}
@@ -61,7 +73,6 @@
* @returns {string}
*/
this.bindTooltip = (layer) => {
-
}
/**
@@ -69,7 +80,6 @@
* @param e
*/
this.clickListener = (e) => {
-
}
/**
diff --git a/src/components/LayerController/logic/WasteWater.js b/src/components/LayerController/logic/WasteWater.js
index 09cc1f9..29658e1 100644
--- a/src/components/LayerController/logic/WasteWater.js
+++ b/src/components/LayerController/logic/WasteWater.js
@@ -27,7 +27,20 @@
L: L,
layer: layer
})
- const res = await mapApi.getWasteWater()
+ const res = await mapApi.getWasteWater({
+ companyId: 3900100145, // 浼佷笟鍚嶇О
+ id: '',
+ monType: 1, // 鍊间负1鏌ヨ搴熸按
+ userCode: 'wenchun.deng', // 瑙掕壊鍚嶇О
+ monDuration: '',
+ epName: '',
+ secdDeptId: '',
+ contrLevel: '',
+ dataStatus: '',
+ dataFlag: '',
+ runStatus: '',
+ emissTypeId: ''
+ })
const data = res.Result.DataInfo || {}
for (let i = 0; i < data.length; i++) {
// 缁忕含搴� 浣嶇疆
diff --git a/src/components/base-page/WasteWater/Detail.vue b/src/components/base-page/WasteWater/Detail.vue
index 5dc823d..91a92be 100644
--- a/src/components/base-page/WasteWater/Detail.vue
+++ b/src/components/base-page/WasteWater/Detail.vue
@@ -62,8 +62,20 @@
methods: {
async initdetail () {
const timeEnd = dayjs().format('YYYY-MM-DD HH:mm:ss')
- const timeStart = dayjs().subtract(3, 'minute').format('YYYY-MM-DD HH:mm:ss')
+ var timeStart = null
+ var oDate = new Date()
+ var year = oDate.getFullYear()
+ if ((year % 4 === 0 && year % 100 !== 0) || year % 400 === 0) { // 鍒ゆ柇鏄钩骞磋繕鏄棸骞�
+ timeStart = dayjs().subtract(366, 'day').format('YYYY-MM-DD HH:mm:ss')
+ } else {
+ timeStart = dayjs().subtract(365, 'day').format('YYYY-MM-DD HH:mm:ss')
+ }
const data = {
+ poltSourceId: '',
+ poltMtrlId: '',
+ companyCode: '',
+ emissTypeId: '',
+ monItemId: 28,
companyId: 3900100145,
labMonPointId: 219,
beginTime: timeStart,
@@ -73,7 +85,6 @@
// console.log(result)
this.tableData = result
for (let i = 0; i < result.length; i++) {
- console.log(result[i].LabMonValue)
if (result[i].LabMonValue === '0') {
return '-'
}
diff --git a/src/components/base-page/WasteWater/WasteWaterDayChart.vue b/src/components/base-page/WasteWater/WasteWaterDayChart.vue
index 02244e7..1fcb2c9 100644
--- a/src/components/base-page/WasteWater/WasteWaterDayChart.vue
+++ b/src/components/base-page/WasteWater/WasteWaterDayChart.vue
@@ -100,6 +100,9 @@
},
async draw24Chart () {
const data = {
+ poltSourceId: '',
+ poltMtrlId: '',
+ emissTypeId: '',
onLineMonEmissPointId: 23,
monItemId: 28,
beginTime: this.formData.timeStart,
diff --git a/src/components/base-page/WasteWater/WasteWaterHoursChart.vue b/src/components/base-page/WasteWater/WasteWaterHoursChart.vue
index 765f402..2acfe80 100644
--- a/src/components/base-page/WasteWater/WasteWaterHoursChart.vue
+++ b/src/components/base-page/WasteWater/WasteWaterHoursChart.vue
@@ -79,8 +79,8 @@
formData: {
region: '25',
regionList: [25, 50, 75, 100],
- startTime: dayjs().subtract(16, 'hour').format('YYYY-MM-DD HH'),
- endTime: dayjs().format('YYYY-MM-DD HH')
+ startTime: dayjs().subtract(24, 'hour').format('YYYY-MM-DD HH:mm:ss'),
+ endTime: dayjs().format('YYYY-MM-DD HH:mm:ss')
},
chart: null,
jcdID: 1,
@@ -101,6 +101,9 @@
// 鍒濆鍖栨暟鎹姹�
async draw24Chart () {
const data = {
+ poltSourceId: '',
+ poltMtrlId: '',
+ emissTypeId: '',
onLineMonEmissPointId: 23,
monItemId: 28,
beginTime: this.formData.startTime,
@@ -327,12 +330,14 @@
biaozhuiz = bzzList[i].bzhui
}
}
- if (c.value[1] > biaozhuiz) {
- return zdcbcolor
- } else if (c.value[1] > biaozhuiz * 0.9) {
- return '#FFA500'
- } else {
- return '#33c95f'
+ if (c.value) {
+ if (c.value[1] > biaozhuiz) {
+ return zdcbcolor
+ } else if (c.value[1] > biaozhuiz * 0.9) {
+ return '#FFA500'
+ } else {
+ return '#33c95f'
+ }
}
},
lineStyle: { // 鎶樼嚎鐨勯鑹�
diff --git a/src/utils/axios.js b/src/utils/axios.js
index 47300fe..cca3604 100644
--- a/src/utils/axios.js
+++ b/src/utils/axios.js
@@ -191,11 +191,12 @@
params: $T.filterParams(params)
})
}
-$http.post = function (url, data = {}) {
+$http.post = function (url, data = {}, setHeaders) {
return Service({
url: url,
method: 'post',
- data: data
+ data: data,
+ headers: setHeaders || { 'Content-Type': 'application/json; charset=UTF-8' }
})
}
$http.put = function (url, data = {}) {
--
Gitblit v1.8.0