[viewer]解决合并冲突

Jin Lei

2023-11-11 076cd08a4abcae33957e4de5b15babfcb6fed8ce

 src/components/right/right-bottom.vue

@@ -1,7 +1,7 @@
<template>
  <div class="rightBottom trigger" id="rightBottom">
    <div class="mapTools">
      <!-- <div class="mapTool">
      <div class="mapTool">
        <el-tooltip
          class="item"
          effect="dark"
@@ -10,38 +10,10 @@
          popper-class="item_tooltip"
        >
          <div class="legend-bg" @click="maskingOut">
            <img class="legendImg" src="@/assets/img/new/mengban.png" />
            <img class="legendImg" src="@/assets/img/new/mengbanbai.png" />
          </div>
        </el-tooltip>
      </div> -->
      <!-- <div class="mapTool">
        <el-tooltip
          class="item"
          effect="dark"
          content="相机参数"
          placement="left"
          popper-class="item_tooltip"
        >
          <div class="legend-bg" @click="getcamera">
            <img class="legendImg" src="@/assets/img/new/mengban.png" />
          </div>
        </el-tooltip>
      </div> -->

      <!-- <div class="mapTool">
        <el-tooltip
          class="item"
          effect="dark"
          content="超图"
          placement="left"
          popper-class="item_tooltip"
        >
          <div class="legend-bg" @click="S3M()">
            <img class="legendImg" src="@/assets/img/new/mengban.png" />
          </div>
        </el-tooltip>
      </div> -->

      </div>
      <div class="mapTool">
        <el-tooltip
          class="item"
@@ -55,7 +27,7 @@
          </div>
        </el-tooltip>
      </div>
      <div class="mapTool">
      <!-- <div class="mapTool">
        <el-tooltip
          class="item"
          effect="dark"
@@ -67,7 +39,7 @@
            <img class="dwImg" src="@/assets/img/new/location.png" />
          </div>
        </el-tooltip>
      </div>
      </div> -->
      <div class="mapTool">
        <el-tooltip
          class="item"
@@ -94,7 +66,7 @@
          </div>
        </el-tooltip>
      </div>
      <div class="mapTool" v-if="isActive">
      <!-- <div class="mapTool" v-if="isActive">
        <el-tooltip
          class="item"
          effect="dark"
@@ -119,7 +91,7 @@
            <img class="qpImg" src="@/assets/img/new/tuichuquanping.png" />
          </div>
        </el-tooltip>
      </div>
      </div> -->
      <div class="mapTool">
        <el-tooltip
          class="item"
@@ -146,6 +118,32 @@
          </div>
        </el-tooltip>
      </div>
      <!-- <div class="mapTool">
        <el-tooltip
          class="item"
          effect="dark"
          content="场景快照"
          placement="left"
          popper-class="item_tooltip"
        >
          <div class="legend-bg" @click="screenShot">
            <img class="legendImg" src="@/assets/img/new/mengban.png" />
          </div>
        </el-tooltip>
      </div> -->
      <!-- <div class="mapTool">
        <el-tooltip
          class="item"
          effect="dark"
          content="相机参数"
          placement="left"
          popper-class="item_tooltip"
        >
          <div class="legend-bg" @click="getcamera">
            <img class="legendImg" src="@/assets/img/new/mengban.png" />
          </div>
        </el-tooltip>
      </div> -->
      <!-- <div class="mapTool">
        <el-tooltip class="item" effect="dark" content="二三维切换" placement="left">
          <el-button class="tool-23mode" @click="_23mode">
@@ -198,9 +196,7 @@
.trigger {
  pointer-events: all;
}
.mapTools {
  /* margin-bottom: 58px; */
}

.mapTool {
  margin: 2px 0;
}
@@ -208,8 +204,8 @@
  background-image: url("~@/assets/img/new/leftCircle.png");
  background-size: 100%;
  background-color: transparent;
  width: 54.5px;
  height: 54.5px;
  width:  35px;
  height:  35px;
  position: relative;
}
.legend-bg:hover {
@@ -225,8 +221,8 @@
/* 
.mapTool .el-button {
  padding: 0 !important;
  width: 54.5px;
  height: 54.5px;
  width:  30px;
  height:  30px;
  border: unset;
  float: unset;
  display: block;
@@ -240,7 +236,7 @@
  top: 50%;
  left: 50%;
  transform: translate(-50%, -50%);
  width: 28px;
  width: 20px;
}

.button-group-vertical {
@@ -384,28 +380,32 @@
    },

    maskingOut() {
      // if (!window.maskinglayer) {
      //   window.maskinglayer = sgworld.Creator.createImageryProvider(
      //     "蒙版",
      //     "wms",
      //     {
      //       url: "http://10.10.4.116:8070/gisserver/wmsserver/WaiWeiMengBan",
      //       layers: "",
      //       parameters: {
      //         format: "image/png",
      //         transparent: true,
      //         alpha: 1,
      //       },
      //     },
      //     "0",
      //     15, //zindex
      //     true,
      //     ""
      //   );
      // } else {
      //   window.maskinglayer.deleteObject();
      //   window.maskinglayer = null;
      // }
      if (!window.maskinglayer) {
        window.maskinglayer = sgworld.Creator.createImageryProvider(
          "蒙版",
          "wms",
          {
            url: "http://10.10.4.121:8070/gisserver/wmsserver/WaiWeiMengBan",
            layers: "",
            parameters: {
              format: "image/png",
              transparent: true,
              alpha: 1,
            },
          },
          "0",
          15, //zindex
          true,
          ""
        );
      } else {
        window.maskinglayer.deleteObject();
        window.maskinglayer = null;
      }
    },
    screenShot() {
      sgworld.tools.browse();
      sgworld.Analysis.createScreenshot();
    },
    S3M() {
      var promise = Viewer.scene.open(