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/directory/index.vue | 86 ++++++++++++++++++++++++++++++------------
1 files changed, 61 insertions(+), 25 deletions(-)
diff --git a/src/views/directory/index.vue b/src/views/directory/index.vue
index 0af77d1..0d3e66f 100644
--- a/src/views/directory/index.vue
+++ b/src/views/directory/index.vue
@@ -26,7 +26,14 @@
</p>
</div>
<!-- 鍥捐〃鏄剧ず -->
- <div class="charts-main" v-if="activeTabs == 'chart'">
+ <div
+ class="charts-main"
+ v-if="activeTabs == 'chart'"
+ v-loading="loading"
+ element-loading-text="鍥捐〃鍔犺浇涓�"
+ element-loading-spinner="el-icon-loading"
+ element-loading-background="rgba(0, 0, 0, 0)"
+ >
<div class="radial-tree-container" v-show="!loading">
<div ref="chart" style="width: 100%; height: 70vh"></div>
</div>
@@ -83,8 +90,14 @@
{{ currentNodeInfo.name }}
</div>
<div style="margin-top: 20px">
- <span> 鐢� </span> <span> 纭曞＋ </span>
- <span> 鍖椾含涓尰鑽ぇ瀛� </span>
+ <span>
+ {{
+ currentNodeInfo.gender == "male" ? "鐢�" : "濂�" || "-"
+ }}
+ </span>
+ <span> {{ currentNodeInfo.academicName || "-"}} </span>
+ <span> {{ legendList.find((item) => item.value == currentNodeInfo.unit)?.name ||
+ "-" }} </span>
</div>
</div>
</div>
@@ -98,12 +111,12 @@
margin-top: 10px;
"
>
- <p style="margin-bottom: 15px">瀛︿範鏃堕棿锛�1985.09 -1988.07</p>
+ <p style="margin-bottom: 15px">瀛︿範鏃堕棿锛歿{ currentNodeInfo.studyTime || "-" }}</p>
<p style="margin-bottom: 15px">
- 鐜板伐浣滃崟浣嶏細鍖椾含涓尰鑽ぇ瀛︿笢鏂瑰尰闄�
+ 鐜板伐浣滃崟浣嶏細 {{currentNodeInfo.currentEmployer_secondary || '-' }}
</p>
- <p style="margin-bottom: 15px">鑱屽姟锛氬師闄㈤暱</p>
- <p style="margin-bottom: 15px">鑱岀О锛氫富浠诲尰甯堛�佹暀鎺�</p>
+ <p style="margin-bottom: 15px">鑱屽姟锛歿{ currentNodeInfo.jobTitle || "-" }}</p>
+ <p style="margin-bottom: 15px">鑱岀О锛歿{ currentNodeInfo.professionalTitle || "-" }}</p>
</div>
<div style="text-align: left; line-height: 22px">
<p>
@@ -132,7 +145,8 @@
</div>
<!-- 鍒楄〃鏄剧ず -->
<div class="page-main" v-if="activeTabs == 'list'">
- <div v-loading="loading">
+ <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"
@@ -285,7 +299,7 @@
formatter: (params) => {
const data = params.data;
this.currentNodeInfo = data;
-
+ console.log(data, "data");
if (data.cmsItemType == "student") {
return `
<div style="
@@ -300,14 +314,27 @@
<img class="autoImg" src="${require("@/assets/images/directory/touxiang.png")}" alt="">
</div>
<div style="font-size: 16px; font-weight: bold; margin-bottom: 5px;">${
- data.name|| '-'
+ data.name || "-"
}</div>
- <div> <span> ${data.gender == "male" ? "鐢�" : "濂�" || '-'} </span> <span> ${data.academicName || '-'} </span> <span> ${ this.legendList.find((item) => item.value == data.unit)?.name || '-'} </span></div>
+ <div> <span> ${
+ data.gender == "male" ? "鐢�" : "濂�" || "-"
+ } </span> <span> ${data.academicName || "-"} </span> <span> ${
+ this.legendList.find((item) => item.value == data.unit)?.name ||
+ "-"
+ } </span></div>
<div style="font-size: 16px; font-weight: bold; margin-bottom: 5px;text-align: left;margin-top: 10px;overflow: hidden;">
- <p style="margin-bottom: 5px;">瀛︿範鏃堕棿锛�${data.studyTime || '-'}</p>
- <p style="margin-bottom: 5px; white-space: pre-wrap" >鐜板伐浣滃崟浣嶏細${data.currentEmployer_secondary || '-'}</p>
- <p style="margin-bottom: 5px;">鑱屽姟锛�${data.jobTitle || '-'}</p>
- <p style="margin-bottom: 5px;">鑱岀О锛�${data.professionalTitle || '-'}</p>
+ <p style="margin-bottom: 5px;">瀛︿範鏃堕棿锛�${
+ data.studyTime || "-"
+ }</p>
+ <p style="margin-bottom: 5px; white-space: pre-wrap" >鐜板伐浣滃崟浣嶏細${
+ data.currentEmployer_secondary || "-"
+ }</p>
+ <p style="margin-bottom: 5px;">鑱屽姟锛�${
+ data.jobTitle || "-"
+ }</p>
+ <p style="margin-bottom: 5px;">鑱岀О锛�${
+ data.professionalTitle || "-"
+ }</p>
</div>
</div>
@@ -328,14 +355,10 @@
<div style="font-size: 16px; font-weight: bold; margin-bottom: 5px;">${
data.name
}</div>
- <div> <span> 娴嬭瘯 </span> <span> 纭曞＋ </span> <span> 鍖椾含涓尰鑽ぇ瀛� </span></div>
- <div style="font-size: 16px; font-weight: bold; margin-bottom: 5px;text-align: left;margin-top: 10px;">
- <p style="margin-bottom: 5px;">瀛︿範鏃堕棿锛�1985.09 -1988.07</p>
- <p style="margin-bottom: 5px;">鐜板伐浣滃崟浣嶏細鍖椾含涓尰鑽ぇ瀛︿笢鏂瑰尰闄�</p>
- <p style="margin-bottom: 5px;">鑱屽姟锛氬師闄㈤暱</p>
- <p style="margin-bottom: 5px;">鑱岀О锛氫富浠诲尰甯堛�佹暀鎺�</p>
- </div>
-
+ <div> <span> ${data.academicDegreeValue} </span> <span> ${
+ data.academicDegreeName
+ } </span></div>
+
</div>
`;
}
@@ -491,6 +514,7 @@
});
});
});
+ this.loading = false;
console.log(res, "res");
if (res.datas && res.datas.length) {
res.datas.forEach((item) => {
@@ -499,7 +523,9 @@
item.unit == citem.unitValue &&
item.academicDegree == citem.academicDegreeValue
) {
- item.academicName = this.academicDegreeList.find(f => f.value == item.academicDegree)?.name
+ item.academicName = this.academicDegreeList.find(
+ (f) => f.value == item.academicDegree
+ )?.name;
citem.studentList.push(item);
citem.children.push(item);
}
@@ -518,7 +544,7 @@
console.log(this.chartData, "this.chartData");
this.initChart();
- this.loading = false;
+
}
})
.catch((error) => {
@@ -655,6 +681,8 @@
.charts-main {
// background-color: #000;
position: relative;
+ margin: 0 auto;
+ min-height: 600px;
}
.table-title {
@@ -737,4 +765,12 @@
.tagText {
margin-left: 30px;
}
+::v-deep .el-loading-spinner {
+ color: #937950 !important;
+}
+
+::v-deep .el-loading-spinner .el-loading-text {
+ font-size: 14px;
+ color: #937950;
+}
</style>
--
Gitblit v1.9.1