From de962e6331d7ebf3c660a3b0d7fa1dbdc81c645f Mon Sep 17 00:00:00 2001
From: 杨磊 <505174330@qq.com>
Date: 星期一, 28 四月 2025 19:30:04 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/wyyDatabase
---
src/views/honors/index.vue | 10
/dev/null | 0
src/views/achievements/index.vue | 306 ++++++++++++---------------------
src/views/achievements/details.vue | 9
src/assets/images/directory/topIcon.svg | 1
src/assets/images/directory/bottomIcon.svg | 1
src/views/directory/index.vue | 197 ++++++++++++++-------
7 files changed, 254 insertions(+), 270 deletions(-)
diff --git a/src/assets/images/directory/bottomIcon.png b/src/assets/images/directory/bottomIcon.png
deleted file mode 100644
index 426dab4..0000000
--- a/src/assets/images/directory/bottomIcon.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/images/directory/bottomIcon.svg b/src/assets/images/directory/bottomIcon.svg
new file mode 100644
index 0000000..2401076
--- /dev/null
+++ b/src/assets/images/directory/bottomIcon.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1745833947877" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="5416" xmlns:xlink="http://www.w3.org/1999/xlink" width="32" height="32"><path d="M512 693.333333c-14.933333 0-29.866667-4.266667-40.533333-14.933333l-277.33333399-234.666667c-27.733333-23.466667-29.866667-64-8.53333301-89.6 23.466667-27.733333 64-29.866667 89.6-8.53333299L512 546.133333l236.8-200.53333299c27.733333-23.466667 68.266667-19.19999999 89.6 8.53333299 23.466667 27.733333 19.19999999 68.266667-8.53333301 89.6l-277.33333399 234.666667c-10.666667 10.666667-25.6 14.933333-40.533333 14.933333z" fill="#FFFFFF" p-id="5417"></path></svg>
\ No newline at end of file
diff --git a/src/assets/images/directory/topIcon.png b/src/assets/images/directory/topIcon.png
deleted file mode 100644
index e6c63db..0000000
--- a/src/assets/images/directory/topIcon.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/images/directory/topIcon.svg b/src/assets/images/directory/topIcon.svg
new file mode 100644
index 0000000..d577b98
--- /dev/null
+++ b/src/assets/images/directory/topIcon.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1745833941015" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="5250" xmlns:xlink="http://www.w3.org/1999/xlink" width="32" height="32"><path d="M512 330.666667c14.933333 0 29.866667 4.266667 40.533333 14.933333l277.33333399 234.666667c27.733333 23.466667 29.866667 64 8.53333301 89.6-23.466667 27.733333-64 29.866667-89.6 8.53333299L512 477.866667l-236.8 200.53333299c-27.733333 23.466667-68.266667 19.19999999-89.6-8.53333299-23.466667-27.733333-19.19999999-68.266667 8.53333301-89.6l277.33333399-234.666667c10.666667-10.666667 25.6-14.933333 40.533333-14.933333z" fill="#FFFFFF" p-id="5251"></path></svg>
\ No newline at end of file
diff --git a/src/views/achievements/details.vue b/src/views/achievements/details.vue
index 043b07e..e3708e1 100644
--- a/src/views/achievements/details.vue
+++ b/src/views/achievements/details.vue
@@ -154,7 +154,7 @@
resourceTypeValueList: [],
// 鏌ヨ缁撴灉
resultList: [],
- loading: false,
+ loading: true,
pdfLoading: false,
};
},
@@ -207,6 +207,7 @@
cmsType: ["cmsItem"],
"Id=": [id + ""],
source: [],
+ isbn: [],
year: [],
abstract: [],
keyWords: [],
@@ -433,6 +434,7 @@
// 'id=':[this.$route.params.key],
"resourceType*": this.resourceTypeValueList,
source: [],
+ isbn: [],
year: [],
abstract: [],
keyWords: [],
@@ -486,6 +488,7 @@
cmsType: ["cmsItem"],
"resourceType*": this.resourceTypeValueList,
source: [],
+ isbn: [],
year: [],
abstract: [],
keyWords: [],
@@ -687,9 +690,10 @@
display: -webkit-box;
-webkit-box-orient: vertical;
- .abstract-title{
+ .abstract-title {
font-weight: bold;
}
+
span {
font-family: Source Han Sans;
font-size: 14px;
@@ -880,6 +884,7 @@
color: #333;
border-left: 1px solid #2c2c2c;
}
+
margin-bottom: 15px;
}
diff --git a/src/views/achievements/index.vue b/src/views/achievements/index.vue
index 42bb078..b147315 100644
--- a/src/views/achievements/index.vue
+++ b/src/views/achievements/index.vue
@@ -19,17 +19,12 @@
</ul>
<!-- 楂樼骇鎼滅储 -->
<div v-if="isDisplay" class="page-search">
- <MyForm
- class="myfrom"
- @submit="
- (data) => {
- CurrentPage = 1;
- onSubmit(data);
- }
- "
- @reset="resetForm"
- :from="from"
- />
+ <MyForm class="myfrom" @submit="
+ (data) => {
+ CurrentPage = 1;
+ onSubmit(data);
+ }
+ " @reset="resetForm" :from="from" />
</div>
<!-- 鎼滅储缁撴灉 -->
<div class="page-content">
@@ -39,31 +34,15 @@
<li class="left-title">
<span>{{ category.title }}</span>
<p @click="category.isDisplay = !category.isDisplay">
- <img
- :src="[category.isDisplay ? topIcon : bottomIcon]"
- alt=""
- />
+ <img :src="[category.isDisplay ? topIcon : bottomIcon]" alt="" />
</p>
</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"
- 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 class="category-main" v-for="(item, index) in category.list" :key="index">
+ <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>
@@ -74,50 +53,25 @@
<span>{{ annual.title }}</span>
<span>
鏃堕棿
- <img
- class="sort-Icon"
- :src="[isDisplay ? sortTop : sortBottom]"
- alt=""
- />
+ <img class="sort-Icon" :src="[isDisplay ? sortTop : sortBottom]" alt="" />
</span>
- <span
- >鏂囩尞閲�
- <img
- class="sort-Icon"
- :src="[isDisplay ? sortBottom : sortTop]"
- alt=""
- />
+ <span>鏂囩尞閲�
+ <img class="sort-Icon" :src="[isDisplay ? sortBottom : sortTop]" alt="" />
</span>
</div>
<p @click="annual.isDisplay = !annual.isDisplay">
- <img
- :src="[annual.isDisplay ? topIcon : bottomIcon]"
- alt=""
- />
+ <img :src="[annual.isDisplay ? topIcon : bottomIcon]" alt="" />
</p>
</li>
<li class="left-main" v-if="annual.isDisplay">
- <div
- class="annual-main"
- :style="{
- display: index + 1 > professionIndex ? 'none' : '',
- }"
- v-for="(item, index) in annual.list"
- :key="index"
- >
- <el-checkbox
- class="el-checkbox"
- v-model="item.checked"
- :title="item.years"
- >{{ item.years }}</el-checkbox
- >
+ <div class="annual-main" :style="{
+ display: index + 1 > professionIndex ? 'none' : '',
+ }" v-for="(item, index) in annual.list" :key="index">
+ <el-checkbox class="el-checkbox" v-model="item.checked" :title="item.years">{{ item.years
+ }}</el-checkbox>
<span class="">{{ item.num }}</span>
</div>
- <p
- class="annual-footer"
- v-if="annual.list && annual.list.length > 5"
- @click="shrinkClick('a', '骞村害')"
- >
+ <p class="annual-footer" v-if="annual.list && annual.list.length > 5" @click="shrinkClick('a', '骞村害')">
{{ activeBox !== "a" ? "鏇村 鈭�" : "鏀惰捣 鈭�" }}
</p>
</li>
@@ -129,42 +83,23 @@
<span>{{ sources.title }}</span>
<span>
鏂囩尞閲�
- <img
- class="sort-Icon"
- :src="[isDisplay ? sortBottom : sortTop]"
- alt=""
- />
+ <img class="sort-Icon" :src="[isDisplay ? sortBottom : sortTop]" alt="" />
</span>
</div>
<p @click="sources.isDisplay = !sources.isDisplay">
- <img
- :src="[sources.isDisplay ? topIcon : bottomIcon]"
- alt=""
- />
+ <img :src="[sources.isDisplay ? topIcon : bottomIcon]" alt="" />
</p>
</li>
<li class="left-main" v-if="sources.isDisplay">
- <div
- class="sources-main"
- v-for="(item, index) in sources.list"
- :key="index"
- :style="{
- display: index + 1 > dynastyIndex ? 'none' : '',
- }"
- >
- <el-checkbox
- class="el-checkbox"
- :title="item.name"
- v-model="item.checked"
- >{{ item.name }}</el-checkbox
- >
+ <div class="sources-main" v-for="(item, index) in sources.list" :key="index" :style="{
+ display: index + 1 > dynastyIndex ? 'none' : '',
+ }">
+ <el-checkbox class="el-checkbox" :title="item.name" v-model="item.checked">{{ item.name
+ }}</el-checkbox>
<span class="">{{ item.num }}</span>
</div>
- <p
- class="sources-footer"
- v-if="sources.list && sources.list.length > 5"
- @click="shrinkClick('b', '鏂囩尞鏉ユ簮')"
- >
+ <p class="sources-footer" v-if="sources.list && sources.list.length > 5"
+ @click="shrinkClick('b', '鏂囩尞鏉ユ簮')">
{{ activeBox !== "b" ? "鏇村 鈭�" : "鏀惰捣 鈭�" }}
</p>
</li>
@@ -174,67 +109,39 @@
<li class="left-title">
<span>{{ subject.title }}</span>
<p @click="subject.isDisplay = !subject.isDisplay">
- <img
- :src="[subject.isDisplay ? topIcon : bottomIcon]"
- alt=""
- />
+ <img :src="[subject.isDisplay ? topIcon : bottomIcon]" alt="" />
</p>
</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"
- @change="subjectChange(item)"
- >{{ item.name }}</el-checkbox
- >
+ <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"
+ @change="subjectChange(item)">{{ item.name }}</el-checkbox>
<span class="">{{ item.num }}</span>
</div>
</li>
</ul> -->
</div>
- <div
- class="content-right"
- v-loading="loading"
- element-loading-text="妫�绱㈢粨鏋滃姞杞戒腑"
- element-loading-spinner="el-icon-loading"
- element-loading-background="rgba(0, 0, 0, 0)"
- >
+ <div class="content-right" v-loading="loading" element-loading-text="妫�绱㈢粨鏋滃姞杞戒腑"
+ element-loading-spinner="el-icon-loading" element-loading-background="rgba(0, 0, 0, 0)">
<!-- title閮ㄥ垎 -->
<ul class="right-header">
<li v-for="(item, index) in associationList" :key="index">
<p>{{ item.type }} : {{ item.content }}</p>
- <img
- @click="removeAssociationList(item.content)"
- :src="errorIcon"
- alt=""
- />
+ <img @click="removeAssociationList(item.content)" :src="errorIcon" alt="" />
</li>
</ul>
<!-- 鍏眡x鏉� -->
<ul class="right-number">
<ul class="number-number">
- 鍏辨壘鍒�<span>{{ this.total }}</span
- >鏉＄粨鏋�
+ 鍏辨壘鍒�<span>{{ this.total }}</span>鏉＄粨鏋�
</ul>
<ul class="number-time">
鍙戣〃鏃堕棿
- <span @click="sortChange()"
- ><img :src="!postedSortInfo ? sortBottom : sortTop" alt=""
- /></span>
+ <span @click="sortChange()"><img :src="!postedSortInfo ? sortBottom : sortTop" alt="" /></span>
</ul>
</ul>
<!-- 缁撴灉灞曠ず -->
- <ul
- class="right-main"
- v-for="(item, index) in resultList"
- :key="index"
- >
+ <ul class="right-main" v-for="(item, index) in resultList" :key="index">
<li class="main-name">
<p>{{ item.name }}</p>
<p>
@@ -243,7 +150,7 @@
</p>
</li>
<li class="main-sources">
- <span>{{ item.resourceTypeName }}</span>
+ <span :class="getResourceTypeClass(item.cmsItemType)">{{ item.resourceTypeName }}</span>
<span>{{ item.source }}</span>
<span>{{ item.year }}</span>
<span v-if="item.DOI">doi锛歿{ item.DOI }}</span>
@@ -251,49 +158,31 @@
<li class="main-author">
{{ item.author }}
</li>
- <li
- class="main-title"
- :title="item.cleanAbstract"
- v-if="item.abstract"
- >
+ <li class="main-title" :title="item.cleanAbstract" v-if="item.abstract">
<span>鎽樿: </span>
<span
class="page-main-abstract"
v-html="item.cleanAbstract"
></span>
</li>
- <li
- class="main-keyword"
- v-if="item.keyWords && item.keyWords.length > 0"
- >
+ <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"
- @click="
- () =>
- handleSearch({
- text: citem,
- type: 'keyWords',
- label: '鍏抽敭璇�',
- })
- "
- >
+ <span class="keyWord" v-for="(citem, cindex) in item.keyWords" :key="cindex" @click="
+ () =>
+ handleSearch({
+ text: citem,
+ type: 'keyWords',
+ label: '鍏抽敭璇�',
+ })
+ ">
{{ citem }}
</span>
</li>
</ul>
<!-- 鍒嗛〉 -->
<div class="pagination" v-if="total > 6">
- <el-pagination
- @current-change="handleCurrentChange"
- class="msg-pagination-container"
- :background="isBackground"
- layout="prev, pager, next"
- :total="total"
- :page-size="6"
- >
+ <el-pagination @current-change="handleCurrentChange" class="msg-pagination-container"
+ :background="isBackground" layout="prev, pager, next" :total="total" :page-size="10">
</el-pagination>
</div>
<el-empty v-if="!loading && !resultList.length"></el-empty>
@@ -562,7 +451,7 @@
resultList: [],
total: 0,
paginationPage: 1,
- loading: false,
+ loading: true,
labelList: {
abstract: "鎽樿",
author: "浣滆��",
@@ -710,7 +599,6 @@
console.log(isText, "isText");
this.associationList = [];
console.log(isText, "isText");
-
if (isText.text != "") {
this.inputValue = isText.text;
this.inputType = isText.type;
@@ -754,28 +642,26 @@
}
}
}
- console.log(searchData, "searchData1");
-
- if (this.associationList && this.associationList.length) {
- this.associationList.forEach((item) => {
- if (item.value == "year") {
- const endDate = item.content.split("/")[0] + "/12/31 23:59:59";
- const startDate = item.content.split("/")[0] + "/01/01 00:00:00";
- searchData[item.value + ">="] = startDate;
- searchData[item.value + "<="] = endDate;
- } else if (item.value) {
- searchData[item.value + "*"] = item.content;
- }
- });
- }
+ // if (this.associationList && this.associationList.length) {
+ // this.associationList.forEach((item) => {
+ // if (item.value == "year") {
+ // const endDate = item.content.split("/")[0] + "/12/31 23:59:59";
+ // const startDate = item.content.split("/")[0] + "/01/01 00:00:00";
+ // searchData[item.value + ">="] = startDate;
+ // searchData[item.value + "<="] = endDate;
+ // } else {
+ // searchData["||" + item.value + "*"] = item.content;
+ // }
+ // });
+ // }
console.log(searchData, "searchData");
MG.resource
.getItem({
path: "*",
queryType: "*",
paging: {
- start: (this.paginationPage - 1) * 6,
- size: 6,
+ start: (this.paginationPage - 1) * 10,
+ size: 10,
},
sort: {
year: this.postedSortInfo ? "Desc" : "Asc",
@@ -787,6 +673,7 @@
? this.categoryChecList
: this.resourceTypeValueList,
source: [],
+ isbn: [],
year: [],
abstract: [],
keyWords: [],
@@ -858,6 +745,22 @@
this.postedSortInfo = !this.postedSortInfo;
this.getItemList();
},
+ getResourceTypeClass(typeName) {
+ switch (typeName) {
+ case 'journal':
+ return 'journal-color';
+ case 'books':
+ return 'books-color';
+ case 'video':
+ return 'video-color';
+ case 'audio':
+ return 'audio-color';
+ case 'newspaper':
+ return 'newspaper-color';
+ default:
+ return 'other-color';
+ }
+ }
},
};
</script>
@@ -1145,15 +1048,12 @@
border-color: #d1d1d1;
}
- ::v-deep .el-checkbox .el-checkbox__input.is-checked + .el-checkbox__label {
+ ::v-deep .el-checkbox .el-checkbox__input.is-checked+.el-checkbox__label {
color: #2c2c2c;
}
::v-deep .el-checkbox .el-checkbox__input.is-checked .el-checkbox__inner,
- ::v-deep
- .el-checkbox
- .el-checkbox__input.is-indeterminate
- .el-checkbox__inner {
+ ::v-deep .el-checkbox .el-checkbox__input.is-indeterminate .el-checkbox__inner {
border-color: #8f7a5a;
background-color: #8f7a5a;
}
@@ -1280,10 +1180,31 @@
}
}
+ .journal-color {
+ background-color: #87a8b9;
+ }
+ .books-color {
+ background-color: #C48787;
+ }
+ .video-color {
+ background-color: #6F8F5A;
+ }
+ .audio-color {
+ background-color: #937950;
+ }
+ .newspaper-color {
+ background-color: #8D77B3;
+ }
+ .other-color {
+ background-color: #009F9F;
+ }
+
+
+
.main-sources {
span:nth-child(1) {
padding: 3px 5px;
- background-color: #87a8b9;
+
color: #fff;
margin-right: 10px;
}
@@ -1410,16 +1331,15 @@
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;
border-radius: 5px;
border: 1px solid #cccccc;
}
-:deep.el-pagination.is-background .el-pager li:not(.disabled):hover{
+
+:deep.el-pagination.is-background .el-pager li:not(.disabled):hover {
color: #937950
}
</style>
diff --git a/src/views/directory/index.vue b/src/views/directory/index.vue
index 5ed4e5c..9a1ea8c 100644
--- a/src/views/directory/index.vue
+++ b/src/views/directory/index.vue
@@ -53,8 +53,8 @@
background: #d8d8d8;
">
<img class="autoImg" :src="currentNodeInfo.icon
- ? currentNodeInfo.icon
- : '@/assets/images/directory/touxiang.png'
+ ? currentNodeInfo.icon
+ : '@/assets/images/directory/touxiang.png'
" alt="" />
</div>
<div style="padding-top: 20px; text-align: left; margin-left: 20px">
@@ -138,58 +138,62 @@
<div v-loading="loading" style="min-height: 550px" element-loading-background="rgba(0, 0, 0, 0)"
element-loading-text="瀛︾敓鍒楄〃鍔犺浇涓�" element-loading-spinner="el-icon-loading">
<div v-for="(item, index) in universityList" :key="index">
- <div class="table-title" v-if="item.studentList && item.studentList.length > 0">
+ <div class="table-title" v-if="item.agreelist && item.agreelist.length > 0">
<div class="table-title-left">
<p class="table-title-name">{{ item.unitName }}</p>
- <p class="table-title-degree">{{ item.academicDegreeName }}</p>
- <p class="table-title-number">
- {{ item.studentList.length }}浜�
- </p>
</div>
<div class="table-title-right" @click="item.isShow = !item.isShow">
<img :src="[item.isShow ? topIcon : bottomIcon]" alt="" />
</div>
</div>
- <table cellpadding="100" v-if="
- item.studentList && item.studentList.length > 0 && item.isShow
- " style="vertical-align: middle">
- <tr class="table-heading">
- <th>濮撳悕</th>
- <th>鎬у埆</th>
- <th>瀛︿範鏃堕棿</th>
- <th>宸ヤ綔鍗曚綅锛堝埌浜岀骇鍗曚綅鍏ㄧО锛�</th>
- <th>鑱屽姟</th>
- <th>鑱岀О</th>
- </tr>
- <tr v-for="(citem, cindex) in item.studentList" :key="cindex">
- <td>
- {{ citem.name }}
- </td>
- <td>
- {{ citem.gender == "male" ? "鐢�" : "濂�" }}
- </td>
- <td>{{ citem.studyTime }}</td>
- <td>{{ citem.currentEmployer_secondary }}</td>
- <td>
- {{
- citem.jobTitle === undefined || citem.jobTitle === ""
- ? "-"
- : citem.jobTitle
- }}
- </td>
- <td>
- {{
- citem.professionalTitle === undefined ||
- citem.professionalTitle === ""
- ? "-"
- : citem.professionalTitle
- }}
- </td>
- </tr>
- </table>
+ <div v-if="item.agreelist && item.agreelist.length > 0 && item.isShow">
+ <div v-for="(citem, cindex) in item.agreelist" :key="cindex">
+ <div class="agree-title">
+ <p class="table-title-degree">{{ citem.academicDegreeName }}</p>
+ <p class="table-title-number">
+ {{ citem.studentList.length }}浜�
+ </p>
+ </div>
+ <table cellpadding="100" style="vertical-align: middle">
+ <tr class="table-header">
+ <th>濮撳悕</th>
+ <th>鎬у埆</th>
+ <th>瀛︿範鏃堕棿</th>
+ <th>宸ヤ綔鍗曚綅锛堝埌浜岀骇鍗曚綅鍏ㄧО锛�</th>
+ <th>鑱屽姟</th>
+ <th>鑱岀О</th>
+ </tr>
+ <tr v-for="(ditem, dindex) in citem.studentList" :key="dindex">
+ <td>
+ {{ ditem.name }}
+ </td>
+ <td>
+ {{ ditem.gender == "male" ? "鐢�" : "濂�" }}
+ </td>
+ <td>{{ ditem.studyTime }}</td>
+ <td>{{ ditem.currentEmployer_secondary }}</td>
+ <td>
+ {{
+ ditem.jobTitle === undefined || ditem.jobTitle === ""
+ ? "-"
+ : ditem.jobTitle
+ }}
+ </td>
+ <td>
+ {{
+ ditem.professionalTitle === undefined ||
+ ditem.professionalTitle === ""
+ ? "-"
+ : ditem.professionalTitle
+ }}
+ </td>
+ </tr>
+ </table>
+ </div>
+ </div>
</div>
</div>
- <!-- <el-empty v-if="!resultList.length"></el-empty> -->
+ <!-- <el-empty v-if="!loading && !universityList.length"></el-empty> -->
</div>
</div>
</div>
@@ -214,8 +218,8 @@
noChartIcon: require("@/assets/images/directory/noChartIcon.png"),
listIcon: require("@/assets/images/directory/listIcon.png"),
noListIcon: require("@/assets/images/directory/noListIcon.png"),
- topIcon: require("@/assets/images/directory/topIcon.png"),
- bottomIcon: require("@/assets/images/directory/bottomIcon.png"),
+ topIcon: require("@/assets/images/directory/topIcon.svg"),
+ bottomIcon: require("@/assets/images/directory/bottomIcon.svg"),
activeTabs: "chart",
universityList: [],
chart: null,
@@ -469,8 +473,27 @@
})
.then((res) => {
let arrList = [];
+ let schoolList = [];
console.log(this.unitList, "unitList");
console.log(this.academicDegreeList, "this.academicDegreeList");
+ this.unitList.forEach((item, index) => {
+ schoolList.push({
+ unitName: item.name,
+ unitValue: item.value,
+ isShow: index === 0, // 濡傛灉鏄涓�涓厓绱�(index涓�0)锛屽垯isShow涓簍rue锛屽惁鍒欎负false
+ agreelist: [],
+ });
+ });
+ this.academicDegreeList.forEach((item) => {
+ schoolList.forEach((citem) => {
+ citem.agreelist.push({
+ academicDegreeName: item.name,
+ academicDegreeValue: item.value,
+ studentList: [],
+ });
+ });
+ })
+ console.log(schoolList, "schoolList");
this.unitList.forEach((item) => {
this.academicDegreeList.forEach((citem) => {
arrList.push({
@@ -491,9 +514,6 @@
});
});
});
- console.log(arrList, "arrList");
- console.log(res, "res");
-
if (res.datas && res.datas.length) {
res.datas.forEach((item) => {
arrList.forEach((citem) => {
@@ -509,10 +529,31 @@
}
});
});
- console.log(arrList, "鍘婚櫎arrList");
+
+ res.datas.forEach((item) => {
+ schoolList.forEach((citem) => {
+ citem.agreelist.forEach((ditem) => {
+ if (item.unit == citem.unitValue && item.academicDegree == ditem.academicDegreeValue) {
+ ditem.studentList.push(item);
+ }
+ });
+ });
+ });
+ console.log(schoolList, "schoolList");
+
+ // 浣跨敤filter鏂规硶杩囨护schoolList锛屽垹闄greelist闀垮害涓�0鐨刬tem
+ schoolList = schoolList.filter((item) => {
+ // 鍏堣繃婊ゆ帀閭ｄ簺studentList闀垮害涓�0鐨刢item
+ item.agreelist = item.agreelist.filter((citem) => citem.studentList.length > 0);
+ // 鐒跺悗妫�鏌ヨ繃婊ゅ悗鐨刟greelist闀垮害鏄惁澶т簬0
+ return item.agreelist.length > 0;
+ });
+
+ // 姝ゆ椂schoolList涓笉鍖呭惈agreelist闀垮害涓�0鐨刬tem
+
+ console.log(schoolList, "澶勭悊濂界殑schoolList");
+ this.universityList = schoolList;
arrList = arrList.filter((item) => item.studentList.length);
- console.log(arrList, "arrList");
- this.universityList = arrList;
this.chartData.children = arrList;
const temp_chartData = {
name: "鐜嬫案鐐�",
@@ -628,7 +669,9 @@
background-color: #fff;
background-clip: padding-box;
border-bottom: 2px solid transparent;
+ line-height: 20px;
}
+
th {
font-family: Source Han Serif CN;
@@ -636,6 +679,7 @@
font-weight: bold;
padding: 4px 41px;
text-wrap: nowrap;
+ line-height: 30px;
}
td {
@@ -645,10 +689,12 @@
text-align: center;
display: table-cell;
vertical-align: middle;
+ line-height: 20px;
}
td:nth-child(1) {
text-wrap: nowrap;
+ line-height: 20px;
}
tr:last-child td {
@@ -669,9 +715,11 @@
align-items: center;
justify-content: space-between;
padding: 10px 28px;
- background-color: #d8cbb6;
+ background-color: #937950;
margin-bottom: 4px;
margin-top: 2px;
+ line-height: 35px;
+
.table-title-left {
display: flex;
@@ -679,23 +727,11 @@
}
.table-title-name {
+ color: #fff;
width: 200px;
overflow: hidden;
font-family: Source Han Serif CN;
font-size: 18px;
- font-weight: bold;
- }
-
- .table-title-degree {
- font-family: Source Han Serif CN;
- font-size: 14px;
- font-weight: bold;
- margin-right: 40px;
- }
-
- .table-title-number {
- font-family: Source Han Serif CN;
- font-size: 14px;
font-weight: bold;
}
@@ -704,8 +740,33 @@
}
img {
+ display: flex;
+ align-items: center;
width: 20px;
height: auto;
+ }
+}
+
+
+.agree-title {
+ display: flex;
+ line-height: 45px;
+ background-color: #d8cbb6;
+ margin-bottom: 4px;
+ margin-top: 2px;
+
+ .table-title-degree {
+ font-family: Source Han Serif CN;
+ font-size: 14px;
+ font-weight: bold;
+ margin-right: 40px;
+ margin-left: 50px;
+ }
+
+ .table-title-number {
+ font-family: Source Han Serif CN;
+ font-size: 14px;
+ font-weight: bold;
}
}
@@ -760,7 +821,7 @@
color: #937950;
}
- .el-icon-loading{
+ .el-icon-loading {
font-size: 14px;
color: #937950;
}
diff --git a/src/views/honors/index.vue b/src/views/honors/index.vue
index 7d14eb4..cae8214 100644
--- a/src/views/honors/index.vue
+++ b/src/views/honors/index.vue
@@ -34,8 +34,7 @@
</el-pagination>
</div>
</div>
-
-
+ <el-empty v-if="!loading && !honorList.length"></el-empty>
</div>
</div>
</div>
@@ -53,7 +52,7 @@
honorList: [],
total: 0,
currentPage: 1,
- loading: false,
+ loading: true,
};
},
mounted() {
@@ -74,9 +73,6 @@
start: (this.currentPage - 1) * 10,
size: 10,
},
- coverSize: {
- height: 70
- }
}).then((res) => {
console.log(res, "res");
if (res.datas && res.datas.length) {
@@ -343,7 +339,7 @@
}
//淇敼榧犳爣婊戣繃鐨勯鑹�
-:deep.el-pagination.is-background .el-pager li:not(.disabled):hover{
+:deep.el-pagination.is-background .el-pager li:not(.disabled):hover {
color: #937950
}
</style>
--
Gitblit v1.9.1