From a5abb70a428f59894fc9ee4330f0033d6fe93a8b Mon Sep 17 00:00:00 2001
From: 杨磊 <505174330@qq.com>
Date: 星期四, 24 四月 2025 18:38:13 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/wyyDatabase
---
src/views/honors/index.vue | 220 +++++++++++++++++++++++++++++++-----------------------
1 files changed, 126 insertions(+), 94 deletions(-)
diff --git a/src/views/honors/index.vue b/src/views/honors/index.vue
index d928ddb..c299f09 100644
--- a/src/views/honors/index.vue
+++ b/src/views/honors/index.vue
@@ -1,41 +1,37 @@
<template>
<div class="honors">
<div class="honors-title">
- <p>鐜嬫案鐐庨櫌澹崳瑾夊椤�</p>
+ <p>
+ <span>鐜嬫案鐐庨櫌澹崳瑾夊椤�</span>
+ </p>
</div>
<div class="page-main-father">
<div class="honors-main">
<div class="honors-main-box">
+ <!-- 宸﹁竟鏍囬 -->
<div class="honors-main-title">鑽�<br />瑾�<br />濂�<br />椤�</div>
- <div class="honors-text">
- <ul>
- <li v-for="(item, index) in honorList" :key="index">
- <img
- class="main-img"
- :src="item.imgSrc ? item.imgSrc : defaultImg"
- alt=""
- />
- <div>
- <p class="main-time">{{ item.time }}</p>
- <p class="main-text" :title="item.txt">{{ item.txt }}</p>
- </div>
- </li>
- </ul>
- <img
- class="honor-Bg"
- src="../../assets/images/honors/honor-Bg.png"
- alt=""
- />
+ <!-- 鍙宠竟鍐呭 -->
+ <div class="honors-text" v-loading="loading" element-loading-background="rgba(0, 0, 0, 0)" element-loading-text="瀛︾敓鍒楄〃鍔犺浇涓�"
+ element-loading-spinner="el-icon-loading">
+ <div style="min-height: 646px;">
+ <ul>
+ <li v-for="(item, index) in honorList" :key="index">
+ <img class="main-img" :src="item.icon ? item.icon : defaultImg" alt="" />
+ <div>
+ <p class="main-time">{{ item.year }}</p>
+ <p class="main-text" :title="item.txt">{{ item.honor }}</p>
+ </div>
+ </li>
+ </ul>
+ </div>
<!-- 鍒嗛〉 -->
<div class="pagination">
- <el-pagination
- class="msg-pagination-container"
- :background="isBackground"
- layout="prev, pager, next"
- :total="200"
- >
+ <el-pagination @current-change="handleCurrentChange" class="msg-pagination-container"
+ :background="isBackground" layout="prev, pager, next" :total="total">
</el-pagination>
</div>
+ <!-- 鈥滃北鈥濆浘鐗� -->
+ <img class="honor-Bg" src="../../assets/images/honors/honor-Bg.png" alt="" />
</div>
</div>
</div>
@@ -44,55 +40,66 @@
</template>
<script>
+import MG from '@/assets/js/middleGround/WebMiddleGroundApi.js'
export default {
data() {
return {
defaultImg: require("@/assets/images/honors/honorImg.png"),
isBackground: true,
- honorList: [
- {
- imgSrc: "",
- time: "1986骞�11鏈�",
- txt: "1991骞�11鏈�'娓呭紑鐏垫敞灏勬恫娌荤枟涓鐥呯棸鐑瘉鐨勪复搴婁笌瀹為獙鐮旂┒'鑾�1991骞村害鍥藉绉戞妧杩涙濂栦笁绛夊",
- },
- {
- imgSrc: "",
- time: "1986骞�11鏈�",
- txt: "1991骞�11鏈�'娓呭紑鐏垫敞灏勬恫娌荤枟涓鐥呯棸鐑瘉鐨勪复搴婁笌瀹為獙鐮旂┒'鑾�1991骞村害鍥藉绉戞妧杩涙濂栦笁绛夊",
- },
- {
- imgSrc: "",
- time: "1986骞�11鏈�",
- txt: "1991骞�11鏈�'娓呭紑鐏垫敞灏勬恫娌荤枟涓鐥呯棸鐑瘉鐨勪复搴婁笌瀹為獙鐮旂┒'鑾�1991骞村害鍥藉绉戞妧杩涙濂栦笁绛夊",
- },
- {
- imgSrc: "",
- time: "1986骞�11鏈�",
- txt: "1991骞�11鏈�'娓呭紑鐏垫敞灏勬恫娌荤枟涓鐥呯棸鐑瘉鐨勪复搴婁笌瀹為獙鐮旂┒'鑾�1991骞村害鍥藉绉戞妧杩涙濂栦笁绛夊",
- },
- {
- imgSrc: "",
- time: "1986骞�11鏈�",
- txt: "1991骞�11鏈�'娓呭紑鐏垫敞灏勬恫娌荤枟涓鐥呯棸鐑瘉鐨勪复搴婁笌瀹為獙鐮旂┒'鑾�1991骞村害鍥藉绉戞妧杩涙濂栦笁绛夊",
- },
- {
- imgSrc: "",
- time: "1986骞�11鏈�",
- txt: "1991骞�11鏈�'娓呭紑鐏垫敞灏勬恫娌荤枟涓鐥呯棸鐑瘉鐨勪复搴婁笌瀹為獙鐮旂┒'鑾�1991骞村害鍥藉绉戞妧杩涙濂栦笁绛夊",
- },
- {
- imgSrc: "",
- time: "1986骞�11鏈�",
- txt: "1991骞�11鏈�'娓呭紑鐏垫敞灏勬恫娌荤枟涓鐥呯棸鐑瘉鐨勪复搴婁笌瀹為獙鐮旂┒'鑾�1991骞村害鍥藉绉戞妧杩涙濂栦笁绛夊",
- },
- {
- imgSrc: "",
- time: "1986骞�11鏈�",
- txt: "1991骞�11鏈�'娓呭紑鐏垫敞灏勬恫娌荤枟涓鐥呯棸鐑瘉鐨勪复搴婁笌瀹為獙鐮旂┒'鑾�1991骞村害鍥藉绉戞妧杩涙濂栦笁绛夊,1991骞�11鏈�'娓呭紑鐏垫敞灏勬恫娌荤枟涓鐥呯棸鐑瘉鐨勪复搴婁笌瀹為獙鐮旂┒'鑾�1991骞村害鍥藉绉戞妧杩涙濂栦笁绛夊,1991骞�11鏈�'娓呭紑鐏垫敞灏勬恫娌荤枟涓鐥呯棸鐑瘉鐨勪复搴婁笌瀹為獙鐮旂┒'鑾�1991骞村害鍥藉绉戞妧杩涙濂栦笁绛夊1991骞�11鏈�'娓呭紑鐏垫敞灏勬恫娌荤枟涓鐥呯棸鐑瘉鐨勪复搴婁笌瀹為獙鐮旂┒'鑾�1991骞村害鍥藉绉戞妧杩涙濂栦笁绛夊,1991骞�11鏈�'娓呭紑鐏垫敞灏勬恫娌荤枟涓鐥呯棸鐑瘉鐨勪复搴婁笌瀹為獙鐮旂┒'鑾�1991骞村害鍥藉绉戞妧杩涙濂栦笁绛夊",
- },
- ],
+ honorList: [],
+ total: 0,
+ currentPage: 1,
+ loading: false,
};
},
+ mounted() {
+ this.initChart();
+ },
+ methods: {
+ // 鑾峰彇鏁版嵁
+ initChart() {
+ this.loading = true;
+ MG.resource.getItem({
+ path: "WYY_honor",
+ fields: {
+ Link: "",
+ honor: "",
+ 'year': '',
+ },
+ paging: {
+ start: (this.currentPage - 1) * 10,
+ size: 10,
+ },
+ // coverSize: {
+ // height: 70
+ // }
+ }).then((res) => {
+ console.log(res, "res");
+ if (res.datas && res.datas.length) {
+ this.honorList = res.datas.map(item => {
+ // 灏� year 瀛楁鏍煎紡鍖栦负 "2017骞�9鏈�" 杩欑鏍煎紡
+ const date = new Date(item.year);
+ const year = date.getFullYear();
+ const month = date.getMonth() + 1; // 鏈堜唤浠�0寮�濮嬶紝闇�瑕佸姞1
+ return {
+ ...item,
+ year: `${year}骞�${month}鏈坄
+ };
+ });
+ this.total = res.total;
+ this.loading = false;
+ }
+ }).catch((error) => {
+ console.error('鑾峰彇鑽ｈ獕澶辫触:', error);
+ });
+ },
+ // 澶勭悊椤电爜鍙樺寲
+ handleCurrentChange(newPage) {
+ this.currentPage = newPage;
+ this.initChart(); // 閲嶆柊鑾峰彇鏁版嵁
+ },
+ },
+
};
</script>
@@ -104,9 +111,12 @@
background-color: #e9e1d4;
position: relative;
overflow: hidden;
+ display: flex;
+ flex-direction: column;
}
.honors-title {
+ padding: 8px 0;
height: 9.4%;
width: 100%;
text-align: left;
@@ -115,32 +125,38 @@
position: sticky;
top: 0;
z-index: 100;
+
p {
- padding: 1.6% 0 1.55% 0;
+ height: 100%;
font-family: Alimama DongFangDaKai;
font-size: 30px;
text-indent: 1em;
border-bottom: 1px solid #937950;
+ display: flex;
+ align-items: center;
}
}
.page-main-father {
- height: calc(100% - 9.4%);
+ flex: 1;
width: 100%;
+ height: 100%;
overflow: auto;
+ padding-top: 2%;
+ padding-bottom: 2%;
}
.honors-main {
width: 77.3%;
- height: auto;
margin: 0 auto;
- margin-top: 2%;
+
}
.honors-main-box {
+ height: 100%;
display: flex;
justify-content: center;
- padding: 3.2% 6% 14% 4%;
+ padding: 3.2% 6% 0% 4%;
border: 1px solid #e4dace;
background: rgba(255, 253, 248, 0.9);
}
@@ -153,18 +169,23 @@
}
.honors-text {
+ height: 100%;
width: 100%;
position: relative;
padding: 0 0 0 5.8%;
+ display: flex;
+ flex-direction: column;
+ min-height: 646px;
ul {
+ flex: 1;
display: flex;
flex-wrap: wrap;
justify-content: space-between;
}
li {
- height: 25%;
+ height: calc(20% - 20px);
width: 45%;
display: flex;
margin-right: 0.9%;
@@ -197,25 +218,50 @@
}
.honor-Bg {
- position: absolute;
width: 70.5%;
height: auto;
- bottom: -36%;
- left: -295px;
+ margin-left: -33%;
+ margin-bottom: -1%;
+
}
.pagination {
+ // position: absolute;
+ // bottom: 0;
+ // right: 0;
+ height: 10%;
padding-right: 47px;
padding-top: 30px;
text-align: end;
}
}
+@font-face {
+ font-family: "Alimama DongFangDaKai";
+ src: url("../../assets/font/闃块噷濡堝涓滄柟澶фシ.ttf");
+}
+
+// @media screen and (min-width: 1920px) {
+// .honors-main-box {
+// display: flex;
+// justify-content: center;
+// padding: 3.2% 6% 11% 4%;
+// border: 1px solid #e4dace;
+// background: rgba(255, 253, 248, 0.9);
+// }
+// .honor-Bg {
+// position: absolute;
+// width: 70.5%;
+// height: auto;
+// bottom: -20%;
+// left: -26.5%;
+// }
+// }
+
@media screen and (min-width: 2560px) {
.honors-main {
width: 77.3%;
min-width: 1600px;
- transform: scale(1);
}
.honors-title p {
@@ -238,21 +284,9 @@
}
}
}
-
- .honor-Bg {
- position: absolute;
- width: 70.5%;
- height: auto;
- bottom: -39%;
- left: -295px;
- }
-
}
-@font-face {
- font-family: "Alimama DongFangDaKai";
- src: url("../../assets/font/闃块噷濡堝涓滄柟澶фシ.ttf");
-}
+
:deep .msg-pagination-container.is-background .el-pager li {
/*瀵归〉鏁扮殑鏍峰紡杩涜淇敼*/
@@ -278,9 +312,7 @@
border: 1px solid #cccccc;
}
-:deep.msg-pagination-container.is-background
- .el-pager
- li:not(.disabled).active {
+:deep.msg-pagination-container.is-background .el-pager li:not(.disabled).active {
/*褰撳墠閫変腑椤垫暟鐨勬牱寮忚繘琛屼慨鏀�*/
background-color: #937950;
color: #fff;
--
Gitblit v1.9.1