diff --git a/src/views/floodSys/floodOneMap/tabRightWL.vue b/src/views/floodSys/floodOneMap/tabRightWL.vue
index 51b853c..da6f13b 100644
--- a/src/views/floodSys/floodOneMap/tabRightWL.vue
+++ b/src/views/floodSys/floodOneMap/tabRightWL.vue
@@ -939,7 +939,7 @@
getSampleDateList();
let closeCommonPopup = false;
bus.emit('closeCommonPopup', closeCommonPopup);
- //bus.emit('initeLayer', ['riverLake']);
+ bus.emit('initeLayer', ['riverLake']);
newfiberMapbox.map.easeTo({
center: [114.312, 34.802],
zoom: 12.9,
@@ -951,7 +951,7 @@
getRealtimeDataByPump();
let closeCommonPopup = false;
bus.emit('closeCommonPopup', closeCommonPopup);
- bus.emit('initeLayer', ['YSBZ', 'WSBZ', 'WSCLC']);
+ bus.emit('initeLayer', ['YSBZ']);
newfiberMapbox.map.easeTo({
center: [114.312, 34.802],
zoom: 12.9,
diff --git a/src/views/gisMapPage/commonLegend.js b/src/views/gisMapPage/commonLegend.js
index 16589b4..073c6e3 100644
--- a/src/views/gisMapPage/commonLegend.js
+++ b/src/views/gisMapPage/commonLegend.js
@@ -1,12 +1,13 @@
-import wuShuiChang from '@/assets/geojson/kaifeng/wuShuiChang.json';
-import ysBengZhan from '@/assets/geojson/kaifeng/ysBengZhan.json';
-import wsBengZhan from '@/assets/geojson/kaifeng/wsBengZhan.json';
+// import wuShuiChang from '@/assets/geojson/kaifeng/wuShuiChang.json';
+// import ysBengZhan from '@/assets/geojson/kaifeng/ysBengZhan.json';
+// import wsBengZhan from '@/assets/geojson/kaifeng/wsBengZhan.json';
import { getStationList } from '@/api/sponeScreen/syntherticData';
import { listpipelinePoint } from '@/api/drainagePipeline/pipelinePoint';
import { facilityPumpList } from '@/api/scada/pumpStationInformation';
import { facilitySewageList } from '@/api/scada/sewage';
import { sectionWaterList } from '@/api/dataAnalysis/manualAssay';
+import { realtimeDataByPump } from '@/api/floodSys/oneMap.js';
import bus from '@/bus';
let rainStation;
let pipeSupervise;
@@ -48,6 +49,7 @@
//雨水泵站
let resRainwater = await facilityPumpList();
if (resRainwater && resRainwater.code == 200) {
+ console.log('resRainwater--', resRainwater.data);
let YSBZDataList = resRainwater.data.filter(data => data.pumpType == 'rain_water');
let WSBZDataList = resRainwater.data.filter(data => data.pumpType == 'sewage_water');
let PLBZDataList = resRainwater.data.filter(data => data.pumpType == 'drain_flooded');
@@ -201,8 +203,8 @@
url: 'paiLaoBengs.png', //图层+json √
mapUrl: 'paiLaoBeng.png',
type: 'point',
- //data: YSBZ,
- data: ysBengZhan,
+ data: YSBZ,
+ //data: ysBengZhan,
},
{
isCheck: false,
@@ -247,8 +249,8 @@
url: 'WSCs.png',
mapUrl: 'WSC.png',
type: 'point',
- //data: WSCLC,
- data: wuShuiChang,
+ data: WSCLC,
+ //data: wuShuiChang,
},
{
isCheck: false,
@@ -257,8 +259,8 @@
url: 'wsBengs.png',
mapUrl: 'wsBeng.png',
type: 'point',
- //data: WSBZ,
- data: wsBengZhan,
+ data: WSBZ,
+ //data: wsBengZhan,
},
{
isCheck: false,
diff --git a/src/views/gisMapPage/gisMapBox1.vue b/src/views/gisMapPage/gisMapBox1.vue
index c410763..6a1f6c0 100644
--- a/src/views/gisMapPage/gisMapBox1.vue
+++ b/src/views/gisMapPage/gisMapBox1.vue
@@ -191,6 +191,7 @@
const setLayerVisible = ({ layername, isCheck }) => {
if (!!!window.newfiberMapbox) return;
+
if (((config || {}).filter || {})[layername]) {
config.filter[layername].layerName.forEach((name, index) => {
let filter = map.getFilter(name);
@@ -207,10 +208,13 @@
if (features.length) {
let types = Array.from(new Set(features.map(i => i.geometry.type.toLocaleLowerCase())));
types.forEach(type1 => {
- let filter = map.getFilter(type1);
- if (!!!filter) return;
- isCheck ? filter.push(layername) : (filter = filter.filter(i => i != layername));
- map.setFilter(type1, filter);
+ if (map.getLayer(type1)) {
+ let filter = map.getFilter(type1);
+ if (!!!filter) return;
+ isCheck ? filter.push(layername) : (filter = filter.filter(i => i != layername));
+
+ map.setFilter(type1, filter);
+ }
});
}
let layer = newfiberMapbox.getLayers().filter(i => i.newfiberId == layername)[0];
diff --git a/vite.config.js b/vite.config.js
index d814042..ea36ec6 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -6,9 +6,9 @@
const Timestamp = new Date().getTime(); //随机时间戳
-const targetUrl = 'http://192.168.16.254:7200'; //孙逢时
+// const targetUrl = 'http://192.168.16.254:7200'; //孙逢时
// const targetUrl = 'http://192.168.20.52:7300'; //杨辉
-// const targetUrl = 'https://server2.wh-nf.cn:8082/prod-api'; //线上
+const targetUrl = 'https://server2.wh-nf.cn:8082/prod-api'; //线上
// https://vitejs.dev/config/
export default defineConfig(({ mode, command }) => {