From dc161b8ff89d1a2791ba0c08e30aa278ea5ace47 Mon Sep 17 00:00:00 2001
From: zhongshujie <2862698242@qq.com>
Date: 星期二, 08 四月 2025 18:35:25 +0800
Subject: [PATCH] bug修改
---
src/views/honors/index.vue | 3
src/views/achievements/index.vue | 9
src/views/achievements/details.vue | 3
src/views/chronology/index.vue | 4
src/views/directory/index.vue | 298 +++++++++++++++++++++++++------------------------
5 files changed, 165 insertions(+), 152 deletions(-)
diff --git a/src/views/achievements/details.vue b/src/views/achievements/details.vue
index dbeedac..4fab097 100644
--- a/src/views/achievements/details.vue
+++ b/src/views/achievements/details.vue
@@ -283,6 +283,7 @@
box-sizing: border-box;
background-color: #e9e1d4;
position: relative;
+ overflow: hidden;
}
.page-header {
@@ -295,7 +296,7 @@
top: 0;
z-index: 100;
p {
- padding: 2% 0 1.9% 0;
+ padding: 1.6% 0 1.55% 0;
font-family: Alimama DongFangDaKai;
font-size: 30px;
text-indent: 1em;
diff --git a/src/views/achievements/index.vue b/src/views/achievements/index.vue
index 08049d5..06dc4a5 100644
--- a/src/views/achievements/index.vue
+++ b/src/views/achievements/index.vue
@@ -686,19 +686,20 @@
box-sizing: border-box;
background-color: #e9e1d4;
position: relative;
+ overflow: hidden;
}
.page-header {
+ background-color: #e9e1d4;
height: 9.4%;
width: 100%;
text-align: left;
border-bottom: 2px solid #937950;
- background-color: #e9e1d4;
position: sticky;
top: 0;
- z-index: 100;
+ z-index: 10;
p {
- padding: 2% 0 1.9% 0;
+ padding: 1.6% 0 1.55% 0;
font-family: Alimama DongFangDaKai;
font-size: 30px;
text-indent: 1em;
@@ -716,6 +717,7 @@
width: 77.3%;
margin: 0 auto;
margin-top: 1%;
+ margin-bottom: 1%;
}
.page-input {
@@ -799,7 +801,6 @@
.page-content {
width: 100%;
margin-top: 20px;
- margin-bottom: 20px;
background-color: #fefbf5;
border: 1px solid #e4dace;
display: flex;
diff --git a/src/views/chronology/index.vue b/src/views/chronology/index.vue
index c624c7e..30f7a07 100644
--- a/src/views/chronology/index.vue
+++ b/src/views/chronology/index.vue
@@ -918,14 +918,14 @@
}
}
.page-header {
- height: 102px;
+ height: 9.4%;
width: 100%;
text-align: left;
margin-bottom: 8px;
border-bottom: 2px solid #937950;
p {
- padding: 35px 0 34px 0;
+ padding: 1.6% 0 1.55% 0;
font-family: Alimama DongFangDaKai;
font-size: 30px;
text-indent: 1em;
diff --git a/src/views/directory/index.vue b/src/views/directory/index.vue
index 42e4bd7..b94eafc 100644
--- a/src/views/directory/index.vue
+++ b/src/views/directory/index.vue
@@ -3,165 +3,175 @@
<div class="page-header">
<p>鐜嬫案鐐庨櫌澹鐢熺洰褰�</p>
</div>
- <div class="page-main-title">
- <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' : '']"
- >
- <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 ref="chart" style="width: 100%; height: 70vh"></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=""
+ />
+ <span>鍥捐〃鏄剧ず</span>
+ </p>
+ <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 ref="chart" style="width: 100%; height: 70vh"></div>
+ </div>
- <div class="legend">
- <div class="tagItem" v-for="(item, index) in legendList" :key="index">
- <div class="tagColor" :style="{ background: item.color }"></div>
- <div class="tagText" :style="{ color: item.color }">
- {{ item.name }}
+ <div class="legend">
+ <div class="tagItem" v-for="(item, index) in legendList" :key="index">
+ <div class="tagColor" :style="{ background: item.color }"></div>
+ <div class="tagText" :style="{ color: item.color }">
+ {{ item.name }}
+ </div>
</div>
</div>
- </div>
- <transition name="el-fade-in-linear">
- <div class="tooltipBox" v-show="tooltipShow">
- <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>
+ <transition name="el-fade-in-linear">
+ <div class="tooltipBox" v-show="tooltipShow">
+ <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="
+ width: 80px;
+ height: 80px;
+ position: relative;
+ margin-bottom: 10px;
+ background: #d8d8d8;
+ "
+ >
+ <img
+ class="autoImg"
+ src="@/assets/images/directory/touxiang.png"
+ alt=""
+ />
+ </div>
+ <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">
+ <span> 鐢� </span> <span> 纭曞＋ </span>
+ <span> 鍖椾含涓尰鑽ぇ瀛� </span>
+ </div>
+ </div>
+ </div>
- <div style="display: flex">
<div
style="
- width: 80px;
- height: 80px;
- position: relative;
- margin-bottom: 10px;
- background: #d8d8d8;
+ font-size: 16px;
+ font-weight: bold;
+ margin-bottom: 5px;
+ text-align: left;
+ margin-top: 10px;
"
>
- <img
- class="autoImg"
- src="@/assets/images/directory/touxiang.png"
- alt=""
- />
+ <p style="margin-bottom: 15px">瀛︿範鏃堕棿锛�1985.09 -1988.07</p>
+ <p style="margin-bottom: 15px">
+ 鐜板伐浣滃崟浣嶏細鍖椾含涓尰鑽ぇ瀛︿笢鏂瑰尰闄�
+ </p>
+ <p style="margin-bottom: 15px">鑱屽姟锛氬師闄㈤暱</p>
+ <p style="margin-bottom: 15px">鑱岀О锛氫富浠诲尰甯堛�佹暀鎺�</p>
</div>
- <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">
- <span> 鐢� </span> <span> 纭曞＋ </span>
- <span> 鍖椾含涓尰鑽ぇ瀛� </span>
- </div>
- </div>
- </div>
-
- <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">
- 鐜板伐浣滃崟浣嶏細鍖椾含涓尰鑽ぇ瀛︿笢鏂瑰尰闄�
- </p>
- <p style="margin-bottom: 15px">鑱屽姟锛氬師闄㈤暱</p>
- <p style="margin-bottom: 15px">鑱岀О锛氫富浠诲尰甯堛�佹暀鎺�</p>
- </div>
- <div style="text-align: left; line-height: 22px">
- <p>
- 澶у鸡鍢堝槇濡傛�ラ洦锛屽皬寮﹀垏鍒囧绉佽銆傚槇鍢堝垏鍒囬敊鏉傚脊锛屽ぇ鐝犲皬鐝犺惤鐜夌洏銆傞棿鍏宠幒璇姳搴曟粦锛屽菇鍜芥硥娴佸啺涓嬮毦銆傚啺娉夊喎娑╁鸡鍑濈粷锛屽嚌缁濅笉閫氬０鏆傛瓏銆傚埆鏈夊菇鎰佹殫鎭ㄧ敓锛屾鏃舵棤澹拌儨鏈夊０銆傞摱鐡朵箥鐮存按娴嗚扛锛岄搧楠戠獊鍑哄垁鏋福銆傛洸缁堟敹鎷ㄥ綋蹇冪敾锛屽洓寮︿竴澹板瑁傚笡銆備笢鑸硅タ鑸倓鏃犺█锛屽敮瑙佹睙蹇冪鏈堢櫧銆�
- </p>
- </div>
- <div
- style="
- display: flex;
- justify-content: space-between;
- margin-top: 20px;
- "
- >
- <div style="text-align: left; width: 48%; line-height: 22px">
+ <div style="text-align: left; line-height: 22px">
<p>
- 瑙傚か鏄庡爞涔嬪畯澹篃锛屽垯绐佸厐鐬虫洦锛屼箥鏄庝箥钂欙紝鑻ュぇ鍙ゅ厓姘斾箣缁撶┖銆傚穬宓搁娌擄紝鑻ュ惮鑻ュ丢锛屼技澶╅槂鍦伴棬涔嬪紑闃栥�傚皵涔冨垝宀濆硥浠ュ渤绔嬶紝閮佺┕宕囪�岄缚绾枫�傚啝鐧剧帇鑰屽瀭鍕嬶紝鐑涗竾璞¤�岃吘鏂囥�傜獧鎯氭亶浠ユ礊鍚紝鍛煎祵宀╄�屽倣鍒嗐�傚張姣斾箮鏄嗗北涔嬪ぉ鏌憋紝鐭椾節闇勮�屽瀭浜戙��
+ 澶у鸡鍢堝槇濡傛�ラ洦锛屽皬寮﹀垏鍒囧绉佽銆傚槇鍢堝垏鍒囬敊鏉傚脊锛屽ぇ鐝犲皬鐝犺惤鐜夌洏銆傞棿鍏宠幒璇姳搴曟粦锛屽菇鍜芥硥娴佸啺涓嬮毦銆傚啺娉夊喎娑╁鸡鍑濈粷锛屽嚌缁濅笉閫氬０鏆傛瓏銆傚埆鏈夊菇鎰佹殫鎭ㄧ敓锛屾鏃舵棤澹拌儨鏈夊０銆傞摱鐡朵箥鐮存按娴嗚扛锛岄搧楠戠獊鍑哄垁鏋福銆傛洸缁堟敹鎷ㄥ綋蹇冪敾锛屽洓寮︿竴澹板瑁傚笡銆備笢鑸硅タ鑸倓鏃犺█锛屽敮瑙佹睙蹇冪鏈堢櫧銆�
</p>
</div>
- <div>
- <img src="@/assets/images/directory/test.png" alt="" />
+ <div
+ style="
+ display: flex;
+ justify-content: space-between;
+ margin-top: 20px;
+ "
+ >
+ <div style="text-align: left; width: 48%; line-height: 22px">
+ <p>
+ 瑙傚か鏄庡爞涔嬪畯澹篃锛屽垯绐佸厐鐬虫洦锛屼箥鏄庝箥钂欙紝鑻ュぇ鍙ゅ厓姘斾箣缁撶┖銆傚穬宓搁娌擄紝鑻ュ惮鑻ュ丢锛屼技澶╅槂鍦伴棬涔嬪紑闃栥�傚皵涔冨垝宀濆硥浠ュ渤绔嬶紝閮佺┕宕囪�岄缚绾枫�傚啝鐧剧帇鑰屽瀭鍕嬶紝鐑涗竾璞¤�岃吘鏂囥�傜獧鎯氭亶浠ユ礊鍚紝鍛煎祵宀╄�屽倣鍒嗐�傚張姣斾箮鏄嗗北涔嬪ぉ鏌憋紝鐭椾節闇勮�屽瀭浜戙��
+ </p>
+ </div>
+ <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-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.name }}</p>
- <p class="table-title-degree">{{ item.degree }}</p>
- <p class="table-title-number">{{ item.studentList.length }}浜�</p>
+ </transition>
+ </div>
+ <!-- 鍒楄〃鏄剧ず -->
+ <div class="page-main" v-if="activeTabs == 'list'">
+ <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.name }}</p>
+ <p class="table-title-degree">{{ item.degree }}</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>
- <div class="table-title-right" @click="item.isShow = !item.isShow">
- <img :src="[item.isShow ? topIcon : bottomIcon]" alt="" />
- </div>
+ <table
+ cellpadding="100"
+ v-if="
+ item.studentList && item.studentList.length > 0 && item.isShow
+ "
+ >
+ <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.studentName }}
+ </td>
+ <td>
+ {{ citem.gender }}
+ </td>
+ <td>{{ citem.studyTime }}</td>
+ <td>{{ citem.workUnit }}</td>
+ <td>{{ citem.position }}</td>
+ <td>{{ citem.title }}</td>
+ </tr>
+ </table>
</div>
- <table
- cellpadding="100"
- v-if="item.studentList && item.studentList.length > 0 && item.isShow"
- >
- <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.studentName }}
- </td>
- <td>
- {{ citem.gender }}
- </td>
- <td>{{ citem.studyTime }}</td>
- <td>{{ citem.workUnit }}</td>
- <td>{{ citem.position }}</td>
- <td>{{ citem.title }}</td>
- </tr>
- </table>
</div>
</div>
</div>
@@ -170,7 +180,6 @@
<script>
import * as echarts from "echarts";
import axios from "axios";
-
import debounce from "lodash/debounce";
import treeData from "./treeData.json";
export default {
@@ -514,6 +523,7 @@
box-sizing: border-box;
background-color: #e9e1d4;
position: relative;
+ overflow: hidden;
}
.page-header {
@@ -524,9 +534,9 @@
background-color: #e9e1d4;
position: sticky;
top: 0;
- z-index: 100;
+ z-index: 10;
p {
- padding: 2% 0 1.9% 0;
+ padding: 1.6% 0 1.55% 0;
font-family: Alimama DongFangDaKai;
font-size: 30px;
text-indent: 1em;
diff --git a/src/views/honors/index.vue b/src/views/honors/index.vue
index 0a8984d..d928ddb 100644
--- a/src/views/honors/index.vue
+++ b/src/views/honors/index.vue
@@ -103,6 +103,7 @@
box-sizing: border-box;
background-color: #e9e1d4;
position: relative;
+ overflow: hidden;
}
.honors-title {
@@ -115,7 +116,7 @@
top: 0;
z-index: 100;
p {
- padding: 2% 0 1.9% 0;
+ padding: 1.6% 0 1.55% 0;
font-family: Alimama DongFangDaKai;
font-size: 30px;
text-indent: 1em;
--
Gitblit v1.9.1