From bcb67f336c2b352177884b8db6decc3fcf382bb0 Mon Sep 17 00:00:00 2001
From: jihongshun <1151753686@qq.com>
Date: 星期四, 11 九月 2025 16:58:13 +0800
Subject: [PATCH] 航线模拟 差视锥体的head值和时间轴
---
src/views/system/shootPoint/components/shootPointDialog.vue | 128 ++++++++++++++++++++++++++++++++++--------
1 files changed, 102 insertions(+), 26 deletions(-)
diff --git a/src/views/system/shootPoint/components/shootPointDialog.vue b/src/views/system/shootPoint/components/shootPointDialog.vue
index f60d32f..320bf53 100644
--- a/src/views/system/shootPoint/components/shootPointDialog.vue
+++ b/src/views/system/shootPoint/components/shootPointDialog.vue
@@ -55,6 +55,10 @@
<i
class="el-icon-success"
></i>
+ <i
+ class="el-icon-delete"
+ @click.stop="deleteItem(wp)"
+ ></i>
<div class="waypoint-contnet">
<span class="waypoint-index">{{ wp.label +'----' +wp.children[0].label }}</span>
<span v-for="(action, aIndex) in wp.children[0].actions"
@@ -62,11 +66,11 @@
class="action-icon"
@click.stop="clickItem(action)">
- <img src="@/assets/images/xuanting.svg" alt="svg鍥剧墖" v-if="action.type==='鎮仠'" />
- <img src="@/assets/images/photo.svg" alt="svg鍥剧墖" v-if="action.type==='鎷嶇収'" />
- <img src="@/assets/images/startVideo.svg" alt="svg鍥剧墖" v-if="action.type==='寮�濮嬪綍鍍�'" />
- <img src="@/assets/images/stopVideo.svg" alt="svg鍥剧墖" v-if="action.type==='缁撴潫褰曞儚'" />
- <img src="@/assets/images/zoom.svg" alt="svg鍥剧墖" v-if="action.type==='鍙樼劍'" />
+ <img src="@/assets/images/xuanting.svg" alt="svg鍥剧墖" v-if="action.type==='鎮仠'" title="鎮仠"/>
+ <img src="@/assets/images/photo.svg" alt="svg鍥剧墖" v-if="action.type==='鎷嶇収'" title="鎷嶇収"/>
+ <img src="@/assets/images/startVideo.svg" alt="svg鍥剧墖" v-if="action.type==='寮�濮嬪綍鍍�'" title="寮�濮嬪綍鍍�"/>
+ <img src="@/assets/images/stopVideo.svg" alt="svg鍥剧墖" v-if="action.type==='缁撴潫褰曞儚'" title="缁撴潫褰曞儚"/>
+ <img src="@/assets/images/zoom.svg" alt="svg鍥剧墖" v-if="action.type==='鍙樼劍'" title="鍙樼劍"/>
<!-- <i v-if="action.type==='鎷嶇収'" class="el-icon-video-camera"></i> -->
</span>
</div>
@@ -144,10 +148,6 @@
form:{},
deviceData:null,
activeName: 'first',
- totalDistance: 3054.9,
- totalTime: '5m 56s',
- totalPoints: 11,
- totalPhotos: 3,
waypoints:[],
selectedIndex:null,
chooseItem: null,
@@ -163,6 +163,7 @@
console.log(res.data)
this.getRowData(res.data)
let drawArr = this.convertToTree(res.data.ardListWayPointsLS)
+ console.log(drawArr)
setTimeout(() => {
//娓叉煋鏃堕棿闂 鍔犱釜寤舵椂鍣�
this.drawLines(drawArr)
@@ -223,7 +224,7 @@
Cesium.Matrix4.inverseTransformation(transform, new Cesium.Matrix4()),
direction,
new Cesium.Cartesian3()
- );
+ );
Cesium.Cartesian3.normalize(directionLocal, directionLocal);
return Math.asin(directionLocal.z); // z杞村悜涓�
},
@@ -344,19 +345,43 @@
// 2. 姣忎釜绌轰腑鐐逛笌鍦伴潰鐐圭敤钃濊壊铏氱嚎杩炴帴
treeData.forEach(point => {
const airPos = Cesium.Cartesian3.fromDegrees(point.longitude, point.latitude, point.height);
+ this.addLabel(point)
point.children.forEach(child => {
const groundPos = Cesium.Cartesian3.fromDegrees(child.longitude, child.latitude, child.height);
+ this.addLabel(child)
viewer.entities.add({
polyline: {
positions: [airPos, groundPos],
width: 1,
material: new Cesium.PolylineDashMaterialProperty({
- color: Cesium.Color.BLUE,
+ color: Cesium.Color.RED,
dashLength: 8
})
}
});
});
+ });
+ },
+ addLabel(point) {
+ const position = Cesium.Cartesian3.fromDegrees(
+ point.longitude,
+ point.latitude,
+ point.height
+ );
+ let viewer = window.viewerM
+ // Create a label entity
+ viewer.entities.add({
+ position: position,
+ label: {
+ text: point.label,
+ font: "14px sans-serif",
+ fillColor: Cesium.Color.WHITE,
+ backgroundColor: Cesium.Color.BLACK,
+ style: Cesium.LabelStyle.FILL_AND_OUTLINE,
+ outlineWidth: 2,
+ horizontalOrigin: Cesium.HorizontalOrigin.CENTER,
+ verticalOrigin: Cesium.VerticalOrigin.BOTTOM
+ }
});
},
addPoint(viewer, position, color, label) {
@@ -482,7 +507,7 @@
console.log(this.treeData)
},
//鏁扮粍 濉旂殑绮惧害 濉旂殑绾害 濉旂殑楂樺害 鍗婂緞
- insertRaisedPoints(data, centerLon, centerLat, centerHeight, radius = 10) {
+ insertRaisedPoints(data, centerLon, centerLat, centerHeight, radius = 15) {
const center = Cesium.Cartesian3.fromDegrees(centerLon, centerLat, centerHeight);
const result = JSON.parse(JSON.stringify(data)); // 娣辨嫹璐濋伩鍏嶆薄鏌撳師鏁版嵁
const inserts = []; // 鐢ㄤ簬瀛樺偍鎻掑叆椤瑰強鍏剁洰鏍囦綅缃�
@@ -495,7 +520,8 @@
const cartA = Cesium.Cartesian3.fromDegrees(pointA.longitude, pointA.latitude, pointA.height);
const cartB = Cesium.Cartesian3.fromDegrees(pointB.longitude, pointB.latitude, pointB.height);
-
+ console.log(cartA)
+ console.log(cartB)
const closest = this.closestPointOnSegment(cartA, cartB, center);
const distance = Cesium.Cartesian3.distance(closest, center);
console.log(distance)
@@ -504,7 +530,7 @@
const groundA = result[i];
const raisedA = {
id: this.generateId(),
- label: groundA.label+ "-鍔犻珮111",
+ label: groundA.label+ "-鍔犻珮",
longitude: groundA.longitude,
latitude: groundA.latitude,
height: groundA.height,
@@ -512,8 +538,9 @@
{
...pointA,
id: this.generateId(),
- label: pointA.label + "-鍔犻珮2222",
- height: pointA.height + 50,
+ label: pointA.label + "-鍔犻珮",
+ // height: pointA.height + 50,
+ height: pointA.height + (towerHeight - pointA.height + 20),
actions:[]
}
]
@@ -532,8 +559,8 @@
{
...pointB,
id: this.generateId(),
- label: pointB.label + "-鍔犻珮3333",
- height: pointB.height + 50,
+ label: pointB.label + "-鍔犻珮",
+ height: pointB.height + (towerHeight - pointB.height + 20),
actions:[]
}
]
@@ -711,7 +738,6 @@
});
})
console.log(this.treeData)
- this.dialogVisible = false
// const dealArr = this.submitDealData()
const transformed = this.treeData.map((ground, index) => {
const pointNumber = index + 1;
@@ -726,11 +752,32 @@
longitude: ground.longitude,
pointNumber: 1,
targetName: ground.label,
- actions:child.actions.map((item, index) => ({
- actionIndex: index.toString(),
- actionType: typeDictionary[item.type] || "", // 濡傛灉绫诲瀷涓嶅瓨鍦ㄥ瓧鍏镐腑锛岄粯璁ょ┖瀛楃涓�
- actionValue: item.extra.value
- }))
+ // actions:child.actions.map((item, index) => ({
+ // actionIndex: index.toString(),
+ // actionType: typeDictionary[item.type] || "", // 濡傛灉绫诲瀷涓嶅瓨鍦ㄥ瓧鍏镐腑锛岄粯璁ょ┖瀛楃涓�
+ // actionValue: item.extra.value
+ // }))
+ actions:child.actions.map(action => {
+ console.log(action)
+ switch (action.type) {
+ case "鎮仠":
+ return { hoverTime: parseFloat(action.extra.value) };
+ case "鍙樺��":
+ return { zoom: parseFloat(action.extra.value) };
+ case "寮�濮嬪綍鍍�":
+ return { startRecord: true };
+ case "缁撴潫褰曞儚":
+ return { stopRecord: true };
+ case "鎷嶇収":
+ // const [takePhotoType, useGlobalImageFormat] = action.actionValue.split('-');
+ return {
+ takePhotoType: 0,
+ useGlobalImageFormat: 0
+ };
+ default:
+ return {};
+ }
+ })
}
],
latitude: child.latitude,
@@ -752,6 +799,7 @@
message: '鏂板妯℃澘鎴愬姛',
type: 'success'
})
+ this.dialogVisible = false
this.$emit('on-submit')
this.$emit('close')
}
@@ -778,6 +826,7 @@
console.log(this.treeData)
console.log(this.waypoints)
console.log(data)
+ console.log(this.lastTableArr)
const byLabel = this.addOrUpdate(this.lastTableArr, data, 'label', this)
this.waypoints = this.lastTableArr
console.log(byLabel)
@@ -800,6 +849,33 @@
},
clickItem(value){
this.$refs.initMap.editAction(value);
+ },
+ extractNumberFromLabel(label){
+ const match = label.match(/(\d+)/); // 鑾峰彇鏍囩涓殑鏁板瓧
+ return match ? match[0] : null;
+ },
+ deleteItem(item){
+ this.treeData = this.treeData.filter(obj=>obj.id != item.id)
+ this.lastTableArr = this.lastTableArr.filter(obj=>obj.id != item.id)
+ const data1LabelNumber = this.extractNumberFromLabel(item.label);
+
+ // 鍒涘缓涓�涓柊鐨凟ntityCollection锛屽彧淇濈暀涓嶅尮閰嶇殑瀹炰綋
+ const filteredEntities = window.viewerM.entities.values.filter(entity => {
+ const entityIdNumber = this.extractNumberFromLabel(entity.id); // 鎻愬彇瀹炰綋鐨刬d涓殑鏁板瓧
+ return entityIdNumber !== data1LabelNumber; // 濡傛灉鏁板瓧涓嶄竴鑷达紝淇濈暀璇ュ疄浣�
+ });
+ // 娓呯┖鍘熸潵鐨別ntities闆嗗悎骞堕噸鏂版坊鍔犺繃婊ゅ悗鐨勫疄浣�
+ window.viewerM.entities.removeAll(); // 娓呯┖鎵�鏈夊疄浣�
+ filteredEntities.forEach(entity => window.viewerM.entities.add(entity))
+ console.log(item)
+ console.log(this.treeData)
+ console.log(this.lastTableArr)
+ console.log(window.viewerM.entities.values)
+ // console.log(window.viewerM.entities.values[0].id)
+ // console.log(window.viewerM.entities.values[1].id)
+ // console.log(window.viewerM.entities.values[2].id)
+ // console.log(window.viewerM.entities.values[3].id)
+
}
}
}
@@ -977,13 +1053,13 @@
height: 36px;
line-height: 36x;
transition: transform 0.2s;
- font-size: 24px;
+ font-size: 22px;
}
.waypoint-header .waypoint-index {
- font-size: 24px;
+ font-size: 22x;
}
.rotated {
transform: rotate(-90deg);
--
Gitblit v1.9.3