diff --git a/src/types/components.d.ts b/src/types/components.d.ts
index c3e631dfd..dc75103ca 100644
--- a/src/types/components.d.ts
+++ b/src/types/components.d.ts
@@ -18,16 +18,27 @@ declare module '@vue/runtime-core' {
     CopyerDrawer: typeof import('./../components/workflow/drwer/copyerDrawer.vue')['default']
     DiyIconfont: typeof import('./../components/DesignForm/public/expand/diy-iconfont.vue')['default']
     DragControl: typeof import('./../components/DesignForm/dragControl.vue')['default']
+    ElAlert: typeof import('element-plus/es')['ElAlert']
+    ElAside: typeof import('element-plus/es')['ElAside']
     ElAvatar: typeof import('element-plus/es')['ElAvatar']
     ElBreadcrumb: typeof import('element-plus/es')['ElBreadcrumb']
     ElBreadcrumbItem: typeof import('element-plus/es')['ElBreadcrumbItem']
     ElButton: typeof import('element-plus/es')['ElButton']
+    ElButtonGroup: typeof import('element-plus/es')['ElButtonGroup']
     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']
     ElCheckbox: typeof import('element-plus/es')['ElCheckbox']
     ElCheckboxGroup: typeof import('element-plus/es')['ElCheckboxGroup']
     ElCol: typeof import('element-plus/es')['ElCol']
     ElCollapse: typeof import('element-plus/es')['ElCollapse']
     ElCollapseItem: typeof import('element-plus/es')['ElCollapseItem']
+    ElColorPicker: typeof import('element-plus/es')['ElColorPicker']
+    ElContainer: typeof import('element-plus/es')['ElContainer']
+    ElDatePicker: typeof import('element-plus/es')['ElDatePicker']
+    ElDescriptions: typeof import('element-plus/es')['ElDescriptions']
+    ElDescriptionsItem: typeof import('element-plus/es')['ElDescriptionsItem']
     ElDialog: typeof import('element-plus/es')['ElDialog']
     ElDivider: typeof import('element-plus/es')['ElDivider']
     ElDrawer: typeof import('element-plus/es')['ElDrawer']
@@ -37,26 +48,35 @@ declare module '@vue/runtime-core' {
     ElForm: typeof import('element-plus/es')['ElForm']
     ElFormItem: typeof import('element-plus/es')['ElFormItem']
     ElIcon: typeof import('element-plus/es')['ElIcon']
+    ElImage: typeof import('element-plus/es')['ElImage']
     ElInput: typeof import('element-plus/es')['ElInput']
+    ElInputNumber: typeof import('element-plus/es')['ElInputNumber']
     ElLink: typeof import('element-plus/es')['ElLink']
+    ElMain: typeof import('element-plus/es')['ElMain']
     ElMenu: typeof import('element-plus/es')['ElMenu']
     ElMenuItem: typeof import('element-plus/es')['ElMenuItem']
     ElOption: typeof import('element-plus/es')['ElOption']
     ElPagination: typeof import('element-plus/es')['ElPagination']
+    ElPopover: typeof import('element-plus/es')['ElPopover']
     ElRadio: typeof import('element-plus/es')['ElRadio']
+    ElRadioButton: typeof import('element-plus/es')['ElRadioButton']
     ElRadioGroup: typeof import('element-plus/es')['ElRadioGroup']
     ElRow: typeof import('element-plus/es')['ElRow']
     ElScrollbar: typeof import('element-plus/es')['ElScrollbar']
     ElSelect: typeof import('element-plus/es')['ElSelect']
+    ElSpace: typeof import('element-plus/es')['ElSpace']
     ElSubMenu: typeof import('element-plus/es')['ElSubMenu']
     ElSwitch: typeof import('element-plus/es')['ElSwitch']
     ElTable: typeof import('element-plus/es')['ElTable']
     ElTableColumn: typeof import('element-plus/es')['ElTableColumn']
     ElTabPane: typeof import('element-plus/es')['ElTabPane']
     ElTabs: typeof import('element-plus/es')['ElTabs']
+    ElTag: typeof import('element-plus/es')['ElTag']
+    ElText: typeof import('element-plus/es')['ElText']
     ElTimePicker: typeof import('element-plus/es')['ElTimePicker']
     ElTooltip: typeof import('element-plus/es')['ElTooltip']
     ElTree: typeof import('element-plus/es')['ElTree']
+    ElTreeSelect: typeof import('element-plus/es')['ElTreeSelect']
     ElUpload: typeof import('element-plus/es')['ElUpload']
     EmployeesDialog: typeof import('./../components/workflow/dialog/employeesDialog.vue')['default']
     EmployeesRoleDialog: typeof import('./../components/workflow/dialog/employeesRoleDialog.vue')['default']
@@ -77,8 +97,26 @@ declare module '@vue/runtime-core' {
     HeadToolsNew: typeof import('./../components/DesignForm/public/headToolsNew.vue')['default']
     IconSelect: typeof import('./../components/IconSelect/index.vue')['default']
     IEpCaretBottom: typeof import('~icons/ep/caret-bottom')['default']
+    IEpCaretTop: typeof import('~icons/ep/caret-top')['default']
     IEpClose: typeof import('~icons/ep/close')['default']
+    IEpCollection: typeof import('~icons/ep/collection')['default']
+    IEpDelete: typeof import('~icons/ep/delete')['default']
+    IEpDownload: typeof import('~icons/ep/download')['default']
+    IEpEdit: typeof import('~icons/ep/edit')['default']
+    IEpMessageBox: typeof import('~icons/ep/message-box')['default']
+    IEpMinus: typeof import('~icons/ep/minus')['default']
+    IEpOperation: typeof import('~icons/ep/operation')['default']
+    IEpPicture: typeof import('~icons/ep/picture')['default']
+    IEpPlus: typeof import('~icons/ep/plus')['default']
+    IEpPosition: typeof import('~icons/ep/position')['default']
+    IEpRefresh: typeof import('~icons/ep/refresh')['default']
+    IEpRefreshLeft: typeof import('~icons/ep/refresh-left')['default']
+    IEpSearch: typeof import('~icons/ep/search')['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']
     List: typeof import('./../components/DesignForm/public/form/components/list.vue')['default']
     ListTreeSide: typeof import('./../components/DesignForm/public/form/components/listTreeSide.vue')['default']
diff --git a/src/views/knowledge/knowledge/components/Navili.vue b/src/views/knowledge/knowledge/components/Navili.vue
index fc96a34e9..bf6b98f98 100644
--- a/src/views/knowledge/knowledge/components/Navili.vue
+++ b/src/views/knowledge/knowledge/components/Navili.vue
@@ -1,8 +1,4 @@
 <script lang='ts' setup>
-<<<<<<< HEAD
-import { scrollTo } from '@/api/knowledge/scroll'
-=======
->>>>>>> v3_liwenxuan
 
 const showli = ref(true);
 
@@ -29,12 +25,9 @@ const liIndex = props.index + 1;
 
 
 <template>
-<<<<<<< HEAD
-    <li :class="{ active: active === index }" @click="scrollTo(index)" v-if="showli">
 
-=======
     <li :class="{ active: active === index }" v-if="showli">
->>>>>>> v3_liwenxuan
+
         {{ oneli?.atTitle }}
     </li>
 </template>
diff --git a/src/views/knowledge/knowledge/components/archivestype.vue b/src/views/knowledge/knowledge/components/archivestype.vue
index d505e0676..f046b6f02 100644
--- a/src/views/knowledge/knowledge/components/archivestype.vue
+++ b/src/views/knowledge/knowledge/components/archivestype.vue
@@ -270,7 +270,7 @@ function showContentDialog(item: any) {
 
     <div v-show="!showCards" style="text-align: center;padding-top: 5%;">暂无数据</div>
 
-    <div class="grid-tuijian" v-show="showCards">
+    <div v-show="showCards" class="grid-tuijian" >
 
 
       <div v-for="(item, index) in tuijianPage" :key="index" class="tuijian-card" @click="showContentDialog(item)">
diff --git a/src/views/knowledge/knowledge/index.vue b/src/views/knowledge/knowledge/index.vue
index dfa93efc7..ee195cf0c 100644
--- a/src/views/knowledge/knowledge/index.vue
+++ b/src/views/knowledge/knowledge/index.vue
@@ -1,13 +1,11 @@
 <script lang='ts' setup>
 import { useUserStore } from "@/store/modules/user"
 
-
 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'
-
 import { UserQuery, UserDetail, NaviQuery, Navi, Graphicform, PageParam } from '@/api/knowledge/types'
 import { onScroll, formatDate } from '@/api/knowledge/scroll'
 import { useRouter } from 'vue-router'
@@ -37,9 +35,7 @@ const userDetail = ref<UserDetail>({
 const tuijianPage = ref<Graphicform[]>();
 
 const naviList = ref<Navi[]>();
-
 const naviList1 = ref<Navi[]>();
-
 //用户信息查询参数
 const userQueryParam = reactive<UserQuery>({
   userkey: userKey,
@@ -48,10 +44,8 @@ const userQueryParam = reactive<UserQuery>({
 //navi查询参数
 const naviQueryParam = reactive<NaviQuery>({
   atParentId: "",//知识库
-
   userkey: userKey,
   usertoken: userToken,
-
 });
 const pageParamTuijian = reactive<PageParam>({
   total: 0,
@@ -75,9 +69,6 @@ function errorImg(e: any) {
 }
 const fatherisReady = ref(0);
 
-
-
-
 const router = useRouter()
 const routerUrl = toRaw(router).currentRoute.value.fullPath
 onBeforeMount(() => {
@@ -87,7 +78,6 @@ onBeforeMount(() => {
       userDetail.value = data
     });
 
-
 })
 
 
@@ -124,54 +114,23 @@ onMounted(() => {
   getZxxyNavis(naviQueryParam)
     .then(({ data }) => {
       naviList.value = data
-<<<<<<< HEAD
-      //console.log(naviList.value)
-
     }).finally(() => {
       fatherisReady.value = 100;
     })
-
-  //当前登录用户详细信息
-  getUserDetail(userQueryParam)
-    .then(({ data }) => {
-      userDetail.value = data
-      //console.log(userDetail.value)
-    }).finally(() => {
-        fatherisReady.value = 100;
-      })
-
-=======
-    }).finally(() => {
-      fatherisReady.value = 100;
-    })
->>>>>>> v3_liwenxuan
   //推荐 
   getTuijian(pageParamTuijian)
     .then(({ data }) => {
       tuijianPage.value = data.list
       pageParamTuijian.page = data.pageNum
       pageParamTuijian.total = data.total
-
     });
   getCarousel(pageParamTuijian)
     .then(({ data }) => {
       carousel.value = data.list
-
-
-
-      //console.log(tuijianPage.value)
     });
-
-
-
-  //setTimeout(function(){  fatherisReady.value = 100;}, 3000);　　//三秒之后执行函数
-
 });
 
 
-
-
-
 function jsScroll() {
   active.value = onScroll();
 }
@@ -198,7 +157,6 @@ const showContentBox = ref(false);	//详情弹窗
 function showContentDialog(item: any) {
   showContentBox.value = true;
   cardContentSource.value = item;
-
 }
 
 
@@ -216,7 +174,6 @@ function scrollTo(index: any) {
 
 </script>
 <template>
-
   <div class="app-container">
 
     <!-- 导航区域 -->
@@ -228,7 +185,7 @@ function scrollTo(index: any) {
         </li>
 
         <template v-for="(item, index) in naviList">
-          <Navili :class="{ active: active === index+1 }" :oneli=item :index=(index+1) v-if="item.hasCard" :active=active
+          <Navili :class="{ active: active === index+1 }" :oneli=item v-if="item.hasCard" :index=(index+1) :active=active
           @click="scrollTo(index + 1)"></Navili>
         </template>
 
@@ -239,7 +196,6 @@ function scrollTo(index: any) {
     <!-- 内容区域 -->
     <div class="content">
 
-
       <div class="models ">
 
         <div class="model-title">
@@ -247,20 +203,16 @@ function scrollTo(index: any) {
 
         </div>
         <div class="grid-tuijian">
-
           <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;"
-
                 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)">
-
             <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 class="card-right">
@@ -279,79 +231,28 @@ function scrollTo(index: any) {
           </div>
 
         </div>
-
-        <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"
+        <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>
       <!-- 各知识/新闻分区 -->
-      <Archivestype  v-for="(item, index) in naviList" :key="index"   :fatherisReady="fatherisReady" :liContent=item :index=(index) :routerUrl="routerUrl">
-      </Archivestype>
+
+      <template v-for="(item, index) in naviList">
+        <Archivestype :liContent=item :index=(index) :fatherisReady="fatherisReady" :router-url="routerUrl"></Archivestype>
+      </template>
 
 
     </div>
     <!-- 内容详情组件 -->
     <KnowledgeContent v-model:isShow="showContentBox" :contentSource="cardContentSource"></KnowledgeContent>
 
-<<<<<<< HEAD
-    
-    <!-- 导航区域 -->
 
-
-    <!-- 导航区域 -->
-
-
-    <ul class="navs">
-      <li :class="{ active: active === 0 }" @click="scrollTo(0)">
-        推荐
-      </li>
-
-      <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>
-    
-=======
-
->>>>>>> v3_liwenxuan
   </div>
-
 </template>
 
 
 
 <style scoped>
-<<<<<<< HEAD
-
-/* 内容区的样式 */
-.content {
-  background-color: white;
-  width: 100%;
-}
-
-.models {
-  width: 100%;
-  /*  min-height: 500px; */
-
-
-}
-
-
-/* 导航栏的样式 */
-.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;
-	}
-}
-=======
 .app-container {
   height: calc(100vh - 125px);
   width: 100%;
@@ -375,7 +276,6 @@ h3 {
   margin-left: 10px;
 }
 
->>>>>>> v3_liwenxuan
 
 
 
@@ -384,27 +284,6 @@ h3 {
   width: 142px;
   position: fixed;
   height: auto;
-<<<<<<< HEAD
-  top: 95px;
-
-
-}
-
-.navs li {
-
-
-  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;
-=======
   top: 105px;
   text-align: center;
   line-height: 5;
@@ -424,7 +303,6 @@ li {
   color: #909399;
   background-color: white;
 
->>>>>>> v3_liwenxuan
 
 }
 
@@ -443,19 +321,15 @@ li:hover {
 }
 
 .model-title {
-
   margin-top: -9px;
-
   height: 30px;
 }
 
 .grid-tuijian {
 
 
-
   display: grid;
   grid-template-columns: repeat(auto-fill, 484px);
-
   gap: 10px;
   grid-auto-flow: row dense;
 
@@ -463,9 +337,7 @@ li:hover {
 
 .tuijian-card {
   display: flex;
-
   width: 481px;
-
   height: 140px;
   padding: 3px;
   border-radius: 8px;
@@ -476,7 +348,6 @@ li:hover {
 
 .mycarousel {
 
-
   grid-row-start: 1;
   grid-row-end: 3;
   border-radius: 15px;
@@ -487,9 +358,7 @@ li:hover {
 
 .card-right {
   display: flex;
-
   width: 300px;
-
   flex-direction: column;
   flex-wrap: wrap;
   padding-left: 8px;
diff --git a/src/views/knowledge/news/index.vue b/src/views/knowledge/news/index.vue
index 5f5c8568a..6bc002203 100644
--- a/src/views/knowledge/news/index.vue
+++ b/src/views/knowledge/news/index.vue
@@ -1,19 +1,11 @@
-
-<!--
-@ 作者: 鲁智强
-@ 时间: 2023-08-28 11:13:14
-@ 备注: 
--->
-
 <script lang='ts' setup>
-import aaComponent from "./aa.vue"
 import { useUserStore } from "@/store/modules/user"
 
 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 Navili from './components/Navili.vue'
+import KnowledgeContent from './components/KnowledgeContent.vue'
 import { UserQuery, UserDetail, NaviQuery, Navi, Graphicform, PageParam } from '@/api/knowledge/types'
 import { onScroll, formatDate } from '@/api/knowledge/scroll'
 import { useRouter } from 'vue-router'
@@ -192,9 +184,8 @@ function scrollTo(index: any) {
           推荐
         </li>
 
-        <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 v-for="(item, index) in naviList" :key="index">
+          <Navili v-if="item.hasCard" :oneli="item" :index="(index+1)"  :active="active" :class="{ active: active === index+1 }" @click="scrollTo(index + 1)"></Navili>
         </template>
 
       </ul>
@@ -245,8 +236,8 @@ function scrollTo(index: any) {
       </div>
       <!-- 各知识/新闻分区 -->
 
-      <template v-for="(item, index) in naviList">
-        <Archivestype :liContent=item :index=(index) :fatherisReady="fatherisReady" :routerUrl="routerUrl"></Archivestype>
+      <template v-for="(item, index) in naviList" :key="index">
+        <Archivestype :li-content=item :index=(index) :fatheris-ready="fatherisReady" :router-url="routerUrl"></Archivestype>
       </template>
 
 
@@ -423,3 +414,4 @@ li:hover {
 
 }
 </style>
+