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

zhongshujie

8 小时以前 2561b4735c1c0b2c28fbd79f47854809cc5773a3

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

 src/assets/js/middleGround/api/resource.js

@@ -89,6 +89,8 @@
    }).then((resp) => {
      if (resp.length > 0) {
        const data = resp[0];
        console.log(data,'datas');
        debugger
        const datas = handleQueryResourceListData({
          datas: data.datas,
          fields,

 src/views/achievements/index.vue

@@ -105,7 +105,7 @@
              </li>
            </ul>
            <!-- 学科 -->
            <ul>
            <!-- <ul>
              <li class="left-title">
                <span>{{ subject.title }}</span>
                <p @click="subject.isDisplay = !subject.isDisplay">
@@ -119,7 +119,7 @@
                  <span class="">{{ item.num }}</span>
                </div>
              </li>
            </ul>
            </ul> -->
          </div>
          <div class="content-right" v-loading="loading" element-loading-text="检索结果加载中"
            element-loading-spinner="el-icon-loading" element-loading-background="rgba(0, 0, 0, 0)">
@@ -160,7 +160,10 @@
              </li>
              <li class="main-title" :title="item.cleanAbstract" v-if="item.abstract">
                <span>摘要: </span>
                <span class="page-main-abstract" v-html="item.cleanAbstract"></span>
                <span
                  class="page-main-abstract"
                  v-html="item.cleanAbstract"
                ></span>
              </li>
              <li class="main-keyword" v-if="item.keyWords && item.keyWords.length > 0">
                <span>关键词：</span>
@@ -259,7 +262,7 @@
          {
            type: "input",
            label: "标　题",
            name: "title",
            name: "Name",
            value: "",
          },
          {
@@ -462,7 +465,7 @@
        author: "作者",
        keyword: "关键词",
        source: "来源",
        title: "标题",
        Name: "标题",
        year: "年份",
      },
    };
@@ -506,16 +509,23 @@
    },

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

      for (let key in val) {
        if (val[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();
    },
    //重置搜索结果
@@ -594,6 +604,7 @@

    // 搜索
    handleSearch(isText) {
      console.log(isText, "isText");
      this.associationList = [];
      console.log(isText, "isText");
      if (isText.text != "") {
@@ -706,18 +717,19 @@
          this.resultList = res.datas;
          this.total = res.total;
          this.loading = false;
        }).catch((error) => {
        })
        .catch((error) => {
          // 打印错误信息
          console.error("获取数据失败:", error);
        });

      // 滚动到页面顶部
      this.$nextTick(() => {
        const pageMain = document.querySelector('.page-main-father');
        const pageMain = document.querySelector(".page-main-father");
        if (pageMain) {
          pageMain.scrollTo({
            top: 0,
            behavior: 'smooth'
            behavior: "smooth",
          });
        }
      });

 src/views/chronology/index.vue

@@ -402,6 +402,7 @@
  margin-left: -9px;
  z-index: 99;
  background: #fff;
  cursor: pointer;
}

.item-text {