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

shuishen

2024-12-02 ca47649fe279a2ad70241573e04e5988fd157d3b

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

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

@@ -488,8 +488,7 @@
          addPupoLayers[attrParams.name] = new DC.HtmlLayer(attrParams.name)
          window.$viewer.addLayer(addPupoLayers[attrParams.name])
          let iconEl = `<div class="marsBlueGradientPnl">
            <li>${attrParams.firmName || ''}</li>
            <li>${attrParams.riskLevelName || ''}</li>
            <li>${attrParams.name || ''}</li>
            </div>`
          let divIcon = new DC.DivIcon(
            new DC.Position(attrParams.lng, attrParams.lat, attrParams.ele || 64),
@@ -525,9 +524,8 @@
          destroy()
          addPupoLayers[attrParams.name] = new DC.HtmlLayer(attrParams.name)
          window.$viewer.addLayer(addPupoLayers[attrParams.name])
          let iconEl = `<div class="marsBlueGradientPnl">
            <li>${attrParams.firmName || ''}</li>
            <li>${attrParams.riskLevelName || ''}</li>
          let iconEl = `<div class="marsBlueGradientPnl"> 
            <li>${attrParams.name || ''}</li>
            </div>`
          let divIcon = new DC.DivIcon(
            new DC.Position(attrParams.lng, attrParams.lat, attrParams.ele || 64),
@@ -914,7 +912,7 @@

onMounted(() => {
  setTimeout(() => {
    handleCheckChange(data.filter(i => indexPoint.value.includes(i.id)))
    // handleCheckChange(data.filter(i => indexPoint.value.includes(i.id)))
  }, 3000)
})


 src/styles/base/dc-base.scss

@@ -117,8 +117,8 @@

  .marsBlueGradientPnl img {
    vertical-align: middle;
    width: 160px;
    height: 160px;
    width: 360px;
    height: 360px;
  }
}


 src/views/companyInfo/components/box/fireTrend.vue

@@ -138,7 +138,6 @@
      addPupoLayers['企业应急物资'] = new DC.HtmlLayer('企业应急物资')
      window.$viewer.addLayer(addPupoLayers['企业应急物资'])
      let iconEl = `<div class="marsBlueGradientPnl">
            <div>${attrParams.firmName}</div>
            <img src="${picList.value[0].link}" />
                </div>`
      let divIcon = new DC.DivIcon(

 src/views/rs/components/box/dataContent.vue

@@ -133,8 +133,7 @@
    addPupoLayers[row.firmName] = new DC.HtmlLayer(row.firmName)
    window.$viewer.addLayer(addPupoLayers[row.firmName])
    let iconEl = `<div class="marsBlueGradientPnl">
            <li>${row.firmName || ''}</li>
            <li>${row.riskLevelName || ''}</li>
            <li>${row.name || ''}</li>
            </div>`
    let divIcon = new DC.DivIcon(
      new DC.Position(row.lng, row.lat, row.ele || 64),