shaogen1995 2 роки тому
батько
коміт
e9db2a586a

BIN
web/public/data/LearnEngage/in/93.jpg


BIN
web/public/data/LearnEngage/in/94.jpg


BIN
web/public/data/LearnEngage/sm/93.png


BIN
web/public/data/LearnEngage/sm/94.png


+ 36 - 27
web/src/views/Events/info.vue

@@ -2,7 +2,9 @@
 <template>
   <div class="EventsInfo">
     <div class="conten">
-      <img class="topBan aria-theme-independent" :src="`/data/About/Events/${imgInd}Ac.jpg`"
+      <img
+        class="topBan aria-theme-independent"
+        :src="`/data/About/Events/${imgInd}Ac.jpg`"
         :alt="info.h3"
         tabindex="0"
         :aria-description="info.h3"
@@ -37,7 +39,7 @@
           tabindex="0"
           aria-label="You've reached the content area of the Events sub-page, please use the tab key to go through the content."
         >
-          <div class="title" >
+          <div class="title">
             <div class="left">
               <h3 v-html="info.h3" tabindex="0"></h3>
               <div class="txt">
@@ -58,18 +60,17 @@
               <p tabindex="0">{{ info.i }}</p>
             </div>
           </div>
-          <div class="txtMain" v-html="info.main" v-if="info.main" ></div>
+          <div class="txtMain" v-html="info.main" v-if="info.main"></div>
           <div
             class="txtMain"
             v-if="info.mainArr"
             v-html="info.mainArr[mainArr]"
-            
           ></div>
           <!-- 分页 -->
-          <div class="page" v-if="info.mainArr" >
+          <div class="page" v-if="info.mainArr">
             <span
-              @click="pageCut(i-1)"
-              @keydown.enter.passive="pageCut(i-1)"
+              @click="pageCut(i - 1)"
+              @keydown.enter.passive="pageCut(i - 1)"
               v-for="i in 5"
               :key="i"
               :class="{ active: i === mainArr + 1 }"
@@ -145,21 +146,21 @@ export default {
   methods: {
     requestProcessElementInTxtMain() {
       this.$nextTick(() => {
-        const txtMainList = document.getElementsByClassName('txtMain')
+        const txtMainList = document.getElementsByClassName("txtMain");
         for (const iterator of txtMainList) {
-          this.$eventBus.$emit('request-process-text-element', iterator)
-          this.$eventBus.$emit('request-process-image-element', iterator)
+          this.$eventBus.$emit("request-process-text-element", iterator);
+          this.$eventBus.$emit("request-process-image-element", iterator);
         }
-      })
+      });
     },
-    pageCut(i){
-      this.mainArr = i
-      this.toTop()
-      this.requestProcessElementInTxtMain()
+    pageCut(i) {
+      this.mainArr = i;
+      this.toTop();
+      this.requestProcessElementInTxtMain();
     },
     skip(id) {
       this.$router.push(`/Layout/EventsInfo/${id}`).catch(() => {});
-      this.requestProcessElementInTxtMain()
+      this.requestProcessElementInTxtMain();
     },
     // 点击回到顶部
     toTop() {
@@ -199,20 +200,20 @@ export default {
       this.other = temp;
     },
     onAriaShowMagnifyArea() {
-      this.needMagnifyAreaSpace = true
+      this.needMagnifyAreaSpace = true;
     },
     onAriaHideMagnifyArea() {
-      this.needMagnifyAreaSpace = false
+      this.needMagnifyAreaSpace = false;
     },
   },
   //生命周期 - 创建完成(可以访问当前this实例)
   created() {
     this.getData();
-    if ([...document.body.classList].includes('aria-magnifying')) {
-      this.needMagnifyAreaSpace = true
+    if ([...document.body.classList].includes("aria-magnifying")) {
+      this.needMagnifyAreaSpace = true;
     }
-    this.$eventBus.$on('aria-show-magnify-area', this.onAriaShowMagnifyArea)
-    this.$eventBus.$on('aria-hide-magnify-area', this.onAriaHideMagnifyArea)
+    this.$eventBus.$on("aria-show-magnify-area", this.onAriaShowMagnifyArea);
+    this.$eventBus.$on("aria-hide-magnify-area", this.onAriaHideMagnifyArea);
   },
   //生命周期 - 挂载完成(可以访问DOM元素)
   mounted() {
@@ -220,7 +221,7 @@ export default {
       "request-read",
       `You've reached the sub-page of the Events page.This page contains one navigation section, four window sections, and one interactive section. To choose an section, please hit the shortcut key.`
     );
-    this.requestProcessElementInTxtMain()
+    this.requestProcessElementInTxtMain();
   },
   beforeCreate() {}, //生命周期 - 创建之前
   beforeMount() {}, //生命周期 - 挂载之前
@@ -228,8 +229,8 @@ export default {
   updated() {}, //生命周期 - 更新之后
   beforeDestroy() {}, //生命周期 - 销毁之前
   destroyed() {
-    this.$eventBus.$off('aria-show-magnify-area', this.onAriaShowMagnifyArea)
-    this.$eventBus.$off('aria-hide-magnify-area', this.onAriaHideMagnifyArea)
+    this.$eventBus.$off("aria-show-magnify-area", this.onAriaShowMagnifyArea);
+    this.$eventBus.$off("aria-hide-magnify-area", this.onAriaHideMagnifyArea);
   }, //生命周期 - 销毁完成
   activated() {}, //如果页面有keep-alive缓存功能,这个函数会触发
 };
@@ -353,12 +354,20 @@ export default {
           bottom: 10px;
           left: 50%;
           transform: translateX(-50%);
+          display: flex;
+          justify-content: center;
           & > span {
-            margin-right: 8px;
+            width: 30px;
+            height: 30px;
+            text-align: center;
+            line-height: 30px;
+            margin-right: 15px;
+            border-radius: 50%;
             cursor: pointer;
           }
           .active {
-            color: #bf2323;
+            background-color: #bf2323;
+            color: #fff;
             pointer-events: none;
           }
         }

+ 31 - 12
web/src/views/LearnEngage/index.vue

@@ -112,9 +112,18 @@
         </div>
         <div class="bottomTxt" v-if="item.info">
           <h3 tabindex="0" aria-label="Link">{{ item.h3 }}</h3>
-          <p tabindex="0" aria-label="Link">Venue:{{ item.info.loc }}</p>
-          <p tabindex="0" aria-label="Link">Date:{{ item.info.time }}</p>
-          <p tabindex="0" aria-label="Link">Limit:{{ item.info.ren }}</p>
+          <div tabindex="0" aria-label="Link">
+            <span>Venue:</span>
+            <p>{{ item.info.loc }}</p>
+          </div>
+          <div tabindex="0" aria-label="Link">
+            <span>Date:</span>
+            <p>{{ item.info.time }}</p>
+          </div>
+          <div tabindex="0" aria-label="Link">
+            <span>Limit:</span>
+            <p>{{ item.info.ren }}</p>
+          </div>
         </div>
       </div>
     </div>
@@ -190,10 +199,10 @@ export default {
       this.topId = this.$route.params.id;
       let temp = LearnEngage[this.topId];
       // 判断有多少页
-      this.pageNum = Math.ceil(temp.length / 8);
+      this.pageNum = Math.ceil(temp.length / 9);
       let tempArrAll = [];
       for (let i = 0; i < this.pageNum; i++) {
-        tempArrAll.push(temp.slice(i * 8, (i + 1) * 8));
+        tempArrAll.push(temp.slice(i * 9, (i + 1) * 9));
       }
       this.data = tempArrAll;
 
@@ -322,7 +331,7 @@ export default {
       position: relative;
       .rightMoer {
         position: absolute;
-        bottom: 10px;
+        bottom: 5px;
         right: 8px;
         width: 50px;
         & > img {
@@ -333,6 +342,7 @@ export default {
         width: 100%;
         height: 220px;
         & > img {
+          border-radius: 5px;
           width: 100%;
           height: 100%;
           object-fit: cover;
@@ -349,15 +359,24 @@ export default {
           overflow: hidden;
           text-overflow: ellipsis;
           white-space: nowrap;
+          margin-bottom: 5px;
         }
-        & > p {
-          overflow: hidden;
-          text-overflow: ellipsis;
-          white-space: nowrap;
+        & > div {
+          display: flex;
           color: #8b8b8b;
           font-size: 14px;
-          line-height: 20px;
-          font-weight: normal;
+          & > span {
+            display: inline-block;
+            width: 55px;
+          }
+          & > p {
+            width: calc(100% - 55px);
+            overflow: hidden;
+            text-overflow: ellipsis;
+            white-space: nowrap;
+            line-height: 20px;
+            font-weight: normal;
+          }
         }
       }
       &:nth-of-type(3n) {

+ 5 - 1
web/src/views/LearnEngage/info.vue

@@ -92,7 +92,11 @@
             tabindex="0"
             :aria-description="dataObj.txt.replace(/(<([^>]+)>)/gi, '')"
           ></div>
-          <div class="baoMingSta"></div>
+          <div
+            class="baoMingSta"
+            v-if="dataObj.baoming"
+            v-html="dataObj.baoming"
+          ></div>
           <div class="Tip" v-if="dataObj.tip">
             <h3 class="h3xx">Tip</h3>
             <p v-html="dataObj.tip" tabindex="0"></p>

+ 8 - 2
web/src/views/Search/All.vue

@@ -197,11 +197,17 @@ export default {
     justify-content: center;
     padding-bottom: 30px;
     & > span {
-      margin-right: 8px;
+      width: 30px;
+      height: 30px;
+      text-align: center;
+      line-height: 30px;
+      margin-right: 15px;
+      border-radius: 50%;
       cursor: pointer;
     }
     .active {
-      color: #bf2323;
+      background-color: #bf2323;
+      color: #fff;
       pointer-events: none;
     }
   }

+ 8 - 2
web/src/views/Search/Collections.vue

@@ -188,11 +188,17 @@ export default {
     justify-content: center;
     padding-bottom: 30px;
     & > span {
-      margin-right: 8px;
+      width: 30px;
+      height: 30px;
+      text-align: center;
+      line-height: 30px;
+      margin-right: 15px;
+      border-radius: 50%;
       cursor: pointer;
     }
     .active {
-      color: #bf2323;
+      background-color: #bf2323;
+      color: #fff;
       pointer-events: none;
     }
   }

+ 8 - 2
web/src/views/Search/Exhibitions.vue

@@ -172,11 +172,17 @@ export default {
     justify-content: center;
     padding-bottom: 30px;
     & > span {
-      margin-right: 8px;
+      width: 30px;
+      height: 30px;
+      text-align: center;
+      line-height: 30px;
+      margin-right: 15px;
+      border-radius: 50%;
       cursor: pointer;
     }
     .active {
-      color: #bf2323;
+      background-color: #bf2323;
+      color: #fff;
       pointer-events: none;
     }
   }

+ 8 - 2
web/src/views/Search/Learn.vue

@@ -172,11 +172,17 @@ export default {
     justify-content: center;
     padding-bottom: 30px;
     & > span {
-      margin-right: 8px;
+      width: 30px;
+      height: 30px;
+      text-align: center;
+      line-height: 30px;
+      margin-right: 15px;
+      border-radius: 50%;
       cursor: pointer;
     }
     .active {
-      color: #bf2323;
+      background-color: #bf2323;
+      color: #fff;
       pointer-events: none;
     }
   }

+ 8 - 2
web/src/views/Search/Research.vue

@@ -181,11 +181,17 @@ export default {
     justify-content: center;
     padding-bottom: 30px;
     & > span {
-      margin-right: 8px;
+      width: 30px;
+      height: 30px;
+      text-align: center;
+      line-height: 30px;
+      margin-right: 15px;
+      border-radius: 50%;
       cursor: pointer;
     }
     .active {
-      color: #bf2323;
+      background-color: #bf2323;
+      color: #fff;
       pointer-events: none;
     }
   }

Різницю між файлами не показано, бо вона завелика
+ 36 - 18
web/src/views/Search/data.js


Різницю між файлами не показано, бо вона завелика
+ 41 - 24
web/src/views/Search/dataAll.js


Різницю між файлами не показано, бо вона завелика
+ 35 - 0
web/src/views/dataAll.js