From f727efbdcd149f4804963f945203175e8cedaa3f Mon Sep 17 00:00:00 2001 From: guoyue Date: Sat, 8 Oct 2022 14:58:01 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E9=A1=B6=E9=83=A8=E5=AF=BC=E8=88=AA?= =?UTF-8?q?=E9=99=A4=E5=9F=BA=E7=A1=80=E8=AE=BE=E6=96=BD=E5=A4=96=EF=BC=8C?= =?UTF-8?q?=E7=A6=81=E6=AD=A2=E5=88=87=E6=8D=A2=E4=B8=94=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=E6=AD=A3=E5=9C=A8=E5=BB=BA=E8=AE=BE=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- front/src/views/home/components/header.vue | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/front/src/views/home/components/header.vue b/front/src/views/home/components/header.vue index ada50a51..6fcc8839 100644 --- a/front/src/views/home/components/header.vue +++ b/front/src/views/home/components/header.vue @@ -132,6 +132,7 @@ import Cookies from 'js-cookie' import mybus from '@/myplugins/mybus' import { DETAIL_PAGE_CONTENT_DEFAULT_TAB } from '@/global/GlobalConfig.js' + import { message } from 'ant-design-vue' const store = useStore() const router = useRouter() @@ -181,6 +182,9 @@ } // 跳转页面 const jumpPage = (item) => { + if(item.name !== '能力集市') { + return message.warn('正在建设中！') + } // console.log(item) select.value = item.key switch (item.name) { From c71784567c51e10ee98df40c7a53ab8a47346cc6 Mon Sep 17 00:00:00 2001 From: guoyue Date: Sat, 8 Oct 2022 16:00:26 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E8=A5=BF=E6=B5=B7=E5=B2=B8-=E8=B4=AD?= =?UTF-8?q?=E7=89=A9=E8=BD=A6=E6=94=B6=E8=97=8F=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- front/src/api/home.js | 3 +- front/src/views/home/infrastructurePage.vue | 32 ++++----- .../components/PurchaseVehicle.vue | 4 +- .../personalCenter/components/asideMenu.vue | 72 +++++++++---------- 4 files changed, 56 insertions(+), 55 deletions(-) diff --git a/front/src/api/home.js b/front/src/api/home.js index e29fce91..8071fe00 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/home/infrastructurePage.vue b/front/src/views/home/infrastructurePage.vue index caa2cf86..ac566f31 100644 --- a/front/src/views/home/infrastructurePage.vue +++ b/front/src/views/home/infrastructurePage.vue @@ -452,15 +452,6 @@ > 批量预览 - - { 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 +1956,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..28919b9e 100644 --- a/front/src/views/personalCenter/components/PurchaseVehicle.vue +++ b/front/src/views/personalCenter/components/PurchaseVehicle.vue @@ -498,6 +498,8 @@ pageSize: pageSize.value, name: name.value, }).then((res) => { + console.log('res-----selectResourceCarGroupByDept------->', res); + let statistics = 0 res.data.data.list.map((val) => { val.initLoading = true @@ -557,7 +559,7 @@ // 通过deptid查询列表 const getListByDeptId = (item) => { console.log(item, 'item') - if (item.children.length == 0) { + if (item.children && item.children.length == 0) { selectResourceListByDept({ pageNum: item.pageNum, pageSize: item.pageSize, diff --git a/front/src/views/personalCenter/components/asideMenu.vue b/front/src/views/personalCenter/components/asideMenu.vue index 63351538..8e64a0a8 100644 --- a/front/src/views/personalCenter/components/asideMenu.vue +++ b/front/src/views/personalCenter/components/asideMenu.vue @@ -40,42 +40,42 @@ imgActive: require('@/assets/personalCenter/demandactive.png'), key: 'PurchaseVehicle', }, - { - title: '我的发布', - img: require('@/assets/personalCenter/push.png'), - imgActive: require('@/assets/personalCenter/pushactive.png'), - key: 'push', - }, - { - title: '我的申请', - img: require('@/assets/personalCenter/apply.png'), - imgActive: require('@/assets/personalCenter/applyactive.png'), - key: 'apply', - }, - { - title: '我的收藏', - img: require('@/assets/personalCenter/collect.png'), - imgActive: require('@/assets/personalCenter/collectactive.png'), - key: 'collect', - }, - { - title: '我的浏览', - img: require('@/assets/personalCenter/recent.png'), - imgActive: require('@/assets/personalCenter/recentactive.png'), - key: 'recent', - }, - { - title: '我的需求', - img: require('@/assets/personalCenter/demand.png'), - imgActive: require('@/assets/personalCenter/demandactive.png'), - key: 'demand', - }, - { - title: '我的评论', - img: require('@/assets/personalCenter/remark.png'), - imgActive: require('@/assets/personalCenter/remarkactive.png'), - key: 'remark', - }, + // { + // title: '我的发布', + // img: require('@/assets/personalCenter/push.png'), + // imgActive: require('@/assets/personalCenter/pushactive.png'), + // key: 'push', + // }, + // { + // title: '我的申请', + // img: require('@/assets/personalCenter/apply.png'), + // imgActive: require('@/assets/personalCenter/applyactive.png'), + // key: 'apply', + // }, + // { + // title: '我的收藏', + // img: require('@/assets/personalCenter/collect.png'), + // imgActive: require('@/assets/personalCenter/collectactive.png'), + // key: 'collect', + // }, + // { + // title: '我的浏览', + // img: require('@/assets/personalCenter/recent.png'), + // imgActive: require('@/assets/personalCenter/recentactive.png'), + // key: 'recent', + // }, + // { + // title: '我的需求', + // img: require('@/assets/personalCenter/demand.png'), + // imgActive: require('@/assets/personalCenter/demandactive.png'), + // key: 'demand', + // }, + // { + // title: '我的评论', + // img: require('@/assets/personalCenter/remark.png'), + // imgActive: require('@/assets/personalCenter/remarkactive.png'), + // key: 'remark', + // }, ] const selectedKeys = ref(['PurchaseVehicle']) const type = JSON.parse(window.sessionStorage.getItem('type')) From 7d513edafc31714ac3def452b968193e08a99bd6 Mon Sep 17 00:00:00 2001 From: guoyue Date: Sat, 8 Oct 2022 16:00:37 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E7=8E=AF=E5=A2=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- front/public/static/config/basicConfig.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/front/public/static/config/basicConfig.js b/front/public/static/config/basicConfig.js index fa306d8d..ce8ed1a8 100644 --- a/front/public/static/config/basicConfig.js +++ b/front/public/static/config/basicConfig.js @@ -62,8 +62,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', From b2c2958fdb83610f8f37f57a04b3c5e33cfc79a6 Mon Sep 17 00:00:00 2001 From: guoyue Date: Sat, 8 Oct 2022 18:01:53 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=97=A0=E7=94=A8?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/PurchaseVehicle.vue | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/front/src/views/personalCenter/components/PurchaseVehicle.vue b/front/src/views/personalCenter/components/PurchaseVehicle.vue index 28919b9e..84244d7d 100644 --- a/front/src/views/personalCenter/components/PurchaseVehicle.vue +++ b/front/src/views/personalCenter/components/PurchaseVehicle.vue @@ -499,7 +499,6 @@ name: name.value, }).then((res) => { console.log('res-----selectResourceCarGroupByDept------->', res); - let statistics = 0 res.data.data.list.map((val) => { val.initLoading = true @@ -526,30 +525,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]) From d6c971ab23d6f9303cea6bf59b78864605ffa25b Mon Sep 17 00:00:00 2001 From: guoyue Date: Sat, 8 Oct 2022 19:20:18 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E8=A5=BF=E6=B5=B7=E5=B2=B8=E9=A1=B6?= =?UTF-8?q?=E9=83=A8=E5=AF=BC=E8=88=AA=E6=8F=90=E7=A4=BA=E6=AD=A3=E5=9C=A8?= =?UTF-8?q?=E5=BB=BA=E8=AE=BE=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- front/src/views/home/components/header.vue | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/front/src/views/home/components/header.vue b/front/src/views/home/components/header.vue index 6fcc8839..323a8353 100644 --- a/front/src/views/home/components/header.vue +++ b/front/src/views/home/components/header.vue @@ -23,8 +23,8 @@ > {{ item.name }} - - + + - + --> { - if(item.name !== '能力集市') { + let _arr = ['共享门户', '能力云图', '能力统计', '需求中心', '赋能案例'] + if(_arr.includes(item.name)) { return message.warn('正在建设中！') } // console.log(item) From c4ae6d603a821ba570f992e0a50e3c0819d6395e Mon Sep 17 00:00:00 2001 From: guoyue Date: Sun, 9 Oct 2022 13:52:28 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E8=A5=BF=E6=B5=B7=E5=B2=B8=E8=B4=AD?= =?UTF-8?q?=E7=89=A9=E8=BD=A6=E7=AD=89=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- front/src/views/home/AbilityToApplyFor.vue | 6 +- front/src/views/home/apply.vue | 1543 ++++++++--------- front/src/views/home/infrastructurePage.vue | 14 +- .../components/PurchaseVehicle.vue | 53 +- .../personalCenter/components/asideMenu.vue | 237 +-- 5 files changed, 895 insertions(+), 958 deletions(-) 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 074472f4..71624d81 100644 --- a/front/src/views/home/apply.vue +++ b/front/src/views/home/apply.vue @@ -8,159 +8,69 @@
- +
- - + + - - + +
- - + + - - + + - - - - + + + + {{ item.name }}
- + - + - - + +
- - + +
- + " type="primary" html-type="cancle" @click="resetFields()"> 退出申请 - + " type="primary" html-type="submit" @click="processStartHandle()"> 提交申请
@@ -211,306 +112,242 @@
diff --git a/front/src/views/home/infrastructurePage.vue b/front/src/views/home/infrastructurePage.vue index ac566f31..1912d8a3 100644 --- a/front/src/views/home/infrastructurePage.vue +++ b/front/src/views/home/infrastructurePage.vue @@ -453,14 +453,14 @@ 批量预览 - 添加至申购车 - + --> ', 444); + } else if (name == '政务云资源') { room.value = true tableHeight.value = 600 @@ -1479,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() @@ -1863,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 || '', diff --git a/front/src/views/personalCenter/components/PurchaseVehicle.vue b/front/src/views/personalCenter/components/PurchaseVehicle.vue index 84244d7d..9f6affdc 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,7 +503,8 @@ pageSize: pageSize.value, name: name.value, }).then((res) => { - console.log('res-----selectResourceCarGroupByDept------->', res); + console.log('res---获取信息--------->', res); + let statistics = 0 res.data.data.list.map((val) => { val.initLoading = true @@ -541,13 +547,19 @@ // 通过deptid查询列表 const getListByDeptId = (item) => { console.log(item, 'item') - if (item.children && item.children.length == 0) { - selectResourceListByDept({ + if (item.children.length == 0) { + 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, @@ -625,16 +637,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) @@ -822,8 +835,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) { @@ -841,6 +861,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 8e64a0a8..1b47ce7d 100644 --- a/front/src/views/personalCenter/components/asideMenu.vue +++ b/front/src/views/personalCenter/components/asideMenu.vue @@ -1,136 +1,137 @@