From 71627d89045c5bf3c50030751d93ae519f5dbb8d Mon Sep 17 00:00:00 2001 From: jihongshun <1151753686@qq.com> Date: 星期三, 20 八月 2025 17:25:50 +0800 Subject: [PATCH] 航点列表 中化建 右侧联动 待测试联调 --- src/views/system/shootPoint/components/shootPointDialog.vue | 229 ++++++++++++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 208 insertions(+), 21 deletions(-) diff --git a/src/views/system/shootPoint/components/shootPointDialog.vue b/src/views/system/shootPoint/components/shootPointDialog.vue index 127462d..d619ffe 100644 --- a/src/views/system/shootPoint/components/shootPointDialog.vue +++ b/src/views/system/shootPoint/components/shootPointDialog.vue @@ -25,22 +25,63 @@ </div> <div class="modelTree"> <div class='modelTreeTitle'>宸℃鐐圭洰褰�</div> - <el-tree - class="filter-tree" - :data="treeData" - :props="defaultProps" - draggable - :allow-drop="allowDrop" - @node-drop="handleDrop" - default-expand-all - @node-click="handleNodeClick" - ref="tree"> - </el-tree> + <el-tabs v-model="activeName"> + <el-tab-pane label="鑸偣鏍�" name="first"> + <el-tree + class="filter-tree" + :data="treeData" + :props="defaultProps" + draggable + :allow-drop="allowDrop" + @node-drop="handleDrop" + default-expand-all + @node-click="handleNodeClick" + ref="tree"> + </el-tree> + </el-tab-pane> + <el-tab-pane label="鑸偣鍒楄〃" name="second"> + <div class="waypoint-panel"> + + <!-- 鑸偣鍒楄〃 --> + <div class="waypoints"> + <div + v-for="(wp, index) in waypoints" + :key="index" + class="waypoint-item" + :class="{ active: selectedIndex === index }" + @click="toggleSelect(wp,index)" + > + <div class="waypoint-header"> + <i + class="el-icon-success" + ></i> + <div class="waypoint-contnet"> + <span class="waypoint-index">{{ wp.label }}</span> + <span v-for="(action, aIndex) in wp.actions" + :key="action.id" + class="action-icon" + @click="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> + </div> + </el-tab-pane> + </el-tabs> + </div> </el-card> </el-col> <el-col :span="20"> - <InitMap v-if="showMap" @mergePoint="mergePoint" :towerUrl="towerUrl" :deviceData="deviceData" @dealTreeData="dealTreeData"></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"> @@ -52,6 +93,7 @@ </div> </template> <script> +import { compileToFunctions } from "vue-template-compiler"; import CesiumMap from "../../../../utils/components/cesium-map.vue"; import InitMap from "../../../../utils/components/init-map.vue"; import ChooseModelDialog from './chooseModelDialog.vue'; @@ -93,7 +135,16 @@ modelName:null, templateType:null, form:{}, - deviceData:null + deviceData:null, + activeName: 'first', + totalDistance: 3054.9, + totalTime: '5m 56s', + totalPoints: 11, + totalPhotos: 3, + waypoints:[], + selectedIndex:null, + chooseItem: null, + lastTableArr:[] } }, mounted(){ @@ -114,6 +165,25 @@ } }, methods:{ + toggleSelect(wq,index) { + this.chooseItem = wq + console.log(this.treeData) + console.log(wq) + // 濡傛灉鐐瑰嚮鐨勬槸褰撳墠琛岋紝鍒欏彇娑堥�変腑 + if (this.selectedIndex === index) { + this.selectedIndex = null + } else { + this.selectedIndex = index + } + const result = this.treeData.filter(item => + item.children && item.children.some(child => child.label === wq.label) + ); + const dataObj = result[0] + const from = [dataObj.children[0]?.longitude,dataObj.children[0]?.latitude, dataObj.children[0]?.height]; + const to = [dataObj.longitude,dataObj.latitude, dataObj.height]; + this.flyToAndLookAt(from, to); + this.$refs.initMap.DealVisualCone(dataObj) + }, // 璁$畻 heading锛堝亸鑸锛� computeHeading(fromCartesian, toCartesian) { const transform = Cesium.Transforms.eastNorthUpToFixedFrame(fromCartesian); @@ -167,24 +237,36 @@ }); }, handleNodeClick(data,node) { - console.log(data); - console.log(node) if(data.children && data.children.length >0) { //鐐瑰嚮鐖剁骇 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){ - this.treeData = 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) }, convertToTree(data) { return data.map((item, index) => { @@ -629,13 +711,39 @@ 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> .noScroll{ - height: calc(100vh - 185px); + height: calc(100vh - 175px); overflow: auto; position: relative; } @@ -748,4 +856,83 @@ background: transparent; box-shadow: none; } -</style> \ No newline at end of file +</style> +<style scoped> +.waypoint-panel { + width: 300px; + /* background: #1e1e1e; + color: white; */ + font-size: 14px; + height: 500px; + overflow-y: scroll; + /* overflow: scroll; */ +} +.waypoint-panel .waypoints { + min-height: 50px; +} + +.stats { + display: flex; + justify-content: space-around; + padding: 8px; + border-bottom: 1px solid #333; +} + +.stat-item { + display: flex; + align-items: center; +} + +.stat-item i { + margin-right: 4px; +} + +.waypoint-item { + border-bottom: 1px solid #333; + min-height: 40px; + line-height: 40px; +} + +.waypoint-item.active { + background-color: rgba(0, 122, 255, 0.3); /* 楂樹寒鑹� */ +} + +.waypoint-header { + display: flex; + 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; +} +.rotated { + transform: rotate(-90deg); +} + +.waypoint-content { + flex: 1; + background: rgb(73, 76, 128); + display: flex; + flex-wrap: wrap; + align-items: center; +} + +.waypoint-contnet img{ + height: 25px; + margin-left: 5px; +} + +</style> -- Gitblit v1.9.3