diff --git a/front/package.json b/front/package.json index 592ac777..0496e1ce 100644 --- a/front/package.json +++ b/front/package.json @@ -45,7 +45,7 @@ "three.meshline": "^1.1.0", "vue": "^3.1.4", "vue-router": "^4.0.10", - "vue3-video-play": "^1.3.1-beta.6", + "vue3-video-play-emiyagm": "^1.3.1-beta.6.1", "vuex": "^4.0.2" }, "devDependencies": { @@ -75,6 +75,7 @@ "svg-sprite-loader": "^6.0.9", "swiper": "^8.0.0", "vab-config": "0.0.8", + "vue3-video-play-emiyagm": "^1.3.1-beta.6.1", "webpackbar": "^5.0.0-3" }, "gitHooks": { diff --git a/front/public/index.html b/front/public/index.html index e5aa7167..56381dbd 100644 --- a/front/public/index.html +++ b/front/public/index.html @@ -1,8 +1,8 @@ @@ -48,18 +48,18 @@ // window.SITE_CONFIG['websocketURL'] = '15.2.21.243:8888/renren-admin'; // window.SITE_CONFIG['POI_URL'] = 'http://15.2.21.238:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address'; // 西海岸版本 - // window.SITE_CONFIG['backUrl'] = 'http://10.134.135.9:9797'; - // window.SITE_CONFIG['previewUrl'] = 'http://10.134.135.9:9796/'; - // window.SITE_CONFIG['frontUrl'] = 'http://10.134.135.9:9796/document/#/devModelFile/'; - // window.SITE_CONFIG['apiURL'] = 'http://10.134.135.9:8888/renren-admin'; + window.SITE_CONFIG['backUrl'] = 'http://10.134.135.9:9797'; + window.SITE_CONFIG['previewUrl'] = 'http://10.134.135.9:9796/'; + window.SITE_CONFIG['frontUrl'] = 'http://10.134.135.9:9796/document/#/devModelFile/'; + window.SITE_CONFIG['apiURL'] = 'http://10.134.135.9:8888/renren-admin'; // 开发 // window.SITE_CONFIG['backUrl'] = 'http://15.2.21.238:9797'; - window.SITE_CONFIG['backUrl'] = 'http://localhost:8001'; - window.SITE_CONFIG['previewUrl'] = 'http://192.168.124.236:9796/'; - window.SITE_CONFIG['frontUrl'] = 'http://192.168.124.236:9796/document/#/devModelFile/'; - window.SITE_CONFIG['apiURL'] = 'http://192.168.124.236:8888/renren-admin'; - window.SITE_CONFIG['websocketURL'] = '192.168.124.236:8888/renren-admin'; - window.SITE_CONFIG['POI_URL'] = 'http://192.168.124.236:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address'; + // window.SITE_CONFIG['backUrl'] = 'http://localhost:8001'; + // window.SITE_CONFIG['previewUrl'] = 'http://192.168.124.236:9796/'; + // window.SITE_CONFIG['frontUrl'] = 'http://192.168.124.236:9796/document/#/devModelFile/'; + // window.SITE_CONFIG['apiURL'] = 'http://192.168.124.236:8888/renren-admin'; + // window.SITE_CONFIG['websocketURL'] = '192.168.124.236:8888/renren-admin'; + // window.SITE_CONFIG['POI_URL'] = 'http://192.168.124.236:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address'; // 穿透版本 // window.SITE_CONFIG['backUrl'] = 'http://124.222.94.39:9797'; // window.SITE_CONFIG['previewUrl'] = 'http://124.222.94.39:9796/'; diff --git a/front/public/static/config/location.js b/front/public/static/config/location.js index deddff2f..9ce152a1 100644 --- a/front/public/static/config/location.js +++ b/front/public/static/config/location.js @@ -1,11 +1,11 @@ /* * @Author: hisense.wuhongjian * @Date: 2020-07-07 16:03:23 - * @LastEditors: hisense.liangjunhua - * @LastEditTime: 2022-08-01 11:02:21 + * @LastEditors: hisense.wuhongjian + * @LastEditTime: 2022-08-06 10:43:53 * @Description: 数据资源参数配置 */ -const newLocation = 'qingdao' +const newLocation = 'xihaian' // const newLocation = 'baotou' // const newLocation = 'xihaian' diff --git a/front/src/main.js b/front/src/main.js index be02ff2a..7b3ccf72 100644 --- a/front/src/main.js +++ b/front/src/main.js @@ -1,8 +1,8 @@ /* * @Author: hisense.wuhongjian * @Date: 2022-03-29 17:48:03 - * @LastEditors: hisense.liangjunhua - * @LastEditTime: 2022-07-22 16:03:23 + * @LastEditors: hisense.wuhongjian + * @LastEditTime: 2022-08-06 15:00:49 * @Description: 告诉大家这是什么 */ import { createApp } from 'vue' @@ -16,8 +16,8 @@ import 'ant-design-vue/dist/antd.css' import '@/vab' import * as echarts from 'echarts' import * as moment from 'moment' -import vue3videoPlay from 'vue3-video-play' // 引入组件 -import 'vue3-video-play/dist/style.css' // 引入css +import vue3videoPlay from 'vue3-video-play-emiyagm' // 引入组件 +import 'vue3-video-play-emiyagm/dist/style.css' // 引入css import ElementPlus from 'element-plus' import 'element-plus/dist/index.css' import * as ElementPlusIconsVue from '@element-plus/icons-vue' diff --git a/front/src/views/capabilityCloud/components/ComponentServices.vue b/front/src/views/capabilityCloud/components/ComponentServices.vue index d64c3bee..1660dc9a 100644 --- a/front/src/views/capabilityCloud/components/ComponentServices.vue +++ b/front/src/views/capabilityCloud/components/ComponentServices.vue @@ -2,7 +2,7 @@ * @Author: hisense.liangjunhua * @Date: 2022-06-19 10:15:33 * @LastEditors: hisense.wuhongjian - * @LastEditTime: 2022-06-19 18:19:58 + * @LastEditTime: 2022-08-06 16:21:24 * @Description: 能力云图-组件服务 --> + + + + +
+
+ +
+
+ 0) { + const list = selectedList.value.splice(0, 4) + const length = list.length + videoList.value = [] + for (let index = 0; index < length; index++) { + const param = { + key: list[index].channelId, + } + let ob = { + options: { + width: '600px', //播放器宽度 + height: '350px', //播放器高度 + color: '#409eff', //主题色 + title: '', //视频名称 + src: '', //视频源 + type: 'm3u8', // 视频源类型 + muted: false, //静音 + webFullScreen: false, + speedRate: ['0.75', '1.0', '1.25', '1.5', '2.0'], //播放倍速 + autoPlay: false, //自动播放 + loop: false, //循环播放 + mirror: false, //镜像画面 + ligthOff: false, //关灯模式 + volume: 0.3, //默认音量大小 + control: true, //是否显示控制 + controlBtns: [ + 'audioTrack', + 'quality', + 'speedRate', + 'volume', + 'setting', + 'pip', + 'pageFullScreen', + 'fullScreen', + ], //显示所有按钮, + }, + } + await getStreamByChannelCode(param).then((res) => { + ob.options.src = res.data.data + console.log('监测ob的变化', ob) + videoList.value.push(ob) + }) + } + console.log('验证数据的准确性', videoList) + batchVisible.value = true + } else { + message.error('请选择需要预览的数据') + } + } // 清空 const nullClick = () => { clickList.value[1].content = [] @@ -562,8 +639,19 @@ // 重置 const clean = () => { mapSearchParam.value.cameraName = '' + selectedList.value = [] + selectedRowKeys.value = [] + videoList.value = [] + pagination.value.current = 1 + mapSearchParam.value.pageNum = 1 + pagination.value.pageSize = 10 getCamera() } + const videoClean = () => { + selectedList.value = [] + selectedRowKeys.value = [] + videoList.value = [] + } // 一键申请 const dept = reactive({}) // eslint-disable-next-line no-undef @@ -912,4 +1000,15 @@ overflow-y: scroll !important; } } + .batch-preview-modal { + .batch-video { + width: 100%; + display: grid; + grid-template-columns: 50% 50%; + grid-template-rows: 50% 50%; + justify-content: center; + grid-row-gap: 14px; + grid-column-gap: 20px; + } + }