Compare commits

..

No commits in common. "main" and "testdsj" have entirely different histories.

12 changed files with 105 additions and 153 deletions

View File

@ -11,7 +11,7 @@ VITE_APP_CLIENT_SECRET = 'NjHifmmB41rH6bJTd4A7RA=='
#程璐 #程璐
#VITE_APP_API_BASE_URL=http://192.168.12.117:9060/airport/ #VITE_APP_API_BASE_URL=http://192.168.12.117:9060/airport/
VITE_APP_API_BASE_URL= https://virtualplane-test.t-aaron.com/airport VITE_APP_API_BASE_URL= https://virtualplane-test.t-aaron.com
#VITE_APP_API_BASE_URL=https://airport-develop.t-aaron.com:3443 #VITE_APP_API_BASE_URL=https://airport-develop.t-aaron.com:3443
# VUE_APP_API_BASE_URL=https://airport.t-aaron.com/airport/ # VUE_APP_API_BASE_URL=https://airport.t-aaron.com/airport/
# VUE_APP_API_BASE_URL=https://airportdev.t-aaron.com/airport/ # VUE_APP_API_BASE_URL=https://airportdev.t-aaron.com/airport/
@ -27,4 +27,8 @@ VITE_APP_AUTHORITY =https://login-test.t-aaron.com
#令牌 #令牌
#VUE_APP_OUT_AUTHORITY = 'https://oidc-develop.t-aaron.com:3443' #VUE_APP_OUT_AUTHORITY = 'https://oidc-develop.t-aaron.com:3443'
# 机场大屏跳转地址
VITE_APP_ASURL = 'https://airport-screen-test.t-aaron.com'
# 低空
VITE_APP_BUSINESS ='http://192.168.14.12:8082'

View File

@ -1,6 +1,9 @@
<script setup> <script setup>
// import { RouterLink, RouterView, useRoute } from 'vue-router'
// const { VITE_APP_AUTHORITY, VITE_APP_CLIENT_ID } = import.meta.env // const { VITE_APP_AUTHORITY, VITE_APP_CLIENT_ID } = import.meta.env
// const router = useRoute()
// let t = setInterval(() => { // let t = setInterval(() => {
// if (router.query.access_token) { // if (router.query.access_token) {
// clearInterval(t) // clearInterval(t)

View File

@ -4,42 +4,42 @@ import axios from 'axios'
//机场查询 //机场查询
export function queryAirportApi(params) { export function queryAirportApi(params) {
return request({ return request({
url: `/api/airportStatus/index?airportId=${params.airportId}`, url: `/api/airportStatus/index`,
method: 'get', method: 'get',
data: params, params: params,
}) })
} }
//无人机查询(暂时没用) //无人机查询
export function queryDroneApi(params) { export function queryDroneApi(params) {
return request({ return request({
url: `/api/drone/getDroneList`, url: `/api/drone/getDroneList`,
method: 'get', method: 'get',
data: params, params: params,
}) })
} }
//电池查询(暂时没用) //电池查询
export function queryBatteryApi(params) { export function queryBatteryApi(params) {
return request({ return request({
url: `/api/batteryRecord/queryBatteryBaseInfoList`, url: `/api/batteryRecord/queryBatteryBaseInfoList`,
method: 'get', method: 'get',
data: params, params: params,
}) })
} }
//航线查询(暂时没用) //航线查询
// api/airlineFile/getAirlineFileListByAirportId?airportId=67 // api/airlineFile/getAirlineFileListByAirportId?airportId=67
export function queryAirLineApi(params) { export function queryAirLineApi(params) {
return request({ return request({
url: `api/airlineFile/getAirlineFileListByAirportId?airportId=${params.airportId}`, url: `api/airlineFile/getAirlineFileListByAirportId`,
method: 'get', method: 'get',
data: params, params: params,
}) })
} }
//无人机飞前自检 //无人机飞前自检
export function beforeCheckApi(params) { export function beforeCheckApi(params) {
return request({ return request({
url: `/api/airportLog/virtualCockpit/progressBar?airportId=${params.airportId}&taskId=${params.taskId}`, url: `/api/airportLog/virtualCockpit/progressBar`,
method: 'get', method: 'get',
data: params, params: params,
}) })
} }
//获取航线文件 //获取航线文件
@ -96,7 +96,7 @@ export async function getAirWayPointsToJson2(url) {
} }
arr.shift() arr.shift()
arr.pop() arr.pop()
// console.log(arr) console.log(arr)
arr = arr.map((text) => { arr = arr.map((text) => {
return text.split(/\s+/) return text.split(/\s+/)
@ -131,6 +131,6 @@ export function getweatherApi(params) {
return request({ return request({
url: `/api/airportLog/getCallback`, url: `/api/airportLog/getCallback`,
method: 'get', method: 'get',
data: params, params: params,
}) })
} }

View File

@ -40,24 +40,21 @@ if (!qiankunWindow.__POWERED_BY_QIANKUN__) {
const queryParams = new URLSearchParams(window.location.search) const queryParams = new URLSearchParams(window.location.search)
const access_token = queryParams.get('access_token') const access_token = queryParams.get('access_token')
const token_type = queryParams.get('token_type') const token_type = queryParams.get('token_type')
const airporId = queryParams.get('airportId') const airporId = queryParams.get('airporId')
window.iframe_AirPortID = airporId let oidcSession = {
access_token: access_token,
if (access_token) { token_type: token_type,
let oidcSession = {
access_token: access_token,
token_type: token_type,
}
oidcSession = JSON.stringify(oidcSession)
sessionStorage.setItem(`oidc.user:${VITE_APP_AUTHORITY}:${VITE_APP_CLIENT_ID}`, oidcSession)
let access_token_str = `Bearer ${access_token}`
//设置token
localStorage.setItem('access_token', access_token_str)
sessionStorage.setItem('access_token', access_token_str)
} }
oidcSession = JSON.stringify(oidcSession)
window.iframe_AirPortID = airporId
sessionStorage.setItem(`oidc.user:${VITE_APP_AUTHORITY}:${VITE_APP_CLIENT_ID}`, oidcSession)
let access_token_str = `Bearer ${access_token}`
//设置token
localStorage.setItem('access_token', access_token_str)
sessionStorage.setItem('access_token', access_token_str)
setupAll({ container: '#airapp' }) setupAll({ container: '#airapp' })
//监听消息事件 //监听消息事件

View File

@ -7,15 +7,9 @@ const router = createRouter({
routes: [ routes: [
{ {
path: '/', path: '/',
name: 'container',
component: () => import('../views/container/index.vue'),
},
{
path: '/plane',
name: 'carbin', name: 'carbin',
component: () => import('../views/carbin/index.vue'), component: () => import('../views/carbin/index.vue'),
}, },
// { // {
// path: '/about', // path: '/about',
// name: 'about', // name: 'about',

View File

@ -4,19 +4,21 @@ import router from '@/router'
import { useSettingStore } from '@/stores/setting.js' import { useSettingStore } from '@/stores/setting.js'
// request是一个axios实例,每一个实例你都可以单独定制它的baseURL,超时时间,请求头和一些其他配置项。 // request是一个axios实例,每一个实例你都可以单独定制它的baseURL,超时时间,请求头和一些其他配置项。
//const baseUrl = import.meta.env.VITE_APP_API_BASE_URL + 'airport/admin' //接口统一域名 const baseUrl = import.meta.env.VITE_APP_API_BASE_URL + '/airport/admin' //接口统一域名
//const baseUrl = 'https://virtualplane-test.t-aaron.com/airport/admin' //接口统一域名 // const baseUrl = '/airport/admin' //接口统一域名
const baseUrl = '/airport/admin' // const baseUrl = '/airport/admin'
// 设置统一的url // 设置统一的url
// axios.defaults.baseURL = '/airport/admin' // axios.defaults.baseURL = '/airport/admin'
const instance = axios.create({ const instance = axios.create({
baseURL: baseUrl, baseURL: baseUrl,
timeout: 60 * 1000, //设置超时 timeout: 60 * 1000, //设置超时
// headers: { headers: {
// 'Content-Type': 'application/json;charset=UTF-8;', 'Content-Type': 'application/json;charset=UTF-8;',
// 'Accept-Language': 'zh-CN,zh;q=0.9,en;q=0.8', 'Accept-Language': 'zh-CN,zh;q=0.9,en;q=0.8',
// '.AspNetCore.Culture': 'c=zh-Hans|uic=zh-Hans', '.AspNetCore.Culture': 'c=zh-Hans|uic=zh-Hans',
// }, },
}) })
let loading let loading
@ -46,8 +48,9 @@ instance.interceptors.request.use(
(config) => { (config) => {
// 每次发送请求之前判断是否存在token如果存在则统一在http请求的header都加上token不用每次请求都手动添加了 // 每次发送请求之前判断是否存在token如果存在则统一在http请求的header都加上token不用每次请求都手动添加了
// const { token_type, access_token } = userInfo // const { token_type, access_token } = userInfo
config.headers.Authorization = `${localStorage.getItem('access_token')}` config.headers.Authorization = `${localStorage.getItem('access_token')}`
// config.headers['Client-Id'] = import.meta.env.VITE_APP_CLIENT_ID config.headers['Client-Id'] = import.meta.env.VITE_APP_CLIENT_ID
//若请求方式为post则将data参数转为JSON字符串 //若请求方式为post则将data参数转为JSON字符串
if (config.method === 'POST') { if (config.method === 'POST') {
config.data = JSON.stringify(config.data) config.data = JSON.stringify(config.data)

View File

@ -24,8 +24,8 @@ const airPortSocketStore = useAirPortSocketStore()
let size1Img = ref(new URL(`@/assets/icons/size1active.png`, import.meta.url).href) let size1Img = ref(new URL(`@/assets/icons/size1active.png`, import.meta.url).href)
let size2Img = ref(new URL(`@/assets/icons/size2.png`, import.meta.url).href) let size2Img = ref(new URL(`@/assets/icons/size2.png`, import.meta.url).href)
let viewMode = ref(1) //1-1/4 2- let viewMode = ref(1) //1-1/4 2-
let littleViewMode = ref(1) //1- 2- 3- let littleViewMode = ref(2) //1- 2- 3-
let littleViewModeName = ref('舱画面') let littleViewModeName = ref('舱画面')
import img_default from '@/assets/icons/state1.png' import img_default from '@/assets/icons/state1.png'
import img_touch from '@/assets/icons/state2.png' import img_touch from '@/assets/icons/state2.png'
@ -43,7 +43,7 @@ let planeStateList = reactive({
value: '0', value: '0',
touch: false, touch: false,
content: '爬升<br>速度', content: '爬升<br>速度',
unit: 'm/s', unit: '/s',
}, },
hspeed: { hspeed: {
id: 2, id: 2,
@ -52,7 +52,7 @@ let planeStateList = reactive({
value: '0', value: '0',
touch: false, touch: false,
content: '平飞<br>速度', content: '平飞<br>速度',
unit: 'm/s', unit: '/s',
}, },
distToHome: { distToHome: {
id: 3, id: 3,
@ -174,7 +174,7 @@ const setCurrentData = (data) => {
// //
littleViewMode.value = 1 littleViewMode.value = 1
littleViewModeName.value = '舱外画面' littleViewModeName.value = '舱外画面'
small_area_showType.value = 'video_out' small_area_showType.value = 'video_in'
// //
isModifedSmallScreen.value = true isModifedSmallScreen.value = true
} }

View File

@ -95,23 +95,6 @@ const switchViewFn = (viewPrecent) => {
} }
sendGisMessage(params) sendGisMessage(params)
} }
//gis
const changeGisToolHeight = () => {
let bottomPlane = document.getElementById('bottomPlane')
if (bottomPlane) {
//
let height = bottomPlane.clientHeight
let t = {
toolbarStartY: height,
}
sendGisMessage(t)
} else {
let t = {
toolbarStartY: 0,
}
sendGisMessage(t)
}
}
// //
const bottom_switchScreenVideo = (smallVideoType) => { const bottom_switchScreenVideo = (smallVideoType) => {
big_area_showType.value = smallVideoType big_area_showType.value = smallVideoType
@ -122,16 +105,11 @@ const queryAirLine_AirPort = async () => {
let params = { let params = {
airportId: window.iframe_AirPortID, //67 1011 airportId: window.iframe_AirPortID, //67 1011
} }
let res = await Promise.allSettled([queryAirportApi(params), queryAirLineApi(params)]) let res = await Promise.allSettled([queryAirportApi(params), queryAirLineApi(params)])
// console.log(res) // console.log(res)
if (res[0].value.code == 0) { if (res[0].value.code == 0) {
// //
currentAirPortInfo.value = res[0].value.data[0] currentAirPortInfo.value = res[0].value.data[0]
if (!currentAirPortInfo.value.online) {
//退
// window.close()
}
airPortSocketStore.ceurrentAirPortData = currentAirPortInfo.value airPortSocketStore.ceurrentAirPortData = currentAirPortInfo.value
airPortName.value = currentAirPortInfo.value.name airPortName.value = currentAirPortInfo.value.name
@ -139,17 +117,14 @@ const queryAirLine_AirPort = async () => {
// //
if (currentAirPortStatus.value != Number(currentAirPortInfo.value.status)) { if (currentAirPortStatus.value != Number(currentAirPortInfo.value.status)) {
currentAirPortStatus.value = Number(currentAirPortInfo.value.status) currentAirPortStatus.value = Number(currentAirPortInfo.value.status)
// console.log( console.log(
// ':', '现在的状态是:',
// currentAirPortStatus.value, currentAirPortStatus.value,
// statusList[currentAirPortStatus.value], statusList[currentAirPortStatus.value],
// ) )
// //
if ( if (Number(currentAirPortInfo.value.status) == 2) {
Number(currentAirPortInfo.value.status) == 2 ||
Number(currentAirPortInfo.value.status) == 3
) {
// 线 // 线
queryAirLine(currentAirPortInfo.value.fileUrl) queryAirLine(currentAirPortInfo.value.fileUrl)
} else { } else {
@ -210,41 +185,32 @@ const queryAirPort = async () => {
let params = { let params = {
airportId: window.iframe_AirPortID, airportId: window.iframe_AirPortID,
} }
// console.log(params)
let res = await queryAirportApi(params) let res = await queryAirportApi(params)
if (res.code == 0) { if (res.code == 0) {
currentAirPortInfo.value = res.data[0] currentAirPortInfo.value = res.data[0]
if (!currentAirPortInfo.value.online) {
//退
// window.close()
}
airPortSocketStore.ceurrentAirPortData = currentAirPortInfo.value airPortSocketStore.ceurrentAirPortData = currentAirPortInfo.value
// console.log(currentAirPortInfo.value) // console.log(currentAirPortInfo.value)
// currentAirPortInfo.value.status = 1 currentAirPortInfo.value.status = 2
if (currentAirPortStatus.value != Number(currentAirPortInfo.value.status)) { if (currentAirPortStatus.value != Number(currentAirPortInfo.value.status)) {
currentAirPortStatus.value = Number(currentAirPortInfo.value.status) currentAirPortStatus.value = Number(currentAirPortInfo.value.status)
// console.log( console.log(
// ':', '现在的状态是:',
// currentAirPortStatus.value, currentAirPortStatus.value,
// statusList[currentAirPortStatus.value], statusList[currentAirPortStatus.value],
// ) )
// //
if ( if (Number(currentAirPortInfo.value.status) == 2) {
Number(currentAirPortInfo.value.status) == 2 ||
Number(currentAirPortInfo.value.status) == 3
) {
// 线 // 线
queryAirLine(currentAirPortInfo.value.fileUrl) queryAirLine(currentAirPortInfo.value.fileUrl)
} }
resetScreen() resetScreen()
} }
// console.log(':', currentAirPortStatus.value, statusList[currentAirPortStatus.value]) console.log('现在的状态是:', currentAirPortStatus.value, statusList[currentAirPortStatus.value])
} }
// //
setTimeout(() => { setTimeout(() => {
@ -255,7 +221,7 @@ const queryAirPort = async () => {
const queryAirLine = async (fileUrl) => { const queryAirLine = async (fileUrl) => {
//线 //线
let resultWayPoint = await getAirWayPointsToJson2(fileUrl) let resultWayPoint = await getAirWayPointsToJson2(fileUrl)
// console.log(resultWayPoint) console.log(resultWayPoint)
// //
iframeData = { iframeData = {
airportName: currentAirPortInfo.value.name, airportName: currentAirPortInfo.value.name,
@ -266,6 +232,30 @@ const queryAirLine = async (fileUrl) => {
flyPath: resultWayPoint, flyPath: resultWayPoint,
coverage: currentAirPortInfo.value.coverage, coverage: currentAirPortInfo.value.coverage,
} }
//
// let params = {
// airportId: window.iframe_AirPortID, //67 1011
// }
// let res = await queryAirLineApi(params)
// if (res.code == 0) {
// //线
// let airLineInfo = res.data
// //线
// let resultWayPoint = await getAirWayPointsToJson(airLineInfo.fileUrl)
// //
// iframeData = {
// airportName: currentAirPortInfo.value.name,
// airportLocation: {
// lon: currentAirPortInfo.value.longitude,
// lat: currentAirPortInfo.value.latitude,
// },
// flyPath: resultWayPoint,
// coverage: currentAirPortInfo.value.coverage,
// }
// }
} }
// //
// const getweatherFn = async () => { // const getweatherFn = async () => {
@ -309,8 +299,8 @@ const socketFn = (workParams) => {
const iframeLoaded = (iframeContent) => { const iframeLoaded = (iframeContent) => {
setTimeout(() => { setTimeout(() => {
map_iframeContent = iframeContent map_iframeContent = iframeContent
// console.log('iframeData:') console.log('iframeData:')
// console.log(iframeData) console.log(iframeData)
// //
let tempTime = null let tempTime = null
@ -318,15 +308,9 @@ const iframeLoaded = (iframeContent) => {
if (iframeData) { if (iframeData) {
clearInterval(tempTime) clearInterval(tempTime)
let data = JSON.stringify(iframeData) let data = JSON.stringify(iframeData)
// console.log('gis....................................') console.log('向gis发送数据....................................')
// console.log(data) console.log(data)
iframeContent.postMessage(data, '*') iframeContent.postMessage(data, '*')
//
if (currentAirPortInfo.value.status == 2) {
//gis
changeGisToolHeight()
}
} }
}, 50) }, 50)
}, 0) }, 0)
@ -359,21 +343,9 @@ const sendPosToPlane = (socketData) => {
//gis //gis
const sendGisMessage = (params) => { const sendGisMessage = (params) => {
let contentWindow = document.getElementById('virturalDrive_iframe_full').contentWindow let contentWindow = document.getElementById('virturalDrive_iframe_full').contentWindow
let data = JSON.stringify(params) let data = JSON.stringify(params)
console.log('...............发送给gis数据是:', data) // console.log(data)
contentWindow.postMessage(data, '*') contentWindow.postMessage(data, '*')
// let t = setInterval(() => {
// if (document.getElementById('virturalDrive_iframe_full').hasOwnProperty('contentWindow')) {
// contentWindow = document.getElementById('virturalDrive_iframe_full').contentWindow
// let data = JSON.stringify(params)
// console.log('...............gis:', data)
// contentWindow.postMessage(data, '*')
// clearInterval(t)
// }
// }, 50)
} }
//screen //screen
@ -605,7 +577,6 @@ onMounted(() => {
<!-- 底部面板 --> <!-- 底部面板 -->
<div <div
v-if="currentAirPortStatus == 2" v-if="currentAirPortStatus == 2"
id="bottomPlane"
class="bottomPlane w-full lg:h-[150px] xk:h-[150px] x1k:h-[212px] x2k:h-[282px] bg-[#001626] bg-opacity-70 absolute bottom-0 left-0 z-[3]" class="bottomPlane w-full lg:h-[150px] xk:h-[150px] x1k:h-[212px] x2k:h-[282px] bg-[#001626] bg-opacity-70 absolute bottom-0 left-0 z-[3]"
> >
<bottomPlaneFlying <bottomPlaneFlying
@ -646,9 +617,6 @@ onMounted(() => {
:deep(.live-player-stretch-btn) { :deep(.live-player-stretch-btn) {
// display: none !important; // display: none !important;
} }
:deep(.video-title) {
display: none !important;
}
:deep(.video-js .vjs-tech) { :deep(.video-js .vjs-tech) {
max-width: unset !important; max-width: unset !important;
width: auto; width: auto;
@ -657,7 +625,7 @@ onMounted(() => {
left: 0; left: 0;
right: 0; right: 0;
margin: auto; margin: auto;
// height: 120%; height: 120%;
} }
.rem-header { .rem-header {

View File

@ -23,9 +23,9 @@ let items = reactive({
}) })
// //
let precent = ref('20') let precent = ref('-')
// //
let lastTime = ref('30') let lastTime = ref('-')
const setCurrentData = (data) => { const setCurrentData = (data) => {
// console.log(data) // console.log(data)
@ -35,7 +35,7 @@ const setCurrentData = (data) => {
items.temperature.value = data ? data.weather.cellTemp + '℃' : '0℃' items.temperature.value = data ? data.weather.cellTemp + '℃' : '0℃'
precent.value = data ? Number(data.battery) * 100 : '-' precent.value = data ? Number(data.battery) * 100 : '-'
lastTime.value = data ? parseInt(data.allflytime, 10) : '-' lastTime.value = data ? data.allflytime : '-'
} }
const droneCommand = async (type) => { const droneCommand = async (type) => {
@ -91,7 +91,7 @@ onMounted(() => {})
</div> </div>
</template> </template>
<div <div
class="relative middlePlane w-[210px] h-[46px] mx-3 px-1 flex flex-row items-center justify-around" class="relative middlePlane w-[210px] h-[46px] mx-3 flex flex-row items-center justify-around"
> >
<img src="@/assets/icons/middleplane.png" alt="" class="absolute w-full h-full z-[-1]" /> <img src="@/assets/icons/middleplane.png" alt="" class="absolute w-full h-full z-[-1]" />
<div <div
@ -101,7 +101,7 @@ onMounted(() => {})
</div> </div>
<span class="text-sm text-[#ffffff]">电池电量</span> <span class="text-sm text-[#ffffff]">电池电量</span>
<div class="lastTime text-sm font-bold">{{ precent }}%/{{ lastTime }}min</div> <div class="lastTime text-sm font-bold">{{ precent }}%/{{ lastTime }}min</div>
<span class="iconfont icon-xiashuangjiantou text-[#ffffff50] text-[12px]"></span> <span class="iconfont icon-xiashuangjiantou text-[#ffffff50]"></span>
</div> </div>
</a-tooltip> </a-tooltip>
<!-- <div class="middlePlane w-[210px] h-[46px] mx-3 flex flex-row items-center justify-around"> <!-- <div class="middlePlane w-[210px] h-[46px] mx-3 flex flex-row items-center justify-around">

View File

@ -80,7 +80,7 @@ watch(
ref="OutlivePlayerRef" ref="OutlivePlayerRef"
:options="LiveOptions" :options="LiveOptions"
/> />
<!-- https://gisdata.t-aaron.com/virturalDrive/test/VirturalDrive.html -->
<iframe <iframe
v-if="showType == 'map'" v-if="showType == 'map'"
id="virturalDrive_iframe_full" id="virturalDrive_iframe_full"

View File

@ -1,13 +0,0 @@
<script setup>
import { ref, defineAsyncComponent, onMounted, watch, toRaw, defineProps, reactive } from 'vue'
import { RouterLink, RouterView, useRoute, useRouter } from 'vue-router'
const router = useRouter()
console.log(router)
router.push({ path: '/plane', query: { airportId: window.iframe_AirPortID } })
</script>
<template>
<div></div>
</template>

View File

@ -109,19 +109,15 @@ export default ({ command, mode }) => {
host: '0.0.0.0', host: '0.0.0.0',
port: 8080, port: 8080,
cors: true, cors: true,
http: true,
open: false, //不自动开启 open: false, //不自动开启
proxy: { proxy: {
'/airport': { '/airport': {
target: env.VITE_APP_API_BASE_URL, target: env.VITE_APP_API_BASE_URL,
changeOrigin: true, changeOrigin: true,
logLeve: 'debug', //输出真实的地址 logLeve: 'debug', //输出真实的地址
rewrite: (path) => path.replace(/^\/airport/, ''), rewrite: {
//获取真实的转发地址 '^/airport': '',
bypass(req, res, options) {
const proxyURL = options.target + options.rewrite(req.url)
console.log('proxyURL', proxyURL)
req.headers['x-req-proxyURL'] = proxyURL // 设置未生效
res.setHeader('x-req-proxyURL', proxyURL) // 设置响应头可以看到
}, },
}, },
}, },