diff --git a/index.html b/index.html index d5286d4..50460ea 100644 --- a/index.html +++ b/index.html @@ -1,186 +1,195 @@ - - - - - - <%= VITE_GLOB_APP_TITLE %> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
-
-
- -
-
<%= VITE_GLOB_APP_TITLE %>
+ + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+
+
+ +
+
+ <%= VITE_GLOB_APP_TITLE %>
- - - - +
+ + + + + \ No newline at end of file diff --git a/package.json b/package.json index b496e57..336d6eb 100644 --- a/package.json +++ b/package.json @@ -134,6 +134,7 @@ "showdown": "^2.1.0", "shpjs": "^6.1.0", "sortablejs": "^1.15.1", + "tcplayer.js": "^5.3.4", "terraformer-wkt-parser": "^1.2.1", "three": "^0.145.0", "tinymce": "^5.10.9", diff --git a/src/api/workmanagement/airportMaintenance.ts b/src/api/workmanagement/airportMaintenance.ts new file mode 100644 index 0000000..5f506a5 --- /dev/null +++ b/src/api/workmanagement/airportMaintenance.ts @@ -0,0 +1,25 @@ +import { defHttp } from '@/utils/http/axios'; +import { StartLiveParams ,SetCameraVideoParams} from './model/index'; + +enum Api { + StartLive = '/api/AirportMaintenance/StartLive', + EndLive = '/api/AirportMaintenance/EndLive', + SetCameraVideo = '/api/AirportMaintenance/SetCameraVideo', +} + +export const startLive = (params: StartLiveParams) => + defHttp.post({ + url: Api.StartLive, + params, + }); + +export const endLive = (params: StartLiveParams) => + defHttp.post({ + url: Api.EndLive, + params, + }); +export const setCameraVideo = (params: SetCameraVideoParams) => + defHttp.post({ + url: Api.SetCameraVideo, + params, + }); diff --git a/src/api/workmanagement/model/index.ts b/src/api/workmanagement/model/index.ts new file mode 100644 index 0000000..17f0047 --- /dev/null +++ b/src/api/workmanagement/model/index.ts @@ -0,0 +1,16 @@ +/** + * @description: Request list return value + */ +export interface StartLiveParams { + videoId?: string; + urlType?: number; + url?: string; + quality?: number; +} +/** + * @description: Request list return value + */ +export interface SetCameraVideoParams { + videoId?: string; + videoQuality?: number; +} diff --git a/src/main.ts b/src/main.ts index 4c88275..b2f3b20 100644 --- a/src/main.ts +++ b/src/main.ts @@ -16,7 +16,7 @@ import { router, setupRouter } from '@/router'; import { setupRouterGuard } from '@/router/guard'; import { setupStore } from '@/store'; -import VideoPlayer from 'vue-video-player/src'; +import VideoPlayer from 'vue-video-player'; import 'vue-video-player/src/custom-theme.css'; import App from './App.vue'; diff --git a/src/views/demo/workmanagement/flightoperation/index.vue b/src/views/demo/workmanagement/flightoperation/index.vue index 72fcc55..0b977a3 100644 --- a/src/views/demo/workmanagement/flightoperation/index.vue +++ b/src/views/demo/workmanagement/flightoperation/index.vue @@ -65,10 +65,10 @@ getClient().on('message', (topic, message, packet) => { const rs = JSON.parse(message); console.log(rs); + airportAllVal.value = rs; if (!rs.data.wind_speed) { } else { // 机场信息 - airportAllVal.value = rs; } // 无人机信息 // uavAllVal.value = diff --git a/src/views/demo/workmanagement/flightoperation/src/AirportLive.vue b/src/views/demo/workmanagement/flightoperation/src/AirportLive.vue index 8d7dddc..3c4c995 100644 --- a/src/views/demo/workmanagement/flightoperation/src/AirportLive.vue +++ b/src/views/demo/workmanagement/flightoperation/src/AirportLive.vue @@ -3,17 +3,72 @@
机场直播
- + - +
+
+ +