wuhongjian
/
hi-ucs
1
0
Fork 0
Code Issues Pull Requests Projects Releases 10 Wiki Activity

首页跳转问题修改

This commit is contained in:
gongjiale 2022-10-19 10:45:15 +08:00
parent 29ace46c69
commit 55398620f0
5 changed files with 90 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
front/src/views/home/DetailsPageconetent.vue
View File

@ -262,7 +262,7 @@
</div>
</div>
<div class="top-content-father">
<infrastructurePage ref="camera" :searchValue="searchValue" />
<infrastructurePage ref="camera" :searchValue="searchValue" :searchType="searchType" />
</div>
</div>
<div class="top" v-else>
@ -494,8 +494,11 @@ export default defineComponent({
const router = useRouter()
let select = router.currentRoute.value.query.select || DETAIL_PAGE_CONTENT_DEFAULT_TAB
const select2 = router.currentRoute.value.query.select
const type2 = router.currentRoute.value.query.type
const queryName=ref('')
const str = router.currentRoute.value.query.str
const searchValue = ref(str)
const searchType= ref(str)
let tecHnosphere = router.currentRoute.value.query.tecHnosphere
let appLiCation = router.currentRoute.value.query.appLiCation
const Cardsname = ref(select)
@ -682,6 +685,7 @@ export default defineComponent({
}
ListContent.records.forEach((val) => {
if (!val) {
return
}
@ -689,6 +693,7 @@ export default defineComponent({
paramsGetResources.infoList = paramsGetResources.infoList.filter(
(item) => item.attrType !== name
)
if (
val.selectedTags &&
val.selectedTags.indexOf(tag.dict_label) == -1
@ -798,7 +803,34 @@ export default defineComponent({
ListContentCopy.value = JSON.parse(JSON.stringify(dataCopy))
ListContent.records = []
ListContent.records = JSON.parse(JSON.stringify(dataCopy))
if(select2=='组件服务'){
queryName.value='组件类型'
}else if(select2=='应用资源'){
queryName.value='应用领域'
}else{
queryName.value=''
}
ListContent.records.forEach((val) => {
if (!val) {
return
}
if (val.name === queryName.value ) {
if (
val.selectedTags &&
val.selectedTags.indexOf(type2) == -1
) {
val.selectedTags = [type2]
} else {
val.selectedTags &&
val.selectedTags.splice(
val.selectedTags.indexOf(type2),
1
)
}
}
})
// 智能算法-特殊处理
if (whoShow1.value.itShowXiHaiAn) {
if (!storageSearchInfo) {
@ -859,6 +891,7 @@ export default defineComponent({
// 校验
const re = /^[0-9\u4E00-\u9FA5]*$/
const getAppResources2 = () => {
globalFlag.value = false
if (
whoShow1.value.itShowQingDao &&
@ -1236,7 +1269,24 @@ export default defineComponent({
if (searchValue.value && !select2) {
globalSearch()
} else {
paramsGetResources.infoList=[]
if(select2=='组件服务'){
queryName.value='组件类型'
}else if(select2=='应用资源'){
queryName.value='应用领域'
}else if(select2=='基础设施'){
searchType.value=type2
}else{
queryName.value=type2
searchType.value=''
}
let info={attrType:queryName.value, attrValue: type2}
paramsGetResources.infoList.push(info)
paramsGetResources.type=select2
getAppResources2()
listKey.value++
}
}
})

1
front/src/views/home/components/integrationServiceOrder.vue
View File

@ -47,6 +47,7 @@ const integrationOrder = reactive({
// 融合服务--排序
const changeOrder = (i, val, type) => {
console.log('i, val, type------------>', i, val, type);
integrationOrder.orderField = val
integrationOrder.orderType = type;

17
front/src/views/home/components/searchResultList.vue
View File

@ -230,6 +230,21 @@
</span>
</template>
</div>
<div
v-if="
selectCardsname === '打包模式'
"
class="label-content1"
>
发布时间：
<template v-if="item.createDate">
<span>
{{ item.createDate.substring(0, 10) + ' ' }}
</span>
<span>{{ item.createDate.substring(11, 19) }}</span>
</template>
<template v-else>--</template>
</div>
<div v-else>
发布时间：
<template v-if="item.createDate">
@ -989,7 +1004,7 @@
margin: 0 10px 0 0;
.header-right {
display: flex;
// display: flex;
font-size: 14px;
color: #212121;

13
front/src/views/home/infrastructurePage.vue
View File

@ -480,6 +480,7 @@ import moment from 'moment'
const props = defineProps({
// 模糊查
searchValue: { type: String, default: '' },
searchType: { type: String, default: '' },
})
const current = ref(1)
const videoTotal = ref(0)
@ -621,6 +622,9 @@ const lookData = ref({})
if (props.searchValue) {
mapSearchParam.value.cameraName = props.searchValue
}
if (props.searchType) {
tabClick(0, props.searchType.value)
}
// 消息列表页面
let formPage = router.currentRoute.value.query.formPage || ''
// 设施类型--无人机和单兵设备
@ -834,6 +838,7 @@ const look = (row) => {
}
// 搜索
const onSearch = (searchValue) => {
debugger
searchData()
chengguoSearch()
}
@ -1127,14 +1132,6 @@ const selectType = ref('政务云资源')
let tableHeight = ref('600')
//tab切换点击事件
const tabClick = (indexFather, name) => {
console.log(
'点击tab================>',
indexFather,
name,
clickList.value,
clickList.value[indexFather]
)
selectedRowKeys.value = []
selectedList.value = []
if (clickList.value[indexFather].content.indexOf(name) != -1) {

22
front/src/views/newHome/components/CapabilityConvergence.vue
View File

@ -146,17 +146,18 @@ const getAppResources = (type, obj) => {
num: res.data.data[key],
})
}
} else if(key !== '云资源') { //云资源--暂时隐藏
}
else {
jcList.value.push({
name: key,
num: res.data.data[key],
})
}
}
jcList.value.push({
name: '会客厅',
num: 4,
})
// jcList.value.push({
// name: '会客厅',
// num: 4,
// })
// 西海岸-单兵设备、无人机 获取数量
if (whoShow1.value.itShowXiHaiAn) {
getSoldierData('无人机')
@ -328,11 +329,18 @@ const selectOne11 = (name) => {
})
}
const selectOne2 = (name) => {
console.log('点击===============》', name)
let names=''
if(name ==='云资源'){
names='政务云资源'
} else if(name ==='会客厅'){
names='城市云脑会客厅'
}else{
names=name
}
router.push({
path: '/DetailsPageconetent',
query: {
type: name,
type: names,
select: '基础设施',
},
})