From 0b906280ec163a3e80364e091550d8462db6b9f9 Mon Sep 17 00:00:00 2001
From: jihongshun <1151753686@qq.com>
Date: 星期四, 28 八月 2025 17:25:25 +0800
Subject: [PATCH] 更改默认值
---
src/views/system/shootPoint/components/shootPointDialog.vue | 153 +++++++++++++++++++++++++++++++++-----------------
1 files changed, 100 insertions(+), 53 deletions(-)
diff --git a/src/views/system/shootPoint/components/shootPointDialog.vue b/src/views/system/shootPoint/components/shootPointDialog.vue
index 0fb2d6b..eed0225 100644
--- a/src/views/system/shootPoint/components/shootPointDialog.vue
+++ b/src/views/system/shootPoint/components/shootPointDialog.vue
@@ -56,7 +56,7 @@
class="el-icon-success"
></i>
<div class="waypoint-contnet">
- <span class="waypoint-index">{{ wp.label + wp.children[0].label }}</span>
+ <span class="waypoint-index">{{ wp.label +'----' +wp.children[0].label }}</span>
<span v-for="(action, aIndex) in wp.children[0].actions"
:key="action.id"
class="action-icon"
@@ -102,6 +102,14 @@
let towerHeight = 45
//濉旂殑鏈濆悜绠楁硶鎵�鐢ㄥ埌鐨� 鏃嬭浆搴︽暟
let rotationAngle = Cesium.Math.toRadians(0)
+const typeDictionary = {
+ "鎷嶇収": "01",
+ "鍙樺��": "02",
+ "寮�濮嬪綍鍍�": "03",
+ '缁撴潫褰曞儚':'04',
+ "鎮仠": "05",
+
+}
export default{
name:'shootPointDialog',
components: {
@@ -136,10 +144,6 @@
form:{},
deviceData:null,
activeName: 'first',
- totalDistance: 3054.9,
- totalTime: '5m 56s',
- totalPoints: 11,
- totalPhotos: 3,
waypoints:[],
selectedIndex:null,
chooseItem: null,
@@ -215,7 +219,7 @@
Cesium.Matrix4.inverseTransformation(transform, new Cesium.Matrix4()),
direction,
new Cesium.Cartesian3()
- );
+ );
Cesium.Cartesian3.normalize(directionLocal, directionLocal);
return Math.asin(directionLocal.z); // z杞村悜涓�
},
@@ -261,7 +265,23 @@
.filter(item => Array.isArray(item.children))
.map(item => item.children)
.reduce((acc, cur) => acc.concat(cur), []);
-
+ //閫氳繃鍙崇偣鍑� 瀵规瘮涔嬪墠鐨勫姩浣滅殑鏁扮粍 鎶婁箣鍓嶅姩浣滄暟缁勭紦瀛� 鐒跺悗鍙嶈祴鍊肩粰鏂版暟鎹�
+ if(this.lastTableArr?.length >0){
+ this.treeData = this.treeData.map(item2 => {
+ const matchingItem1 = this.lastTableArr.find(item1 => item1.label === item2.label);
+ if (matchingItem1) {
+ item2.children = item2.children.map(child2 => {
+ const matchingChild1 = matchingItem1.children.find(child1 => child1.label === child2.label);
+ if (matchingChild1) {
+ // 灏� actions 浠� array1 澶嶅埗鍒� this.treeData
+ child2.actions = [...matchingChild1.actions];
+ }
+ return child2;
+ });
+ }
+ return item2;
+ })
+ }
childrenArr?.forEach((ele)=>{
if(ele.actions) {
}else {
@@ -480,7 +500,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,
@@ -488,8 +508,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:[]
}
]
@@ -508,8 +529,8 @@
{
...pointB,
id: this.generateId(),
- label: pointB.label + "-鍔犻珮3333",
- height: pointB.height + 50,
+ label: pointB.label + "-鍔犻珮",
+ height: pointB.height + (towerHeight - pointB.height + 20),
actions:[]
}
]
@@ -666,47 +687,73 @@
console.log(this.$refs.initMap.preVideoScopePrimitiveArrTie)
console.log(this.treeData)
console.log(this.waypoints)
- // this.dialogVisible = false
+ this.$refs.initMap.preVideoScopePrimitiveArrTie.forEach(point => {
+ // 閬嶅巻鍘熷鏁版嵁
+ this.treeData.forEach(item => {
+ item.children.forEach(child => {
+ // 濡傛灉鍚嶇О鐩稿悓
+ if (child.label === point.name) {
+ // 鍚� actions 鏁扮粍鐨勭涓�椤� push zoomRatio
+ console.log(child)
+ console.log(point.primitive)
+ child.actions.unshift({
+ "id": Date.now(), // 浣跨敤褰撳墠鏃堕棿浣滀负鍞竴ID
+ "type": "鍙樺��",
+ "extra": {
+ "value": point.primitive.zoomRatio || 1
+ }
+ });
+ }
+ });
+ });
+ })
+ console.log(this.treeData)
+ this.dialogVisible = false
// const dealArr = this.submitDealData()
- // const transformed = this.treeData.map((ground, index) => {
- // const pointNumber = index + 1;
- // const child = ground.children?.[0] || {};
+ const transformed = this.treeData.map((ground, index) => {
+ const pointNumber = index + 1;
+ const child = ground.children?.[0] || {};
- // return {
- // altitude: child.height,
- // ardGroundPoint: [
- // {
- // height: ground.height,
- // latitude: ground.latitude,
- // longitude: ground.longitude,
- // pointNumber: 1,
- // targetName: ground.label
- // }
- // ],
- // latitude: child.latitude,
- // longitude: child.longitude,
- // pointNumber: pointNumber,
- // targetName: child.label
- // };
- // })
- // console.log(transformed)
- // let parmas = {
- // templateName:this.form.templateName,
- // modelId:this.chooseModelId,
- // ardListWayPointsLS:transformed
- // }
- // addPoint(parmas).then(res=>{
- // console.log(res)
- // if(res.code == 200) {
- // this.$message({
- // message: '鏂板妯℃澘鎴愬姛',
- // type: 'success'
- // })
- // this.$emit('on-submit')
- // this.$emit('close')
- // }
- // })
- // console.log(parmas)
+ return {
+ altitude: child.height,
+ ardGroundPoint: [
+ {
+ height: ground.height,
+ latitude: ground.latitude,
+ 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
+ }))
+ }
+ ],
+ latitude: child.latitude,
+ longitude: child.longitude,
+ pointNumber: pointNumber,
+ targetName: child.label
+ };
+ })
+ console.log(transformed)
+ let parmas = {
+ templateName:this.form.templateName,
+ modelId:this.chooseModelId,
+ ardListWayPointsLS:transformed
+ }
+ addPoint(parmas).then(res=>{
+ console.log(res)
+ if(res.code == 200) {
+ this.$message({
+ message: '鏂板妯℃澘鎴愬姛',
+ type: 'success'
+ })
+ this.$emit('on-submit')
+ this.$emit('close')
+ }
+ })
+ console.log(parmas)
},
//聽璁＄畻鐐笰缁曠偣B閫嗘椂閽堟棆杞寚瀹氳搴﹀悗鐨勬柊浣嶇疆
// 绌轰腑鐐规垨鑰呭湴闈㈢偣绗涘崱灏斿潗鏍� 濉旂殑绗涘崱灏斿潗鏍� 濉旂殑鏈濆悜鍊�
@@ -927,13 +974,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