|
|
|
@ -1,19 +1,13 @@ |
|
|
|
<script lang='ts' setup> |
|
|
|
import { useUserStore } from "@/store/modules/user" |
|
|
|
<<<<<<< HEAD |
|
|
|
import { ref } from 'vue' |
|
|
|
import { getUserDetail, getZxxyNavis, getTuijian, getCarousel } from '@/api/knowledge/index' |
|
|
|
import Archivestype from '@/views/knowledge/knowledge/components/archivestype.vue' |
|
|
|
import Navili from '@/views/knowledge/knowledge/components/Navili.vue' |
|
|
|
import KnowledgeContent from '@/views/knowledge/knowledge/components/KnowledgeContent.vue' |
|
|
|
======= |
|
|
|
|
|
|
|
|
|
|
|
import { ref } from 'vue' |
|
|
|
import { getUserDetail, getZxxyNavis, getTuijian, getCarousel } from '@/api/knowledge/index' |
|
|
|
import Archivestype from '@/views/knowledge/knowledge/components/archivestype.vue' |
|
|
|
import Navili from './components/Navili.vue' |
|
|
|
import KnowledgeContent from './components/KnowledgeContent.vue' |
|
|
|
>>>>>>> v3 |
|
|
|
|
|
|
|
import { UserQuery, UserDetail, NaviQuery, Navi, Graphicform, PageParam } from '@/api/knowledge/types' |
|
|
|
import { onScroll, scrollTo, formatDate } from '@/api/knowledge/scroll' |
|
|
|
import { useRouter } from 'vue-router' |
|
|
|
@ -26,10 +20,6 @@ const userStore = useUserStore(); |
|
|
|
const { userKey, userToken } = userStore; |
|
|
|
|
|
|
|
|
|
|
|
<<<<<<< HEAD |
|
|
|
|
|
|
|
======= |
|
|
|
>>>>>>> v3 |
|
|
|
const userDetail = ref<UserDetail>({ |
|
|
|
//证件号码 |
|
|
|
idcardno: ["1", "2"], |
|
|
|
@ -47,10 +37,9 @@ const userDetail = ref<UserDetail>({ |
|
|
|
const tuijianPage = ref<Graphicform[]>(); |
|
|
|
|
|
|
|
const naviList = ref<Navi[]>(); |
|
|
|
<<<<<<< HEAD |
|
|
|
======= |
|
|
|
|
|
|
|
const naviList1 = ref<Navi[]>(); |
|
|
|
>>>>>>> v3 |
|
|
|
|
|
|
|
//用户信息查询参数 |
|
|
|
const userQueryParam = reactive<UserQuery>({ |
|
|
|
userkey: userKey, |
|
|
|
@ -59,11 +48,10 @@ const userQueryParam = reactive<UserQuery>({ |
|
|
|
//navi查询参数 |
|
|
|
const naviQueryParam = reactive<NaviQuery>({ |
|
|
|
atParentId: "",//知识库 |
|
|
|
<<<<<<< HEAD |
|
|
|
======= |
|
|
|
|
|
|
|
userkey: userKey, |
|
|
|
usertoken: userToken, |
|
|
|
>>>>>>> v3 |
|
|
|
|
|
|
|
}); |
|
|
|
const pageParamTuijian = reactive<PageParam>({ |
|
|
|
total: 0, |
|
|
|
@ -86,11 +74,9 @@ function errorImg(e: any) { |
|
|
|
e.srcElement.onerror = null; //防止闪图 |
|
|
|
} |
|
|
|
const fatherisReady = ref(0); |
|
|
|
<<<<<<< HEAD |
|
|
|
const router = useRouter() |
|
|
|
const routerUrl = toRaw(router).currentRoute.value.fullPath |
|
|
|
onBeforeMount(() => { |
|
|
|
======= |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
const router = useRouter() |
|
|
|
const routerUrl = toRaw(router).currentRoute.value.fullPath |
|
|
|
@ -100,7 +86,7 @@ onBeforeMount(() => { |
|
|
|
.then(({ data }) => { |
|
|
|
userDetail.value = data |
|
|
|
}); |
|
|
|
>>>>>>> v3 |
|
|
|
|
|
|
|
|
|
|
|
}) |
|
|
|
|
|
|
|
@ -119,7 +105,6 @@ onMounted(() => { |
|
|
|
getZxxyNavis(naviQueryParam) |
|
|
|
.then(({ data }) => { |
|
|
|
naviList.value = data |
|
|
|
<<<<<<< HEAD |
|
|
|
//console.log(naviList.value) |
|
|
|
|
|
|
|
}).finally(() => { |
|
|
|
@ -131,30 +116,22 @@ onMounted(() => { |
|
|
|
.then(({ data }) => { |
|
|
|
userDetail.value = data |
|
|
|
//console.log(userDetail.value) |
|
|
|
}); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
======= |
|
|
|
}).finally(() => { |
|
|
|
}).finally(() => { |
|
|
|
fatherisReady.value = 100; |
|
|
|
}) |
|
|
|
>>>>>>> v3 |
|
|
|
|
|
|
|
//推荐 |
|
|
|
getTuijian(pageParamTuijian) |
|
|
|
.then(({ data }) => { |
|
|
|
tuijianPage.value = data.list |
|
|
|
pageParamTuijian.page = data.pageNum |
|
|
|
pageParamTuijian.total = data.total |
|
|
|
<<<<<<< HEAD |
|
|
|
//console.log(tuijianPage.value) |
|
|
|
======= |
|
|
|
>>>>>>> v3 |
|
|
|
|
|
|
|
}); |
|
|
|
getCarousel(pageParamTuijian) |
|
|
|
.then(({ data }) => { |
|
|
|
carousel.value = data.list |
|
|
|
<<<<<<< HEAD |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//console.log(tuijianPage.value) |
|
|
|
@ -165,12 +142,11 @@ onMounted(() => { |
|
|
|
//setTimeout(function(){ fatherisReady.value = 100;}, 3000); //三秒之后执行函数 |
|
|
|
|
|
|
|
}); |
|
|
|
======= |
|
|
|
}); |
|
|
|
}); |
|
|
|
|
|
|
|
|
|
|
|
>>>>>>> v3 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
function jsScroll() { |
|
|
|
active.value = onScroll(); |
|
|
|
} |
|
|
|
@ -186,46 +162,29 @@ function handleCurrentChange() { |
|
|
|
tuijianPage.value = data.list |
|
|
|
pageParamTuijian.page = data.pageNum |
|
|
|
pageParamTuijian.total = data.total |
|
|
|
<<<<<<< HEAD |
|
|
|
|
|
|
|
//console.log(tuijianPage.value) |
|
|
|
======= |
|
|
|
>>>>>>> v3 |
|
|
|
}); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
//dialog |
|
|
|
const cardContentSource = ref<Graphicform>({}); |
|
|
|
<<<<<<< HEAD |
|
|
|
const showContentBox= ref(false); //详情弹窗 |
|
|
|
function showContentDialog(item:any){ |
|
|
|
|
|
|
|
showContentBox.value = true; |
|
|
|
cardContentSource.value=item; |
|
|
|
======= |
|
|
|
const showContentBox = ref(false); //详情弹窗 |
|
|
|
|
|
|
|
function showContentDialog(item: any) { |
|
|
|
showContentBox.value = true; |
|
|
|
cardContentSource.value = item; |
|
|
|
>>>>>>> v3 |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
</script> |
|
|
|
<template> |
|
|
|
<<<<<<< HEAD |
|
|
|
<div class="know-main"> |
|
|
|
<KnowledgeContent v-model:isShow="showContentBox" :contentSource="cardContentSource"></KnowledgeContent> |
|
|
|
<!-- 内容区域 --> |
|
|
|
<div class="content" style="margin-left: 10% ;padding-right: 15%;"> |
|
|
|
======= |
|
|
|
|
|
|
|
<div class="app-container"> |
|
|
|
<KnowledgeContent v-model:isShow="showContentBox" :contentSource="cardContentSource"></KnowledgeContent> |
|
|
|
<!-- 内容区域 --> |
|
|
|
<div class="content"> |
|
|
|
>>>>>>> v3 |
|
|
|
|
|
|
|
|
|
|
|
<div class="models "> |
|
|
|
|
|
|
|
@ -234,27 +193,20 @@ function showContentDialog(item: any) { |
|
|
|
|
|
|
|
</div> |
|
|
|
<div class="grid-tuijian"> |
|
|
|
<<<<<<< HEAD |
|
|
|
<el-carousel indicator-position="outside" class="mycarousel" style="width: 412px;height:290px; " arrow="always"> |
|
|
|
<el-carousel-item v-for="(item, index) in carousel" :key="index" > |
|
|
|
<!-- <h3 text="2xl" justify="center">{{ item.gThumbnail }}</h3> --> |
|
|
|
<img style="width: 412px; height: 300px;border-radius:16px;margin-top: 4px; margin-left: 4px;" |
|
|
|
======= |
|
|
|
|
|
|
|
<el-carousel indicator-position="outside" class="mycarousel" arrow="always"> |
|
|
|
<el-carousel-item v-for="(item, index) in carousel" :key="index" @click="showContentDialog(item)"> |
|
|
|
|
|
|
|
<img style="width: 495px; height: 300px;border-radius:16px;margin-top: 4px; margin-left: 4px;" |
|
|
|
>>>>>>> v3 |
|
|
|
|
|
|
|
referrerpolicy="no-referrer" :src="item.gThumbnail" fit="fill" loading="lazy" @error="errorImg($event)" /> |
|
|
|
</el-carousel-item> |
|
|
|
</el-carousel> |
|
|
|
|
|
|
|
<div v-for="(item, index) in tuijianPage" :key="index" class="tuijian-card" @click="showContentDialog(item)"> |
|
|
|
<<<<<<< HEAD |
|
|
|
<img style="width: 140px; height: 126px;border-radius:8px;margin-top: 4px; margin-left: 4px;" |
|
|
|
======= |
|
|
|
|
|
|
|
<img style="width: 170px; height: 126px;border-radius:8px;margin-top: 4px; margin-left: 4px;" |
|
|
|
>>>>>>> v3 |
|
|
|
|
|
|
|
referrerpolicy="no-referrer" :src="item.gThumbnail" fit="fill" loading="lazy" @error="errorImg($event)" /> |
|
|
|
|
|
|
|
<div class="card-right"> |
|
|
|
@ -273,7 +225,7 @@ function showContentDialog(item: any) { |
|
|
|
</div> |
|
|
|
|
|
|
|
</div> |
|
|
|
<<<<<<< HEAD |
|
|
|
|
|
|
|
<el-pagination |
|
|
|
v-if="pageParamTuijian.total > 0" v-model:current-page="pageParamTuijian.page" |
|
|
|
v-model:page-size="pageParamTuijian.pagesize" layout="prev, pager, next, jumper" :total="pageParamTuijian.total" class="pagi" |
|
|
|
@ -282,58 +234,37 @@ v-if="pageParamTuijian.total > 0" v-model:current-page="pageParamTuijian.page" |
|
|
|
<!-- 各知识/新闻分区 --> |
|
|
|
<Archivestype v-for="(item, index) in naviList" :key="index" :fatherisReady="fatherisReady" :liContent=item :index=(index) :routerUrl="routerUrl"> |
|
|
|
</Archivestype> |
|
|
|
======= |
|
|
|
<el-pagination class="pagi" v-model:current-page="pageParamTuijian.page" v-if="pageParamTuijian.total > 0" |
|
|
|
v-model:page-size="pageParamTuijian.pagesize" layout="prev, pager, next, jumper" :total="pageParamTuijian.total" |
|
|
|
@current-change="handleCurrentChange" /> |
|
|
|
</div> |
|
|
|
<!-- 各知识/新闻分区 --> |
|
|
|
|
|
|
|
<template v-for="(item, index) in naviList"> |
|
|
|
<Archivestype :liContent=item :index=(index) :fatherisReady="fatherisReady" :routerUrl="routerUrl"></Archivestype> |
|
|
|
</template> |
|
|
|
|
|
|
|
>>>>>>> v3 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
</div> |
|
|
|
<<<<<<< HEAD |
|
|
|
|
|
|
|
|
|
|
|
<!-- 导航区域 --> |
|
|
|
======= |
|
|
|
|
|
|
|
|
|
|
|
<!-- 导航区域 --> |
|
|
|
|
|
|
|
>>>>>>> v3 |
|
|
|
|
|
|
|
<ul class="navs"> |
|
|
|
<li :class="{ active: active === 0 }" @click="scrollTo(0)"> |
|
|
|
推荐 |
|
|
|
</li> |
|
|
|
<<<<<<< HEAD |
|
|
|
|
|
|
|
<Navili v-for="(item, index) in naviList" :key="index" :class="{ active: active === index+1 }" :oneli=item :index=(index+1) |
|
|
|
:active=active @click="scrollTo(index+1)"></Navili> |
|
|
|
|
|
|
|
</ul> |
|
|
|
|
|
|
|
</div> |
|
|
|
|
|
|
|
======= |
|
|
|
|
|
|
|
<template v-for="(item, index) in naviList"> |
|
|
|
<Navili :class="{ active: active === index+1 }" :oneli=item :index=(index+1) v-if="item.hasCard" :active=active |
|
|
|
@click="scrollTo(index + 1)"></Navili> |
|
|
|
</template> |
|
|
|
|
|
|
|
</ul> |
|
|
|
</div> |
|
|
|
>>>>>>> v3 |
|
|
|
</template> |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<style scoped> |
|
|
|
<<<<<<< HEAD |
|
|
|
|
|
|
|
/* 内容区的样式 */ |
|
|
|
.content { |
|
|
|
background-color: white; |
|
|
|
@ -352,15 +283,15 @@ v-if="pageParamTuijian.total > 0" v-model:current-page="pageParamTuijian.page" |
|
|
|
.navs { |
|
|
|
position: fixed; |
|
|
|
top: 100px; |
|
|
|
======= |
|
|
|
.content { |
|
|
|
background-color: white; |
|
|
|
width: 89.1%; |
|
|
|
margin-left: 190px; |
|
|
|
box-shadow: rgba(0, 0, 0, 0.24) 0px 3px 8px; |
|
|
|
border-radius: 5px; |
|
|
|
} |
|
|
|
|
|
|
|
.content { |
|
|
|
background-color: white; |
|
|
|
width: 89.1%; |
|
|
|
margin-left: 190px; |
|
|
|
box-shadow: rgba(0, 0, 0, 0.24) 0px 3px 8px; |
|
|
|
border-radius: 5px; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@ -373,25 +304,25 @@ v-if="pageParamTuijian.total > 0" v-model:current-page="pageParamTuijian.page" |
|
|
|
position: fixed; |
|
|
|
height: auto; |
|
|
|
top: 95px; |
|
|
|
>>>>>>> v3 |
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
.navs li { |
|
|
|
|
|
|
|
<<<<<<< HEAD |
|
|
|
|
|
|
|
padding: 0 40px; |
|
|
|
line-height: 2.6; |
|
|
|
font-size: 15px; |
|
|
|
color: #909399; |
|
|
|
======= |
|
|
|
|
|
|
|
text-align: center; |
|
|
|
line-height: 3; |
|
|
|
font-size: 15.5px; |
|
|
|
color: #909399; |
|
|
|
background-color: white; |
|
|
|
margin-right: 15px; |
|
|
|
>>>>>>> v3 |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
.navs li:hover { |
|
|
|
@ -405,23 +336,19 @@ v-if="pageParamTuijian.total > 0" v-model:current-page="pageParamTuijian.page" |
|
|
|
} |
|
|
|
|
|
|
|
.model-title { |
|
|
|
<<<<<<< HEAD |
|
|
|
======= |
|
|
|
|
|
|
|
margin-top: -9px; |
|
|
|
>>>>>>> v3 |
|
|
|
|
|
|
|
height: 30px; |
|
|
|
} |
|
|
|
|
|
|
|
.grid-tuijian { |
|
|
|
<<<<<<< HEAD |
|
|
|
display: grid; |
|
|
|
grid-template-columns: repeat(auto-fill, 415px); |
|
|
|
======= |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
display: grid; |
|
|
|
grid-template-columns: repeat(auto-fill, 484px); |
|
|
|
>>>>>>> v3 |
|
|
|
|
|
|
|
gap: 10px; |
|
|
|
grid-auto-flow: row dense; |
|
|
|
|
|
|
|
@ -429,46 +356,33 @@ v-if="pageParamTuijian.total > 0" v-model:current-page="pageParamTuijian.page" |
|
|
|
|
|
|
|
.tuijian-card { |
|
|
|
display: flex; |
|
|
|
<<<<<<< HEAD |
|
|
|
width: 412px; |
|
|
|
======= |
|
|
|
|
|
|
|
width: 481px; |
|
|
|
>>>>>>> v3 |
|
|
|
|
|
|
|
height: 140px; |
|
|
|
padding: 3px; |
|
|
|
border-radius: 8px; |
|
|
|
flex-direction: row; |
|
|
|
flex-wrap: wrap; |
|
|
|
<<<<<<< HEAD |
|
|
|
/* border:#909399 1px solid; */ |
|
|
|
/* box-shadow: rgba(99, 99, 99, 0.2) 0px 2px 8px 0px; */ |
|
|
|
======= |
|
|
|
>>>>>>> v3 |
|
|
|
box-shadow: rgba(0, 0, 0, 0.24) 0px 3px 8px; |
|
|
|
} |
|
|
|
|
|
|
|
.mycarousel { |
|
|
|
<<<<<<< HEAD |
|
|
|
grid-row-start: 1; |
|
|
|
grid-row-end: 3; |
|
|
|
border-radius: 15px; |
|
|
|
======= |
|
|
|
|
|
|
|
|
|
|
|
grid-row-start: 1; |
|
|
|
grid-row-end: 3; |
|
|
|
border-radius: 15px; |
|
|
|
width: 480px; |
|
|
|
height: 290px; |
|
|
|
>>>>>>> v3 |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
.card-right { |
|
|
|
display: flex; |
|
|
|
<<<<<<< HEAD |
|
|
|
width: 260px; |
|
|
|
======= |
|
|
|
|
|
|
|
width: 300px; |
|
|
|
>>>>>>> v3 |
|
|
|
|
|
|
|
flex-direction: column; |
|
|
|
flex-wrap: wrap; |
|
|
|
padding-left: 8px; |
|
|
|
@ -476,18 +390,6 @@ v-if="pageParamTuijian.total > 0" v-model:current-page="pageParamTuijian.page" |
|
|
|
|
|
|
|
.card-title { |
|
|
|
|
|
|
|
<<<<<<< HEAD |
|
|
|
/* height: 1.5em !important; |
|
|
|
overflow: hidden; |
|
|
|
text-overflow: ellipsis; |
|
|
|
display: -webkit-box; |
|
|
|
-webkit-line-clamp: 3; |
|
|
|
-webkit-box-orient: vertical; |
|
|
|
line-height: 25px; |
|
|
|
height: 85px; */ |
|
|
|
|
|
|
|
======= |
|
|
|
>>>>>>> v3 |
|
|
|
|
|
|
|
height: 1.5em !important; |
|
|
|
display: -webkit-box; |
|
|
|
|
