Merge branch 'master' of http://183.162.245.49:82/GitServer/PM_YiZhuang_Zhe...

lixuliang

2023-10-12 3afa54cb5f7176fa52f6246127e19cc623d14767

Merge branch 'master' of http://183.162.245.49:82/GitServer/PM_YiZhuang_ZhengFuWuFuZhongXin_2haoPing_Web

 src/api/api.js

@@ -40,3 +40,8 @@
        "&geom=true&requesttype=json"
    );
}
export function shengwuSearch() {
    return request.get(
        'gisserver/wfsserver/liushisijiayuanqu1005?version=1.3.0&request=GetFeature&typename=64jiayuanqujibenqingkuang&propertyname=*&filter=<Filter><PropertyIsLike+wildCard%3D"*"><PropertyName>chanyeDW<%2FPropertyName><Literal>*生物医药*<%2FLiteral><%2FPropertyIsLike><%2FFilter>&format=json'
    );
}

 src/assets/js/mapMsg.js

@@ -86,13 +86,16 @@
        })
        if (accept.length > 0) {
            rpc.getFuzzyQuery(result)
        }else{
            vueEvents.$emit("queryData", false);
            rpc.setClearAllMsg();
            rpc.setMapRest();
        }


        // else{
        //     vueEvents.$emit("queryData", false);
        //     rpc.setClearAllMsg();
        //     rpc.setMapRest();
        // }



    },
};

 src/assets/js/rpc.js

@@ -6,7 +6,8 @@
    liushisijiayuanqudizhibianmafuwu,
    findAddressCandidates,
    getDiKuanFanWei,
    ent_selectByName
    ent_selectByName,
    shengwuSearch
} from "../../api/api";
import vueEvents from "@/utils/vueEvent.js";
let PoiLayerConstructor = Vue.extend(coord);
@@ -25,12 +26,12 @@
    pointerFly: null, //定点漫游
    isShow: false,
    objArr: [],
    pointrange:null,

    //关键字查询
    getFuzzyQuery(res) {
        if(res.message.indexOf('奔驰')>-1){
            store.queryLayer.val ='奔驰公司'
        } else if(res.message.indexOf('永昌')>-1){
            store.queryLayer.val ='永昌工业园'
        }else if(res.message.indexOf('京东')>-1){
            store.queryLayer.val ='京东'
        }else if(res.message.indexOf('小米')>-1){
@@ -39,7 +40,7 @@
            store.queryLayer.val ='博大大厦'
        }else{
          
            //  store.queryLayer.val = res.message;
  store.queryLayer.val = res.message;
        }
     
        this.setClearAllMsg();
@@ -84,20 +85,18 @@

            this.dataQuery = [];
            this.objArr = [];
            this.pointrange = 2000;
            for (var i = 0; i < length; i++) {
                var world = keyWorld[i].word;
               if(world.indexOf('奔驰')>-1){
                   world ='奔驰'
               } else if(world.indexOf('永昌')>-1){
                world ='永昌'
                   world ='奔驰';
                   this.pointrange = 12000
               }else if(world.indexOf('京东')>-1){
                world ='京东'
               }else if(world.indexOf('小米')>-1){
                world ='小米'
               }else if(world.indexOf('博大')>-1){
                world ='博大'
               }else{
               continue;
               }else if(world.indexOf('博大大厦')>-1){
                world ='博大大厦'
               }
                this.setFuzzyQueryData(world, i, length - 1);
            }
@@ -107,7 +106,8 @@
        Promise.all([
            ent_selectByName(res), //企业
            liushisijiayuanqudizhibianmafuwu(res), //园区
            findAddressCandidates(res) //地块
            findAddressCandidates(res) ,//地块,
           
        ]).then(result => {
            var that = this;
            store.queryLayer.data = [];
@@ -159,6 +159,7 @@
                };
                that.objArr.push(itemObj);
            });

            if (index == length) {
                if (that.objArr.length <= 0) {

@@ -589,7 +590,7 @@
            offset: {
                heading: Cesium.Math.toRadians(-200),
                pitch: Cesium.Math.toRadians(-45),
                range: 4000
                range: this.pointrange
            },
            duration: 3
        });

 static/layers.json

@@ -154,6 +154,7 @@
    {
      "id": "33213273",
      "name": "地图数据",
      "disabled": false,
      "children": [
        {
          "id": "AC1CE1F9",

 static/mapData.js

@@ -96,7 +96,7 @@
        lineRoam: ['漫游', '导航'],
        closeRoam: ['停止漫游', '停止导航'],
        localPage: ['一', '二', '三', '四', '五', '六'],
        acceptMsg:['工业园','奔驰','京东','小米','博大','查看第','办事流程']
        acceptMsg:['定位','奔驰','京东','小米','博大大厦','第','办事流程']
    }
};
export default mapData;