shaogen1995 %!s(int64=2) %!d(string=hai) anos
pai
achega
458bbd49e1

BIN=BIN
web/public/data/Publications/Magazines/30.jpg


BIN=BIN
web/public/data/Publications/Magazines/31.jpg


BIN=BIN
web/public/data/Publications/Magazines/32.jpg


BIN=BIN
web/public/data/Publications/Magazines/33.jpg


BIN=BIN
web/public/data/Publications/Magazines/34.jpg


BIN=BIN
web/public/data/Publications/Magazines/35.jpg


BIN=BIN
web/public/data/Publications/Magazines/36.png


BIN=BIN
web/public/data/Publications/Magazines/37.jpg


+ 34 - 17
web/src/views/Publications/Publications1.vue

@@ -1,21 +1,25 @@
 <!--  -->
 <template>
   <div class="Publications1">
-    <div class="magzines-wrapper" data-aria-viewport-area tabindex="0"
-      aria-label aria-description="You've reached the content area of the Magazines page, please use the tab key to go through the content."
+    <div
+      class="magzines-wrapper"
+      data-aria-viewport-area
+      tabindex="0"
+      aria-label
+      aria-description="You've reached the content area of the Magazines page, please use the tab key to go through the content."
     >
-      <div class="title" >
+      <div class="title">
         <img src="../../assets/images/Visit/pLeft.jpg" alt="" />
         <span tabindex="0">{{ $route.meta.nameAll }}</span>
         <div class="xian aria-theme-independent"></div>
       </div>
-      <div class="conten" >
+      <div class="conten">
         <!-- 左侧 -->
         <div class="menu">
           <p
             class="aria-theme-independent"
             :class="{
-              cur: txtInd === index
+              cur: txtInd === index,
             }"
             v-for="(item, index) in txtData"
             @click="txtInd = index"
@@ -29,15 +33,23 @@
           </p>
         </div>
         <!-- 右侧 -->
-        <div class="rightTxt" v-html="txtData[txtInd].conten" tabindex="0"></div>
+        <div
+          class="rightTxt"
+          v-html="txtData[txtInd].conten"
+          tabindex="0"
+        ></div>
       </div>
     </div>
-    <div class="our-magzines-wrapper" data-aria-viewport-area tabindex="0"
-      aria-label aria-description="You've reached the Our Magazines section, please use the tab key to go through the content."
+    <div
+      class="our-magzines-wrapper"
+      data-aria-viewport-area
+      tabindex="0"
+      aria-label
+      aria-description="You've reached the Our Magazines section, please use the tab key to go through the content."
     >
       <div class="title_2" tabindex="0">Our Magazines</div>
       <!-- 下面书籍 -->
-      <div class="tabTimeBox" >
+      <div class="tabTimeBox">
         <span
           @mouseenter="dateInd = i"
           @focus="dateInd = i"
@@ -53,8 +65,10 @@
           {{ i }}
         </span>
       </div>
-      <ul class="imgList" >
-        <li v-for="item in imgList" :key="item.id"
+      <ul class="imgList">
+        <li
+          v-for="item in imgList"
+          :key="item.id"
           @click="jump(item.id)"
           @keydown.enter.passive="jump(item.id)"
           tabindex="0"
@@ -94,8 +108,8 @@ export default {
         },
       ],
       // 日历书籍的数据
-      dateInd: 2021,
-      dateData: [2021, 2020, 2019, 2018, 2017],
+      dateInd: 2023,
+      dateData: [2023, 2022, 2021, 2020, 2019, 2018, 2017],
       imgList: [],
       imgAllData: {},
     };
@@ -127,16 +141,19 @@ export default {
       date = Number(date);
       this.dateInd = date;
       setTimeout(() => {
-      window.scrollTo({ top: 1100 });
+        window.scrollTo({ top: 1100 });
       }, 100);
     }
     // 从搜索页跳过来
-    let pInd = this.$route.query.p
-    if(pInd) this.txtInd=Number(pInd)
+    let pInd = this.$route.query.p;
+    if (pInd) this.txtInd = Number(pInd);
   },
   //生命周期 - 挂载完成(可以访问DOM元素)
   mounted() {
-    this.$eventBus.$emit('request-read', `You've reached the Magazines page of the Publications section. This page contains one navigation section, seven window sections, and one interactive section. To choose a section, please hit the shortcut key.`)
+    this.$eventBus.$emit(
+      "request-read",
+      `You've reached the Magazines page of the Publications section. This page contains one navigation section, seven window sections, and one interactive section. To choose a section, please hit the shortcut key.`
+    );
   },
   beforeCreate() {}, //生命周期 - 创建之前
   beforeMount() {}, //生命周期 - 挂载之前

+ 4 - 1
web/src/views/Publications/index.vue

@@ -126,7 +126,10 @@ export default {
       else if (id <= 11) temp = 2020;
       else if (id <= 17) temp = 2019;
       else if (id <= 23) temp = 2018;
-      else temp = 2017;
+      else if (id <= 29) temp = 2017;
+      else if (id === 30) temp = 2021;
+      else if (id <= 31) temp = 2022;
+      else if (id <= 37) temp = 2023;
       return temp;
     },
 

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 61 - 6
web/src/views/Search/data.js


+ 58 - 0
web/src/views/Search/dataAll.js

@@ -2180,6 +2180,64 @@ export const dataAll = [{
     path: '#/Layout/Publications/1?p=2',
   },
 
+
+  // -------------书籍
+  {
+    id: 37,
+    cover: "/data/Publications/Magazines/37.jpg",
+    h3: "Study of Museum History",
+    p: '',
+    path: '#/Layout/PublicationsInfo?id=37',
+  },
+  {
+    id: 36,
+    cover: "/data/Publications/Magazines/36.png",
+    h3: "Application of Digital Technology in Museums",
+    p: '',
+    path: '#/Layout/PublicationsInfo?id=36',
+  },
+  {
+    id: 35,
+    cover: "/data/Publications/Magazines/35.jpg",
+    h3: "Cultural Relics Conservation and Security",
+    p: '',
+    path: '#/Layout/PublicationsInfo?id=35',
+  },
+  {
+    id: 34,
+    cover: "/data/Publications/Magazines/34.jpg",
+    h3: "Study on City of Museums",
+    p: '',
+    path: '#/Layout/PublicationsInfo?id=34',
+  },
+  {
+    id: 33,
+    cover: "/data/Publications/Magazines/33.jpg",
+    h3: "Archaeology, Site and Museum",
+    p: '',
+    path: '#/Layout/PublicationsInfo?id=33',
+  },
+  {
+    id: 32,
+    cover: "/data/Publications/Magazines/32.jpg",
+    h3: "Cultural Relics Witness History",
+    p: '',
+    path: '#/Layout/PublicationsInfo?id=32',
+  },
+  {
+    id: 31,
+    cover: "/data/Publications/Magazines/31.jpg",
+    h3: "Research on Su Donghai’s Academic Thoughts of Museology",
+    p: '',
+    path: '#/Layout/PublicationsInfo?id=31',
+  },
+  {
+    id: 30,
+    cover: "/data/Publications/Magazines/30.jpg",
+    h3: "Practice and Reflections of Young Museum Professionals",
+    p: '',
+    path: '#/Layout/PublicationsInfo?id=30',
+  },
   {
     id: 1,
     cover: "/data/Publications/Magazines/2021_5.jpg",

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 572 - 3
web/src/views/dataAll.js


BIN=BIN
webM/public/data/Publications/Magazines/30.jpg


BIN=BIN
webM/public/data/Publications/Magazines/31.jpg


BIN=BIN
webM/public/data/Publications/Magazines/32.jpg


BIN=BIN
webM/public/data/Publications/Magazines/33.jpg


BIN=BIN
webM/public/data/Publications/Magazines/34.jpg


BIN=BIN
webM/public/data/Publications/Magazines/35.jpg


BIN=BIN
webM/public/data/Publications/Magazines/36.png


BIN=BIN
webM/public/data/Publications/Magazines/37.jpg


+ 21 - 20
webM/src/views/Publications/Magazines.vue

@@ -193,8 +193,8 @@ export default {
     return {
       box1Show: false,
       box2Show: false,
-      dateInd: 2021,
-      dateData: [2021, 2020, 2019, 2018, 2017],
+      dateInd: 2023,
+      dateData: [2023, 2022, 2021, 2020, 2019, 2018, 2017],
       imgList: [],
       info: {},
       infoInd: 0,
@@ -253,7 +253,7 @@ export default {
           let dom = document.querySelector(".box3");
           // 获取主滚动元素
           let domScroll = document.querySelector(".Layout");
-          domScroll.scrollTo({ top: dom.offsetTop-70 });
+          if (dom && domScroll) domScroll.scrollTo({ top: dom.offsetTop - 70 });
         }, 100);
       });
     }
@@ -343,14 +343,27 @@ export default {
       margin-top: 40px;
       position: relative;
       width: 100%;
-      height: 2px;
-      background-color: #c1aa7b;
       margin-bottom: 30px;
+      display: flex;
+      flex-wrap: wrap;
+
       .xian_son {
-        position: absolute;
+        position: relative;
         top: -8px;
-        left: 7%;
+        padding: 0 2px 0 14px;
+        margin-bottom: 15px;
+        &::before {
+          content: "";
+          position: absolute;
+          top: 7px;
+          left: 0;
+          width: 100%;
+          height: 2px;
+          background-color: #c1aa7b;
+        }
         & > div {
+          position: relative;
+          z-index: 10;
           width: 17px;
           height: 17px;
           border-radius: 50%;
@@ -364,18 +377,6 @@ export default {
           margin-top: 5px;
           margin-left: -8px;
         }
-        &:nth-of-type(2) {
-          left: 27%;
-        }
-        &:nth-of-type(3) {
-          left: 47%;
-        }
-        &:nth-of-type(4) {
-          left: 67%;
-        }
-        &:nth-of-type(5) {
-          left: 87%;
-        }
       }
       .active {
         & > div {
@@ -387,7 +388,7 @@ export default {
       }
     }
     .card {
-      margin-top: 60px;
+      margin-top: 30px;
       margin-bottom: 20px;
       width: 100%;
       height: 400px;

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 564 - 10
webM/src/views/Publications/data.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 60 - 3
webM/src/views/Search/data.js


+ 57 - 0
webM/src/views/Search/dataAll.js

@@ -2178,6 +2178,63 @@ export const dataAll = [{
     p: 'Contact information of the journalTel: +86 10 64033878、64034135、63370450Fax: +86 10 64030141Email: bowuyuan@mail.sciencep.comReview Platform:http:ees.scichina.comuserlogin.actionAddress: No. 16, Donghuangchenggen North Street, Beijing.Postcode: 100717…',
     path: '#/Layout/Publications/Magazines?m=3',
   },
+  // -------------书籍
+  {
+    id: 37,
+    cover: "/data/Publications/Magazines/37.jpg",
+    h3: "Study of Museum History",
+    p: '',
+    path: '#/Layout/Publications/Info?id=37',
+  },
+  {
+    id: 36,
+    cover: "/data/Publications/Magazines/36.png",
+    h3: "Application of Digital Technology in Museums",
+    p: '',
+    path: '#/Layout/Publications/Info?id=36',
+  },
+  {
+    id: 35,
+    cover: "/data/Publications/Magazines/35.jpg",
+    h3: "Cultural Relics Conservation and Security",
+    p: '',
+    path: '#/Layout/Publications/Info?id=35',
+  },
+  {
+    id: 34,
+    cover: "/data/Publications/Magazines/34.jpg",
+    h3: "Study on City of Museums",
+    p: '',
+    path: '#/Layout/Publications/Info?id=34',
+  },
+  {
+    id: 33,
+    cover: "/data/Publications/Magazines/33.jpg",
+    h3: "Archaeology, Site and Museum",
+    p: '',
+    path: '#/Layout/Publications/Info?id=33',
+  },
+  {
+    id: 32,
+    cover: "/data/Publications/Magazines/32.jpg",
+    h3: "Cultural Relics Witness History",
+    p: '',
+    path: '#/Layout/Publications/Info?id=32',
+  },
+  {
+    id: 31,
+    cover: "/data/Publications/Magazines/31.jpg",
+    h3: "Research on Su Donghai’s Academic Thoughts of Museology",
+    p: '',
+    path: '#/Layout/Publications/Info?id=31',
+  },
+  {
+    id: 30,
+    cover: "/data/Publications/Magazines/30.jpg",
+    h3: "Practice and Reflections of Young Museum Professionals",
+    p: '',
+    path: '#/Layout/Publications/Info?id=30',
+  },
 
   {
     id: 1,