From 636318536b86a4ff6698a5f85f36e50dea462847 Mon Sep 17 00:00:00 2001 From: gaoyuanwei <2826352639@qq.com> Date: Mon, 1 Aug 2022 15:57:09 +0800 Subject: [PATCH 1/4] =?UTF-8?q?765bug=EF=BC=8C=E4=B8=8A=E6=9E=B6=E5=85=B3?= =?UTF-8?q?=E8=81=94=E7=BB=84=E4=BB=B6=E6=97=B6=E6=90=9C=E7=B4=A2=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../capacityOnTheShelf/components/PutOnTheShelf.vue | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/front/src/views/capacityOnTheShelf/components/PutOnTheShelf.vue b/front/src/views/capacityOnTheShelf/components/PutOnTheShelf.vue index db50a51e..d8832e02 100644 --- a/front/src/views/capacityOnTheShelf/components/PutOnTheShelf.vue +++ b/front/src/views/capacityOnTheShelf/components/PutOnTheShelf.vue @@ -477,6 +477,8 @@ :render="(item) => item.title" @change="handleChangeOther" @selectChange="handleSelectChangeOther" + show-search + :filter-option="filterOptionTransfer" /> @@ -927,7 +929,7 @@ mockDataOther.value.push({ key: val.id, title: val.name, - description: val.id, + description: val.name, }) }) }) @@ -948,7 +950,7 @@ mockDataOther.value.push({ key: val.id, title: val.name, - description: val.id, + description: val.name, }) }) }) @@ -978,6 +980,11 @@ console.log('targetSelectedKeys: ', targetSelectedKeys, sourceSelectedKeys) } + const filterOptionTransfer = (inputValue, option) => { + console.log(option, 'option') + return option.description.indexOf(inputValue) > -1 + } + const handleOk = (e) => { console.log(e) visibleAssociatedApplicationOther.value = false From 1ccd81cd6687ae68bdc62f25c19ec7a46f4747c5 Mon Sep 17 00:00:00 2001 From: guoyue Date: Mon, 1 Aug 2022 16:16:16 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E8=9E=8D=E5=90=88=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=EF=BC=8C=E4=B8=80=E9=94=AE=E7=94=B3=E8=AF=B7--=E5=9F=BA?= =?UTF-8?q?=E7=A1=80=E8=AE=BE=E6=96=BD=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- front/src/views/home/AbilityToApplyFor.vue | 4 +- front/src/views/home/apply.vue | 1306 ++++++++--------- .../home/components/searchResultList.vue | 97 +- front/src/views/home/packagingDetails.vue | 107 +- 4 files changed, 799 insertions(+), 715 deletions(-) diff --git a/front/src/views/home/AbilityToApplyFor.vue b/front/src/views/home/AbilityToApplyFor.vue index 7a863bd2..fa791bc4 100644 --- a/front/src/views/home/AbilityToApplyFor.vue +++ b/front/src/views/home/AbilityToApplyFor.vue @@ -49,8 +49,8 @@
{{ val.description || - (val.note1 && - JSON.parse(val.note1)[0].channelName + + ((val.note1 || '') && + ( 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 74cfa2f4..26d1c68a 100644 --- a/front/src/views/home/apply.vue +++ b/front/src/views/home/apply.vue @@ -11,150 +11,61 @@
- +
- - + +
- - + + - - + + - - + +
- - + + - - + +
- - + +
- - + +
- - - + + + "> 文件上传 @@ -181,8 +91,7 @@
- + " type="primary" html-type="cancle" @click="resetFields()"> 退出申请 - + " type="primary" html-type="submit" @click="processStartHandle()"> 提交申请
@@ -234,294 +134,268 @@ diff --git a/front/src/views/home/components/searchResultList.vue b/front/src/views/home/components/searchResultList.vue index 531885ad..f755cb77 100644 --- a/front/src/views/home/components/searchResultList.vue +++ b/front/src/views/home/components/searchResultList.vue @@ -588,33 +588,88 @@ export default { } // 融合服务--一键申请 - const handleAKeyApplication = (item) => { - let _applyList = [] - ; (item.fuseResourceList || []).map((v) => { - let resource = v.resource || {} - let obj = { - arr: [ - { - delFlag: resource.delFlag, - description: resource.description, - resourceId: resource.id, - resourceName: resource.name, - time: resource.createDate, - type: resource.type, - }, - ], - deptId: resource.deptId, - deptName: resource.deptName, - } - _applyList.push(obj) - }) - + // 一键申请 + const handleAKeyApplication = (item ) => { + let _applyList = []; + let fuseResourceList = item.fuseResourceList || [] + let jcssArray = fuseResourceList.filter(v => v.type === '基础设施') + let otherArray = fuseResourceList.filter(v => v.type !== '基础设施') + jcssArray = jcssArray.map(v => { + v = Object.assign(v, v.resource) + return v + }) + let jcss = [ + { + arr: [ + { + description: '', + note1: JSON.stringify(jcssArray), + resourceId: '1522550195055828996', + resourceName: '摄像头列表', + type: '基础设施', + }, + ], + deptId: '', + deptName: '', + }, + ] + if (infrastructure) { + jcss[0].deptId = infrastructure.deptId + jcss[0].deptName = infrastructure.deptName + } + otherArray.map((v) => { + let resource = v.resource || {} + console.log('resource------------>', resource); + let obj = { + arr: [ + { + delFlag: resource.delFlag, + description: resource.description, + resourceId: resource.id, + resourceName: resource.name, + time: resource.createDate, + type: resource.type, + }, + ], + deptId: resource.deptId, + deptName: resource.deptName, + } + _applyList.push(obj) + }) + _applyList = jcss.concat(_applyList) localStorage.setItem('applyList', JSON.stringify(_applyList)) router.push({ path: '/apply', }) } + // const handleAKeyApplication = (item) => { + // let _applyList = [] + // ; (item.fuseResourceList || []).map((v) => { + // let resource = v.resource || {} + // let obj = { + // arr: [ + // { + // delFlag: resource.delFlag, + // description: resource.description, + // resourceId: resource.id, + // resourceName: resource.name, + // time: resource.createDate, + // type: resource.type, + // }, + // ], + // deptId: resource.deptId, + // deptName: resource.deptName, + // } + // _applyList.push(obj) + // }) + + // localStorage.setItem('applyList', JSON.stringify(_applyList)) + // router.push({ + // path: '/apply', + // }) + // } + mybus.on('chongzhi', (typeObj) => { console.log('typeObj------------>', typeObj) if (!typeObj) { diff --git a/front/src/views/home/packagingDetails.vue b/front/src/views/home/packagingDetails.vue index 29f6282a..6cf964cc 100644 --- a/front/src/views/home/packagingDetails.vue +++ b/front/src/views/home/packagingDetails.vue @@ -23,13 +23,14 @@
描述：{{ detailInfoObj.description || '--' }}
- + 申请使用 - + @@ -67,6 +68,7 @@ import packageAbilityList from '@/views/home/components/packageAbilityList.vue' import { message } from 'ant-design-vue' import { getIntegrationDetail } from '@/api/home' import HomeHeader from '@/views/home/components/header' +import { scInsert, scDel } from '@/api/personalCenter' const router = useRouter() const id = router.currentRoute.value.query.id @@ -102,6 +104,8 @@ const getIntegrationServicesDeatil = (id) => { return message.error(res.data.msg) } detailInfoObj.value = res.data.data || {} + console.log('detailInfoObj------------>', detailInfoObj); + let fuseResourceList = detailInfoObj.value.fuseResourceList || [] abilityList.value.map(v => { let list = fuseResourceList.filter(x => x.type == v.name) || []; @@ -116,6 +120,104 @@ const getIntegrationServicesDeatil = (id) => { } ) } + +// 一键申请 +const handleAKeyApplication = () => { + let _applyList = []; + let fuseResourceList = detailInfoObj.value.fuseResourceList || [] + let jcssArray = fuseResourceList.filter(v => v.type === '基础设施') + let otherArray = fuseResourceList.filter(v => v.type !== '基础设施') + jcssArray = jcssArray.map(v => { + v = Object.assign(v, v.resource) + return v + }) + let jcss = [ + { + arr: [ + { + description: '', + note1: JSON.stringify(jcssArray), + resourceId: '1522550195055828996', + resourceName: '摄像头列表', + type: '基础设施', + }, + ], + deptId: '', + deptName: '', + }, + ] + if (infrastructure) { + jcss[0].deptId = infrastructure.deptId + jcss[0].deptName = infrastructure.deptName + } + otherArray.map((v) => { + let resource = v.resource || {} + console.log('resource------------>', resource); + let obj = { + arr: [ + { + delFlag: resource.delFlag, + description: resource.description, + resourceId: resource.id, + resourceName: resource.name, + time: resource.createDate, + type: resource.type, + }, + ], + deptId: resource.deptId, + deptName: resource.deptName, + } + _applyList.push(obj) + }) + _applyList = jcss.concat(_applyList) + localStorage.setItem('applyList', JSON.stringify(_applyList)) + router.push({ + path: '/apply', + }) +} + +const dataPosting = ref(true) +const addCollect = () => { + if (dataPosting.value && detailInfoObj.value.id) { + dataPosting.value = false + if (detailInfoObj.value.isCollect == 'true') { + scDel([detailInfoObj.value.id]).then((res) => { + if (res.data.msg === 'success') { + message.success('取消成功') + detailInfoObj.value.isCollect = 'false' + detailInfoObj.value.collectCount-- + dataPosting.value = true + console.log('收藏2===============>', res.data, dataPosting.value) + getIntegrationServicesDeatil(id) + } + }) + .catch(err => { + console.log('err------------>', err); + message.success(err) + }) + } else { + scInsert([ + { + resourceId: detailInfoObj.value.id, + }, + ]).then((res) => { + if (res.data.msg === 'success') { + message.success('添加收藏成功！') + detailInfoObj.value.isCollect = 'true' + detailInfoObj.value.collectCount++ + dataPosting.value = true + console.log('收藏2===============>', res.data, dataPosting.value) + getIntegrationServicesDeatil(id) + } + }) + .catch(err => { + console.log('err------------>', err); + message.success(err) + }) + } + } +} + getIntegrationServicesDeatil(id) @@ -239,4 +341,5 @@ getIntegrationServicesDeatil(id) .list-box { padding: 0.4rem; } + From 035a600a3cb58a7afb8aa74d0a1b2cb525da7939 Mon Sep 17 00:00:00 2001 From: lizhicheng2 Date: Mon, 1 Aug 2022 16:43:44 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E8=B5=8B=E8=83=BD=E5=9C=BA=E6=99=AF?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/home/integrationServicesDetails.vue | 65 ++++++++++--------- 1 file changed, 36 insertions(+), 29 deletions(-) diff --git a/front/src/views/home/integrationServicesDetails.vue b/front/src/views/home/integrationServicesDetails.vue index 73c3f3cb..c792ace5 100644 --- a/front/src/views/home/integrationServicesDetails.vue +++ b/front/src/views/home/integrationServicesDetails.vue @@ -63,37 +63,38 @@
-
@@ -105,14 +106,11 @@
-
- - - -
+ + +
- @@ -271,7 +269,7 @@ })) }else if(item.title==='数据资源'){ arr=resource.map(res=>({ - id: res.resource.zycode, name: res.resource.zyname, dept: res.resource.TGBM, platform: 'UCS' + id: res.resource.zycode, name: res.resource.zyname, dept: res.resource.TGBM, platform: '共享交换平台' })) } } @@ -288,10 +286,6 @@ } getIntegrationServicesDeatil(id) - function openResourceDetail(row, column, event){ - console.log(row) - } - function handleOpenUrl(type) { let obj = (detailInfoObj.value.fuseAttrList || []).find( @@ -467,17 +461,20 @@ padding: 0.8rem 0; background: rgb(247, 248, 250); .bg { - height: 2rem; - width: 2rem; + height: 3rem; + width: 3rem; background: url('~@/assets/home/rhfw_square.png') no-repeat; background-size: 100%; margin-top: 0.3rem; } .content { - height: 2rem; + overflow: auto; + height: 3rem; width: 6rem; + margin-top: 0.3rem; .content-item { - margin: 0.1rem; + font-size: 16px; + margin: 0rem 0rem 0.1rem 0.1rem; } } } @@ -486,9 +483,9 @@ padding: 0.8rem 0; background: rgb(247, 248, 250); .content { - height: 2rem; - width: 8rem; + width: 9rem; .content-item { + font-size: 16px; margin: 0.3rem; } } @@ -499,6 +496,12 @@ background: rgb(247, 248, 250); .step-content { margin-top: 0.3rem; + /deep/ .el-step__title { + font-size: 16px; + } + /deep/ .el-step__description { + font-size: 14px; + } } } @@ -514,12 +517,16 @@ margin-top: 0.3rem; align-items: flex-start; .title { - height: 2rem; - width: 2rem; + height: 3rem; + width: 3rem; margin-right: 0.5rem; background: url('~@/assets/home/rhfw_square.png') no-repeat; background-size: 100%; } + .table { + width: 100%; + font-size: 16px + } } .name-box { From ae2e32376980cbf45181811a3204634fa07e5189 Mon Sep 17 00:00:00 2001 From: lizhicheng2 Date: Mon, 1 Aug 2022 17:05:40 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E8=9E=8D=E5=90=88=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E5=88=97=E8=A1=A8bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../home/components/searchResultList.vue | 23 +++++++++++-------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/front/src/views/home/components/searchResultList.vue b/front/src/views/home/components/searchResultList.vue index f755cb77..7e97ba24 100644 --- a/front/src/views/home/components/searchResultList.vue +++ b/front/src/views/home/components/searchResultList.vue @@ -10,7 +10,7 @@ }}
-
    +
    • {{ item.name }} @@ -42,7 +42,7 @@
+ v-else-if="(selectCardsname === '融合服务' || selectCardsname === '赋能场景') && item.fuseAttrList && item.fuseAttrList.filter((val) => val.attrType == '服务图片')[0]">
@@ -72,10 +72,10 @@ ? 'ywzj' : '' " v-else-if=" - selectCardsname !== '基础设施' && selectCardsname !== '融合服务' + selectCardsname !== '基础设施' && selectCardsname !== '融合服务' && selectCardsname !== '赋能场景' ">
-
+
@@ -95,7 +95,7 @@
-
+