diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/httpList.js b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/httpList.js index 0001db2e..3f288ed5 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/httpList.js +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/httpList.js @@ -9,14 +9,20 @@ import request from "@/utils/request"; * @param {1 | 2 | 3} media 参数说明: 1: http+flv; 2: rtmp; 3: hls * @returns */ -export function getCameraStream(camId, media = 1) { - return request({ - url: "/video/externalVideoStreaming", - method: "get", - params: { - camId, - }, - }); +export async function getCameraStream(camId, media = 1) { + let data = await request({ + url: "/video/externalVideoStreaming", + method: "get", + params: { + camId, + }, + }); + + if (data.code == 200){ + data.data.liveUrl = "https://10.0.81.202/camera?target=" + data.data.liveUrl.substring(7); + } + + return data; } /** @@ -276,7 +282,7 @@ export function getEventTopicList(eventType) { request({ url: `/business/trafficIncidents/getEventList/${eventType}`, - method: "get", + method: "post", }) .then(({ code, data }) => { if (code != 200) { diff --git a/ruoyi-ui/src/views/websocket.vue b/ruoyi-ui/src/views/websocket.vue index ac7d4437..964ea251 100644 --- a/ruoyi-ui/src/views/websocket.vue +++ b/ruoyi-ui/src/views/websocket.vue @@ -30,7 +30,8 @@ export default { // console.log(location.hostname ) // 建立 websocket 连接 this.socket.initialize({ - url: 'ws://' + location.hostname + ':' + port + path, + // url: 'ws://' + location.hostname + ':' + port + path, + url: 'wss://' + location.hostname + ':' + window.location.port || 80 + '/ws', // url: "ws://10.7.179.15" + ":" + port + path, // url: "ws://10.168.64.171" + ":" + port + path, // url: 'ws://10.168.78.127'+ ':' + port + path, diff --git a/ruoyi-ui/vue.config.js b/ruoyi-ui/vue.config.js index 388187f1..fd47c39e 100644 --- a/ruoyi-ui/vue.config.js +++ b/ruoyi-ui/vue.config.js @@ -31,6 +31,7 @@ module.exports = { devServer: { host: "0.0.0.0", port: port, + https: true, open: true, proxy: { // detail: https://cli.vuejs.org/config/#devserver-proxy