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

杨磊

9 小时以前 6938616d7e67a8822569420f6bddd8754a63d574

 src/views/achievements/index.vue

@@ -170,7 +170,7 @@
              </li>
            </ul>
            <!-- 学科 -->
            <ul>
            <!-- <ul>
              <li class="left-title">
                <span>{{ subject.title }}</span>
                <p @click="subject.isDisplay = !subject.isDisplay">
@@ -196,7 +196,7 @@
                  <span class="">{{ item.num }}</span>
                </div>
              </li>
            </ul>
            </ul> -->
          </div>
          <div
            class="content-right"
@@ -257,7 +257,10 @@
                v-if="item.abstract"
              >
                <span>摘要: </span>
                <span class="page-main-abstract" v-html="item.abstract"></span>
                <span
                  class="page-main-abstract"
                  v-html="item.cleanAbstract"
                ></span>
              </li>
              <li
                class="main-keyword"
@@ -370,7 +373,7 @@
          {
            type: "input",
            label: "标　题",
            name: "title",
            name: "Name",
            value: "",
          },
          {
@@ -573,7 +576,7 @@
        author: "作者",
        keyword: "关键词",
        source: "来源",
        title: "标题",
        Name: "标题",
        year: "年份",
      },
    };
@@ -617,16 +620,23 @@
    },

    async onSubmit(val) {
      console.log(val, "val");
      console.log(this.associationList, "associationList");

      for (let key in val) {
        if (val[key] != "") {
          this.associationList.push({
            type: this.labelList[key],
            content: val[key],
            value: key,
          });
          const hasKey = this.associationList.find((item) => item.value == key);
          if (!hasKey) {
            this.associationList.push({
              type: this.labelList[key],
              content: val[key],
              value: key,
            });
          }else {
            hasKey.content = val[key]
          }
        }
      }
      console.log(this.associationList, "this.associationList");
      this.getItemList();
    },
    //重置搜索结果
@@ -658,7 +668,6 @@

    //获取下拉选择框的内容
    async getSelectData() {
      this.loading = true;
      try {
        // 同时发起两个异步请求，并等待它们的结果
        const [subjectListResult, resourceListResult] = await Promise.all([
@@ -706,13 +715,17 @@

    // 搜索
    handleSearch(isText) {
      console.log(isText, "isText");
      this.associationList = [];
      console.log(isText, "isText");
      
      if (isText.text != "") {
        this.inputValue = isText.text;
        this.inputType = isText.type;
        this.associationList.push({
          type: isText.label,
          content: isText.text,
          value: isText.type,
        });
        this.getItemList();
      }
@@ -720,6 +733,7 @@

    // 请求数据
    getItemList() {
      this.loading = true;
      let searchData = {}; // 初始化一个空对象来存储搜索数据
      if (this.inputValue) {
        // 如果输入值存在
@@ -748,6 +762,8 @@
          }
        }
      }
      console.log(searchData, "searchData1");

      if (this.associationList && this.associationList.length) {
        this.associationList.forEach((item) => {
          if (item.value == "year") {
@@ -755,7 +771,7 @@
            const startDate = item.content.split("/")[0] + "/01/01 00:00:00";
            searchData[item.value + ">="] = startDate;
            searchData[item.value + "<="] = endDate;
          } else {
          } else if (item.value) {
            searchData[item.value + "*"] = item.content;
          }
        });
@@ -814,7 +830,22 @@
          this.resultList = res.datas;
          this.total = res.total;
          this.loading = false;
        })
        .catch((error) => {
          // 打印错误信息
          console.error("获取数据失败:", error);
        });

      // 滚动到页面顶部
      this.$nextTick(() => {
        const pageMain = document.querySelector(".page-main-father");
        if (pageMain) {
          pageMain.scrollTo({
            top: 0,
            behavior: "smooth",
          });
        }
      });
    },
    // 处理页码变化
    handleCurrentChange(newPage) {
@@ -1239,6 +1270,10 @@
        color: #937950;
        margin-bottom: 5px;

        p {
          overflow: hidden;
        }

        ::v-deep .el-button {
          font-size: 14px;
          background-color: transparent;
@@ -1288,7 +1323,7 @@
          border-left: 1px solid #2c2c2c;
        }

        margin-bottom: 10px;
        margin-bottom: 15px;
      }

      .main-author {
@@ -1309,7 +1344,7 @@
        overflow: hidden;
        display: -webkit-box;
        -webkit-box-orient: vertical;
        -webkit-line-clamp: 4;
        -webkit-line-clamp: 3;

        span {
          font-family: Source Han Sans;
@@ -1392,6 +1427,9 @@
  border-radius: 5px;
  border: 1px solid #cccccc;
}
:deep.el-pagination.is-background .el-pager li:not(.disabled):hover{
  color: #937950
}
</style>

<style>