From 894bbea89dd32c42750a39790883840a3fe35796 Mon Sep 17 00:00:00 2001
From: zhongshujie <2862698242@qq.com>
Date: 星期一, 28 四月 2025 14:49:46 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/wyyDatabase

---
 src/views/directory/index.vue |   53 ++++++++++++++++++++++++++++++++++++++---------------
 1 files changed, 38 insertions(+), 15 deletions(-)

diff --git a/src/views/directory/index.vue b/src/views/directory/index.vue
index b056e02..4e022f1 100644
--- a/src/views/directory/index.vue
+++ b/src/views/directory/index.vue
@@ -28,7 +28,7 @@
       <!-- 鍥捐〃鏄剧ず -->
       <div
         class="charts-main"
-        v-if="activeTabs == 'chart'"
+        v-show="activeTabs == 'chart'"
         v-loading="loading"
         element-loading-text="鍥捐〃鍔犺浇涓�"
         element-loading-spinner="el-icon-loading"
@@ -134,7 +134,15 @@
                   鑱岀О锛歿{ currentNodeInfo.professionalTitle || "-" }}
                 </p>
               </div>
-              <div style="text-align: left; line-height: 22px;max-height:200px;overflow-y: auto; padding: 10px;" >
+              <div
+                style="
+                  text-align: left;
+                  line-height: 22px;
+                  max-height: 200px;
+                  overflow-y: auto;
+                  padding: 10px;
+                "
+              >
                 <div v-html="currentNodeInfo.studentProfile"></div>
               </div>
               <!-- <div
@@ -158,7 +166,7 @@
         </transition>
       </div>
       <!-- 鍒楄〃鏄剧ず -->
-      <div class="page-main" v-if="activeTabs == 'list'">
+      <div class="page-main" v-show="activeTabs == 'list'">
         <div
           v-loading="loading"
           style="min-height: 550px"
@@ -169,8 +177,7 @@
           <div v-for="(item, index) in universityList" :key="index">
             <div
               class="table-title"
-              v-if="item.studentList && item.studentList.length > 0"
-            >
+              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>
@@ -180,8 +187,7 @@
               </div>
               <div
                 class="table-title-right"
-                @click="item.isShow = !item.isShow"
-              >
+                @click="item.isShow = !item.isShow">
                 <img :src="[item.isShow ? topIcon : bottomIcon]" alt="" />
               </div>
             </div>
@@ -307,7 +313,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);
@@ -319,7 +328,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="
@@ -441,7 +450,7 @@
 
       this.chart.setOption(option);
       this.chart.on("click", (params) => {
-        console.log("鐐瑰嚮鏃剁殑鍥炶皟", params);
+        // console.log("鐐瑰嚮鏃剁殑鍥炶皟", params);
         this.tooltipShow = true;
       });
     },
@@ -465,7 +474,6 @@
           };
         });
         this.academicDegreeList = academicDegreeListResult.option;
-        console.log(this.academicDegreeList, "this.academicDegreeList");
       } catch (error) {
         console.error("鑾峰彇涓嬫媺妗嗘暟鎹け璐�:", error);
       }
@@ -477,7 +485,6 @@
       return MG.store
         .getProductTypeField(requestData)
         .then((res) => {
-          console.log(res, "涓嬫媺妗嗘暟鎹�");
           const selestList = JSON.parse(res[0].config);
           return selestList;
         })
@@ -538,6 +545,7 @@
           });
           this.loading = false;
           console.log(res, "res");
+          console.log(arrList, "arrList");
           if (res.datas && res.datas.length) {
             res.datas.forEach((item) => {
               arrList.forEach((citem) => {
@@ -554,16 +562,18 @@
               });
             });
             arrList = arrList.filter((item) => item.studentList.length);
-            console.log(arrList, "arrList");
+
+            // console.log(arrList, "arrList");
+
             this.universityList = arrList;
-            // this.chartData.children = arrList;
+            this.chartData.children = arrList;
             const temp_chartData = {
               name: "鐜嬫案鐐�",
               children: arrList,
             };
             this.chartData = temp_chartData;
 
-            console.log(this.chartData, "this.chartData");
+            // console.log(this.chartData, "this.chartData");
             this.initChart();
           }
         })
@@ -585,6 +595,7 @@
   overflow: hidden;
   display: flex;
   flex-direction: column;
+  font-family: Source Han Sans;
 }
 
 .page-header {
@@ -794,4 +805,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