Merge branch 'master' of http://182.92.203.7:2001/r/TCM_CharacterLibrary

杨磊

2024-06-12 ab0ba0da5856458749609d4df3fec44aa7ce18ed

 src/pages/knowledgeBase/knowledgeBase.vue

@@ -7,7 +7,7 @@
      <!-- <luanqing-search class="search_bar" @onSearch="onSearch"></luanqing-search> -->
      <advancedSearch
        @onSearch="onSearch"
        placehold="输入姓名/别名/朝代/传主职业搜索"
        placehold="输入姓名/别名/时期/传主职业搜索"
        :isAvancedTrue="false"
        :keyword="keywords"
      />
@@ -207,7 +207,7 @@
            label="性别"
            width="70"
          ></el-table-column>
          <el-table-column prop="period" label="时代"></el-table-column>
          <el-table-column prop="period" label="时期"></el-table-column>
          <el-table-column
            prop="birthYear"
            label="生年"
@@ -337,7 +337,7 @@
          },
          {
            type: "input",
            label: "时间",
            label: "时期",
            name: "dynasty",
            value: ""
          },
@@ -365,7 +365,7 @@
      activeBox: null,
      // 时期
      dynasty: {
        title: "时代",
        title: "时期",
        id: "",
        index: "",
        list: []