Merge branch 'master' of http://192.168.0.105:10010/r/school-web

shuishen

2022-01-20 09d137249b4ee41603a8e4becc41923b99f13e95

 src/components/mobileWindow/index.vue

@@ -97,6 +97,7 @@
      "query",
      "MobileWindowChangeData",
      "audioState",
      "areaLayerSelect",
    ]),
  },
  watch: {
@@ -108,7 +109,7 @@
        this.video = ""; //清除视频
        this.seebut = []; //清除按钮
        let queryData = this.query.query;
        console.log(queryData, 789);
        // console.log(queryData, 789);
        this.title = queryData.name;

        if (queryData.seebut) {
@@ -121,6 +122,11 @@
            this.seebut.push({
              name: "显示活动",
            });
            if (queryData.notAddGoOn == "notAddGoOn") {
              this.seebut.push({
                name: "去这",
              });
            }
          }
          for (let k in this.seebut) {
            if (this.seebut[k].name == "定位") {
@@ -134,9 +140,9 @@
          }
        } else {
          this.seebut = [
            {
              name: "实景",
            },
            // {
            //   name: "实景",
            // },
            {
              name: "图集",
            },
@@ -145,6 +151,7 @@
            },
          ];
        }
        //图集
        if (queryData.bgImg) {
          this.srcList = queryData.bgImg.split(",");
          this.url = this.srcList[0];
@@ -153,6 +160,7 @@
            return res.name != "图集";
          });
        }
        //视频
        if (queryData.video) {
          if (queryData.from == "labels") {
            this.seebut = [];
@@ -161,6 +169,20 @@
            this.seebut.push({ name: "视频" });
          }
        }
        //全景
        if (queryData.panoramaurl) {
          this.panoramaurl = queryData.panoramaurl;
          this.seebut = this.seebut.filter((res) => {
            return res.name != "实景";
          });
          this.seebut.splice(0, 0, { name: "实景" });
        } else {
          this.panoramaurl = "";
          this.seebut = this.seebut.filter((res) => {
            return res.name != "实景";
          });
        }
        //中心内容
        this.center = [];
        for (let k in queryData) {
          for (let n in this.getCenter) {
@@ -220,6 +242,7 @@
      srcList: [],
      seebut: [],
      center: [],
      panoramaurl: "",
    };
  },
  methods: {
@@ -228,6 +251,7 @@
      that.routerS = [];
      let once = true;
      let query = this.query.query;
      // console.log(query);
      if (val == "去这") {
        //定位
        // console.log(this.query.query);
@@ -235,7 +259,7 @@
        let ints = {
          // start: [114.039946, 27.628475],
          // end: that.query.query.lntLat,
          start: [+that.query.query.lntLat[0], +that.query.query.lntLat[1]],
          start: [+query.lntLat[0], +query.lntLat[1], 360],
          end: [114.031946, 27.621475],
          type: "driving",
          fn: function (datas) {
@@ -252,6 +276,9 @@
        };
        that.$store.dispatch("MSET_GOTOWHERE", ints);
      } else if (val == "实景") {
        // console.log(this.panoramaurl, query);
        this.$store.commit("MSET_OPENMOBILEPANORAMA", this.panoramaurl);
        return;
        this.$store.commit(
          "MSET_OPENMOBILEPANORAMA",
          "https://www.kuleiman.com/110487/index.html?m=1"
@@ -299,7 +326,16 @@
    },
    closeWindow() {
      if (!this.MobileWindowsHide) {
        let that = this;
        this.$store.dispatch("closeMobileWindowsDom"); //关闭随地图弹窗
        if (that.areaLayerSelect.overlay != undefined) {
          that.areaLayerSelect.overlay.setStyle({
            material: that.areaLayerSelect.color,
            outline: false,
          });

          that.$store.commit("mset_changeSelect", [undefined, undefined]);
        }
      }
    },
    openAudio() {