chenlei 10 bulan lalu
induk
melakukan
62ecdab9fa

TEMPAT SAMPAH
web/src/assets/images/swiper10.jpg


+ 8 - 3
web/src/views/Exhibitions/component/List.vue

@@ -152,6 +152,7 @@ export default {
       cut: false,
       topId: null,
       data: [],
+      copyData: [],
       dataShow: [],
     };
   },
@@ -206,11 +207,14 @@ export default {
       }
       this.getIdChangeData();
       this.txt = "";
-      this.data = this.data.filter((v) => {
+      this.data = this.copyData.filter((v) => {
         return v.year.includes(val) || v.year === "";
       });
       this.dataShowArr(9);
     },
+    fuzzyMatch(str, pattern) {
+      return str.toLowerCase().includes(pattern.toLowerCase());
+    },
     // 点击搜索
     search() {
       if (this.txt.trim() === "" || this.txt.trim().length < 4) {
@@ -218,8 +222,8 @@ export default {
         this.dataShowArr(9);
         return;
       }
-      this.data = this.data.filter((v) => {
-        return v.h3.includes(this.txt) || v.p.includes(this.txt);
+      this.data = this.copyData.filter((v) => {
+        return this.fuzzyMatch(v.h3, this.txt) || this.fuzzyMatch(v.p, this.txt);
       });
       this.dataShowArr(9);
     },
@@ -231,6 +235,7 @@ export default {
       else if (temp === "2") this.data = dataAll.Exhibitions.Permanent;
       else if (temp === "3") this.data = dataAll.Exhibitions.Past;
       else if (temp === "4") this.data = dataAll.Exhibitions.Overseas;
+      this.copyData = [...this.data];
     },
     // 处理显示在页面的数组初始数据为9
     dataShowArr(val) {

+ 12 - 54
web/src/views/Home/index.vue

@@ -8,32 +8,32 @@
       aria-description="You've reached the slider section. This section has four image URLs. To browse the content, please use the tab key."
     >
       <!-- 新增的轮播图模块 -->
-      <el-carousel-item key="9">
+      <el-carousel-item key="10">
         <router-link
-          to="/Layout/ExhibitionsInfo?id=61&k=1"
+          to="/Layout/ExhibitionsInfo?id=63&k=2"
           replace
           tabindex="0"
           aria-label="Image link"
-          aria-description="The soul of Russia - selected pieces of painting from the State Tretyakov Gallery collection"
+          aria-description="Four Seasons Album: Peking Folk Customs"
         >
           <img
-            :src="require(`@/assets/images/swiper9.jpg`)"
-            alt="The soul of Russia - selected pieces of painting from the State Tretyakov Gallery collection"
+            :src="require(`@/assets/images/swiper10.jpg`)"
+            alt="Four Seasons Album: Peking Folk Customs"
           />
         </router-link>
       </el-carousel-item>
 
-      <el-carousel-item key="8">
+      <el-carousel-item key="9">
         <router-link
-          to="/Layout/ExhibitionsInfo?id=60&k=1"
+          to="/Layout/ExhibitionsInfo?id=61&k=4"
           replace
           tabindex="0"
           aria-label="Image link"
-          aria-description="Unveiling Sanxingdui And Jinsha Of Ancient Shu Civilization"
+          aria-description="The soul of Russia - selected pieces of painting from the State Tretyakov Gallery collection"
         >
           <img
-            :src="require(`@/assets/images/swiper8.jpg`)"
-            alt="Unveiling Sanxingdui And Jinsha Of Ancient Shu Civilization"
+            :src="require(`@/assets/images/swiper9.jpg`)"
+            alt="The soul of Russia - selected pieces of painting from the State Tretyakov Gallery collection"
           />
         </router-link>
       </el-carousel-item>
@@ -68,37 +68,9 @@
         </router-link>
       </el-carousel-item>
 
-      <!-- <el-carousel-item key="1">
-        <router-link
-          to="/Layout/ExhibitionsInfo?id=1&k=3"
-          replace
-          tabindex="0"
-          aria-label="Image link"
-          aria-description="The Great Journey: the 100th Anniversary of the Founding of the Communist Party of China."
-        >
-          <img
-            :src="require(`@/assets/images/swiper1.jpg`)"
-            alt="The Great Journey: the 100th Anniversary of the Founding of the Communist Party of China."
-          />
-        </router-link>
-      </el-carousel-item> -->
-      <el-carousel-item key="2">
-        <router-link
-          to="/Layout/Collections/Bronzes"
-          replace
-          tabindex="0"
-          aria-label="Image link"
-          aria-description="What's new? More arts just added to our online collections."
-        >
-          <img
-            :src="require(`@/assets/images/swiper2.jpg`)"
-            alt="What's new? More arts just added to our online collections."
-          />
-        </router-link>
-      </el-carousel-item>
       <el-carousel-item key="3">
         <router-link
-          to="/Layout/ExhibitionsInfo?id=10&k=2"
+          to="/Layout/ExhibitionsInfo?id=10&k=3"
           replace
           tabindex="0"
           aria-label="Image link"
@@ -110,20 +82,6 @@
           />
         </router-link>
       </el-carousel-item>
-      <el-carousel-item key="4">
-        <router-link
-          to="/Layout/Publications/2"
-          replace
-          tabindex="0"
-          aria-label="Image link"
-          aria-description="Exhibition catalogues newly added to our website."
-        >
-          <img
-            :src="require(`@/assets/images/swiper4.jpg`)"
-            alt="Exhibition catalogues newly added to our website."
-          />
-        </router-link>
-      </el-carousel-item>
     </el-carousel>
     <!-- 底部 -->
     <div
@@ -314,7 +272,7 @@ export default {
   img {
     width: 100%;
     height: 100%;
-    object-fit: cover;
+    object-fit: contain;
     cursor: pointer;
   }
   .bottomNav {

File diff ditekan karena terlalu besar
+ 169 - 32
web/src/views/dataAll.js


TEMPAT SAMPAH
webM/src/assets/img/Layout/banner10.png


File diff ditekan karena terlalu besar
+ 169 - 31
webM/src/views/Exhibitions/data.js


File diff ditekan karena terlalu besar
+ 169 - 31
webM/src/views/Exhibitions/dataAll.js


+ 3 - 5
webM/src/views/Home/index.vue

@@ -72,13 +72,11 @@ export default {
     return {
       topImg: [
         // { id: 1, path: "/Layout/Detail?id=1&k=3" },
-        { id: 9, path: "/Layout/Detail?id=61&k=1" },
-        { id: 8, path: "/Layout/Detail?id=60&k=1" },
+        { id: 10, path: "/Layout/Detail?id=63&k=2" },
+        { id: 9, path: "/Layout/Detail?id=61&k=4" },
         { id: 7, path: "/Layout/Detail?id=11&k=2" },
         { id: 6, path: "/Layout/Detail?id=58&k=1" },
-        { id: 2, path: "/Layout/Collections/Bronzes" },
-        { id: 3, path: "/Layout/Detail?id=10&k=2" },
-        { id: 4, path: "/Layout/Publications/Catalogues" },
+        { id: 3, path: "/Layout/Detail?id=10&k=3" },
       ],
       vData: [
         {