From 4e3fa2098455f22da5cf4a71a352dafbf8866bb1 Mon Sep 17 00:00:00 2001 From: guoyue Date: Mon, 26 Sep 2022 15:55:31 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E8=A5=BF=E6=B5=B7=E5=B2=B8=EF=BC=9A?= =?UTF-8?q?=E7=99=BB=E5=BD=95=E9=BB=98=E8=AE=A4=20=E8=B7=B3=E8=BD=AC?= =?UTF-8?q?=E5=88=B0=E8=83=BD=E5=8A=9B=E9=9B=86=E5=B8=82-=E5=9F=BA?= =?UTF-8?q?=E7=A1=80=E8=AE=BE=E6=96=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- front/src/views/login/index.vue | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/front/src/views/login/index.vue b/front/src/views/login/index.vue index 7e481975..cd9cc7f8 100644 --- a/front/src/views/login/index.vue +++ b/front/src/views/login/index.vue @@ -42,6 +42,9 @@ import { Encrypt } from '@/utils/crypto' import { UserOutlined, LockOutlined } from '@ant-design/icons-vue' import { message, Modal } from 'ant-design-vue' +// 是否是西海岸 +const isXiHaiAn = whoShow.itShowXiHaiAn + export default { name: 'Login', components: { @@ -145,7 +148,19 @@ export default { window.sessionStorage.setItem('visits', JSON.stringify([])) console.log('添加visits========================================>') // console.log(this.handleRoute()) - await this.$router.push('/home') + // 西海岸特殊处理 + if (isXiHaiAn) { + await this.$router.push({ + path: '/DetailsPageconetent', + query: { + select: '基础设施', + tecHnosphere: '', + appLiCation: '' + } + }) + } else { + await this.$router.push('/home') + } } catch (error) { message.error('登陆失败，用户名或密码错误！') } From eab0eb374a780ad90cfea9aba323463d7f110503 Mon Sep 17 00:00:00 2001 From: guoyue Date: Mon, 26 Sep 2022 16:28:50 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E8=A5=BF=E6=B5=B7=E5=B2=B8=EF=BC=9A?= =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=8B=BC=E6=8E=A5=E7=9A=84status=3D1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- front/src/views/home/detailsPageInfrastructureTree.vue | 3 --- front/src/views/home/videoSurveillance/index.vue | 1 - 2 files changed, 4 deletions(-) diff --git a/front/src/views/home/detailsPageInfrastructureTree.vue b/front/src/views/home/detailsPageInfrastructureTree.vue index 62c1b8fb..a4aaab3b 100644 --- a/front/src/views/home/detailsPageInfrastructureTree.vue +++ b/front/src/views/home/detailsPageInfrastructureTree.vue @@ -136,7 +136,6 @@ } else { getCameraInfoByAreaId({ areaId: '70be8c5b664f4bcf869d82f2e8335051', - status: 1, }).then((res) => { treeData.value = res.data.data }) @@ -270,7 +269,6 @@ } else { getCameraInfoByAreaId({ areaId: val.id, - status: 1, }).then((res) => { treeData.value.map((treeDataItem, index) => { if (item.id == treeDataItem.id) { @@ -345,7 +343,6 @@ } else { getCameraInfoByAreaId({ areaId: item.id, - status: 1, }).then((res) => { treeData.value.map((treeDataItem, index) => { if (item.id == treeDataItem.id) { diff --git a/front/src/views/home/videoSurveillance/index.vue b/front/src/views/home/videoSurveillance/index.vue index 117f7bbf..333b6258 100644 --- a/front/src/views/home/videoSurveillance/index.vue +++ b/front/src/views/home/videoSurveillance/index.vue @@ -226,7 +226,6 @@ longitude: this.mapSearchParam.gpsX || '', latitude: this.mapSearchParam.gpsY || '', radius: this.mapSearchParam.radius || '', - status: 1, } let paramsFather = '' let i = 1 From 076d84bd0a025c0b4208238be7ca08874839e83e Mon Sep 17 00:00:00 2001 From: guoyue Date: Mon, 26 Sep 2022 16:29:32 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E8=A5=BF=E6=B5=B7=E5=B2=B8=EF=BC=9A?= =?UTF-8?q?=E8=A7=86=E9=A2=91=E6=92=AD=E6=94=BE=20=E7=A6=BB=E7=BA=BF(statu?= =?UTF-8?q?s=E4=B8=8D=E6=98=AF1)=E6=8F=90=E7=A4=BA=E5=BD=93=E5=89=8D?= =?UTF-8?q?=E8=A7=86=E9=A2=91=E7=A6=BB=E7=BA=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- front/src/views/home/infrastructurePage.vue | 35 ++++++++++++++------- 1 file changed, 23 insertions(+), 12 deletions(-) diff --git a/front/src/views/home/infrastructurePage.vue b/front/src/views/home/infrastructurePage.vue index 766b2115..fd378fe1 100644 --- a/front/src/views/home/infrastructurePage.vue +++ b/front/src/views/home/infrastructurePage.vue @@ -315,7 +315,7 @@ openVideo( record.channelCode || record.channelId || - record.channelCode.channelId + record.channelCode.channelId, record ) "> 预览 @@ -389,9 +389,9 @@ destroyOnClose @cancel="videoClean">
-
+
-
+

@@ -465,7 +465,7 @@ const current = ref(1) const videoTotal = ref(0) const router = useRouter() const whoShow1 = ref(whoShow) -const isXiHaiAn = whoShow1.value.itShowXiHaiAn; +const isXiHaiAn = whoShow1.value.itShowXiHaiAn || true; const options = reactive({ width: '912px', //播放器宽度 height: '513px', //播放器高度 @@ -688,8 +688,11 @@ if (whoShow1.value.itShowXiHaiAn) { tabList.value[0].content.push('无人机') tabList.value[0].content.push('单兵设备') } + +const rowClickData = ref(null) // 打开视频预览 -const openVideo = (id) => { +const openVideo = (id, record) => { + rowClickData.value = record; console.log('打开视频', id) const param = { key: id, @@ -1271,8 +1274,6 @@ const getSoldierData = (indexFather, name) => { return message.error(res.data.msg) } let { list = [], total = 0 } = res.data.data; - console.log('total------------>', total); - pagination.value.total = total if (name == '无人机') { list.map((wrj) => { @@ -1285,6 +1286,7 @@ const getSoldierData = (indexFather, name) => { }) }) } + if (name == '单兵设备') { list.map((db) => { dataSource2.value.push({ @@ -1348,7 +1350,7 @@ const batchPreview = async function (page) { }, } await getStreamByChannelCode(param).then((res) => { - // 视频测试 + // 视频测试-勿删 // ob.options.src = 'http://playertest.longtailvideo.com/adaptive/bipbop/gear4/prog_index.m3u8' ob.options.src = res.data.data console.log('监测ob的变化', ob) @@ -1489,7 +1491,6 @@ const getCamera = (flag, str) => { longitude: mapSearchParam.value.gpsX || '', latitude: mapSearchParam.value.gpsY || '', radius: mapSearchParam.value.radius || '', - status: 1, name: mapSearchParam.value.cameraName } // todo-临时放开 @@ -1658,8 +1659,19 @@ const handleTableChange = (val) => { } } -const videoShowMsg = () => { - message.warning('请申请后在我的申请中预览视频!') +// 视频预览 提示 +const videoShowMsg = (index) => { + let itemData = null; + if (index) { + itemData = selectedList.value[index] + } + let msg = '请申请后在我的申请中预览视频!' + if ((itemData && itemData.status !== 1) || (rowClickData.value && rowClickData.value.status !== 1)) { + msg = '当前视频离线不可预览!' + } else { + msg = '请申请后在我的申请中预览视频!' + } + message.warning(msg) } From 5c6d90d912c802d53738877f9eb6e2f6835ed7a8 Mon Sep 17 00:00:00 2001 From: guoyue Date: Mon, 26 Sep 2022 16:40:54 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E8=A5=BF=E6=B5=B7=E5=B2=B8=EF=BC=9A?= =?UTF-8?q?=E6=88=91=E7=9A=84=E7=94=B3=E8=AF=B7=E4=B8=AD-=E8=A7=86?= =?UTF-8?q?=E9=A2=91=E9=A2=84=E8=A7=88=20=E5=A2=9E=E5=8A=A0=E7=A6=BB?= =?UTF-8?q?=E7=BA=BF=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- front/src/views/home/infrastructurePage.vue | 2 +- .../views/personalCenter/components/AbilityApplication.vue | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/front/src/views/home/infrastructurePage.vue b/front/src/views/home/infrastructurePage.vue index fd378fe1..beb5954f 100644 --- a/front/src/views/home/infrastructurePage.vue +++ b/front/src/views/home/infrastructurePage.vue @@ -1666,7 +1666,7 @@ const videoShowMsg = (index) => { itemData = selectedList.value[index] } let msg = '请申请后在我的申请中预览视频!' - if ((itemData && itemData.status !== 1) || (rowClickData.value && rowClickData.value.status !== 1)) { + if ((itemData && itemData.status != 1) || (rowClickData.value && rowClickData.value.status != 1)) { msg = '当前视频离线不可预览!' } else { msg = '请申请后在我的申请中预览视频!' diff --git a/front/src/views/personalCenter/components/AbilityApplication.vue b/front/src/views/personalCenter/components/AbilityApplication.vue index 11567292..3a75af0e 100644 --- a/front/src/views/personalCenter/components/AbilityApplication.vue +++ b/front/src/views/personalCenter/components/AbilityApplication.vue @@ -187,7 +187,7 @@
视频预览 @@ -440,6 +440,9 @@ // 视频预览 const openVideo = (item) => { console.log('打开视频', item) + if(item && item.status != 1) { + return message.error('当前视频离线不可预览!') + } const param = { key: item.cameraId, } From cecba03c6eed9559531c5810d76c47a096e44858 Mon Sep 17 00:00:00 2001 From: guoyue Date: Mon, 26 Sep 2022 16:41:09 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E8=A5=BF=E6=B5=B7=E5=B2=B8=EF=BC=9A?= =?UTF-8?q?=E8=A7=86=E9=A2=91=E6=92=AD=E6=94=BE=20=E7=A6=BB=E7=BA=BF(statu?= =?UTF-8?q?s=E4=B8=8D=E6=98=AF1)=E6=8F=90=E7=A4=BA=E5=BD=93=E5=89=8D?= =?UTF-8?q?=E8=A7=86=E9=A2=91=E7=A6=BB=E7=BA=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- front/src/api/file.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/front/src/api/file.js b/front/src/api/file.js index 7ff3cbd6..d7e2349d 100644 --- a/front/src/api/file.js +++ b/front/src/api/file.js @@ -99,7 +99,7 @@ export function getHls(params) { } //能力集市基础设施-左侧列表 export function getCameraInfoByAreaId(params) { - return axios.get(`http://10.134.135.92:9537/data_service/getCamera/getCameraInfoByAreaId?areaId=${params.areaId}&status=${params.status}`, + return axios.get(`http://10.134.135.92:9537/data_service/getCamera/getCameraInfoByAreaId?areaId=${params.areaId}`, config2 ) } From 653559e727b4bb060a6648f2a455779d6eb0ea49 Mon Sep 17 00:00:00 2001 From: guoyue Date: Mon, 26 Sep 2022 16:55:51 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E5=8C=96=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- front/src/views/home/infrastructurePage.vue | 173 +++++++++++--------- 1 file changed, 93 insertions(+), 80 deletions(-) diff --git a/front/src/views/home/infrastructurePage.vue b/front/src/views/home/infrastructurePage.vue index beb5954f..05bef9e8 100644 --- a/front/src/views/home/infrastructurePage.vue +++ b/front/src/views/home/infrastructurePage.vue @@ -315,7 +315,8 @@ openVideo( record.channelCode || record.channelId || - record.channelCode.channelId, record + record.channelCode.channelId, + record ) "> 预览 @@ -344,9 +345,7 @@ 申请 - - 详情 - + 详情 @@ -355,7 +354,7 @@
-
+
@@ -389,7 +388,7 @@ destroyOnClose @cancel="videoClean">
-
+

@@ -404,11 +403,11 @@