Merge branch 'main' of http://123.132.248.154:10000/gitY/LinYeFangHuo

src/packages/components/Equipment/Equipment/HuoQingXianSuo/index.vue

@@ -199,6 +199,20 @@ const getFileImage = (type) => {
       return '/map/fire.png'
   }
 }
+  function buildPopupContent(popup, attr) {
+    return `
+    <div class="mars3d-template-content">
+      <div class="popup-wrap">
+        ${popup.map(item => `
+          <div class="popup-row">
+            <span class="popup-label">${item.name}</span>
+            <span class="popup-value">${attr[item.field] ?? '-'}</span>
+          </div>
+        `).join('')}
+      </div>
+    </div>
+    `
+  }
   // 加载火点信息
   const handlerLoadFirePoint = (points: []) => {
     console.log("points123",points);
@@ -226,7 +240,7 @@ const getFileImage = (type) => {
           verticalOrigin: Cesium.VerticalOrigin.BOTTOM, 
           pixelOffset: new Cesium.Cartesian2(0, 0),
         },
-        popup: [
+        popup: buildPopupContent([
           { field: "id", name: "线索编号" },
           { field: "describe", name: "描述信息" },
           { field: "degreeType", name: "线索类型" },
@@ -234,7 +248,7 @@ const getFileImage = (type) => {
           { field: "reportTime", name: "上报时间" },
           { field: "lng", name: "经度" },
           { field: "lat", name: "纬度" }
-        ],
+        ], item),
         
         popupOptions: {
           offsetY: -30,
@@ -468,3 +482,34 @@ const getFileImage = (type) => {
     }
   }
 </style>
+<style lang="scss">
+  .mars3d-template-content{
+    .popup-wrap {
+      min-width: 240px;
+      padding: 8px 12px;
+    }
+
+    .popup-row {
+      display: flex;
+      line-height: 22px;
+      margin-bottom: 6px;
+    }
+
+    .popup-label {
+      width: 72px;            /* 关键：统一宽度 */
+      text-align: right;
+      margin-right: 10px;
+      color: #9aa4af;         /* 标题颜色 */
+      font-size: 12px;
+      flex-shrink: 0;
+    }
+
+    .popup-value {
+      flex: 1;
+      color: #ffffff;        /* 数据颜色 */
+      font-size: 12px;
+      word-break: break-all;
+    }
+  }
+  
+</style>

src/packages/components/Uav/Uav/CopterList/index.vue

@@ -6,7 +6,7 @@
       <div class="title-item">操作</div>
     </div>
     <div class="list-content">
-      <div class="list-item" v-for="(item, index) in 3">
+      <div class="list-item" v-for="(item, index) in 2">
         <div v-if="!(index % 2)" class="item-icon"></div>
         <div class="item-model">Douck-3</div>
         <div class="item-status">

src/packages/components/Zhigan/Zhigan/ZhiGan_DroneLive/index.vue

@@ -90,9 +90,6 @@
   const videoHeight = computed(() => {
     return h.value - 120
   })
-  watch(() => uavList.value, () => {
-    console.log('watch,',uavList.value)
-  }, { deep: true })
   onMounted(() => {
     // 组件通信
     EventBus.on(props.chartConfig.id + 'click', (data) => {