From 5c3f597fed3b703143413447089a9ffce171bf51 Mon Sep 17 00:00:00 2001
From: YM <479443481@qq.com>
Date: 星期五, 26 七月 2024 11:55:35 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/TCM_CharacterLibrary

---
 src/pages/academicSchools/index.vue |   16 ++++++++--------
 src/pages/inherit/list.vue          |    7 +++++--
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/src/pages/academicSchools/index.vue b/src/pages/academicSchools/index.vue
index c4735dc..2d1985b 100644
--- a/src/pages/academicSchools/index.vue
+++ b/src/pages/academicSchools/index.vue
@@ -322,12 +322,12 @@
       class="customDrawer"
     >
       <div class="drawerContent">
-        <div class="drawerTips">閬镐腑鐨勫湴鍧�锛�</div>
+        <div class="drawerTips">閫変腑鐨勫湴鍧�锛�</div>
         <div class="drawerTable">
           <div class="tableTabs">
             <div class="inputItem">
               <el-input
-                placeholder="璜嬭几鍏ュ湴鍚嶆悳绱�"
+                placeholder="璇疯緭鍏ュ湴鍚嶆悳绱�"
                 v-model="tableKey"
                 class="input-with-select"
                 @keyup.enter="searchAddress"
@@ -341,7 +341,7 @@
               </el-input>
             </div>
             <div class="selectItem">
-              <el-select v-model="dynastyId" placeholder="璜嬮伕鎿囨檪鏈�">
+              <el-select v-model="dynastyId" placeholder="璇烽�夋嫨鏃舵湡">
                 <el-option
                   v-for="item in dynastyData"
                   :key="item.dynastyId + '0'"
@@ -361,14 +361,14 @@
           >
             <el-table-column type="selection" width="55"> </el-table-column>
             <el-table-column prop="currentName" label="鍦板悕"> </el-table-column>
-            <el-table-column width="250" label="骞翠唬鍗�闁�">
+            <el-table-column width="250" label="骞翠唬鍖洪棿">
               <template slot-scope="scope">{{
                 scope.row.start + "-" + scope.row.end
               }}</template>
             </el-table-column>
             <el-table-column
               prop="dynastyName"
-              label="鏅傛湡"
+              label="鏃舵湡"
               width="250"
               show-overflow-tooltip
             >
@@ -390,9 +390,9 @@
           </el-pagination>
         </div>
         <div class="drawerBtn">
-          <el-button @click="setCurrent">鍏ㄩ伕鐣跺墠闋�</el-button>
-          <el-button @click="setCurrent('cancle')">鍙栨秷鍏ㄩ伕</el-button>
-          <el-button @click="drawer = false" type="primary">纰哄畾</el-button>
+          <el-button @click="setCurrent">鍏ㄩ�夊綋鍓嶉〉</el-button>
+          <el-button @click="setCurrent('cancle')">鍙栨秷鍏ㄩ��</el-button>
+          <el-button @click="drawer = false" type="primary">纭畾</el-button>
         </div>
       </div>
     </el-drawer>
diff --git a/src/pages/inherit/list.vue b/src/pages/inherit/list.vue
index 0ea761f..893e0bd 100644
--- a/src/pages/inherit/list.vue
+++ b/src/pages/inherit/list.vue
@@ -385,14 +385,17 @@
           },
         };
       });
-      let that = this
+      let that = this;
       const edgeType =
         this.viewType == 1 ? "cubic-horizontal" : "cubic-vertical";
       this.graph.edge(function (node) {
         return {
           type: edgeType,
           color: "#A3B1BF",
-          label:  that.textStyle(node.target._cfg?.model.relationInfo)
+          label:
+            that.viewType == 1
+              ? node.target._cfg?.model.relationInfo
+              : that.textStyle(node.target._cfg?.model.relationInfo),
         };
       });
       this.graph.on("node:click", (e) => {

--
Gitblit v1.9.1