From 00fc503240260a65321c07bd0c5718f075b7da4b Mon Sep 17 00:00:00 2001 From: zhongshujie <2862698242@qq.com> Date: 星期二, 08 四月 2025 17:54:29 +0800 Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/wyyDatabase --- src/views/directory/treeData.json | 108 +++++++++++++++ src/views/chronology/floatingWindow.vue | 32 ++++ src/assets/images/directory/test.png | 0 src/views/directory/index.vue | 243 +++++++++++++++++++++------------ 4 files changed, 290 insertions(+), 93 deletions(-) diff --git a/src/assets/images/directory/test.png b/src/assets/images/directory/test.png new file mode 100644 index 0000000..fbcfb33 --- /dev/null +++ b/src/assets/images/directory/test.png Binary files differ diff --git a/src/views/chronology/floatingWindow.vue b/src/views/chronology/floatingWindow.vue index b556ec3..88fd7b5 100644 --- a/src/views/chronology/floatingWindow.vue +++ b/src/views/chronology/floatingWindow.vue @@ -26,12 +26,23 @@ </div> </div> <div class="imageBox" v-if="info.type === 'image'"> - <div style="width: 500px; height: 300px"> + <div style="width: 350px; height: 200px; position: relative"> <img class="autoImg" src="@/assets/images/chronology/photoTest.png" alt="" /> + </div> + <div + style=" + display: flex; + width: 100%; + justify-content: space-between; + margin-top: 50px; + " + > + <div class="ARROWS">鈫�</div> + <div class="ARROWS">鈫�</div> </div> </div> <div class="BookBox" v-if="info.type === 'book'">book</div> @@ -58,8 +69,9 @@ </div> </div> <div class="audioBox" v-if="info.type === 'audio'"> - <audio src="https://www.w3schools.com/html/horse.ogg" controls></audio> - + <div style="text-align: center"> + <audio style="width: 100%" src="https://www.w3schools.com/html/horse.ogg" controls></audio> + </div> <div> <div class="subtitle"> <div class="source">涓浗涓尰鍩虹鍖诲鏉傚織</div> @@ -153,4 +165,18 @@ height: 100%; object-fit: cover; } +.ARROWS { + font-size: 24px; + line-height: 40px; + width: 40px; + height: 40px; + border-radius: 50%; + border: 1px solid #8f7a5a; + display: flex; + justify-content: center; + align-items: center; + cursor: pointer; + font-weight: 700; + color: #8f7a5a; +} </style> diff --git a/src/views/directory/index.vue b/src/views/directory/index.vue index 5f2f359..9ab12ef 100644 --- a/src/views/directory/index.vue +++ b/src/views/directory/index.vue @@ -23,55 +23,102 @@ <span>鍒楄〃鏄剧ず</span> </p> </div> - <!-- 鍥捐〃鏄剧ず --> - <div class="charts-main" v-if="activeTabs == 'chart'"> - <div class="radial-tree-container"> - <div ref="chart" style="width: 100%; height: 600px"></div> - </div> - </div> - <!-- 鍒楄〃鏄剧ず --> - <div class="page-main" v-if="activeTabs == 'list'"> - <div v-for="(item, index) in universityList" :key="index"> + <transition name="el-fade-in-linear"> + <div class="tooltipBox" v-show="tooltipShow"> <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> - <table - cellpadding="100" - v-if=" - item.studentList && item.studentList.length > 0 && item.isShow + style=" + padding: 10px; + background: #fdf8f0; + border-radius: 5px; + width: 100%; + max-height: 500px; + text-align: center; " > - <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 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=" + 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> + 澶у鸡鍢堝槇濡傛�ラ洦锛屽皬寮﹀垏鍒囧绉佽銆傚槇鍢堝垏鍒囬敊鏉傚脊锛屽ぇ鐝犲皬鐝犺惤鐜夌洏銆傞棿鍏宠幒璇姳搴曟粦锛屽菇鍜芥硥娴佸啺涓嬮毦銆傚啺娉夊喎娑╁鸡鍑濈粷锛屽嚌缁濅笉閫氬0鏆傛瓏銆傚埆鏈夊菇鎰佹殫鎭ㄧ敓锛屾鏃舵棤澹拌儨鏈夊0銆傞摱鐡朵箥鐮存按娴嗚扛锛岄搧楠戠獊鍑哄垁鏋福銆傛洸缁堟敹鎷ㄥ綋蹇冪敾锛屽洓寮︿竴澹板瑁傚笡銆備笢鑸硅タ鑸倓鏃犺█锛屽敮瑙佹睙蹇冪鏈堢櫧銆� + </p> + </div> + <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> + </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> </div> @@ -81,6 +128,9 @@ <script> import * as echarts from "echarts"; import axios from "axios"; + +import debounce from "lodash/debounce"; +import treeData from "./treeData.json"; export default { data() { return { @@ -91,6 +141,7 @@ topIcon: require("@/assets/images/directory/topIcon.png"), bottomIcon: require("@/assets/images/directory/bottomIcon.png"), activeTabs: "chart", + universityList: [ { name: "鍖椾含涓尰鑽ぇ瀛�", @@ -261,33 +312,9 @@ }, ], chart: null, - chartData: { - name: "Root", - children: [ - { - name: "鐜嬬帀鏉�", - children: [ - { name: "Leaf 1-1" }, - { name: "Leaf 1-2" }, - { name: "Leaf 1-3" }, - ], - }, - { - name: "Node 2", - children: [ - { - name: "Node 2-1", - children: [{ name: "Leaf 2-1-1" }, { name: "Leaf 2-1-2" }], - }, - { name: "Leaf 2-2" }, - ], - }, - { - name: "Node 3", - children: [{ name: "Leaf 3-1" }, { name: "Leaf 3-2" }], - }, - ], - }, + chartData: treeData, + currentNodeInfo: {}, + tooltipShow: false, }; }, @@ -318,8 +345,10 @@ tooltip: { trigger: "item", triggerOn: "mousemove", + backgroundColor: "#FDF8F0", formatter: (params) => { const data = params.data; + this.currentNodeInfo = data; return ` <div style=" padding: 10px; @@ -342,55 +371,80 @@ <p style="margin-bottom: 5px;">鑱屽姟锛氬師闄㈤暱</p> <p style="margin-bottom: 5px;">鑱岀О锛氫富浠诲尰甯堛�佹暀鎺�</p> </div> - + </div> `; }, + }, + textStyle: { + color: "#bc1c00" // 璁剧疆鏁翠綋瀛椾綋棰滆壊涓虹孩鑹� + }, + edgeLabel: { + normal: { + color: "#bc1c00" // 璁剧疆绾挎潯鐨勯鑹蹭负绾㈣壊 + } }, series: [ { type: "tree", data: [this.chartData], + // symbol: "emptyCircle", + top: "10%", + bottom: "10%", layout: "radial", symbol: "emptyCircle", symbolSize: 7, - initialTreeDepth: -1, // 灞曞紑鎵�鏈夎妭鐐� + initialTreeDepth: 3, // 灞曞紑鎵�鏈夎妭鐐� animationDurationUpdate: 750, emphasis: { focus: "descendant", }, label: { - position: "left", - verticalAlign: "middle", - align: "right", - fontSize: 12, - rotate: 0, + position: "top", //鏍囩鐨勪綅缃�� + verticalAlign: "middle", //鏂囧瓧鍨傜洿瀵归綈鏂瑰紡锛岄粯璁よ嚜鍔ㄣ�� + fontSize: 12, //鏂囧瓧鐨勫瓧浣撳ぇ灏� + color: "#bc1c00", }, leaves: { + symbol: "emptyCircle", label: { - position: "right", - verticalAlign: "middle", - align: "left", + fontSize: 12, }, }, - expandAndCollapse: true, + expandAndCollapse: false, lineStyle: { - color: "#ccc", + color: "#bc1c00", width: 1, }, itemStyle: { - color: "#4f8ff7", - borderColor: "#4f8ff7", + symbol: "emptyCircle", + color: "#bc1c00", }, roam: true, - center: ["10%", "15%"], // 寰皟鍨傜洿灞呬腑 - radius: "60%", // 澧炲ぇ鍗婂緞鍗犳瘮 - nodePadding: 20, + center: ["5%", "0%"], // 寰皟鍨傜洿灞呬腑 + radius: "100%", // 澧炲ぇ鍗婂緞鍗犳瘮 + nodePadding: 120, }, ], }; this.chart.setOption(option); + + this.chart.on( + "showTip", + debounce((event) => { + console.log("鏄剧ず鏃剁殑鍥炶皟", event); + this.tooltipShow = true; + }, 500) + ); + + this.chart.on( + "hideTip", + debounce((event) => { + console.log("闅愯棌鏃剁殑鍥炶皟", event); + this.tooltipShow = false; + }, 500) + ); }, handleResize() { if (this.chart) { @@ -507,6 +561,7 @@ .charts-main { // background-color: #000; + position: relative; } .table-title { @@ -553,4 +608,12 @@ height: auto; } } +.tooltipBox { + max-height: 500px; + max-width: 500px; + background-color: #fdf8f0; + position: absolute; + bottom: -60px; + right: 40px; +} </style> diff --git a/src/views/directory/treeData.json b/src/views/directory/treeData.json new file mode 100644 index 0000000..503e7a8 --- /dev/null +++ b/src/views/directory/treeData.json @@ -0,0 +1,108 @@ +{ + "name": "flare", + "children": [ + + + + + + + + + { + "name": "vis", + "children": [ + { + "name": "axis", + "children": [ + {"name": "Axes", "value": 1302}, + {"name": "Axis", "value": 24593}, + {"name": "AxisGridLine", "value": 652}, + {"name": "AxisLabel", "value": 636}, + {"name": "CartesianAxes", "value": 6703} + ] + }, + { + "name": "controls", + "children": [ + {"name": "AnchorControl", "value": 2138}, + {"name": "ClickControl", "value": 3824}, + {"name": "Control", "value": 1353}, + {"name": "ControlList", "value": 4665}, + {"name": "DragControl", "value": 2649}, + {"name": "ExpandControl", "value": 2832}, + {"name": "HoverControl", "value": 4896}, + {"name": "IControl", "value": 763}, + {"name": "PanZoomControl", "value": 5222}, + {"name": "SelectionControl", "value": 7862}, + {"name": "TooltipControl", "value": 8435} + ] + }, + { + "name": "events", + "children": [ + {"name": "DataEvent", "value": 2313}, + {"name": "SelectionEvent", "value": 1880}, + {"name": "TooltipEvent", "value": 1701}, + {"name": "VisualizationEvent", "value": 1117} + ] + }, + { + "name": "legend", + "children": [ + {"name": "Legend", "value": 20859}, + {"name": "LegendItem", "value": 4614}, + {"name": "LegendRange", "value": 10530} + ] + }, + { + "name": "operator", + "children": [ + { + "name": "distortion", + "children": [ + {"name": "BifocalDistortion", "value": 4461}, + {"name": "Distortion", "value": 6314}, + {"name": "FisheyeDistortion", "value": 3444} + ] + }, + { + "name": "encoder", + "children": [ + {"name": "ColorEncoder", "value": 3179}, + {"name": "Encoder", "value": 4060}, + {"name": "PropertyEncoder", "value": 4138}, + {"name": "ShapeEncoder", "value": 1690}, + {"name": "SizeEncoder", "value": 1830} + ] + }, + { + "name": "filter", + "children": [ + {"name": "FisheyeTreeFilter", "value": 5219}, + {"name": "GraphDistanceFilter", "value": 3165}, + {"name": "VisibilityFilter", "value": 3509} + ] + }, + {"name": "IOperator", "value": 1286}, + { + "name": "label", + "children": [ + {"name": "Labeler", "value": 9956}, + {"name": "RadialLabeler", "value": 3899}, + {"name": "StackedAreaLabeler", "value": 3202} + ] + }, + + {"name": "Operator", "value": 2490}, + {"name": "OperatorList", "value": 5248}, + {"name": "OperatorSequence", "value": 4190}, + {"name": "OperatorSwitch", "value": 2581}, + {"name": "SortOperator", "value": 2023} + ] + }, + {"name": "Visualization", "value": 16540} + ] + } + ] + } \ No newline at end of file -- Gitblit v1.9.1