1
YM
2024-07-26 e00361c6bcbb1a56f6dcda22b91bdfcb2736e263
1
11个文件已修改
637 ■■■■ 已修改文件
src/components/footer/footer.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/pages/academicGenres/chart.vue 14 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/pages/academicGenres/detail.vue 30 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/pages/academicSchools/index.vue 113 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/pages/changePassword/changePassword.vue 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/pages/character/detail.vue 306 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/pages/character/index.vue 11 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/pages/forgetPass/forgetPass.vue 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/pages/index/index.vue 81 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/pages/inherit/index.vue 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/pages/knowledgeBase/knowledgeBase.vue 45 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/footer/footer.vue
@@ -65,7 +65,7 @@
  /* left: 0px; */
  bottom: 0px;
  left: 0;
  z-index: 999999999999999999999999999999999999999999;
  z-index: 9999999999;
  padding: 0.19rem 0;
  width: 100%;
  background-color: #e6eff8;
src/pages/academicGenres/chart.vue
@@ -389,17 +389,17 @@
.NavTop {
  background-color: #0c274c;
  padding: 25rpx;
}
  img {
.NavTop img {
    width: 30rpx;
    height: 30rpx;
    vertical-align: middle;
  }
  .NavTopr {
.NavTop .NavTopr {
    img {
      margin-right: 10rpx;
    }
  }
}
@@ -411,12 +411,13 @@
  padding: 0.18rem 0.23rem 0;
  align-items: flex-start;
  height: 1.43rem;
}
  view {
.Midde view {
    color: #000;
  }
  .MiddeBack {
.Midde .MiddeBack {
    width: 0.6rem;
    height: 0.24rem;
    font-size: 0.12rem;
@@ -426,7 +427,7 @@
    color: #000;
  }
  .Lists {
.Midde .Lists {
    li {
      width: 0.96rem;
      height: 0.3rem;
@@ -434,7 +435,6 @@
      line-height: 0.3rem;
      text-align: center;
      font-size: 0.14rem;
    }
  }
}
src/pages/academicGenres/detail.vue
@@ -307,17 +307,17 @@
.NavTop {
  background-color: #0c274c;
  padding: 25rpx;
}
  img {
.NavTop img {
    width: 30rpx;
    height: 30rpx;
    vertical-align: middle;
  }
  .NavTopr {
.NavTop .NavTopr {
    img {
      margin-right: 10rpx;
    }
  }
}
@@ -328,12 +328,13 @@
  padding: 0.18rem 0.23rem 0;
  align-items: flex-start;
  height: 1.43rem;
}
  view {
.Midde view {
    color: #000;
  }
  .MiddeBack {
.Midde .MiddeBack {
    width: 0.6rem;
    height: 0.24rem;
    font-size: 0.12rem;
@@ -343,8 +344,7 @@
    color: #000;
  }
  .Lists {
    li {
.Midde .Lists li {
      width: 0.96rem;
      height: 0.3rem;
      border: 1px solid #597aa5;
@@ -352,42 +352,40 @@
      text-align: center;
      font-size: 0.14rem;
    }
  }
}
.Bottom {
  overflow: hidden;
  padding: 0.39rem 1.21rem !important;
}
  .Bottom_top {
.Bottom .Bottom_top {
    justify-content: flex-start;
    align-items: flex-start;
    padding: 0 1.59rem;
}
    .BBimage {
.Bottom .Bottom_top .BBimage {
      width: 4rem;
      height: 2rem;
      margin-right: 0.49rem;
    }
    .author {
.Bottom .Bottom_top .author {
      flex: 1;
      overflow: hidden;
      color: #000;
}
      li {
.Bottom .Bottom_top .author li {
        line-height: 0.22rem;
        font-size: 0.14rem;
        margin-top: 0.18rem;
        color: #2c2c2c;
      }
    }
  }
  .BBimage {
    width: 50%;
    height: 350rpx;
  }
}
.Bottom_Bot {
src/pages/academicSchools/index.vue
@@ -429,19 +429,19 @@
      // 分类
      categories: [
        {
          name: "亲属关系",
          name: "亲属关系"
        },
        {
          name: "师承关系",
          name: "师承关系"
        },
        {
          name: "文献作品",
          name: "文献作品"
        },
        {
          name: "社会关系",
          name: "社会关系"
        },
        {
          name: "活动地",
          name: "活动地"
        },
        {
          name: "学术流派"
@@ -450,7 +450,7 @@
      // 当前人物信息
      ownInfo: null,
      detailData: {
        name: "",
        name: ""
      },
      isAdvancedSearch: false,
      formData: {
@@ -470,7 +470,7 @@
      personPageInfo: {
        totalCount: 0,
        page: 1,
        limit: 10,
        limit: 10
      },
      personTag: [],
      socialDistinction: [],
@@ -489,7 +489,7 @@
      infoOfPersons: [],
      infoOfSchools: [],
      nodeDatas: [],
      links: [],
      links: []
    };
  },
  mounted() {
@@ -536,7 +536,7 @@
        return {
          ...item,
          name: item.currentName,
          id: item.dynastyId,
          id: item.dynastyId
        };
      });
      this.formData.actively = data;
@@ -557,7 +557,7 @@
          return {
            ...item,
            name: item.currentName,
            id: item.dynastyId,
            id: item.dynastyId
          };
        });
        this.formData.actively = data;
@@ -568,7 +568,7 @@
    getAddressList() {
      const data = {
        page: this.page,
        pageSize: this.pageSize,
        pageSize: this.pageSize
      };
      if (this.dynastyId != "") {
        data["dynastyId"] = this.dynastyId;
@@ -584,7 +584,7 @@
          this.gridData = res?.list?.map((item, i) => {
            return {
              ...item,
              index: i,
              index: i
            };
          });
        } else {
@@ -758,7 +758,7 @@
            parentName: parent?.NAME[0]?.content1 ?? parent.parentName,
            name: personInfo?.NAME[0]?.content1,
            category: type,
            symbolSize: 15,
            symbolSize: 15
          };
          if (order > 80) {
            order = 80;
@@ -860,7 +860,7 @@
              const data = item[str]?.map((e) => {
                return {
                  ...e,
                  personId: item.personId,
                  personId: item.personId
                };
              });
              if (ele[str] && data?.length) {
@@ -1049,8 +1049,8 @@
            id: item.mainId,
            name: mainPerson.NAME[0].content1,
            itemStyle: {
              color: "#244a7b",
            },
              color: "#244a7b"
            }
          });
        } else {
          switch (parent.thisType) {
@@ -1067,7 +1067,7 @@
                  this.nodeDatas.push({
                    category: 0,
                    id: item.mainId,
                    name: p.NAME[0].content1,
                    name: p.NAME[0].content1
                  });
                }
              }
@@ -1083,8 +1083,8 @@
                  padding: [3, 8],
                  borderRadius: 30,
                  position: "middle", // 设置标签文本在线的中间位置上居中显示
                  distance: -10, // 将标签放置在连接线上
                },
                  distance: -10 // 将标签放置在连接线上
                }
              });
              break;
            case 2:
@@ -1096,12 +1096,12 @@
                this.nodeDatas.push({
                  category: 2,
                  id: item.mainId,
                  name: item.literatureName,
                  name: item.literatureName
                });
              }
              this.links.push({
                source: item.mainId,
                target: parent.mainId,
                target: parent.mainId
              });
              break;
            case 3:
@@ -1113,12 +1113,12 @@
                this.nodeDatas.push({
                  category: 4,
                  id: item.mainId,
                  name: item.ancientName,
                  name: item.ancientName
                });
              }
              this.links.push({
                source: item.mainId,
                target: parent.mainId,
                target: parent.mainId
              });
              break;
            case 4:
@@ -1134,13 +1134,13 @@
                  this.nodeDatas.push({
                    category: 5,
                    id: item.mainId,
                    name: s.name[0],
                    name: s.name[0]
                  });
                }
              }
              this.links.push({
                source: item.mainId,
                target: parent.mainId,
                target: parent.mainId
              });
              break;
            case 5:
@@ -1156,7 +1156,7 @@
                  this.nodeDatas.push({
                    category: 3,
                    id: item.mainId,
                    name: p.NAME[0].content1,
                    name: p.NAME[0].content1
                  });
                }
              }
@@ -1172,8 +1172,8 @@
                  padding: [3, 8],
                  borderRadius: 30,
                  position: "middle", // 设置标签文本在线的中间位置上居中显示
                  distance: -10, // 将标签放置在连接线上
                },
                  distance: -10 // 将标签放置在连接线上
                }
              });
              break;
            case 6:
@@ -1189,7 +1189,7 @@
                  this.nodeDatas.push({
                    category: 1,
                    id: item.mainId,
                    name: p.NAME[0].content1,
                    name: p.NAME[0].content1
                  });
                }
              }
@@ -1205,8 +1205,8 @@
                  padding: [3, 8],
                  borderRadius: 30,
                  position: "middle", // 设置标签文本在线的中间位置上居中显示
                  distance: -10, // 将标签放置在连接线上
                },
                  distance: -10 // 将标签放置在连接线上
                }
              });
              break;
          }
@@ -1257,7 +1257,7 @@
        }
        return {
          ...item,
          symbolSize: size > 80 ? 80 : size,
          symbolSize: size > 80 ? 80 : size
        };
      });
@@ -1291,8 +1291,8 @@
            orient: "vertical",
            data: this.categories.map(function (a) {
              return a.name;
            }),
          },
            })
          }
        ],
        series: [
          {
@@ -1307,27 +1307,27 @@
            label: {
              show: true,
              position: "right",
              formatter: "{b}",
              formatter: "{b}"
            },
            scaleLimit: {
              min: 0.4,
              max: 2,
              max: 2
            },
            lineStyle: {
              color: "source",
              curveness: 0.2,
              curveness: 0.2
            },
            emphasis: {
              focus: "adjacency",
              lineStyle: {
                width: 5,
              },
                width: 5
              }
            },
            force: {
              repulsion: 600,
              edgeLength: 300,
            },
          },
              edgeLength: 300
            }
          }
        ],
        color: [
          "#5470c6",
@@ -1335,8 +1335,8 @@
          "#fac858",
          "#ee6666",
          "#ea7ccc",
          "#9a60b4",
        ],
          "#9a60b4"
        ]
      };
      // 设置点击事件监听
      myChart.off("click");
@@ -1383,7 +1383,7 @@
              i += 1;
              return e["content" + i];
            }).join("、") ?? "",
          biography: data?.BIOGRAPHY ?? "",
          biography: data?.BIOGRAPHY ?? ""
        };
        this.detailData = obj;
      }
@@ -1466,7 +1466,7 @@
            division:
              item.medicalBranchList && item.medicalBranchList.length
                ? item.medicalBranchList[0].content1
                : "-",
                : "-"
          };
        });
        this.showPerson = true;
@@ -1510,7 +1510,7 @@
        this.hotKeyList = indexList.map((item) => {
          return {
            id: item,
            name: res.object[item],
            name: res.object[item]
          };
        });
      });
@@ -1526,8 +1526,8 @@
      //     document.querySelector(".fbox1").style.height = box1Height + "px";
      //   }
      // });
    },
  },
    }
  }
};
</script>
@@ -1726,16 +1726,17 @@
.hotSearch {
  font-size: 0.12rem;
  color: #2c2c2c;
}
  li {
.hotSearch li {
    color: #244a7b;
    margin: 0 0.1rem;
    color: #244a7b;
    &.active {
}
.hotSearch li.active {
      color: #027edc;
      font-weight: bold;
    }
  }
}
.searchDialog {
@@ -1757,7 +1758,10 @@
  background: #fff;
  border-radius: 6px;
  box-shadow: 0 0 10px -3px #000;
  .closeBtn {
}
.personDialog .closeBtn {
    position: absolute;
    right: -10px;
    top: -10px;
@@ -1768,7 +1772,6 @@
    border-radius: 50%;
    color: #f56c6c;
    cursor: pointer;
  }
}
.selectActivelyBox {
src/pages/changePassword/changePassword.vue
@@ -251,7 +251,7 @@
        {
          name: "地域图谱",
          id: 4
        },
        }
        // {
        //   name: "中医医事制度",
        //   id: 5
@@ -292,7 +292,7 @@
          // alert('submit!成功');
          getchangePassword(Obj).then((res) => {
            if (res.success == true) {
              this.$message.success('修改成功');
              this.$message.success("修改成功");
              uni.navigateTo({
                url: "/pages/Login/Login"
              });
@@ -463,7 +463,6 @@
  width: 88px;
  color: #244a7b;
  font-size: 0.14rem;
}
::v-deep .el-form-item {
@@ -497,8 +496,9 @@
  height: 100vh;
  color: #fff;
}
  .repository {
.container .repository {
    width: 100% !important;
    /* margin-top: 19px; */
    /* height: 68%; */
@@ -515,7 +515,6 @@
    .r-top {
      font-size: 40rpx !important;
      margin: 10rpx 0;
    }
  }
}
@@ -572,8 +571,8 @@
  /* flex-wrap: wrap; */
  padding: 0 20px;
  text-align: center;
  li {
}
.secretary li {
    background-color: #fff;
    color: black;
    height: 600rpx;
@@ -586,7 +585,6 @@
    /*             padding: 58rpx 128rpx 88rpx; */
    text-align: center;
    background: #ebf4ff;
  }
}
.Bbottom {
src/pages/character/detail.vue
@@ -289,7 +289,7 @@
              <span>相关附表/图像</span>
            </div>
            <view>
              <div style="overflow: auto;display: flex;">
              <div style="overflow: auto; display: flex">
                <div v-for="item in imageList" :key="item" :title="item.name">
                  <el-image
                    :title="item.name"
@@ -418,7 +418,7 @@
  getPersonWritings,
  getPersonRelationAtSchool,
  getSpaceTime,
  getDynastyData,
  getDynastyData
} from "@/api/index.js";
import { getImg } from "@/static/tool.js";
import L from "leaflet";
@@ -426,7 +426,7 @@
export default {
  components: {
    Table1,
    Table1
  },
  data() {
    return {
@@ -447,62 +447,62 @@
      tableColumns1: [
        {
          prop: "a",
          label: "正书名",
          label: "正书名"
        },
        {
          prop: "e",
          label: "作者",
          label: "作者"
        },
        {
          prop: "b",
          label: "著作年",
          label: "著作年"
        },
        {
          prop: "c",
          label: "著作方式",
          label: "著作方式"
        },
        {
          prop: "d",
          label: "总目分类",
        },
          label: "总目分类"
        }
      ],
      tableColumns2: [
        {
          prop: "a",
          label: "关系人",
          label: "关系人"
        },
        {
          prop: "b",
          label: "关系类型",
          label: "关系类型"
        },
        {
          prop: "c",
          label: "考据",
          label: "考据"
        },
        {
          prop: "d",
          width: 300,
          showOverflowTooltip: true,
          label: "出处",
        },
          label: "出处"
        }
      ],
      tableColumns3: [
        {
          prop: "a",
          label: "活动时间区间",
          label: "活动时间区间"
        },
        {
          prop: "b",
          label: "活动名称",
          label: "活动名称"
        },
        {
          prop: "c",
          label: "活动地点",
          label: "活动地点"
        },
        {
          prop: "d",
          label: "活动描述",
        },
          label: "活动描述"
        }
      ],
      tableData1: [],
      tableData2: [],
@@ -512,7 +512,7 @@
      nodes: [],
      relationships: [],
      personResearchList: [],
      markerList: [],
      markerList: []
    };
  },
  onLoad(options) {
@@ -557,7 +557,7 @@
      document.body.removeChild(textarea);
      this.$message({
        message: "复制成功!",
        type: "success",
        type: "success"
      });
    },
    toLink(item) {
@@ -572,7 +572,7 @@
      // 基本信息
      getPersonInfo({
        id: this.detailId,
        type: "PERSON_BASIC",
        type: "PERSON_BASIC"
      }).then((res) => {
        const obj = {};
        if (
@@ -590,7 +590,7 @@
        this.detailInfo = obj;
        getDynastyAll().then((dynastyData) => {
          getWebBasic({
            personId: this.detailId,
            personId: this.detailId
          }).then((res) => {
            const obj = res.object;
            if (obj.school) {
@@ -609,7 +609,7 @@
      //现代研究
      getPersonInfo({
        id: this.detailId,
        type: "PERSON_RESEARCH",
        type: "PERSON_RESEARCH"
      }).then((res) => {
        this.personResearchList = res.object.personResearchList;
      });
@@ -617,7 +617,7 @@
      // 活动年谱
      getPersonInfo({
        id: this.detailId,
        type: "PERSON_SPACE_TIME",
        type: "PERSON_SPACE_TIME"
      }).then((res) => {
        if (res.object.personSpaceTimeList) {
          this.tableData5 = res.object.personSpaceTimeList.map((item) => {
@@ -625,7 +625,7 @@
              a: item.time,
              b: item.activityName,
              c: item.activityAddrOld,
              d: item.desc,
              d: item.desc
            };
          });
        }
@@ -637,15 +637,15 @@
          list: [
            {
              name: "姓名",
              value: obj.name || "-",
              value: obj.name || "-"
            },
            {
              name: "字",
              value: obj.zi || "-",
              value: obj.zi || "-"
            },
            {
              name: "号",
              value: obj.hao || "-",
              value: obj.hao || "-"
            },
            {
              name: "所处时期",
@@ -656,25 +656,25 @@
                uni.navigateTo({
                  url:
                    "/pages/knowledgeBase/knowledgeBase?dynasty=" +
                    obj.dynastyId,
                    obj.dynastyId
                });
              },
              }
            },
            {
              name: "民族",
              value: obj.ethnic || "-",
            },
          ],
              value: obj.ethnic || "-"
            }
          ]
        },
        {
          list: [
            {
              name: "籍贯",
              value: obj.native || "-",
              value: obj.native || "-"
            },
            {
              name: "性别",
              value: obj.gender || "-",
              value: obj.gender || "-"
            },
            {
              name: "职官",
@@ -683,9 +683,9 @@
                uni.navigateTo({
                  url:
                    "/pages/knowledgeBase/knowledgeBase?isAdvancedSearch=1&official=" +
                    obj.official,
                    obj.official
                });
              },
              }
            },
            {
              name: "流派",
@@ -695,38 +695,38 @@
                sres.object.school_NAME &&
                sres.object.school_NAME.length
                  ? sres.object.school_NAME[0].content
                  : "-",
                  : "-"
            },
            {
              name: "学术特点",
              value: obj.features || "-",
            },
          ],
        },
              value: obj.features || "-"
            }
          ]
        }
      ];
    },
    getSourceData() {
      getSource({
        personId: this.detailId,
        personId: this.detailId
      }).then((res) => {
        this.sourceDataList = res.list;
      });
    },
    getImages() {
      getPersonImages({
        personId: this.detailId,
        personId: this.detailId
      }).then((res) => {
        this.imageList = res.list.map((item) => {
          return {
            src: getImg(item.filePath),
            name: item.desc,
            name: item.desc
          };
        });
      });
    },
    getBiog() {
      getPersonBiog({
        personId: this.detailId,
        personId: this.detailId
      }).then((res) => {
        this.biogData = res.list.map((item) => {
          return {
@@ -735,14 +735,14 @@
              "《" +
              item.bookName +
              "》 " +
              (item.pageNo ? "P " + item.pageNo : ""), // 这里只有bookid无法匹配到书名
              (item.pageNo ? "P " + item.pageNo : "") // 这里只有bookid无法匹配到书名
          };
        });
      });
    },
    getBiog() {
      getPersonBiog({
        personId: this.detailId,
        personId: this.detailId
      }).then((res) => {
        this.biogData = res.list.map((item) => {
          return {
@@ -751,14 +751,14 @@
              "《" +
              item.bookName +
              "》 " +
              (item.pageNo ? "P " + item.pageNo : ""), // 这里只有bookid无法匹配到书名
              (item.pageNo ? "P " + item.pageNo : "") // 这里只有bookid无法匹配到书名
          };
        });
      });
    },
    getWritings() {
      getPersonWritings({
        personId: this.detailId,
        personId: this.detailId
      }).then((res) => {
        this.tableData1 = res.list.map((item) => {
          return {
@@ -766,7 +766,7 @@
            b: item.dynasty,
            c: item.writeWay,
            d: item.classify,
            e: this.detailInfo.NAME,
            e: this.detailInfo.NAME
          };
        });
      });
@@ -774,7 +774,7 @@
    getRelationship() {
      getPersonInfo({
        id: this.detailId,
        type: "PERSON_RELATIONS",
        type: "PERSON_RELATIONS"
      }).then((res) => {
        this.tableData4;
        if (res.object.personRelationMap.kin.length) {
@@ -791,7 +791,7 @@
                      .name +
                    "》 P" +
                    f.pageNo
                  : "",
                  : ""
            };
          });
        }
@@ -810,7 +810,7 @@
                        .name +
                      "》 P" +
                      f.pageNo
                    : "",
                    : ""
              };
            }
          );
@@ -829,7 +829,7 @@
                      .name +
                    "》 P" +
                    f.pageNo
                  : "",
                  : ""
            };
          });
        }
@@ -837,7 +837,7 @@
    },
    getMappingData() {
      getFuzzySearch({
        personId: this.detailId,
        personId: this.detailId
      }).then((res) => {
        this.nodes = [];
        this.relationships = [];
@@ -853,19 +853,19 @@
            if (item.name1 && exists1 !== true) {
              this.nodes.push({
                name: item.name1,
                id: item.identifier1,
                id: item.identifier1
              });
            }
            if (item.name2 && exists2 !== true) {
              this.nodes.push({
                name: item.name2,
                id: item.identifier2,
                id: item.identifier2
              });
            }
            let obj = {
              source: item.name1,
              target: item.name2,
              relation: item.relationName || "", // 如果存在 relationName 字段则使用,否则为空字符串
              relation: item.relationName || "" // 如果存在 relationName 字段则使用,否则为空字符串
            };
            this.relationships.push(obj);
          });
@@ -875,7 +875,7 @@
    },
    getMapInfo() {
      getSpaceTime({
        personId: this.detailId,
        personId: this.detailId
      }).then((res) => {
        if (res.list && res.list.length) {
          const data = [];
@@ -884,7 +884,7 @@
            if (item.xcoord && item.ycoord) {
              const obj = {
                name: item.activityName,
                value: [item.xcoord, item.ycoord],
                value: [item.xcoord, item.ycoord]
              };
              data.push(obj);
            }
@@ -905,36 +905,36 @@
    initMap(markerList) {
      var map = L.map("spaceTime", {
        preferCanvas: true,
        attributionControl: false,
        attributionControl: false
      }).setView([markerList[0].value[1], markerList[0].value[0]], 13);
      L.tileLayer
        .chinaProvider("TianDiTu.Normal.Map", {
          key: "76bc34ead7e30e663a4eded8aeaf5860",
          maxZoom: 18,
          minZoom: 3,
          minZoom: 3
        })
        .addTo(map);
      L.tileLayer
        .chinaProvider("TianDiTu.Normal.Annotion", {
          key: "76bc34ead7e30e663a4eded8aeaf5860",
          maxZoom: 18,
          minZoom: 3,
          minZoom: 3
        })
        .addTo(map);
      let icon = L.divIcon({
        html: "<div class='map-circle-name ripple'></div>",
        iconSize: [80, 80],
        className: "map-circle",
        className: "map-circle"
      });
      this.map = map;
      const temp_mark = L.marker([markerList.value[1], markerList.value[0]], {
        icon: icon,
        icon: icon
      }).addTo(map);
      if (markerList.length) {
        for (let i = 0; i < markerList.length; i++) {
          const item = markerList[i];
          const temp_mark = L.marker([item.value[1], item.value[0]], {
            icon: icon,
            icon: icon
          }).addTo(map);
        }
      }
@@ -943,11 +943,11 @@
    fangdaClick(index) {
      if (index == 1) {
        uni.navigateTo({
          url: "/pages/character/index?keyword=" + this.detailInfo.NAME,
          url: "/pages/character/index?keyword=" + this.detailInfo.NAME
        });
      } else if (index == 2) {
        uni.navigateTo({
          url: "/pages/characterMap/characterMap?id=" + this.detailId,
          url: "/pages/characterMap/characterMap?id=" + this.detailId
        });
      }
    },
@@ -963,13 +963,13 @@
    scrollToTop() {
      window.scrollTo({
        top: 0,
        behavior: "smooth", // 使用平滑滚动
        behavior: "smooth" // 使用平滑滚动
      });
    },
    openFileClick(index) {
      let obj = {
        id: this.detailId,
        type: "Person",
        type: "Person"
      };
      switch (index) {
        case 1:
@@ -1031,8 +1031,8 @@
                position: "middle", // 设置标签文本在线的中间位置上居中显示
                // bottom: -(FontSize+10),
                z: 10, // 设置标签的z轴高度,使其比连接线更高
                distance: -(Distance + 1), // 将标签放置在连接线上
              },
                distance: -(Distance + 1) // 将标签放置在连接线上
              }
            });
          }
        }
@@ -1047,8 +1047,8 @@
          itemStyle: {
            color: "#eae0eb", // 可以根据索引设置不同的颜色
            borderWidth: BorderWidth,
            borderColor: "#996f9f",
          },
            borderColor: "#996f9f"
          }
        };
      });
      var option;
@@ -1058,14 +1058,14 @@
          top: FontSize + 10,
          subtextStyle: {
            fontSize: FontSize, // 设置副标题文字大小为 14px
            color: "#2C2C2C",
          },
            color: "#2C2C2C"
          }
        },
        backgroundColor: {
          type: "image",
          image: "/static/image/characterRelationBg.png",
          size: "100% 100%", // 背景图片的尺寸,可以是百分比或者像素
          position: "center center", // 背景图片的位置,可以是 top, bottom, middle 或者百分比
          position: "center center" // 背景图片的位置,可以是 top, bottom, middle 或者百分比
        },
        tooltip: {},
        animationDurationUpdate: 1500,
@@ -1079,7 +1079,7 @@
            label: {
              show: true,
              color: "black", // 设置节点文字颜色为黑色
              fontSize: FontSize, // 设置文字大小
              fontSize: FontSize // 设置文字大小
            },
            edgeSymbol: ["circle"],
            edgeSymbolSize: [4, 10],
@@ -1088,16 +1088,16 @@
            lineStyle: {
              opacity: 0.9,
              width: 2,
              curveness: 0.3,
              curveness: 0.3
            },
            emphasis: {
              focus: "adjacency",
              lineStyle: {
                width: 10,
              },
            },
          },
        ],
                width: 10
              }
            }
          }
        ]
      };
      // 将生成的连接线添加到echarts图表的option中
      option.series[0].links = links;
@@ -1121,10 +1121,10 @@
          text: "",
          subtext: "",
          sublink: "",
          left: "center",
          left: "center"
        },
        tooltip: {
          trigger: "item",
          trigger: "item"
        },
        bmap: {
          center: data[0].value,
@@ -1136,123 +1136,123 @@
                featureType: "water",
                elementType: "all",
                stylers: {
                  color: "#86a1ac",
                },
                  color: "#86a1ac"
                }
              },
              {
                featureType: "land",
                elementType: "all",
                stylers: {
                  color: "#f1d99d",
                },
                  color: "#f1d99d"
                }
              },
              {
                featureType: "railway",
                elementType: "all",
                stylers: {
                  visibility: "off",
                },
                  visibility: "off"
                }
              },
              {
                featureType: "highway",
                elementType: "all",
                stylers: {
                  color: "#f1d99d",
                },
                  color: "#f1d99d"
                }
              },
              {
                featureType: "highway",
                elementType: "labels",
                stylers: {
                  visibility: "off",
                },
                  visibility: "off"
                }
              },
              {
                featureType: "arterial",
                elementType: "geometry",
                stylers: {
                  color: "#f1d99d",
                },
                  color: "#f1d99d"
                }
              },
              {
                featureType: "arterial",
                elementType: "geometry.fill",
                stylers: {
                  color: "#f1d99d",
                },
                  color: "#f1d99d"
                }
              },
              {
                featureType: "poi",
                elementType: "all",
                stylers: {
                  visibility: "off",
                },
                  visibility: "off"
                }
              },
              {
                featureType: "green",
                elementType: "all",
                stylers: {
                  visibility: "off",
                },
                  visibility: "off"
                }
              },
              {
                featureType: "subway",
                elementType: "all",
                stylers: {
                  visibility: "off",
                },
                  visibility: "off"
                }
              },
              {
                featureType: "manmade",
                elementType: "all",
                stylers: {
                  color: "#f1d99d",
                },
                  color: "#f1d99d"
                }
              },
              {
                featureType: "local",
                elementType: "all",
                stylers: {
                  color: "#f1d99d",
                },
                  color: "#f1d99d"
                }
              },
              {
                featureType: "local",
                elementType: "labels",
                stylers: {
                  visibility: "off",
                },
                  visibility: "off"
                }
              },
              {
                featureType: "arterial",
                elementType: "labels",
                stylers: {
                  visibility: "off",
                },
                  visibility: "off"
                }
              },
              {
                featureType: "boundary",
                elementType: "all",
                stylers: {
                  color: "#f1d99d",
                },
                  color: "#f1d99d"
                }
              },
              {
                featureType: "building",
                elementType: "all",
                stylers: {
                  color: "#f1d99d",
                },
                  color: "#f1d99d"
                }
              },
              {
                featureType: "label",
                elementType: "labels.text.fill",
                stylers: {
                  color: "#000",
                },
              },
            ],
          },
                  color: "#000"
                }
              }
            ]
          }
        },
        series: [
          {
@@ -1262,18 +1262,18 @@
            data: data,
            symbolSize: 0,
            encode: {
              value: 2,
              value: 2
            },
            label: {
              formatter: "{b}",
              position: "right",
              show: false,
              show: false
            },
            emphasis: {
              label: {
                show: true,
              },
            },
                show: true
              }
            }
          },
          {
            name: "",
@@ -1282,47 +1282,45 @@
            data: data,
            symbolSize: 20,
            encode: {
              value: 2,
              value: 2
            },
            showEffectOn: "render",
            rippleEffect: {
              brushType: "stroke",
              brushType: "stroke"
            },
            label: {
              formatter: "{b}",
              position: "right",
              show: false,
              show: false
            },
            itemStyle: {
              color: "#ec7b43",
              shadowBlur: 10,
              shadowColor: "#333",
              shadowColor: "#333"
            },
            emphasis: {
              scale: false,
              scale: false
            },
            zlevel: 1,
          },
        ],
            zlevel: 1
          }
        ]
      };
      option && myChart.setOption(option);
    },
  },
    }
  }
};
</script>
<style>
/* Table1表格里面的数据 */
::v-deep .is-leaf {
  .cell {
::v-deep .is-leaf .cell {
    font-size: 0.14rem !important;
    height: 0.4rem !important;
    line-height: 0.4rem !important;
  }
}
::v-deep .el-table__body {
  .cell {
::v-deep .el-table__body .cell {
    font-size: 0.14rem !important;
    height: 0.4rem !important;
    line-height: 0.4rem !important;
@@ -1374,16 +1372,16 @@
  padding: 15rpx 25rpx;
  color: #fff !important;
  img {
}
.NavTop img {
    width: 30rpx;
    height: 30rpx;
    vertical-align: middle;
  }
  .NavTopr {
.NavTop .NavTopr {
    img {
      margin-right: 10rpx;
    }
  }
}
@@ -1391,9 +1389,9 @@
  width: 100%;
  height: 30rpx;
  img {
    vertical-align: top;
  }
.mImage img {
  vertical-align: top;
}
.Midde {
@@ -1404,28 +1402,28 @@
  align-items: flex-start;
  padding: 0.18rem 0.24rem;
  view {
}
.Midde view {
    color: #000;
  }
  .MiddeBack {
.Midde .MiddeBack {
    width: 0.6rem;
    height: 0.24rem;
    font-size: 0.12rem;
    padding: 0;
    border: 1px solid #9e9e9e;
  }
}
.yinyong {
  font-size: 0.12rem;
  img {
}
.yinyong img {
    width: 0.12rem;
    height: 0.1rem;
    vertical-align: top;
    margin-right: 0.03rem;
  }
}
.el-dialog__wrapper {
src/pages/character/index.vue
@@ -594,15 +594,14 @@
.hotSearch {
  font-size: 0.12rem;
  color: #2c2c2c;
  li {
}
.hotSearch li {
    color: #244a7b;
    margin: 0 0.1rem;
    color: #244a7b;
    &.active{
      color: #027EDC;
}
.hotSearch li .active {
  color: #027edc;
      font-weight: bold;
    }
  }
}
</style>
src/pages/forgetPass/forgetPass.vue
@@ -654,8 +654,8 @@
  height: 100vh;
  color: #fff;
  .repository {
}
.container .repository {
    width: 100% !important;
    /* margin-top: 19px; */
    /* height: 68%; */
@@ -663,17 +663,15 @@
    flex-direction: column;
    justify-content: space-around;
    align-items: center;
    .Ttop {
}
.container .repository .Ttop {
      margin-top: 0.38rem;
      margin-bottom: 1.22rem;
    }
    .r-top {
.container .repository .r-top {
      font-size: 40rpx !important;
      margin: 10rpx 0;
    }
  }
}
.login {
@@ -729,8 +727,8 @@
  /* flex-wrap: wrap; */
  padding: 0 20px;
  text-align: center;
  li {
}
.secretary li {
    background-color: #fff;
    color: black;
    height: 600rpx;
@@ -743,7 +741,6 @@
    /*             padding: 58rpx 128rpx 88rpx; */
    text-align: center;
    background: #ebf4ff;
  }
}
.Bbottom {
src/pages/index/index.vue
@@ -150,7 +150,7 @@
import Footer1 from "@/components/footer/footer.vue";
export default {
  components: {
    Footer1,
    Footer1
  },
  data() {
    return {
@@ -169,55 +169,55 @@
        pass: "",
        checkPass: "",
        cellphoneORmailbox: "",
        verifyCode: "",
        verifyCode: ""
      },
      // 登录用户账号
      loginData: {
        // 账号
        loginID: "",
        pass: "",
        pass: ""
      },
      // 重置密码
      resetDataPass: {
        cellphoneORmailbox: "",
        verifyCode: "",
        newPass: "",
        checkPass: "",
        checkPass: ""
      },
      // 修改密码
      amendDataPass: {
        loginID: "",
        originalPass: "",
        newPass: "",
        checkPass: "",
        checkPass: ""
      },
      // 书籍数据
      listData: [
        {
          name: "历代人物",
          id: 1,
          id: 1
        },
        {
          name: "家学传承",
          id: 2,
          id: 2
        },
        {
          name: "学术图谱",
          id: 6,
          id: 6
        },
        {
          name: "学术流派",
          id: 3,
          id: 3
        },
        {
          name: "地域图谱",
          id: 4,
        },
          id: 4
        }
        // {
        //   name: "中医医事制度",
        //   id: 5
        // }
      ],
      ]
    };
  },
  onLoad() {
@@ -225,7 +225,7 @@
      success: function (info) {
        // console.log('屏幕的宽度:' + info.windowWidth);
        // console.log('屏幕的高度:' + info.windowHeight);
      },
      }
    });
  },
  mounted() {
@@ -236,7 +236,7 @@
    // 搜索
    onSearch(val) {
      uni.navigateTo({
        url: "/pages/knowledgeBase/knowledgeBase?keyword=" + val.text,
        url: "/pages/knowledgeBase/knowledgeBase?keyword=" + val.text
      });
    },
    // 搜索
@@ -247,7 +247,7 @@
        if (this.searchInput.trim() !== "") {
          uni.navigateTo({
            url:
              "/pages/knowledgeBase/knowledgeBase?keyword=" + this.searchInput,
              "/pages/knowledgeBase/knowledgeBase?keyword=" + this.searchInput
          });
        }
        this.searchInput = "";
@@ -260,30 +260,30 @@
      if (item.id == 1) {
        uni.navigateTo({
          // url: '/pages/character/detail?id=' + item.id
          url: "/pages/character/index?id=" + item.id,
          url: "/pages/character/index?id=" + item.id
        });
      } else if (item.id == 2) {
        uni.navigateTo({
          url: "/pages/inherit/index?id=" + item.id,
          url: "/pages/inherit/index?id=" + item.id
        });
        // uni.navigateTo({
        //     url: '/pages/shiyiHome/shiyiHome'
        // })
      } else if (item.id == 3) {
        uni.navigateTo({
          url: "/pages/academicGenres/index?id=" + item.id,
          url: "/pages/academicGenres/index?id=" + item.id
        });
      } else if (item.id == 4) {
        uni.navigateTo({
          url: "/pages/territory/territory?id=" + item.id,
          url: "/pages/territory/territory?id=" + item.id
        });
      } else if (item.id == 5) {
        uni.navigateTo({
          url: "/pages/TcmSystem/TcmSystem?id=" + item.id,
          url: "/pages/TcmSystem/TcmSystem?id=" + item.id
        });
      } else if (item.id == 6) {
        uni.navigateTo({
          url: "/pages/academicSchools/index",
          url: "/pages/academicSchools/index"
        });
      }
    },
@@ -315,7 +315,7 @@
          // token 不存在
          this.isCommand = false;
          uni.navigateTo({
            url: "/pages/Login/Login",
            url: "/pages/Login/Login"
          });
        }
      } else if (index == 3) {
@@ -326,7 +326,7 @@
    handleCommand(int) {
      if (int == 1) {
        uni.navigateTo({
          url: "/pages/changePassword/changePassword",
          url: "/pages/changePassword/changePassword"
        });
      } else if (int == 2) {
        uni.showModal({
@@ -343,15 +343,15 @@
                //退出成功!并跳转到其他页面
                this.$message.success("退出成功");
                uni.reLaunch({
                  url: "/pages/Login/Login",
                  url: "/pages/Login/Login"
                });
              });
            }
          },
          }
        });
      }
    },
  },
    }
  }
};
</script>
@@ -493,12 +493,11 @@
  .secretary li {
    width: 1.3rem !important;
    height: 4rem !important;
    span {
  }
  .secretary li span {
      width: 0.5rem !important;
      height: 70% !important;
      font-size: 0.25rem !important;
    }
  }
  .hua {
@@ -558,12 +557,11 @@
  .secretary li {
    width: 1.3rem !important;
    height: 4rem !important;
    span {
  }
  .secretary li span {
      width: 0.5rem !important;
      height: 70% !important;
      font-size: 0.25rem !important;
    }
  }
  /* 高级搜索 */
@@ -660,8 +658,8 @@
  height: 100vh;
  color: #fff;
  .repository {
}
.container .repository {
    width: 100% !important;
    /* margin-top: 19px; */
    /* height: 68%; */
@@ -669,17 +667,15 @@
    flex-direction: column;
    justify-content: space-around;
    align-items: center;
    .Ttop {
}
.container .repository .Ttop {
      margin-top: 0.38rem;
      margin-bottom: 1.22rem;
    }
    .r-top {
.container .repository .r-top {
      font-size: 40rpx !important;
      margin: 10rpx 0;
    }
  }
}
.login {
@@ -735,8 +731,8 @@
  /* flex-wrap: wrap; */
  padding: 0 20px;
  text-align: center;
  li {
}
.secretary li {
    background-color: #fff;
    color: black;
    width: 1.6rem;
@@ -750,7 +746,6 @@
    font-weight: 600;
    margin: 0 0.21rem;
    cursor: pointer;
  }
}
::v-deep .cleanupBtn {
src/pages/inherit/index.vue
@@ -430,15 +430,13 @@
};
</script>
<style scoped>
.Lists {
  li {
.Lists li {
    width: 0.96rem;
    height: 0.3rem;
    border: 1px solid #da7a2b;
    line-height: 0.3rem;
    text-align: center;
    font-size: 0.14rem;
  }
}
.MiddeBack {
  width: 0.6rem;
src/pages/knowledgeBase/knowledgeBase.vue
@@ -47,7 +47,16 @@
        class="advancedSeaTrue1"
      >
        <h3>高级搜索</h3>
        <MyForm @submit="onSubmit" @reset="resetForm" :from="from" />
        <MyForm
          @submit="
            (data) => {
              CurrentPage = 1;
              onSubmit(data);
            }
          "
          @reset="resetForm"
          :from="from"
        />
      </view>
    </view>
    <uni-row
@@ -382,7 +391,7 @@
      // 表格的数组
      tableData: [],
      // 分页的总数
      total: 100,
      total: 0,
      // 当前页
      CurrentPage: 1,
      // 一页显示多少条数据
@@ -641,6 +650,10 @@
          document.querySelector(".fbox1").style.height = box1Height + "px";
        }
      });
      if (this.isAdvancedSearch) {
        this.keywords = "";
        this.CurrentPage = 1;
      }
    },
    // 高级搜索
    async onSubmit(val) {
@@ -657,7 +670,7 @@
        this.dynasty.id = currentDynasty.dynastyId;
      }
      this.submitData = val;
      this.CurrentPage = 1;
      let Obj = {
        keywords: "", //搜索框检索
        name: val.name, //姓名
@@ -669,7 +682,6 @@
        dynasty: val.dynasty, //朝代id
        dynastyId: this.dynasty.id, //朝代id
        institution: val.institution, //机构
        bookId: null, //来源id
        page: this.CurrentPage,
        pageSize: this.pageSize
      };
@@ -760,14 +772,22 @@
    PrevClick(val) {
      if (this.CurrentPage != val) {
        this.CurrentPage = val;
        if (this.isAdvancedSearch) {
          this.onSubmit(this.aSearchData);
        } else {
        this.onSearch({ text: this.keywords });
        }
      }
    },
    // 下一页
    NextClick(val) {
      if (this.CurrentPage != val) {
        this.CurrentPage = val;
        if (this.isAdvancedSearch) {
          this.onSubmit(this.aSearchData);
        } else {
        this.onSearch({ text: this.keywords });
        }
      }
    }
  }
@@ -861,29 +881,26 @@
  .lightBo {
    font-size: 0.14rem !important;
  }
    .is-leaf {
  .lightBo .is-leaf {
      background-color: #c1d3ea !important;
      color: #2c2c2c !important;
      font-weight: 400;
  }
      .cell {
  .lightBo .is-leaf .cell {
        height: 0.3rem !important;
        line-height: 0.3rem !important;
      }
    }
  }
  .el-table__body-wrapper {
    .el-table__row {
  .el-table__body-wrapper .el-table__row {
      height: 0.46rem !important;
      line-height: 0.46rem !important;
      .cell {
  }
  .el-table__body-wrapper .el-table__row .cell {
        height: 0.3rem !important;
        line-height: 0.3rem !important;
      }
    }
  }
}