Merge branch 'main' of http://139.196.74.78:10010/r/zhyq/bigScreen

shuishen

2024-11-26 59c42afa6e082c0d71b5e937fd3fc0ee5d07f55d

Merge branch 'main' of http://139.196.74.78:10010/r/zhyq/bigScreen

 public/img/mapicon/psk.png

 public/img/mapicon/wsc.png

 src/pages/layout/components/scomponents/layersControl.vue

@@ -459,6 +459,34 @@
        className: 'xfs-box',
        showPanel: false,
        layerName: 'fsclz'
      },
      {
        id: '3-10',
        label: '排水口',
        type: 'layer',
        subType: 'labelPoint',
        method: getList,
        params: {
          type: 10,
        },
        backgroundIcon: VITE_APP_BASE + 'img/mapicon/psk.png',
        className: 'xfs-box',
        showPanel: false,
        layerName: 'psk'
      },
      {
        id: '3-11',
        label: '污水池',
        type: 'layer',
        subType: 'labelPoint',
        method: getList,
        params: {
          type: 11,
        },
        backgroundIcon: VITE_APP_BASE + 'img/mapicon/wsc.png',
        className: 'xfs-box',
        showPanel: false,
        layerName: 'wsc'
      }
    ]
  },
@@ -700,7 +728,9 @@
              progressiveResolutionHeightFraction: 0.5,
              baseScreenSpaceError: 1024
            })

            // tile.setSplitDirection(1)
            // viewer.sceneSplit.enable = true
            // viewer.sceneSplit.addTileset(tileset)
            tileLayers.addOverlay(tile)
            addTileLayers[item.layerName][ind] = tile
          })
@@ -781,7 +811,7 @@
          addTileLayers[item.layerName] = new DC.VectorLayer(item.layerName)
          window.$viewer.addLayer(addTileLayers[item.layerName])

          function computeCircle (radius) {
          function computeCircle(radius) {
            var positions = []
            for (var i = 0; i < 360; i++) {
              var radians = DC.Math.toRadians(i)
@@ -853,7 +883,7 @@
  })
}

function findObjectById (data, id) {
function findObjectById(data, id) {
  // 遍历数据数组
  for (let i = 0; i < data.length; i++) {
    const item = data[i]
@@ -928,7 +958,7 @@
// });

// 销毁
function destroy () {
function destroy() {
  let arr = Object.keys(addPupoLayers)
  arr.filter(i => i != 'hgyq').forEach(i => {
    addPupoLayers[i] && window.$viewer.removeLayer(addPupoLayers[i])

 src/views/space/components/leftContainer.vue

@@ -153,8 +153,8 @@
      display: flex;
      align-items: center;
      justify-content: center;
      margin-top: 16px;
      padding: 10px;
      margin-top: 10px;
      padding: 8px;
      width: 64px;
      height: 64px;

@@ -191,8 +191,8 @@
      display: flex;
      align-items: center;
      justify-content: center;
      margin-top: 16px;
      padding: 10px;
      margin-top: 10px;
      padding: 8px;
      width: 54px;
      height: 54px;