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

杨磊

2024-05-17 1335100e875ffdda19fc16de9afdda920858ca9b

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

 src/components/headNav/headNav.vue

@@ -3,8 +3,13 @@
    <view class="NavTop flex" :style="{ backgroundImage: 'url(' + bg + ')' }" >
      <view
        class="santiaogang"
        style="
          width: 0.34rem;
          height: 0.34rem;
          margin-right: 3rem;
          cursor: pointer;
        "
        title="导航菜单"
        style="width: 0.34rem; height: 0.34rem; margin-right: 3rem;cursor: pointer;"
        @click="menuNav = !menuNav"
        ><img
          style="width: 100%; height: 100%"
@@ -311,17 +316,18 @@
    },
    // 切换搜索框的展开和收起状态
    toggleSearch() {
      // console.log('撒旦范德萨发生的',this.searchInput);
      this.isExpanded = !this.isExpanded;
      this.$nextTick(() => {
        if (this.searchInput.trim() !== "") {
          console.log("搜索", this.searchInput);
          uni.navigateTo({
            url:
              "/pages/knowledgeBase/knowledgeBase?keyword=" + this.searchInput
          });
        } else {
          console.log("不搜索");
        }

        this.searchInput = "";
        console.log(this.isExpanded);
      });
    }
  }

 src/pages/character/detail.vue

@@ -476,9 +476,8 @@
  },
  methods: {
    copyText() {
      var textToCopy = document.getElementById("copyBox").innerText;
      console.log(textToCopy, "textToCopy");
      navigator.clipboard.writeText(textToCopy).then();
      const txt = this.biogData[0].content+";来源：中医医学人物数据库"
      navigator.clipboard.writeText(txt).then();
      this.$message({
        message: "复制成功！",
        type: "success",

 src/pages/character/index.vue

@@ -28,10 +28,10 @@
    </view>
    <view class="" style="margin-left: 0.2rem">书中最常提到的100位人物</view>
    <!-- 关系表地图 -->
    <view
      id="relation"
      style="margin-top: 0.2rem; height: 70vh; width: 100%"
    ></view>
    <view id="relation" style="margin-top: 0.2rem; height: 70vh; width: 100%;position: relative;"
      ><div v-if="!loading && relationships.length == 0" style="position: absolute;top: 30%;left: 0;right: 0;text-align: center;font-size: 0.20rem;color: #666;">暂无相关数据</div></view
    >

    <!-- 朝代 -->
    <view
      class="flex flex-center"
@@ -87,6 +87,7 @@
export default {
  data() {
    return {
      loading: true,
      // echarts数据
      nodes: [],
      // echarts两者的关系
@@ -309,6 +310,7 @@
            this.relationships.push(obj);
          });
        }
        this.loading = false;
        this.relation();
      });
    },

 src/pages/index/index.vue

@@ -25,8 +25,8 @@
                        <el-dropdown trigger="click" @command="handleCommand" style="margin-right:  .3rem;">
                            <view @click="iconClick(2)" class="s2 ss1 "></view>
                            <el-dropdown-menu v-if="isCommand" slot="dropdown">
                                <el-dropdown-item command="1" icon="el-icon-plus">修改密码</el-dropdown-item>
                                <el-dropdown-item command="2" icon="el-icon-circle-plus">退出登录</el-dropdown-item>
                                <el-dropdown-item command="1" >修改密码</el-dropdown-item>
                                <el-dropdown-item command="2" >退出登录</el-dropdown-item>
                            </el-dropdown-menu>
                        </el-dropdown>
                        <view @click="iconClick(item+2)" v-for="item in 1" :key="item" :class="'s'+(item+2)"
@@ -152,27 +152,22 @@
            // 搜索
            onSearch(val) {
                uni.navigateTo({
                    url: '/pages/knowledgeBase/knowledgeBase?name=' + val.text
                    url: '/pages/knowledgeBase/knowledgeBase?keyword=' + val.text
                })
            },
            // 搜索
            // 切换搜索框的展开和收起状态
            toggleSearch() {
                console.log('sdf');
                // console.log('撒旦范德萨发生的',this.searchInput);
                this.isExpanded = !this.isExpanded;
                this.$nextTick(() => {
                    if (this.searchInput.trim() !== '') {
                        uni.navigateTo({
                            url: '/pages/knowledgeBase/knowledgeBase?name=' + this.searchInput
                            url: '/pages/knowledgeBase/knowledgeBase?keyword=' + this.searchInput
                        })
                        // console.log('搜索', this.searchInput);
                    } else {
                        console.log('不搜索');
                    }

                    this.searchInput = '';
                    console.log(this.isExpanded);
                })
            },
            // 列表项跳转

 src/pages/inherit/index.vue

@@ -157,18 +157,18 @@
      //通过 $ref 进行挂载
      let myChart = echarts.init(this.$refs.barChart);

      let FontSize = 12; // 字体大小
      let FontSize = 18; // 字体大小
      let BorderWidth = 2; // 边框大小
      let SymbolSize = 80; // 尺寸距离
      let Distance = 10;
      // 不同尺寸下修改echarts的字体
      if (window.innerWidth > 2560 && window.innerWidth <= 3840) {
        FontSize = 28;
        FontSize = 20;
        BorderWidth = 5;
        SymbolSize = 100;
        Distance = 33;
      } else if (window.innerWidth > 1920 && window.innerWidth <= 2560) {
        FontSize = 28;
        FontSize = 20;
        BorderWidth = 4;
        SymbolSize = 90;
        Distance = 22;
@@ -197,7 +197,7 @@
          {
            type: "graph",
            layout: "force",
            symbolSize: 120,
            symbolSize: 100,
            //是否允许用户拖动图片
            roam: true,
            label: {
@@ -240,6 +240,11 @@
      };
      //进行渲染
      myChart.setOption(option);
      myChart.getZr().on("click", (params) => {
        if (!params.target) {
          this.showTool = false;
        }
      });
      myChart.on("click", (params) => {
        console.log(params.event.offsetX, params.event.offsetY);
        if (params.componentType === "series") {
@@ -250,6 +255,8 @@
            id: params.data.identifier,
            name: encodeURIComponent(params.data.name),
          };
        } else {
          this.showTool = false;
        }
      });
    },
@@ -421,8 +428,8 @@
  box-shadow: 1px 1px 5px #888888;
  align-items: center;
  justify-content: center;
  width: 1rem;
  height: 0.25rem;
  width: 1.4rem;
  height: 0.3rem;
  margin-left: 0.2rem;
  border-radius: 0.13rem;
  float: left;
@@ -435,8 +442,8 @@
  box-shadow: 1px 1px 5px #888888;
  align-items: center;
  justify-content: center;
  width: 1.3rem;
  height: 0.25rem;
  width: 1.6rem;
  height: 0.3rem;
  float: left;
  margin-left: 0.2rem;
  border-radius: 0.13rem;
@@ -456,7 +463,7 @@
}
.filterText {
  margin-left: 10px;
  font-size: 16px;
  font-size: 0.16rem;
}
.fontColor {
  color: #827e44 !important;

 src/pages/knowledgeBase/knowledgeBase.vue

@@ -386,8 +386,8 @@
    };
  },
  onLoad(options) {
    this.onSearch({ text: options.name });
    this.keywords = options.name;
    console.log(options.keyword);
    this.onSearch({ text: options.keyword });
  },
  mounted() {
    // 修改两次的高度保持一致
@@ -396,8 +396,6 @@
      box1Height + box1Height / 18 + "px";
    console.log(box1Height, "box1Height");
    this.getStatistics();
    // 默认先调用搜索一次
    this.onSearch("");
  },
  methods: {
    //重置搜索结果
@@ -658,6 +656,7 @@
        page: this.CurrentPage,
        pageSize: this.pageSize,
      };
      console.log(Obj,"ObjObjObj");
      // // 搜索
      await getPersonList(Obj).then((res) => {
        if (res.success) {

 src/static/initialize.css

@@ -6,7 +6,7 @@

html {
  /* font-size: calc(100vw / 1440 * 96) !important; */
  font-size: 126px;
  font-size: 100px;
}

body {

 src/uni_modules/csr-tab/static/demo.css

@@ -40,7 +40,7 @@
  height: 40px;
  line-height: 40px;
  text-align: center;
  font-size: 16px;
  font-size: 0.16rem;
  border-bottom: 2px solid transparent;
  position: relative;
  z-index: 1;
@@ -188,7 +188,7 @@
}

.markdown h3 {
  font-size: 16px;
  font-size: 0.16rem;
}

.markdown h4 {

 src/uni_modules/csr-tab/static/demo_index.html

@@ -79,7 +79,7 @@
<pre><code class="language-css"
>.iconfont {
  font-family: "iconfont" !important;
  font-size: 16px;
  font-size: 0.16rem;
  font-style: normal;
  -webkit-font-smoothing: antialiased;
  -moz-osx-font-smoothing: grayscale;

 src/uni_modules/csr-tab/static/iconfont.css

@@ -9,7 +9,7 @@

.iconfont {
  font-family: "iconfont" !important;
  font-size: 16px;
  font-size: 0.16rem;
  font-style: normal;
  -webkit-font-smoothing: antialiased;
  -moz-osx-font-smoothing: grayscale;

 src/uni_modules/uni-combox/components/uni-combox/uni-combox.vue

@@ -175,7 +175,7 @@
    }

    .uni-combox__label {
        font-size: 16px;
        font-size: 0.16rem;
        line-height: 22px;
        padding-right: 10px;
        color: #999999;

 src/uni_modules/uni-data-select/components/uni-data-select/uni-data-select.vue

@@ -372,7 +372,7 @@
    }

    .uni-select__label {
        font-size: 16px;
        font-size: 0.16rem;
        // line-height: 22px;
        height: 35px;
        padding-right: 10px;

 src/uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar.vue

@@ -864,7 +864,7 @@
    color: #999;
        line-height: 50px;
    /* #ifdef MP-TOUTIAO */
    font-size: 16px;
    font-size: 0.16rem;
    /* #endif */
        margin-right: 5px;
        // opacity: 0.6;
@@ -916,7 +916,7 @@
        line-height: 40px;
        background-color: $uni-primary;
        color: #fff;
        font-size: 16px;
        font-size: 0.16rem;
        letter-spacing: 2px;
    }


 src/uni_modules/uni-datetime-picker/components/uni-datetime-picker/time-picker.vue

@@ -904,7 +904,7 @@
        /* 减掉 10px 的元素高度，兼容nvue */
        color: #999;
        /* #ifdef APP-NVUE */
        font-size: 16px;
        font-size: 0.16rem;
        /* #endif */
    }


 src/uni_modules/uni-indexed-list/components/uni-indexed-list/uni-indexed-list-item.vue

@@ -138,7 +138,7 @@
    .uni-indexed-list__title {
        padding: 6px 12px;
        line-height: 24px;
        font-size: 16px;
        font-size: 0.16rem;
        font-weight: 500;
    }
</style>

 src/uni_modules/uni-popup/components/uni-popup-dialog/uni-popup-dialog.vue

@@ -191,7 +191,7 @@
    }

    .uni-dialog-title-text {
        font-size: 16px;
        font-size: 0.16rem;
        font-weight: 500;
    }

@@ -239,7 +239,7 @@
    }

    .uni-dialog-button-text {
        font-size: 16px;
        font-size: 0.16rem;
        color: #333;
    }


 src/uni_modules/uni-popup/components/uni-popup-share/uni-popup-share.vue

@@ -178,7 +178,7 @@
        flex: 1;
        border-radius: 50px;
        color: #666;
        font-size: 16px;
        font-size: 0.16rem;
    }

    .uni-share-button::after {

 src/uni_modules/uni-scss/styles/setting/_styles.scss

@@ -68,7 +68,7 @@
    margin: 5px;
    color: #393939;
    border:1px solid #ccc;
    font-size: 16px;
    font-size: 0.16rem;
    font-weight: 200;
    background-color: #F9F9F9;
    // TODO 暂时处理边框隐藏一边的问题
@@ -126,7 +126,7 @@
    }

    &[size=mini] {
        font-size: 16px;
        font-size: 0.16rem;
        font-weight: 200;
        border-radius: 8px;
    }

 src/uni_modules/uni-title/components/uni-title/uni-title.vue

@@ -149,7 +149,7 @@
    }

    .uni-h3 {
        font-size: 16px;
        font-size: 0.16rem;
        color: #333;
        font-weight: bold;
        /* font-weight: 400; */

 yarn.lock

Diff too large