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

YM

2024-05-17 4cdc35b7911554a955a7f5b29f55dbd91d7fd34e

 src/pages/knowledgeBase/knowledgeBase.vue

@@ -15,7 +15,7 @@
        class="advancedSea"
        @click="isAvancedClick"
        style="color: #244a7b; cursor: pointer"
        >高级搜索 ﹀</view
        >高级搜索 ∨</view
      >
    </view>
    <!-- 热门搜索 -->
@@ -47,7 +47,7 @@
        class="advancedSeaTrue1"
      >
        <h3>高级搜索</h3>
        <MyForm @submit="onSubmit" :from="from" />
        <MyForm @submit="onSubmit" @reset="resetForm" :from="from" />
      </view>
    </view>
    <uni-row
@@ -91,10 +91,10 @@
          <view v-if="profession.list.length - 1 > 3" class="flex flex-center">
            <view
              class="toggleButton"
              style="color: #c1d3ea"
              style="color: #244a7b"
              @click="shrinkClick('a', '职业')"
            >
              {{ activeBox !== "a" ? "更多  ﹀" : "收起  ︿" }}
              {{ activeBox !== "a" ? "更多  ∨" : "收起  ∧" }}
            </view>
          </view>
        </view>
@@ -129,10 +129,10 @@
          <view v-if="dynasty.list.length - 1 > 3" class="flex flex-center">
            <view
              class="toggleButton"
              style="color: #c1d3ea"
              style="color: #244a7b"
              @click="shrinkClick('b', '时期')"
            >
              {{ activeBox !== "b" ? "更多  ﹀" : "收起  ︿" }}
              {{ activeBox !== "b" ? "更多  ∨" : "收起  ∧" }}
            </view>
          </view>
        </view>
@@ -165,7 +165,7 @@
          </ul>
          <!--    <view class="flex flex-center">
                     <view class="toggleButton" style="font-size: 25rpx;color: #C1D3EA;" @click="shrinkClick('b')">
                        {{ activeBox !== 'b' ? '更多  ﹀' : '收起  ︿' }}
                        {{ activeBox !== 'b' ? '更多  ∨' : '收起  ∧' }}
                     </view>
                  </view> -->
        </view>
@@ -213,7 +213,7 @@
          <el-table-column prop="official" label="官职"></el-table-column>
        </el-table>
        <!-- 分页 -->
        <el-row class="fenye" style="position: absolute; bottom: 0.1rem">
        <el-row class="fenye">
          <el-pagination
            class="paging flex"
            :current-page="CurrentPage"
@@ -375,23 +375,28 @@
      dataTable: [],
      option: {},
      keywords: "",
      submitData: {
        name: "",
        alias: "",
        nativePlace: "",
        tagId: "",
        official: "",
        genderType: "",
      },
    };
  },
  onLoad(options) {
    this.onSearch({ text: options.name });
    this.keywords = options.name;
    console.log(options.keyword);
    this.onSearch({ text: options.keyword });
  },
  mounted() {
    // 修改两次的高度保持一致
    var box1Height = document.querySelector(".fbox2").offsetHeight;
    document.querySelector(".fbox3").style.height =
      box1Height + box1Height / 18 + "px";
    console.log(box1Height, "box1Height");
    this.getStatistics();
    // 默认先调用搜索一次
    this.onSearch("");
  },
  methods: {
    //重置搜索结果
    resetForm() {
      this.onSearch("");
    },
    // ExportJsonExcel实例
    Ture() {
      //   创建ExportJsonExcel实例对象
@@ -402,24 +407,27 @@
    // 下载按钮
    async exportClick() {
      const dataList = this.tableData;
      console.log(this.keywords, "keywords");
      let Obj = {
        keywords: "", //搜索框检索
        name: "", //姓名
        alias: "", //别名
        nativePlace: "", //机关
        tagId: null, //职业id
        official: null, //职官
        genderType: null, //性别
        dynasty: null, //朝代id
        dynastyId: null, //朝代id
        institution: null, //机构
        // keywords: this.keywords, //搜索框检索
        name: this.submitData.name, //姓名
        alias: this.submitData.alias, //别名
        nativePlace: this.submitData.nativePlace, //机关
        tagId: this.profession.id !== 0 ? Number(this.profession.id) : null, //职业id
        official: this.submitData.official, //职官
        genderType:
          this.submitData.genderType !== "" ? this.submitData.genderType : null, //性别
        dynasty: this.dynasty.id !== "" ? Number(this.dynasty.id) : null, //朝代id
        institution: "", //机构
        bookId: null, //来源id
        page: 1,
        pageSize: 9999,
        pageSize: 1,
      };
      console.log(Obj, "Obj");
      // // 搜索
      await getPersonList(Obj).then((res) => {
        console.log(res);
      await getPDownload(Obj).then((res) => {
        console.log(res, "exportClick");
        // if (res.success) {
        //   console.log(res, "搜索接口");
        //   this.tableData = res.list;
@@ -579,7 +587,6 @@
        var box1Height = document.querySelector(".fbox").offsetHeight;
        // let box2Height= document.querySelector('.fbox1').style.height = box1Height + 'px';
        let box2Height = document.querySelector(".fbox1").offsetHeight;
        console.log(box1Height, box2Height);
        if (box1Height <= box2Height) {
          document.querySelector(".fbox1").style.height = box1Height + "px";
        }
@@ -597,7 +604,7 @@
        this.dynasty.index = currentDynasty.dynastyId;
        this.dynasty.id = currentDynasty.dynastyId;
      }

      this.submitData = val;
      this.CurrentPage = 1;
      let Obj = {
        keywords: "", //搜索框检索
@@ -628,6 +635,7 @@
    },
    // 基础搜索
    async onSearch(val) {
      this.keywords = val.text;
      let Obj = {
        keywords: val.text, //搜索框检索
        name: "", //姓名
@@ -643,6 +651,7 @@
        page: this.CurrentPage,
        pageSize: this.pageSize,
      };
      console.log(Obj, "ObjObjObj");
      // // 搜索
      await getPersonList(Obj).then((res) => {
        if (res.success) {