diff --git a/front/public/static/config/basicConfig.js b/front/public/static/config/basicConfig.js index fa306d8d..ea1f9e0d 100644 --- a/front/public/static/config/basicConfig.js +++ b/front/public/static/config/basicConfig.js @@ -28,7 +28,8 @@ var CONFIGITEM = { previewUrl: 'http://15.72.183.90:7008/', //frontUrl: 'http://15.72.183.90:7008/document/#/devModelFile/', //apiURL: 'http://15.72.183.90:8000/renren-admin', - websocketURL: '15.72.183.90:8000/renren-admin', + // websocketURL: '15.72.183.90:8000/renren-admin', + websocketURL: '192.168.124.254:8888/renren-admin', // 李志成-远雄 POI_URL: 'http://15.72.178.129:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address', }, @@ -62,8 +63,9 @@ var CONFIGITEM = { }, backUrl: 'http://10.134.135.9:9797', previewUrl: 'http://10.134.135.9:9796/', - websocketURL: '10.134.135.9:8888/renren-admin', // 正式环境 - websocketURL: '10.134.135.92:8888/renren-admin', // 测试环境 + // websocketURL: '10.134.135.9:8888/renren-admin', // 正式环境 + // websocketURL: '10.134.135.92:8888/renren-admin', // 测试环境 + websocketURL: '192.168.124.254:8888/renren-admin', // 李志成-远雄 // websocketURL: '10.18.1.99:8889/renren-admin', // 研发 POI_URL: 'http://15.72.178.129:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address', diff --git a/front/src/api/home.js b/front/src/api/home.js index c1927328..db989ea8 100644 --- a/front/src/api/home.js +++ b/front/src/api/home.js @@ -74,7 +74,8 @@ export function getHls(params) { // 加入申购车 export function sgcInsert(data) { return request({ - url: '/resourcecar/insert', + // url: '/resourcecar/insert', + url: '/resourcecar/batchInsert', // 西海岸-加入购物车相当于收藏功能 method: 'post', data, }) diff --git a/front/src/views/abilityStatistics/components/ResourceAggregation.vue b/front/src/views/abilityStatistics/components/ResourceAggregation.vue index 45fa2333..64c3021b 100644 --- a/front/src/views/abilityStatistics/components/ResourceAggregation.vue +++ b/front/src/views/abilityStatistics/components/ResourceAggregation.vue @@ -60,6 +60,7 @@ import { } from '@/api/abilityStatistics.js' // import { zywMessage } from '@/api/home' import * as echarts from 'echarts' +import { message } from 'ant-design-vue' //各类资源汇聚量 let dataList = ref({ title: '各类资源汇聚量', @@ -95,11 +96,10 @@ let dataList = ref({ // }) // } selectTotal().then((res) => { - console.log('selectTotal===============>', res.data.data) - // res.data.data.map((item, index) => { - // dataList.value.dataList[index].organization = '个' - // dataList.value.dataList[index].photo = photo.value[index] - // }) + console.log('selectTotal===============>', res) + if(res.data.code !== 0) { + return message.error(res.data.msg) + } let imgObj = { '组件服务': require('../../../assets/abilityStatistics/banner-zj.png'), '应用资源': require('../../../assets/abilityStatistics/banner-yy.png'), diff --git a/front/src/views/home/AbilityToApplyFor.vue b/front/src/views/home/AbilityToApplyFor.vue index 4f23d218..84cf6400 100644 --- a/front/src/views/home/AbilityToApplyFor.vue +++ b/front/src/views/home/AbilityToApplyFor.vue @@ -89,11 +89,15 @@ {{ val.type }} + +
{{ val.description || ((val.note1 || '') && - (JSON.parse(val.note1)[0].channelName || '--') + + (JSON.parse(val.note1) && JSON.parse(val.note1)[0] && JSON.parse(val.note1)[0].channelName || '--') + '等' + JSON.parse(val.note1).length + '个摄像头') || diff --git a/front/src/views/home/apply.vue b/front/src/views/home/apply.vue index 47f72b18..59c1b3a7 100644 --- a/front/src/views/home/apply.vue +++ b/front/src/views/home/apply.vue @@ -502,26 +502,29 @@ export default { if (item.note1 && typeof item.note1 == 'string') { item.note1 = JSON.parse(item.note1) } - item.note1.map((sxt) => { + item.note1 && item.note1.map((jcss) => { + if (!jcss) { + return; + } let _itemData = { - resourceId: sxt.idtCameraChannel + '', - resourceName: sxt.channelName, - cameraId: sxt.channelId, // 改接口后删除 - channelCode: sxt.channelCode, - channelId: sxt.channelId, - channelName: sxt.channelName, - checkStatus: sxt.checkStatus + '', - gpsX: sxt.gpsX, - gpsY: sxt.gpsY, - idtCameraChannel: sxt.idtCameraChannel + '', - nodeName: sxt.nodeName, - parentId: sxt.parentId, - status: sxt.status + '', + resourceId: (jcss.idtCameraChannel || '') + '', + resourceName: jcss.channelName, + cameraId: jcss.channelId, // 改接口后删除 + channelCode: jcss.channelCode, + channelId: jcss.channelId, + channelName: jcss.channelName, + checkStatus: jcss.checkStatus + '', + gpsX: jcss.gpsX, + gpsY: jcss.gpsY, + idtCameraChannel: (jcss.idtCameraChannel || '') + '', + nodeName: jcss.nodeName, + parentId: jcss.parentId, + status: jcss.status + '', } // 西海岸 if (isXiHaiAn.value) { - _itemData.managementUnitName = sxt.managementUnitName - _itemData.cameraPointTypeName = sxt.cameraPointTypeName + _itemData.managementUnitName = jcss.managementUnitName; + _itemData.cameraPointTypeName = jcss.cameraPointTypeName; } obj.system.push(_itemData) }) diff --git a/front/src/views/home/components/header.vue b/front/src/views/home/components/header.vue index ada50a51..95b5e0ba 100644 --- a/front/src/views/home/components/header.vue +++ b/front/src/views/home/components/header.vue @@ -1,11 +1,8 @@ diff --git a/front/src/views/home/infrastructurePage.vue b/front/src/views/home/infrastructurePage.vue index 54067c5a..46bd3da5 100644 --- a/front/src/views/home/infrastructurePage.vue +++ b/front/src/views/home/infrastructurePage.vue @@ -452,15 +452,6 @@ > 批量预览 - - ', 444); + } else if (name == '政务云资源') { room.value = true tableHeight.value = 600 @@ -1488,7 +1481,12 @@ mapSearchParam.value.labelCodes.push(item.labelCode) }) } - console.log('选中的标签code', mapSearchParam.value) + // 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() @@ -1872,7 +1870,6 @@ mapSearchParam.value.parentId || '70be8c5b664f4bcf869d82f2e8335051', pageNum: mapSearchParam.value.pageNum, pageSize: mapSearchParam.value.pageSize, - name: mapSearchParam.value.cameraName || '', longitude: mapSearchParam.value.gpsX || '', latitude: mapSearchParam.value.gpsY || '', radius: mapSearchParam.value.radius || '', @@ -1916,13 +1913,20 @@ //加入申购车 const addShoppingCart = () => { if (selectedList.value.length > 0) { - sgcInsert({ - delFlag: '0', - resourceId: '8888888880000000001', - note1: selectedList.value, - // userId: userId.value, - }).then((res) => { - console.log(res) + let _arr = [] + selectedList.value.map(v => { + _arr.push({ + delFlag: '0', + resourceId: v.idtCameraChannel, + 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) + } message.success('添加申购车成功！') mybus.emit('getSgcNum') }) @@ -1958,7 +1962,7 @@ ]) // 西海岸--状态展示 if(isXiHaiAn) { - columns.value = columns.value.splice(2, 0, { + columns.value.splice(2, 0, { title: '状态', dataIndex: 'status', width: '10%', diff --git a/front/src/views/personalCenter/components/PurchaseVehicle.vue b/front/src/views/personalCenter/components/PurchaseVehicle.vue index 99b76346..c889ef03 100644 --- a/front/src/views/personalCenter/components/PurchaseVehicle.vue +++ b/front/src/views/personalCenter/components/PurchaseVehicle.vue @@ -93,8 +93,11 @@ :checked="val.checked" @click.stop="checkedDept(val)" > - - {{ val.deptName + '(' + val.count + ')' }} + + {{ val.deptName}} + + + {{ val.deptName + '(' + val.count + ')' }}
@@ -113,13 +116,13 @@ @@ -144,8 +147,9 @@ {{ item.type }} + - 加购时间:{{ item.time }} + 加购时间:{{ item.time }} { getList('init') @@ -498,6 +503,10 @@ pageSize: pageSize.value, name: name.value, }).then((res) => { + console.log('res---获取信息--------->', res); + if(res.data.code !== 0) { + return message.error(res.data.msg) + } let statistics = 0 res.data.data.list.map((val) => { val.initLoading = true @@ -524,30 +533,13 @@ } // console.log('整体页面加载次数===============>', load.value) // 判断是否有已打开项，如果有重新载入之后自动打开 - debugger list.value = res.data.data.list if (index || index === 0) { - debugger list.value[index].show = true - // console.log('1111', list.value[index]) showNew(list.value[index]) - // showBottom() } - // list.value = res.data.data.list - console.log( - '重新请求值', - index, - // res.data.data.list[index].show, - list.value - ) total.value = res.data.data.deptCount - console.log( - '重新请求值2', - index, - // res.data.data.list[index].show, - list.value - ) showKey.value++ if (type == 'init' || type == 'changePage') { getListByDeptId(list.value[0]) @@ -558,12 +550,18 @@ const getListByDeptId = (item) => { console.log(item, 'item') if (item.children.length == 0) { - selectResourceListByDept({ + let _obj = { pageNum: item.pageNum, pageSize: item.pageSize, - deptId: item.deptId, + deptId: item.deptId || '', name: name.value, - }).then((res) => { + } + // 西海岸 todo + if(whoShow.itShowXiHaiAn) { + _obj.key = item.deptName + } + selectResourceListByDept(_obj).then((res) => { + console.log('res----根据部门查询-------->', res); // console.log( // '根据部门查询=============>', // item, @@ -641,16 +639,17 @@ } // 点击部门多选框 const checkedDept = (item) => { - // console.log( - // '点击部门多选框==================>', - // item, - // checkedList.value, - // checkAll.value - // ) + console.log( + '点击部门多选框==================>', + item, + checkedList.value, + checkAll.value + ) item.checked = !item.checked if (item.checked) { if (item.children.length > 0) { item.children.map((val) => { + console.log('val.id------------>', val.id); if (checkedListAbility.value.indexOf(val.id) == -1) { checkedListAbility.value.push(val.id) item.checkedList.push(val.id) @@ -838,8 +837,15 @@ } else { let arr = [] let delArr = [] + console.log('list.value------------>', list.value); + list.value.map((val) => { val.arr = val.children.filter((item) => { + if(whoShow.itShowXiHaiAn) { + item.type = '基础设施'; + item.resourceName = '摄像头列表'; + item.resourceId = '1522550195055828996'; + } console.log('选择的数据=============>', item) if (checkedListAbility.value.indexOf(item.id) > -1) { if (item.delFlag == 0) { @@ -857,6 +863,7 @@ if (arr.length > 0) { console.log('一键申请===================>', arr) localStorage.setItem('applyList', JSON.stringify(arr)) + return; router.push({ path: '/apply', }) diff --git a/front/src/views/personalCenter/components/asideMenu.vue b/front/src/views/personalCenter/components/asideMenu.vue index 63351538..d87f933f 100644 --- a/front/src/views/personalCenter/components/asideMenu.vue +++ b/front/src/views/personalCenter/components/asideMenu.vue @@ -1,136 +1,144 @@ diff --git a/front/src/views/personalCenter/index.vue b/front/src/views/personalCenter/index.vue index 700e7857..41853678 100644 --- a/front/src/views/personalCenter/index.vue +++ b/front/src/views/personalCenter/index.vue @@ -50,7 +50,7 @@ const delFlag = ref(true) mybus.on('tabsChange', (e) => { console.log('进入详情', e) - if (e.flag) { + if (e && e.flag) { delFlag.value = false } else { console.log('tabsChange', e.key)