From f9201f16652d1e58d649afaf0c5d025031c52c3f Mon Sep 17 00:00:00 2001
From: chenzeping <ChenZeping02609@163.com>
Date: 星期三, 31 三月 2021 11:16:25 +0800
Subject: [PATCH] 更改文件地址/及方法
---
/dev/null | 117 -----------------------------
src/conf/MapConfig.js | 3
src/api/mapApi.js | 4 +
src/api/mapUrl.js | 2
src/components/BaseNav/PublicBounced/PublicBounced.vue | 7 +
public/assets/images/map/solidwaste/voc.png | 0
public/assets/images/map/solidwaste/gf_green.png | 0
src/components/LayerController/logic/SolidWaste.js | 65 ++++++++++-----
8 files changed, 54 insertions(+), 144 deletions(-)
diff --git a/src/assets/images/map-pages/basenav/solidwaste/gf_green.png b/public/assets/images/map/solidwaste/gf_green.png
similarity index 100%
rename from src/assets/images/map-pages/basenav/solidwaste/gf_green.png
rename to public/assets/images/map/solidwaste/gf_green.png
Binary files differ
diff --git a/src/assets/images/map-pages/basenav/solidwaste/voc.png b/public/assets/images/map/solidwaste/voc.png
similarity index 100%
rename from src/assets/images/map-pages/basenav/solidwaste/voc.png
rename to public/assets/images/map/solidwaste/voc.png
Binary files differ
diff --git a/public/static/WasteWater.json b/public/static/WasteWater.json
deleted file mode 100644
index 44ed223..0000000
--- a/public/static/WasteWater.json
+++ /dev/null
@@ -1,117 +0,0 @@
-{
- "Result": {
- "IsSuccess": 1,
- "code": 1,
- "ErrorMsg": "",
- "DataInfo": [
- {
- "StoragePlaceId": 124.0,
- "StoragePlaceName": "鐐兼补閮ㄥ惈娌规薄姘存帓鏀惧彛",
- "HazaWasteStorageDate": "0001-01-01T00:00:00",
- "HazaWasteCatgrName": null,
- "SurplusQuantityWarning": 0,
- "LongDayWarning": 0,
- "DesignFloorArea": 95.0,
- "HazaWasteName": null,
- "EstimateFloorArea": 0.0,
- "HazaWasteDeptName": null,
- "SurplusFloorArea": 95.0,
- "HazaWasteStorageDays": 0.0,
- "StorageQty": 0.0,
- "HazaWasteStorageQty": 0.0,
- "positionX": 32.234354069955536,
- "positionY": 118.76172605141248
- },
- {
- "StoragePlaceId": 123.0,
- "StoragePlaceName": "姘村姟閮ㄧ儻鐑冨閮ㄦ帓姘村彛",
- "HazaWasteStorageDate": "0001-01-01T00:00:00",
- "HazaWasteCatgrName": null,
- "SurplusQuantityWarning": 0,
- "LongDayWarning": 0,
- "DesignFloorArea": 260.0,
- "HazaWasteName": null,
- "EstimateFloorArea": 0.0,
- "HazaWasteDeptName": null,
- "SurplusFloorArea": 260.0,
- "HazaWasteStorageDays": 0.0,
- "StorageQty": 0.0,
- "HazaWasteStorageQty": 0.0,
- "positionX": 32.21783286123124,
- "positionY": 118.74581627024358
- },
- {
- "StoragePlaceId": 127.0,
- "StoragePlaceName": "鑱氶啔閮ㄥ簾姘存帓鏀惧彛",
- "HazaWasteStorageDate": "0001-01-01T00:00:00",
- "HazaWasteCatgrName": null,
- "SurplusQuantityWarning": 0,
- "LongDayWarning": 0,
- "DesignFloorArea": 351.0,
- "HazaWasteName": null,
- "EstimateFloorArea": 0.0,
- "HazaWasteDeptName": null,
- "SurplusFloorArea": 351.0,
- "HazaWasteStorageDays": 0.0,
- "StorageQty": 0.0,
- "HazaWasteStorageQty": 0.0,
- "positionX": 32.21761792102056,
- "positionY": 118.7694434198091
- },
- {
- "StoragePlaceId": 126.0,
- "StoragePlaceName": "姘村姟閮ㄩ洦姘存帓鏀惧彛",
- "HazaWasteStorageDate": "0001-01-01T00:00:00",
- "HazaWasteCatgrName": null,
- "SurplusQuantityWarning": 0,
- "LongDayWarning": 1.0,
- "DesignFloorArea": 54.0,
- "HazaWasteName": null,
- "EstimateFloorArea": 0.0,
- "HazaWasteDeptName": null,
- "SurplusFloorArea": 54.0,
- "HazaWasteStorageDays": 0.0,
- "StorageQty": 1.0,
- "HazaWasteStorageQty": 0.0,
- "positionX": 32.22328407752166,
- "positionY": 118.7645304033338
- },
- {
- "StoragePlaceId": 122.0,
- "StoragePlaceName": "鐢熶骇搴熸按鎺掓斁鍙�",
- "HazaWasteStorageDate": "0001-01-01T00:00:00",
- "HazaWasteCatgrName": null,
- "SurplusQuantityWarning": 0,
- "LongDayWarning": 1.0,
- "DesignFloorArea": 124.0,
- "HazaWasteName": null,
- "EstimateFloorArea": 0.0,
- "HazaWasteDeptName": null,
- "SurplusFloorArea": 124.0,
- "HazaWasteStorageDays": 0.0,
- "StorageQty": 1.0,
- "HazaWasteStorageQty": 0.0,
- "positionX": 32.22478169721047,
- "positionY": 118.75309838487216
- },
- {
- "StoragePlaceId": 129.0,
- "StoragePlaceName": "鍖栧纭寲鍝佹帓姘村彛",
- "HazaWasteStorageDate": "0001-01-01T00:00:00",
- "HazaWasteCatgrName": null,
- "SurplusQuantityWarning": 0,
- "LongDayWarning": 0,
- "DesignFloorArea": 78.0,
- "HazaWasteName": null,
- "EstimateFloorArea": 0.0,
- "HazaWasteDeptName": null,
- "SurplusFloorArea": 78.0,
- "HazaWasteStorageDays": 0.0,
- "StorageQty": 0.0,
- "HazaWasteStorageQty": 0.0,
- "positionX": 32.228692681454525,
- "positionY": 118.77199913186048
- }
- ]
- }
-}
diff --git a/src/api/mapApi.js b/src/api/mapApi.js
index 7376708..ce6c47f 100644
--- a/src/api/mapApi.js
+++ b/src/api/mapApi.js
@@ -4,11 +4,15 @@
// 娴嬭瘯鐜IP锛歨ttp://10.238.221.113
import axios from '@utils/axios'
import * as mapUrl from './mapUrl'
+
/**
* 璇ユ柟娉曢厤缃�
*/
export default {
getUser (data) {
return axios.get(mapUrl.GetUser, data)
+ },
+ getSolidWaste (data) {
+ return axios.get(mapUrl.getSolidWaste, data)
}
}
diff --git a/src/api/mapUrl.js b/src/api/mapUrl.js
index f5f7815..afdb4e3 100644
--- a/src/api/mapUrl.js
+++ b/src/api/mapUrl.js
@@ -4,3 +4,5 @@
import { $HOST } from './host'
export const GetUser = $HOST + '/user/getUser'
+
+export const getSolidWaste = $HOST + '/wasteSolid/getSolidWaste'
diff --git a/src/components/BaseNav/PublicBounced/PublicBounced.vue b/src/components/BaseNav/PublicBounced/PublicBounced.vue
index fbc8c8c..d854b06 100644
--- a/src/components/BaseNav/PublicBounced/PublicBounced.vue
+++ b/src/components/BaseNav/PublicBounced/PublicBounced.vue
@@ -7,7 +7,8 @@
<div class="public-bounced-content">
<div class="public-bounced-content-left">
<GasTab :displayContent="displayContent"></GasTab>
- <!-- <PublicTable v-if="value === 'gufei'" :requestSolidWasteData="displayContent.StoragePlaceId"></PublicTable>-->
+ <!-- <PublicTable v-if="value === 'gufei'" :requestSolidWasteData="displayContent.StoragePlaceId"></PublicTable>-->
+ <PublicTable></PublicTable>
<!-- <GasECharts v-else></GasECharts>-->
</div>
<div class="public-bounced-content-right">
@@ -21,7 +22,7 @@
import '@/components/BaseNav/SolidWaste/directive/dir'
import GasTab from '@components/BaseNav/PublicBounced/GasComponents/GasTab'
-// import PublicTable from '@components/BaseNav/PublicBounced/GasComponents/PublicTable'
+import PublicTable from '@components/BaseNav/PublicBounced/GasComponents/PublicTable'
// import GasECharts from '@components/BaseNav/PublicBounced/GasComponents/GasECharts'
import GasVideo from '@components/BaseNav/PublicBounced/GasComponents/GasVideo'
@@ -29,7 +30,7 @@
name: 'PublicBounced',
components: {
GasTab,
- // PublicTable,
+ PublicTable,
// GasECharts,
GasVideo
},
diff --git a/src/components/LayerController/logic/SolidWaste.js b/src/components/LayerController/logic/SolidWaste.js
index c92dca2..dfc5841 100644
--- a/src/components/LayerController/logic/SolidWaste.js
+++ b/src/components/LayerController/logic/SolidWaste.js
@@ -1,37 +1,46 @@
/**
* 鍥哄簾
*/
+// 鍖哄垎涓嶅悓绫诲瀷 浣跨敤涓嶅悓img
+const defaultImg = '/assets/images/map/solidwaste/voc.png'
+const setting = '/assets/images/map/solidwaste/gf_green.png'
+
+const mapApi = require('../../../api/mapApi').default
const AnimalService = require('../service/AnimalService').default
-const AjaxUtils = require('../../../utils/AjaxUtils').default
module.exports = function () {
/**
* 杩斿洖marker瀵硅薄鏁扮粍
* @param L leaflet瀵硅薄
*/
- this.init = (layer, L) => {
+ this.init = async (layer, L) => {
+ // const SolidWasteIcon = this.SolidWasteIcon()
this.animalService = new AnimalService({
L: L,
- layer: layer,
- LayerPopup: null
+ layer: layer
})
- // AjaxUtils.get4JsonDataByUrl('http://10.246.162.140:8080/EPInterface/DataService/EPMapService.asmx/QueryStoragePlaceListByCompanyAndName', {
- // AjaxUtils.get4JsonDataByUrl('http://xearth.cn:3000/wasteSolid/getSolidWaste', {
- AjaxUtils.get4JsonDataByUrl('http://localhost:8888/static/SolidWaste.json', {
- companyId: 3900100145,
- userCode: 'wenchun.deng',
- name: '',
- marginWarr: '',
- longDayWarr: ''
- }, function (res) {
- const data = res.data.Result.DataInfo
- for (let i = 0; i < data.length; i++) {
- // 缁忕含搴� 浣嶇疆
- const positionX = data[i].Latitude
- const positionY = data[i].Longitude
- layer.addLayer(L.marker([positionX, positionY], {}))
- }
- })
+ const res = await mapApi.getSolidWaste()
+ // console.log(res)
+ const data = res.Result.DataInfo || {}
+ for (let i = 0; i < data.length; i++) {
+ // 缁忕含搴� 浣嶇疆
+ const positionX = data[i].Latitude
+ const positionY = data[i].Longitude
+
+ // 瀹氫箟绫诲瀷 鐢ㄦ潵鍖哄垎鏁版嵁鐨勪笉鍚�
+ const judgeValue = data[i].StorageQty
+ var iconUrl = this.differentTypes(judgeValue)
+
+ const marker = L.marker.magic([positionX, positionY], {
+ icon: L.icon({
+ iconUrl: iconUrl,
+ iconSize: [50, 50],
+ iconAnchor: [25, 25]
+ })
+ })
+
+ layer.addLayer(marker)
+ }
}
this.bindTooltip = (layer) => {
@@ -41,8 +50,18 @@
this.clickListener = (e) => {
this.animalService.pulseEffect(e.latlng)
console.log(e)
- console.log(this.PublicBounced)
- // return this.PublicBounced.$el
+ return this.PublicBounced.$el
+ }
+
+ // 涓嶅悓绫诲瀷鍥剧墖灏佽
+ this.differentTypes = (judgeValue) => {
+ var effectOfChange
+ if (judgeValue === 1) {
+ effectOfChange = defaultImg
+ } else {
+ effectOfChange = setting
+ }
+ return effectOfChange
}
// 鍥哄簾鐐瑰嚮杩涜鐨� 鍐呭鐨勮缃�
// SetSolidWasteContent (config, containerPopup) {
diff --git a/src/conf/MapConfig.js b/src/conf/MapConfig.js
index 1326a16..d1ece05 100644
--- a/src/conf/MapConfig.js
+++ b/src/conf/MapConfig.js
@@ -25,7 +25,8 @@
minZoom: 3,
maxZoom: 18,
// center: [26, 104],
- center: [38.828558921813965, 117.41676807403564],
+ // center: [38.828558921813965, 117.41676807403564],
+ center: [29.769515991210938, 107.03567504882812],
zoom: 14,
worldCopyJump: true,
inertia: true,
--
Gitblit v1.8.0