From d12ef33357fece97d1810294f77b25f662410048 Mon Sep 17 00:00:00 2001
From: liwenxuan <1298531568@qq.com>
Date: Thu, 3 Aug 2023 14:06:26 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9A=90=E8=97=8F=E6=97=A0=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/knowledge/types.ts                    |  11 +-
 src/store/modules/knowledge.ts                |   1 -
 .../knowledge/components/KnowledgeContent.vue |   2 +-
 .../knowledge/knowledge/components/Navili.vue |  41 +------
 .../knowledge/components/archivestype.vue     | 111 +++++-------------
 src/views/knowledge/knowledge/index.vue       |  99 ++++++----------
 6 files changed, 73 insertions(+), 192 deletions(-)

diff --git a/src/api/knowledge/types.ts b/src/api/knowledge/types.ts
index b2ec51fde..18b0a3a1f 100644
--- a/src/api/knowledge/types.ts
+++ b/src/api/knowledge/types.ts
@@ -24,7 +24,8 @@ export interface UserDetail {
 //导航栏查询
 export interface NaviQuery {
   atParentId: string;
-  
+  userkey: String,
+  usertoken: String,
 }
 //导航栏信息
 export interface Navi{
@@ -42,8 +43,8 @@ export interface Navi{
   atUid:string;
   //排序
   atSort:string;
-/*   //该导航栏中有无card
-  hasCard:Boolean; */
+   //该导航栏中有无card
+  hasCard:Boolean; 
 }
 export type cardList = PageResult<Graphicform[]>
 //卡片
@@ -161,6 +162,6 @@ interface PageResultJava<T> {
 
 //标题下有无内容
 export interface ShowTitle {
-  atIdAndGParentSun: string;
-  hasCard:Boolean;
+  atIdAndGParentSun: string;//导航栏id
+  hasCard:Boolean;//是否展示
 }
diff --git a/src/store/modules/knowledge.ts b/src/store/modules/knowledge.ts
index 752ac296a..9d1f2ffc0 100644
--- a/src/store/modules/knowledge.ts
+++ b/src/store/modules/knowledge.ts
@@ -1,6 +1,5 @@
 import { defineStore } from 'pinia'
 import { ShowTitle } from '@/api/knowledge/types';
-import KnowledgeContentVue from '@/views/knowledge/knowledge/components/KnowledgeContent.vue';
 // 第一个参数是应用程序中 store 的唯一 id
 export const useKnowledgeStore = defineStore('knowledge', {
 
diff --git a/src/views/knowledge/knowledge/components/KnowledgeContent.vue b/src/views/knowledge/knowledge/components/KnowledgeContent.vue
index 6e2f94330..802b696f1 100644
--- a/src/views/knowledge/knowledge/components/KnowledgeContent.vue
+++ b/src/views/knowledge/knowledge/components/KnowledgeContent.vue
@@ -43,7 +43,7 @@ watch(() => props.isShow, () => {
         } else {
             pdfIframeShow.value = true
         }
-        console.log(pdfIframeShow.value)
+        //console.log(pdfIframeShow.value)
     }
 })
 onMounted(() => {
diff --git a/src/views/knowledge/knowledge/components/Navili.vue b/src/views/knowledge/knowledge/components/Navili.vue
index a79c67a05..42bf7e660 100644
--- a/src/views/knowledge/knowledge/components/Navili.vue
+++ b/src/views/knowledge/knowledge/components/Navili.vue
@@ -1,8 +1,5 @@
 <script lang='ts' setup>
 import { scrollTo } from '@/api/knowledge/scroll'
-import { useKnowledgeStore } from "@/store/modules/knowledge"
-import { ShowTitle } from '@/api/knowledge/types'
-import { storeToRefs } from 'pinia';
 const showli = ref(true);
 const props = defineProps({
     oneli: {
@@ -21,45 +18,11 @@ const props = defineProps({
     knowledgeStore: {
         type: Object,
     },
-   fatherisReady1:{
-        type:Number,
-   }
-})
-function navShow() {
-
-    //标题下是否有内容
-    const KnowledgeStore = useKnowledgeStore();
-    let {knowledgeTitlesShow} = storeToRefs(KnowledgeStore)
-    // const
-    //const data = ref<ShowTitle[]>(KnowledgeStore.knowledgeTitlesShow);
-    console.log("knowledgeTitlesShow--->",knowledgeTitlesShow.value,KnowledgeStore)
-    if(knowledgeTitlesShow.value && knowledgeTitlesShow.value.length > 0){
-        knowledgeTitlesShow.value.forEach((val,index)=>{
-            console.log("index--->",index)
-            console.log("val--->",val)
-        })
+    fatherisReady1: {
+        type: Number,
     }
-    // console.log("data.value.length="+data.value.length)
-    // for (let item of knowledgeTitlesShow.value) {
-    //     console.log(1)
-    //     console.log(item)
-    //     if (item.hasCard == false) {
-    //             console.log(item)
-    //             showli.value = false;
-    //         }
-    // }  
-   
-}
-
-
-watch(() => [props.fatherisReady1], (newVal, oldVal) => {
-    // navShow()
 })
 
-
-
-
-
 </script>
 <template>
     <li :class="{ active: active === index }" @click="scrollTo(index)" v-if="showli">
diff --git a/src/views/knowledge/knowledge/components/archivestype.vue b/src/views/knowledge/knowledge/components/archivestype.vue
index 034175c0a..cc52cc0ab 100644
--- a/src/views/knowledge/knowledge/components/archivestype.vue
+++ b/src/views/knowledge/knowledge/components/archivestype.vue
@@ -1,17 +1,13 @@
 <script lang='ts' setup>
 import { useUserStore } from "@/store/modules/user"
 import { ref, watch } from 'vue'
-import { getUserDetail, getZxxyNavis, getTuijian } from '@/api/knowledge/index'
+import { getTuijian } from '@/api/knowledge/index'
 import KnowledgeContent from '@/views/knowledge/knowledge/components/KnowledgeContent.vue'
-import { UserQuery, UserDetail, NaviQuery, Navi, Graphicform, PageParam, ShowTitle } from '@/api/knowledge/types'
+import { UserDetail, NaviQuery, Navi, Graphicform, PageParam, ShowTitle } from '@/api/knowledge/types'
 import { formatDate } from '@/api/knowledge/scroll'
-import { useRouter } from 'vue-router'
 import errimg from '@/assets/404_images/imgNotFound.png'
 import { useKnowledgeStore } from "@/store/modules/knowledge"
 
-
-
-
 const showArea = ref(true);
 
 const props = defineProps({
@@ -40,9 +36,6 @@ const props = defineProps({
 
 const userStore = useUserStore();
 const { userKey, userToken } = userStore;
-
-
-
 const userDetail = ref<UserDetail>({
   //证件号码
   idcardno: ["1", "2"],
@@ -59,15 +52,12 @@ const userDetail = ref<UserDetail>({
 });
 const tuijianPage = ref<Graphicform[]>();
 
-/* const naviList = ref<Navi[]>(); */
-/* //用户信息查询参数
-const userQueryParam = reactive<UserQuery>({
-  userkey: userKey,
-  usertoken: userToken,
-}); */
+
 //navi查询参数
 const naviQueryParam = reactive<NaviQuery>({
   atParentId: "",//知识库
+  userkey: userKey,
+  usertoken: userToken,
 });
 const pageParamTuijian = reactive<PageParam>({
   total: 0,
@@ -89,14 +79,6 @@ function errorImg(e: any) {
   //这一句没用，如果默认图片的路径错了还是会一直闪屏，在方法的前面加个.once只让它执行一次也没用
   e.srcElement.onerror = null; //防止闪图
 }
-onMounted(() => {
-
-  //console.log(props.liContent?.gParentSun)
-
-  //console.log(useKnowledgeStore().$state)
-
-
-});
 
 watch(() => [props.fatherisReady, props.liContent, props.routerUrl], (newVal, oldVal) => {
   //console.log(newVal, oldVal); // [11, 22], [1, 2]
@@ -115,68 +97,37 @@ watch(() => [props.fatherisReady, props.liContent, props.routerUrl], (newVal, ol
   }
 
   pageParamTuijian.gParentSun = liContent.atId;
-  //console.log(pageParamTuijian.gParentSun)
   //推荐 
-  getTuijian(pageParamTuijian)
-    .then(({ data }) => {
-      tuijianPage.value = data.list
-      //console.log(tuijianPage.value)
-      pageParamTuijian.page = data.pageNum
-      pageParamTuijian.total = data.total
-      if (pageParamTuijian.total > 0) {
-        showCards.value = 1;
-      }
-      const KnowledgeStore = useKnowledgeStore();
-
-      
-      if (tuijianPage.value.length > 0) {
-        //本标题下有数据
-        KnowledgeStore.$patch((state) => {
-          state.knowledgeTitlesShow.push({ atIdAndGParentSun: liContent.atId, hasCard: true })
-        })
-        showArea.value = true;
-      }else{
-        KnowledgeStore.$patch((state) => {
-          state.knowledgeTitlesShow.push({ atIdAndGParentSun: liContent.atId, hasCard: false })
-          
-        })
-        showArea.value = false;
-      }
-     
-
-
-    });
-
-})
-
-
-
-/* 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;
-    //推荐 
+  if (props.liContent?.hasCard == true) {
+    //console.log(props.liContent?.hasCard)
     getTuijian(pageParamTuijian)
       .then(({ data }) => {
         tuijianPage.value = data.list
+        //console.log(tuijianPage.value)
         pageParamTuijian.page = data.pageNum
         pageParamTuijian.total = data.total
-        console.log(tuijianPage.value)
+        if (pageParamTuijian.total > 0) {
+          showCards.value = 1;
+        }
+        const KnowledgeStore = useKnowledgeStore();
+
+
+        if (tuijianPage.value.length > 0) {
+          //本标题下有数据
+          KnowledgeStore.$patch((state) => {
+            state.knowledgeTitlesShow.push({ atIdAndGParentSun: liContent.atId, hasCard: true })
+          })
+          showArea.value = true;
+        } else {
+          KnowledgeStore.$patch((state) => {
+            state.knowledgeTitlesShow.push({ atIdAndGParentSun: liContent.atId, hasCard: false })
+
+          })
+          //showArea.value = false;
+        }
       });
-
-  }) */
-
+  }
+})
 
 function handleCurrentChange() {
 
@@ -185,8 +136,6 @@ function handleCurrentChange() {
       tuijianPage.value = data.list
       pageParamTuijian.page = data.pageNum
       pageParamTuijian.total = data.total
-
-      console.log(tuijianPage.value)
     });
 }
 
@@ -208,7 +157,7 @@ function showContentDialog(item: any) {
 
 </script>
 <template>
-  <div class="models " v-if="showArea">
+  <div class="models ">
     <KnowledgeContent v-model:isShow="showContentBox" :contentSource="cardContentSource"></KnowledgeContent>
     <div class="model-title">
       <h3>{{ props.liContent?.atTitle }}</h3>
diff --git a/src/views/knowledge/knowledge/index.vue b/src/views/knowledge/knowledge/index.vue
index c14508b89..8c2371308 100644
--- a/src/views/knowledge/knowledge/index.vue
+++ b/src/views/knowledge/knowledge/index.vue
@@ -1,6 +1,6 @@
 <script lang='ts' setup>
 import { useUserStore } from "@/store/modules/user"
-import { useKnowledgeStore } from "@/store/modules/knowledge"
+
 import { ref } from 'vue'
 import { getUserDetail, getZxxyNavis, getTuijian, getCarousel } from '@/api/knowledge/index'
 import Archivestype from '@/views/knowledge/knowledge/components/archivestype.vue'
@@ -16,8 +16,7 @@ const active = ref(0); // 当前激活的导航索引
 
 const userStore = useUserStore();
 const { userKey, userToken } = userStore;
-//标题下是否有内容
-const KnowledgeStore = useKnowledgeStore();
+
 
 const userDetail = ref<UserDetail>({
   //证件号码
@@ -36,6 +35,7 @@ const userDetail = ref<UserDetail>({
 const tuijianPage = ref<Graphicform[]>();
 
 const naviList = ref<Navi[]>();
+const naviList1 = ref<Navi[]>();
 //用户信息查询参数
 const userQueryParam = reactive<UserQuery>({
   userkey: userKey,
@@ -44,6 +44,8 @@ const userQueryParam = reactive<UserQuery>({
 //navi查询参数
 const naviQueryParam = reactive<NaviQuery>({
   atParentId: "",//知识库
+  userkey: userKey,
+  usertoken: userToken,
 });
 const pageParamTuijian = reactive<PageParam>({
   total: 0,
@@ -66,10 +68,15 @@ function errorImg(e: any) {
   e.srcElement.onerror = null; //防止闪图
 }
 const fatherisReady = ref(0);
-const fatherisReady1 = ref(0);
+
 const router = useRouter()
 const routerUrl = toRaw(router).currentRoute.value.fullPath
 onBeforeMount(() => {
+  //当前登录用户详细信息
+  getUserDetail(userQueryParam)
+    .then(({ data }) => {
+      userDetail.value = data
+    });
 
 })
 
@@ -88,45 +95,20 @@ onMounted(() => {
   getZxxyNavis(naviQueryParam)
     .then(({ data }) => {
       naviList.value = data
-      //console.log(naviList.value)
-
-    }).finally(() => {
-      fatherisReady.value = 100;
-    })
-
-  //当前登录用户详细信息
-  getUserDetail(userQueryParam)
-    .then(({ data }) => {
-      userDetail.value = data
-      //console.log(userDetail.value)
-    });
-
-
-
+      }).finally(() => {
+        fatherisReady.value = 100;
+      })
   //推荐 
   getTuijian(pageParamTuijian)
     .then(({ data }) => {
       tuijianPage.value = data.list
       pageParamTuijian.page = data.pageNum
       pageParamTuijian.total = data.total
-      //console.log(tuijianPage.value)
-    }).finally(()=>{
-      fatherisReady1.value = 9;
     });
   getCarousel(pageParamTuijian)
     .then(({ data }) => {
       carousel.value = data.list
-
-
-      //console.log(tuijianPage.value)
     });
-
-
-
-  //setTimeout(function(){  fatherisReady.value = 100;}, 3000);　　//三秒之后执行函数
-
-
-  
 });
 
 
@@ -145,8 +127,6 @@ function handleCurrentChange() {
       tuijianPage.value = data.list
       pageParamTuijian.page = data.pageNum
       pageParamTuijian.total = data.total
-
-      //console.log(tuijianPage.value)
     });
 
 }
@@ -156,7 +136,6 @@ const cardContentSource = ref<Graphicform>({});
 const showContentBox = ref(false);	//详情弹窗
 
 function showContentDialog(item: any) {
-
   showContentBox.value = true;
   cardContentSource.value = item;
 }
@@ -164,7 +143,6 @@ function showContentDialog(item: any) {
 
 </script>
 <template>
-
   <div class="app-container">
     <KnowledgeContent v-model:isShow="showContentBox" :contentSource="cardContentSource"></KnowledgeContent>
     <!-- 内容区域 -->
@@ -210,9 +188,11 @@ function showContentDialog(item: any) {
           @current-change="handleCurrentChange" />
       </div>
       <!-- 各知识/新闻分区 -->
-      <Archivestype v-for="(item, index) in naviList" :liContent=item :index=(index) :fatherisReady="fatherisReady" 
-        :routerUrl="routerUrl">
-      </Archivestype>
+
+      <template v-for="(item, index) in naviList">
+        <Archivestype :liContent=item :index=(index) :fatherisReady="fatherisReady" :routerUrl="routerUrl"></Archivestype>
+      </template>
+
 
 
 
@@ -220,59 +200,48 @@ function showContentDialog(item: any) {
 
     <!-- 导航区域 -->
 
-      <ul class="navs">
+    <ul class="navs">
       <li :class="{ active: active === 0 }" @click="scrollTo(0)">
         推荐
       </li>
-      <Navili v-for="(item, index) in naviList" :class="{ active: active === index+1 }" :oneli=item :index=(index+1) :fatherisReady1="fatherisReady1"
-        :active=active @click="scrollTo(index + 1)"></Navili>
 
-    </ul>
+      <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>
-
 </template>
 
 
 
 <style scoped>
-
-
 .content {
   background-color: white;
-  width:89.1%;
-  margin-left: 190px; 
+  width: 89.1%;
+  margin-left: 190px;
   box-shadow: rgba(0, 0, 0, 0.24) 0px 3px 8px;
   border-radius: 5px;
 }
 
 
-/* .models {
-  
-   min-height: 500px; 
-
-
-} */
 
 
 /* 导航栏的样式 */
 .navs {
-  
-  /* border:black 1px solid; */
 
-  
+
+
   width: 192px;
   position: fixed;
   height: auto;
   top: 95px;
-    
-  /*  box-shadow: rgba(0, 0, 0, 0.24) 0px 3px 8px;  */
- /*  box-shadow: rgb(204, 219, 232) 3px 3px 6px 0px inset, rgba(255, 255, 255, 0.5) -3px -3px 6px 1px inset; */
+
 }
 
 .navs li {
-  
+
   text-align: center;
   line-height: 3;
   font-size: 15.5px;
@@ -297,8 +266,8 @@ function showContentDialog(item: any) {
 }
 
 .grid-tuijian {
-  
-  
+
+
   display: grid;
   grid-template-columns: repeat(auto-fill, 484px);
   gap: 10px;
@@ -318,7 +287,7 @@ function showContentDialog(item: any) {
 }
 
 .mycarousel {
-  
+
   grid-row-start: 1;
   grid-row-end: 3;
   border-radius: 15px;