diff --git a/src/views/sponeScreen/HaiMianScreen/index.vue b/src/views/sponeScreen/HaiMianScreen/index.vue index c45b087..0b5832f 100644 --- a/src/views/sponeScreen/HaiMianScreen/index.vue +++ b/src/views/sponeScreen/HaiMianScreen/index.vue @@ -144,7 +144,6 @@ ]); NewFiberMapUtils.removeByIds(Object.values(NewFiberMapUtils.defaultParams.keys)); if (id == 4) { - console.log('111111beng'); bus.emit('setIniteLayer', [ { layername: 'YSBZ', diff --git a/src/views/sponeScreen/HaiMianScreen/index.vue b/src/views/sponeScreen/HaiMianScreen/index.vue index c45b087..0b5832f 100644 --- a/src/views/sponeScreen/HaiMianScreen/index.vue +++ b/src/views/sponeScreen/HaiMianScreen/index.vue @@ -144,7 +144,6 @@ ]); NewFiberMapUtils.removeByIds(Object.values(NewFiberMapUtils.defaultParams.keys)); if (id == 4) { - console.log('111111beng'); bus.emit('setIniteLayer', [ { layername: 'YSBZ', diff --git a/src/views/sponeScreen/gisMF/cesiumMapLegend.js b/src/views/sponeScreen/gisMF/cesiumMapLegend.js index 26e7780..7b85f48 100644 --- a/src/views/sponeScreen/gisMF/cesiumMapLegend.js +++ b/src/views/sponeScreen/gisMF/cesiumMapLegend.js @@ -328,7 +328,7 @@ type: 'point', data: WSCLC, //data: wuShuiChang, - dataArea: wscArea, + //dataArea: wscArea, }, { isCheck: false, diff --git a/src/views/sponeScreen/HaiMianScreen/index.vue b/src/views/sponeScreen/HaiMianScreen/index.vue index c45b087..0b5832f 100644 --- a/src/views/sponeScreen/HaiMianScreen/index.vue +++ b/src/views/sponeScreen/HaiMianScreen/index.vue @@ -144,7 +144,6 @@ ]); NewFiberMapUtils.removeByIds(Object.values(NewFiberMapUtils.defaultParams.keys)); if (id == 4) { - console.log('111111beng'); bus.emit('setIniteLayer', [ { layername: 'YSBZ', diff --git a/src/views/sponeScreen/gisMF/cesiumMapLegend.js b/src/views/sponeScreen/gisMF/cesiumMapLegend.js index 26e7780..7b85f48 100644 --- a/src/views/sponeScreen/gisMF/cesiumMapLegend.js +++ b/src/views/sponeScreen/gisMF/cesiumMapLegend.js @@ -328,7 +328,7 @@ type: 'point', data: WSCLC, //data: wuShuiChang, - dataArea: wscArea, + //dataArea: wscArea, }, { isCheck: false, diff --git a/src/views/sponeScreen/gisMF/whiteMapStyle.js b/src/views/sponeScreen/gisMF/whiteMapStyle.js index 2733a6f..76821cf 100644 --- a/src/views/sponeScreen/gisMF/whiteMapStyle.js +++ b/src/views/sponeScreen/gisMF/whiteMapStyle.js @@ -233,7 +233,7 @@ filter: ['==', '$type', 'Point'], layout: { 'text-field': '{housenumber}', - 'text-font': ['KlokanTech Noto Sans Regular'], + 'text-font': ['KlokanTech Noto Sans CJK Bold'], 'text-size': 10, }, paint: { 'text-color': 'rgba(212, 177, 146, 1)' }, @@ -723,13 +723,13 @@ type: 'symbol', source: 'openmaptiles', 'source-layer': 'poi', - minzoom: 10, + minzoom: 9, filter: ['all', ['==', '$type', 'Point'], ['==', 'rank', 1]], layout: { 'icon-size': 1, 'text-anchor': 'top', 'text-field': '\n{name:nonlatin}', - 'text-font': ['KlokanTech Noto Sans Regular'], + 'text-font': ['KlokanTech Noto Sans CJK Bold'], 'text-max-width': 8, 'text-offset': [0, 0.5], 'text-size': 11, @@ -753,7 +753,7 @@ 'icon-size': 1, 'text-anchor': 'top', 'text-field': '{name:nonlatin}\n', - 'text-font': ['KlokanTech Noto Sans Regular'], + 'text-font': ['KlokanTech Noto Sans CJK Bold'], 'text-max-width': 8, 'text-offset': [0, 0.5], 'text-size': 11, @@ -776,7 +776,7 @@ layout: { 'symbol-placement': 'line', 'text-field': ' {name:nonlatin}', - 'text-font': ['KlokanTech Noto Sans Regular'], + 'text-font': ['KlokanTech Noto Sans CJK Bold'], 'text-letter-spacing': 0.1, 'text-rotation-alignment': 'map', 'text-size': { @@ -805,7 +805,7 @@ layout: { 'text-anchor': 'center', 'text-field': '\n{name:nonlatin}', - 'text-font': ['KlokanTech Noto Sans Regular'], + 'text-font': ['KlokanTech Noto Sans CJK Bold'], 'text-max-width': 6, 'text-size': 10, visibility: 'visible', @@ -826,7 +826,7 @@ filter: ['all', ['==', '$type', 'Point'], ['==', 'class', 'city']], layout: { 'text-field': '\n{name:nonlatin}', - 'text-font': ['KlokanTech Noto Sans Regular'], + 'text-font': ['KlokanTech Noto Sans CJK Bold'], 'text-max-width': 10, 'text-size': 12, }, @@ -846,7 +846,7 @@ filter: ['all', ['==', '$type', 'Point'], ['==', 'class', 'country'], ['!has', 'iso_a2']], layout: { 'text-field': '{name:nonlatin}', - 'text-font': ['KlokanTech Noto Sans Regular'], + 'text-font': ['KlokanTech Noto Sans CJK Bold'], 'text-max-width': 10, 'text-size': { stops: [ @@ -872,7 +872,7 @@ filter: ['all', ['==', '$type', 'Point'], ['==', 'class', 'country'], ['has', 'iso_a2']], layout: { 'text-field': '{name:nonlatin}', - 'text-font': ['KlokanTech Noto Sans Regular'], + 'text-font': ['KlokanTech Noto Sans CJK Bold'], 'text-max-width': 10, 'text-size': { stops: [ diff --git a/src/views/sponeScreen/HaiMianScreen/index.vue b/src/views/sponeScreen/HaiMianScreen/index.vue index c45b087..0b5832f 100644 --- a/src/views/sponeScreen/HaiMianScreen/index.vue +++ b/src/views/sponeScreen/HaiMianScreen/index.vue @@ -144,7 +144,6 @@ ]); NewFiberMapUtils.removeByIds(Object.values(NewFiberMapUtils.defaultParams.keys)); if (id == 4) { - console.log('111111beng'); bus.emit('setIniteLayer', [ { layername: 'YSBZ', diff --git a/src/views/sponeScreen/gisMF/cesiumMapLegend.js b/src/views/sponeScreen/gisMF/cesiumMapLegend.js index 26e7780..7b85f48 100644 --- a/src/views/sponeScreen/gisMF/cesiumMapLegend.js +++ b/src/views/sponeScreen/gisMF/cesiumMapLegend.js @@ -328,7 +328,7 @@ type: 'point', data: WSCLC, //data: wuShuiChang, - dataArea: wscArea, + //dataArea: wscArea, }, { isCheck: false, diff --git a/src/views/sponeScreen/gisMF/whiteMapStyle.js b/src/views/sponeScreen/gisMF/whiteMapStyle.js index 2733a6f..76821cf 100644 --- a/src/views/sponeScreen/gisMF/whiteMapStyle.js +++ b/src/views/sponeScreen/gisMF/whiteMapStyle.js @@ -233,7 +233,7 @@ filter: ['==', '$type', 'Point'], layout: { 'text-field': '{housenumber}', - 'text-font': ['KlokanTech Noto Sans Regular'], + 'text-font': ['KlokanTech Noto Sans CJK Bold'], 'text-size': 10, }, paint: { 'text-color': 'rgba(212, 177, 146, 1)' }, @@ -723,13 +723,13 @@ type: 'symbol', source: 'openmaptiles', 'source-layer': 'poi', - minzoom: 10, + minzoom: 9, filter: ['all', ['==', '$type', 'Point'], ['==', 'rank', 1]], layout: { 'icon-size': 1, 'text-anchor': 'top', 'text-field': '\n{name:nonlatin}', - 'text-font': ['KlokanTech Noto Sans Regular'], + 'text-font': ['KlokanTech Noto Sans CJK Bold'], 'text-max-width': 8, 'text-offset': [0, 0.5], 'text-size': 11, @@ -753,7 +753,7 @@ 'icon-size': 1, 'text-anchor': 'top', 'text-field': '{name:nonlatin}\n', - 'text-font': ['KlokanTech Noto Sans Regular'], + 'text-font': ['KlokanTech Noto Sans CJK Bold'], 'text-max-width': 8, 'text-offset': [0, 0.5], 'text-size': 11, @@ -776,7 +776,7 @@ layout: { 'symbol-placement': 'line', 'text-field': ' {name:nonlatin}', - 'text-font': ['KlokanTech Noto Sans Regular'], + 'text-font': ['KlokanTech Noto Sans CJK Bold'], 'text-letter-spacing': 0.1, 'text-rotation-alignment': 'map', 'text-size': { @@ -805,7 +805,7 @@ layout: { 'text-anchor': 'center', 'text-field': '\n{name:nonlatin}', - 'text-font': ['KlokanTech Noto Sans Regular'], + 'text-font': ['KlokanTech Noto Sans CJK Bold'], 'text-max-width': 6, 'text-size': 10, visibility: 'visible', @@ -826,7 +826,7 @@ filter: ['all', ['==', '$type', 'Point'], ['==', 'class', 'city']], layout: { 'text-field': '\n{name:nonlatin}', - 'text-font': ['KlokanTech Noto Sans Regular'], + 'text-font': ['KlokanTech Noto Sans CJK Bold'], 'text-max-width': 10, 'text-size': 12, }, @@ -846,7 +846,7 @@ filter: ['all', ['==', '$type', 'Point'], ['==', 'class', 'country'], ['!has', 'iso_a2']], layout: { 'text-field': '{name:nonlatin}', - 'text-font': ['KlokanTech Noto Sans Regular'], + 'text-font': ['KlokanTech Noto Sans CJK Bold'], 'text-max-width': 10, 'text-size': { stops: [ @@ -872,7 +872,7 @@ filter: ['all', ['==', '$type', 'Point'], ['==', 'class', 'country'], ['has', 'iso_a2']], layout: { 'text-field': '{name:nonlatin}', - 'text-font': ['KlokanTech Noto Sans Regular'], + 'text-font': ['KlokanTech Noto Sans CJK Bold'], 'text-max-width': 10, 'text-size': { stops: [ diff --git a/src/views/sponeScreen/waterFlood/index.vue b/src/views/sponeScreen/waterFlood/index.vue index d2ae6e7..134538d 100644 --- a/src/views/sponeScreen/waterFlood/index.vue +++ b/src/views/sponeScreen/waterFlood/index.vue @@ -71,6 +71,50 @@ pumpObj.value = params; dialogShow.value = true; }); + setTimeout(() => { + newfiberMap.setView({ + lng: 114.342, + lat: 34.702, + heading: 2.281299097855777, + zoom: 6358.12942752382, + pitch: -25.2508969308367, + roll: 0.005453465256790101, + }); + bus.emit('setIniteLayer', [ + { + layername: 'YSBZ', + show: false, + }, + { + layername: 'WSBZ', + show: false, + }, + { + layername: 'sewageFactory', + show: false, + }, + { + layername: 'henan_kaifeng_ysline', + show: false, + }, + { + layername: 'henan_kaifeng_wsline', + show: false, + }, + { + layername: 'henan_kaifeng_hsline', + show: false, + }, + { + layername: 'pipeLineFlow', + show: false, + }, + { + layername: 'dynamicWater', + show: false, + }, + ]); + }, 8000); }); onBeforeUnmount(() => { bus.off('checkBZGYT');