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

杨磊

15 小时以前 4b08c2e5d2f1533feaeb23402c99c73c74ebe9b2

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

 src/views/achievements/details.vue

@@ -22,9 +22,9 @@
          <p>
            <span v-for="(item, index) in details.author" :key="index">{{ item }}</span>
          </p>
          <p v-if="details.abstract">
            <span>摘要：</span>
            <span class="page-main-abstract" v-html="details.abstract"></span>
          <p v-if="details.cleanAbstract">
            <span class="abstract-title">摘要：</span>
            <span class="page-main-abstract-main" v-html="details.cleanAbstract"></span>
          </p>
          <p v-if="details.keyWords && details.keyWords.length > 0">
            <span>关键词：</span>
@@ -63,9 +63,9 @@
              <li class="main-author">
                {{ item.author }}
              </li>
              <li class="main-title" :title="item.abstract" v-if="item.abstract">
              <li class="main-title" :title="item.abstract" v-if="item.cleanAbstract">
                <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" v-if="item.keyWords && item.keyWords.length > 0">
                <span>关键词：</span>
@@ -228,6 +228,10 @@
        if (item.author && item.author.length > 0) {
          item.author = item.author.split(";");
        }
        if (item.abstract) {
          item.cleanAbstract = item.abstract.replace(/<[^>]+>/g, "");
        }

        const foundItem = this.category.list.find((citem) => citem.value == item.cmsItemType);
        item.resourceTypeName = foundItem ? foundItem.name : '';
      })
@@ -448,6 +452,9 @@
          // 设置一个默认值或者进行其他错误处理
          item.keyWords = [];
        }
        if (item.abstract) {
          item.cleanAbstract = item.abstract.replace(/<[^>]+>/g, "");
        }
        const foundItem = this.category.list.find((citem) => citem.value == item.cmsItemType);
        item.resourceTypeName = foundItem ? foundItem.name : '';
        console.log(this.details.id, "");
@@ -497,6 +504,9 @@
            } else {
              // 设置一个默认值或者进行其他错误处理
              item.keyWords = [];
            }
            if (item.abstract) {
              item.cleanAbstract = item.abstract.replace(/<[^>]+>/g, "");
            }
            const foundItem = this.category.list.find((citem) => citem.value == item.cmsItemType);
            item.resourceTypeName = foundItem ? foundItem.name : '';
@@ -583,11 +593,11 @@
      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;
      }
    }
@@ -631,11 +641,11 @@
      font-size: 14px;
      background-color: #937950;
      color: #fff;
      border: 1px solid #6f5a3a;
      border: 1px solid #937950;
      border-radius: 0;

      &:hover {
        background-color: #6f5a3a;
        background-color: #937950;
        color: #fffdf8;
      }
    }
@@ -643,9 +653,9 @@
    .page-main-abstract {
      font-family: Source Han Sans !important;
      font-size: 14px !important;
      font-weight: 350 !important;
      line-height: 26px !important;
      color: #333333 !important;
      font-weight: 100 !important;
    }

    p:nth-child(1) {
@@ -671,20 +681,21 @@
      margin-bottom: 13px;
      font-family: Source Han Sans;
      font-size: 14px;
      font-weight: 350;
      line-height: 26px;
      color: #333333;
      overflow: hidden;
      display: -webkit-box;
      -webkit-box-orient: vertical;
      -webkit-line-clamp: 3;

      .abstract-title{
        font-weight: bold;
      }
      span {
        font-family: Source Han Sans;
        font-size: 14px;
        font-weight: bold;
        color: #333333;
      }

    }

    p:nth-child(3) {
@@ -817,16 +828,17 @@
          font-size: 16px;
          font-weight: bold;
          color: #937950;
          margin-bottom: 5px;

          ::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;
            }
          }
@@ -868,10 +880,7 @@
            color: #333;
            border-left: 1px solid #2c2c2c;
          }



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

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

          span {
            font-family: Source Han Sans;
@@ -948,6 +957,7 @@
    object-fit: contain;
  }
}

::v-deep .el-loading-spinner {
  .el-loading-text {
    font-size: 14px;
@@ -959,8 +969,6 @@
    color: #937950;
  }
}


</style>

<style lang="less">
@@ -991,7 +999,8 @@
    .el-dialog__title,
    .el-dialog__headerbtn .el-dialog__close {
      color: #fff;
      font-weight: 900;font-size: 16px;
      font-weight: 900;
      font-size: 16px;
    }
  }
}

 src/views/achievements/index.vue

@@ -257,7 +257,7 @@
                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"
@@ -814,6 +814,20 @@
          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'
          });
        }
        });
    },
    // 处理页码变化
@@ -1239,6 +1253,10 @@
        color: #937950;
        margin-bottom: 5px;

        p {
          overflow: hidden;
        }

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

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

      .main-author {

 src/views/directory/index.vue

@@ -313,7 +313,7 @@
  methods: {
    changeTab(key) {
      this.activeTabs = key;
      console.log(this.activeTabs, "activeTabs");
      // console.log(this.activeTabs, "activeTabs");
      if (key == "chart") {
        this.initChart();
      }
@@ -328,7 +328,7 @@
          formatter: (params) => {
            const data = params.data;
            this.currentNodeInfo = data;
            console.log(data, "data");
            // console.log(data, "data");
            if (data.cmsItemType == "student") {
              return `
              <div style="
@@ -450,7 +450,7 @@

      this.chart.setOption(option);
      this.chart.on("click", (params) => {
        console.log("点击时的回调", params);
        // console.log("点击时的回调", params);
        this.tooltipShow = true;
      });
    },
@@ -474,7 +474,6 @@
          };
        });
        this.academicDegreeList = academicDegreeListResult.option;
        console.log(this.academicDegreeList, "this.academicDegreeList");
      } catch (error) {
        console.error("获取下拉框数据失败:", error);
      }
@@ -486,7 +485,6 @@
      return MG.store
        .getProductTypeField(requestData)
        .then((res) => {
          console.log(res, "下拉框数据");
          const selestList = JSON.parse(res[0].config);
          return selestList;
        })
@@ -547,6 +545,7 @@
          });
          this.loading = false;
          console.log(res, "res");
          console.log(arrList, "arrList");
          if (res.datas && res.datas.length) {
            res.datas.forEach((item) => {
              arrList.forEach((citem) => {
@@ -563,16 +562,18 @@
              });
            });
            arrList = arrList.filter((item) => item.studentList.length);
            console.log(arrList, "arrList");

            // console.log(arrList, "arrList");

            this.universityList = arrList;
            // this.chartData.children = arrList;
            this.chartData.children = arrList;
            const temp_chartData = {
              name: "王永炎",
              children: arrList,
            };
            this.chartData = temp_chartData;

            console.log(this.chartData, "this.chartData");
            // console.log(this.chartData, "this.chartData");
            this.initChart();
          }
        })

 src/views/honors/index.vue

@@ -74,9 +74,9 @@
          start: (this.currentPage - 1) * 10,
          size: 10,
        },
        // coverSize: {
        //   height: 70
        // }
        coverSize: {
          height: 70
        }
      }).then((res) => {
        console.log(res, "res");
        if (res.datas && res.datas.length) {