From 04aacd14a6cf6b1d8283b70927b29f8e36ac30e0 Mon Sep 17 00:00:00 2001 From: a0049873 <79py69t9wb@privaterelay.appleid.com> Date: Mon, 28 Nov 2022 11:25:09 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=82=B9=E5=87=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- front/src/views/home/components/header.vue | 350 +++++++++++---------- 1 file changed, 188 insertions(+), 162 deletions(-) diff --git a/front/src/views/home/components/header.vue b/front/src/views/home/components/header.vue index e3d618fe..cdf61897 100644 --- a/front/src/views/home/components/header.vue +++ b/front/src/views/home/components/header.vue @@ -17,9 +17,17 @@
{{ item.name }}
@@ -54,6 +62,7 @@ p-id="2187" width="0.35rem" height="0.35rem" + @click="goToView()" > {{ user.realName }} 退出 @@ -135,19 +148,19 @@ const mynoticeFlag = ref(false) const mynoticeData = ref([]) const navList = ref(navListManagement.navList) - const targetRouter= ref('') + const targetRouter = ref('') const backFlag = ref(false) getUserInfo().then((res) => { - if(res.data.data.superAdmin =='1'){ + if (res.data.data.superAdmin == '1') { backFlag.value = true } else { - res.data.data.roleIdList.map((val) => { - getRole(val).then((role) => { - if (role.data.data.name === '后台管理员') { - backFlag.value = true - } + res.data.data.roleIdList.map((val) => { + getRole(val).then((role) => { + if (role.data.data.name === '后台管理员') { + backFlag.value = true + } + }) }) - }) } }) console.log('navList------------>', navList) @@ -188,140 +201,145 @@ window.open('http://15.72.177.175:18460/analystrunner/tonglan', '_blank') } // 跳转页面 - const jumpPage = (item,type) => { - if(type == 'headerClick'){ - // 西海岸 - if (itShowXiHaiAn.value) { - let _arr = ['共享门户', '能力云图', '能力统计', '需求中心', '赋能案例'] - if ( - _arr.includes(item.name) && - !xhaHasPermissionUser.list.includes(user.value.username) - ) { - return message.warn('暂无权限') + const jumpPage = (item, type) => { + if (type == 'headerClick') { + // 西海岸 + if (itShowXiHaiAn.value) { + let _arr = ['共享门户', '能力云图', '能力统计', '需求中心', '赋能案例'] + if ( + _arr.includes(item.name) && + !xhaHasPermissionUser.list.includes(user.value.username) + ) { + return message.warn('暂无权限') + } + } + select.value = item.key + switch (item.name) { + case '个人中心': + window.sessionStorage.setItem( + 'type', + JSON.stringify('PurchaseVehicle') + ) + router.push({ + path: '/personalCenter', + }) + break + case '能力统计': + router.push({ + path: '/abilityStatistics', + }) + break + case '能力集市': + router.push({ + path: '/DetailsPageconetent', + query: { + select: DETAIL_PAGE_CONTENT_DEFAULT_TAB, + }, + }) + break + case '能力云图': + router.push({ + path: '/capabilityCloud', + }) + break + // case '技术文档': + // router.push({ + // path: '/developmentGuide', + // }) + // break + case '新手指南': + router.push({ + path: '/instructionManual', + }) + break + case '需求中心': + router.push({ + path: '/demandCenter', + }) + break + case '区市站点': + router.push({ + path: '/mapTest', + }) + break + case '后台管理': + Cookies.remove('JSESSIONID') + window.open(window.SITE_CONFIG.backUrl + '/#/workBench-workBench') + // window.reload('http://15.2.21.238:9797') + break + case '赋能案例': + router.push({ + path: '/assignCase', + }) + break + case '典型赋能案例': + router.push({ + path: '/assignCase', + }) + break + case '融合服务': + router.push({ + path: '/integrationServices', + }) + break + case 'CIM专区': + router.push({ + path: '/cimSpecialArea', + }) + break + default: + router.push('/home') + break + } + } else if (type == 'innerClick') { + //select.value = item.key + switch (item.name) { + case '个人中心': + window.sessionStorage.setItem( + 'type', + JSON.stringify('PurchaseVehicle') + ) + router.push({ + path: '/personalCenter', + }) + break + case '能力统计': + router.push({ + path: '/abilityStatistics', + }) + break + case '能力集市': + router.push({ + path: targetRouter.value.path, + query: { + id: targetRouter.value.id, + }, + }) + break + case '能力云图': + router.push({ + path: '/capabilityCloud', + }) + break + case '后台管理': + Cookies.remove('JSESSIONID') + window.open(window.SITE_CONFIG.backUrl + '/#/workBench-workBench') + // window.reload('http://15.2.21.238:9797') + break + case '融合服务': + router.push({ + path: '/integrationServices', + }) + break + case 'CIM专区': + router.push({ + path: '/cimSpecialArea', + }) + break + default: + router.push('/home') + break } - } - select.value = item.key - switch (item.name) { - case '个人中心': - window.sessionStorage.setItem('type', JSON.stringify('PurchaseVehicle')) - router.push({ - path: '/personalCenter', - }) - break - case '能力统计': - router.push({ - path: '/abilityStatistics', - }) - break - case '能力集市': - router.push({ - path: '/DetailsPageconetent', - query: { - select: DETAIL_PAGE_CONTENT_DEFAULT_TAB, - }, - }) - break - case '能力云图': - router.push({ - path: '/capabilityCloud', - }) - break - // case '技术文档': - // router.push({ - // path: '/developmentGuide', - // }) - // break - case '新手指南': - router.push({ - path: '/instructionManual', - }) - break - case '需求中心': - router.push({ - path: '/demandCenter', - }) - break - case '区市站点': - router.push({ - path: '/mapTest', - }) - break - case '后台管理': - Cookies.remove('JSESSIONID') - window.open(window.SITE_CONFIG.backUrl + '/#/workBench-workBench') - // window.reload('http://15.2.21.238:9797') - break - case '赋能案例': - router.push({ - path: '/assignCase', - }) - break - case '典型赋能案例': - router.push({ - path: '/assignCase', - }) - break - case '融合服务': - router.push({ - path: '/integrationServices', - }) - break - case 'CIM专区': - router.push({ - path: '/cimSpecialArea', - }) - break - default: - router.push('/home') - break - } - }else if(type == 'innerClick'){ - //select.value = item.key - switch (item.name) { - case '个人中心': - window.sessionStorage.setItem('type', JSON.stringify('PurchaseVehicle')) - router.push({ - path: '/personalCenter', - }) - break - case '能力统计': - router.push({ - path: '/abilityStatistics', - }) - break - case '能力集市': - router.push({ - path: targetRouter.value.path, - query: { - id: targetRouter.value.id, - }, - }); - break - case '能力云图': - router.push({ - path: '/capabilityCloud', - }) - break - case '后台管理': - Cookies.remove('JSESSIONID') - window.open(window.SITE_CONFIG.backUrl + '/#/workBench-workBench') - // window.reload('http://15.2.21.238:9797') - break - case '融合服务': - router.push({ - path: '/integrationServices', - }) - break - case 'CIM专区': - router.push({ - path: '/cimSpecialArea', - }) - break - default: - router.push('/home') - break - } - } } const scrollTop = ref(0) @@ -403,24 +421,32 @@ mybus.on('changeMenuStyle', (data) => { debugger - targetRouter.value = data; - if(data.path=='/algorithmCompare'){ - jumpPage({ - "name": "能力集市", - "key": "DetailsPageconetent", - "innerKey":"algorithmCompare" - },'innerClick'); - } else if(data.path =='/DetailsPageconetent'){ - jumpPage({ name: '能力集市', key: 'DetailsPageconetent' },'headerClick') - } else if(data.path =='/details'){ - jumpPage({ - "name": "能力集市", - "key": "DetailsPageconetent", - "innerKey":"details" - },'innerClick'); + targetRouter.value = data + if (data.path == '/algorithmCompare') { + jumpPage( + { + name: '能力集市', + key: 'DetailsPageconetent', + innerKey: 'algorithmCompare', + }, + 'innerClick' + ) + } else if (data.path == '/DetailsPageconetent') { + jumpPage( + { name: '能力集市', key: 'DetailsPageconetent' }, + 'headerClick' + ) + } else if (data.path == '/details') { + jumpPage( + { + name: '能力集市', + key: 'DetailsPageconetent', + innerKey: 'details', + }, + 'innerClick' + ) } }) - }) onBeforeUnmount(() => { mybus.off('getSgcNum') @@ -507,7 +533,7 @@ background: #0058e1; color: #fff !important; } - .select-inner { + .select-inner { background: #0058e1; color: #fff !important; } From d5722586e75bbfc3e6686c756fbd8eb41243e67a Mon Sep 17 00:00:00 2001 From: a0049873 <79py69t9wb@privaterelay.appleid.com> Date: Mon, 28 Nov 2022 11:30:17 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E9=99=84=E4=BB=B6=E5=90=8D=E7=A7=B0?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/modules/myAgent/demo/competency-application.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/back/src/views/modules/myAgent/demo/competency-application.vue b/back/src/views/modules/myAgent/demo/competency-application.vue index c2aa0bca..182dc009 100644 --- a/back/src/views/modules/myAgent/demo/competency-application.vue +++ b/back/src/views/modules/myAgent/demo/competency-application.vue @@ -2,7 +2,7 @@ * @Author: hisense.liangjunhua * @Date: 2022-06-29 15:59:51 * @LastEditors: Light - * @LastEditTime: 2022-11-24 20:45:45 + * @LastEditTime: 2022-11-28 11:28:43 * @Description: 告诉大家这是什么 --> @@ -531,7 +531,7 @@ export default { // 任务处理出错回调 taskHandleErrorCallback (data) { }, download (data) { - this.downloadFile(data.attachment, '附件') + this.downloadFile(data.attachment, '感知资源申请表') // const alink = document.createElement('a') // alink.download = '附件' // 文件名,大部分浏览器兼容,IE10及以下不兼容 // // alink.href = data.attachment // 创建 url地址 From 689d308864c92e3ff14386d45dc95352d4436c48 Mon Sep 17 00:00:00 2001 From: a0049873 <79py69t9wb@privaterelay.appleid.com> Date: Mon, 28 Nov 2022 14:53:47 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=A4=84=E7=90=86=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E5=A4=B1=E8=B4=A5=E6=83=85=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../personalCenter/components/MyApply.vue | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/front/src/views/personalCenter/components/MyApply.vue b/front/src/views/personalCenter/components/MyApply.vue index 4f4c5cf0..2e4c5ea6 100644 --- a/front/src/views/personalCenter/components/MyApply.vue +++ b/front/src/views/personalCenter/components/MyApply.vue @@ -484,6 +484,10 @@ yaweiApproveDetails({ applyGuid: item.GUID }) .then((res) => { console.log('详情===========>', res.data.data) + if (res.data.code !== 0) { + message.error('数据请求失败！') + return + } res.data.data.map((val) => { val.clsj = moment(val.clsj).format('YYYY-MM-DD HH:mm:ss') }) @@ -717,6 +721,14 @@ } else if (typeName.value == '数据资源申请') { yaweiApproveStatus({ page: page.value, size: 4, title: '' }).then( (res) => { + if (res.data.code !== 0) { + num.value = [] + total.value = 0 + contentList.data = [] + contentList2.data = [] + showType.value = '' + return + } console.log('数据资源申请===============>', res.data.data) contentList.data = res.data.data.data num.value = [] @@ -727,6 +739,14 @@ } else if (typeName.value == '云资源申请') { getResourceBusinessList({ userAccount: userName.value }).then((res) => { console.log('数据资源申请===============>', res.data.data) + if (res.data.code !== 0) { + num.value = [] + total.value = 0 + contentList.data = [] + contentList2.data = [] + showType.value = '' + return + } contentList.data = res.data.data contentList2.data = res.data.data num.value = [] @@ -735,6 +755,14 @@ }) } else if (typeName.value == '云视频申请') { getVideoBusinessList({ userAccount: userName.value }).then((res) => { + if (res.data.code !== 0) { + num.value = [] + total.value = 0 + contentList.data = [] + contentList2.data = [] + showType.value = '' + return + } console.log('数据资源申请===============>', res.data.data) contentList.data = res.data.data contentList2.data = res.data.data