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 | 471 ++++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 419 insertions(+), 52 deletions(-)
diff --git a/src/views/system/shootPoint/components/shootPointDialog.vue b/src/views/system/shootPoint/components/shootPointDialog.vue
index 92d54c7..d619ffe 100644
--- a/src/views/system/shootPoint/components/shootPointDialog.vue
+++ b/src/views/system/shootPoint/components/shootPointDialog.vue
@@ -12,29 +12,76 @@
<div class="chooseModel">
<el-button type="primary" @click='chooseModel'>閫夋嫨妯″瀷</el-button>
<div class="modelType">
- 妯″瀷鍚嶇О锛歿{ templateName }}
+ 妯″瀷鍚嶇О锛歿{ modelName }}
</div>
<div>
妯″瀷绫诲瀷锛歿{ templateType }}
</div>
+ <el-form label-width="70px" :model="form">
+ <el-form-item label="妯℃澘鍚嶇О">
+ <el-input v-model="form.templateName"></el-input>
+ </el-form-item>
+ </el-form>
</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
- 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"></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">
@@ -42,25 +89,32 @@
<el-button type="primary" @click="submit()" >纭� 瀹�</el-button>
</span>
</el-dialog>
- <ChooseModelDialog v-if="showModel" @cancel ='cancel' @getRowData="getRowData" ></ChooseModelDialog>
+ <ChooseModelDialog v-if="showModel" @cancel ='cancel' @getRowData="getRowData"></ChooseModelDialog>
</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';
-import { addPoint} from "@/api/system/template"
- let globalon = 0
+import { addPoint , getPointInfo} from "@/api/system/template"
+let globalon = 0
let globalat = 0
-const centerCartesian = Cesium.Cartesian3.fromDegrees(globalon,globalat , 0)
-let rotationAngle = Cesium.Math.toRadians(60)
-let relativeData
+let towerHeight = 45
+//濉旂殑鏈濆悜绠楁硶鎵�鐢ㄥ埌鐨� 鏃嬭浆搴︽暟
+let rotationAngle = Cesium.Math.toRadians(0)
export default{
name:'shootPointDialog',
components: {
CesiumMap,
ChooseModelDialog,
InitMap
+ },
+ props: {
+ templateId: {
+ type: String,
+ defaule: null
+ }
},
data(){
return{
@@ -78,13 +132,205 @@
showMap:false,
towerUrl:null,
chooseModelId:null,
- templateName:null,
- templateType:null
+ modelName:null,
+ templateType:null,
+ form:{},
+ deviceData:null,
+ activeName: 'first',
+ totalDistance: 3054.9,
+ totalTime: '5m 56s',
+ totalPoints: 11,
+ totalPhotos: 3,
+ waypoints:[],
+ selectedIndex:null,
+ chooseItem: null,
+ lastTableArr:[]
}
},
mounted(){
+ console.log(this.templateId)
+ if(this.templateId) {
+ //棰勮閫昏緫
+ getPointInfo(this.templateId).then(res=>{
+ if(res.code == 200 ) {
+ console.log(res.data)
+ this.getRowData(res.data)
+ let drawArr = this.convertToTree(res.data.ardListWayPointsLS)
+ setTimeout(() => {
+ //娓叉煋鏃堕棿闂 鍔犱釜寤舵椂鍣�
+ this.drawLines(drawArr)
+ }, 500);
+ }
+ })
+ }
},
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);
+ const direction = Cesium.Cartesian3.subtract(
+ toCartesian,
+ fromCartesian,
+ new Cesium.Cartesian3()
+ );
+ const directionLocal = Cesium.Matrix4.multiplyByPointAsVector(
+ Cesium.Matrix4.inverseTransformation(transform, new Cesium.Matrix4()),
+ direction,
+ new Cesium.Cartesian3()
+ );
+ Cesium.Cartesian3.normalize(directionLocal, directionLocal);
+ return Math.atan2(directionLocal.x, directionLocal.y);
+ },
+
+ // 璁＄畻 pitch锛堜刊浠拌锛�
+ computePitch(fromCartesian, toCartesian) {
+ const transform = Cesium.Transforms.eastNorthUpToFixedFrame(fromCartesian);
+ const direction = Cesium.Cartesian3.subtract(
+ toCartesian,
+ fromCartesian,
+ new Cesium.Cartesian3()
+ );
+ const directionLocal = Cesium.Matrix4.multiplyByPointAsVector(
+ Cesium.Matrix4.inverseTransformation(transform, new Cesium.Matrix4()),
+ direction,
+ new Cesium.Cartesian3()
+ );
+ Cesium.Cartesian3.normalize(directionLocal, directionLocal);
+ return Math.asin(directionLocal.z); // z杞村悜涓�
+ },
+
+ // 椋炲埌 from 鐪嬪悜 to
+ flyToAndLookAt(from, to) {
+ const fromCartesian = Cesium.Cartesian3.fromDegrees(from[0], from[1], from[2]);
+ const toCartesian = Cesium.Cartesian3.fromDegrees(to[0], to[1], to[2]);
+
+ const heading = this.computeHeading(fromCartesian, toCartesian);
+ const pitch = this.computePitch(fromCartesian, toCartesian);
+ let viewer = window.viewerM
+ viewer.camera.flyTo({
+ destination: fromCartesian,
+ orientation: {
+ heading: heading,
+ pitch: pitch,
+ roll: 0.0
+ },
+ duration: 3
+ });
+ },
+ handleNodeClick(data,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);
+ } 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.$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)
+ },
+ convertToTree(data) {
+ return data.map((item, index) => {
+ const parentId = 'air_' + index;
+ return {
+ id: parentId,
+ label: item.targetName,
+ longitude: item.longitude,
+ latitude: item.latitude,
+ height: item.altitude,
+ children: (item.ardGroundPoint || []).map((g, i) => {
+ return {
+ id: parentId + '_ground_' + i,
+ label: g.targetName,
+ longitude: g.longitude,
+ latitude: g.latitude,
+ height: g.height
+ }
+ })
+ }
+ });
+ },
+ drawLines(treeData) {
+ console.log(treeData)
+ console.log(window)
+ console.log(window.viewerM)
+ let viewer = window.viewerM
+
+ // 鏀堕泦绌轰腑鐐逛綅缃�
+ const airPositions = treeData.map(point => {
+ return Cesium.Cartesian3.fromDegrees(
+ point.longitude,
+ point.latitude,
+ point.height
+ );
+ });
+
+ // 1. 绌轰腑鐐逛箣闂寸敤榛勮壊瀹炵嚎杩炴帴
+ viewer.entities.add({
+ polyline: {
+ positions: airPositions,
+ width: 2,
+ material: Cesium.Color.YELLOW
+ }
+ });
+
+ // 2. 姣忎釜绌轰腑鐐逛笌鍦伴潰鐐圭敤钃濊壊铏氱嚎杩炴帴
+ treeData.forEach(point => {
+ const airPos = Cesium.Cartesian3.fromDegrees(point.longitude, point.latitude, point.height);
+ point.children.forEach(child => {
+ const groundPos = Cesium.Cartesian3.fromDegrees(child.longitude, child.latitude, child.height);
+ viewer.entities.add({
+ polyline: {
+ positions: [airPos, groundPos],
+ width: 1,
+ material: new Cesium.PolylineDashMaterialProperty({
+ color: Cesium.Color.BLUE,
+ dashLength: 8
+ })
+ }
+ });
+ });
+ });
+ },
addPoint(viewer, position, color, label) {
viewer.entities.add({
name: label,
@@ -163,18 +409,19 @@
return newGround;
});
},
+ //鍚堝苟閫昏緫 灏嗛檮杩憂绫宠寖鍥村唴鐨勭偣鍚堝苟 骞朵笖澶勭悊鎴愭暟鎹�
mergePoint(arr,mergeNumber,viewer){
this.treeData = arr
const result = this.replaceCloseChildrenWithHighestPoint(this.treeData,mergeNumber);
// const updated = this.insertRaisedPoints(result, 0,0, 236, 130);
- const updated = this.insertRaisedPoints(result, globalon, globalat, 236, 130);
+ const updated = this.insertRaisedPoints(result, globalon, globalat, towerHeight);
this.treeData = updated
const airPoints = []
this.treeData.forEach(item => {
const ground = item
const air = item.children[0]
- // 鍦伴潰鐐瑰埌绌轰腑鐐� 鈥� 鐧借壊铏氱嚎
+ // 鍦伴潰鐐瑰埌7绌轰腑鐐� 鈥� 鐧借壊铏氱嚎
viewer.entities.add({
polyline: {
positions: Cesium.Cartesian3.fromDegreesArrayHeights([
@@ -204,7 +451,7 @@
console.log(this.treeData)
},
//鏁扮粍 濉旂殑绮惧害 濉旂殑绾害 濉旂殑楂樺害 鍗婂緞
- insertRaisedPoints(data, centerLon, centerLat, centerHeight, radius = 130) {
+ insertRaisedPoints(data, centerLon, centerLat, centerHeight, radius = 10) {
const center = Cesium.Cartesian3.fromDegrees(centerLon, centerLat, centerHeight);
const result = JSON.parse(JSON.stringify(data)); // 娣辨嫹璐濋伩鍏嶆薄鏌撳師鏁版嵁
const inserts = []; // 鐢ㄤ簬瀛樺偍鎻掑叆椤瑰強鍏剁洰鏍囦綅缃�
@@ -350,12 +597,21 @@
},
getRowData(row){
console.log(row)
- this.templateName = row.modelName
+ this.modelName = row.modelName
this.templateType = row.modelType
+ this.deviceData = row
+ if(this.templateId){
+ this.form.templateName = row.templateName || ''
+ }
this.chooseModelId = row.id
+ towerHeight = row.modelHeight || 45
this.showMap =false
this.$nextTick(()=>{
- this.towerUrl = row.modelRoute
+ if(this.templateId){
+ this.towerUrl = row.ardTowerModel.modelRoute
+ }else {
+ this.towerUrl = row.modelRoute
+ }
this.showMap = true
})
},
@@ -392,34 +648,40 @@
console.log('鎷栨嫿瀹屾垚', { draggingNode, dropNode, dropType })
},
submit(){
+ if(!this.form.templateName){
+ return this.$message({
+ message: '璇峰厛杈撳叆妯℃澘鍚嶇О鍐嶄繚瀛�',
+ type: 'warning'
+ })
+ }
// this.dialogVisible = false
// const dealArr = this.submitDealData()
- const transformed = this.treeData.map((groundPoint, index) => {
- const pointNumber = index + 1;
- const airPoints = groundPoint.children.map(child => ({
- altitude: child.height,
- flightTemplateId: "",
- latitude: child.latitude,
- longitude: child.longitude,
- pointNumber: 1, // 鍙牴鎹渶瑕佹敼涓� child 缂栧彿
- targetName:child.label
- }));
- return {
- ardAirPointLs: airPoints,
- ardGroundPoint: {
- flightTemplateId: "",
- height: groundPoint.height,
- latitude: groundPoint.latitude,
- longitude: groundPoint.longitude,
- pointNumber: 1,
- targetName: groundPoint.label
- },
- pointNumber: pointNumber
- };
- });
+ 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,
- ard3DCoordinateSystemLs:transformed
+ ardListWayPointsLS:transformed
}
addPoint(parmas).then(res=>{
console.log(res)
@@ -449,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;
}
@@ -466,7 +754,7 @@
text-align: center;
}
.chooseModel{
- height: 100px;
+ height: 120px;
/* border: 1px solid #dddddd; */
}
.cameraView{
@@ -568,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