Merge branch 'master' of http://106.120.22.35:48888/r/PM20221203225_MobileWeb

ZhAkps

2024-02-06 f027164f4ee3f8a234f1a5dfd61eb3cceaa13fb7

Merge branch 'master' of http://106.120.22.35:48888/r/PM20221203225_MobileWeb

 src/components/viewer2.vue

@@ -456,6 +456,7 @@
}

#ponitPanel {
  display: none;
  width: 80vw;
  background-repeat: no-repeat;
  background-size: 100% 100%;

 src/utils/map2.js

@@ -1,10 +1,10 @@
import { Feature } from "ol";
import VectorLayer from "ol/layer/Vector";
import VectorSource from "ol/source/Vector";
import { Style, Icon, Fill, Stroke, Text, Circle as CircleStyle } from "ol/style";
import { Point, LineString } from "ol/geom";
import Overlay from 'ol/Overlay.js';
import { unByKey } from "ol/Observable.js"; //移除事件
// import { Feature } from "ol";
// import VectorLayer from "ol/layer/Vector";
// import VectorSource from "ol/source/Vector";
// import { Style, Icon, Fill, Stroke, Text, Circle as CircleStyle } from "ol/style";
// import { Point, LineString } from "ol/geom";
// import Overlay from 'ol/Overlay.js';
// import { unByKey } from "ol/Observable.js"; //移除事件
import Vue from 'vue';
import axios from "axios";
import _GLOBAL from '@/assets/GLOBAL2';
@@ -2204,20 +2204,20 @@

//openlayer 创建点位
export function createPointMarker(position, obj) {
    let startFeature = new Feature({
        geometry: new Point(position),
    let startFeature = new ol.Feature({
        geometry: new ol.geom.Point(position),
    });
    startFeature.setProperties({
        desc: obj,
    });
    let MarkerLayer = new VectorLayer({
    let MarkerLayer = new ol.layer.Vector({
        id: 'LocationPoint',
        name: '标记点',
        source: new VectorSource({
        source: new ol.source.Vector({
            features: [startFeature],
        }),
        style: new Style({
            image: new Icon({
        style: new ol.style.Style({
            image: new ol.style.Icon({
                src: require('@/assets/img/collection/scdw.png'),
                anchorOrigin: "top-left",
                anchorXUnits: "fraction",
@@ -2235,7 +2235,7 @@
//openlayer 地图点击事件
export function setClick(state) {
    let ponitPanel = document.getElementById('ponitPanel');
    let overlay = new Overlay({
    let overlay = new ol.Overlay({
        element: ponitPanel,
        autoPan: {
            animation: {
@@ -2250,6 +2250,8 @@
        window.map.forEachFeatureAtPixel(e.pixel, function (feature) {
            // console.log(feature, '111111')
            if (feature && feature.values_.desc) {
                ponitPanel.style.display = 'block'

                let obj = feature.values_.desc
                objdata = {
                    POITYPE: "POINT",
@@ -2269,7 +2271,10 @@
                        <span>地址：</span>
                       <span>${objdata.address}</span>
                    </div>`
                overlay.setPosition(e.coordinate);

                setTimeout(() => {
                    overlay.setPosition(e.coordinate);
                }, 0)

                // store.setPoplayerShowAction(true);
                // store.setPoplayerListAction(objdata);
@@ -2288,31 +2293,33 @@
    if (state) {
        clickEvent = window.map.on('click', handleClick);
    } else {
        unByKey(clickEvent)
        ol.Observable.unByKey(clickEvent)
        clickEvent = null
    }
}


export function flyToPoint(posisitons) {
    let zoom = window.map.getView().getZoom();
    if (zoom >= 16) {
        zoom = 12
    }
    let duration = 2000;
    // let zoom = window.map.getView().getZoom();
    // if (zoom >= 16) {
    //     zoom = 12
    // }
    // let duration = 2000;
    window.map.getView().animate({
        center: posisitons,
        zoom: 12,
        duration: 1500
    })
    window.map.getView().animate(
        //动画开始时
        {
            zoom: zoom > 16 ? zoom - 0.01 : zoom + 0.01,
            duration: duration / 2,
        },
        //动画结束时
        {
            zoom: zoom >= 16 ? 16 : zoom + 4,
            duration: duration / 2,
        }
    );
    // window.map.getView().animate(
    //     //动画开始时
    //     {
    //         zoom: zoom > 16 ? zoom - 0.01 : zoom + 0.01,
    //         duration: duration / 2,
    //     },
    //     //动画结束时
    //     {
    //         zoom: zoom >= 16 ? 16 : zoom + 4,
    //         duration: duration / 2,
    //     }
    // );
}

 static/lib/dist/cdn/ol/ol.css

 static/lib/dist/cdn/ol/ol.js

 static/lib/dist/cdn/zondyclient/ZDproxy.ashx

 static/lib/dist/cdn/zondyclient/webclient-openlayers-plugin.min.html

 static/lib/dist/cdn/zondyclient/webclient-openlayers-plugin.min.js

 static/lib/dist/dist/ol/iclient-ol-es6.js

 static/lib/dist/dist/ol/iclient-ol-es6.min.js

 static/lib/dist/dist/ol/iclient-ol.css

 static/lib/dist/dist/ol/iclient-ol.js

 static/lib/dist/dist/ol/iclient-ol.min.css

 static/lib/dist/dist/ol/iclient-ol.min.js

 static/lib/dist/dist/ol/include-ol.js

 static/lib/dist/dist/openlayers/iclient-openlayers-es6.js

 static/lib/dist/dist/openlayers/iclient-openlayers-es6.min.js

 static/lib/dist/dist/openlayers/iclient-openlayers.css

 static/lib/dist/dist/openlayers/iclient-openlayers.js

 static/lib/dist/dist/openlayers/iclient-openlayers.min.css

 static/lib/dist/dist/openlayers/iclient-openlayers.min.js

 static/lib/dist/dist/openlayers/include-openlayers.js

 static/lib/dist/include-lib-local.js

 static/lib/dist/include-ol.js

 static/lib/dist/include-openlayers-local.js

 static/lib/dist/ol/iclient-ol-es6.js

 static/lib/dist/ol/iclient-ol-es6.min.js

 static/lib/dist/ol/iclient-ol.css

 static/lib/dist/ol/iclient-ol.js

 static/lib/dist/ol/iclient-ol.min.css

 static/lib/dist/ol/iclient-ol.min.js

 static/lib/dist/ol/include-ol.js

 static/lib/dist/openlayers/iclient-openlayers-es6.js

 static/lib/dist/openlayers/iclient-openlayers-es6.min.js

 static/lib/dist/openlayers/iclient-openlayers.css

 static/lib/dist/openlayers/iclient-openlayers.js

 static/lib/dist/openlayers/iclient-openlayers.min.css

 static/lib/dist/openlayers/iclient-openlayers.min.js

 static/lib/dist/openlayers/include-openlayers.js

 static/lib/libs/antv/g6/4.3.2/g6.min.js

 static/lib/libs/canvg/3.0.10/umd.min.js

 static/lib/libs/deck.gl/5.1.3/deck.gl.js

 static/lib/libs/deck.gl/5.1.3/deck.gl.min.js

 static/lib/libs/echarts/5.4.3/echarts.min.js

 static/lib/libs/geostats/geostats.js

 static/lib/libs/jsonsql/jsonsql.js

 static/lib/libs/mapv/2.0.62/mapv.3d.js

 static/lib/libs/mapv/2.0.62/mapv.js

 static/lib/libs/mapv/2.0.62/mapv.min.js

 static/lib/libs/openlayers/4.6.5/ol-debug.css

 static/lib/libs/openlayers/4.6.5/ol-debug.js

 static/lib/libs/openlayers/4.6.5/ol.css

 static/lib/libs/openlayers/4.6.5/ol.js

 static/lib/libs/openlayers/6.14.1/ol.css

 static/lib/libs/openlayers/6.14.1/ol.css.map

 static/lib/libs/openlayers/6.14.1/ol.js

 static/lib/libs/openlayers/6.14.1/ol.js.map

 static/lib/libs/openlayers/ol3-echarts/1.3.6/ol3Echarts.js

 static/lib/libs/openlayers/ol3-echarts/1.3.6/ol3Echarts.min.js

 static/lib/libs/openlayers/ol3-echarts/2.0.6/ol3Echarts.js

 static/lib/libs/openlayers/ol3-echarts/2.0.6/ol3Echarts.min.js

 static/lib/libs/openlayers/plugins/animatedclusterlayer/animatedclusterlayer.js

 static/lib/libs/openlayers/plugins/ol-layerswitcher/3.8.3/ol-layerswitcher.css

 static/lib/libs/openlayers/plugins/ol-layerswitcher/3.8.3/ol-layerswitcher.js

 static/lib/libs/openlayers/plugins/ol-layerswitcher/3.8.3/ol-layerswitcher.min.js

 static/lib/libs/openlayers/plugins/ol-mapbox-style/2.11.2-4/olms-debug.js

 static/lib/libs/openlayers/plugins/ol-mapbox-style/2.11.2-4/olms.js

 static/lib/libs/osmbuildings/OSMBuildings-Leaflet.js

 static/lib/libs/osmbuildings/OSMBuildings-OL3.js

 static/lib/libs/proj4/2.9.0/proj4.js

 static/lib/libs/proj4/2.9.0/proj4.min.js

 static/lib/libs/tensorflow/3.9.0/tf.js

 static/lib/libs/tensorflow/3.9.0/tf.min.js

 static/lib/libs/turf/6.5.0/turf.min.js

 static/lib/libs/xlsx/0.19.3/xlsx.core.min.js