From 9966a7e507a541c8e4e64f2a8a6746b0db4a2fd4 Mon Sep 17 00:00:00 2001
From: chenzeping <ChenZeping02609@163.com>
Date: 星期四, 25 三月 2021 15:10:53 +0800
Subject: [PATCH] 添加固废功能
---
public/static/SolidWaste.json | 5 +++--
src/utils/axios.js | 23 ++++++++++++-----------
src/Sgis.js | 23 ++++++++++++++++-------
3 files changed, 31 insertions(+), 20 deletions(-)
diff --git a/public/static/SolidWaste.json b/public/static/SolidWaste.json
index 37e8ad1..3a16382 100644
--- a/public/static/SolidWaste.json
+++ b/public/static/SolidWaste.json
@@ -1,6 +1,7 @@
{
"Result": {
"IsSuccess": 1,
+ "code": 1,
"ErrorMsg": "",
"DataInfo": [
{
@@ -63,14 +64,14 @@
"HazaWasteStorageDate": "0001-01-01T00:00:00",
"HazaWasteCatgrName": null,
"SurplusQuantityWarning": 0,
- "LongDayWarning": 1,
+ "LongDayWarning": 1.0,
"DesignFloorArea": 54.0,
"HazaWasteName": null,
"EstimateFloorArea": 0.0,
"HazaWasteDeptName": null,
"SurplusFloorArea": 54.0,
"HazaWasteStorageDays": 0.0,
- "StorageQty": 1,
+ "StorageQty": 1.0,
"HazaWasteStorageQty": 0.0,
"positionX": 32.23092555999756,
"positionY": 118.75735759735107
diff --git a/src/Sgis.js b/src/Sgis.js
index cbc3d10..f908709 100644
--- a/src/Sgis.js
+++ b/src/Sgis.js
@@ -1,22 +1,28 @@
import BasemapHelper from '@components/helpers/BasemapHelper'
import VectorLayerHelper from '@components/helpers/VectorLayerHelper'
+// 鍒濆鍖栨樉绀�
import ServiceLayerHelper from '@components/helpers/ServiceLayerHelper'
+
import '@components/plugin/PathDrag'
-// import MagicMarker from '@components/plugin/MagicMarker'
-// import WmtsSupport from '@components/plugin/wmts_plugins'
import MapConfig from '@/conf/MapConfig'
import '@components/plugin/PathDashFlow' // 娴佸姩绾垮浘
-// import CanvasMarkers from '@components/plugin/CanvasMarkers'
-// import FullScreen from '@components/plugin/FullScreen'
import DownLoad from '@components/plugin/DownLoad'
// 娴嬮噺
import '@components/plugin/leaflet-measure-path/leaflet-measure-path'
import 'leaflet.markercluster'
-// import 'leaflet-canvas-markers'
import './components/plugin/Leaflet.GridLayer.FadeOut' // 鐡︾墖鍥惧眰鍒囨崲娣″叆娣″嚭
import './components/plugin/leaflet-canvas-markers' // 鐢诲竷marker
import './components/plugin/Editable' // 鏍囩粯鎿嶄綔
+import './components/plugin/MagicMarker' // 鍔ㄧ敾Marker
+import './assets/css/map/magic.min.css' // 鍔ㄧ敾Marker css
+import './components/BaseNav/Pulse'
+import './components/BaseNav/Pulse.css'
+
+// import WmtsSupport from '@components/plugin/wmts_plugins'
+// import CanvasMarkers from '@components/plugin/CanvasMarkers'
+// import FullScreen from '@components/plugin/FullScreen'
+// import 'leaflet-canvas-markers'
let map = null
const L = window.L
@@ -35,8 +41,8 @@
// 鍏ㄥ睆
// FullScreen.init(L)
// 涓嬭浇
- DownLoad.init(L)
// LeafletMeasurePath.init(L)
+ DownLoad.init(L)
map = L.map(div, MapConfig.mapOptions)
@@ -46,7 +52,11 @@
window.map = map
window.L = L
+
+ // L.sgis = L.sgis || L
+
initTileLayersHelper(map)
+
return map
}
@@ -68,7 +78,6 @@
var serviceLayerHelper = new ServiceLayerHelper({ map })
return serviceLayerHelper
}
-
/**
* 鐭㈤噺鍦板浘鍒濆鍖�
* @param map
diff --git a/src/utils/axios.js b/src/utils/axios.js
index a5bb1ab..20047e2 100644
--- a/src/utils/axios.js
+++ b/src/utils/axios.js
@@ -117,10 +117,10 @@
// request鎷︽埅鍣�
Service.interceptors.request.use(
config => {
- // 涓存椂杩藉姞
- // if ($store.state.user.account) {
- // config.headers.account = $store.state.user.account
- // }
+ // 涓存椂杩藉姞
+ // if ($store.state.user.account) {
+ // config.headers.account = $store.state.user.account
+ // }
const copyConfig = Object.assign({}, config)
// copyConfig = filterOauthData(copyConfig)
// showDebugInfo(copyConfig)
@@ -139,13 +139,14 @@
// respone鎷︽埅鍣�
Service.interceptors.response.use(
response => {
- const res = response.data
- if (Number(res.code) !== 200 && Number(res.code) !== 0) {
- $T.warning(res.message)
- return Promise.reject(res.message)
- } else {
- return res
- }
+ // const res = response.data
+ // if (Number(res.code) !== 200 && Number(res.code) !== 0) {
+ // $T.warning(res.message)
+ // return Promise.reject(res.message)
+ // } else {
+ // return res
+ // }
+ return response.data
},
error => {
if (error.message && error.message.includes('timeout')) {
--
Gitblit v1.8.0