diff --git a/front/src/views/home/infrastructurePage.vue b/front/src/views/home/infrastructurePage.vue index e38455bc..5fa40442 100644 --- a/front/src/views/home/infrastructurePage.vue +++ b/front/src/views/home/infrastructurePage.vue @@ -330,7 +330,6 @@ - {{ pagination.total || 0 }} 个

-

已选 {{ selectedRowKeys.length }} @@ -425,7 +423,6 @@

-
@@ -566,19 +551,19 @@ >
-
+
-
-
+
+
{{ userInfo.usernameShow }}
-
+
{{ userInfo.realNameShow }}
-
+
{{ userInfo.usernameShow }}
-
+
{{ userInfo.realNameShow }}
@@ -843,13 +828,6 @@ }, ], matter: [{ min: 1, max: 500, required: true, message: '可输入500字内容' }], - // phone: [ - // { - // required: true, - // pattern: /^1[3|4|5|7|8|9][0-9]\d{8}$/, - // message: '请输入正确的手机号', - // }, - // ], dept: [ { required: true, @@ -948,7 +926,6 @@ dataSource.value = param.dataSource pagination.value.total = param.total - // getCamera() }) //点位点击 mybus.off('pointMarkerClick') @@ -1004,10 +981,6 @@ { arr: [ { - // description: - // '申请单兵手持便携终端,提告前端人员执法透明度,加强执法人员与指挥中心实时沟通。', - // resourceId: 'dbsb', - // type: '单兵设备', description: data.description, resourceId: data.id, resourceName: data.wrjName, @@ -1444,14 +1417,6 @@ pagination.value.total = 0 selectType.value = '感知资源' } else if (name == '城市云脑会客厅') { - // room.value = false - // wrjFlag.value = true - // showMap.value = false - // roomYuyue.value = true - // roomResult.value = false - // tabList.value[1] = [] - // emits('add', 6) - // searchData() } clickList.value[indexFather].content.splice( clickList.value[indexFather].content.indexOf(name), @@ -1491,12 +1456,10 @@ mapSearchParam.value.labelCodes.push(item.labelCode) }) } - // todo mapSearchParam.value.gpsX = '' mapSearchParam.value.gpsY = '' mapSearchParam.value.radius = '' mapSearchParam.value.type = '' - console.log('mapSearchParam----->查询条件', mapSearchParam.value) mapSearchParam.value.labelCodes = mapSearchParam.value.labelCodes + '' emits('add', 1) getCamera() @@ -1717,7 +1680,6 @@ videoList.value.push(ob) }) } - console.log('验证数据的准确性', videoList) batchVisible.value = true } else { message.error('请选择需要预览的数据') @@ -1750,7 +1712,6 @@ videoList.value.push(ob) }) } - console.log('验证数据的准确性', videoList) batchPicVisible.value = true } else { message.error('请选择需要预览的数据') @@ -1778,8 +1739,6 @@ } const videoClean = () => { //视频预览弹窗关闭后不清除选中行 - // selectedList.value = [] - // selectedRowKeys.value = [] videoList.value = [] current.value = 1 } @@ -1787,11 +1746,8 @@ const changePage = (page) => {} // 一键申请 const dept = reactive({}) - // eslint-disable-next-line no-undef if (infrastructure) { - // eslint-disable-next-line no-undef dept.deptId = infrastructure.deptId || '' - // eslint-disable-next-line no-undef dept.deptName = infrastructure.deptName || '' } @@ -1809,7 +1765,6 @@ } const apply = async () => { - console.log('一键申请', selectedList.value) if (selectedRowKeys.value.length != 0) { // 判断最大数量 let maxNumRes = await judegNumber() @@ -1831,6 +1786,7 @@ deptName: dept.deptName, }, ] + console.log('一键申请', arr) localStorage.setItem('applyList', JSON.stringify(arr)) router.push({ path: '/apply', @@ -1851,30 +1807,27 @@ break } } - // // 添加至购物车 - // const addShopCar = () => { - // console.log('添加至购物车') - // } const wrjFlag = ref(false) + // 西海岸-视频资源loading + const loadingCamera = ref(false) const getCamera = (flag, str) => { - console.log( - 'mapSearchParam.value.cameraName------------>', - mapSearchParam.value.cameraName - ) + loadingCamera.value = true; if (flag) { mapSearchParam.value.cameraName = str - console.log('赋值===============》', str, mapSearchParam.value) } console.log('初始化调用') console.log('不选左侧树的时候不调用接口', mapSearchParam.value) if (!whoShow1.value.itShowXiHaiAn) { getCameraByParentId(mapSearchParam.value).then((res) => { - console.log('RRRRRRRRRR', res.data.data) + 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 { - console.log('mapSearchParam------------>', mapSearchParam) let params = { regionId: mapSearchParam.value.parentId || '70be8c5b664f4bcf869d82f2e8335051', @@ -1911,9 +1864,13 @@ } } getCameraByCondition(params).then((res) => { + console.log('res--查询摄像头---------->', res); + loadingCamera.value = false; dataSource.value = res.data.data pagination.value.total = res.data.count - console.log('根据parent查询摄像头', res.data.data) + }).catch(err => { + loadingCamera.value = false; + message.error(err) }) } } @@ -1931,9 +1888,7 @@ note1: [v], }) }) - console.log('_arr------------>', _arr); sgcInsert(_arr).then((res) => { - console.log('res------申购车------>', res); if(res.data.code !== 0) { return message.error(res.data.msg) } @@ -2001,7 +1956,6 @@ align: 'center', }, ]) - // const allClick = ref([]) const onSelectChange = ( record, selected, @@ -2009,7 +1963,6 @@ nativeEvent, type ) => { - console.log('hahhahah', record, selected, selectedRows, nativeEvent) record = JSON.parse(JSON.stringify(record)) if (selected) { if (selectedRowKeys.value.length == 1000) { @@ -2041,9 +1994,6 @@ if (selectedRowKeys.value.length > 1000) { message.warning('最多只能添加1000个摄像头!') changeRows.map((val) => { - // selectedList.value = selectedList.value.filter( - // (item) => item.idtCameraChannel !== val.idtCameraChannel - // ) selectedList.value.forEach((ele, index) => { if (ele.channelCode == record.channelCode) { selectedList.value.splice(index, 1)