[viewer]解决合并冲突

Jin Lei

2023-11-11 076cd08a4abcae33957e4de5b15babfcb6fed8ce

 src/components/menu/bottom-menu.vue

@@ -23,7 +23,7 @@
          <img src="@assets/img/new/chengshibujian.png" alt="" />
        </div>
        <div class="textbox">
          <span> 城市部件 </span>
          <span> 综合扩展 </span>
        </div>
        <el-dropdown-menu
          slot="dropdown"
@@ -36,10 +36,12 @@
          <el-dropdown-item command="bzdSystem"
            >标准地监管平台</el-dropdown-item
          >
          <el-dropdown-item command="spjkHandle"
          <el-dropdown-item v-if="isShowSPJK" command="spjkHandle"
            >视频集成与可视化</el-dropdown-item
          >

          <el-dropdown-item v-else command="closeSpjk"
            >关闭视频点位分布</el-dropdown-item
          >
          <el-dropdown-item v-if="isShowSjxl" command="sjxlHandle"
            >手机信令热力分布</el-dropdown-item
          >
@@ -65,8 +67,11 @@
        >
          <el-dropdown-item command="fcfhHandle">分层分户</el-dropdown-item>
          <!-- <el-dropdown-item command="sprhHandle">场景视频融合</el-dropdown-item> -->
          <el-dropdown-item command="jiqirendahui"
          <el-dropdown-item v-if="isShowSPRH" command="jiqirendahui"
            >场景视频融合</el-dropdown-item
          >
          <el-dropdown-item v-else command="jiqirendahui"
            >关闭视频融合</el-dropdown-item
          >
        </el-dropdown-menu>
      </el-dropdown>
@@ -341,6 +346,9 @@
  width: 155px;
  border: none;
}
.el-dropdown /deep/ .el-dropdown-selfdefine{
  margin-left: 8px !important;
}
.csbj .el-dropdown-menu {
  top: -215px !important;
}
@@ -428,6 +436,9 @@
  name: "bottom-menu",
  data() {
    return {
      isShowSPJK: true,
      isShowSjxl: true,
      isShowSPRH: true,
      csbjShow: false,
      jxmxShow: false,
      romanOption: [
@@ -609,7 +620,6 @@
      // 透明度
      far: 166,
      videoarrList: [],
      isShowSjxl: true,
    };
  },
  computed: {
@@ -637,6 +647,9 @@
        case "spjkHandle":
          this.spjkHandle();
          break;
        case "closeSpjk":
          this.closeSpjk();
          break;
        case "stdsjHandle":
          this.stdsjHandle();
          break;
@@ -653,7 +666,7 @@
          this.shoujixinling();
          break;
        case "closeSjxl":
          this.guanbi();
          this.closeSjxl();
          break;
        case "csgxHandle":
          this.csgxHandle();
@@ -664,19 +677,40 @@
      }
    },
    tdglHandle() {
      if (!this.viewer1Show) {
        const loading = this.$loading({
          lock: true,
          text: "土地管理功能加载中，请稍后",
          spinner: "el-icon-loading",
          background: "rgba(0, 0, 0, 0.7)",
        });
        setTimeout(() => {
          loading.close();
        }, 3500);
      }

      this.setViewer1Show(!this.viewer1Show);
    },
    stdsjHandle() {
      // window.location.href =
      //   "http://10.9.2.29:8080/#/login?token=1ed14c5157acb8088efe65bc93a032c3";
      window.open(
        "http://10.9.2.29:8080/#/login?token=1ed14c5157acb8088efe65bc93a032c3"
      );
    },
    bzdSystem() {
      window.open(
        "http://192.162.24.2:8076/login"
      );
      window.open("http://192.162.24.2:8076/login");
    },
    shoujixinling() {
      const loading = this.$loading({
        lock: true,
        text: "手机信令数据加载中，请稍后",
        spinner: "el-icon-loading",
        background: "rgba(0, 0, 0, 0.7)",
      });
      setTimeout(() => {
        loading.close();
      }, 2000);
      this.isShowSjxl = false;
      let heatMapUrl = URLInCode.heatMapUrl;
      sgworld.Core.getJSON(heatMapUrl, (data) => {
@@ -705,7 +739,7 @@
        });
      });
    },
    guanbi() {
    closeSjxl() {
      if (heatMapItem) {
        this.isShowSjxl = true;
        heatMapItem.deleteObject();
@@ -762,6 +796,16 @@
      });
    },
    spjkHandle() {
      const loading = this.$loading({
        lock: true,
        text: "视频点位数据加载中，请稍后",
        spinner: "el-icon-loading",
        background: "rgba(0, 0, 0, 0.7)",
      });
      setTimeout(() => {
        loading.close();
      }, 2000);
      this.isShowSPJK = false;
      if (window.sxtkGeojson) {
        window.sxtkGeojson.deleteObject();
        window.sxtkGeojson = null;
@@ -775,23 +819,51 @@
        // this.spjkLoad();
      }
    },
    closeSpjk() {
      this.isShowSPJK = true;
      if (window.sxtkGeojson) {
        window.sxtkGeojson.deleteObject();
        window.sxtkGeojson = null;
        window.sxthandler.destroy();
        //关闭弹窗
        Bus.$emit("closeRightPop", true);
        layuiLayer.close(SmartEarthPopupData.layerProp);
        return;
      } else {
        Bus.$emit("closeSPJK");
        // this.spjkLoad();
      }
    },
    // 分层分户
    fencengfenhu() {
      Bus.$emit("switchImage");
      const loading = this.$loading({
        lock: true,
        text: "建筑实景模型加载中，请稍后",
        spinner: "el-icon-loading",
        background: "rgba(0, 0, 0, 0.7)",
      });
      setTimeout(() => {
        loading.close();
      }, 2000);
      Bus.$emit("ShowFCFH", true);
    },
    // 机器人大会视频融合
    async jiqirendahui(item) {
      Bus.$emit("switch3D");
      var that = this;
      this.isShowSPRH = false;
      if (that.robotvideoarrList.length > 0) {
        for (var i = 0; i < that.robotvideoarrList.length; i++) {
          that.robotvideoarrList[i].destroy();
          that.robotvideoarrList[i] = undefined;
        }
        that.robotvideoarrList = [];
        this.isShowSPRH = true;
      } else {
        const loading = this.$loading({
          lock: true,
          text: "Loading",
          text: "视频数据加载中，请稍后",
          spinner: "el-icon-loading",
          background: "rgba(0, 0, 0, 0.7)",
        });
@@ -807,7 +879,6 @@
              item[i].cameraIndexCode,
            // url: "http://10.10.4.116:8086/getCamerasInfoHls?cameraIndexCode=49ee9fed701444738112e80a4835122c",
            success: function (result) {
              loading.close();
              video = sgworld.Creator.Video3D({
                cameraPosition: position, //相机安装位置
                heading: item[i].heading, //64
@@ -823,6 +894,7 @@
                useLine: false, //是否试用辅助线
                success() {
                  sgworld.Navigate.flyToObj(video);
                  loading.close();
                },
              });
              that.robotvideoarrList.push(video);