Przeglądaj źródła

完成打开速度优化

完成打开速度优化
dangyunlong 3 tygodni temu
rodzic
commit
479415f9b4

+ 1 - 1
.nuxt/manifest/latest.json

@@ -1 +1 @@
-{"id":"dev","timestamp":1743064729172}
+{"id":"dev","timestamp":1743120488124}

+ 1 - 1
.nuxt/manifest/meta/dev.json

@@ -1 +1 @@
-{"id":"dev","timestamp":1743064729172,"matcher":{"static":{},"wildcard":{},"dynamic":{}},"prerendered":[]}
+{"id":"dev","timestamp":1743120488124,"matcher":{"static":{},"wildcard":{},"dynamic":{}},"prerendered":[]}

+ 3 - 3
.nuxt/nitro.json

@@ -1,5 +1,5 @@
 {
-  "date": "2025-03-27T08:38:51.996Z",
+  "date": "2025-03-28T00:08:11.854Z",
   "preset": "nitro-dev",
   "framework": {
     "name": "nuxt",
@@ -9,9 +9,9 @@
     "nitro": "2.10.4"
   },
   "dev": {
-    "pid": 21880,
+    "pid": 4820,
     "workerAddress": {
-      "socketPath": "\\\\.\\pipe\\nitro\\worker-21880-1.sock"
+      "socketPath": "\\\\.\\pipe\\nitro\\worker-4820-1.sock"
     }
   }
 }

+ 1 - 1
.nuxt/tsconfig.json

@@ -102,7 +102,7 @@
         "./imports"
       ],
       "#app-manifest": [
-        "./manifest/meta/dev.json"
+        "./manifest/meta/dev"
       ],
       "#components": [
         "./components"

+ 6 - 1
assets/css/index.less

@@ -1770,7 +1770,12 @@
                     cursor: pointer;
                     color: #49A769;
                 }
-                
+                a:nth-child(8) {
+                    border-right: none;
+                }
+                a:nth-child(9) {
+                    display: none;
+                }
             }
         }
         .lastPartContext {

+ 1 - 1
pages/index.vue

@@ -557,7 +557,7 @@
                         </span>
                     </div>
                     <div class="right" v-if="tabsData3==1">
-                        <NuxtLink :to="{ path: `/newsList/${item.category_id}`}"  v-for="(item,index) in boxData14menu" :title="item.alias">
+                        <NuxtLink :to="{ path: `/newsList/${item.category_id}`}"  v-for="item in boxData14menu" :title="item.alias">
                             {{item.alias}}
                         </NuxtLink>
                     </div>

+ 183 - 108
pages/primaryNavigation/[id].vue

@@ -268,6 +268,7 @@
                             v-if="pageData[7].data[4] && hoverStatus == 4">
                         <img class="left" :src="pageData[7].data[5].imgurl" :alt="pageData[7].data[5].title"
                             v-if="pageData[7].data[5] && hoverStatus == 5">
+                            
                         <ul class="leftList left">
                             <li v-for="(item, index) in pageData[7].data" @mouseenter="qhPic(index)">
                                 <h4>
@@ -335,7 +336,7 @@ const getLinkPathDetail = (item) => {
         return `${item.linkurl}`;
     } else {
         //return `/${item.aLIas_pinyin}/${item.id}`;
-        return `/newsDetail/${item.id}?page=1`
+        return `/newsDetail/${item.id}`
     }
 }
 //0.加载页面依赖 end ---------------------------------------->
@@ -516,14 +517,28 @@ try {
             }
         }
         //导航池加载完毕,开始申请模块数据
-        await getPageData1();
-        await getPageData2();
-        await getPageData3();
-        await getPageData4();
-        await getPageData5();
-        await getPageData6();
-        await getPageData7();
-        await getPageData8();
+        // await getPageData1();
+        // await getPageData2();
+        // await getPageData3();
+        // await getPageData4();
+        // await getPageData5();
+        // await getPageData6();
+        // await getPageData7();
+        // await getPageData8();
+        let getJson = [
+            {"parent":pageData.value[0].cid + ",5,8","child":""},//模块1理论前沿
+            {"parent":pageData.value[1].cid + ",5,0","child":""},//模块2典型经验
+            {"parent":pageData.value[2].cid + ",1,6","child":""},//模块3农业天地
+            {"parent":pageData.value[3].cid + ",1,6","child":""},//模块4美丽乡村
+            {"parent":pageData.value[4].cid + ",1,6","child":""},//模块5农民之家
+            {"parent":pageData.value[5].cid + ",6,3","child":""},//模块6农业天地
+            {"parent":pageData.value[6].cid + ",2,3","child":""},//模块7农村建设
+            {"parent":pageData.value[7].cid + ",4,0","child":""},//模块8高端资讯
+        ]
+
+        let jsonString = JSON.stringify(getJson);
+        getPageAllData(jsonString);
+
     }else{
         console.log("SSR waring ---------- SSR waring ---------- SSR waring ---------->")
         console.log("错误位置:分类页导航池")
@@ -538,120 +553,180 @@ try {
 }
 
 
-//获得模块数据
-async function getPageData(catid,img_num,text_num,modulesNum,childNavNum,childImgNum,childTextNum){
-    const mkdata =  await requestDataPromise('/web/getWebsiteCatidArticle', {
+async function getPageAllData(jsonString){
+    const mkdata =  await requestDataPromise('/web/getWebsiteAllArticle', {
         method: 'GET',
         query: {
-            'catid': catid, //catid
-            'img_num': img_num, //图片数量
-            'text_num': text_num, //文字数量
-            'child_catnum':childNavNum,//子级栏目菜单数量
-            'child_imgnum':childImgNum,//子栏目展示图片新闻数量
-            'child_textnum':childTextNum//子栏目展示文字新闻数量
+            'id':jsonString
         },
     });
-    if(modulesNum == 1){
-        if(mkdata.data.img.length > 0){
-            pageData.value[0].data.push(mkdata.data.img[0]);
-        }
-        if(mkdata.data.img.length > 1){
-            pageData.value[0].data2.push(mkdata.data.img[1]);
-        }
-        if(mkdata.data.img.length > 2){
-            pageData.value[0].data2.push(mkdata.data.img[2]);
-        }
-        if(mkdata.data.img.length > 3){
-            pageData.value[0].data2.push(mkdata.data.img[3]);
-        }
-        if(mkdata.data.img.length > 4){
-            pageData.value[0].data2.push(mkdata.data.img[4]);
+
+    if(mkdata.code==200){
+        //模块1理论前沿
+        if(mkdata.data[0].imgnum.length > 0){
+            pageData.value[0].data.push(mkdata.data[0].imgnum[0]);
         }
-        // pageData.value[0].data.push(mkdata.data.img[0]);
-        // pageData.value[0].data2.push(mkdata.data.img[1]);
-        // pageData.value[0].data2.push(mkdata.data.img[2]);
-        // pageData.value[0].data2.push(mkdata.data.img[3]);
-        // pageData.value[0].data2.push(mkdata.data.img[4]);
-        pageData.value[0].data3 = mkdata.data.text;
-    }
-    if(modulesNum == 2){
-        pageData.value[1].data = mkdata.data.img;
-    }
-    if(modulesNum == 3){
-        pageData.value[2].data = mkdata.data.img;
-        pageData.value[2].data2 = mkdata.data.text;
-    }
-    if(modulesNum == 4){
-        pageData.value[3].data = mkdata.data.img;
-        pageData.value[3].data2 = mkdata.data.text;
-    }
-    if(modulesNum == 5){
-        pageData.value[4].data = mkdata.data.img;
-        pageData.value[4].data2 = mkdata.data.text;
-    }
-    if(modulesNum == 6){
-        if(mkdata.data.img.length > 0){
-            pageData.value[5].data.push(mkdata.data.img[0]);
+        if(mkdata.data[0].imgnum.length > 1){
+            pageData.value[0].data2.push(mkdata.data[0].imgnum[1]);
         }
-        pageData.value[5].data2 = mkdata.data.text;
-        if(mkdata.data.img.length > 1){
-            pageData.value[7].data.push(mkdata.data.img[1]);
+        if(mkdata.data[0].imgnum.length > 2){
+            pageData.value[0].data2.push(mkdata.data[0].imgnum[2]);
         }
-        if(mkdata.data.img.length > 2){
-            pageData.value[7].data.push(mkdata.data.img[2]);
+        if(mkdata.data[0].imgnum.length > 3){
+            pageData.value[0].data2.push(mkdata.data[0].imgnum[3]);
         }
-        if(mkdata.data.img.length > 3){
-            pageData.value[7].data.push(mkdata.data.img[3]);
+        if(mkdata.data[0].imgnum.length > 4){
+            pageData.value[0].data2.push(mkdata.data[0].imgnum[4]);
         }
-        if(mkdata.data.img.length > 4){
-            pageData.value[7].data.push(mkdata.data.img[4]);
+        pageData.value[0].data3 = mkdata.data[0].textnum;
+        //模块2典型经验
+        pageData.value[1].data = mkdata.data[1].imgnum;
+        //模块3农业天地
+        pageData.value[2].data = mkdata.data[2].imgnum;
+        pageData.value[2].data2 = mkdata.data[2].textnum;
+        //模块4美丽乡村
+        pageData.value[3].data = mkdata.data[3].imgnum;
+        pageData.value[3].data2 = mkdata.data[3].textnum;
+        //模块5农民之家
+        pageData.value[4].data = mkdata.data[4].imgnum;
+        pageData.value[4].data2 = mkdata.data[4].textnum;
+        //模块6农业天地 注意,三农资讯网跟其他行星站不一样,你不需要复制我这个
+        //因为本来二级分类页有9个模块,但是实际应用中只有8个,所以我把本来是模块7
+        //的地方和现有的模块6合并成1个了
+        if(mkdata.data[5].imgnum.length > 0){
+            pageData.value[5].data.push(mkdata.data[5].imgnum[0]);
         }
-        if(mkdata.data.img.length > 5){
-            pageData.value[7].data.push(mkdata.data.img[5]);
+        pageData.value[5].data2 = mkdata.data[5].textnum;
+        //把模块6的内容放到模块7中一部分
+        for (let i = 1; i < mkdata.data[5].imgnum.length && i <= 5; i++) {
+            pageData.value[7].data.push(mkdata.data[5].imgnum[i]);
         }
-    }
-    if(modulesNum == 7){
-        pageData.value[6].data = mkdata.data.img;
-        pageData.value[6].data2 = mkdata.data.text;
-    }
-    //模块8 向后移动一个位置
-    if(modulesNum == 8){
-        pageData.value[7].data2 = mkdata.data.img;
+        //模块7农村建设
+        pageData.value[6].data = mkdata.data[6].imgnum;
+        pageData.value[6].data2 = mkdata.data[6].textnum;
+        //模块8高端资讯
+        pageData.value[7].data2 = mkdata.data[7].imgnum;
+
+    }else{
+        ElMessage.error(mkdata.message)
     }
 }
+
+
+//获得模块数据
+// async function getPageData(catid,img_num,text_num,modulesNum,childNavNum,childImgNum,childTextNum){
+//     const mkdata =  await requestDataPromise('/web/getWebsiteCatidArticle', {
+//         method: 'GET',
+//         query: {
+//             'catid': catid, //catid
+//             'img_num': img_num, //图片数量
+//             'text_num': text_num, //文字数量
+//             'child_catnum':childNavNum,//子级栏目菜单数量
+//             'child_imgnum':childImgNum,//子栏目展示图片新闻数量
+//             'child_textnum':childTextNum//子栏目展示文字新闻数量
+//         },
+//     });
+//     if(modulesNum == 1){
+//         if(mkdata.data.img.length > 0){
+//             pageData.value[0].data.push(mkdata.data.img[0]);
+//         }
+//         if(mkdata.data.img.length > 1){
+//             pageData.value[0].data2.push(mkdata.data.img[1]);
+//         }
+//         if(mkdata.data.img.length > 2){
+//             pageData.value[0].data2.push(mkdata.data.img[2]);
+//         }
+//         if(mkdata.data.img.length > 3){
+//             pageData.value[0].data2.push(mkdata.data.img[3]);
+//         }
+//         if(mkdata.data.img.length > 4){
+//             pageData.value[0].data2.push(mkdata.data.img[4]);
+//         }
+//         // pageData.value[0].data.push(mkdata.data.img[0]);
+//         // pageData.value[0].data2.push(mkdata.data.img[1]);
+//         // pageData.value[0].data2.push(mkdata.data.img[2]);
+//         // pageData.value[0].data2.push(mkdata.data.img[3]);
+//         // pageData.value[0].data2.push(mkdata.data.img[4]);
+//         pageData.value[0].data3 = mkdata.data.text;
+//     }
+//     if(modulesNum == 2){
+//         pageData.value[1].data = mkdata.data.img;
+//     }
+//     if(modulesNum == 3){
+//         pageData.value[2].data = mkdata.data.img;
+//         pageData.value[2].data2 = mkdata.data.text;
+//     }
+//     if(modulesNum == 4){
+//         pageData.value[3].data = mkdata.data.img;
+//         pageData.value[3].data2 = mkdata.data.text;
+//     }
+//     if(modulesNum == 5){
+//         pageData.value[4].data = mkdata.data.img;
+//         pageData.value[4].data2 = mkdata.data.text;
+//     }
+//     if(modulesNum == 6){
+//         if(mkdata.data.img.length > 0){
+//             pageData.value[5].data.push(mkdata.data.img[0]);
+//         }
+//         pageData.value[5].data2 = mkdata.data.text;
+//         if(mkdata.data.img.length > 1){
+//             pageData.value[7].data.push(mkdata.data.img[1]);
+//         }
+//         if(mkdata.data.img.length > 2){
+//             pageData.value[7].data.push(mkdata.data.img[2]);
+//         }
+//         if(mkdata.data.img.length > 3){
+//             pageData.value[7].data.push(mkdata.data.img[3]);
+//         }
+//         if(mkdata.data.img.length > 4){
+//             pageData.value[7].data.push(mkdata.data.img[4]);
+//         }
+//         if(mkdata.data.img.length > 5){
+//             pageData.value[7].data.push(mkdata.data.img[5]);
+//         }
+//     }
+//     if(modulesNum == 7){
+//         pageData.value[6].data = mkdata.data.img;
+//         pageData.value[6].data2 = mkdata.data.text;
+//     }
+//     //模块8 向后移动一个位置
+//     if(modulesNum == 8){
+//         pageData.value[7].data2 = mkdata.data.img;
+//     }
+// }
 //新农村
 //模块1 理论前沿
-async function getPageData1() {
-    await getPageData(pageData.value[0].cid,5,8,1,0,0,0);
-}
-//模块2 典型经验
-async function getPageData2() {
-    await getPageData(pageData.value[1].cid,5,0,2,0,0,0);
-}
-//模块3 农业天地
-async function getPageData3() {
-    await getPageData(pageData.value[2].cid,1,6,3,0,0,0);
-}
-//模块4 美丽乡村
-async function getPageData4() {
-    await getPageData(pageData.value[3].cid,1,6,4,0,0,0);
-}
-//模块5 农民之家
-async function getPageData5() {
-    await getPageData(pageData.value[4].cid,1,6,5,0,0,0);
-}
-//模块6 农业天地
-async function getPageData6() {
-    await getPageData(pageData.value[5].cid,6,3,6,0,0,0);
-}
-//模块7 农村建设
-async function getPageData7() {
-    await getPageData(pageData.value[6].cid,2,3,7,0,0,0);
-}
-//模块8 高端资讯
-async function getPageData8() {
-    await getPageData(pageData.value[7].cid,4,0,8,0,0,0);
-}
+// async function getPageData1() {
+//     await getPageData(pageData.value[0].cid,5,8,1,0,0,0);
+// }
+// //模块2 典型经验
+// async function getPageData2() {
+//     await getPageData(pageData.value[1].cid,5,0,2,0,0,0);
+// }
+// //模块3 农业天地
+// async function getPageData3() {
+//     await getPageData(pageData.value[2].cid,1,6,3,0,0,0);
+// }
+// //模块4 美丽乡村
+// async function getPageData4() {
+//     await getPageData(pageData.value[3].cid,1,6,4,0,0,0);
+// }
+// //模块5 农民之家
+// async function getPageData5() {
+//     await getPageData(pageData.value[4].cid,1,6,5,0,0,0);
+// }
+// //模块6 农业天地
+// async function getPageData6() {
+//     await getPageData(pageData.value[5].cid,6,3,6,0,0,0);
+// }
+// //模块7 农村建设
+// async function getPageData7() {
+//     await getPageData(pageData.value[6].cid,2,3,7,0,0,0);
+// }
+// //模块8 高端资讯
+// async function getPageData8() {
+//     await getPageData(pageData.value[7].cid,4,0,8,0,0,0);
+// }
 // 注意,为了保持模块的数量,当前固定为8个
 // 所以这里的农业天地,合并了原来是下面的7号模块
 // 而原本是7号模块的地方现在变成了8号模块