| src/api/http/config.ts | ●●●●● patch | view | raw | blame | history | |
| src/components/GMap.vue | ●●●●● patch | view | raw | blame | history |
src/api/http/config.ts
@@ -8,13 +8,13 @@ // http // http://172.16.13.64:8100 // baseURL: 'http://192.168.1.133:6789', // This url must end with "/". Example: 'http://192.168.1.1:6789/' // baseURL: 'http://192.168.1.198:6789', // This url must end with "/". Example: 'http://192.168.1.1:6789/' baseURL: 'https://dev.jxpskj.com:36789', // This url must end with "/". Example: 'http://192.168.1.1:6789/' baseURL: 'http://192.168.1.198:6789', // This url must end with "/". Example: 'http://192.168.1.1:6789/' // baseURL: 'https://dev.jxpskj.com:36789', // This url must end with "/". Example: 'http://192.168.1.1:6789/' // ws: 'ws//127.0.0.1:6789/api/v1/ws', // ws://192.168.1.198:1883/ // websocketURL: 'ws://192.168.1.198:6789/api/v1/ws', // Example: 'ws://192.168.1.198:6789/api/v1/ws' websocketURL: 'ws://192.168.1.198:6789/api/v1/ws', // Example: 'ws://192.168.1.198:6789/api/v1/ws' // websocketURL: 'ws://192.168.1.133:6789/api/v1/ws', // Example: 'ws://192.168.1.198:6789/api/v1/ws' websocketURL: 'wss://dev.jxpskj.com:36789/api/v1/ws', // Example: 'ws://192.168.1.198:6789/api/v1/ws' // websocketURL: 'wss://dev.jxpskj.com:36789/api/v1/ws', // Example: 'ws://192.168.1.198:6789/api/v1/ws' // livestreaming // RTMP Note: This IP is the address of the streaming server. If you want to see livestream on web page, you need to convert the RTMP stream to WebRTC stream. src/components/GMap.vue
@@ -399,10 +399,16 @@ <a-row align="middle" justify="center"> <a-col span="24"> <div v-if="deviceInfo.device?.mode_code == 14 || !deviceInfo.device" style="color:#494949;" class="flex-display flex-justify-center mt5 mb5">当前设备已关机,无法进行直播</div> </a-col> </a-row> <a-row align="middle" justify="center"> <a-col span="24"> <a-row class="p5" align="middle" justify="space-between"> <a-col span="11"> <a-button :disabled="deviceInfo.device?.mode_code == 14 || !deviceInfo.device?true:false" :class="[showAircraft?'active-color':'unactive-color']" class="width-100" type="primary" size="small" @click="openAircra"> 飞行控制 </a-button> </a-col> <a-col span="11"> <a-button :disabled="deviceInfo.device?.mode_code == 14 || !deviceInfo.device?true:false" :class="[openDroneControl?'active-color':'unactive-color']" class="width-100" type="primary" size="small" @click="openDeviceSetting"> 操作 </a-button> </a-col> </a-row> @@ -807,12 +813,9 @@ // 打开飞机监控 const openAircra = () => { showAircraft.value = !showAircraft.value setDockControlPanelVisible(false) if (showAircraft.value) { openDroneControl.value = true loadDroneVideo() } else { openDroneControl.value = false closeFly() } } @@ -976,6 +979,11 @@ const openFlySetting = () => { openDroneControl.value = false setDockControlPanelVisible(true) } // 打开无人机操作 const openDeviceSetting = () => { setDockControlPanelVisible(false) openDroneControl.value = false } watch(() => store.state.deviceStatusEvent, data => { @@ -1306,7 +1314,8 @@ closeOperate, closeOsdWindow, openDroneControl, openFlySetting openFlySetting, openDeviceSetting } } })