From 0e074957e62176e43c8c43b11fd46a7e89630abc Mon Sep 17 00:00:00 2001
From: 杨磊 <505174330@qq.com>
Date: 星期三, 23 四月 2025 18:22:56 +0800
Subject: [PATCH] 接口调用
---
src/assets/css/common.css | 4
src/views/chronology/index.vue | 21 +++
src/views/directory/index.vue | 238 +++++++++++++++++++++++++++++++++-------------
3 files changed, 192 insertions(+), 71 deletions(-)
diff --git a/src/assets/css/common.css b/src/assets/css/common.css
index a1ac529..464287b 100644
--- a/src/assets/css/common.css
+++ b/src/assets/css/common.css
@@ -173,4 +173,8 @@
.errorBack {
color: #fff !important;
background: #f56c6c !important;
+}
+
+::v-deep .el-loading-spinner {
+ color: #937950 !important;
}
\ No newline at end of file
diff --git a/src/views/chronology/index.vue b/src/views/chronology/index.vue
index 9543f12..7efd5f0 100644
--- a/src/views/chronology/index.vue
+++ b/src/views/chronology/index.vue
@@ -30,8 +30,14 @@
<div>鍏朵粬</div>
</div>
</div>
- <div class="contentBox">
- <div class="chartsBox" v-if="showList">
+ <div
+ class="contentBox"
+ element-loading-text="骞磋氨鍔犺浇涓�"
+ element-loading-spinner="el-icon-loading"
+ element-loading-background="rgba(0, 0, 0, 0)"
+ v-loading="!showList"
+ >
+ <div class="chartsBox">
<div
class="chartsItemBox"
v-for="(item, index) in contentList"
@@ -78,6 +84,7 @@
</div>
</div>
</div>
+ <div></div>
</div>
</div>
</div>
@@ -274,6 +281,13 @@
display: flex;
align-items: end;
overflow: auto;
+
+ ::v-deep .el-loading-spinner .el-loading-text {
+ font-size: 14px;
+ color: #937950;
+ }
+
+
.chartsBox {
white-space: nowrap;
padding: 0 80px;
@@ -429,4 +443,7 @@
right: 5px;
z-index: 999;
}
+::v-deep .el-loading-spinner {
+ color: #937950 !important;
+ }
</style>
diff --git a/src/views/directory/index.vue b/src/views/directory/index.vue
index 87150c5..0af77d1 100644
--- a/src/views/directory/index.vue
+++ b/src/views/directory/index.vue
@@ -7,18 +7,27 @@
</div>
<div class="page-main-father">
<div class="page-main-title">
- <p @click="changeTab('chart')" :class="[activeTabs == 'chart' ? 'active-tab' : '']">
- <img :src="[activeTabs == 'chart' ? chartIcon : noChartIcon]" alt="" />
+ <p
+ @click="changeTab('chart')"
+ :class="[activeTabs == 'chart' ? 'active-tab' : '']"
+ >
+ <img
+ :src="[activeTabs == 'chart' ? chartIcon : noChartIcon]"
+ alt=""
+ />
<span>鍥捐〃鏄剧ず</span>
</p>
- <p @click="changeTab('list')" :class="[activeTabs == 'list' ? 'active-tab' : '']">
+ <p
+ @click="changeTab('list')"
+ :class="[activeTabs == 'list' ? 'active-tab' : '']"
+ >
<img :src="[activeTabs == 'list' ? listIcon : noListIcon]" alt="" />
<span>鍒楄〃鏄剧ず</span>
</p>
</div>
<!-- 鍥捐〃鏄剧ず -->
<div class="charts-main" v-if="activeTabs == 'chart'">
- <div class="radial-tree-container">
+ <div class="radial-tree-container" v-show="!loading">
<div ref="chart" style="width: 100%; height: 70vh"></div>
</div>
@@ -32,33 +41,45 @@
</div>
<transition name="el-fade-in-linear">
<div class="tooltipBox" v-show="tooltipShow">
- <div style="
+ <div
+ style="
padding: 10px;
background: #fdf8f0;
border-radius: 5px;
width: 100%;
max-height: 500px;
text-align: center;
- ">
+ "
+ >
<div class="closeBtn" @click="tooltipShow = false">
<i class="el-icon-close"></i>
</div>
<div style="display: flex">
- <div style="
+ <div
+ style="
width: 80px;
height: 80px;
position: relative;
margin-bottom: 10px;
background: #d8d8d8;
- ">
- <img class="autoImg" src="@/assets/images/directory/touxiang.png" alt="" />
+ "
+ >
+ <img
+ class="autoImg"
+ src="@/assets/images/directory/touxiang.png"
+ alt=""
+ />
</div>
- <div style="padding-top: 20px; text-align: left; margin-left: 20px">
- <div style="
+ <div
+ style="padding-top: 20px; text-align: left; margin-left: 20px"
+ >
+ <div
+ style="
font-size: 16px;
font-weight: bold;
margin-bottom: 5px;
- ">
+ "
+ >
{{ currentNodeInfo.name }}
</div>
<div style="margin-top: 20px">
@@ -68,13 +89,15 @@
</div>
</div>
- <div style="
+ <div
+ style="
font-size: 16px;
font-weight: bold;
margin-bottom: 5px;
text-align: left;
margin-top: 10px;
- ">
+ "
+ >
<p style="margin-bottom: 15px">瀛︿範鏃堕棿锛�1985.09 -1988.07</p>
<p style="margin-bottom: 15px">
鐜板伐浣滃崟浣嶏細鍖椾含涓尰鑽ぇ瀛︿笢鏂瑰尰闄�
@@ -87,11 +110,13 @@
澶у鸡鍢堝槇濡傛�ラ洦锛屽皬寮﹀垏鍒囧绉佽銆傚槇鍢堝垏鍒囬敊鏉傚脊锛屽ぇ鐝犲皬鐝犺惤鐜夌洏銆傞棿鍏宠幒璇姳搴曟粦锛屽菇鍜芥硥娴佸啺涓嬮毦銆傚啺娉夊喎娑╁鸡鍑濈粷锛屽嚌缁濅笉閫氬０鏆傛瓏銆傚埆鏈夊菇鎰佹殫鎭ㄧ敓锛屾鏃舵棤澹拌儨鏈夊０銆傞摱鐡朵箥鐮存按娴嗚扛锛岄搧楠戠獊鍑哄垁鏋福銆傛洸缁堟敹鎷ㄥ綋蹇冪敾锛屽洓寮︿竴澹板瑁傚笡銆備笢鑸硅タ鑸倓鏃犺█锛屽敮瑙佹睙蹇冪鏈堢櫧銆�
</p>
</div>
- <div style="
+ <div
+ style="
display: flex;
justify-content: space-between;
margin-top: 20px;
- ">
+ "
+ >
<div style="text-align: left; width: 48%; line-height: 22px">
<p>
瑙傚か鏄庡爞涔嬪畯澹篃锛屽垯绐佸厐鐬虫洦锛屼箥鏄庝箥钂欙紝鑻ュぇ鍙ゅ厓姘斾箣缁撶┖銆傚穬宓搁娌擄紝鑻ュ惮鑻ュ丢锛屼技澶╅槂鍦伴棬涔嬪紑闃栥�傚皵涔冨垝宀濆硥浠ュ渤绔嬶紝閮佺┕宕囪�岄缚绾枫�傚啝鐧剧帇鑰屽瀭鍕嬶紝鐑涗竾璞¤�岃吘鏂囥�傜獧鎯氭亶浠ユ礊鍚紝鍛煎祵宀╄�屽倣鍒嗐�傚張姣斾箮鏄嗗北涔嬪ぉ鏌憋紝鐭椾節闇勮�屽瀭浜戙��
@@ -108,20 +133,32 @@
<!-- 鍒楄〃鏄剧ず -->
<div class="page-main" v-if="activeTabs == 'list'">
<div v-loading="loading">
- <div v-for="(item, index) in universityList" :key="index" >
- <div class="table-title" v-if="item.studentList && item.studentList.length > 0">
+ <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-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>
+ <p class="table-title-number">
+ {{ item.studentList.length }}浜�
+ </p>
</div>
- <div class="table-title-right" @click="item.isShow = !item.isShow">
+ <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;">
+ <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>
@@ -135,13 +172,25 @@
{{ citem.name }}
</td>
<td>
- {{ citem.gender == 'male' ? '鐢�' : '濂�' }}
+ {{ 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>
+ <td>
+ {{
+ citem.jobTitle === undefined || citem.jobTitle === ""
+ ? "-"
+ : citem.jobTitle
+ }}
+ </td>
+ <td>
+ {{
+ citem.professionalTitle === undefined ||
+ citem.professionalTitle === ""
+ ? "-"
+ : citem.professionalTitle
+ }}
+ </td>
</tr>
</table>
</div>
@@ -175,29 +224,34 @@
activeTabs: "chart",
universityList: [],
chart: null,
- chartData: treeData,
+ chartData: {},
currentNodeInfo: {},
tooltipShow: false,
legendList: [
{
color: "#87A7B9",
name: "鍖椾含涓尰澶у",
+ value: "BUCM",
},
{
color: "#C48787",
name: "鍖椾含甯堣寖澶у",
+ value: "BNU",
},
{
color: "#6F8F5A",
name: "涓浗涓尰绉戝闄�",
+ value: "CACMS",
},
{
color: "#937950",
name: "骞垮窞涓尰鑽ぇ瀛�",
+ value: "GZUCM",
},
{
color: "#8D77B3",
name: "鎷滃笀寮熷瓙",
+ value: "disciple",
},
],
loading: false,
@@ -206,12 +260,12 @@
mounted() {
this.initChart();
+ window.addEventListener("resize", this.handleResize);
this.getSelectData();
this.getStudentList();
- window.addEventListener("resize", this.handleResize);
},
beforeDestroy() {
- window.removeEventListener("resize", this.handleResize);
+ // window.removeEventListener("resize", this.handleResize);
if (this.chart) {
this.chart.dispose();
}
@@ -220,12 +274,6 @@
changeTab(key) {
this.activeTabs = key;
console.log(this.activeTabs, "activeTabs");
- if (key == "chart") {
- this.$nextTick(() => {
- this.initChart();
- window.addEventListener("resize", this.handleResize);
- });
- }
},
initChart() {
this.chart = echarts.init(this.$refs.chart);
@@ -237,7 +285,9 @@
formatter: (params) => {
const data = params.data;
this.currentNodeInfo = data;
- return `
+
+ if (data.cmsItemType == "student") {
+ return `
<div style="
padding: 10px;
background: #FDF8F0;
@@ -249,9 +299,36 @@
<div style="width: 80px;height: 80px;position: relative; margin: 0 auto; margin-bottom: 10px;background: #D8D8D8;">
<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
- }</div>
- <div> <span> 鐢� </span> <span> 纭曞＋ </span> <span> 鍖椾含涓尰鑽ぇ瀛� </span></div>
+ <div style="font-size: 16px; font-weight: bold; margin-bottom: 5px;">${
+ 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 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>
+ </div>
+
+ </div>
+ `;
+ } else {
+ return `
+ <div style="
+ padding: 10px;
+ background: #FDF8F0;
+ border-radius: 5px;
+ max-width: 300px;
+ width: 360px;
+ text-align: center;
+ ">
+ <div style="width: 80px;height: 80px;position: relative; margin: 0 auto; margin-bottom: 10px;background: #D8D8D8;">
+ <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
+ }</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>
@@ -261,6 +338,7 @@
</div>
`;
+ }
},
},
textStyle: {
@@ -333,17 +411,16 @@
// 鍚屾椂鍙戣捣涓や釜寮傛璇锋眰锛屽苟绛夊緟瀹冧滑鐨勭粨鏋�
const [unitListResult, academicDegreeListResult] = await Promise.all([
this.getSelectContent(this.unitRefCode),
- this.getSelectContent(this.academicDegreeRefCode)
+ this.getSelectContent(this.academicDegreeRefCode),
]);
- this.unitList = unitListResult.option.map(item => {
+ this.unitList = unitListResult.option.map((item) => {
return {
...item,
- studentList: [] // 璁剧疆鑷畾涔夊瓧娈电殑榛樿鍊�
+ studentList: [], // 璁剧疆鑷畾涔夊瓧娈电殑榛樿鍊�
};
});
this.academicDegreeList = academicDegreeListResult.option;
- console.log(this.unitList, "unitList");
- console.log(this.academicDegreeList, "academicDegreeList");
+ console.log(this.academicDegreeList, "this.academicDegreeList");
} catch (error) {
console.error("鑾峰彇涓嬫媺妗嗘暟鎹け璐�:", error);
}
@@ -352,14 +429,17 @@
//鑾峰彇閫夋嫨鍐呭
getSelectContent(refCode) {
let requestData = { refCodes: [refCode] };
- return MG.store.getProductTypeField(requestData).then(res => {
- console.log(res, '涓嬫媺妗嗘暟鎹�');
- const selestList = JSON.parse(res[0].config)
- return selestList
- }).catch((error) => {
- console.error("鑾峰彇鑽ｈ獕澶辫触:", error);
- return null
- });
+ return MG.store
+ .getProductTypeField(requestData)
+ .then((res) => {
+ console.log(res, "涓嬫媺妗嗘暟鎹�");
+ const selestList = JSON.parse(res[0].config);
+ return selestList;
+ })
+ .catch((error) => {
+ console.error("鑾峰彇鑽ｈ獕澶辫触:", error);
+ return null;
+ });
},
// 鑾峰彇鍒楄〃鏄剧ず
@@ -379,7 +459,7 @@
currentEmployer_secondary: "",
//鑱屽姟
jobTitle: "",
- professionalTitle:"",
+ professionalTitle: "",
//瀛︿綅
academicDegree: "",
// 瀛︾敓绠�浠�
@@ -390,33 +470,54 @@
},
})
.then((res) => {
- let arrList = []
- this.unitList.forEach(item => {
- this.academicDegreeList.forEach(citem => {
+ let arrList = [];
+ this.unitList.forEach((item) => {
+ this.academicDegreeList.forEach((citem) => {
arrList.push({
unitName: item.name,
+ name: item.name,
unitValue: item.value,
academicDegreeName: citem.name,
academicDegreeValue: citem.value,
isShow: false,
- studentList:[]
- })
- })
- })
+ studentList: [],
+ itemStyle: {
+ color:
+ this.legendList.find(
+ (legendItem) => legendItem.value === item.value
+ )?.color || "#000000",
+ },
+ children: [],
+ });
+ });
+ });
console.log(res, "res");
if (res.datas && res.datas.length) {
- res.datas.forEach(item => {
- arrList.forEach(citem => {
- if (item.unit == citem.unitValue && item.academicDegree == citem.academicDegreeValue){
+ res.datas.forEach((item) => {
+ arrList.forEach((citem) => {
+ if (
+ item.unit == citem.unitValue &&
+ item.academicDegree == citem.academicDegreeValue
+ ) {
+ item.academicName = this.academicDegreeList.find(f => f.value == item.academicDegree)?.name
citem.studentList.push(item);
+ citem.children.push(item);
}
- })
+ });
});
- arrList = arrList.filter(item =>
- item.studentList.length
- )
+ arrList = arrList.filter((item) => item.studentList.length);
console.log(arrList, "arrList");
this.universityList = arrList;
+ // this.chartData.children = arrList;
+ const temp_chartData = {
+ name: "",
+ children: arrList,
+ };
+ this.chartData = temp_chartData;
+
+ console.log(this.chartData, "this.chartData");
+ this.initChart();
+
this.loading = false;
}
})
@@ -522,7 +623,6 @@
background-color: #fff;
background-clip: padding-box;
border-bottom: 2px solid transparent;
-
}
th {
--
Gitblit v1.9.1