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"
@@ -238,7 +238,7 @@
              <li class="main-name">
                <p>{{ item.name }}</p>
                <p>
                  <el-button @click="goPage(item)">详情</el-button>
                  <el-button @click="goPage(item.id)">详情</el-button>
                  <el-button>AI智能阅读</el-button>
                </p>
              </li>
@@ -251,16 +251,34 @@
              <li class="main-author">
                {{ item.author }}
              </li>
              <li class="main-title" :title="item.abstract">
              <li
                class="main-title"
                :title="item.cleanAbstract"
                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">
              <li
                class="main-keyword"
                v-if="item.keyWords && item.keyWords.length > 0"
              >
                <span>关键词：</span>
                <span
                  class="keyWord"
                  v-for="(citem, cindex) in item.keyWords"
                  :key="cindex"
                  @click="
                    () =>
                      handleSearch({
                        text: citem,
                        type: 'keyWords',
                        label: '关键词',
                      })
                  "
                >
                  {{ citem }}
                </span>
@@ -278,6 +296,7 @@
              >
              </el-pagination>
            </div>
            <el-empty v-if="!loading && !resultList.length"></el-empty>
          </div>
        </div>
      </div>
@@ -299,6 +318,7 @@
  },
  data() {
    return {
      relatedList: [],
      // 输入框的内容
      inputValue: "",
      // 选择的类型
@@ -353,7 +373,7 @@
          {
            type: "input",
            label: "标　题",
            name: "title",
            name: "Name",
            value: "",
          },
          {
@@ -556,27 +576,32 @@
        author: "作者",
        keyword: "关键词",
        source: "来源",
        title: "标题",
        Name: "标题",
        year: "年份",
      },
    };
  },
  mounted() {
    this.getSelectContent();
    this.getLeftCheckbox();
    this.getSelectData();
  },

  methods: {
    categoryChange(val) {
      console.log(val, "val");
      if (val.checked) {
        this.categoryChecList.push(val.value);
        this.associationList.push({
          type: "类型",
          content: val.name,
        });
      } else {
        const index = this.categoryChecList.findIndex(
          (item) => item === val.value
        );
        const index2 = this.associationList.findIndex(
          (item) => item.name === val.name
        );
        this.categoryChecList.splice(index, 1);
        this.associationList.splice(index2, 1);
      }
      this.getItemList();
    },
@@ -595,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();
    },
    //重置搜索结果
@@ -612,9 +644,8 @@
      // this.onSearch("");
    },
    // 页面跳转
    goPage(key) {
      console.log(key, "key");
      this.$router.push({ name: "details", params: { key: key } });
    goPage(id) {
      this.$router.push({ name: "details", query: { id } });
    },
    // 收起和展示
    shrinkClick(key, name) {
@@ -634,12 +665,9 @@
        this.activeBox = this.activeBox === "b" ? null : "b";
      }
    },
    // 获取左侧checkbox数据
    getLeftCheckbox() {},

    //获取下拉选择框的内容
    async getSelectData() {
      this.loading = true;
      try {
        // 同时发起两个异步请求，并等待它们的结果
        const [subjectListResult, resourceListResult] = await Promise.all([
@@ -667,7 +695,6 @@
        .getProductTypeField(requestData)
        .then((res) => {
          const selestList = JSON.parse(res[0].config);
          console.log(selestList, "下拉框数据");
          return selestList;
        })
        .catch((error) => {
@@ -682,47 +709,71 @@
        (item) => item.content !== value
      );
      this.inputValue = "";
      // 通知父组件数据已改变
      this.getItemList();
    },

    // 搜索
    handleSearch(isText) {
      console.log(1234);
      console.log(isText, "搜索123");
      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();
      }
    },

    // getTtem
    // 请求数据
    getItemList() {
      let searchData = {};
      this.loading = true;
      let searchData = {}; // 初始化一个空对象来存储搜索数据
      if (this.inputValue) {
        // 如果输入值存在
        if (this.inputType != "all") {
          // 如果输入类型不是"all"
          // 将输入值与输入类型关联，并添加一个星号(*)作为后缀
          searchData[this.inputType + "*"] = this.inputValue;
        } else {
          // 如果输入类型是"all"
          // 遍历输入选项
          for (let index = 0; index < this.inputOptions.length; index++) {
            const item = this.inputOptions[index];
            const item = this.inputOptions[index]; // 获取当前选项
            if (item.value !== "all") {
              console.log(item.value, "987");
              // 如果当前选项的值不是"all"
              if (!Object.keys(searchData).length) {
                // 如果searchData是空的
                // 将第一个选项的值与输入值关联，并添加一个星号(*)作为后缀
                searchData[item.value + "*"] = this.inputValue;
              } else {
                // 如果searchData不是空的
                // 使用"||"作为前缀，将后续选项的值与输入值关联，并添加一个星号(*)作为后缀
                // 这通常用于构建一个逻辑或（OR）查询
                searchData["||" + item.value + "*"] = this.inputValue;
              }
            }
          }
        }
      }
      console.log(searchData, "searchData1");

      if (this.associationList && this.associationList.length) {
        this.associationList.forEach((item) => {
          searchData[item.value + "*"] = item.content;
          if (item.value == "year") {
            const endDate = item.content.split("/")[0] + "/12/31 23:59:59";
            const startDate = item.content.split("/")[0] + "/01/01 00:00:00";
            searchData[item.value + ">="] = startDate;
            searchData[item.value + "<="] = endDate;
          } else if (item.value) {
            searchData[item.value + "*"] = item.content;
          }
        });
      }
      console.log(searchData, "searchData");
@@ -757,7 +808,8 @@
          },
        })
        .then((res) => {
          console.log(res, "全部数据");
          console.log(res, "全部内容");

          res.datas.forEach((item) => {
            item.year = moment(item.year).format("YYYY-MM-DD");
            if (typeof item.keyWords === "string") {
@@ -766,20 +818,49 @@
              // 设置一个默认值或者进行其他错误处理
              item.keyWords = [];
            }
            item.resourceTypeName = this.category.list.find(
            if (item.abstract) {
              item.cleanAbstract = item.abstract.replace(/<[^>]+>/g, "");
            }

            const foundItem = this.category.list.find(
              (citem) => citem.value == item.cmsItemType
            ).name;
            );
            item.resourceTypeName = foundItem ? foundItem.name : "";
          });
          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) {
      this.paginationPage = newPage;
      this.getItemList(); // 重新获取数据
      // 滚动到页面顶部
      this.$nextTick(() => {
        const pageMain = document.querySelector(".page-main-father");
        if (pageMain) {
          pageMain.scrollTo({
            top: 0,
            behavior: "smooth",
          });
        }
      });
    },
    sortChange() {
      this.postedSortInfo = !this.postedSortInfo;
@@ -823,11 +904,23 @@
  }
}

::v-deep .el-loading-spinner {
  .el-loading-text {
    font-size: 14px;
    color: #937950;
  }

  .el-icon-loading {
    font-size: 14px;
    color: #937950;
  }
}

.page-main-father {
  flex: 1;
  width: 100%;
  height: 100%;
  min-width: 1292px;
  min-width: 1200px;
  overflow: auto;
  padding-top: 1%;
  padding-bottom: 2%;
@@ -846,15 +939,40 @@
  background-color: #fefbf5;
  border: 1px solid #e4dace;

  .input-main {
  ::v-deep(.input-main) {
    padding: 15px 0;
    display: flex;
    justify-content: center;
    width: 90%;
    border-right: 2px solid #e4dace;
    font-weight: bold;

    .input-with-select {
      width: 50%;
      font-weight: bold;
    }

    .el-select .el-input.is-focus .el-input__inner {
      color: #937950 !important;
      border-color: #937950 !important;
      font-weight: bold;
    }

    .el-select-dropdown__item.selected {
      color: #937950 !important;
      font-weight: bold;
    }

    .el-select .el-input__inner:focus {
      border-color: #937950;
      font-weight: bold;
    }

    .el-select .el-input__inner {
      font-family: Source Han Sans;
      font-size: 14px;
      font-weight: bold;
      color: #2c2c2c;
    }
  }

@@ -907,10 +1025,11 @@
        font-size: 14px;
        background-color: transparent;
        color: #937950;
        border: 1px solid #6f5a3a;
        border: 1px solid #937950;
        cursor: pointer;

        &:hover {
          background-color: #6f5a3a;
          background-color: #937950;
          color: #fffdf8;
        }
      }
@@ -1076,6 +1195,7 @@

    .right-header {
      display: flex;
      flex-wrap: wrap;

      li {
        background: #ffffff;
@@ -1087,6 +1207,8 @@
        font-family: Poppins;
        font-size: 13px;
        color: #937950;
        line-height: 20px;
        margin-bottom: 10px;

        img {
          cursor: pointer;
@@ -1146,16 +1268,21 @@
        font-size: 16px;
        font-weight: bold;
        color: #937950;
        margin-bottom: 5px;

        p {
          overflow: hidden;
        }

        ::v-deep .el-button {
          font-size: 14px;
          background-color: transparent;
          color: #937950;
          border: 1px solid #6f5a3a;
          border: 1px solid #937950;
          border-radius: 0;

          &:hover {
            background-color: #6f5a3a;
            background-color: #937950;
            color: #fffdf8;
          }
        }
@@ -1196,7 +1323,7 @@
          border-left: 1px solid #2c2c2c;
        }

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

      .main-author {
@@ -1217,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;
@@ -1300,4 +1427,25 @@
  border-radius: 5px;
  border: 1px solid #cccccc;
}
:deep.el-pagination.is-background .el-pager li:not(.disabled):hover{
  color: #937950
}
</style>

<style>
.el-input.is-focus .el-input__inner {
  color: #937950 !important;
  border-color: #937950 !important;
  font-weight: bold;
}

.el-select-dropdown__item.selected {
  color: #937950 !important;
  font-weight: bold;
}

.el-select .el-input__inner:focus {
  border-color: #937950;
  font-weight: bold;
}
</style>