Merge remote-tracking branch 'origin/master'

xing

2023-02-24 4c2c53b67369661a6176eab85b076206fa11719b

Merge remote-tracking branch 'origin/master'

 src/views/Synthesis/LeftMenu.vue

@@ -1172,7 +1172,7 @@
          break;
        case "d4": //剖面分析
          if (window.AnalysisDXPM) {
            window.AnalysisDXPM.end && window.AnalysisDXPM.end();
            window.AnalysisDXPM.end && window.AnalysisDXPM.end("cancel");
            this.clear(res);
          } else {
            this.addterrainSectionAnalysis();

 src/views/Tools/LayerTree.vue

@@ -21,7 +21,6 @@
      <span
        class="slot-t-node"
        slot-scope="{ node, data }"
        @dblclick="editNode(data)"
      >
        <span v-show="!data.isEdit">
          <span :class="[data.id >= 99 ? 'slot-t-node--label' : '']">{{
@@ -68,7 +67,7 @@
      >
        <i class="el-icon-tickets"></i>&nbsp;&nbsp;属性
      </div>
      <div class="edit" @click="showLayerAttribute()" v-show="showlocal">
      <div class="edit" @click="positioning()" v-show="showlocal">
        <i class="el-icon-tickets"></i>&nbsp;&nbsp;定位
      </div>
      <!-- <div
@@ -230,9 +229,9 @@
      } else {
        this.firstLevel = true;
      }
      if (Node.level === 3 && Node.serveType == "Tileset") {
      if (Node.level === 3 && Node.data.serveType == "Tileset") {
        this.showlocal = true;
      } else if (Node.level === 3 && Node.serveType != "Tileset") {
      } else if (Node.level === 3 && Node.data.serveType != "Tileset") {
        this.showlocal = false;
      }
      this.menuVisible = true;
@@ -365,6 +364,16 @@
            }
          },
        });
    },
    //模型定位
    positioning(){
      for (var i in Viewer.scene.primitives._primitives) {
        Viewer.scene.primitives._primitives[i].show = checked;
        if (Viewer.scene.primitives._primitives[i].id == data.cnName) {
          std.push(res.id);
          Viewer.flyTo(Viewer.scene.primitives._primitives[i]);
        }
      }
    },
    // 编辑节点
    editNode(data) {
@@ -843,6 +852,16 @@
  z-index: 8;
}

.tree-container /deep/ .el-tree-node {
  .is-leaf+.el-checkbox .el-checkbox__inner {
    display: inline-block;
  }

  .el-checkbox .el-checkbox__inner {
    display: none;
  }
}

.tree-container
  /deep/
  .el-tree-node