7 zmienionych plików z 61 dodań i 18 usunięć
+ 1
- 1
index.html
Wyświetl plik
| @@ -12,7 +12,7 @@ | |||
| <link rel="stylesheet" href="https://g.alicdn.com/de/prismplayer/2.9.23/skins/default/aliplayer-min.css" /> | |||
| <script charset="utf-8" type="text/javascript" src="https://g.alicdn.com/de/prismplayer/2.9.23/aliplayer-h5-min.js"></script> | |||
| <script type="text/javascript" src="EasyPlayer-element.min.js"></script> | |||
| </head> | |||
| <body> | |||
| <div id="app"></div> | |||
+ 40
- 0
public/EasyPlayer-element.min.js
Plik diff jest za duży
Wyświetl plik
BIN
public/EasyPlayer.wasm
Wyświetl plik
+ 5
- 6
src/views/dashboard/components/AirInfo.vue
Wyświetl plik
| @@ -35,14 +35,12 @@ | |||
| style="z-index:1" | |||
| /> --> | |||
| <!-- <EasyPlayer style="z-index=1" :video-url="innerVideoSrc" /> --> | |||
| <easy-player :video-url="innerVideoSrc" live="true" stretch="true" /> | |||
| </div> | |||
| <div class="innerMonitor"> | |||
| <div class="monitorName">机场外部监控</div> | |||
| <!-- <img src="../../../assets/images/webScreen.png" @click="outerVideoShowStyle"> --> | |||
| <videoPlay | |||
| v-bind="outsideMonitorOptions" | |||
| style="z-index:1" | |||
| /> | |||
| <easy-player :video-url="outVideoSrc" live="true" stretch="true" /> | |||
| </div> | |||
| </div> | |||
| @@ -81,6 +79,7 @@ export default { | |||
| }, | |||
| innerVideoSrc: '', | |||
| outVideoSrc: '', | |||
| status: null, | |||
| mountedName: null, | |||
| outsideMonitorOptions: { | |||
| @@ -103,8 +102,8 @@ export default { | |||
| data.detail = props.data | |||
| // data.innerMonitorOptions.video-url = data.detail.internalMonitorUrl | |||
| data.innerVideoSrc = data.detail.internalMonitorUrl | |||
| data.outsideMonitorOptions.src = data.detail.externalMonitorUrl | |||
| console.log(data.innerMonitorOptions.src, '直播地址', data.outsideMonitorOptions.src, '回放地址') | |||
| data.outVideoSrc = data.detail.externalMonitorUrl | |||
| getAirportInfo({ | |||
| airportId: data.detail.id | |||
| }) | |||
+ 5
- 7
src/views/dashboard/components/OneMap.vue
Wyświetl plik
| @@ -384,7 +384,7 @@ export default { | |||
| data.airOverlay = new Overlay({ | |||
| id: 'air_overlay', | |||
| element: document.getElementById('airOverlay'), | |||
| autoPan: true, | |||
| // autoPan: true, | |||
| offset: [10, 10] | |||
| }) | |||
| data.airportPopupShow = true | |||
| @@ -413,18 +413,16 @@ export default { | |||
| // 为了overlay位置更加精确 | |||
| const coord = feature.getProperties().coordinate | |||
| data.airOverlay.setPosition(coord) | |||
| data.map.addOverlay(data.airOverlay) | |||
| data.airOverlay.setPosition(coord) | |||
| } | |||
| if (feature.getProperties().typeName) { | |||
| data.problemDetail = feature.getProperties() | |||
| // console.log(data.problemDetail, '详情') | |||
| const coord = feature.getProperties().coordinate | |||
| data.problemPopupShow = true | |||
| data.problemOverlay.setPosition(coord) | |||
| data.map.addOverlay(data.problemOverlay) | |||
| data.problemOverlay.setPosition(coord) | |||
| // data.problemOverlay.setPosition(coord) | |||
| // data.map.addOverlay(data.problemOverlay) | |||
| @@ -510,12 +508,12 @@ export default { | |||
| // 添加问题图层 | |||
| const addproblemLayer = (narr) => { | |||
| if (data.problemlayer !== null) { | |||
| data.map.removeLayer(data.problemLayer) | |||
| data.map.removeLayer(data.problemlayer) | |||
| } | |||
| data.problemOverlay = new Overlay({ | |||
| id: 'problem_overlay', | |||
| element: document.getElementById('problemOverlay'), | |||
| autoPan: true, | |||
| // autoPan: true, | |||
| offset: [10, 10] | |||
| }) | |||
+ 5
- 2
src/views/order-manage/all-order/components/AssignModal.vue
Wyświetl plik
| @@ -1,7 +1,7 @@ | |||
| <template> | |||
| <Modal | |||
| :options="getModalOptions" | |||
| :on-positive-click="handleConfirm" | |||
| :on-positive-click="throttleFn" | |||
| :on-negative-click="handleClose" | |||
| :on-close="handleClose" | |||
| > | |||
| @@ -30,6 +30,7 @@ import { form, getUserOptions } from '../tools/form.js' | |||
| import { defineComponent, ref, reactive, computed, toRefs } from 'vue' | |||
| import Modal from '@/components/Modal/index.vue' | |||
| import { assignOrder } from '@/api/order/index.js' | |||
| import { throttle } from '@/utils/index.js' | |||
| export default defineComponent({ | |||
| name: 'UserModal', | |||
| components: { Modal }, | |||
| @@ -100,6 +101,8 @@ export default defineComponent({ | |||
| }) | |||
| } | |||
| const throttleFn = throttle(handleConfirm, 5000) | |||
| /* 关闭弹窗 */ | |||
| const handleClose = () => { | |||
| emit('update:visible', false) | |||
| @@ -109,7 +112,7 @@ export default defineComponent({ | |||
| formRef, | |||
| getModalOptions, | |||
| getFormOptions, | |||
| handleConfirm, | |||
| throttleFn, | |||
| handleClose | |||
| } | |||
| } | |||
+ 5
- 2
src/views/order-manage/deal-order/components/QuestionModal.vue
Wyświetl plik
| @@ -1,7 +1,7 @@ | |||
| <template> | |||
| <Modal | |||
| :options="getModalOptions" | |||
| :on-positive-click="handleConfirm" | |||
| :on-positive-click="throttleFn" | |||
| :on-negative-click="handleClose" | |||
| :on-close="handleClose" | |||
| > | |||
| @@ -34,6 +34,7 @@ import { defineComponent, ref, reactive, computed, toRefs } from 'vue' | |||
| import Modal from '@/components/Modal/index.vue' | |||
| import UploadOss from '@/components/UploadOss/index.vue' | |||
| import { handleOrder } from '@/api/order/index.js' | |||
| import { throttle } from '@/utils/index.js' | |||
| export default defineComponent({ | |||
| name: 'UserModal', | |||
| components: { Modal, UploadOss }, | |||
| @@ -153,6 +154,8 @@ export default defineComponent({ | |||
| }) | |||
| } | |||
| const throttleFn = throttle(handleConfirm, 5000) | |||
| /* 关闭弹窗 */ | |||
| const handleClose = () => { | |||
| emit('update:visible', false) | |||
| @@ -164,7 +167,7 @@ export default defineComponent({ | |||
| getFormOptions, | |||
| ossRefs, | |||
| handleUploadStatus, | |||
| handleConfirm, | |||
| throttleFn, | |||
| handleClose | |||
| } | |||
| } | |||
Ładowanie…