652a4348e1b2e1b5253c562bd37e15e2c5518ea7..fe85e4208e502c78e3494a460617ae8753f51341
2024-07-26 YM
Merge branch 'master' of http://182.92.203.7:2001/r/TCM_CharacterLibrary
fe85e4 对比 | 目录
2024-07-26 YM
1
571e12 对比 | 目录
10个文件已修改
44 ■■■■ 已修改文件
src/api/index.js 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/headNav/headNav.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/pages/Login/Login.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/pages/Register/Register.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/pages/academicGenres/chart.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/pages/academicGenres/detail.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/pages/academicGenres/index.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/pages/academicSchools/index.vue 14 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/pages/changePassword/changePassword.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/pages/index/index.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/api/index.js
@@ -272,7 +272,7 @@
  });
};
// 学术流派
// 学术图谱
export const getDynastyStatistics = () => {
  return req1({
    url: "/school/dynasty/statistics",
@@ -310,7 +310,7 @@
  });
};
// 查询人物学术流派
// 查询人物学术图谱
export const getSchoolInfo = (id) => {
  return req1({
    url: "/person/chain/search/school?schoolId=" + id + "&maxStep=3",
src/components/headNav/headNav.vue
@@ -144,10 +144,10 @@
            <span slot="title">家学传承</span>
          </el-menu-item>
          <el-menu-item index="6">
            <span slot="title">学术流派</span>
            <span slot="title">学术图谱</span>
          </el-menu-item>
          <el-menu-item index="3">
            <span slot="title">学术图谱</span>
            <span slot="title">学术流派</span>
          </el-menu-item>
          <el-menu-item index="4">
            <span slot="title">地域图谱</span>
src/pages/Login/Login.vue
@@ -243,11 +243,11 @@
          id: 2
        },
        {
          name: "学术流派",
          name: "学术图谱",
          id: 6
        },
        {
          name: "学术图谱",
          name: "学术流派",
          id: 3
        },
        {
src/pages/Register/Register.vue
@@ -301,11 +301,11 @@
          id: 2
        },
        {
          name: "学术流派",
          name: "学术图谱",
          id: 6
        },
        {
          name: "学术图谱",
          name: "学术流派",
          id: 3
        },
        {
src/pages/academicGenres/chart.vue
@@ -3,7 +3,7 @@
    style="width: 100%; height: 100%; display: flex; flex-direction: column"
  >
    <!-- 顶部导航 -->
    <headNav :idIndex="3 + ''" text="学术图谱" />
    <headNav :idIndex="3 + ''" text="学术流派" />
    <view class="Midde flex">
      <!-- <view class="MiddeBack">返回</view> -->
      <el-button class="MiddeBack flex flex-center" @click="goBack"
src/pages/academicGenres/detail.vue
@@ -1,7 +1,7 @@
<template>
  <view class="bag">
    <!-- 顶部导航 -->
    <headNav idIndex="3" text="学术图谱" />
    <headNav idIndex="3" text="学术流派" />
    <view class="Midde flex">
      <!-- <view class="MiddeBack">返回</view> -->
      <el-button class="MiddeBack flex flex-center" @click="goBack"
src/pages/academicGenres/index.vue
@@ -1,7 +1,7 @@
<template>
  <view style="width: 100%;height: 100%;display: flex;flex-direction: column;">
    <!-- 顶部导航 -->
    <headNav :idIndex="idIndex" text="学术图谱" />
    <headNav :idIndex="idIndex" text="学术流派" />
    <view id="line-chart" style="flex: 1;overflow: hidden;padding: 50px;"></view>
  </view>
</template>
src/pages/academicSchools/index.vue
@@ -2,7 +2,7 @@
  <view
    style="width: 100%; height: 100%; display: flex; flex-direction: column"
  >
    <headNav :idIndex="'6'" text="学术流派" />
    <headNav :idIndex="'6'" text="学术图谱" />
    <!-- 高级搜索 -->
    <view
      style="
@@ -220,7 +220,7 @@
            }
          "
        ></i>
        <el-table :data="personList" style="width: 100%">
        <el-table :data="personList" style="width: 100%" :max-height="600">
          <el-table-column prop="name" label="姓名">
            <template slot-scope="scope">
              <span
@@ -435,7 +435,7 @@
          name: "活动地"
        },
        {
          name: "学术流派"
          name: "学术图谱"
        }
      ],
      // 当前人物信息
@@ -982,7 +982,7 @@
        //       place = [...newArr];
        //     }
        //     if (obj.schoolList?.length) {
        //       this.categories.push({ name: "学术流派" });
        //       this.categories.push({ name: "学术图谱" });
        //       let newArr = [];
        //       const data = this.changeLiterature(obj.schoolList, "schoolList");
        //       this.getPersonInfo(
@@ -1212,7 +1212,7 @@
        if (item.placeList && item.placeList.length) {
          this.handleData(item.placeList, { ...item, thisType: 3 });
        }
        // 学术流派
        // 学术图谱
        if (item.schoolList && item.schoolList.length) {
          this.handleData(item.schoolList, { ...item, thisType: 4 });
        }
@@ -1428,8 +1428,8 @@
    searchPerson(key) {
      academicSearch({
        keyword: key,
        page: this.personPageInfo.page,
        pageSize: this.personPageInfo.limit
        page: 1,
        pageSize: 999
      }).then((res) => {
        this.personList = res.list.map((item) => {
          return {
src/pages/changePassword/changePassword.vue
@@ -241,11 +241,11 @@
          id: 2
        },
        {
          name: "学术流派",
          name: "学术图谱",
          id: 6
        },
        {
          name: "学术图谱",
          name: "学术流派",
          id: 3
        },
        {
src/pages/index/index.vue
@@ -202,11 +202,11 @@
          id: 2,
        },
        {
          name: "学术流派",
          name: "学术图谱",
          id: 6,
        },
        {
          name: "学术图谱",
          name: "学术流派",
          id: 3,
        },
        {