From 6938616d7e67a8822569420f6bddd8754a63d574 Mon Sep 17 00:00:00 2001
From: 杨磊 <505174330@qq.com>
Date: 星期一, 28 四月 2025 16:36:23 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/wyyDatabase
---
src/views/achievements/index.vue | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/views/achievements/index.vue b/src/views/achievements/index.vue
index 5f30d05..a69ae53 100644
--- a/src/views/achievements/index.vue
+++ b/src/views/achievements/index.vue
@@ -668,7 +668,6 @@
//鑾峰彇涓嬫媺閫夋嫨妗嗙殑鍐呭
async getSelectData() {
- this.loading = true;
try {
// 鍚屾椂鍙戣捣涓や釜寮傛璇锋眰锛屽苟绛夊緟瀹冧滑鐨勭粨鏋�
const [subjectListResult, resourceListResult] = await Promise.all([
@@ -718,12 +717,15 @@
handleSearch(isText) {
console.log(isText, "isText");
this.associationList = [];
+ console.log(isText, "isText");
+
if (isText.text != "") {
this.inputValue = isText.text;
this.inputType = isText.type;
this.associationList.push({
type: isText.label,
content: isText.text,
+ value: isText.type,
});
this.getItemList();
}
@@ -731,6 +733,7 @@
// 璇锋眰鏁版嵁
getItemList() {
+ this.loading = true;
let searchData = {}; // 鍒濆鍖栦竴涓┖瀵硅薄鏉ュ瓨鍌ㄦ悳绱㈡暟鎹�
if (this.inputValue) {
// 濡傛灉杈撳叆鍊煎瓨鍦�
@@ -1341,7 +1344,7 @@
overflow: hidden;
display: -webkit-box;
-webkit-box-orient: vertical;
- -webkit-line-clamp: 4;
+ -webkit-line-clamp: 3;
span {
font-family: Source Han Sans;
@@ -1424,6 +1427,9 @@
border-radius: 5px;
border: 1px solid #cccccc;
}
+:deep.el-pagination.is-background .el-pager li:not(.disabled):hover{
+ color: #937950
+}
</style>
<style>
--
Gitblit v1.9.1