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

shuishen

2021-12-23 9e43f80d96bda7f1108dcfcfd7340e567f2e48d0

 src/components/mobileCortrolButtom/index.vue

@@ -1,6 +1,6 @@
<template>
  <div class="m-left-mobileCortrolButtom">
    <div class="m-l-inbut" @click="mubiao"><i class="el-icon-s-help"></i></div>
    <!-- <div class="m-l-inbut" @click="mubiao"><i class="el-icon-s-help"></i></div> -->
    <div class="m-l-inbut">
      <!-- <i class="el-icon-s-flag"></i> -->
      <el-dropdown trigger="click" @command="handleCommand">
@@ -20,7 +20,7 @@
    <div class="m-l-inbut" @click="openBigPopupAfter">
      <i class="el-icon-menu"></i>
    </div>
    <div class="m-l-inbut" @click="goOn"><i class="el-icon-location"></i></div>
    <!-- <div class="m-l-inbut" @click="goOn"><i class="el-icon-location"></i></div> -->
  </div>
</template>

@@ -40,16 +40,16 @@
          lat: 28.74382592,
        },
        {
          lnt: 121.50266534548483,
          lat: 31.24357506330159,
          lnt: 115.86711312,
          lat: 28.74615701,
        },
        {
          lnt: 121.56405019,
          lat: 31.20845211,
          lnt: 115.86972136,
          lat: 28.74609846,
        },
        {
          lnt: 121.55500463461836,
          lat: 31.257934074839717,
          lnt: 115.86983129,
          lat: 28.741337,
        },
      ],
    };
@@ -71,12 +71,16 @@
      let that = this;
      console.log(command, "定位");
      // 定位
      this.$store.commit("MSETCC_SETCC", {
        lntLat: [command.lnt, command.lat],
      });
      this.$store.dispatch("mapFlyTo", {
        //飞入
        lntLat: [command.lnt, command.lat, 2530],
        lntLat: [command.lnt, command.lat, 500],
        heading: 0,
        pitch: -45,
        roll: 0,
        noOpen: true,
      });
    },
    openBigPopupAfter() {
@@ -137,12 +141,12 @@
    float: left;
    width: 39px;
    height: 39px;
    background-color: #c9302c;
    background-color: rgb(33, 150, 243);
    display: flex;
    align-items: center;
    justify-content: center;
    color: white;
    font-size: 22px;
    font-size: 32px;
    margin-left: 12px;
    border-radius: 5px;
    .icons {
@@ -151,7 +155,7 @@
      height: 100%;
    }
    .icon {
      font-size: 20px;
      font-size: 32px;
      color: #fff;
      &::before {
        width: 100%;