From 7ebb90b4d99cd661dcb9c9bdc9a1932e5b4a102f Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Tue, 12 Nov 2024 18:31:11 +0800
Subject: [PATCH] Merge branch 'main' of http://139.196.74.78:10010/r/zhyq/bigScreen
---
src/views/space/components/box/dataContent.vue | 78 +++++++++++++++++----------------------
1 files changed, 34 insertions(+), 44 deletions(-)
diff --git a/src/views/space/components/box/dataContent.vue b/src/views/space/components/box/dataContent.vue
index cef64e9..0841ee2 100644
--- a/src/views/space/components/box/dataContent.vue
+++ b/src/views/space/components/box/dataContent.vue
@@ -2,7 +2,7 @@
* @Author: shuishen 1109946754@qq.com
* @Date: 2023-03-13 14:54:26
* @LastEditors: shuishen 1109946754@qq.com
- * @LastEditTime: 2024-11-12 17:55:45
+ * @LastEditTime: 2024-11-12 18:31:08
* @FilePath: \bigScreen\src\views\space\components\box\dataContent.vue
* @Description:
*
@@ -45,7 +45,7 @@
total: 0,
}
-function positionColor () {
+function positionColor() {
return (row) => {
if (
(row.X && row.X != 0) ||
@@ -60,7 +60,7 @@
}
}
-function positionDisabled () {
+function positionDisabled() {
return (row) => {
if (
(row.X && row.X != 0) ||
@@ -106,51 +106,42 @@
})
}
+let state = reactive({
+ layer: {}
+})
+
+
// 行点击
-function rowClick (row) {
- // 读取定位飞
- window.$viewer.zoomToPosition(new DC.Position(
- Number(row.lng),
- Number(row.lat),
- 800,
- 0,
- -80,
- 0
- ), () => {
- })
+function rowClick(row) {
- // let layer = new DC.VectorLayer('layer')
- // window.$viewer.addLayer(layer)
- // let positions = generatePosition(row.lng, row.lat)
- // let material = new DC.PolylineDashMaterialProperty({
- // color: DC.Color.ORANGE
- // })
- // positions.forEach(item => {
- // let label = new DC.CustomLabel(
- // item,
- // row.name
- // )
- // label.setStyle({
- // fillColor: DC.Color.YELLOW,
- // font: '12px',
- // pixelOffset: { x: 0, y: -10 }
- // })
- // label.setVLine({
- // width: 2,
- // material
- // })
- // layer.addOverlay(label)
- // })
+ if (state.layer) {
+ window.$viewer.removeLayer(state.layer)
+ }
+ let layer = new DC.HtmlLayer(`${row.id}`)
+ state.layer = layer
+ window.$viewer.addLayer(layer)
+ let iconEl = `<div class="marsBlueGradientPnl">
+ <div>${row.name}</div>
+ </div>`
+ let divIcon = new DC.DivIcon(
+ new DC.Position(row.lng, row.lat, 0),
+ `<div class="public-map-popup">
+ ${iconEl}
+ </div>`
+ )
+ // divIcon.attrParams = row
+ let incident = () => { }
+ // if (item.incident) incident = item.incident
+ divIcon.on(DC.MouseEventType.CLICK, incident)
+ layer.addOverlay(divIcon)
+
+ window.$viewer.flyToPosition(new DC.Position(row.lng, row.lat, 600, 0, -90, 0))
+
}
-function generatePosition (lng, lat) {
- let list = []
- list.push(new DC.Position(lng, lat, 100))
- return list
-}
// 查看详情
-function goDetail (row) { }
+function goDetail(row) { }
const searchBtn = (params) => {
resetPage()
@@ -192,8 +183,7 @@
<template>
<div class="w100 h0 flex-1 flex f-d-c">
- <global-search :options="options" @searchBtn="searchBtn" @resetBtn="resetBtn"
- ref="SeachBarCondition"></global-search>
+ <global-search :options="options" @searchBtn="searchBtn" @resetBtn="resetBtn" ref="SeachBarCondition"></global-search>
<div class="h0 flex-1 table-content" ref="TableContent">
<el-table :data="tableData" :height="curTableHeight" style="width: 100%" v-loading="loading">
--
Gitblit v1.9.3