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

shuishen

2022-01-20 3ea790ec7b0280a55cc406d2c3dc9fa5411a7471

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

 src/api/mobile/buildsClock/buildsClock.js

New file
@@ -0,0 +1,16 @@
/*
 * @Author: Morpheus
 * @Date: 2021-05-09 15:17:44
 * @Last Modified by: liu
 * @Last Modified time: 2022-01-20 16:47:43
 */
// 党群机构
import request from "@/router/axios";

export const getBuildClock = (params) => {
  return request({
    url: `/blade-architecture/architecture/detail`,
    method: "get",
    params: params,
  });
};

 src/components/mobileCortrol/index.vue

@@ -15,7 +15,7 @@
      :class="{ active: dimension == '2.5D' }"
      @click="zoomIn('2.5D')"
    >
      2.5维
      3D
    </div>
  </div>
</template>

 src/components/mobileLeftNav/index.vue

@@ -9,6 +9,7 @@
        v-for="(item, index) in leftNavData"
        :key="index"
        @click="leftNavClick(item)"
        v-show="!item.notShow"
      >
        <img :style="[imgStyle]" :src="item.img" alt="" />
        <span>{{ item.label }}</span>
@@ -58,9 +59,10 @@
      },
      leftNavData: [
        {
          flag: false,
          flag: true,
          label: "标签",
          img: "/img/leftnav/tag.png",
          // img: "/img/leftnav/tag.png",
          img: "/img/leftnav/tag-checked.png",
          normal: "/img/leftnav/tag.png",
          checked: "/img/leftnav/tag-checked.png",
          layer: "tagLayer",
@@ -121,6 +123,7 @@
          type: 9,
          imgSrc: "img/leftnav/map-aed.png",
          // imgSrc: "img/mobile/pink.png",
          notShow: true,
        },
        {
          flag: false,
@@ -377,9 +380,16 @@
            that[that.leftNavData[n].layer].addOverlay(divIcon); //加入图标
          }
          that[that.leftNavData[n].layer]["positions"] = position;
          that[that.leftNavData[n].layer].show = false;
          if (that.leftNavData[n].layer == "tagLayer") {
            // that.leftNavData[n].img = that.leftNavData[n].checked;
          } else {
            that[that.leftNavData[n].layer].show = false;
          }
        });
      }
      // setTimeout(() => {
      //   this.tagLayer.show = false;
      // }, 500);
    },
    changePoiton(data) {
      // console.log(data);
@@ -422,7 +432,7 @@
  .m-left-coutrol {
    position: absolute;
    left: -24px;
    top: 96px;
    top: 79px;
    width: 25px;
    height: 60px;
    background-color: #fff;

 src/components/mobilemap/index.vue

@@ -34,6 +34,7 @@
</template>
<script>
import axios from "axios";
import { getBuildClock } from "@/api/mobile/buildsClock/buildsClock"; // 楼栋详情
import { mapGetters } from "vuex";
export default {
  name: "mobilemapBox",
@@ -560,20 +561,49 @@
              ),
            });
          }
          // 定制化窗体
          that.openPopupS(
            {},
            [e.wgs84SurfacePosition.lng, e.wgs84SurfacePosition.lat],
            {
              name: "楼栋号:" + e.overlay.attr["楼栋号"],
              bgImg:
                "http://223.82.109.183:2081/zhxy/upload/20220105/3c05dd70a9eac17b7e49afbfc7b1b68e.png",
              address: "",
              introduce: "",
              data: e,
              lntLat: [e.wgs84SurfacePosition.lng, e.wgs84SurfacePosition.lat],
            }
          );

          //如果是地图点击建筑，调用接口查详情
          let ids =
            e.overlay.attr["楼栋号"] == "8栋"
              ? "9栋"
              : e.overlay.attr["楼栋号"] == "9栋"
              ? "8栋"
              : e.overlay.attr["楼栋号"];
          let eIntlat = [
            e.wgs84SurfacePosition.lng,
            e.wgs84SurfacePosition.lat,
          ];
          getBuildClock({
            mechanismname: "香琴湾" + ids,
          }).then((res) => {
            const item = res.data.data;
            // data.query.bgImg = ds.mechanismname;
            // data.query.name = ds.tpurl;
            // data.query.panoramaurl = ds.panoramaurl;
            // data.query.bgImg = ds.tpurl;
            // data.query.bgImg = ds.tpurl;
            let useData = {
              name: item.mechanismname,
              lntLat: eIntlat,
              alt: item.gd,
              heading: item.heading,
              pitch: item.pitch,
              roll: item.roll,
              bgImg: item.tpurl,
              QRImg: item.codeurl,
              websiteUrl: item.websiteurl,
              telePhone: item.telephone,
              address: item.address,
              introduce: item.introduce,
              video: item.videourl,
              buts: ["定位", "实景", "图集"],
              panoramaurl: item.panoramaurl, //全景
            };
            // 定制化窗体
            // console.log(item, useData, "111111");
            // return;
            that.openPopupS({}, eIntlat, useData);
          });
        } else {
          if (that.areaLayerSelect.overlay != undefined) {
            that.areaLayerSelect.overlay.setStyle({