admin/Mars3D-screen_web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: BUG修改

Browse Source
This commit is contained in:
kun 2023-11-22 19:09:02 +08:00
parent a11a9ad51b
commit 83ea7beaec
5 changed files with 141 additions and 141 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.env.development
View File

@ -2,8 +2,8 @@
NODE_ENV = 'development' NODE_ENV = 'development'
# 本地环境接口地址(/api/index.ts文件中使用) # 本地环境接口地址(/api/index.ts文件中使用)
VITE_API_URL = 'http://192.168.34.155:6677' # VITE_API_URL = 'http://192.168.34.155:6677'
# VITE_API_URL = 'http://jxjzw.zhgdyun.com:6677' VITE_API_URL = 'http://jxjzw.zhgdyun.com:6677'
VITE_WPAPI_URL = "http://182.90.224.147:8081" VITE_WPAPI_URL = "http://182.90.224.147:8081"
# VITE_API_URL = "http://182.90.224.147:6688" # VITE_API_URL = "http://182.90.224.147:6688"

74
src/views/goverment/frontLargeScreen/components/flyRoam.vue
View File

@ -4,10 +4,10 @@
<span>飞行漫游</span> <span>飞行漫游</span>
<el-icon size="16" color="#fff" @click="closeDiv"><Close /></el-icon> <el-icon size="16" color="#fff" @click="closeDiv"><Close /></el-icon>
</div> </div>
<div class="btn-operate"> <!-- <div class="btn-operate">
<el-button type="primary" @click="addRoute">新增路线</el-button> <el-button type="primary" @click="addRoute">新增路线</el-button>
<el-button type="primary" @click="saveJson">保存</el-button> <el-button type="primary" @click="saveJson">保存</el-button>
</div> </div> -->
<div class="table-operate"> <div class="table-operate">
<el-table <el-table
:data="tableData" :data="tableData"
@ -18,7 +18,7 @@
<el-table-column align="center" label="操作"> <el-table-column align="center" label="操作">
<template #default="{ row, $index }"> <template #default="{ row, $index }">
<span style="color: white; cursor: pointer; margin-right: 10px" @click="flyToModel(row, $index)">漫游</span> <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> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -250,40 +250,40 @@ const productRoute = (obj: any) => {
name: "路线-" + dataIndex, name: "路线-" + dataIndex,
speed: 200, speed: 200,
positions: obj.points || obj.positions, positions: obj.points || obj.positions,
model: { // model: {
url: "//data.mars3d.cn/gltf/mars/MQ-9-Predator.glb", // url: "//data.mars3d.cn/gltf/mars/MQ-9-Predator.glb",
scale: 1, // scale: 1,
minimumPixelSize: 60 // minimumPixelSize: 60
}, // },
path: { // path: {
color: "#ffff00", // color: "#ffff00",
opacity: 0.5, // opacity: 0.5,
width: 1, // width: 1,
leadTime: 0 // leadTime: 0
}, // },
coneTrack: { // coneTrack: {
angle: 15, // 半场角度 // angle: 15, // 半场角度
color: "rgba(255,0,255,0.5)" // color: "rgba(255,0,255,0.5)"
}, // },
updateClock: false, // updateClock: false,
point: { // point: {
color: "#ffff00", // color: "#ffff00",
pixelSize: 5, // pixelSize: 5,
distanceDisplayCondition: true, // distanceDisplayCondition: true,
distanceDisplayCondition_near: 80000, // distanceDisplayCondition_near: 80000,
distanceDisplayCondition_far: Number.MAX_VALUE // distanceDisplayCondition_far: Number.MAX_VALUE
}, // },
label: { // label: {
text: "测试", // text: "测试",
font_size: 20, // font_size: 20,
pixelOffsetX: 0, // pixelOffsetX: 0,
pixelOffsetY: -20, // pixelOffsetY: -20,
scaleByDistance: true, // scaleByDistance: true,
scaleByDistance_far: 80000, // scaleByDistance_far: 80000,
scaleByDistance_farValue: 0.4, // scaleByDistance_farValue: 0.4,
distanceDisplayCondition: true, // distanceDisplayCondition: true,
distanceDisplayCondition_far: 80000 // distanceDisplayCondition_far: 80000
}, // },
attr: { attr: {
classKey: "FixedRoute" classKey: "FixedRoute"
} }

68
src/views/goverment/frontLargeScreen/index.vue
View File

@ -520,40 +520,40 @@ const showMapData = (arr: any) => {
name: item.name, name: item.name,
speed: 200, speed: 200,
positions: item.points || item.positions, positions: item.points || item.positions,
model: { // model: {
url: "//data.mars3d.cn/gltf/mars/MQ-9-Predator.glb", // url: "//data.mars3d.cn/gltf/mars/MQ-9-Predator.glb",
scale: 1, // scale: 1,
minimumPixelSize: 60 // minimumPixelSize: 60
}, // },
path: { // path: {
color: "#ffff00", // color: "#ffff00",
opacity: 0.5, // opacity: 0.5,
width: 1, // width: 1,
leadTime: 0 // leadTime: 0
}, // },
coneTrack: { // coneTrack: {
angle: 15, // 半场角度 // angle: 15, // 半场角度
color: "rgba(255,0,255,0.5)" // color: "rgba(255,0,255,0.5)"
}, // },
updateClock: false, // updateClock: false,
point: { // point: {
color: "#ffff00", // color: "#ffff00",
pixelSize: 5, // pixelSize: 5,
distanceDisplayCondition: true, // distanceDisplayCondition: true,
distanceDisplayCondition_near: 80000, // distanceDisplayCondition_near: 80000,
distanceDisplayCondition_far: Number.MAX_VALUE // distanceDisplayCondition_far: Number.MAX_VALUE
}, // },
label: { // label: {
text: "测试", // text: "测试",
font_size: 20, // font_size: 20,
pixelOffsetX: 0, // pixelOffsetX: 0,
pixelOffsetY: -20, // pixelOffsetY: -20,
scaleByDistance: true, // scaleByDistance: true,
scaleByDistance_far: 80000, // scaleByDistance_far: 80000,
scaleByDistance_farValue: 0.4, // scaleByDistance_farValue: 0.4,
distanceDisplayCondition: true, // distanceDisplayCondition: true,
distanceDisplayCondition_far: 80000 // distanceDisplayCondition_far: 80000
}, // },
attr: { attr: {
classKey: "FixedRoute" classKey: "FixedRoute"
} }

68
src/views/goverment/largeScreen/components/flyRoam.vue
View File

@ -250,40 +250,40 @@ const productRoute = (obj: any) => {
name: "路线-" + dataIndex, name: "路线-" + dataIndex,
speed: 200, speed: 200,
positions: obj.points || obj.positions, positions: obj.points || obj.positions,
model: { // model: {
url: "//data.mars3d.cn/gltf/mars/MQ-9-Predator.glb", // url: "//data.mars3d.cn/gltf/mars/MQ-9-Predator.glb",
scale: 1, // scale: 1,
minimumPixelSize: 60 // minimumPixelSize: 60
}, // },
path: { // path: {
color: "#ffff00", // color: "#ffff00",
opacity: 0.5, // opacity: 0.5,
width: 1, // width: 1,
leadTime: 0 // leadTime: 0
}, // },
coneTrack: { // coneTrack: {
angle: 15, // 半场角度 // angle: 15, // 半场角度
color: "rgba(255,0,255,0.5)" // color: "rgba(255,0,255,0.5)"
}, // },
updateClock: false, // updateClock: false,
point: { // point: {
color: "#ffff00", // color: "#ffff00",
pixelSize: 5, // pixelSize: 5,
distanceDisplayCondition: true, // distanceDisplayCondition: true,
distanceDisplayCondition_near: 80000, // distanceDisplayCondition_near: 80000,
distanceDisplayCondition_far: Number.MAX_VALUE // distanceDisplayCondition_far: Number.MAX_VALUE
}, // },
label: { // label: {
text: "测试", // text: "测试",
font_size: 20, // font_size: 20,
pixelOffsetX: 0, // pixelOffsetX: 0,
pixelOffsetY: -20, // pixelOffsetY: -20,
scaleByDistance: true, // scaleByDistance: true,
scaleByDistance_far: 80000, // scaleByDistance_far: 80000,
scaleByDistance_farValue: 0.4, // scaleByDistance_farValue: 0.4,
distanceDisplayCondition: true, // distanceDisplayCondition: true,
distanceDisplayCondition_far: 80000 // distanceDisplayCondition_far: 80000
}, // },
attr: { attr: {
classKey: "FixedRoute" classKey: "FixedRoute"
} }

68
src/views/goverment/largeScreen/index.vue
View File

@ -501,40 +501,40 @@ const showMapData = (arr: any) => {
name: item.name, name: item.name,
speed: 200, speed: 200,
positions: item.points || item.positions, positions: item.points || item.positions,
model: { // model: {
url: "//data.mars3d.cn/gltf/mars/MQ-9-Predator.glb", // url: "//data.mars3d.cn/gltf/mars/MQ-9-Predator.glb",
scale: 1, // scale: 1,
minimumPixelSize: 60 // minimumPixelSize: 60
}, // },
path: { // path: {
color: "#ffff00", // color: "#ffff00",
opacity: 0.5, // opacity: 0.5,
width: 1, // width: 1,
leadTime: 0 // leadTime: 0
}, // },
coneTrack: { // coneTrack: {
angle: 15, // 半场角度 // angle: 15, // 半场角度
color: "rgba(255,0,255,0.5)" // color: "rgba(255,0,255,0.5)"
}, // },
updateClock: false, // updateClock: false,
point: { // point: {
color: "#ffff00", // color: "#ffff00",
pixelSize: 5, // pixelSize: 5,
distanceDisplayCondition: true, // distanceDisplayCondition: true,
distanceDisplayCondition_near: 80000, // distanceDisplayCondition_near: 80000,
distanceDisplayCondition_far: Number.MAX_VALUE // distanceDisplayCondition_far: Number.MAX_VALUE
}, // },
label: { // label: {
text: "测试", // text: "测试",
font_size: 20, // font_size: 20,
pixelOffsetX: 0, // pixelOffsetX: 0,
pixelOffsetY: -20, // pixelOffsetY: -20,
scaleByDistance: true, // scaleByDistance: true,
scaleByDistance_far: 80000, // scaleByDistance_far: 80000,
scaleByDistance_farValue: 0.4, // scaleByDistance_farValue: 0.4,
distanceDisplayCondition: true, // distanceDisplayCondition: true,
distanceDisplayCondition_far: 80000 // distanceDisplayCondition_far: 80000
}, // },
attr: { attr: {
classKey: "FixedRoute" classKey: "FixedRoute"
} }