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 | 384 +++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 357 insertions(+), 27 deletions(-)
diff --git a/src/views/system/shootPoint/components/shootPointDialog.vue b/src/views/system/shootPoint/components/shootPointDialog.vue
index 3f2f6a8..eed0225 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>
@@ -25,21 +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
- 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 treeData"
+ :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 +'----' +wp.children[0].label }}</span>
+ <span v-for="(action, aIndex) in wp.children[0].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>
+ </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">
@@ -47,20 +89,27 @@
<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 , getPointInfo} from "@/api/system/template"
let globalon = 0
let globalat = 0
-let towerHeight = 47.47
+let towerHeight = 45
//濉旂殑鏈濆悜绠楁硶鎵�鐢ㄥ埌鐨� 鏃嬭浆搴︽暟
let rotationAngle = Cesium.Math.toRadians(0)
+const typeDictionary = {
+ "鎷嶇収": "01",
+ "鍙樺��": "02",
+ "寮�濮嬪綍鍍�": "03",
+ '缁撴潫褰曞儚':'04',
+ "鎮仠": "05",
+
+}
export default{
name:'shootPointDialog',
components: {
@@ -92,14 +141,22 @@
chooseModelId:null,
modelName:null,
templateType:null,
- form:{}
+ form:{},
+ deviceData:null,
+ activeName: 'first',
+ 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(() => {
@@ -111,6 +168,130 @@
}
},
methods:{
+ toggleSelect(data,index) {
+ this.chooseItem = data
+ console.log(this.treeData)
+ console.log(data)
+ // 濡傛灉鐐瑰嚮鐨勬槸褰撳墠琛岋紝鍒欏彇娑堥�変腑
+ 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 === data.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];
+ 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);
+ this.$refs.initMap.DealVisualCone(data)
+ },
+ // 璁＄畻 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)
+ console.log(this.treeData)
+ console.log(this.lastTableArr)
+ this.treeData = arrList
+ const childrenArr = arrList
+ .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 {
+ ele.actions = []
+ }
+ })
+ this.waypoints = childrenArr
+ console.log(childrenArr)
+ console.log(this.treeData)
+ },
convertToTree(data) {
return data.map((item, index) => {
const parentId = 'air_' + index;
@@ -254,7 +435,10 @@
},
//鍚堝苟閫昏緫 灏嗛檮杩憂绫宠寖鍥村唴鐨勭偣鍚堝苟 骞朵笖澶勭悊鎴愭暟鎹�
mergePoint(arr,mergeNumber,viewer){
- this.treeData = arr
+ console.log(arr)
+ console.log(this.treeData)
+ // this.treeData = arr
+ this.treeData = this.lastTableArr
const result = this.replaceCloseChildrenWithHighestPoint(this.treeData,mergeNumber);
// const updated = this.insertRaisedPoints(result, 0,0, 236, 130);
const updated = this.insertRaisedPoints(result, globalon, globalat, towerHeight);
@@ -264,7 +448,7 @@
const ground = item
const air = item.children[0]
- // 鍦伴潰鐐瑰埌绌轰腑鐐� 鈥� 鐧借壊铏氱嚎
+ // 鍦伴潰鐐瑰埌7绌轰腑鐐� 鈥� 鐧借壊铏氱嚎
viewer.entities.add({
polyline: {
positions: Cesium.Cartesian3.fromDegreesArrayHeights([
@@ -325,7 +509,9 @@
...pointA,
id: this.generateId(),
label: pointA.label + "-鍔犻珮",
- height: pointA.height + 50
+ // height: pointA.height + 50,
+ height: pointA.height + (towerHeight - pointA.height + 20),
+ actions:[]
}
]
};
@@ -344,7 +530,8 @@
...pointB,
id: this.generateId(),
label: pointB.label + "-鍔犻珮",
- height: pointB.height + 50
+ height: pointB.height + (towerHeight - pointB.height + 20),
+ actions:[]
}
]
};
@@ -442,15 +629,19 @@
console.log(row)
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.towerHeight || 47.47
+ towerHeight = row.modelHeight || 45
this.showMap =false
this.$nextTick(()=>{
- // this.towerUrl = row.modelRoute
- this.towerUrl = row.modelRoute
+ if(this.templateId){
+ this.towerUrl = row.ardTowerModel.modelRoute
+ }else {
+ this.towerUrl = row.modelRoute
+ }
this.showMap = true
})
},
@@ -493,7 +684,31 @@
type: 'warning'
})
}
- // this.dialogVisible = false
+ console.log(this.$refs.initMap.preVideoScopePrimitiveArrTie)
+ console.log(this.treeData)
+ console.log(this.waypoints)
+ 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;
@@ -507,7 +722,12 @@
latitude: ground.latitude,
longitude: ground.longitude,
pointNumber: 1,
- targetName: ground.label
+ targetName: ground.label,
+ actions:child.actions.map((item, index) => ({
+ actionIndex: index.toString(),
+ actionType: typeDictionary[item.type] || "", // 濡傛灉绫诲瀷涓嶅瓨鍦ㄥ瓧鍏镐腑锛岄粯璁ょ┖瀛楃涓�
+ actionValue: item.extra.value
+ }))
}
],
latitude: child.latitude,
@@ -550,13 +770,44 @@
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)
+ this.treeData = this.lastTableArr
+ },
+ 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 - 185px);
+ height: calc(100vh - 175px);
overflow: auto;
position: relative;
}
@@ -669,4 +920,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: 22px;
+
+}
+
+
+.waypoint-header .waypoint-index {
+ font-size: 22x;
+}
+.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