YM
2024-07-26 5c3f597fed3b703143413447089a9ffce171bf51
Merge branch 'master' of http://182.92.203.7:2001/r/TCM_CharacterLibrary
2个文件已修改
23 ■■■■■ 已修改文件
src/pages/academicSchools/index.vue 16 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/pages/inherit/list.vue 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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>
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) => {