From f4c90cdeda652f0d40d04eefde317626593d19e5 Mon Sep 17 00:00:00 2001
From: jihongshun <1151753686@qq.com>
Date: 星期四, 21 八月 2025 17:16:30 +0800
Subject: [PATCH] 优化左中右联动效果
---
src/views/system/shootPoint/components/shootPointDialog.vue | 93 +++++++++++++++++++++++++++++++++++++++-------
1 files changed, 79 insertions(+), 14 deletions(-)
diff --git a/src/views/system/shootPoint/components/shootPointDialog.vue b/src/views/system/shootPoint/components/shootPointDialog.vue
index ebf11cc..75b507d 100644
--- a/src/views/system/shootPoint/components/shootPointDialog.vue
+++ b/src/views/system/shootPoint/components/shootPointDialog.vue
@@ -10,7 +10,7 @@
<el-col :span="4">
<el-card class="noScroll">
<div class="chooseModel">
- <el-button type="primary" @click='chooseModel'>閫夋嫨妯″瀷</el-button>
+ <el-button type="primary" @click='chooseModel'>妯″瀷</el-button>
<div class="modelType">
妯″瀷鍚嶇О锛歿{ modelName }}
</div>
@@ -55,12 +55,21 @@
<i
class="el-icon-success"
></i>
- <span>
+ <div class="waypoint-contnet">
<span class="waypoint-index">{{ wp.label }}</span>
- <i class="el-icon-camera"></i>
- <i class="el-icon-video-camera"></i>
- <i class="el-icon-picture-outline"></i>
- </span>
+ <span v-for="(action, aIndex) in wp.actions"
+ :key="action.id"
+ 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==='鍙樼劍'" />
+ <!-- <i v-if="action.type==='鎷嶇収'" class="el-icon-video-camera"></i> -->
+ </span>
+ </div>
</div>
</div>
</div>
@@ -72,7 +81,7 @@
</el-card>
</el-col>
<el-col :span="20">
- <InitMap v-if="showMap" @mergePoint="mergePoint" :towerUrl="towerUrl" :deviceData="deviceData" @dealTreeData="dealTreeData" ref="initMap"></InitMap>
+ <InitMap v-if="showMap" @mergePoint="mergePoint" :towerUrl="towerUrl" :deviceData="deviceData" @dealTreeData="dealTreeData" ref="initMap" :chooseItem="chooseItem" @dealAction = 'dealAction'></InitMap>
</el-col>
</el-row>
<span slot="footer" class="dialog-footer">
@@ -132,7 +141,9 @@
totalPoints: 11,
totalPhotos: 3,
waypoints:[],
- selectedIndex:null
+ selectedIndex:null,
+ chooseItem: null,
+ lastTableArr:[]
}
},
mounted(){
@@ -154,6 +165,7 @@
},
methods:{
toggleSelect(wq,index) {
+ this.chooseItem = wq
console.log(this.treeData)
console.log(wq)
// 濡傛灉鐐瑰嚮鐨勬槸褰撳墠琛岋紝鍒欏彇娑堥�変腑
@@ -228,21 +240,29 @@
//鐐瑰嚮鐖剁骇
const from = [data.children[0].longitude,data.children[0].latitude, data.children[0].height];
const to = [data.longitude,data.latitude, data.height];
- this.flyToAndLookAt(from, to);
+ // this.flyToAndLookAt(from, to);
} else {
//鐐瑰嚮瀛愮骇
const from = [data.longitude,data.latitude, data.height];
const to = [node.parent?.data?.longitude,node.parent?.data?.latitude, node.parent?.data?.height];
- this.flyToAndLookAt(from, to);
+ // this.flyToAndLookAt(from, to);
}
this.$refs.initMap.DealVisualCone(data,node)
},
dealTreeData(arrList){
+ console.log(arrList)
this.treeData = arrList
const childrenArr = arrList
.filter(item => Array.isArray(item.children))
.map(item => item.children)
.reduce((acc, cur) => acc.concat(cur), []);
+
+ childrenArr?.forEach((ele)=>{
+ if(ele.actions) {
+ }else {
+ ele.actions = []
+ }
+ })
this.waypoints = childrenArr
console.log(childrenArr)
console.log(this.treeData)
@@ -690,11 +710,41 @@
const rotatedZ = localStartPoint.z; //聽Z杞村潗鏍囦繚鎸佷笉鍙�
//聽灏嗘棆杞悗鐨勫眬閮ㄥ潗鏍囪浆鎹㈠洖涓栫晫鍧愭爣绯�
return Cesium.Matrix4.multiplyByPoint(transformationMatrix,聽new聽Cesium.Cartesian3(rotatedX,聽rotatedY,聽rotatedZ),聽new聽Cesium.Cartesian3());
+ },
+ dealAction(data){
+ console.log(this.treeData)
+ console.log(this.waypoints)
+ console.log(data)
+ const byLabel = this.addOrUpdate(this.lastTableArr, data, 'label', this)
+ this.waypoints = this.lastTableArr
+ console.log(byLabel)
+ console.log(this.lastTableArr)
+ console.log( this.waypoints)
+ },
+ addOrUpdate(list, newItem, key = 'label', vm = null) {
+ let index = list.findIndex(item => item[key] === newItem[key]);
+ console.log(index)
+ if (index !== -1) {
+ if (vm) {
+ vm.$set(list, index, newItem); // Vue2 鍝嶅簲寮忔浛鎹�
+ } else {
+ list.splice(index, 1, newItem);
+ }
+ } else {
+ list.push(newItem);
+ }
+ },
+ clickItem(value){
+ this.$refs.initMap.editAction(value);
}
}
}
</script>
<style scoped>
+::v-deep .el-dialog__header {
+ padding: 10px; /* 淇敼鍐呰竟璺� */
+ font-size: 18px; /* 淇敼瀛椾綋澶у皬 */
+}
.noScroll{
height: calc(100vh - 175px);
overflow: auto;
@@ -820,6 +870,9 @@
overflow-y: scroll;
/* overflow: scroll; */
}
+.waypoint-panel .waypoints {
+ min-height: 50px;
+}
.stats {
display: flex;
@@ -839,7 +892,7 @@
.waypoint-item {
border-bottom: 1px solid #333;
- height: 40px;
+ min-height: 40px;
line-height: 40px;
}
@@ -852,15 +905,19 @@
align-items: center;
cursor: pointer;
padding: 4px 8px;
+ width: 280px;
+ word-wrap: break-word;
}
-
.waypoint-header i {
margin-right: 6px;
height: 36px;
line-height: 36x;
transition: transform 0.2s;
font-size: 24px;
+
}
+
+
.waypoint-header .waypoint-index {
font-size: 24px;
}
@@ -869,8 +926,16 @@
}
.waypoint-content {
- padding: 4px 8px;
+ flex: 1;
+ background: rgb(73, 76, 128);
display: flex;
- gap: 8px;
+ flex-wrap: wrap;
+ align-items: center;
}
+
+.waypoint-contnet img{
+ height: 25px;
+ margin-left: 5px;
+}
+
</style>
--
Gitblit v1.9.3