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

shuishen

2022-02-09 cfa95f03007b221f1e00f4bf5cd29c3ccea3a0a7

 src/components/mobileWindow/index.vue

@@ -67,7 +67,9 @@
                : item.name == '图集'
                ? 'el-icon-data-board'
                : item.name == '去这'
                ? 'el-icon-finished'
                ? quzheD
                  ? 'el-icon-loading'
                  : 'el-icon-finished'
                : item.name == '视频' || item.name == '返回'
                ? 'el-icon-video-camera-solid'
                : ''
@@ -97,11 +99,13 @@
      "query",
      "MobileWindowChangeData",
      "audioState",
      "areaLayerSelect",
    ]),
  },
  watch: {
    MobileWindowChangeData() {
      this.$store.dispatch("MSET_GETAUDIOBEGIN", "notOpen");
      this.quzheD = false;
      //数据更改
      //   this.fullscreenLoading = true;
      if (!this.MobileWindowsHide) {
@@ -121,6 +125,11 @@
            this.seebut.push({
              name: "显示活动",
            });
            if (queryData.notAddGoOn == "notAddGoOn") {
              this.seebut.push({
                name: "去这",
              });
            }
          }
          for (let k in this.seebut) {
            if (this.seebut[k].name == "定位") {
@@ -237,6 +246,7 @@
      seebut: [],
      center: [],
      panoramaurl: "",
      quzheD: false, //是否点击了去这，并不能再按，以及不应用路线导航
    };
  },
  methods: {
@@ -245,29 +255,47 @@
      that.routerS = [];
      let once = true;
      let query = this.query.query;
      // console.log(query);
      if (val == "去这") {
        if (that.quzheD) {
          console.log("不可点击");
          return;
        }
        that.quzheD = true;
        // return;
        //定位
        // console.log(this.query.query);
        // that.$store.commit("set_endPosition", this.query.query.lntLat);
        let ints = {
          // start: [114.039946, 27.628475],
          // end: that.query.query.lntLat,
          start: [+that.query.query.lntLat[0], +that.query.query.lntLat[1]],
          end: [114.031946, 27.621475],
          type: "driving",
          fn: function (datas) {
            //获取回调路径
            that.routerS.push(datas);
            if (once) {
              once = false;
              //加载第一条线路
              that.$store.commit("set_choiceRouterS", 0);
              that.$store.dispatch("MSET_DRAWALINELAYER", [datas.Str, query]);
              that.$store.commit("cameraSetView", ints.start);
            }
          },
        let doit = (now) => {
          if (now[0] == "失败") {
            that.quzheD = false;
            return;
          }
          let ints = {
            start: [+now[0], +now[1]],
            end: [+query.lntLat[0], +query.lntLat[1], 360],
            // start: [+query.lntLat[0], +query.lntLat[1], 360],
            // end: [114.031946, 27.621475],
            type: "driving",
            fn: function (datas) {
              //获取回调路径
              that.routerS.push(datas);
              that.quzheD = false;
              if (once) {
                once = false;
                //加载第一条线路
                that.$store.commit("set_choiceRouterS", 0);
                that.$store.dispatch("MSET_DRAWALINELAYER", [datas.Str, query]);
                that.$store.commit("cameraSetView", ints.start);
              }
            },
          };
          that.$store.dispatch("MSET_GOTOWHERE", ints);
        };
        that.$store.dispatch("MSET_GOTOWHERE", ints);
        that.$store.commit("GET_NOWPOSITION", (res) => {
          console.log(res);
          doit(res);
        });
      } else if (val == "实景") {
        // console.log(this.panoramaurl, query);
        this.$store.commit("MSET_OPENMOBILEPANORAMA", this.panoramaurl);
@@ -319,7 +347,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() {