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/directory/index.vue | 395 +++++++++++++++++++++++++++++++------------------------
1 files changed, 223 insertions(+), 172 deletions(-)
diff --git a/src/views/directory/index.vue b/src/views/directory/index.vue
index fc824a0..9a1ea8c 100644
--- a/src/views/directory/index.vue
+++ b/src/views/directory/index.vue
@@ -7,33 +7,18 @@
</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'"
- v-loading="loading"
- element-loading-text="鍥捐〃鍔犺浇涓�"
- element-loading-spinner="el-icon-loading"
- element-loading-background="rgba(0, 0, 0, 0)"
- >
+ <div class="charts-main" v-show="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>
@@ -48,45 +33,36 @@
</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="currentNodeInfo.icon
+ ? currentNodeInfo.icon
+ : '@/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">
@@ -95,35 +71,49 @@
currentNodeInfo.gender == "male" ? "鐢�" : "濂�" || "-"
}}
</span>
- <span> {{ currentNodeInfo.academicName || "-"}} </span>
- <span> {{ legendList.find((item) => item.value == currentNodeInfo.unit)?.name ||
- "-" }} </span>
+ <span> {{ currentNodeInfo.academicName || "-" }} </span>
+ <span>
+ {{
+ legendList.find(
+ (item) => item.value == currentNodeInfo.unit
+ )?.name || "-"
+ }}
+ </span>
</div>
</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">瀛︿範鏃堕棿锛歿{ currentNodeInfo.studyTime || "-" }}</p>
+ ">
<p style="margin-bottom: 15px">
- 鐜板伐浣滃崟浣嶏細 {{currentNodeInfo.currentEmployer_secondary || '-' }}
+ 瀛︿範鏃堕棿锛歿{ currentNodeInfo.studyTime || "-" }}
</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>
- 澶у鸡鍢堝槇濡傛�ラ洦锛屽皬寮﹀垏鍒囧绉佽銆傚槇鍢堝垏鍒囬敊鏉傚脊锛屽ぇ鐝犲皬鐝犺惤鐜夌洏銆傞棿鍏宠幒璇姳搴曟粦锛屽菇鍜芥硥娴佸啺涓嬮毦銆傚啺娉夊喎娑╁鸡鍑濈粷锛屽嚌缁濅笉閫氬０鏆傛瓏銆傚埆鏈夊菇鎰佹殫鎭ㄧ敓锛屾鏃舵棤澹拌儨鏈夊０銆傞摱鐡朵箥鐮存按娴嗚扛锛岄搧楠戠獊鍑哄垁鏋福銆傛洸缁堟敹鎷ㄥ綋蹇冪敾锛屽洓寮︿竴澹板瑁傚笡銆備笢鑸硅タ鑸倓鏃犺█锛屽敮瑙佹睙蹇冪鏈堢櫧銆�
+ <p style="margin-bottom: 15px">
+ 鐜板伐浣滃崟浣嶏細
+ {{ currentNodeInfo.currentEmployer_secondary || "-" }}
+ </p>
+ <p style="margin-bottom: 15px">
+ 鑱屽姟锛歿{ currentNodeInfo.jobTitle || "-" }}
+ </p>
+ <p style="margin-bottom: 15px">
+ 鑱岀О锛歿{ currentNodeInfo.professionalTitle || "-" }}
</p>
</div>
- <div
+ <div style="
+ text-align: left;
+ line-height: 22px;
+ max-height: 200px;
+ overflow-y: auto;
+ padding: 10px;
+ ">
+ <div v-html="currentNodeInfo.studentProfile"></div>
+ </div>
+ <!-- <div
style="
display: flex;
justify-content: space-between;
@@ -138,78 +128,72 @@
<div>
<img src="@/assets/images/directory/test.png" alt="" />
</div>
- </div>
+ </div> -->
</div>
</div>
</transition>
</div>
<!-- 鍒楄〃鏄剧ず -->
- <div class="page-main" v-if="activeTabs == 'list'">
- <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 class="page-main" v-show="activeTabs == 'list'">
+ <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"
- >
+ <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>
@@ -234,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,
@@ -288,7 +272,10 @@
methods: {
changeTab(key) {
this.activeTabs = key;
- console.log(this.activeTabs, "activeTabs");
+ // console.log(this.activeTabs, "activeTabs");
+ if (key == "chart") {
+ this.initChart();
+ }
},
initChart() {
this.chart = echarts.init(this.$refs.chart);
@@ -300,7 +287,7 @@
formatter: (params) => {
const data = params.data;
this.currentNodeInfo = data;
- console.log(data, "data");
+ // console.log(data, "data");
if (data.cmsItemType == "student") {
return `
<div style="
@@ -312,30 +299,26 @@
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="">
+ <img class="autoImg" src="${data.icon
+ ? data.icon
+ : require("@/assets/images/directory/touxiang.png")
+ }" alt="">
</div>
- <div style="font-size: 16px; font-weight: bold; margin-bottom: 5px;">${
- data.name || "-"
+ <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 ||
+ <div> <span> ${data.gender == "male" ? "鐢�" : "濂�" || "-"
+ } </span> <span> ${data.academicName || "-"} </span> <span> ${this.legendList.find((item) => item.value == data.unit)?.name ||
"-"
- } </span></div>
+ } </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>
@@ -353,12 +336,9 @@
<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 style="font-size: 16px; font-weight: bold; margin-bottom: 5px;">${data.name
}</div>
- <div> <span> ${data.academicDegreeValue} </span> <span> ${
- data.academicDegreeName
- } </span></div>
+ <div> <span> ${data.academicDegreeName || "-"} </span></div>
</div>
`;
@@ -392,7 +372,7 @@
position: "top", //鏍囩鐨勪綅缃��
verticalAlign: "middle", //鏂囧瓧鍨傜洿瀵归綈鏂瑰紡锛岄粯璁よ嚜鍔ㄣ��
fontSize: 12, //鏂囧瓧鐨勫瓧浣撳ぇ灏�
- color: "#bc1c00",
+ // color: "#bc1c00",
},
// leaves: {
// symbol: "emptyCircle",
@@ -402,7 +382,7 @@
// },
expandAndCollapse: false,
lineStyle: {
- color: "#bc1c00",
+ // color: "#bc1c00",
width: 1,
},
itemStyle: {
@@ -420,7 +400,7 @@
this.chart.setOption(option);
this.chart.on("click", (params) => {
- console.log("鐐瑰嚮鏃剁殑鍥炶皟", params);
+ // console.log("鐐瑰嚮鏃剁殑鍥炶皟", params);
this.tooltipShow = true;
});
},
@@ -444,7 +424,6 @@
};
});
this.academicDegreeList = academicDegreeListResult.option;
- console.log(this.academicDegreeList, "this.academicDegreeList");
} catch (error) {
console.error("鑾峰彇涓嬫媺妗嗘暟鎹け璐�:", error);
}
@@ -456,7 +435,6 @@
return MG.store
.getProductTypeField(requestData)
.then((res) => {
- console.log(res, "涓嬫媺妗嗘暟鎹�");
const selestList = JSON.parse(res[0].config);
return selestList;
})
@@ -495,6 +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({
@@ -515,8 +514,6 @@
});
});
});
- this.loading = false;
- console.log(res, "res");
if (res.datas && res.datas.length) {
res.datas.forEach((item) => {
arrList.forEach((citem) => {
@@ -532,20 +529,40 @@
}
});
});
+
+ 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;
+ this.chartData.children = arrList;
const temp_chartData = {
- name: "",
+ name: "鐜嬫案鐐�",
children: arrList,
};
this.chartData = temp_chartData;
-
- console.log(this.chartData, "this.chartData");
+ // console.log(this.chartData, "this.chartData");
this.initChart();
-
-
+ this.loading = false;
}
})
.catch((error) => {
@@ -641,6 +658,7 @@
overflow: hidden;
margin-bottom: 100px;
padding-top: 50px;
+
table {
width: 100%;
border-collapse: collapse;
@@ -651,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;
@@ -659,6 +679,7 @@
font-weight: bold;
padding: 4px 41px;
text-wrap: nowrap;
+ line-height: 30px;
}
td {
@@ -668,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 {
@@ -692,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;
@@ -702,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;
}
@@ -727,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;
}
}
@@ -767,6 +805,7 @@
.tagText {
margin-left: 30px;
}
+
::v-deep .el-loading-spinner {
color: #937950 !important;
}
@@ -775,4 +814,16 @@
font-size: 14px;
color: #937950;
}
+
+::v-deep .el-loading-spinner {
+ .el-loading-text {
+ font-size: 14px;
+ color: #937950;
+ }
+
+ .el-icon-loading {
+ font-size: 14px;
+ color: #937950;
+ }
+}
</style>
--
Gitblit v1.9.1