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

shuishen

2022-01-04 4ad9804e68c0fa3fb07a85cefc4d73d9e6f5b268

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

 src/components/mobileCortrol/index.vue

@@ -59,7 +59,7 @@
};
</script>

<style scoped lang='scss'>
<style scoped lang="scss">
.m-left-control {
  position: fixed;
  left: 20px;
@@ -82,7 +82,7 @@
  .m-l-inbut-2d {
    position: relative;
    top: 60px;
    font-size: 14px;
    font-size: 12px;
    // &:hover {
    //   background-color: rgb(21, 136, 230);
    //   box-shadow: -2px -2px 3px rgb(3, 74, 136) inset;

 src/components/mobileCortrolButtom/index.vue

@@ -132,10 +132,10 @@
};
</script>

<style scoped lang='scss'>
<style scoped lang="scss">
.m-left-mobileCortrolButtom {
  position: fixed;
  bottom: 20px;
  bottom: 35px;
  left: 20px;
  z-index: 200;
  .m-l-inbut {

 src/components/mobileCortrolSearch/index.vue

@@ -1,13 +1,20 @@
<template>
  <div class="m-left-mobileCortrolSearch">
    <div class="m-left-SearchMain">
      <el-input placeholder="请输入内容" v-model="input" clearable size="small"
        ><el-button
      <el-input
        placeholder="请输入内容"
        v-model="input"
        clearable
        size="small"
        class="m-left-S-input"
      >
        <el-button
          slot="append"
          class="iconSearch"
          icon="el-icon-search icon"
          @click="search"
        ></el-button>
        >
        </el-button>
      </el-input>
    </div>
  </div>
@@ -42,7 +49,7 @@
};
</script>

<style scoped lang='scss'>
<style scoped lang="scss">
.m-left-mobileCortrolSearch {
  width: 100%;
  position: fixed;
@@ -58,6 +65,9 @@
    display: flex;
    align-items: center;
    justify-content: center;
    .m-left-S-input {
      border: none;
    }
    .iconSearch {
      width: 30px;
      height: 30px;

 src/components/mobilePopupOurAfter/index.vue

@@ -165,6 +165,7 @@
  width: 75%;
  height: 25%;
  background-color: #fff;
  box-shadow: 0px 0px 5px #29baf1;
  // background-image: linear-gradient(
  //     // 135deg,
  //     #28bbf06c 30px,

 src/components/mobilemap/index.vue

@@ -21,6 +21,8 @@
    <mobileGoTo></mobileGoTo>
    <!-- 实景窗口 -->
    <mobilePanorama></mobilePanorama>
    <!-- 盖住左下角 -->
    <div class="cover_mobileMap">智慧校园</div>
  </div>
</template>
<script>
@@ -240,9 +242,6 @@
      viewer.on(that.DC.SceneEventType.CAMERA_CHANGED, (e) => {
        //相机移动最后参数
        //控制高度
        if (that.dimension == "3D") {
          console.log("3维不做高度限制");
        }
        let isSet = that.dimension == "3D" ? false : true;
        const height = Math.ceil(viewer.camera.positionCartographic.height);
        let conBack = (height) => {
@@ -428,7 +427,7 @@
      tilesetLayer["changesilhouetteBlue"] = () => {
        silhouetteBlue.selected = [];
      };
      tilesetLayer.show = false;
      // tilesetLayer.show = false;
      //精细模型↑

      // 2.5D贴图↓
@@ -556,7 +555,7 @@
            ? doit([116.36618337, 27.95911915, 2000.0])
            : doit([117.08513731, 31.64790556, 600.0]);
        };
        startPoint(1);
        // startPoint(1);
      }
      //传递默认位置
      that.$store.commit("MSET_MORENWEIZHI", startPoint);
@@ -618,7 +617,15 @@
      viewer.zoomController.enable = true;
      viewer.locationBar.enable = false;
      viewer.distanceLegend.enable = false;
      if (true) {
      //判断默认维度
      //原本默认是2.5d  改为3d默认时做出改变
      if (that.dimension == "2.5D") {
        that.$store.commit("MSET_DIMENSION", "2.5D"); //切换2.5D设置
      } else if (that.dimension == "3D") {
        that.$store.commit("MSET_DIMENSION", "3D"); //切换3D设置
      }
      if (false) {
        //镜头改变示例
        // viewer.scene.screenSpaceCameraController.enableZoom = false; //控制视角缩放
        // viewer.scene.screenSpaceCameraController.enableTilt = false; //控制视角旋转
        // viewer.scene.screenSpaceCameraController.minimumZoomDistance = 200; //最小缩放

 src/store/modules/mobile.js

@@ -30,7 +30,7 @@
    },
    // 默认起始点函数
    startPointFn: "",
    dimension: "2.5D", // 维度
    dimension: "3D", // 维度
    dimensionData: {
      // 维度镜头数据
      heading: 0,

 src/styles/mobile/popup.scss

@@ -48,7 +48,10 @@
            width: 100%;
            height: 35px;
            // background-image: linear-gradient(135deg, transparent 25px, #29baf1 25px);
            background-image: linear-gradient(rgba(41, 186, 241, 0.5), rgba(41, 186, 241, 0.5));
      background-image: linear-gradient(
        rgba(41, 186, 241, 0.5),
        rgba(41, 186, 241, 0.5)
      );

            // background-image: linear-gradient(#29baf1, #28bbf0);
            // background-color: #f7f7f7;
@@ -151,7 +154,10 @@
                border-radius: 0 0 10px 10px;
                display: flex;
                align-items: center;
                background-image: linear-gradient(rgba(41, 186, 241, 0.5), rgba(41, 186, 241, 0.5));
        background-image: linear-gradient(
          rgba(41, 186, 241, 0.5),
          rgba(41, 186, 241, 0.5)
        );
                // background-image: linear-gradient(#29baf1, #28bbf0);
                justify-content: center;
                position: relative;
@@ -485,3 +491,21 @@
        height: $size;
    }
}

//搜索框
.m-left-SearchMain .el-input__inner {
  border-right: 1px transparent !important;
}

//盖住
.cover_mobileMap {
  position: fixed;
  bottom: 6px;
  left: 7px;
  background-color: #000;
  color: #fff;
  z-index: 1;
  font-size: 13px;
  border-radius: 5px;
  padding: 3px 8px 4px;
}