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

shuishen

2022-03-18 bf58722dfd03ea1513f3acc7331d4d4403fca76e

 src/components/mobileWindow/index.vue

@@ -31,14 +31,16 @@
          <i class="el-icon-close icon" @click="closeWindow"></i>
        </div>
        <video :src="video" controls="controls" autoplay v-if="video"></video>
        <img :src="url" alt="" v-show="url && !video" />
        <!-- <img :src="url" alt="" v-show="url && !video" /> -->
        <!-- style="width: 100px; height: 100px" -->
        <el-image
          style="width: 100px; height: 100px"
          class="imgs"
          :src="url"
          id="mobileBigImgs"
          v-show="false"
          v-show="url && !video"
          :preview-src-list="srcList"
        >
          <!-- v-show="false" -->
        </el-image>
        <!-- <div>{{ query.query }}</div> -->
        <div class="mobileBig-center-our" v-show="!video">
@@ -99,7 +101,7 @@
      "query",
      "MobileWindowChangeData",
      "audioState",
      "areaLayerSelect",
      // "areaLayerSelect",
    ]),
  },
  watch: {
@@ -267,6 +269,10 @@
        // console.log(this.query.query);
        // that.$store.commit("set_endPosition", this.query.query.lntLat);
        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],
@@ -293,7 +299,7 @@
          doit(res);
        });
      } else if (val == "实景") {
        // console.log(this.panoramaurl, query);
        console.log(this.panoramaurl, query);
        this.$store.commit("MSET_OPENMOBILEPANORAMA", this.panoramaurl);
        return;
        this.$store.commit(
@@ -345,9 +351,9 @@
      if (!this.MobileWindowsHide) {
        let that = this;
        this.$store.dispatch("closeMobileWindowsDom"); //关闭随地图弹窗
        if (that.areaLayerSelect.overlay != undefined) {
          that.areaLayerSelect.overlay.setStyle({
            material: that.areaLayerSelect.color,
        if (window.select.overlay != undefined) {
          window.select.overlay.setStyle({
            material: window.select.color,
            outline: false,
          });