解决冲突

lixuliang

2023-11-15 f263e0396359ac7686e68ce0e1a2e2ef6419906d

解决冲突

 src/components/map/viewer.vue

@@ -2,54 +2,30 @@
  <div>
    <div id="sdkContainer"></div>
    <div class="listBox" v-show="viewer1Show && !isLand">
      <ul>
        <li
          v-for="(item, index) in arr"
          :key="index"
          @click="changeLeftMap($event, item, index)"
        >
      <ul id="viewer_lsyx">
        <li v-for="(item, index) in arr" :key="index" @click="changeLeftMap($event, item, index)">
          {{ item }}
        </li>
      </ul>
    </div>
    <layerTreeTwoScreen v-if="layerTreeTwoScreen" />
    <!-- <div id="bottomInfo" v-html="bottomInfo"></div> -->
    <div
      id="switchImagerLayer"
      :style="{
    <div id="switchImagerLayer" :style="{
        transform: `scale(${scale}) translate(${offset},${offset})`,
        '-webkit-transform': `scale(${scale}) translate(${offset},${offset})`,
        '-moz-transform': `scale(${scale}) translate(${offset},${offset})`,
        '-o-transform': `scale(${scale}) translate(${offset},${offset})`,
        '-ms-transform': `scale(${scale}) translate(${offset},${offset})`,
      }"
    >
      <transition
        name="animate__animated animate__bounce"
        @click="switchImagerLayerShowOrHide"
        enter-active-class="animate__backInRight"
        leave-active-class="animate__backOutRight"
        appear
      >
    }">
      <transition name="animate__animated animate__bounce" @click="switchImagerLayerShowOrHide"
        enter-active-class="animate__backInRight" leave-active-class="animate__backOutRight" appear>
        <switchImagerLayer ref="switchImagerLayer" v-show="switchImagerLayer" />
      </transition>

      <img
        class="swichImg"
        @click="switchImagerLayerShowOrHide"
        :src="switchImage"
      />
      <img class="swichImg" @click="switchImagerLayerShowOrHide" :src="switchImage" />
      <div class="bgbox">
        <img
          class="swichImg"
          @click="switchImagerLayerShowOrHide"
          src="@/assets/img/new/shiliang.png"
        />
        <img
          class="swichImg bgbox"
          @click="switchImagerLayerShowOrHide"
          src="@/assets/img/new/shiliang.png"
        />
        <img class="swichImg" @click="switchImagerLayerShowOrHide" src="@/assets/img/new/shiliang.png" />
        <img class="swichImg bgbox" @click="switchImagerLayerShowOrHide" src="@/assets/img/new/shiliang.png" />
      </div>
    </div>
  </div>
@@ -101,11 +77,17 @@
    viewer1Show(newvalue, oldvalue) {
      if (!newvalue) {
        this.destroyImageLayer();
      } else {
        if (!this.isLand) {
          this.initLSYX();
        }
      }
    },
    isLand(newvalue, oldvalue) {
      if (newvalue) {
        this.destroyImageLayer();
      } else {
        this.initLSYX();
      }
    },
  },
@@ -279,6 +261,11 @@
        this.destroyImageLayer();
      }
    },
    initLSYX() {
      let ul = document.getElementById("viewer_lsyx");
      let lis = ul.getElementsByTagName('li');
      lis[19].click();
    },
    destroyImageLayer() {
      if (activeLi) {
        activeLi.classList.remove("active");
@@ -309,9 +296,14 @@
        nLayer = null;
      }
      nLayer = this.loadBJ54ImageLayer(year);
      if (!LWLayer) {
      if (!LWLayer||Viewer.imageryLayers.indexOf(LWLayer)<0) {
        if(LWLayer)
        {
          LWLayer.destroy();
        }
        LWLayer = this.loadBJ54LWLayer();
      }

    },
    loadBJ54LWLayer() {
      let url = "http://172.26.64.84/service/ImageEngine/picdis/abc";

 src/components/map/viewer1.vue

@@ -2,20 +2,13 @@
  <div>
    <div id="sdkContainer1" style="height: 100%"></div>
    <div class="listBox" v-show="!isLand">
      <ul>
        <li
          v-for="(item, index) in arr"
          :key="index"
          @click="changeLeftMap($event, item, index)"
        >
      <ul id="viewer1_lsyx">
        <li v-for="(item, index) in arr" :key="index" @click="changeLeftMap($event, item, index)">
          {{ item }}
        </li>
      </ul>
    </div>
    <layerTreeTwoScreenRight
      v-if="layerTreeTwoScreen"
      id="layerTreeTwoScreen111"
    />
    <layerTreeTwoScreenRight v-if="layerTreeTwoScreen" id="layerTreeTwoScreen111" />
    <div class="tdInfo" v-if="showTDinfo">
      <div class="tdInfo_close" @click="tdInfoClose">×</div>
      <p v-if="dikuanxinxi" class="noInfo">暂无该地块信息</p>
@@ -52,12 +45,7 @@
        <div v-else class="title">
          <li>
            企业
            <el-tooltip
              class="item"
              effect="dark"
              content="点击查看企业信息"
              placement="bottom"
            >
            <el-tooltip class="item" effect="dark" content="点击查看企业信息" placement="bottom">
              <a @click="showYZCQY"> {{ qysl }}</a>
            </el-tooltip>
            家
@@ -95,18 +83,10 @@
              :inline="true"
            >
              <el-form-item label="查询内容" prop="name">
                <el-input
                  v-model="queryForm.content"
                  placeholder="请输入查询内容"
                />
                <el-input v-model="queryForm.content" placeholder="请输入查询内容" />
              </el-form-item>
              <el-form-item>
                <el-button
                  @click="queryInfo('queryForm')"
                  icon="el-icon-search"
                  class="primary"
                  >查询</el-button
                >
                <el-button @click="queryInfo('queryForm')" icon="el-icon-search" class="primary">查询</el-button>
              </el-form-item>
            </el-form>
          </div>
@@ -148,12 +128,7 @@
            ></el-table-column> -->
            <el-table-column label="操作" width="80">
              <template slot-scope="scope">
                <el-button
                  @click="handleClick(scope.row)"
                  type="text"
                  size="small"
                  >详情</el-button
                >
                <el-button @click="handleClick(scope.row)" type="text" size="small">详情</el-button>
              </template>
            </el-table-column>
          </el-table>
@@ -198,7 +173,7 @@
  activeLi,
  nLayer,
  TDLayer,
  LWLayer;
  LWLayer1;
export default {
  name: "viewer1",
  components: { layerTreeTwoScreenRight },
@@ -265,6 +240,8 @@
            );
          }
        }, 2000);


      },
    },
    isLand(newvalue, oldvalue) {
@@ -279,6 +256,7 @@
        if (line1) {
          sgworld1.Creator.DeleteObject(line1);
        }
        this.initLSYX();
      } else {
        this.destroyImageLayer();
        if (!TDLayer) {
@@ -331,6 +309,9 @@
          if (this.isLand) {
            this.loadTDGLLayer();
          }
          else {
            this.initLSYX();
          }
          var p = {
            destination: sgworld.Navigate.getPosition(),
            orientation: {
@@ -370,6 +351,11 @@
    });
  },
  methods: {
    initLSYX() {
      let ul = document.getElementById("viewer1_lsyx");
      let lis = ul.getElementsByTagName('li');
      lis[9].click();
    },
    setImageComparison(isStart) {
      this.isImage = isStart;
      if (!this.isImage) {
@@ -385,9 +371,9 @@
        Viewer1.imageryLayers.remove(nLayer, true);
        nLayer = null;
      }
      if (LWLayer) {
        Viewer1.imageryLayers.remove(LWLayer, true);
        LWLayer = null;
      if (LWLayer1) {
        Viewer1.imageryLayers.remove(LWLayer1);
        LWLayer1 = undefined;
      }
    },
    changeLeftMap(event, item, index) {
@@ -406,11 +392,16 @@
        nLayer = null;
      }
      nLayer = this.loadBJ54ImageLayer(year);
      if (!LWLayer) {
        LWLayer = this.loadBJ54LWLayer();

      if (!LWLayer1 || Viewer1.imageryLayers.indexOf(LWLayer1) < 0) {
        if(LWLayer1)
        {
          LWLayer1.destroy();
        }
        LWLayer1 = this.loadBJ54LWLayer1();
      }
    },
    loadBJ54LWLayer() {
    loadBJ54LWLayer1() {
      let url = "http://172.26.64.84/service/ImageEngine/picdis/abc";
      //let url = option.url;
      //let year = option.year;
@@ -478,6 +469,7 @@
        brightness: 1.0,
      });
      Viewer1.imageryLayers.add(imageLayer, 2);

      return imageLayer;
    },
    loadTDGLLayer() {
@@ -1317,6 +1309,7 @@
  height: 80% !important;
  overflow: auto;
}

.el-table /deep/ .el-button--text {
  /* color: #fff; */
  font-size: 14px;
@@ -1368,8 +1361,7 @@
  background-color: rgba(0, 32, 70, 0.7) !important;
}

.aboutDialog .el-dialog-div .dialog-footer {
}
.aboutDialog .el-dialog-div .dialog-footer {}

.el-pagination {
  color: #fff;
@@ -1421,6 +1413,7 @@
  .listBox li {
    font-size: 12px;
  }

  .el-table {
    font-size: 12px;
  }