From 096190dfd5b6c0d3ff7ef0f95ea7885f85730f47 Mon Sep 17 00:00:00 2001
From: wangqi <magical1908@outlook.com>
Date: 星期一, 29 三月 2021 11:12:37 +0800
Subject: [PATCH] 废气点动态加载
---
src/components/BaseNav/SolidWaste/SolidWaste.js | 2
src/api/request.js | 28 +++++---------
src/components/flueGas/flueGas.js | 10 ++--
src/utils/axios.js | 2
src/views/MapTemplate.vue | 27 ++++++++++---
5 files changed, 37 insertions(+), 32 deletions(-)
diff --git a/src/api/request.js b/src/api/request.js
index a27be63..c3ce5bf 100644
--- a/src/api/request.js
+++ b/src/api/request.js
@@ -1,5 +1,6 @@
import $http from '@utils/axios'
import Qs from 'qs'
+// import axios from 'axios'
export const QueryStoragePlaceListByCompanyAndName = (data = {}) => {
return $http.post('/EPInterface/DataService/EPMapService.asmx/QueryStoragePlaceListByCompanyAndName', Qs.stringify(data), {
@@ -8,22 +9,13 @@
}
})
}
-export const FlueGas = (url) => {
- return $http.get('./static/airQuality.json')
-}
-// export function FlueGas () {
-// return axios.post('http://10.246.162.140:8080/EPInterface/DataService/EPMapService.asmx/ObtainningConInfo', {
-// companyId: 3900100145,
-// id: '',
-// monType: 2,
-// userCode: 'wenchun.deng',
-// monDuration: '',
-// epName: '',
-// secdDeptId: '',
-// contrLevel: '',
-// dataStatus: '',
-// dataFlag: '',
-// runStatus: '',
-// emissTypeId: ''
-// })
+// export const FlueGas = (url) => {
+// return $http.get('./static/airQuality.json')
// }
+export function FlueGas (data = {}) {
+ return $http.post('EPInterface/DataService/EPMapService.asmx/ObtainningConInfo', Qs.stringify(data), {
+ headers: {
+ 'Content-Type': 'application/json'
+ }
+ })
+}
diff --git a/src/components/BaseNav/SolidWaste/SolidWaste.js b/src/components/BaseNav/SolidWaste/SolidWaste.js
index 8968cc9..b9be819 100644
--- a/src/components/BaseNav/SolidWaste/SolidWaste.js
+++ b/src/components/BaseNav/SolidWaste/SolidWaste.js
@@ -18,7 +18,7 @@
// 璇锋眰鏁版嵁 data 涓哄弬鏁帮紝 璇锋眰鍚庡彴鏁版嵁鏃� 鎼哄甫data鍙傛暟
requestData (data) {
QueryStoragePlaceListByCompanyAndName(data).then(res => {
- console.log(res)
+ // console.log(res)
this.DrawTheSolidWasteContent(res.Result.DataInfo)
}).catch(err => {
console.log(err)
diff --git a/src/components/flueGas/flueGas.js b/src/components/flueGas/flueGas.js
index ab62d6a..eef18b1 100644
--- a/src/components/flueGas/flueGas.js
+++ b/src/components/flueGas/flueGas.js
@@ -15,8 +15,8 @@
}
// 鑾峰彇鏁版嵁
- requestData () {
- FlueGas().then(res => {
+ requestData (data) {
+ FlueGas(data).then(res => {
console.log(res)
this.DrawFlueGasContent(res.Result.DataInfo)
}).catch(err => {
@@ -35,8 +35,8 @@
}
for (let i = 0; i < data.length; i++) {
// 缁忕含搴� 浣嶇疆
- const positionX = data[i].positionX
- const positionY = data[i].positionY
+ const positionX = data[i].Latitude
+ const positionY = data[i].Longitude
// 鍒ゆ柇 缁忕含搴︿綅缃俊鎭槸鍚﹀瓨鍦�
// if (positionX != null && positionY != null) {
@@ -116,7 +116,7 @@
// 鑴夊啿鏁堟灉璁剧疆瀹炵幇
EffectOfPulse (position, markers, layerGroup) {
// // 鍖哄垎鐩存帴鎵ц 鍜屽垽鏂墽琛岀殑涓嶅悓鍖哄埆
- var differentColor = ''
+ let differentColor = ''
if (markers) {
differentColor = '#ff0000'
} else {
diff --git a/src/utils/axios.js b/src/utils/axios.js
index 69078ed..7f944e8 100644
--- a/src/utils/axios.js
+++ b/src/utils/axios.js
@@ -83,7 +83,7 @@
// 鍒涘缓axios瀹炰緥
const Service = axios.create({
- timeout: 1000,
+ timeout: 5000,
baseURL: 'http://10.246.162.140:8080/'
})
diff --git a/src/views/MapTemplate.vue b/src/views/MapTemplate.vue
index 2e804f4..beae13e 100644
--- a/src/views/MapTemplate.vue
+++ b/src/views/MapTemplate.vue
@@ -20,7 +20,7 @@
<!-- <SolidContent ref="SolidWastePopup"></SolidContent>-->
<el-button type="primary" @click="AddGasHelper" class="flue-gas">搴熸皵</el-button>
<popup-gas ref="FlueGas"></popup-gas>
- <public-bouncedounced ref="PublicBounced"></public-bouncedounced>
+ <PublicBounced ref="PublicBounced"></PublicBounced>
</div>
</template>
@@ -46,8 +46,7 @@
import AddGasHelper from '@components/flueGas/flueGas'
import PopupGas from '@/components/flueGas/popup-gas'
// // 鍏叡灞曠ず鏁版嵁
-// import PublicBounced from '@components/BaseNav/PublicBounced/PublicBounced'
-
+import PublicBounced from '@components/BaseNav/PublicBounced/PublicBounced'
export default {
name: 'MapTemplate',
components: {
@@ -63,8 +62,8 @@
Popup,
summarySheets,
// SolidContent,
- PopupGas
- // PublicBounced
+ PopupGas,
+ PublicBounced
},
data () {
return {
@@ -88,9 +87,23 @@
},
methods: {
AddGasHelper () {
+ const data = {
+ companyId: 3900100145,
+ id: '',
+ monType: 2,
+ userCode: 'wenchun.deng',
+ monDuration: '',
+ epName: '',
+ secdDeptId: '',
+ contrLevel: '',
+ dataStatus: '',
+ dataFlag: '',
+ runStatus: '',
+ emissTypeId: ''
+ }
const AddGas = new AddGasHelper({ map: this.map })
- AddGas.requestData()
- AddGas.SetPlueGasContent(this.config, this.$refs.FlueGas)
+ AddGas.requestData(data)
+ AddGas.SetPlueGasContent(this.config, this.$refs.PublicBounced)
},
ChangeState () {
const data = {
--
Gitblit v1.8.0