From 8b3880c31ceb67416a6eee67ed059d3c17f3d9ec Mon Sep 17 00:00:00 2001
From: 杨磊 <505174330@qq.com>
Date: 星期一, 28 四月 2025 10:50:42 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/wyyDatabase
---
src/views/achievements/index.vue | 263 +++++++++++++++++++++++++++++++++++++++------------
1 files changed, 199 insertions(+), 64 deletions(-)
diff --git a/src/views/achievements/index.vue b/src/views/achievements/index.vue
index d4cab66..eb71247 100644
--- a/src/views/achievements/index.vue
+++ b/src/views/achievements/index.vue
@@ -39,9 +39,10 @@
</li>
<li class="left-main" v-if="category.isDisplay">
<div class="category-main" v-for="(item, index) in category.list" :key="index">
- <el-checkbox class="el-checkbox" style="display: inline-block; vertical-align: middle;"
- v-model="item.checked" :title="item.name">{{ item.name }}</el-checkbox>
- <span class="" style="display: inline-block; vertical-align: middle;">{{ item.num }}</span>
+ <el-checkbox class="el-checkbox" v-model="item.checked" :title="item.name"
+ @change="categoryChange(item)" style="display: inline-block; vertical-align: middle">{{ item.name
+ }}</el-checkbox>
+ <span class="" style="display: inline-block; vertical-align: middle">{{ item.num }}</span>
</div>
</li>
</ul>
@@ -113,8 +114,8 @@
</li>
<li class="left-main" v-if="subject.isDisplay">
<div class="category-main" v-for="(item, index) in subject.list" :key="index">
- <el-checkbox class="el-checkbox" v-model="item.checked" :title="item.name">{{ item.name
- }}</el-checkbox>
+ <el-checkbox class="el-checkbox" v-model="item.checked" :title="item.name"
+ @change="subjectChange(item)">{{ item.name }}</el-checkbox>
<span class="">{{ item.num }}</span>
</div>
</li>
@@ -136,7 +137,7 @@
</ul>
<ul class="number-time">
鍙戣〃鏃堕棿
- <span><img :src="sortBottom" alt="" /></span>
+ <span @click="sortChange()"><img :src="!postedSortInfo ? sortBottom : sortTop" alt="" /></span>
</ul>
</ul>
<!-- 缁撴灉灞曠ず -->
@@ -144,7 +145,7 @@
<li class="main-name">
<p>{{ item.name }}</p>
<p>
- <el-button @click="goPage(item)">璇︽儏</el-button>
+ <el-button @click="goPage(item.id)">璇︽儏</el-button>
<el-button>AI鏅鸿兘闃呰</el-button>
</p>
</li>
@@ -157,13 +158,14 @@
<li class="main-author">
{{ item.author }}
</li>
- <li class="main-title" :title="item.abstract">
+ <li class="main-title" :title="item.cleanAbstract" v-if="item.abstract">
<span>鎽樿: </span>
<span class="page-main-abstract" v-html="item.abstract"></span>
</li>
- <li class="main-keyword">
+ <li class="main-keyword" v-if="item.keyWords && item.keyWords.length > 0">
<span>鍏抽敭璇嶏細</span>
- <span class="keyWord" v-for="(citem, cindex) in item.keyWords" :key="cindex">
+ <span class="keyWord" v-for="(citem, cindex) in item.keyWords" :key="cindex"
+ @click="() => handleSearch({ text: citem, type: 'keyWords', label: '鍏抽敭璇�' })">
{{ citem }}
</span>
</li>
@@ -174,6 +176,7 @@
:background="isBackground" layout="prev, pager, next" :total="total" :page-size="6">
</el-pagination>
</div>
+ <el-empty v-if="!loading && !resultList.length"></el-empty>
</div>
</div>
</div>
@@ -195,6 +198,7 @@
},
data() {
return {
+ relatedList: [],
// 杈撳叆妗嗙殑鍐呭
inputValue: "",
// 閫夋嫨鐨勭被鍨�
@@ -313,6 +317,10 @@
},
],
},
+ categoryChecList: [],
+ subjectCheckList: [],
+
+ postedSortInfo: true,
// 骞村害
annual: {
title: "骞村害",
@@ -443,24 +451,67 @@
total: 0,
paginationPage: 1,
loading: false,
+ labelList: {
+ abstract: "鎽樿",
+ author: "浣滆��",
+ keyword: "鍏抽敭璇�",
+ source: "鏉ユ簮",
+ title: "鏍囬",
+ year: "骞翠唤",
+ },
};
},
mounted() {
- this.getSelectContent();
- this.getLeftCheckbox()
this.getSelectData();
},
methods: {
- async onSubmit(val) { },
+ categoryChange(val) {
+ console.log(val, "val");
+ if (val.checked) {
+ this.categoryChecList.push(val.value);
+ } else {
+ const index = this.categoryChecList.findIndex(
+ (item) => item === val.value
+ );
+ this.categoryChecList.splice(index, 1);
+ }
+ this.getItemList();
+ },
+
+ subjectChange(val) {
+ console.log(val, "val");
+ if (val.checked) {
+ this.subjectCheckList.push(val.value);
+ } else {
+ const index = this.subjectCheckList.findIndex(
+ (item) => item === val.value
+ );
+ this.subjectCheckList.splice(index, 1);
+ }
+ this.getItemList();
+ },
+
+ async onSubmit(val) {
+ for (let key in val) {
+ if (val[key] != "") {
+ this.associationList.push({
+ type: this.labelList[key],
+ content: val[key],
+ value: key,
+ });
+ }
+ }
+ console.log(this.associationList, "this.associationList");
+ this.getItemList();
+ },
//閲嶇疆鎼滅储缁撴灉
resetForm() {
// this.onSearch("");
},
// 椤甸潰璺宠浆
- goPage(key) {
- console.log(key, "key");
- this.$router.push({ name: "details", params: { key: key } });
+ goPage(id) {
+ this.$router.push({ name: "details", query: { id } });
},
// 鏀惰捣鍜屽睍绀�
shrinkClick(key, name) {
@@ -480,11 +531,6 @@
this.activeBox = this.activeBox === "b" ? null : "b";
}
},
- // 鑾峰彇宸︿晶checkbox鏁版嵁
- getLeftCheckbox() {
-
-
- },
//鑾峰彇涓嬫媺閫夋嫨妗嗙殑鍐呭
async getSelectData() {
@@ -495,14 +541,15 @@
this.getSelectContent(this.subjectAffiliationRefCode),
this.getSelectContent(this.resourceTypeRefCode),
]);
- this.subject.list = subjectListResult.option
+ console.log(subjectListResult.option);
+ this.subject.list = subjectListResult.option;
this.category.list = resourceListResult.option;
if (this.category.list && this.category.list.length) {
this.category.list.forEach((item) => {
- this.resourceTypeValueList.push(item.value)
+ this.resourceTypeValueList.push(item.value);
});
}
- this.getItemList()
+ this.getItemList();
} catch (error) {
console.error("鑾峰彇涓嬫媺妗嗘暟鎹け璐�:", error);
}
@@ -515,7 +562,6 @@
.getProductTypeField(requestData)
.then((res) => {
const selestList = JSON.parse(res[0].config);
- console.log(selestList, "涓嬫媺妗嗘暟鎹�");
return selestList;
})
.catch((error) => {
@@ -530,58 +576,65 @@
(item) => item.content !== value
);
this.inputValue = "";
+ // 閫氱煡鐖剁粍浠舵暟鎹凡鏀瑰彉
this.getItemList()
},
// 鎼滅储
handleSearch(isText) {
- console.log(1234);
- console.log(isText, "鎼滅储123");
+ this.associationList = []
if (isText.text != "") {
- this.inputValue = isText.text
- this.inputType = isText.type
+ this.inputValue = isText.text;
+ this.inputType = isText.type;
this.associationList.push({
type: isText.label,
content: isText.text,
});
- this.getItemList()
+ this.getItemList();
}
},
- // getTtem
+ // 璇锋眰鏁版嵁
getItemList() {
- let searchData = {};
- if (this.inputValue) {
- if (this.inputType != "all") {
+ let searchData = {}; // 鍒濆鍖栦竴涓┖瀵硅薄鏉ュ瓨鍌ㄦ悳绱㈡暟鎹�
+ if (this.inputValue) { // 濡傛灉杈撳叆鍊煎瓨鍦�
+ if (this.inputType != "all") { // 濡傛灉杈撳叆绫诲瀷涓嶆槸"all"
+ // 灏嗚緭鍏ュ�间笌杈撳叆绫诲瀷鍏宠仈锛屽苟娣诲姞涓�涓槦鍙�(*)浣滀负鍚庣紑
searchData[this.inputType + "*"] = this.inputValue;
- } else {
+ } else { // 濡傛灉杈撳叆绫诲瀷鏄�"all"
+ // 閬嶅巻杈撳叆閫夐」
for (let index = 0; index < this.inputOptions.length; index++) {
- const item = this.inputOptions[index];
- if (item.value !== "all" ) {
- console.log(item.value, "987");
- if (!Object.keys(searchData).length) {
- searchData[item.value + "*"] = this.inputValue
- } else {
- searchData["||" + item.value + "*"] = this.inputValue
+ const item = this.inputOptions[index]; // 鑾峰彇褰撳墠閫夐」
+ if (item.value !== "all") { // 濡傛灉褰撳墠閫夐」鐨勫�间笉鏄�"all"
+ if (!Object.keys(searchData).length) { // 濡傛灉searchData鏄┖鐨�
+ // 灏嗙涓�涓�夐」鐨勫�间笌杈撳叆鍊煎叧鑱旓紝骞舵坊鍔犱竴涓槦鍙�(*)浣滀负鍚庣紑
+ searchData[item.value + "*"] = this.inputValue;
+ } else { // 濡傛灉searchData涓嶆槸绌虹殑
+ // 浣跨敤"||"浣滀负鍓嶇紑锛屽皢鍚庣画閫夐」鐨勫�间笌杈撳叆鍊煎叧鑱旓紝骞舵坊鍔犱竴涓槦鍙�(*)浣滀负鍚庣紑
+ // 杩欓�氬父鐢ㄤ簬鏋勫缓涓�涓�昏緫鎴栵紙OR锛夋煡璇�
+ searchData["||" + item.value + "*"] = this.inputValue;
}
}
}
}
-
- console.log(searchData, "鎼滅储鏁版嵁123");
}
- debugger
MG.resource
.getItem({
path: "*",
queryType: "*",
paging: {
start: (this.paginationPage - 1) * 6,
- size: 6
+ size: 6,
+ },
+ sort: {
+ year: this.postedSortInfo ? "Desc" : "Asc",
},
fields: {
cmsType: ["cmsItem"],
- "resourceType*": this.resourceTypeValueList,
+ "resourceType*":
+ this.categoryChecList.length > 0
+ ? this.categoryChecList
+ : this.resourceTypeValueList,
source: [],
year: [],
abstract: [],
@@ -591,33 +644,52 @@
AIReading: [],
file: [],
IssueNumber: [],
+ "subjectAffiliation*": this.subjectCheckList,
...searchData,
},
})
.then((res) => {
- console.log(res, "鍏ㄩ儴鏁版嵁");
+ console.log(res, "鍏ㄩ儴鍐呭");
+
res.datas.forEach((item) => {
- item.year = moment(item.year).format("YYYY-MM-DD")
- if (typeof item.keyWords === 'string') {
+ item.year = moment(item.year).format("YYYY-MM-DD");
+ if (typeof item.keyWords === "string") {
item.keyWords = item.keyWords.split(";;");
} else {
// 璁剧疆涓�涓粯璁ゅ�兼垨鑰呰繘琛屽叾浠栭敊璇鐞�
item.keyWords = [];
}
- item.resourceTypeName = this.category.list.find((citem) => citem.value == item.cmsItemType).name
+ if (item.abstract) {
+ item.cleanAbstract = item.abstract.replace(/<[^>]+>/g, "");
+ }
+
+ const foundItem = this.category.list.find((citem) => citem.value == item.cmsItemType);
+ item.resourceTypeName = foundItem ? foundItem.name : '';
})
this.resultList = res.datas
this.total = res.total;
this.loading = false;
- })
+ });
},
-
// 澶勭悊椤电爜鍙樺寲
handleCurrentChange(newPage) {
this.paginationPage = newPage;
this.getItemList(); // 閲嶆柊鑾峰彇鏁版嵁
+ // 婊氬姩鍒伴〉闈㈤《閮�
+ this.$nextTick(() => {
+ const pageMain = document.querySelector('.page-main-father');
+ if (pageMain) {
+ pageMain.scrollTo({
+ top: 0,
+ behavior: 'smooth'
+ });
+ }
+ });
},
-
+ sortChange() {
+ this.postedSortInfo = !this.postedSortInfo;
+ this.getItemList();
+ },
},
};
</script>
@@ -656,11 +728,25 @@
}
}
+::v-deep .el-loading-spinner {
+ .el-loading-text {
+
+ font-size: 14px;
+ color: #937950;
+ }
+
+ .el-icon-loading {
+ font-size: 14px;
+ color: #937950;
+ }
+}
+
+
.page-main-father {
flex: 1;
width: 100%;
height: 100%;
- min-width: 1292px;
+ min-width: 1200px;
overflow: auto;
padding-top: 1%;
padding-bottom: 2%;
@@ -679,16 +765,43 @@
background-color: #fefbf5;
border: 1px solid #e4dace;
- .input-main {
+ ::v-deep(.input-main) {
padding: 15px 0;
display: flex;
justify-content: center;
width: 90%;
border-right: 2px solid #e4dace;
+ font-weight: bold;
.input-with-select {
width: 50%;
+ font-weight: bold;
}
+
+ .el-select .el-input.is-focus .el-input__inner {
+ color: #937950 !important;
+ border-color: #937950 !important;
+ font-weight: bold;
+ }
+
+ .el-select-dropdown__item.selected {
+ color: #937950 !important;
+ font-weight: bold;
+ }
+
+ .el-select .el-input__inner:focus {
+ border-color: #937950;
+ font-weight: bold;
+ }
+
+ .el-select .el-input__inner {
+ font-family: Source Han Sans;
+ font-size: 14px;
+ font-weight: bold;
+ color: #2C2C2C;
+
+ }
+
}
.input-txt {
@@ -740,10 +853,12 @@
font-size: 14px;
background-color: transparent;
color: #937950;
- border: 1px solid #6f5a3a;
+ border: 1px solid #937950;
+ ;
+ cursor: pointer;
&:hover {
- background-color: #6f5a3a;
+ background-color: #937950;
color: #fffdf8;
}
}
@@ -906,6 +1021,7 @@
.right-header {
display: flex;
+ flex-wrap: wrap;
li {
background: #ffffff;
@@ -917,6 +1033,8 @@
font-family: Poppins;
font-size: 13px;
color: #937950;
+ line-height: 20px;
+ margin-bottom: 10px;
img {
cursor: pointer;
@@ -976,16 +1094,17 @@
font-size: 16px;
font-weight: bold;
color: #937950;
+ margin-bottom: 5px;
::v-deep .el-button {
font-size: 14px;
background-color: transparent;
color: #937950;
- border: 1px solid #6f5a3a;
+ border: 1px solid #937950;
border-radius: 0;
&:hover {
- background-color: #6f5a3a;
+ background-color: #937950;
color: #fffdf8;
}
}
@@ -997,7 +1116,6 @@
background-color: #87a8b9;
color: #fff;
margin-right: 10px;
-
}
span:nth-child(2) {
@@ -1006,7 +1124,6 @@
font-weight: 350;
padding-right: 10px;
color: #333;
-
}
span:nth-child(3) {
@@ -1027,8 +1144,6 @@
color: #333;
border-left: 1px solid #2c2c2c;
}
-
-
margin-bottom: 10px;
}
@@ -1133,3 +1248,23 @@
border: 1px solid #cccccc;
}
</style>
+
+<style>
+.el-input.is-focus .el-input__inner {
+ color: #937950 !important;
+ border-color: #937950 !important;
+ font-weight: bold;
+
+}
+
+
+.el-select-dropdown__item.selected {
+ color: #937950 !important;
+ font-weight: bold;
+}
+
+.el-select .el-input__inner:focus {
+ border-color: #937950;
+ font-weight: bold;
+}
+</style>
\ No newline at end of file
--
Gitblit v1.9.1