From 83ea7beaec9232779c3a405d861093f87855402a Mon Sep 17 00:00:00 2001
From: kun <1422840143@qq.com>
Date: Wed, 22 Nov 2023 19:09:02 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20BUG=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                              |  4 +-
 .../frontLargeScreen/components/flyRoam.vue   | 74 +++++++++----------
 .../goverment/frontLargeScreen/index.vue      | 68 ++++++++---------
 .../largeScreen/components/flyRoam.vue        | 68 ++++++++---------
 src/views/goverment/largeScreen/index.vue     | 68 ++++++++---------
 5 files changed, 141 insertions(+), 141 deletions(-)

diff --git a/.env.development b/.env.development
index 54f5fa3..cb8d67d 100644
--- a/.env.development
+++ b/.env.development
@@ -2,8 +2,8 @@
 NODE_ENV = 'development'
 
 # 本地环境接口地址(/api/index.ts文件中使用)
-VITE_API_URL = 'http://192.168.34.155:6677'
-# VITE_API_URL = 'http://jxjzw.zhgdyun.com:6677'
+# VITE_API_URL = 'http://192.168.34.155:6677'
+VITE_API_URL = 'http://jxjzw.zhgdyun.com:6677'
 VITE_WPAPI_URL = "http://182.90.224.147:8081"
 # VITE_API_URL = "http://182.90.224.147:6688"
 
diff --git a/src/views/goverment/frontLargeScreen/components/flyRoam.vue b/src/views/goverment/frontLargeScreen/components/flyRoam.vue
index 6c1cf3c..6487ca4 100644
--- a/src/views/goverment/frontLargeScreen/components/flyRoam.vue
+++ b/src/views/goverment/frontLargeScreen/components/flyRoam.vue
@@ -4,10 +4,10 @@
 			<span>飞行漫游</span>
 			<el-icon size="16" color="#fff" @click="closeDiv"><Close /></el-icon>
 		</div>
-		<div class="btn-operate">
+		<!-- <div class="btn-operate">
 			<el-button type="primary" @click="addRoute">新增路线</el-button>
 			<el-button type="primary" @click="saveJson">保存</el-button>
-		</div>
+		</div> -->
 		<div class="table-operate">
 			<el-table
 				:data="tableData"
@@ -18,7 +18,7 @@
 				<el-table-column align="center" label="操作">
 					<template #default="{ row, $index }">
 						<span style="color: white; cursor: pointer; margin-right: 10px" @click="flyToModel(row, $index)">漫游</span>
-						<span style="color: white; cursor: pointer" @click="deleteRoute(row, $index)">删除</span>
+						<!-- <span style="color: white; cursor: pointer" @click="deleteRoute(row, $index)">删除</span> -->
 					</template>
 				</el-table-column>
 			</el-table>
@@ -250,40 +250,40 @@ const productRoute = (obj: any) => {
 		name: "路线-" + dataIndex,
 		speed: 200,
 		positions: obj.points || obj.positions,
-		model: {
-			url: "//data.mars3d.cn/gltf/mars/MQ-9-Predator.glb",
-			scale: 1,
-			minimumPixelSize: 60
-		},
-		path: {
-			color: "#ffff00",
-			opacity: 0.5,
-			width: 1,
-			leadTime: 0
-		},
-		coneTrack: {
-			angle: 15, // 半场角度
-			color: "rgba(255,0,255,0.5)"
-		},
-		updateClock: false,
-		point: {
-			color: "#ffff00",
-			pixelSize: 5,
-			distanceDisplayCondition: true,
-			distanceDisplayCondition_near: 80000,
-			distanceDisplayCondition_far: Number.MAX_VALUE
-		},
-		label: {
-			text: "测试",
-			font_size: 20,
-			pixelOffsetX: 0,
-			pixelOffsetY: -20,
-			scaleByDistance: true,
-			scaleByDistance_far: 80000,
-			scaleByDistance_farValue: 0.4,
-			distanceDisplayCondition: true,
-			distanceDisplayCondition_far: 80000
-		},
+		// model: {
+		// 	url: "//data.mars3d.cn/gltf/mars/MQ-9-Predator.glb",
+		// 	scale: 1,
+		// 	minimumPixelSize: 60
+		// },
+		// path: {
+		// 	color: "#ffff00",
+		// 	opacity: 0.5,
+		// 	width: 1,
+		// 	leadTime: 0
+		// },
+		// coneTrack: {
+		// 	angle: 15, // 半场角度
+		// 	color: "rgba(255,0,255,0.5)"
+		// },
+		// updateClock: false,
+		// point: {
+		// 	color: "#ffff00",
+		// 	pixelSize: 5,
+		// 	distanceDisplayCondition: true,
+		// 	distanceDisplayCondition_near: 80000,
+		// 	distanceDisplayCondition_far: Number.MAX_VALUE
+		// },
+		// label: {
+		// 	text: "测试",
+		// 	font_size: 20,
+		// 	pixelOffsetX: 0,
+		// 	pixelOffsetY: -20,
+		// 	scaleByDistance: true,
+		// 	scaleByDistance_far: 80000,
+		// 	scaleByDistance_farValue: 0.4,
+		// 	distanceDisplayCondition: true,
+		// 	distanceDisplayCondition_far: 80000
+		// },
 		attr: {
 			classKey: "FixedRoute"
 		}
diff --git a/src/views/goverment/frontLargeScreen/index.vue b/src/views/goverment/frontLargeScreen/index.vue
index b1645d3..7630666 100644
--- a/src/views/goverment/frontLargeScreen/index.vue
+++ b/src/views/goverment/frontLargeScreen/index.vue
@@ -520,40 +520,40 @@ const showMapData = (arr: any) => {
 					name: item.name,
 					speed: 200,
 					positions: item.points || item.positions,
-					model: {
-						url: "//data.mars3d.cn/gltf/mars/MQ-9-Predator.glb",
-						scale: 1,
-						minimumPixelSize: 60
-					},
-					path: {
-						color: "#ffff00",
-						opacity: 0.5,
-						width: 1,
-						leadTime: 0
-					},
-					coneTrack: {
-						angle: 15, // 半场角度
-						color: "rgba(255,0,255,0.5)"
-					},
-					updateClock: false,
-					point: {
-						color: "#ffff00",
-						pixelSize: 5,
-						distanceDisplayCondition: true,
-						distanceDisplayCondition_near: 80000,
-						distanceDisplayCondition_far: Number.MAX_VALUE
-					},
-					label: {
-						text: "测试",
-						font_size: 20,
-						pixelOffsetX: 0,
-						pixelOffsetY: -20,
-						scaleByDistance: true,
-						scaleByDistance_far: 80000,
-						scaleByDistance_farValue: 0.4,
-						distanceDisplayCondition: true,
-						distanceDisplayCondition_far: 80000
-					},
+					// model: {
+					// 	url: "//data.mars3d.cn/gltf/mars/MQ-9-Predator.glb",
+					// 	scale: 1,
+					// 	minimumPixelSize: 60
+					// },
+					// path: {
+					// 	color: "#ffff00",
+					// 	opacity: 0.5,
+					// 	width: 1,
+					// 	leadTime: 0
+					// },
+					// coneTrack: {
+					// 	angle: 15, // 半场角度
+					// 	color: "rgba(255,0,255,0.5)"
+					// },
+					// updateClock: false,
+					// point: {
+					// 	color: "#ffff00",
+					// 	pixelSize: 5,
+					// 	distanceDisplayCondition: true,
+					// 	distanceDisplayCondition_near: 80000,
+					// 	distanceDisplayCondition_far: Number.MAX_VALUE
+					// },
+					// label: {
+					// 	text: "测试",
+					// 	font_size: 20,
+					// 	pixelOffsetX: 0,
+					// 	pixelOffsetY: -20,
+					// 	scaleByDistance: true,
+					// 	scaleByDistance_far: 80000,
+					// 	scaleByDistance_farValue: 0.4,
+					// 	distanceDisplayCondition: true,
+					// 	distanceDisplayCondition_far: 80000
+					// },
 					attr: {
 						classKey: "FixedRoute"
 					}
diff --git a/src/views/goverment/largeScreen/components/flyRoam.vue b/src/views/goverment/largeScreen/components/flyRoam.vue
index 5dc97bd..101c7da 100644
--- a/src/views/goverment/largeScreen/components/flyRoam.vue
+++ b/src/views/goverment/largeScreen/components/flyRoam.vue
@@ -250,40 +250,40 @@ const productRoute = (obj: any) => {
 		name: "路线-" + dataIndex,
 		speed: 200,
 		positions: obj.points || obj.positions,
-		model: {
-			url: "//data.mars3d.cn/gltf/mars/MQ-9-Predator.glb",
-			scale: 1,
-			minimumPixelSize: 60
-		},
-		path: {
-			color: "#ffff00",
-			opacity: 0.5,
-			width: 1,
-			leadTime: 0
-		},
-		coneTrack: {
-			angle: 15, // 半场角度
-			color: "rgba(255,0,255,0.5)"
-		},
-		updateClock: false,
-		point: {
-			color: "#ffff00",
-			pixelSize: 5,
-			distanceDisplayCondition: true,
-			distanceDisplayCondition_near: 80000,
-			distanceDisplayCondition_far: Number.MAX_VALUE
-		},
-		label: {
-			text: "测试",
-			font_size: 20,
-			pixelOffsetX: 0,
-			pixelOffsetY: -20,
-			scaleByDistance: true,
-			scaleByDistance_far: 80000,
-			scaleByDistance_farValue: 0.4,
-			distanceDisplayCondition: true,
-			distanceDisplayCondition_far: 80000
-		},
+		// model: {
+		// 	url: "//data.mars3d.cn/gltf/mars/MQ-9-Predator.glb",
+		// 	scale: 1,
+		// 	minimumPixelSize: 60
+		// },
+		// path: {
+		// 	color: "#ffff00",
+		// 	opacity: 0.5,
+		// 	width: 1,
+		// 	leadTime: 0
+		// },
+		// coneTrack: {
+		// 	angle: 15, // 半场角度
+		// 	color: "rgba(255,0,255,0.5)"
+		// },
+		// updateClock: false,
+		// point: {
+		// 	color: "#ffff00",
+		// 	pixelSize: 5,
+		// 	distanceDisplayCondition: true,
+		// 	distanceDisplayCondition_near: 80000,
+		// 	distanceDisplayCondition_far: Number.MAX_VALUE
+		// },
+		// label: {
+		// 	text: "测试",
+		// 	font_size: 20,
+		// 	pixelOffsetX: 0,
+		// 	pixelOffsetY: -20,
+		// 	scaleByDistance: true,
+		// 	scaleByDistance_far: 80000,
+		// 	scaleByDistance_farValue: 0.4,
+		// 	distanceDisplayCondition: true,
+		// 	distanceDisplayCondition_far: 80000
+		// },
 		attr: {
 			classKey: "FixedRoute"
 		}
diff --git a/src/views/goverment/largeScreen/index.vue b/src/views/goverment/largeScreen/index.vue
index 7fd2382..cb1c6a5 100644
--- a/src/views/goverment/largeScreen/index.vue
+++ b/src/views/goverment/largeScreen/index.vue
@@ -501,40 +501,40 @@ const showMapData = (arr: any) => {
 					name: item.name,
 					speed: 200,
 					positions: item.points || item.positions,
-					model: {
-						url: "//data.mars3d.cn/gltf/mars/MQ-9-Predator.glb",
-						scale: 1,
-						minimumPixelSize: 60
-					},
-					path: {
-						color: "#ffff00",
-						opacity: 0.5,
-						width: 1,
-						leadTime: 0
-					},
-					coneTrack: {
-						angle: 15, // 半场角度
-						color: "rgba(255,0,255,0.5)"
-					},
-					updateClock: false,
-					point: {
-						color: "#ffff00",
-						pixelSize: 5,
-						distanceDisplayCondition: true,
-						distanceDisplayCondition_near: 80000,
-						distanceDisplayCondition_far: Number.MAX_VALUE
-					},
-					label: {
-						text: "测试",
-						font_size: 20,
-						pixelOffsetX: 0,
-						pixelOffsetY: -20,
-						scaleByDistance: true,
-						scaleByDistance_far: 80000,
-						scaleByDistance_farValue: 0.4,
-						distanceDisplayCondition: true,
-						distanceDisplayCondition_far: 80000
-					},
+					// model: {
+					// 	url: "//data.mars3d.cn/gltf/mars/MQ-9-Predator.glb",
+					// 	scale: 1,
+					// 	minimumPixelSize: 60
+					// },
+					// path: {
+					// 	color: "#ffff00",
+					// 	opacity: 0.5,
+					// 	width: 1,
+					// 	leadTime: 0
+					// },
+					// coneTrack: {
+					// 	angle: 15, // 半场角度
+					// 	color: "rgba(255,0,255,0.5)"
+					// },
+					// updateClock: false,
+					// point: {
+					// 	color: "#ffff00",
+					// 	pixelSize: 5,
+					// 	distanceDisplayCondition: true,
+					// 	distanceDisplayCondition_near: 80000,
+					// 	distanceDisplayCondition_far: Number.MAX_VALUE
+					// },
+					// label: {
+					// 	text: "测试",
+					// 	font_size: 20,
+					// 	pixelOffsetX: 0,
+					// 	pixelOffsetY: -20,
+					// 	scaleByDistance: true,
+					// 	scaleByDistance_far: 80000,
+					// 	scaleByDistance_farValue: 0.4,
+					// 	distanceDisplayCondition: true,
+					// 	distanceDisplayCondition_far: 80000
+					// },
 					attr: {
 						classKey: "FixedRoute"
 					}