diff --git a/front/src/views/home/infrastructurePage.vue b/front/src/views/home/infrastructurePage.vue index ba77c2e5..3fe3880a 100644 --- a/front/src/views/home/infrastructurePage.vue +++ b/front/src/views/home/infrastructurePage.vue @@ -331,10 +331,7 @@ - + @@ -389,7 +386,9 @@ :wrapper-col="{ span: 14, offset: 4 }" style="text-align: center; margin-top: 0.4rem" > - 取消 + + 取消 +
-
+
@@ -635,17 +637,33 @@ style="width: 100%; height: 100%; position: relative" > -
-
+
+
{{ userInfo.usernameShow }}
-
+
{{ userInfo.realNameShow }}
-
+
{{ userInfo.usernameShow }}
-
+
{{ userInfo.realNameShow }}

@@ -899,12 +917,12 @@ tabClick(0, '视频资源') } else { // 默认选中 - if(formPage && formPage == 'noticePage') { + if (formPage && formPage == 'noticePage') { tabClick(0, '城市云脑会客厅') roomYuyue.value = false roomResult.value = true onSearch() - }else { + } else { tabClick(0, '政务云资源') } } @@ -1397,7 +1415,7 @@ tabList.value[1].title = '视频标签' } selectType.value = '视频资源' - console.log('444------------>', 444); + console.log('444------------>', 444) } else if (name == '政务云资源') { room.value = true tableHeight.value = 600 @@ -1579,8 +1597,11 @@ clickList.value[1].content = [] } clickList.value[indexFather].content[0] = name - console.log('clickList.value[indexFather].content[0]------------>', clickList.value[indexFather].content[0]); - + console.log( + 'clickList.value[indexFather].content[0]------------>', + clickList.value[indexFather].content[0] + ) + if (tabList.value[1]) { tabList.value[1].title = '' tabList.value[1].content = [] @@ -1814,22 +1835,24 @@ // 西海岸-视频资源loading const loadingCamera = ref(false) const getCamera = (flag, str) => { - loadingCamera.value = true; + loadingCamera.value = true if (flag) { mapSearchParam.value.cameraName = str } console.log('初始化调用') console.log('不选左侧树的时候不调用接口', mapSearchParam.value) if (!whoShow1.value.itShowXiHaiAn) { - getCameraByParentId(mapSearchParam.value).then((res) => { - console.log('res--查询摄像头---------->', res); - loadingCamera.value = false; - dataSource.value = res.data.data - pagination.value.total = res.data.count - }).catch(err => { - loadingCamera.value = false; - message.error(err) - }) + getCameraByParentId(mapSearchParam.value) + .then((res) => { + console.log('res--查询摄像头---------->', res) + loadingCamera.value = false + dataSource.value = res.data.data + pagination.value.total = res.data.count + }) + .catch((err) => { + loadingCamera.value = false + message.error(err) + }) } else { let params = { regionId: @@ -1866,15 +1889,17 @@ } } } - getCameraByCondition(params).then((res) => { - console.log('res--查询摄像头---------->', res); - loadingCamera.value = false; - dataSource.value = res.data.data - pagination.value.total = res.data.count - }).catch(err => { - loadingCamera.value = false; - message.error(err) - }) + getCameraByCondition(params) + .then((res) => { + console.log('res--查询摄像头---------->', res) + loadingCamera.value = false + dataSource.value = res.data.data + pagination.value.total = res.data.count + }) + .catch((err) => { + loadingCamera.value = false + message.error(err) + }) } } defineExpose({ @@ -1884,7 +1909,7 @@ const addShoppingCart = () => { if (selectedList.value.length > 0) { let _arr = [] - selectedList.value.map(v => { + selectedList.value.map((v) => { _arr.push({ delFlag: '0', resourceId: v.idtCameraChannel, @@ -1892,7 +1917,7 @@ }) }) xhaAddCart(_arr).then((res) => { - if(res.data.code !== 0) { + if (res.data.code !== 0) { return message.error(res.data.msg) } message.success('添加申购车成功!') @@ -1929,7 +1954,7 @@ }, ]) // 西海岸--状态展示 - if(isXiHaiAn) { + if (isXiHaiAn) { columns.value.splice(2, 0, { title: '状态', dataIndex: 'status',