diff --git a/front/src/api/videoSurveillance.js b/front/src/api/videoSurveillance.js index 53b714d7..94198d54 100644 --- a/front/src/api/videoSurveillance.js +++ b/front/src/api/videoSurveillance.js @@ -33,14 +33,14 @@ export function searchCamera(params) { } export function getCameraAllOrgan(params) { return request({ - url: `/api/project/selectSubOrgan`, + url: `/api/project/selectSubOrganNew`, method: 'get', params, }) } export function getCameraByParentId(params) { return request({ - url: `/api/project/selectByParentId`, + url: `/api/project/selectByParentIdNew`, method: 'get', params, }) diff --git a/front/src/views/home/detailsPageInfrastructureTree.vue b/front/src/views/home/detailsPageInfrastructureTree.vue index 086313a2..8fd0def1 100644 --- a/front/src/views/home/detailsPageInfrastructureTree.vue +++ b/front/src/views/home/detailsPageInfrastructureTree.vue @@ -11,6 +11,7 @@ :class="item.show ? 'topSelect' : ''" > {{ item.name }} + ({{ item.channelCount }}) @@ -39,9 +40,7 @@ fill="#0058e1" > - - {{ val.name }} - + {{ val.name }}({{ val.channelCount }}) {{ val.total }} @@ -55,7 +54,7 @@ :key="child.id" class="child" :class="selectId == child.id ? 'select2' : ''" - @click="onSelect(item, val, child)" + @click="onSelect(item, child, child)" >
- {{ child.total }} + {{ child.channelCount }} @@ -122,7 +121,6 @@ if (select === '123') { select = '' } - // debugger console.log( '获取url中的select=====================>', router.currentRoute.value.query.select @@ -242,6 +240,7 @@ // } const selectId = ref('') const onSelect = (item, val, child) => { + debugger console.log('item, val, child', child) mybus.emit('getCameraByParentId', val.id) mybus.emit('getListByParentId', val.id)