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

Merge branch 'hi-ucs-xha' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-xha

This commit is contained in:
gaoyuanwei 2022-06-14 16:28:34 +08:00
parent 22e395109f 90163aa9e3
commit 7e1eaa8410
6 changed files with 203 additions and 197 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
front/src/views/abilityStatistics/components/Footer.vue
View File

@ -2,7 +2,7 @@
<div class="footer"> <div class="footer">
<div class="fotter-son"> <div class="fotter-son">
<div class="top"> <div class="top">
<div>青岛市大数据发展管理局建设</div> <div>青岛西海岸新区大数据发展促进局建设</div>
<div class="shuxian"></div> <div class="shuxian"></div>
<div>海信网络科技股份有限公司</div> <div>海信网络科技股份有限公司</div>
</div> </div>
@ -23,12 +23,12 @@
value: '政府标识码3702000106', value: '政府标识码3702000106',
}, },
{ {
name: '版权所有：青岛市大数据发展管理局', name: '版权所有：青岛西海岸新区大数据发展促进局',
value: '地址：山东省青岛市香港中路17号市级机关办公楼', value: '地址：青岛市西海岸新区长江中路369号',
}, },
{ {
name: '电话：0532-8561234', name: '电话：0532-86986596',
value: '传真0532-2145122', value: '传真: 0532-86986596',
}, },
]) ])
</script> </script>

2
front/src/views/home/components/AbilityToRecommendBottom.vue
View File

@ -1,7 +1,7 @@
<template> <template>
<div class="ability-to-recommend"> <div class="ability-to-recommend">
<div class="ability-to-recommend-bottom"> <div class="ability-to-recommend-bottom">
<div class="botttomson-son1">青岛市大数据发展管理局</div> <div class="botttomson-son1">青岛西海岸新区大数据发展促进局</div>
<div class="botttomson-son2"> <div class="botttomson-son2">
<div> <div>
<p>地址</p> <p>地址</p>

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

@ -6,32 +6,6 @@
<span class="line"></span> <span class="line"></span>
</div> </div>
<div class="bottom"> <div class="bottom">
<div class="item">
<div class="zj">组件服务</div>
<div
class="name"
v-for="(item, index) in zjList"
:key="item.id"
:class="index == 4 ? 'name-last' : ''"
@click="selectOne(item.id)"
>
{{ index + 1 }}-{{ item.name }}
</div>
<div class="btn" @click="jumpPage('组件服务')">查看更多</div>
</div>
<div class="item">
<div class="yy">应用资源</div>
<div
class="name"
v-for="(item, index) in yyList"
:key="item.id"
:class="index == 4 ? 'name-last' : ''"
@click="selectOne(item.id)"
>
{{ index + 1 }}-{{ item.name }}
</div>
<div class="btn" @click="jumpPage('应用资源')">查看更多</div>
</div>
<div class="item"> <div class="item">
<div class="jc">基础设施</div> <div class="jc">基础设施</div>
<div class="name">1-J1-党建展示区走廊-北向</div> <div class="name">1-J1-党建展示区走廊-北向</div>
@ -41,6 +15,22 @@
<div class="name name-last">5-J5-指挥席位东北向</div> <div class="name name-last">5-J5-指挥席位东北向</div>
<div class="btn" @click="jumpPage('基础设施')">查看更多</div> <div class="btn" @click="jumpPage('基础设施')">查看更多</div>
</div> </div>
<div class="item">
<div class="zj">组件服务</div>
<div class="name" v-for="(item, index) in zjList" :key="item.id" :class="index == 4 ? 'name-last' : ''"
@click="selectOne(item.id)">
{{ index + 1 }}-{{ item.name }}
</div>
<div class="btn" @click="jumpPage('组件服务')">查看更多</div>
</div>
<div class="item">
<div class="yy">应用资源</div>
<div class="name" v-for="(item, index) in yyList" :key="item.id" :class="index == 4 ? 'name-last' : ''"
@click="selectOne(item.id)">
{{ index + 1 }}-{{ item.name }}
</div>
<div class="btn" @click="jumpPage('应用资源')">查看更多</div>
</div>
<div class="item"> <div class="item">
<div class="sj">数据资源</div> <div class="sj">数据资源</div>
<div class="name">1-扬尘数据接口</div> <div class="name">1-扬尘数据接口</div>
@ -78,167 +68,183 @@
</div> </div>
</template> </template>
<script setup> <script setup>
import { pageWithAttrs } from '@/api/home.js' import { pageWithAttrs } from '@/api/home.js'
import { ref } from 'vue' import { ref } from 'vue'
import { useRouter } from 'vue-router' import { useRouter } from 'vue-router'
import { useStore } from 'vuex' import { useStore } from 'vuex'
const store = useStore() const store = useStore()
const router = useRouter() const router = useRouter()
const zjList = ref([]) const zjList = ref([])
const yyList = ref([]) const yyList = ref([])
// const jcList = ref([]) // const jcList = ref([])
const paramsGetResources = { const paramsGetResources = {
districtId: '', districtId: '',
pageNum: 1, pageNum: 1,
pageSize: 5, pageSize: 5,
type: '', type: '',
name: '', name: '',
infoList: [], infoList: [],
orderField: 'total', // total 综合 visits 访问量 applyCount 申请量 score 评分 collectCount 收藏量 orderField: 'total', // total 综合 visits 访问量 applyCount 申请量 score 评分 collectCount 收藏量
orderType: 'DESC', // ASC 升序 DESC 降序 orderType: 'DESC', // ASC 升序 DESC 降序
} }
const getAppResources = (type, obj) => { const getAppResources = (type, obj) => {
paramsGetResources.type = type paramsGetResources.type = type
pageWithAttrs(paramsGetResources).then((res) => { pageWithAttrs(paramsGetResources).then((res) => {
console.log('查询列表============>', res.data.data.records) console.log('查询列表============>', res.data.data.records)
obj.value = res.data.data.records obj.value = res.data.data.records
}) })
} }
getAppResources('组件服务', zjList) getAppResources('组件服务', zjList)
getAppResources('应用资源', yyList) getAppResources('应用资源', yyList)
// getAppResources('基础设施', jcList) // getAppResources('基础设施', jcList)
function jumpPage(type) { function jumpPage(type) {
// 点击内存入store // 点击内存入store
store.commit('home/selectCardsData', { store.commit('home/selectCardsData', {
selectCardsnum: type, selectCardsnum: type,
}) })
console.log( console.log(
'选中===================>', '选中===================>',
store.getters['home/selectCardsnum'] store.getters['home/selectCardsnum']
) )
// router.push({ path: '/DetailsPageconetent' }) // router.push({ path: '/DetailsPageconetent' })
router.push({ router.push({
path: '/DetailsPageconetent', path: '/DetailsPageconetent',
query: { query: {
select: type, select: type,
}, },
}) })
} }
const selectOne = (id) => { const selectOne = (id) => {
console.log('点击===============》', id) console.log('点击===============》', id)
router.push({ router.push({
path: '/details', path: '/details',
query: { query: {
id: id, id: id,
}, },
}) })
} }
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
.capability-convergence { .capability-convergence {
height: 7.2rem; height: 7.2rem;
background: url('~@/assets/newHome/Convergence-bg.png') no-repeat; background: url('~@/assets/newHome/Convergence-bg.png') no-repeat;
background-size: 100%; background-size: 100%;
display: flex;
justify-content: center;
.main {
width: 13rem;
margin-top: 1.8rem;
display: flex; display: flex;
justify-content: center; flex-direction: column;
.main { flex-wrap: wrap;
width: 13rem;
margin-top: 1.8rem; .top {
font-size: 0.3rem;
color: #212121;
text-align: center;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
flex-wrap: wrap; flex-wrap: wrap;
.top { justify-content: center;
font-size: 0.3rem; align-items: center;
color: #212121;
text-align: center; .line {
display: flex; width: 0.34rem;
flex-direction: column; height: 0.03rem;
flex-wrap: wrap; background-color: #0058e1;
justify-content: center; margin-top: 0.08rem;
align-items: center; }
.line { }
width: 0.34rem;
height: 0.03rem; .bottom {
background-color: #0058e1; display: flex;
margin-top: 0.08rem; justify-content: space-between;
margin-top: 0.4rem;
.item {
width: 2.44rem;
height: 3.91rem;
font-size: 0.16rem;
background-color: #fff;
border-radius: 0.02rem;
box-shadow: 0 0.05rem 0.2rem #ccc;
div:nth-of-type(1) {
height: 1.02rem;
line-height: 1.02rem;
font-size: 0.2rem;
color: #fff;
padding-left: 0.15rem;
background-size: 100%;
}
.jc {
background: url('~@/assets/newHome/Convergence-jc.png') no-repeat;
}
.sj {
background: url('~@/assets/newHome/Convergence-sj.png') no-repeat;
}
.zj {
background: url('~@/assets/newHome/Convergence-zj.png') no-repeat;
}
.yy {
background: url('~@/assets/newHome/Convergence-yy.png') no-repeat;
}
.zs {
background: url('~@/assets/newHome/Convergence-zs.png') no-repeat;
}
.name {
height: 0.47rem;
line-height: 0.47rem;
margin: 0 0.16rem;
border-bottom: 0.01rem solid #e9e9e9;
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-line-clamp: 1;
-webkit-box-orient: vertical;
}
.name:hover {
color: #0058e1;
cursor: pointer;
}
.name-last {
border-bottom: none;
}
.btn {
cursor: pointer;
width: 0.8rem;
height: 0.24rem;
border: 0.01rem solid #0058e1;
font-size: 0.14rem;
color: #0058e1;
border-radius: 0.02rem;
text-align: center;
margin-top: 0.1rem;
margin-left: 0.85rem;
}
.btn:hover {
background: rgba(0, 88, 225, 0.3);
color: #000;
} }
} }
.bottom {
display: flex; .item:hover {
justify-content: space-between; border-radius: 0.02rem;
margin-top: 0.4rem; border: 0.01rem solid #0058e1;
.item { box-shadow: 0rem 0.08rem 0.2rem rgba(0, 88, 225, 0.3);
width: 2.44rem;
height: 3.91rem;
font-size: 0.16rem;
background-color: #fff;
border-radius: 0.02rem;
box-shadow: 0 0.05rem 0.2rem #ccc;
div:nth-of-type(1) {
height: 1.02rem;
line-height: 1.02rem;
font-size: 0.2rem;
color: #fff;
padding-left: 0.15rem;
background-size: 100%;
}
.jc {
background: url('~@/assets/newHome/Convergence-jc.png') no-repeat;
}
.sj {
background: url('~@/assets/newHome/Convergence-sj.png') no-repeat;
}
.zj {
background: url('~@/assets/newHome/Convergence-zj.png') no-repeat;
}
.yy {
background: url('~@/assets/newHome/Convergence-yy.png') no-repeat;
}
.zs {
background: url('~@/assets/newHome/Convergence-zs.png') no-repeat;
}
.name {
height: 0.47rem;
line-height: 0.47rem;
margin: 0 0.16rem;
border-bottom: 0.01rem solid #e9e9e9;
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-line-clamp: 1;
-webkit-box-orient: vertical;
}
.name:hover {
color: #0058e1;
cursor: pointer;
}
.name-last {
border-bottom: none;
}
.btn {
cursor: pointer;
width: 0.8rem;
height: 0.24rem;
border: 0.01rem solid #0058e1;
font-size: 0.14rem;
color: #0058e1;
border-radius: 0.02rem;
text-align: center;
margin-top: 0.1rem;
margin-left: 0.85rem;
}
.btn:hover {
background: rgba(0, 88, 225, 0.3);
color: #000;
}
}
.item:hover {
border-radius: 0.02rem;
border: 0.01rem solid #0058e1;
box-shadow: 0rem 0.08rem 0.2rem rgba(0, 88, 225, 0.3);
}
} }
} }
} }
}
</style> </style>

10
front/src/views/newHome/components/Footer.vue
View File

@ -2,7 +2,7 @@
<div class="footer"> <div class="footer">
<div class="fotter-son"> <div class="fotter-son">
<div class="top"> <div class="top">
<div>青岛市大数据发展管理局建设</div> <div>青岛西海岸新区大数据发展促进局建设</div>
<div class="shuxian"></div> <div class="shuxian"></div>
<div>海信网络科技股份有限公司</div> <div>海信网络科技股份有限公司</div>
</div> </div>
@ -23,12 +23,12 @@
value: '政府标识码3702000106', value: '政府标识码3702000106',
}, },
{ {
name: '版权所有：青岛市大数据发展管理局', name: '版权所有：青岛西海岸新区大数据发展促进局',
value: '地址：山东省青岛市香港中路17号市级机关办公楼', value: '地址：青岛市西海岸新区长江中路369号',
}, },
{ {
name: '电话：0532-8561234', name: '电话：0532-86986596',
value: '传真0532-2145122', value: '传真: 0532-86986596',
}, },
]) ])
</script> </script>

2
front/src/views/newHome/components/Navigation.vue
View File

@ -151,9 +151,9 @@
const store = useStore() const store = useStore()
const router = useRouter() const router = useRouter()
const topList = ref([ const topList = ref([
'基础设施',
'组件服务', '组件服务',
'应用资源', '应用资源',
'基础设施',
'数据资源', '数据资源',
// '知识库', // '知识库',
]) ])

16
front/src/views/newHome/components/Navigation2.vue
View File

@ -1,5 +1,13 @@
<template> <template>
<div class="navigation2"> <div class="navigation2">
<div class="item">
<div class="img jc"></div>
<div class="name">基础设施</div>
<div class="sl">
<span class="num">{{ jcNum || 0 }}</span>
个
</div>
</div>
<div class="item"> <div class="item">
<div class="img zj"></div> <div class="img zj"></div>
<div class="name">组件服务</div> <div class="name">组件服务</div>
@ -16,14 +24,6 @@
个 个
</div> </div>
</div> </div>
<div class="item">
<div class="img jc"></div>
<div class="name">基础设施</div>
<div class="sl">
<span class="num">{{ jcNum || 0 }}</span>
个
</div>
</div>
<div class="item"> <div class="item">
<div class="img sj"></div> <div class="img sj"></div>
<div class="name">数据资源</div> <div class="name">数据资源</div>