From 8bffcbb7f5fca4e1e7a308f6f786b63d0773704c Mon Sep 17 00:00:00 2001
From: zhongshujie <2862698242@qq.com>
Date: 星期一, 28 四月 2025 19:28:29 +0800
Subject: [PATCH] 页面优化
---
src/views/directory/index.vue | 197 ++++++++++++++++++++++++++++++++-----------------
1 files changed, 129 insertions(+), 68 deletions(-)
diff --git a/src/views/directory/index.vue b/src/views/directory/index.vue
index a953a4a..5bb9db0 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;
}
--
Gitblit v1.9.1