diff --git a/front/public/index.html b/front/public/index.html index 946baa4a..20fff5c7 100644 --- a/front/public/index.html +++ b/front/public/index.html @@ -1,8 +1,8 @@ @@ -48,22 +48,22 @@ // window.SITE_CONFIG['websocketURL'] = '15.2.21.243:8888/renren-admin'; // window.SITE_CONFIG['POI_URL'] = 'http://15.2.21.238:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address'; // 西海岸版本 - // window.SITE_CONFIG['backUrl'] = 'http://10.134.135.9:9797'; - // window.SITE_CONFIG['previewUrl'] = 'http://10.134.135.9:9796/'; - // window.SITE_CONFIG['frontUrl'] = 'http://10.134.135.9:9796/document/#/devModelFile/'; - // window.SITE_CONFIG['apiURL'] = 'http://10.134.135.9:8888/renren-admin'; + window.SITE_CONFIG['backUrl'] = 'http://10.134.135.9:9797'; + window.SITE_CONFIG['previewUrl'] = 'http://10.134.135.9:9796/'; + window.SITE_CONFIG['frontUrl'] = 'http://10.134.135.9:9796/document/#/devModelFile/'; + window.SITE_CONFIG['apiURL'] = 'http://10.134.135.9:8888/renren-admin'; // 开发 // window.SITE_CONFIG['backUrl'] = 'http://localhost:8001'; // window.SITE_CONFIG['previewUrl'] = 'http://15.2.21.236:9796/'; // window.SITE_CONFIG['frontUrl'] = 'http://15.2.21.236:9796/document/#/devModelFile/'; // window.SITE_CONFIG['apiURL'] = 'http://15.2.21.236:8888/renren-admin'; // window.SITE_CONFIG['websocketURL'] = '15.2.21.236:8888/renren-admin'; + window.SITE_CONFIG['POI_URL'] = 'http://15.2.21.238:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address'; + // window.SITE_CONFIG['backUrl'] = 'http://15.2.21.238:9797'; + // window.SITE_CONFIG['previewUrl'] = 'http://15.2.21.238:9796/'; + // window.SITE_CONFIG['frontUrl'] = 'http://15.2.21.238:9796/document/#/devModelFile/'; + // window.SITE_CONFIG['apiURL'] = 'http://15.2.21.239:8888/renren-admin'; // window.SITE_CONFIG['POI_URL'] = 'http://15.2.21.238:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address'; - window.SITE_CONFIG['backUrl'] = 'http://192.168.124.236:9797'; - window.SITE_CONFIG['previewUrl'] = 'http://192.168.124.236:9796/'; - window.SITE_CONFIG['frontUrl'] = 'http://192.168.124.236:9796/document/#/devModelFile/'; - window.SITE_CONFIG['apiURL'] = 'http://192.168.124.236:8888/renren-admin'; - window.SITE_CONFIG['POI_URL'] = 'http://192.168.124.236:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address'; // 穿透版本 // window.SITE_CONFIG['backUrl'] = 'http://124.222.94.39:9797'; // window.SITE_CONFIG['previewUrl'] = 'http://124.222.94.39:9796/'; 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 diff --git a/front/src/views/home/AbilityToApplyFor.vue b/front/src/views/home/AbilityToApplyFor.vue index c8848b7a..30218eda 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 6df54af7..57291cce 100644 --- a/front/src/views/home/apply.vue +++ b/front/src/views/home/apply.vue @@ -44,7 +44,6 @@ disabled /> - -
- -
#apply-container { // background-color: #f5f8fc; @@ -824,7 +809,6 @@ margin-right: 10px; } } - :deep(.ant-input) { border: 1px solid #e0e0e0; border-radius: 6px; @@ -857,4 +841,4 @@ justify-content: center; // position: fixed; } - + \ No newline at end of file diff --git a/front/src/views/home/components/searchResultList.vue b/front/src/views/home/components/searchResultList.vue index 531885ad..7e97ba24 100644 --- a/front/src/views/home/components/searchResultList.vue +++ b/front/src/views/home/components/searchResultList.vue @@ -10,7 +10,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 @@
-
+
@@ -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 { 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; } +