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

QYF-GitLab1

2024-07-26 f961a7e1d262afcc37b0743fcd9cec0f9fc1cbc2

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

 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="
@@ -229,7 +229,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
@@ -444,8 +444,8 @@
          name: "活动地",
        },
        {
          name: "学术流派",
        },
          name: "学术图谱"
        }
      ],
      // 当前人物信息
      ownInfo: null,
@@ -994,7 +994,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(
@@ -1224,7 +1224,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 });
        }
@@ -1438,8 +1438,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,
        },
        {

 src/pages/inherit/list.vue

@@ -125,7 +125,7 @@

import {
  inheritMedicalCultureList,
  inheritMedicalRelationList
  inheritMedicalRelationList,
} from "@/api/index.js";

export default {
@@ -142,7 +142,7 @@
      culture1: null,
      culture2: null,
      culture3: null,
      viewType: 1
      viewType: 1,
    };
  },
  onLoad(options) {
@@ -160,7 +160,7 @@
    getData(socialFlag) {
      inheritMedicalRelationList({
        identifier: this.idIndex,
        socialFlag: socialFlag
        socialFlag: socialFlag,
      }).then((res) => {
        this.dataList = res.object;
        // 处理节点颜色
@@ -232,7 +232,7 @@

      // 世医文化
      inheritMedicalCultureList({
        identifier: this.idIndex
        identifier: this.idIndex,
      }).then((res) => {
        this.culture1 = res.list.find((item) => item.typeName == "家风");
        this.culture2 = res.list.find((item) => item.typeName == "医德");
@@ -294,7 +294,8 @@
              : "",
            relationType:
              f?.relationInfo?.relationType == "社会关系" ? true : false,
            children: f.children.length > 0 ? this.getChartData(f.children) : []
            children:
              f.children.length > 0 ? this.getChartData(f.children) : [],
          };
        });
        return G6Data;
@@ -310,12 +311,12 @@
        id: this.dataList.name,
        name:this.dataList.name,
        style: {
          fill: "red"
          fill: "red",
        },
        children:
          this.dataList?.children.length > 0
            ? this.getChartData(this.dataList.children)
            : []
            : [],
      };
      const width = barChart.scrollWidth;
      const height = barChart.scrollHeight || 500;
@@ -325,16 +326,20 @@
        height,
        linkCenter: true,
        modes: {
          default: [
            "drag-canvas",
            "zoom-canvas"
          ]
          default: ["drag-canvas", "zoom-canvas"],
        },
        defaultNode: {
          size: 30
          size: 30,
          type: "tree-node",
        },
        defaultEdge: {
          type: this.viewType == 1 ? "cubic-horizontal" : "cubic-vertical"
          type: this.viewType == 1 ? "cubic-horizontal" : "cubic-vertical",
          style: {
            endArrow: {
              path: G6.Arrow.vee(10, 10, 18), // 使用内置箭头路径函数，参数为箭头的 宽度、长度、偏移量（默认为 0，与 d 对应）
              d: 15,
            },
          },
        },
        layout: {
          type: "compactBox",
@@ -354,19 +359,19 @@
          },
          getHGap: () => {
            return this.viewType == 1 ? 100 : 50;
          }
        }
          },
        },
      });
      this.graph.node(function (node) {
        return {
          size: 38,
          anchorPoints: [
            [0, 0.5],
            [1, 0.5]
            [1, 0.5],
          ],
          style: {
            fill: node.relationType ? "#EDF4FF" : "#FCEFE3",
            stroke: node.relationType ? "#5E7AA7" : "#D3791E"
            stroke: node.relationType ? "#5E7AA7" : "#D3791E",
          },
          label: node.name,
          labelCfg: {
@@ -374,16 +379,19 @@
            offset: 5,
            style: {
              fill: "#000",
              fontSize: 12
            }
          }
              fontSize: 12,
            },
          },
        };
      });
      let that = this
      const edgeType =
        this.viewType == 1 ? "cubic-horizontal" : "cubic-vertical";
      this.graph.edge(function (node) {
        return {
          type: "cubic-horizontal",
          type: edgeType,
          color: "#A3B1BF",
          label: node.target._cfg?.model.relationInfo
          label:  that.textStyle(node.target._cfg?.model.relationInfo)
        };
      });
      this.graph.on("node:click", (e) => {
@@ -391,11 +399,11 @@
        console.log("单击", nodeItem);
        if (nodeItem?.personId) {
          uni.navigateTo({
            url: "/pages/character/detail?id=" + nodeItem?.personId
            url: "/pages/character/detail?id=" + nodeItem?.personId,
          });
        } else {
          uni.navigateTo({
            url: "/pages/character/detail?id=" + this.idIndex
            url: "/pages/character/detail?id=" + this.idIndex,
          });
        }
      });
@@ -437,7 +445,7 @@
          image: "./static/image/WMBg.png",
          repeat: "repeat-x", // 是否平铺，可以是 'repeat-x', 'repeat-y', 'no-repeat'
          size: "100% 100%", // 背景图片的尺寸，可以是百分比或者像素
          position: "center center" // 背景图片的位置，可以是 top, bottom, middle 或者百分比
          position: "center center", // 背景图片的位置，可以是 top, bottom, middle 或者百分比
        },
        tooltip: {},
        animationEasingUpdate: "quinticInOut",
@@ -450,7 +458,7 @@
            label: {
              show: true,
              color: "black", // 设置节点文字颜色为黑色
              fontSize: FontSize // 设置文字大小
              fontSize: FontSize, // 设置文字大小
            },
            edgeSymbol: ["circle", "arrow"],
            edgeSymbolSize: [4, 10],
@@ -458,26 +466,31 @@
            lineStyle: {
              opacity: 0.9,
              width: 2,
              curveness: 0.3
              curveness: 0.3,
            },
            force: {
              initLayout: null,
              // gravity: 0
              repulsion: 600,
              edgeLength: 400
              edgeLength: 400,
            },
            expandAndCollapse: false
          }
        ]
            expandAndCollapse: false,
          },
        ],
      };
      //进行渲染
      myChart.setOption(option);
    },

    textStyle(str) {
      return str.replace(/(.{4})/g, "$1\n");
    },

    // 返回按钮
    goBack() {
      this.$router.go(-1);
    }
  }
    },
  },
};
</script>
<style scoped>