From 56e11a088edc6927378daebd6ecf92d6540a6754 Mon Sep 17 00:00:00 2001 From: a0049873 <79py69t9wb@privaterelay.appleid.com> Date: Tue, 22 Nov 2022 09:47:10 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E8=A5=BF=E6=B5=B7=E5=B2=B8=E9=9C=80?= =?UTF-8?q?=E6=B1=82=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/CameraPopupOnMap.vue | 90 ++++++++++++++----- 1 file changed, 70 insertions(+), 20 deletions(-) diff --git a/front/src/views/home/videoSurveillance/components/CameraPopupOnMap.vue b/front/src/views/home/videoSurveillance/components/CameraPopupOnMap.vue index 5f691d90..dac8d827 100644 --- a/front/src/views/home/videoSurveillance/components/CameraPopupOnMap.vue +++ b/front/src/views/home/videoSurveillance/components/CameraPopupOnMap.vue @@ -25,12 +25,12 @@
- +
{{defaultIndex+1}}/{{cameraDataList.length}}
-
+
立即申请 加入申购车
@@ -46,11 +46,15 @@ LeftCircleOutlined, RightCircleOutlined, } from '@ant-design/icons-vue' - import { useRouter } from 'vue-router' + // import { useRouter } from 'vue-router' import H5Player from '@/views/home/components/H5Player.vue' import mybus from '@/myplugins/mybus' + import { message } from 'ant-design-vue' import { getStreamByChannelCode } from '@/api/videoSurveillance' import {getCameraLiveStream} from '@/api/file' + import {willApplyCameraSelect, + getApplyCameraListXha, + } from '@/api/home' export default { name: '', components: { @@ -78,10 +82,10 @@ data() { return { openVideo: false, - videoStream: '', + videoStream: '', videoUrl:'', //视频预览url defaultIndex:0,//默认显示列表中的对一个 - router:useRouter() + // router:useRouter() } }, methods: { @@ -94,13 +98,59 @@ }, //立即申请 applyNow(item){ - console.log('applyNowapplyNow',item); - //跳转至申请页面 - this.router.push({ - path: '/apply', - query: { - - }, + getApplyCameraListXha().then(res => { + let flag = true + if (res.data.code == 0) { + res.data.data.map((val) => { + val.cameraInfo = JSON.parse(val.cameraInfo) + console.log('applyNowapplyNow',val.cameraInfo); + if(flag && val.cameraInfo.channelId == item.channelId){ + flag = false + } + }) + if(flag){ + willApplyCameraSelect().then(res => { + if (res.data.code == 0) { + res.data.data.map(val => { + if(item.channelId == val.channelId){ + item.id = val.id + } + }) + } + let obj = { + arr: [ + { + checked: true, + delFlag: 0, + id: '1593084734789996545', + idtCameraChannel: '790582098133127168', + loading: false, + note1: '', + resourceId: '1522550195055828996', + resourceName: '摄像头列表', + type: '基础设施', + }, + ], + deptName: '西海岸新区工业和信息化局', + deptId: '732560225344761856', + } + item.type = '基础设施' + item.delFlag = 0 + item.resourceId = item.channelId + item.resourceName = item.channelName + obj.arr[0].note1 = JSON.stringify([item]) + if (obj.arr.length > 0) { + localStorage.setItem('applyList', JSON.stringify([obj])) + console.log('applyNowapplyNowobj',obj); + this.$router.push({ + path: '/apply', + }) + } + }) + }else{ + message.warning('该摄像头已申请！') + } + } }) }, //加入申购车 @@ -136,7 +186,7 @@ console.log('uyutyuyopopopop',this.cameraDataList[this.defaultIndex]); this.getVideoUrl(this.cameraDataList[this.defaultIndex]); } - + }, //查看下一个 handleNext(){ @@ -146,10 +196,10 @@ this.getVideoUrl(this.cameraDataList[0]); }else{ this.defaultIndex = this.defaultIndex + 1; - console.log('opopopop',this.cameraDataList[this.defaultIndex]); + console.log('opopopop',this.cameraDataList[this.defaultIndex]); this.getVideoUrl(this.cameraDataList[this.defaultIndex]); } - + } }, } @@ -229,14 +279,14 @@ } .video-content{ width: 750px; - height:600px; - text-align: left; + height:600px; + text-align: left; padding: 5px; } .footer-button{ width: 750px; - //height:50px; - text-align: center; + //height:50px; + text-align: center; padding-top:5px; } } @@ -289,7 +339,7 @@ .ant-carousel :deep(.slick-dots) { display: none !important; } - + } // .current-video { // width: 320px; From 962f1ad766da5e86127e082ffdd31d0ee82141e9 Mon Sep 17 00:00:00 2001 From: a0049873 <79py69t9wb@privaterelay.appleid.com> Date: Tue, 22 Nov 2022 09:49:43 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E7=82=B9=E4=BD=8D=E6=9F=A5=E5=85=A8?= =?UTF-8?q?=E9=83=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- front/src/views/home/videoSurveillance/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/front/src/views/home/videoSurveillance/index.vue b/front/src/views/home/videoSurveillance/index.vue index 44ee5f19..3ca60641 100644 --- a/front/src/views/home/videoSurveillance/index.vue +++ b/front/src/views/home/videoSurveillance/index.vue @@ -523,7 +523,7 @@ import { ElMessage } from 'element-plus' if(queryString){ getCameraByCondition({ pageNum: 1, - pageSize: 10, + pageSize: 30000, regionId: "70be8c5b664f4bcf869d82f2e8335051", type: "0", name:queryString, From beb51f9b5126e60fee38b89955f59af32b943fea Mon Sep 17 00:00:00 2001 From: gongjiale <942894820@qq.com> Date: Tue, 22 Nov 2022 10:00:29 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E8=A5=BF=E6=B5=B7?= =?UTF-8?q?=E5=B2=B8=E5=B7=A6=E5=81=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- front/src/api/file.js | 2 +- .../home/detailsPageInfrastructureTreeXha.vue | 54 ++++++++++--------- 2 files changed, 31 insertions(+), 25 deletions(-) diff --git a/front/src/api/file.js b/front/src/api/file.js index 278aee62..bd199a46 100644 --- a/front/src/api/file.js +++ b/front/src/api/file.js @@ -117,7 +117,7 @@ export function getPlaceType() { //西海岸 根据标签树查询视频列表 export function CameraConditionPlaceType(params) { return axios.post( - 'http://10.134.135.92:9537/data_service/getCamera/CameraConditionPlaceType' + + 'http://10.134.135.92:9537/data_service/getCamera/CameraConditionPlaceType' , params, config2 ) diff --git a/front/src/views/home/detailsPageInfrastructureTreeXha.vue b/front/src/views/home/detailsPageInfrastructureTreeXha.vue index 4ceed28f..23d6a2de 100644 --- a/front/src/views/home/detailsPageInfrastructureTreeXha.vue +++ b/front/src/views/home/detailsPageInfrastructureTreeXha.vue @@ -140,7 +140,6 @@ export default defineComponent({ const bumenImg = require('@/assets/newHome/bumen.png') const biaoqianImg = require('@/assets/newHome/biaoqian.png') const router = useRouter() - const whoShow1 = ref(whoShow) const showKey = ref(0) const treeData = ref([]) const selectId = ref('') @@ -149,6 +148,24 @@ export default defineComponent({ //切换tab const btnClick = (index) => { itemIndex.value = index + if(index===2){ + if(chooseId.value !==''){ + let placeTypeCode =[] + placeTypeCode.push(chooseId.value) + mybus.emit('CameraConditionPlaceType', placeTypeCode) + }else{ + mybus.emit('clearLeftSelect') + } + }else{ + if(selectId.value!==''){ + mybus.emit('getCameraByParentId', selectId.value) + }else{ + mybus.emit('clearLeftSelect') + } + } + + + } //选择标签内容 const tabClick = (id) => { @@ -156,6 +173,7 @@ export default defineComponent({ chooseId.value = '' mybus.emit('clearLeftSelect') }else{ + chooseId.value = id let placeTypeCode =[] placeTypeCode.push(id) @@ -175,14 +193,10 @@ export default defineComponent({ if (select == '基础设施') { let res = {} - if (whoShow1.value && !whoShow1.value.itShowXiHaiAn) { - res = await getCameraAllOrgan({ parentId: 'S4NbecfYB1DBH8HNULGS34' }) - } else { - // 西海岸 + res = await getCameraInfoByAreaId({ areaId: '70be8c5b664f4bcf869d82f2e8335051', }) - } treeData.value = (res.data && res.data.data) || [] let tabs={} tabs = await getPlaceType() @@ -202,14 +216,9 @@ export default defineComponent({ chooseId.value='' }) const onSelect = async (item, val, child) => { - - // if(selectId.value===val.id){ - // selectId.value='' - //   mybus.emit('clearLeftSelect') - // }else{ + let res = {}  mybus.emit('getCameraByParentId', val.id) - res = await getCameraInfoByAreaId({ areaId: val.id }) treeData.value.map((treeDataItem, index) => { if (item.id == treeDataItem.id) { @@ -222,36 +231,33 @@ export default defineComponent({ } }) if (child) { + if(selectId.value===child.id){ selectId.value='' -   mybus.emit('clearLeftSelect') + }else{ selectId.value = child.id } } - // } + } watch(selectId, (newVal) => { - - if (newVal == '') { - mybus.emit('getCameraByParentId', '') - mybus.emit('getListByParentId', '') + + if (newVal == '') { +   mybus.emit('clearLeftSelect') + // mybus.emit('getCameraByParentId', '') + // mybus.emit('getListByParentId', '') } }) const showBottom = async (item) => { item.show = !item.show let res = {} - if (whoShow1.value && !whoShow1.value.itShowXiHaiAn) { - res = await getCameraAllOrgan({ parentId: item.id }) - } else { // 西海岸 res = await getCameraInfoByAreaId({ areaId: item.id }) - } - treeData.value.map((treeDataItem, index) => { if (item.id == treeDataItem.id) { treeData.value[index].children = (res.data && res.data.data) || [] @@ -268,7 +274,7 @@ export default defineComponent({ // 取消选中 if (!val.show) { selectId.value = '' - mybus.emit('clearLeftSelect') + // mybus.emit('clearLeftSelect') } } } From 8ad683813c93a0a0830130bd31376645660b25b3 Mon Sep 17 00:00:00 2001 From: a0049873 <79py69t9wb@privaterelay.appleid.com> Date: Tue, 22 Nov 2022 10:57:30 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E8=A5=BF=E6=B5=B7=E5=B2=B8=E9=9C=80?= =?UTF-8?q?=E6=B1=82=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/home/infrastructureApplication.vue | 5 +- .../components/CameraPopupOnMap.vue | 90 ++++++++++++++----- 2 files changed, 73 insertions(+), 22 deletions(-) diff --git a/front/src/views/home/infrastructureApplication.vue b/front/src/views/home/infrastructureApplication.vue index 33842f48..dd386684 100644 --- a/front/src/views/home/infrastructureApplication.vue +++ b/front/src/views/home/infrastructureApplication.vue @@ -2,7 +2,7 @@ * @Author: Light * @Date: 2022-11-18 11:53:43 * @LastEditors: Light - * @LastEditTime: 2022-11-21 17:51:38 + * @LastEditTime: 2022-11-22 10:54:46 * @Description: 告诉大家这是什么 -->