Browse Source

替换知行学院文件

liwenxuan_v2
超级管理员 2 years ago
parent
commit
3f7f3238d2
  1. 21
      src/types/components.d.ts
  2. 14
      src/views/knowledge/knowledge/components/KnowledgeContent.vue
  3. 21
      src/views/knowledge/knowledge/components/Navili.vue
  4. 148
      src/views/knowledge/knowledge/components/archivestype.vue
  5. 10
      src/views/knowledge/knowledge/index.vue
  6. 8
      src/views/knowledge/news/index.vue

21
src/types/components.d.ts

@ -18,12 +18,16 @@ declare module '@vue/runtime-core' {
CopyerDrawer: typeof import('./../components/workflow/drwer/copyerDrawer.vue')['default'] CopyerDrawer: typeof import('./../components/workflow/drwer/copyerDrawer.vue')['default']
DiyIconfont: typeof import('./../components/DesignForm/public/expand/diy-iconfont.vue')['default'] DiyIconfont: typeof import('./../components/DesignForm/public/expand/diy-iconfont.vue')['default']
DragControl: typeof import('./../components/DesignForm/dragControl.vue')['default'] DragControl: typeof import('./../components/DesignForm/dragControl.vue')['default']
ElAlert: typeof import('element-plus/es')['ElAlert']
ElAside: typeof import('element-plus/es')['ElAside'] ElAside: typeof import('element-plus/es')['ElAside']
ElAvatar: typeof import('element-plus/es')['ElAvatar'] ElAvatar: typeof import('element-plus/es')['ElAvatar']
ElBreadcrumb: typeof import('element-plus/es')['ElBreadcrumb'] ElBreadcrumb: typeof import('element-plus/es')['ElBreadcrumb']
ElBreadcrumbItem: typeof import('element-plus/es')['ElBreadcrumbItem'] ElBreadcrumbItem: typeof import('element-plus/es')['ElBreadcrumbItem']
ElButton: typeof import('element-plus/es')['ElButton'] ElButton: typeof import('element-plus/es')['ElButton']
ElButtonGroup: typeof import('element-plus/es')['ElButtonGroup']
ElCard: typeof import('element-plus/es')['ElCard'] ElCard: typeof import('element-plus/es')['ElCard']
ElCarousel: typeof import('element-plus/es')['ElCarousel']
ElCarouselItem: typeof import('element-plus/es')['ElCarouselItem']
ElCascader: typeof import('element-plus/es')['ElCascader'] ElCascader: typeof import('element-plus/es')['ElCascader']
ElCheckbox: typeof import('element-plus/es')['ElCheckbox'] ElCheckbox: typeof import('element-plus/es')['ElCheckbox']
ElCheckboxGroup: typeof import('element-plus/es')['ElCheckboxGroup'] ElCheckboxGroup: typeof import('element-plus/es')['ElCheckboxGroup']
@ -32,6 +36,7 @@ declare module '@vue/runtime-core' {
ElCollapseItem: typeof import('element-plus/es')['ElCollapseItem'] ElCollapseItem: typeof import('element-plus/es')['ElCollapseItem']
ElColorPicker: typeof import('element-plus/es')['ElColorPicker'] ElColorPicker: typeof import('element-plus/es')['ElColorPicker']
ElContainer: typeof import('element-plus/es')['ElContainer'] ElContainer: typeof import('element-plus/es')['ElContainer']
ElDatePicker: typeof import('element-plus/es')['ElDatePicker']
ElDescriptions: typeof import('element-plus/es')['ElDescriptions'] ElDescriptions: typeof import('element-plus/es')['ElDescriptions']
ElDescriptionsItem: typeof import('element-plus/es')['ElDescriptionsItem'] ElDescriptionsItem: typeof import('element-plus/es')['ElDescriptionsItem']
ElDialog: typeof import('element-plus/es')['ElDialog'] ElDialog: typeof import('element-plus/es')['ElDialog']
@ -43,7 +48,9 @@ declare module '@vue/runtime-core' {
ElForm: typeof import('element-plus/es')['ElForm'] ElForm: typeof import('element-plus/es')['ElForm']
ElFormItem: typeof import('element-plus/es')['ElFormItem'] ElFormItem: typeof import('element-plus/es')['ElFormItem']
ElIcon: typeof import('element-plus/es')['ElIcon'] ElIcon: typeof import('element-plus/es')['ElIcon']
ElImage: typeof import('element-plus/es')['ElImage']
ElInput: typeof import('element-plus/es')['ElInput'] ElInput: typeof import('element-plus/es')['ElInput']
ElInputNumber: typeof import('element-plus/es')['ElInputNumber']
ElLink: typeof import('element-plus/es')['ElLink'] ElLink: typeof import('element-plus/es')['ElLink']
ElMain: typeof import('element-plus/es')['ElMain'] ElMain: typeof import('element-plus/es')['ElMain']
ElMenu: typeof import('element-plus/es')['ElMenu'] ElMenu: typeof import('element-plus/es')['ElMenu']
@ -52,10 +59,12 @@ declare module '@vue/runtime-core' {
ElPagination: typeof import('element-plus/es')['ElPagination'] ElPagination: typeof import('element-plus/es')['ElPagination']
ElPopover: typeof import('element-plus/es')['ElPopover'] ElPopover: typeof import('element-plus/es')['ElPopover']
ElRadio: typeof import('element-plus/es')['ElRadio'] ElRadio: typeof import('element-plus/es')['ElRadio']
ElRadioButton: typeof import('element-plus/es')['ElRadioButton']
ElRadioGroup: typeof import('element-plus/es')['ElRadioGroup'] ElRadioGroup: typeof import('element-plus/es')['ElRadioGroup']
ElRow: typeof import('element-plus/es')['ElRow'] ElRow: typeof import('element-plus/es')['ElRow']
ElScrollbar: typeof import('element-plus/es')['ElScrollbar'] ElScrollbar: typeof import('element-plus/es')['ElScrollbar']
ElSelect: typeof import('element-plus/es')['ElSelect'] ElSelect: typeof import('element-plus/es')['ElSelect']
ElSpace: typeof import('element-plus/es')['ElSpace']
ElSubMenu: typeof import('element-plus/es')['ElSubMenu'] ElSubMenu: typeof import('element-plus/es')['ElSubMenu']
ElSwitch: typeof import('element-plus/es')['ElSwitch'] ElSwitch: typeof import('element-plus/es')['ElSwitch']
ElTable: typeof import('element-plus/es')['ElTable'] ElTable: typeof import('element-plus/es')['ElTable']
@ -67,6 +76,7 @@ declare module '@vue/runtime-core' {
ElTimePicker: typeof import('element-plus/es')['ElTimePicker'] ElTimePicker: typeof import('element-plus/es')['ElTimePicker']
ElTooltip: typeof import('element-plus/es')['ElTooltip'] ElTooltip: typeof import('element-plus/es')['ElTooltip']
ElTree: typeof import('element-plus/es')['ElTree'] ElTree: typeof import('element-plus/es')['ElTree']
ElTreeSelect: typeof import('element-plus/es')['ElTreeSelect']
ElUpload: typeof import('element-plus/es')['ElUpload'] ElUpload: typeof import('element-plus/es')['ElUpload']
EmployeesDialog: typeof import('./../components/workflow/dialog/employeesDialog.vue')['default'] EmployeesDialog: typeof import('./../components/workflow/dialog/employeesDialog.vue')['default']
EmployeesRoleDialog: typeof import('./../components/workflow/dialog/employeesRoleDialog.vue')['default'] EmployeesRoleDialog: typeof import('./../components/workflow/dialog/employeesRoleDialog.vue')['default']
@ -87,15 +97,26 @@ declare module '@vue/runtime-core' {
HeadToolsNew: typeof import('./../components/DesignForm/public/headToolsNew.vue')['default'] HeadToolsNew: typeof import('./../components/DesignForm/public/headToolsNew.vue')['default']
IconSelect: typeof import('./../components/IconSelect/index.vue')['default'] IconSelect: typeof import('./../components/IconSelect/index.vue')['default']
IEpCaretBottom: typeof import('~icons/ep/caret-bottom')['default'] IEpCaretBottom: typeof import('~icons/ep/caret-bottom')['default']
IEpCaretTop: typeof import('~icons/ep/caret-top')['default']
IEpClose: typeof import('~icons/ep/close')['default'] IEpClose: typeof import('~icons/ep/close')['default']
IEpCollection: typeof import('~icons/ep/collection')['default']
IEpDelete: typeof import('~icons/ep/delete')['default'] IEpDelete: typeof import('~icons/ep/delete')['default']
IEpDownload: typeof import('~icons/ep/download')['default']
IEpEdit: typeof import('~icons/ep/edit')['default'] IEpEdit: typeof import('~icons/ep/edit')['default']
IEpMessageBox: typeof import('~icons/ep/message-box')['default'] IEpMessageBox: typeof import('~icons/ep/message-box')['default']
IEpMinus: typeof import('~icons/ep/minus')['default']
IEpOperation: typeof import('~icons/ep/operation')['default'] IEpOperation: typeof import('~icons/ep/operation')['default']
IEpPicture: typeof import('~icons/ep/picture')['default']
IEpPlus: typeof import('~icons/ep/plus')['default'] IEpPlus: typeof import('~icons/ep/plus')['default']
IEpPosition: typeof import('~icons/ep/position')['default']
IEpRefresh: typeof import('~icons/ep/refresh')['default'] IEpRefresh: typeof import('~icons/ep/refresh')['default']
IEpRefreshLeft: typeof import('~icons/ep/refresh-left')['default']
IEpSearch: typeof import('~icons/ep/search')['default'] IEpSearch: typeof import('~icons/ep/search')['default']
IEpSetting: typeof import('~icons/ep/setting')['default'] IEpSetting: typeof import('~icons/ep/setting')['default']
IEpTop: typeof import('~icons/ep/top')['default']
IEpUploadFilled: typeof import('~icons/ep/upload-filled')['default']
IEpUser: typeof import('~icons/ep/user')['default']
IEpView: typeof import('~icons/ep/view')['default']
LangSelect: typeof import('./../components/LangSelect/index.vue')['default'] LangSelect: typeof import('./../components/LangSelect/index.vue')['default']
List: typeof import('./../components/DesignForm/public/form/components/list.vue')['default'] List: typeof import('./../components/DesignForm/public/form/components/list.vue')['default']
ListTreeSide: typeof import('./../components/DesignForm/public/form/components/listTreeSide.vue')['default'] ListTreeSide: typeof import('./../components/DesignForm/public/form/components/listTreeSide.vue')['default']

14
src/views/knowledge/knowledge/components/KnowledgeContent.vue

@ -11,10 +11,7 @@ const props = defineProps({
}, },
// eslint-disable-next-line vue/require-default-prop // eslint-disable-next-line vue/require-default-prop
contentSource: { contentSource: {
type: Object, type: Object
default:()=>{
return "";
}
}, },
}); });
const emits = defineEmits(["update:isShow"]); // const emits = defineEmits(["update:isShow"]); //
@ -47,7 +44,7 @@ watch(() => props.isShow, () => {
} else { } else {
pdfIframeShow.value = true pdfIframeShow.value = true
} }
//console.log(pdfIframeShow.value)
} }
}) })
@ -57,13 +54,8 @@ watch(() => props.isShow, () => {
<template> <template>
<el-dialog v-model="boxShow" class="dialogStyle" :show-close="true"> <el-dialog v-model="boxShow" class="dialogStyle" :show-close="true">
<<<<<<< HEAD
<template #header="{ titleId, titleClass }">
<div class="my-header">
=======
<template #header="{ close, titleId, titleClass }"> <template #header="{ close, titleId, titleClass }">
<div class="my-header" @dblclick="close"> <div class="my-header" @dblclick="close">
>>>>>>> v3_liwenxuan
<h4 :id="titleId" :class="titleClass" style="margin-top: 5px;">{{ props.contentSource?.gTitle }}</h4> <h4 :id="titleId" :class="titleClass" style="margin-top: 5px;">{{ props.contentSource?.gTitle }}</h4>
<!-- <h4 :id="titleId" :class="titleClass" style="margin-top: 5px;">{{ props.contentSource?.gContent }}</h4> --> <!-- <h4 :id="titleId" :class="titleClass" style="margin-top: 5px;">{{ props.contentSource?.gContent }}</h4> -->
</div> </div>
@ -97,4 +89,4 @@ watch(() => props.isShow, () => {
margin-top: 0% !important; margin-top: 0% !important;
padding-top: 0% !important; padding-top: 0% !important;
} }
</style> </style>

21
src/views/knowledge/knowledge/components/Navili.vue

@ -1,14 +1,11 @@
<script lang='ts' setup> <script lang='ts' setup>
const showli = ref(true); const showli = ref(true);
const props = defineProps({ const props = defineProps({
// eslint-disable-next-line vue/require-default-prop // eslint-disable-next-line vue/require-default-prop
oneli: { oneli: {
type: Object, type: Object,
default:()=>{
return "";
}
}, },
index: { index: {
@ -18,9 +15,6 @@ const props = defineProps({
active: { active: {
type: Number, type: Number,
default: 0 default: 0
<<<<<<< HEAD
=======
}, },
// eslint-disable-next-line vue/require-default-prop // eslint-disable-next-line vue/require-default-prop
knowledgeStore: { knowledgeStore: {
@ -29,22 +23,13 @@ const props = defineProps({
// eslint-disable-next-line vue/require-default-prop // eslint-disable-next-line vue/require-default-prop
fatherisReady1: { fatherisReady1: {
type: Number, type: Number,
>>>>>>> v3_liwenxuan
} }
}) })
const liIndex = props.index + 1;
</script>
</script>
<template> <template>
<<<<<<< HEAD
<li :class="{ active: active === index }" v-if="showli">
=======
<li v-if="showli" :class="{ active: active === index }"> <li v-if="showli" :class="{ active: active === index }">
>>>>>>> v3_liwenxuan
{{ oneli?.atTitle }} {{ oneli?.atTitle }}
</li> </li>
</template> </template>
<style></style> <style></style>

148
src/views/knowledge/knowledge/components/archivestype.vue

@ -1,34 +1,24 @@
<script lang='ts' setup> <script lang='ts' setup>
import { useUserStore } from "@/store/modules/user" import { useUserStore } from "@/store/modules/user"
import { ref, watch } from 'vue' import { ref, watch } from 'vue'
import { getTuijian } from '@/api/knowledge/index'
import { getUserDetail, getZxxyNavis, getTuijian } from '@/api/knowledge/index'
import KnowledgeContent from '@/views/knowledge/knowledge/components/KnowledgeContent.vue' import KnowledgeContent from '@/views/knowledge/knowledge/components/KnowledgeContent.vue'
import { UserQuery, UserDetail, NaviQuery, Navi, Graphicform, PageParam } from '@/api/knowledge/types' import { UserDetail, NaviQuery, Navi, Graphicform, PageParam, ShowTitle } from '@/api/knowledge/types'
import { formatDate } from '@/api/knowledge/scroll' import { formatDate } from '@/api/knowledge/scroll'
import { useRouter } from 'vue-router'
import errimg from '@/assets/404_images/imgNotFound.png' import errimg from '@/assets/404_images/imgNotFound.png'
import { useKnowledgeStore } from "@/store/modules/knowledge"
const showArea = ref(true); const showArea = ref(true);
const props = defineProps({ const props = defineProps({
// eslint-disable-next-line vue/require-default-prop // eslint-disable-next-line vue/require-default-prop
liContent: { liContent: {
type: Object, type: Object,
default:()=>{
return "";
}
},
<<<<<<< HEAD
======= },
// eslint-disable-next-line vue/require-default-prop // eslint-disable-next-line vue/require-default-prop
>>>>>>> v3_liwenxuan
routerUrl: { routerUrl: {
type: String, type: String,
default:""
}, },
index: { index: {
@ -44,12 +34,10 @@ const props = defineProps({
default: 0 default: 0
}, },
}) })
const userStore = useUserStore(); const userStore = useUserStore();
const { userKey, userToken } = userStore; const { userKey, userToken } = userStore;
const userDetail = ref<UserDetail>({ const userDetail = ref<UserDetail>({
// //
idcardno: ["1", "2"], idcardno: ["1", "2"],
@ -67,21 +55,11 @@ const userDetail = ref<UserDetail>({
const tuijianPage = ref<Graphicform[]>(); const tuijianPage = ref<Graphicform[]>();
/* const naviList = ref<Navi[]>(); */
/* //用户信息查询参数
const userQueryParam = reactive<UserQuery>({
userkey: userKey,
usertoken: userToken,
}); */
//navi
//navi //navi
const naviQueryParam = reactive<NaviQuery>({ const naviQueryParam = reactive<NaviQuery>({
atParentId: "",// atParentId: "",//
userkey: userKey, userkey: userKey,
usertoken: userToken, usertoken: userToken,
}); });
const pageParamTuijian = reactive<PageParam>({ const pageParamTuijian = reactive<PageParam>({
total: 0, total: 0,
@ -104,78 +82,6 @@ function errorImg(e: any) {
e.srcElement.onerror = null; // e.srcElement.onerror = null; //
} }
onMounted(() => {
//console.log(props.liContent?.gParentSun)
});
watch(() => [props.fatherisReady, props.liContent,props.routerUrl], (newVal, oldVal) => {
//console.log(newVal, oldVal); // [11, 22], [1, 2]
const routerUrl = oldVal[2] as String;
const liContent = newVal[1] as any;
//console.log(newVal[1])
//console.log(oldVal[2])
//console.log(routerUrl)
if (routerUrl?.endsWith("index")) {//
naviQueryParam.atParentId = '16213848089876281'
pageParamTuijian.archivesTypeAtParentId = '16213848089876281'
} else if (routerUrl?.endsWith("news")) {//
naviQueryParam.atParentId = '16213847972425134'
pageParamTuijian.archivesTypeAtParentId = '16213847972425134'
}
pageParamTuijian.gParentSun = liContent.atId;
//console.log(pageParamTuijian.gParentSun)
//
getTuijian(pageParamTuijian)
.then(({ data }) => {
tuijianPage.value = data.list
pageParamTuijian.page = data.pageNum
pageParamTuijian.total = data.total
if(pageParamTuijian.total>0){
showCards.value = 1;
}
});
})
/* watch(props.fatherisReady, (value) => {
console.log(props);
//childList.value = nweProps.listData
let router = useRouter()
let routerUrl = toRaw(router).currentRoute.value.fullPath
console.log(routerUrl)
if (routerUrl.endsWith("index")) {//
naviQueryParam.atParentId = '16213848089876281'
pageParamTuijian.archivesTypeAtParentId = '16213848089876281'
} else if (routerUrl.endsWith("news")) {//
naviQueryParam.atParentId = '16213847972425134'
pageParamTuijian.archivesTypeAtParentId = '16213847972425134'
}
pageParamTuijian.gParentSun = props.liContent?.gParentSun;
//
getTuijian(pageParamTuijian)
.then(({ data }) => {
tuijianPage.value = data.list
pageParamTuijian.page = data.pageNum
pageParamTuijian.total = data.total
console.log(tuijianPage.value)
});
}) */
watch(() => [props.fatherisReady, props.liContent, props.routerUrl], (newVal, oldVal) => { watch(() => [props.fatherisReady, props.liContent, props.routerUrl], (newVal, oldVal) => {
//console.log(newVal, oldVal); // [11, 22], [1, 2] //console.log(newVal, oldVal); // [11, 22], [1, 2]
const routerUrl = oldVal[2] as String; const routerUrl = oldVal[2] as String;
@ -225,7 +131,6 @@ watch(() => [props.fatherisReady, props.liContent, props.routerUrl], (newVal, ol
} }
}) })
function handleCurrentChange() { function handleCurrentChange() {
getTuijian(pageParamTuijian) getTuijian(pageParamTuijian)
@ -233,10 +138,6 @@ function handleCurrentChange() {
tuijianPage.value = data.list tuijianPage.value = data.list
pageParamTuijian.page = data.pageNum pageParamTuijian.page = data.pageNum
pageParamTuijian.total = data.total pageParamTuijian.total = data.total
console.log(tuijianPage.value)
}); });
} }
@ -246,23 +147,15 @@ const showCards = ref(0)
//dialog //dialog
const cardContentSource = ref<Graphicform>({}); const cardContentSource = ref<Graphicform>({});
const showContentBox= ref(false); //
function showContentDialog(item:any){
showContentBox.value = true;
cardContentSource.value=item;
const showContentBox = ref(false); // const showContentBox = ref(false); //
function showContentDialog(item: any) { function showContentDialog(item: any) {
showContentBox.value = true; showContentBox.value = true;
cardContentSource.value = item; cardContentSource.value = item;
} }
}
</script> </script>
<template> <template>
@ -272,25 +165,12 @@ function showContentDialog(item: any) {
<h3>{{ props.liContent?.atTitle }}</h3> <h3>{{ props.liContent?.atTitle }}</h3>
</div> </div>
<div v-show="!showCards" style="text-align: center;padding-top: 5%;">暂无数据</div> <div v-show="!showCards" style="text-align: center;padding-top: 5%;">暂无数据</div>
<<<<<<< HEAD
<div v-show="showCards" class="grid-tuijian" >
<div v-for="(item, index) in tuijianPage" :key="index" class="tuijian-card" @click="showContentDialog(item)">
<img style="width: 170px; height: 126px;border-radius:8px;margin-top: 4px; margin-left: 4px;"
referrerpolicy="no-referrer" :src="item.gThumbnail" fit="fill" loading="lazy" @error="errorImg($event)" />
=======
<div v-show="showCards" class="grid-tuijian"> <div v-show="showCards" class="grid-tuijian">
<!-- <div v-for="(item, index1) in tuijianPage" :key="index1" class="tuijian-card" @click="showContentDialog(item)"> <!-- <div v-for="(item, index1) in tuijianPage" :key="index1" class="tuijian-card" @click="showContentDialog(item)">
<img style="width: 170px; height: 126px;border-radius:8px;margin-top: 4px; margin-left: 4px;" referrerpolicy="no-referrer" :src="item.gThumbnail" fit="fill" loading="lazy" @error="errorImg($event)" /> <img style="width: 170px; height: 126px;border-radius:8px;margin-top: 4px; margin-left: 4px;" referrerpolicy="no-referrer" :src="item.gThumbnail" fit="fill" loading="lazy" @error="errorImg($event)" />
>>>>>>> v3_liwenxuan
<div class="card-right"> <div class="card-right">
<span class="card-title" :title=item.gTitle>{{ item.gTitle }}</span> <span class="card-title" :title=item.gTitle>{{ item.gTitle }}</span>
@ -332,9 +212,7 @@ function showContentDialog(item: any) {
<style> <style>
.models { .models {
width: 100%; width: 100%;
min-height: 200px;
min-height: 200px;
} }
@ -347,13 +225,7 @@ function showContentDialog(item: any) {
/* .grid-tuijian { /* .grid-tuijian {
display: grid; display: grid;
<<<<<<< HEAD
grid-template-columns: repeat(auto-fill, 484px);
=======
grid-template-columns: repeat(auto-fill, 474px); grid-template-columns: repeat(auto-fill, 474px);
>>>>>>> v3_liwenxuan
gap: 10px; gap: 10px;
grid-auto-flow: row dense; grid-auto-flow: row dense;
} */ } */
@ -369,14 +241,8 @@ h3 {
} }
.tuijian-card { .tuijian-card {
display: flex; display: flex;
<<<<<<< HEAD
width: 481px;
=======
/* width: 481px; */ /* width: 481px; */
width: 480px; width: 480px;
>>>>>>> v3_liwenxuan
height: 140px; height: 140px;
padding: 3px; padding: 3px;
border-radius: 8px; border-radius: 8px;
@ -451,4 +317,4 @@ h3 {
justify-content: center; justify-content: center;
} }
</style> </style>

10
src/views/knowledge/knowledge/index.vue

@ -185,12 +185,7 @@ function scrollTo(index: any) {
</li> </li>
<template v-for="(item, index) in naviList" :key="index"> <template v-for="(item, index) in naviList" :key="index">
<<<<<<< HEAD
<Navili :class="{ active: active === index+1 }" :oneli=item v-if="item.hasCard" :index=(index+1) :active=active
@click="scrollTo(index + 1)"></Navili>
=======
<Navili v-if="item.hasCard" :class="{ active: active === index+1 }" :oneli=item :index=(index+1) :active=active @click="scrollTo(index + 1)"></Navili> <Navili v-if="item.hasCard" :class="{ active: active === index+1 }" :oneli=item :index=(index+1) :active=active @click="scrollTo(index + 1)"></Navili>
>>>>>>> v3_liwenxuan
</template> </template>
</ul> </ul>
@ -238,13 +233,8 @@ function scrollTo(index: any) {
</div> </div>
<!-- 各知识/新闻分区 --> <!-- 各知识/新闻分区 -->
<<<<<<< HEAD
<template v-for="(item, index) in naviList" :key="index">
<Archivestype :liContent=item :index=(index) :fatherisReady="fatherisReady" :router-url="routerUrl"></Archivestype>
=======
<template v-for="(item, index) in naviList" :key="index"> <template v-for="(item, index) in naviList" :key="index">
<Archivestype :li-content=item :index=(index) :fatheris-ready="fatherisReady" :router-url="routerUrl"></Archivestype> <Archivestype :li-content=item :index=(index) :fatheris-ready="fatherisReady" :router-url="routerUrl"></Archivestype>
>>>>>>> v3_liwenxuan
</template> </template>

8
src/views/knowledge/news/index.vue

@ -185,11 +185,7 @@ function scrollTo(index: any) {
</li> </li>
<template v-for="(item, index) in naviList" :key="index"> <template v-for="(item, index) in naviList" :key="index">
<<<<<<< HEAD
<Navili v-if="item.hasCard" :oneli="item" :index="(index+1)" :active="active" :class="{ active: active === index+1 }" @click="scrollTo(index + 1)"></Navili>
=======
<Navili v-if="item.hasCard" :class="{ active: active === index+1 }" :oneli=item :index=(index+1) :active=active @click="scrollTo(index + 1)"></Navili> <Navili v-if="item.hasCard" :class="{ active: active === index+1 }" :oneli=item :index=(index+1) :active=active @click="scrollTo(index + 1)"></Navili>
>>>>>>> v3_liwenxuan
</template> </template>
</ul> </ul>
@ -237,11 +233,7 @@ function scrollTo(index: any) {
</div> </div>
<!-- 各知识/新闻分区 --> <!-- 各知识/新闻分区 -->
<<<<<<< HEAD
<template v-for="(item, index) in naviList" :key="index">
=======
<template v-for="(item, index) in naviList" :key="index"> <template v-for="(item, index) in naviList" :key="index">
>>>>>>> v3_liwenxuan
<Archivestype :li-content=item :index=(index) :fatheris-ready="fatherisReady" :router-url="routerUrl"></Archivestype> <Archivestype :li-content=item :index=(index) :fatheris-ready="fatherisReady" :router-url="routerUrl"></Archivestype>
</template> </template>

Loading…
Cancel
Save