diff --git a/src/views/bigScreen/components/deptDangerTable.vue b/src/views/bigScreen/components/deptDangerTable.vue index e99f4de..e8ba29e 100644 --- a/src/views/bigScreen/components/deptDangerTable.vue +++ b/src/views/bigScreen/components/deptDangerTable.vue @@ -10,7 +10,7 @@ // 表格表头 const columns = [ { text: '单位', value: 'deptName', align: 'center' }, - { text: '危险点地名', value: 'placeName', align: 'center' }, + { text: '危险点地名', value: 'placeName', align: 'center', width: '95' }, { text: '分类', value: 'category', align: 'center' }, { text: '等级', value: 'grade', align: 'center', width: '60' }, ] @@ -106,6 +106,7 @@ background-color: rgba($color: #050b2d, $alpha: .6) !important; color: #c2f9fa; border-bottom: 0.1rem solid #289b73 !important; + white-space: nowrap !important; } // 表中背景 diff --git a/src/views/bigScreen/components/deptDangerTable.vue b/src/views/bigScreen/components/deptDangerTable.vue index e99f4de..e8ba29e 100644 --- a/src/views/bigScreen/components/deptDangerTable.vue +++ b/src/views/bigScreen/components/deptDangerTable.vue @@ -10,7 +10,7 @@ // 表格表头 const columns = [ { text: '单位', value: 'deptName', align: 'center' }, - { text: '危险点地名', value: 'placeName', align: 'center' }, + { text: '危险点地名', value: 'placeName', align: 'center', width: '95' }, { text: '分类', value: 'category', align: 'center' }, { text: '等级', value: 'grade', align: 'center', width: '60' }, ] @@ -106,6 +106,7 @@ background-color: rgba($color: #050b2d, $alpha: .6) !important; color: #c2f9fa; border-bottom: 0.1rem solid #289b73 !important; + white-space: nowrap !important; } // 表中背景 diff --git a/src/views/bigScreen/components/video6.vue b/src/views/bigScreen/components/video6.vue index b767ae8..fcd2a4b 100644 --- a/src/views/bigScreen/components/video6.vue +++ b/src/views/bigScreen/components/video6.vue @@ -2,6 +2,8 @@ import { ElLoading, ElMessage, ElMessageBox } from 'element-plus' import { createStream, sendHeart, stopStream } from '@/api/monitor/index-new-gm' import { getConfig } from '@/api/bs' +import { getMediaStream, getMediaToken } from '@/api/monitor/media' +const mediaToken = ref('') // 流媒体token const baseurl = ref(window.location.href.split('/#')[0]) const width = ref(0) const height = ref(0) @@ -15,6 +17,17 @@ console.log('宽高', width.value, height.value) } +// ----------------------------------------sm流--------------------------------------------------- +// 拉取流(流媒体) +async function fetchMediaStream(deviceId: string, channelId: string, index: number) { + const res = await getMediaStream(deviceId, channelId, mediaToken.value) + if (res && res.data) { + videoUrl.value[index] = res.data.flv + } + else { + ElMessage.warning('设备未注册') + } +} // ----------------------------------------gm流--------------------------------------------------- // 创建流 async function fetchStream(deviceId: string) { @@ -97,17 +110,27 @@ } }) }) -onMounted(() => { +onMounted(async () => { + if (window.localStorage.getItem('systemType') === 'sm') { + const res = await getMediaToken() + mediaToken.value = res.data + } const tempCameraIndexCode = localStorage.getItem('tempCameraIndexCode') getConfig().then((res) => { if (res.data) { const configData = JSON.parse(res.data) if (configData && configData.length) { console.log('视频页面:获取设备数据', configData) - configData.forEach((item: { cameraIndexCode: string }, index: number) => { + configData.forEach((item: { cameraIndexCode: string; nvrIndexCode: string }, index: number) => { // if (currentStreamId.value[currentIndex] !== item.cameraIndexCode && index < 7) { - playGmStream(item.cameraIndexCode, index) + // playGmStream(item.cameraIndexCode, index) // } + if (window.localStorage.getItem('systemType') === 'gm') { + playGmStream(item.cameraIndexCode, index) + } + else if (window.localStorage.getItem('systemType') === 'sm') { + fetchMediaStream(item.cameraIndexCode, item.nvrIndexCode, index) + } }) } }