974aa7d5f7541ca5a4457ac0620fee7cb590b9ab..5e73d562bae941a7658c3c13fdb585461f1a24e4
2025-04-28 zhongshujie
Merge branch 'master' of http://182.92.203.7:2001/r/wyyDatabase
5e73d5 对比 | 目录
2025-04-28 zhongshujie
ai智能阅读
9d4368 对比 | 目录
2025-04-28 杨磊
bug修改
060c87 对比 | 目录
2025-04-28 杨磊
Merge branch 'master' of http://182.92.203.7:2001/r/wyyDatabase
de962e 对比 | 目录
2025-04-28 杨磊
bug修改
c6189f 对比 | 目录
2025-04-28 zhongshujie
Merge branch 'master' of http://182.92.203.7:2001/r/wyyDatabase
2561b4 对比 | 目录
2025-04-28 zhongshujie
页面优化
8bffcb 对比 | 目录
2025-04-28 杨磊
Merge branch 'master' of http://182.92.203.7:2001/r/wyyDatabase
693861 对比 | 目录
2025-04-28 杨磊
高级检索
a460a8 对比 | 目录
2025-04-28 zhongshujie
搜索优化
fd82e6 对比 | 目录
2025-04-28 zhongshujie
搜索什么
1da736 对比 | 目录
2025-04-28 zhongshujie
Merge branch 'master' of http://182.92.203.7:2001/r/wyyDatabase
894bbe 对比 | 目录
2025-04-28 zhongshujie
样式调整
428519 对比 | 目录
2025-04-28 杨磊
Merge branch 'master' of http://182.92.203.7:2001/r/wyyDatabase
4b08c2 对比 | 目录
2025-04-28 杨磊
高级检索
87c87f 对比 | 目录
2025-04-28 zhongshujie
优化
1bb225 对比 | 目录
2025-04-28 杨磊
Merge branch 'master' of http://182.92.203.7:2001/r/wyyDatabase
8b3880 对比 | 目录
2025-04-28 杨磊
字体文件
2b8cbe 对比 | 目录
2025-04-28 zhongshujie
样式优化
c2b714 对比 | 目录
14个文件已修改
2个文件已删除
7个文件已添加
1279 ■■■■ 已修改文件
dist.zip 补丁 | 查看 | 原始文档 | blame | 历史
src/App.vue 92 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/assets/css/base.css 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/assets/font/SourceHanSansCN-Bold.otf 补丁 | 查看 | 原始文档 | blame | 历史
src/assets/font/SourceHanSansCN-Regular.otf 补丁 | 查看 | 原始文档 | blame | 历史
src/assets/font/SourceHanSerifCN-Bold.otf 补丁 | 查看 | 原始文档 | blame | 历史
src/assets/font/SourceHanSerifCN-Regular.otf 补丁 | 查看 | 原始文档 | blame | 历史
src/assets/images/directory/bottomIcon.png 补丁 | 查看 | 原始文档 | blame | 历史
src/assets/images/directory/bottomIcon.svg 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/assets/images/directory/topIcon.png 补丁 | 查看 | 原始文档 | blame | 历史
src/assets/images/directory/topIcon.svg 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/assets/images/right_arrow.svg 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/assets/js/middleGround/tool.js 21 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/form/form.vue 45 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/layout/index.vue 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/achievements/details.vue 67 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/achievements/index.vue 397 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/chronology/floatingWindow.vue 33 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/chronology/index.vue 146 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/chronology/yearWindow.vue 83 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/directory/index.vue 301 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/home/index.vue 15 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/honors/index.vue 50 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
dist.zip
Binary files differ
src/App.vue
@@ -14,9 +14,10 @@
};
</script>
<style>
<style lang="less">
@import "~@/assets/css/base.css";
@import "~@/assets/css/common.css";
#app {
  width: 100%;
  height: 100%;
@@ -26,4 +27,93 @@
  -moz-osx-font-smoothing: grayscale;
  font-size: auto !important;
}
.richTextInitBox {
  html,
  body,
  div,
  applet,
  object,
  iframe,
  h1,
  h2,
  h3,
  h4,
  h5,
  h6,
  p,
  blockquote,
  pre,
  a,
  abbr,
  acronym,
  address,
  big,
  cite,
  code,
  del,
  dfn,
  em,
  img,
  ins,
  kbd,
  q,
  s,
  samp,
  small,
  strike,
  sub,
  sup,
  tt,
  var,
  b,
  u,
  i,
  center,
  dl,
  dt,
  dd,
  ol,
  ul,
  li,
  fieldset,
  form,
  label,
  legend,
  table,
  caption,
  tbody,
  tfoot,
  thead,
  tr,
  th,
  td,
  article,
  aside,
  canvas,
  details,
  embed,
  figure,
  figcaption,
  footer,
  header,
  menu,
  nav,
  output,
  ruby,
  section,
  summary,
  time,
  mark,
  audio,
  video,
  input {
    margin: revert;
    padding: revert;
    border: revert;
    font-weight: revert;
    vertical-align: revert;
  }
}
</style>
src/assets/css/base.css
@@ -98,6 +98,17 @@
  font-family: "LanTing";
  src: url(../font/兰亭黑\ GBK.TTF);
}
@font-face {
  font-family: "siyuanBold";
  src: url(../font/SourceHanSansCN-Bold.otf);
}
@font-face {
  font-family: "siyuan";
  src: url(../font/SourceHanSansCN-Regular.otf);
}
/* HTML5 display-role reset for older browsers */
article,
aside,
src/assets/font/SourceHanSansCN-Bold.otf
Binary files differ
src/assets/font/SourceHanSansCN-Regular.otf
Binary files differ
src/assets/font/SourceHanSerifCN-Bold.otf
Binary files differ
src/assets/font/SourceHanSerifCN-Regular.otf
Binary files differ
src/assets/images/directory/bottomIcon.png
Binary files differ
src/assets/images/directory/bottomIcon.svg
New file
@@ -0,0 +1 @@
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1745833947877" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="5416" xmlns:xlink="http://www.w3.org/1999/xlink" width="32" height="32"><path d="M512 693.333333c-14.933333 0-29.866667-4.266667-40.533333-14.933333l-277.33333399-234.666667c-27.733333-23.466667-29.866667-64-8.53333301-89.6 23.466667-27.733333 64-29.866667 89.6-8.53333299L512 546.133333l236.8-200.53333299c27.733333-23.466667 68.266667-19.19999999 89.6 8.53333299 23.466667 27.733333 19.19999999 68.266667-8.53333301 89.6l-277.33333399 234.666667c-10.666667 10.666667-25.6 14.933333-40.533333 14.933333z" fill="#FFFFFF" p-id="5417"></path></svg>
src/assets/images/directory/topIcon.png
Binary files differ
src/assets/images/directory/topIcon.svg
New file
@@ -0,0 +1 @@
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1745833941015" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="5250" xmlns:xlink="http://www.w3.org/1999/xlink" width="32" height="32"><path d="M512 330.666667c14.933333 0 29.866667 4.266667 40.533333 14.933333l277.33333399 234.666667c27.733333 23.466667 29.866667 64 8.53333301 89.6-23.466667 27.733333-64 29.866667-89.6 8.53333299L512 477.866667l-236.8 200.53333299c-27.733333 23.466667-68.266667 19.19999999-89.6-8.53333299-23.466667-27.733333-19.19999999-68.266667 8.53333301-89.6l277.33333399-234.666667c10.666667-10.666667 25.6-14.933333 40.533333-14.933333z" fill="#FFFFFF" p-id="5251"></path></svg>
src/assets/images/right_arrow.svg
New file
@@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill="none" version="1.1" width="48" height="48" viewBox="0 0 48 48"><defs><clipPath id="master_svg0_55_1931"><rect x="0" y="0" width="48" height="48" rx="0"/></clipPath></defs><g clip-path="url(#master_svg0_55_1931)"><g><rect x="0" y="0" width="48" height="48" rx="0" fill="#FFFFFF" fill-opacity="0.009999999776482582" style="mix-blend-mode:passthrough"/></g><g><path d="M9.15075,9.15076Q3,15.3015,3,24Q3,32.698499999999996,9.15076,38.8492Q15.3015,45,24,45Q32.698499999999996,45,38.8492,38.8492Q45,32.698499999999996,45,24Q45,15.3015,38.8492,9.15075Q32.698499999999996,3,24,3Q15.3015,3,9.15075,9.15076ZM10.564969999999999,37.435Q5,31.8701,5,24Q5,16.1299,10.564969999999999,10.564969999999999Q16.1299,5,24,5Q31.8701,5,37.435,10.564969999999999Q43,16.1299,43,24Q43,31.8701,37.435,37.435Q31.8701,43,24,43Q16.1299,43,10.564969999999999,37.435Z" fill-rule="evenodd" fill="#6F5A3A" fill-opacity="1" style="mix-blend-mode:passthrough"/></g><g><path d="M14.49163818359375,23.5L32.49163818359375,23.5Q32.59013818359375,23.5,32.68673818359375,23.519215Q32.78333818359375,23.538429999999998,32.87433818359375,23.576121Q32.96533818359375,23.613812,33.04723818359375,23.66853Q33.12913818359375,23.723249,33.19873818359375,23.792893Q33.268338183593755,23.862537,33.32313818359375,23.94443Q33.37783818359375,24.026322,33.41553818359375,24.117317Q33.453238183593754,24.208311,33.47243818359375,24.30491Q33.49163818359375,24.4015086,33.49163818359375,24.5Q33.49163818359375,24.5984914,33.47243818359375,24.69509Q33.453238183593754,24.791689,33.41553818359375,24.882683Q33.37783818359375,24.973678,33.32313818359375,25.05557Q33.268338183593755,25.137463,33.19873818359375,25.207107Q33.12913818359375,25.276751,33.04723818359375,25.33147Q32.96533818359375,25.386188,32.87433818359375,25.423879Q32.78333818359375,25.461570000000002,32.68673818359375,25.480785Q32.59013818359375,25.5,32.49163818359375,25.5L14.49163818359375,25.5Q14.39314678359375,25.5,14.29654818359375,25.480785Q14.19994918359375,25.461570000000002,14.10895518359375,25.423879Q14.01796018359375,25.386188,13.93606818359375,25.33147Q13.85417518359375,25.276751,13.78453118359375,25.207107Q13.71488718359375,25.137463,13.66016818359375,25.05557Q13.60545018359375,24.973678,13.56775918359375,24.882683Q13.53006818359375,24.791689,13.510853183593749,24.69509Q13.49163818359375,24.5984914,13.49163818359375,24.5Q13.49163818359375,24.4015086,13.510853183593749,24.30491Q13.53006818359375,24.208311,13.56775918359375,24.117317Q13.60545018359375,24.026322,13.66016818359375,23.94443Q13.71488718359375,23.862537,13.78453118359375,23.792893Q13.85417518359375,23.723249,13.93606818359375,23.66853Q14.01796018359375,23.613812,14.10895518359375,23.576121Q14.19994918359375,23.538429999999998,14.29654818359375,23.519215Q14.39314678359375,23.5,14.49163818359375,23.5Z" fill-rule="evenodd" fill="#6F5A3A" fill-opacity="1" style="mix-blend-mode:passthrough"/></g><g><path d="M22.78453118359375,16.207107Q22.64387918359375,16.066455,22.56775818359375,15.882683Q22.49163818359375,15.698912,22.49163818359375,15.5Q22.49163818359375,15.4015086,22.51085318359375,15.30491Q22.530068183593748,15.208311,22.56775918359375,15.117317Q22.60545018359375,15.026322,22.66016818359375,14.94443Q22.71488718359375,14.862537,22.78453118359375,14.792893Q22.85417518359375,14.723249,22.93606818359375,14.66853Q23.01796018359375,14.613812,23.10895518359375,14.576121Q23.19994918359375,14.53843,23.29654818359375,14.519214999999999Q23.39314678359375,14.5,23.49163818359375,14.5Q23.69055018359375,14.5,23.87432118359375,14.57612Q24.05809318359375,14.652241,24.19874518359375,14.792893L33.19874818359375,23.79289Q33.33939818359375,23.93355,33.41551818359375,24.11732Q33.49163818359375,24.301090000000002,33.49163818359375,24.5Q33.49163818359375,24.698909999999998,33.41551818359375,24.88268Q33.33939818359375,25.06645,33.19874818359375,25.20711L24.19874518359375,34.2071Q24.05809218359375,34.3478,23.87432118359375,34.4239Q23.69055018359375,34.5,23.49163818359375,34.5Q23.39314678359375,34.5,23.29654818359375,34.4808Q23.19994918359375,34.461600000000004,23.10895518359375,34.4239Q23.01796018359375,34.3862,22.93606818359375,34.3315Q22.85417518359375,34.276700000000005,22.78453118359375,34.2071Q22.71488718359375,34.1375,22.66016818359375,34.0556Q22.60545018359375,33.9737,22.56775918359375,33.8827Q22.530068183593748,33.7917,22.51085318359375,33.6951Q22.49163818359375,33.5985,22.49163818359375,33.5Q22.49163818359375,33.301100000000005,22.56775818359375,33.1173Q22.64387918359375,32.933499999999995,22.78453118359375,32.7929L22.78541118359375,32.792L31.07742818359375,24.5L22.78453118359375,16.207107L22.78453118359375,16.207107Z" fill-rule="evenodd" fill="#6F5A3A" fill-opacity="1" style="mix-blend-mode:passthrough"/></g></g></svg>
src/assets/js/middleGround/tool.js
@@ -19,14 +19,23 @@
      for (let fieldKey in fields) {
        if (item.datas[fieldKey]) {
          const values = JSON.parse(item.datas[fieldKey]);
          if (values.length > 0) {
            // 用字段名处理返回的字段值
            if (values[0].Value) {
              _fields[fieldKey] = values[0].Value;
            } else if (values[0].Data) {
              _fields[fieldKey] = values[0].Data.Value;
            //特殊处理动态行字段
            if (fieldKey == "eventPictures") {
              _fields[fieldKey] = values.map(citem => citem.Value);
            }else{
         // 用字段名处理返回的字段值
         if (values[0].Value) {
          _fields[fieldKey] = values[0].Value;
        } else if (values[0].Data) {
          _fields[fieldKey] = values[0].Data.Value;
        }
        item.datas[fieldKey] = values[0];
            }
            item.datas[fieldKey] = values[0];
          }
        }
      }
src/components/form/form.vue
@@ -1,38 +1,16 @@
<template >
<template>
  <div>
    <el-form
      size="mini"
      :inline="true"
      style="padding: 0px 10px;
      "
      :model="from"
      class="row demo-form-inline col-xs-12"
    >
    <el-form size="mini" :inline="true" style="padding: 0px 10px;
      " :model="from" class="row demo-form-inline col-xs-12">
      <el-row :gutter="10">
        <el-form-item
          style="width: 33%"
          v-for="(item, i) in from.from"
          :key="i"
          :label="item.label"
        >
          <el-input
            v-if="item.type === 'input'"
            v-model="item.value"
            :placeholder="item.label"
          ></el-input>
        <el-form-item style="width: 33%" v-for="(item, i) in from.from" :key="i" :label="item.label">
          <el-input v-if="item.type === 'input'" v-model="item.value" :placeholder="item.label" :type="item.name == 'year' ? 'number' : 'text'"></el-input>
        </el-form-item>
        <!-- 其他表单项省略 -->
        <!-- <el-form-item style="display:block; "> -->
        <div class="flex flex-center Formbtn">
          <el-button
            size="mini"
            @click="handleSubmit"
            >搜索</el-button
          >
          <el-button  size="mini" @click="handleReset"
            >重置</el-button
          >
          <el-button size="mini" @click="handleSubmit">搜索</el-button>
          <el-button size="mini" @click="handleReset">重置</el-button>
        </div>
        <!-- </el-form-item> -->
      </el-row>
@@ -42,7 +20,7 @@
<script>
export default {
  props: ["from"],
  mounted(){
  mounted() {
  },
  methods: {
    handleSubmit() {
@@ -80,4 +58,11 @@
::v-deep .el-form-item__content div {
  width: 100%;
}
::v-deep.el-form--inline .el-form-item__label {
  font-family: Source Han Sans;
  font-size: 14px;
  font-weight: bold;
  color: #2C2C2C;
}
</style>
src/layout/index.vue
@@ -1,7 +1,7 @@
<template>
  <div class="homeLayoutBox">
    <div class="leftMenu">
      <div class="leftMenuTitle" @click="$router.push('/home')">王永炎院士</div>
      <div style="cursor: pointer;" class="leftMenuTitle" @click="$router.push('/home')">王永炎院士</div>
      <div class="leftMenuContent">
        <p>学术思想传承</p>
        <p>多维度数据库</p>
@@ -114,13 +114,14 @@
    background: #937950;
    display: flex;
    flex-direction: column;
    font-family: Alimama DongFangDaKai;
    font-family: siyuanBlod;
    .leftMenuTitle {
      width: 100%;
      height: 50px;
      line-height: 50px;
      text-align: center;
      margin-top: 20px;
      color: #fff;
      font-size: 24px;
    }
@@ -129,11 +130,14 @@
      font-size: 20px;
      line-height: 30px;
      color: #fff;
      margin: 10px 20px;
      margin: 10px 14px;
      margin-top: 0px;
      padding: 10px 0;
      text-align: center;
      border-top: 1px solid #fff;
      border-bottom: 1px solid #fff;
      letter-spacing: 4px;
      white-space: nowrap;
    }
    .leftMenuList > menuItem:first-child {
@@ -146,7 +150,7 @@
      justify-content: space-around;
      border-top: 1px solid #b9a587;
      margin-top: 20px;
      font-weight: bold;
      .menuItem {
        width: 100%;
        display: flex;
@@ -161,6 +165,7 @@
        cursor: pointer;
        .menuText {
          line-height: 50px;
          font-weight: 700;
        }
        i {
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>
@@ -154,7 +154,7 @@
      resourceTypeValueList: [],
      // 查询结果
      resultList: [],
      loading: false,
      loading: true,
      pdfLoading: false,
    };
  },
@@ -182,6 +182,7 @@
    if (this.details.cmsItemType == "video" || this.details.cmsItemType == "audio") {
      if (this.details.file != "") {
        this.details.src = await this.getResourcePath(this.details.file)
        console.log(this.details.src, "视频地址");
      }
    }
@@ -206,6 +207,7 @@
            cmsType: ["cmsItem"],
            "Id=": [id + ""],
            source: [],
            isbn: [],
            year: [],
            abstract: [],
            keyWords: [],
@@ -227,6 +229,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 : '';
      })
@@ -428,6 +434,7 @@
            // 'id=':[this.$route.params.key],
            "resourceType*": this.resourceTypeValueList,
            source: [],
            isbn: [],
            year: [],
            abstract: [],
            keyWords: [],
@@ -446,6 +453,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 : '';
@@ -478,6 +488,7 @@
            cmsType: ["cmsItem"],
            "resourceType*": this.resourceTypeValueList,
            source: [],
            isbn: [],
            year: [],
            abstract: [],
            keyWords: [],
@@ -496,6 +507,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 : '';
@@ -582,11 +596,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;
      }
    }
@@ -630,11 +644,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;
      }
    }
@@ -642,9 +656,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) {
@@ -670,20 +684,22 @@
      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) {
@@ -816,16 +832,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,9 +885,7 @@
            border-left: 1px solid #2c2c2c;
          }
          margin-bottom: 10px;
          margin-bottom: 15px;
        }
        .main-author {
@@ -891,7 +906,7 @@
          overflow: hidden;
          display: -webkit-box;
          -webkit-box-orient: vertical;
          -webkit-line-clamp: 4;
          -webkit-line-clamp: 3;
          span {
            font-family: Source Han Sans;
@@ -947,6 +962,18 @@
    object-fit: contain;
  }
}
::v-deep .el-loading-spinner {
  .el-loading-text {
    font-size: 14px;
    color: #937950;
  }
  .el-icon-loading {
    font-size: 14px;
    color: #937950;
  }
}
</style>
<style lang="less">
src/views/achievements/index.vue
@@ -170,33 +170,21 @@
              </li>
            </ul>
            <!-- 学科 -->
            <ul>
            <!-- <ul>
              <li class="left-title">
                <span>{{ subject.title }}</span>
                <p @click="subject.isDisplay = !subject.isDisplay">
                  <img
                    :src="[subject.isDisplay ? topIcon : bottomIcon]"
                    alt=""
                  />
                  <img :src="[subject.isDisplay ? topIcon : bottomIcon]" alt="" />
                </p>
              </li>
              <li class="left-main" v-if="subject.isDisplay">
                <div
                  class="category-main"
                  v-for="(item, index) in subject.list"
                  :key="index"
                >
                  <el-checkbox
                    class="el-checkbox"
                    v-model="item.checked"
                    :title="item.name"
                    @change="subjectChange(item)"
                    >{{ item.name }}</el-checkbox
                  >
                <div class="category-main" v-for="(item, index) in subject.list" :key="index">
                  <el-checkbox class="el-checkbox" v-model="item.checked" :title="item.name"
                    @change="subjectChange(item)">{{ item.name }}</el-checkbox>
                  <span class="">{{ item.num }}</span>
                </div>
              </li>
            </ul>
            </ul> -->
          </div>
          <div
            class="content-right"
@@ -239,11 +227,13 @@
                <p>{{ item.name }}</p>
                <p>
                  <el-button @click="goPage(item.id)">详情</el-button>
                  <el-button>AI智能阅读</el-button>
                  <el-button @click="openAiReading(item.AIReading, item.name)">AI智能阅读</el-button>
                </p>
              </li>
              <li class="main-sources">
                <span>{{ item.resourceTypeName }}</span>
                <span :class="getResourceTypeClass(item.cmsItemType)">{{
                  item.resourceTypeName
                }}</span>
                <span>{{ item.source }}</span>
                <span>{{ item.year }}</span>
                <span v-if="item.DOI">doi:{{ item.DOI }}</span>
@@ -251,16 +241,31 @@
              <li class="main-author">
                {{ item.author }}
              </li>
              <li class="main-title" :title="item.cleanAbstract" v-if="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" v-if="item.keyWords && item.keyWords.length > 0">
              <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>
@@ -274,12 +279,20 @@
                :background="isBackground"
                layout="prev, pager, next"
                :total="total"
                :page-size="6"
                :page-size="10"
              >
              </el-pagination>
            </div>
            <el-dialog v-model="dialogVisible" :title="aIName" width="60vw" top="3vh" bottom="2vh"
              :visible.sync="dialogVisible" class="custom-dialog">
              <div class="AIReadingBox" element-loading-spinner="el-icon-loading"
                element-loading-background="rgba(0, 0, 0, 0)">
                <div class="richTextInitBox" v-if="AIReading" v-html="AIReading"></div>
                <div class="richTextInitError" v-else>网络繁忙,请稍后再试。</div>
              </div>
            </el-dialog>
            <el-empty v-if="!loading && !resultList.length"></el-empty>
          </div>
          <el-empty v-if="!loading && !resultList.length"></el-empty>
        </div>
      </div>
    </div>
@@ -300,6 +313,9 @@
  },
  data() {
    return {
      dialogVisible: false,
      aIName: "",
      AIReading: "",
      relatedList: [],
      // 输入框的内容
      inputValue: "",
@@ -355,7 +371,7 @@
          {
            type: "input",
            label: "标 题",
            name: "title",
            name: "Name",
            value: "",
          },
          {
@@ -373,7 +389,7 @@
          {
            type: "input",
            label: "关键词",
            name: "keyword",
            name: "keyWords",
            value: "",
          },
          {
@@ -432,37 +448,32 @@
        list: [
          {
            years: "2025",
            num: 20,
            num: 10,
            check: false,
          },
          {
            years: "2025",
            num: 20,
            years: "2024",
            num: 18,
            check: false,
          },
          {
            years: "2025",
            num: 20,
            years: "2023",
            num: 21,
            check: false,
          },
          {
            years: "2025",
            num: 20,
            years: "2022",
            num: 19,
            check: false,
          },
          {
            years: "2025",
            num: 20,
            years: "2021",
            num: 22,
            check: false,
          },
          {
            years: "2025",
            num: 20,
            check: false,
          },
          {
            years: "2025",
            num: 20,
            years: "2020",
            num: 24,
            check: false,
          },
        ],
@@ -480,28 +491,23 @@
            check: false,
          },
          {
            name: "北京中医药大学大学学报",
            num: 190,
            name: "北京师范大学",
            num: 19,
            check: false,
          },
          {
            name: "中国中医科学院",
            num: 22,
            check: false,
          },
          {
            name: "北京中医药大学大学学报",
            num: 190,
            num: 31,
            check: false,
          },
          {
            name: "北京中医药大学大学学报",
            num: 190,
            check: false,
          },
          {
            name: "北京中医药大学大学学报",
            num: 190,
            check: false,
          },
          {
            name: "北京中医药大学大学学报",
            num: 190,
            name: "广州中医药大学",
            num: 25,
            check: false,
          },
        ],
@@ -552,13 +558,13 @@
      resultList: [],
      total: 0,
      paginationPage: 1,
      loading: false,
      loading: true,
      labelList: {
        abstract: "摘要",
        author: "作者",
        keyword: "关键词",
        keyWords: "关键词",
        source: "来源",
        title: "标题",
        Name: "标题",
        year: "年份",
      },
    };
@@ -569,14 +575,21 @@
  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 +608,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();
    },
    //重置搜索结果
@@ -636,7 +656,6 @@
    //获取下拉选择框的内容
    async getSelectData() {
      this.loading = true;
      try {
        // 同时发起两个异步请求,并等待它们的结果
        const [subjectListResult, resourceListResult] = await Promise.all([
@@ -679,18 +698,21 @@
      );
      this.inputValue = "";
      // 通知父组件数据已改变
      this.getItemList()
      this.getItemList();
    },
    // 搜索
    handleSearch(isText) {
      this.associationList = []
      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();
      }
@@ -698,20 +720,27 @@
    // 请求数据
    getItemList() {
      this.loading = true;
      let searchData = {}; // 初始化一个空对象来存储搜索数据
      if (this.inputValue) { // 如果输入值存在
        if (this.inputType != "all") { // 如果输入类型不是"all"
      if (this.inputValue) {
        // 如果输入值存在
        if (this.inputType != "all") {
          // 如果输入类型不是"all"
          // 将输入值与输入类型关联,并添加一个星号(*)作为后缀
          searchData[this.inputType + "*"] = this.inputValue;
        } else { // 如果输入类型是"all"
        } else {
          // 如果输入类型是"all"
          // 遍历输入选项
          for (let index = 0; index < this.inputOptions.length; index++) {
            const item = this.inputOptions[index]; // 获取当前选项
            if (item.value !== "all") { // 如果当前选项的值不是"all"
              if (!Object.keys(searchData).length) { // 如果searchData是空的
            if (item.value !== "all") {
              // 如果当前选项的值不是"all"
              if (!Object.keys(searchData).length) {
                // 如果searchData是空的
                // 将第一个选项的值与输入值关联,并添加一个星号(*)作为后缀
                searchData[item.value + "*"] = this.inputValue;
              } else { // 如果searchData不是空的
              } else {
                // 如果searchData不是空的
                // 使用"||"作为前缀,将后续选项的值与输入值关联,并添加一个星号(*)作为后缀
                // 这通常用于构建一个逻辑或(OR)查询
                searchData["||" + item.value + "*"] = this.inputValue;
@@ -720,13 +749,28 @@
          }
        }
      }
      if (this.associationList && this.associationList.length) {
        this.associationList.forEach((item) => {
          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;
          } else {
            searchData["||" + item.value + "*"] = item.content;
          }
        });
      }
      console.log(searchData, "searchData");
      MG.resource
        .getItem({
          path: "*",
          queryType: "*",
          paging: {
            start: (this.paginationPage - 1) * 6,
            size: 6,
            start: (this.paginationPage - 1) * 10,
            size: 10,
          },
          sort: {
            year: this.postedSortInfo ? "Desc" : "Asc",
@@ -738,6 +782,7 @@
                ? this.categoryChecList
                : this.resourceTypeValueList,
            source: [],
            isbn: [],
            year: [],
            abstract: [],
            keyWords: [],
@@ -761,14 +806,34 @@
              // 设置一个默认值或者进行其他错误处理
              item.keyWords = [];
            }
            // item.cleanAbstract = item.abstract.replace(/<[^>]+>/g, "");
            const foundItem = this.category.list.find((citem) => citem.value == item.cmsItemType);
            item.resourceTypeName = foundItem ? foundItem.name : '';
          })
          this.resultList = res.datas
            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 : "";
          });
          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) {
@@ -776,11 +841,11 @@
      this.getItemList(); // 重新获取数据
      // 滚动到页面顶部
      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",
          });
        }
      });
@@ -789,6 +854,28 @@
      this.postedSortInfo = !this.postedSortInfo;
      this.getItemList();
    },
    getResourceTypeClass(typeName) {
      switch (typeName) {
        case "journal":
          return "journal-color";
        case "books":
          return "books-color";
        case "video":
          return "video-color";
        case "audio":
          return "audio-color";
        case "newspaper":
          return "newspaper-color";
        default:
          return "other-color";
      }
    },
    openAiReading(text, name) {
        this.AIReading = text;
        this.aIName = name;
        this.dialogVisible = true;
    }
  },
};
</script>
@@ -827,6 +914,18 @@
  }
}
::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%;
@@ -850,15 +949,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;
    }
  }
@@ -911,11 +1035,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;
        }
      }
@@ -1081,6 +1205,7 @@
    .right-header {
      display: flex;
      flex-wrap: wrap;
      li {
        background: #ffffff;
@@ -1092,6 +1217,8 @@
        font-family: Poppins;
        font-size: 13px;
        color: #937950;
        line-height: 20px;
        margin-bottom: 10px;
        img {
          cursor: pointer;
@@ -1151,25 +1278,54 @@
        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;
          }
        }
      }
      .journal-color {
        background-color: #87a8b9;
      }
      .books-color {
        background-color: #c48787;
      }
      .video-color {
        background-color: #6f8f5a;
      }
      .audio-color {
        background-color: #937950;
      }
      .newspaper-color {
        background-color: #8d77b3;
      }
      .other-color {
        background-color: #009f9f;
      }
      .main-sources {
        span:nth-child(1) {
          padding: 3px 5px;
          background-color: #87a8b9;
          color: #fff;
          margin-right: 10px;
        }
@@ -1201,7 +1357,7 @@
          border-left: 1px solid #2c2c2c;
        }
        margin-bottom: 10px;
        margin-bottom: 15px;
      }
      .main-author {
@@ -1222,7 +1378,7 @@
        overflow: hidden;
        display: -webkit-box;
        -webkit-box-orient: vertical;
        -webkit-line-clamp: 4;
        -webkit-line-clamp: 3;
        span {
          font-family: Source Han Sans;
@@ -1260,6 +1416,23 @@
      }
    }
  }
}
.AIReadingBox {
  height: 85vh;
  min-height: 600px;
  padding: 20px 10px;
}
.richTextInitBox {
  height: 100%;
  overflow: auto;
}
.richTextInitError{
    height: 100%;
    display: flex;
    align-items: center;
    justify-content: center;
}
.pagination {
@@ -1305,4 +1478,38 @@
  border-radius: 5px;
  border: 1px solid #cccccc;
}
</style>
:deep.el-pagination.is-background .el-pager li:not(.disabled):hover {
  color: #937950;
}
:deep.el-button--primary {
  background-color: #937950;
  color: #937950;
  border: 1px solid #937950;
  cursor: pointer;
  &:hover {
    background-color: #937950;
    color: #fffdf8;
  }
}
</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>
src/views/chronology/floatingWindow.vue
@@ -4,7 +4,7 @@
      class="journalBox"
      v-if="info.cmsItemType === 'journal' || info.cmsItemType === 'books'"
    >
      <div class="title">{{ info.name }}</div>
      <div :title="info.name" class="title">{{ info.name }}</div>
      <div class="subtitle">
        <div class="source">{{ info.source }}</div>
        <div class="journalInformation">{{ info.IssueNumber }}</div>
@@ -43,7 +43,7 @@
      </div>
    </div>
    <div class="videoBox" v-if="info.cmsItemType === 'video'">
      <video width="370" height="200" controls :src="info.requestCtx"></video>
      <video width="370" height="200" controls :src="info.fileLink"></video>
      <div>
        <div class="subtitle">
@@ -52,15 +52,16 @@
        </div>
        <div class="contentBox" style="text-align: left">
          <div class="contentBox" style="text-align: left">
          <div class="audioContent" v-html="info.abstract"></div>
        </div></div>
            <div class="audioContent" v-html="info.abstract"></div>
          </div>
        </div>
      </div>
    </div>
    <div class="audioBox" v-if="info.cmsItemType === 'audio'">
      <div style="text-align: center">
        <audio
          style="width: 90%"
          src="https://www.w3schools.com/html/horse.ogg"
          :src="info.fileLink"
          controls
        ></audio>
      </div>
@@ -76,7 +77,7 @@
    </div>
    <div class="btnBox">
      <div class="detailBtn">查看详情</div>
      <div @click="toDetail" class="detailBtn">查看详情</div>
    </div>
  </div>
</template>
@@ -94,7 +95,14 @@
  data() {
    return {};
  },
  mounted() {
    console.log(this.info);
  },
  methods: {
    toDetail() {
      this.$router.push({ name: "details", query: { id: this.info.id } });
    },
  },
};
</script>
@@ -112,6 +120,10 @@
  font-size: 16px;
  line-height: 22px;
  font-weight: 600;
  overflow: hidden;
  text-overflow: ellipsis;
  white-space: nowrap;
  margin-top: 10px;
}
.subtitle {
@@ -197,7 +209,7 @@
  cursor: pointer;
  border: 1px solid #8f7a5a;
}
.audioContent{
.audioContent {
  white-space: pre-line;
  line-height: 18px;
  margin-top: 10px;
@@ -205,4 +217,9 @@
  overflow-y: auto;
  margin-top: 20px;
}
video {
      border-radius: 10px;
      border: 1px solid #dcdcdc;
      box-shadow: 0px 0px 10px 0px rgba(0, 0, 0, 0.1);
    }
</style>
src/views/chronology/index.vue
@@ -49,10 +49,14 @@
                  class="gradchild"
                  v-for="(citem, cindex) in item.list"
                  :style="{ background: citem.color }"
                  @click.stop="showDetail(index, cindex, 1, $event)"
                  @click.self="showDetail(index, cindex, 1, $event)"
                  :key="cindex"
                >
                  <div class="detailDialog" v-if="citem.showDetail">
                  <div
                    class="detailDialog"
                    :style="popupStyle"
                    v-if="citem.showChildDetail"
                  >
                    <div
                      class="closeBtn"
                      @click.stop="closeDetail(index, cindex, 0)"
@@ -91,6 +95,9 @@
import moment from "moment";
import floatingWindow from "./floatingWindow.vue";
import yearWindow from "./yearWindow.vue";
import { nextTick } from "vue";
import fileApi from "@/assets/js/middleGround/api/file";
import { requestCtx, appRefCode } from "@/assets/js/config";
export default {
  components: {
@@ -109,6 +116,10 @@
        audio: "#b9a587",
        newspaper: "#8d77b3",
        other: "#009f9f",
      },
      popupStyle: {
        left: "0",
        top: "0",
      },
    };
  },
@@ -155,11 +166,12 @@
            const listData = await this.getYearResource(item);
            if (listData.length > 0) {
              this.$set(item, "list", listData);
              console.log(item, "item");
              for (let j = 0; j < listData.length; j++) {
                const element = listData[j];
                this.$set(element, "showChildDetail", false);
              }
            }
          }
          console.log(this.contentList, "this.contentList");
          this.contentList = res.datas;
          this.showList = true;
        });
@@ -197,8 +209,7 @@
        for (let i = 0; i < filterList.length; i++) {
          const item = filterList[i];
          if (item.file) {
            const requestCtx =
              this.config.requestCtx + `/file/api/ApiDownload?md5=${item.file}`;
            const requestCtx = await this.getResourcePath(item.file);
            this.$set(item, "fileLink", requestCtx);
          }
          this.$set(item, "showDetail", false);
@@ -211,35 +222,81 @@
      }
      return filterList;
    },
    // 获取阿里云加速地址 (视频,音频)
    async getResourcePath(md5) {
      try {
        // 如果返回的数据为空或未定义,则拼接默认下载路径
        return requestCtx + "/file/api/ApiDownload?md5=" + md5;
      } catch (error) {
        // 捕获异常并打印错误日志
        console.error("获取资源路径失败:", error);
        // 返回一个默认值或抛出错误(根据业务需求)
        return requestCtx + "/file/api/ApiDownload?md5=" + md5;
      }
    },
    closeDetail(index, cindex, type) {
      for (let i = 0; i < this.contentList.length; i++) {
        const item = this.contentList[i];
        if (item && item.length > 0) {
        if (item && item.list?.length > 0) {
          for (let j = 0; j < item.list.length; j++) {
            const citem = item.list[j];
            this.$set(citem, "showDetail", false);
            this.$set(citem, "showChildDetail", false);
          }
        }
      }
      this.contentList[index].list[cindex].showDetail = false;
    },
    showDetail(index, cindex, type, event) {
      const rect = event.target.getBoundingClientRect();
      const screenWidth = window.innerWidth;
      const popupWidth = 542; // 假设弹框宽度为200px
      // 判断触发元素位置
      if (rect.left + rect.width / 2 < screenWidth / 2) {
        // 左侧显示弹框在右侧
        this.popupStyle = {
          left: `${rect.right}px`,
          top: `${rect.bottom - 150}px`,
        };
      } else {
        // 右侧显示弹框在左侧
        this.popupStyle = {
          left: `${rect.left - popupWidth}px`,
          top: `${rect.bottom - 150}px`,
        };
      }
      console.log(this.popupStyle.top, "this.top");
      console.log(this.popupStyle.left, "this.left");
      // if (rect.left - popupWidth < 0) {
      //   // 左侧空间不足时强制右侧显示
      //   this.popupStyle.left = `${rect.right}px`;
      // } else if (rect.right + popupWidth > screenWidth) {
      //   // 右侧空间不足时强制左侧显示
      //   this.popupStyle.left = `${rect.left - popupWidth}px`;
      // }
      console.log(event, "event");
      for (let i = 0; i < this.contentList.length; i++) {
        const item = this.contentList[i];
        if (item && item.length > 0) {
        if (item && item.list?.length > 0) {
          for (let j = 0; j < item.list.length; j++) {
            const citem = item.list[j];
            this.$set(citem, "showDetail", false);
            item.showDetail = false;
            if (citem.showChildDetail) {
              this.contentList[i].list[j].showDetail = false;
              citem.showChildDetail = false;
            }
          }
        }
      }
      if (this.contentList[index].list[cindex].type) {
        this.contentList[index].list[cindex].showDetail = true;
        this.contentList[index].list[cindex].showChildDetail = true;
      }
      console.log(this.contentList[index].list, "this.contentList[index].list[cindex]");
      console.log(
        this.contentList[index].list,
        "this.contentList[index].list[cindex]"
      );
    },
  },
};
@@ -254,6 +311,7 @@
  display: flex;
  flex-direction: column;
  overflow: auto;
  font-family: Source Han Sans;
}
.pageBox {
@@ -363,15 +421,20 @@
  cursor: pointer;
  position: relative;
}
.gradchild:hover {
  width: 25px;
  height: 25px;
  margin-top: 2px;
  margin-right: 2px;
  // transform: scale(1.1);
  width: 23px;
  height: 23px;
  cursor: pointer;
  position: relative;
}
/* 重置子元素的样式 */
// .gradchild:hover .detailDialog {
//   transform: scale(1);
//   z-index: 999;
// }
.item-circle {
  width: 100%;
  height: 20px;
@@ -402,6 +465,11 @@
  margin-left: -9px;
  z-index: 99;
  background: #fff;
  cursor: pointer;
}
.item-circle:hover:before {
  background-color: #b9a587;
  border: 1px solid #8f7a5a;
}
.item-text {
@@ -413,16 +481,19 @@
  align-items: center;
}
.detailDialog {
  position: absolute;
  top: -700%;
  transform: translateY(20%);
  transform: translateX(-50%);
  position: fixed;
  width: 524px;
  z-index: 9999;
  cursor: pointer;
  background: #fff;
  border: 2px solid #cbbeaa;
  box-shadow: 2px 2px 4px 1px rgba(0, 0, 0, 0.5);
}
video {
  border-radius: 10px;
  border: 1px solid #dcdcdc;
  box-shadow: 0px 0px 10px 0px rgba(0, 0, 0, 0.1);
}
.yaerWindow {
@@ -436,15 +507,15 @@
  border: 2px solid #cbbeaa;
  box-shadow: 2px 2px 4px 1px rgba(0, 0, 0, 0.5);
}
.detailDialog .dialogContent {
  width: 100%;
  height: 100%;
  background-color: #fff;
  position: relative;
  padding: 5px;
  z-index: 20;
  box-sizing: border-box;
}
// .detailDialog .dialogContent {
//   width: 100%;
//   height: 100%;
//   background-color: #fff;
//   position: relative;
//   padding: 5px;
//   z-index: 20;
//   box-sizing: border-box;
// }
.closeBtn {
  position: absolute;
  width: 20px;
@@ -453,7 +524,16 @@
  right: 5px;
  z-index: 999;
}
::v-deep .el-loading-spinner {
  color: #937950 !important;
  .el-loading-text {
    font-size: 14px;
    color: #937950;
  }
  .el-icon-loading {
    font-size: 14px;
    color: #937950;
  }
}
</style>
src/views/chronology/yearWindow.vue
@@ -4,10 +4,20 @@
    <div class="content">
      <div class="leftTxt" v-html="info.eventOverview"></div>
      <div class="rightimg">
        <div v-if="imgLink != ''" class="imgBox">
          <img class="autoImg" :src="imgLink" alt="" />
        <div class="imgBox" style="text-align: center" v-if="imgLink != ''">
          <div class="arrowBox leftArrowBox" @click="leftArrow">
            <img class="autoImg" :src="arrow" alt="" />
          </div>
          <div class="imgBox">
            <img class="autoImg" :src="imgLink" alt="" />
          </div>
          <div class="arrowBox" @click="rightArrow">
            <img class="autoImg" :src="arrow" alt="" />
          </div>
        </div>
        <div style="text-align: center; font-size: 18px; color: #999" v-else>暂无图片</div>
        <div style="text-align: center; font-size: 18px; color: #999" v-else>
          暂无图片
        </div>
      </div>
    </div>
  </div>
@@ -15,7 +25,7 @@
<script>
import { getPublicImage } from "@/assets/js/middleGround/tool";
import arrow from "@/assets/images/right_arrow.svg";
export default {
  name: "floatingWindow",
  props: {
@@ -28,15 +38,48 @@
    return {
      title: "",
      imgLink: "",
      arrow,
      currentIndex: 0,
      imgList: [],
    };
  },
  methods: {},
  methods: {
    leftArrow() {
      if (this.currentIndex == 0) {
        this.currentIndex = this.imgList.length - 1;
        this.imgLink = this.imgList[this.currentIndex];
      } else {
        this.currentIndex--;
        this.imgLink = this.imgList[this.currentIndex];
      }
    },
    rightArrow() {
      if (this.currentIndex == this.imgList.length - 1) {
        this.currentIndex = 0;
        this.imgLink = this.imgList[this.currentIndex];
      } else {
        this.currentIndex++;
        this.imgLink = this.imgList[this.currentIndex];
      }
    },
  },
  mounted() {
    console.log(this.info);
    this.title =
      this.info.name.split(",")[0] + " " + this.info.name.split(",")[1];
    this.imgLink = getPublicImage(this.info.eventPictures);
    console.log(this.imgLink);
    console.log(
      Array.isArray(this.info.eventPictures),
      "Array.isArray(this.info.eventPictures)"
    );
    if (Array.isArray(this.info.eventPictures)) {
      console.log(1);
      this.imgList = this.info.eventPictures.map((item) =>
        getPublicImage(item)
      );
      this.imgLink = this.imgList[0];
    } else {
      this.imgLink = getPublicImage(this.info.eventPictures);
    }
  },
};
</script>
@@ -49,7 +92,7 @@
  padding: 15px;
  z-index: 20;
  box-sizing: border-box;
  background-color: #FDF8F0;
  background-color: #fdf8f0;
}
.content {
  display: flex;
@@ -61,11 +104,13 @@
  overflow: hidden;
  white-space: normal;
  overflow-y: auto;
  padding: 10px;
}
.rightimg {
  width: 350px;
  height: 100%;
  padding: 10px;
  padding-top: 0px;
}
.title {
  font-size: 24px;
@@ -77,4 +122,22 @@
  min-height: 300px;
  position: relative;
}
.arrowBox {
  width: 30px;
  height: 30px;
  position: relative;
}
.imgBox {
  display: flex;
  justify-content: center;
  align-items: center;
}
.arrowBox {
  margin: 0 5px;
}
.leftArrowBox {
  transform: rotate(180deg);
}
</style>
src/views/directory/index.vue
@@ -28,7 +28,7 @@
      <!-- 图表显示 -->
      <div
        class="charts-main"
        v-if="activeTabs == 'chart'"
        v-show="activeTabs == 'chart'"
        v-loading="loading"
        element-loading-text="图表加载中"
        element-loading-spinner="el-icon-loading"
@@ -134,7 +134,15 @@
                  职称:{{ currentNodeInfo.professionalTitle || "-" }}
                </p>
              </div>
              <div style="text-align: left; line-height: 22px;max-height:200px;overflow-y: auto; padding: 10px;" >
              <div
                style="
                  text-align: left;
                  line-height: 22px;
                  max-height: 200px;
                  overflow-y: auto;
                  padding: 10px;
                "
              >
                <div v-html="currentNodeInfo.studentProfile"></div>
              </div>
              <!-- <div
@@ -158,7 +166,7 @@
        </transition>
      </div>
      <!-- 列表显示 -->
      <div class="page-main" v-if="activeTabs == 'list'">
      <div class="page-main" v-show="activeTabs == 'list'">
        <div
          v-loading="loading"
          style="min-height: 550px"
@@ -169,14 +177,10 @@
          <div v-for="(item, index) in universityList" :key="index">
            <div
              class="table-title"
              v-if="item.studentList && item.studentList.length > 0"
              v-if="item.agreelist && item.agreelist.length > 0"
            >
              <div class="table-title-left">
                <p class="table-title-name">{{ item.unitName }}</p>
                <p class="table-title-degree">{{ item.academicDegreeName }}</p>
                <p class="table-title-number">
                  {{ item.studentList.length }}人
                </p>
              </div>
              <div
                class="table-title-right"
@@ -185,50 +189,61 @@
                <img :src="[item.isShow ? topIcon : bottomIcon]" alt="" />
              </div>
            </div>
            <table
              cellpadding="100"
              v-if="
                item.studentList && item.studentList.length > 0 && item.isShow
              "
              style="vertical-align: middle"
            <div
              v-if="item.agreelist && item.agreelist.length > 0 && item.isShow"
            >
              <tr class="table-heading">
                <th>姓名</th>
                <th>性别</th>
                <th>学习时间</th>
                <th>工作单位(到二级单位全称)</th>
                <th>职务</th>
                <th>职称</th>
              </tr>
              <tr v-for="(citem, cindex) in item.studentList" :key="cindex">
                <td>
                  {{ citem.name }}
                </td>
                <td>
                  {{ citem.gender == "male" ? "男" : "女" }}
                </td>
                <td>{{ citem.studyTime }}</td>
                <td>{{ citem.currentEmployer_secondary }}</td>
                <td>
                  {{
                    citem.jobTitle === undefined || citem.jobTitle === ""
                      ? "-"
                      : citem.jobTitle
                  }}
                </td>
                <td>
                  {{
                    citem.professionalTitle === undefined ||
                    citem.professionalTitle === ""
                      ? "-"
                      : citem.professionalTitle
                  }}
                </td>
              </tr>
            </table>
              <div v-for="(citem, cindex) in item.agreelist" :key="cindex">
                <div class="agree-title">
                  <p class="table-title-degree">
                    {{ citem.academicDegreeName }}
                  </p>
                  <p class="table-title-number">
                    {{ citem.studentList.length }}人
                  </p>
                </div>
                <table cellpadding="100" style="vertical-align: middle">
                  <tr class="table-header">
                    <th>姓名</th>
                    <th>性别</th>
                    <th>学习时间</th>
                    <th>工作单位(到二级单位全称)</th>
                    <th>职务</th>
                    <th>职称</th>
                  </tr>
                  <tr
                    v-for="(ditem, dindex) in citem.studentList"
                    :key="dindex"
                  >
                    <td>
                      {{ ditem.name }}
                    </td>
                    <td>
                      {{ ditem.gender == "male" ? "男" : "女" }}
                    </td>
                    <td>{{ ditem.studyTime }}</td>
                    <td>{{ ditem.currentEmployer_secondary }}</td>
                    <td>
                      {{
                        ditem.jobTitle === undefined || ditem.jobTitle === ""
                          ? "-"
                          : ditem.jobTitle
                      }}
                    </td>
                    <td>
                      {{
                        ditem.professionalTitle === undefined ||
                        ditem.professionalTitle === ""
                          ? "-"
                          : ditem.professionalTitle
                      }}
                    </td>
                  </tr>
                </table>
              </div>
            </div>
          </div>
        </div>
        <!-- <el-empty v-if="!resultList.length"></el-empty> -->
        <!-- <el-empty v-if="!loading && !universityList.length"></el-empty> -->
      </div>
    </div>
  </div>
@@ -253,8 +268,8 @@
      noChartIcon: require("@/assets/images/directory/noChartIcon.png"),
      listIcon: require("@/assets/images/directory/listIcon.png"),
      noListIcon: require("@/assets/images/directory/noListIcon.png"),
      topIcon: require("@/assets/images/directory/topIcon.png"),
      bottomIcon: require("@/assets/images/directory/bottomIcon.png"),
      topIcon: require("@/assets/images/directory/topIcon.svg"),
      bottomIcon: require("@/assets/images/directory/bottomIcon.svg"),
      activeTabs: "chart",
      universityList: [],
      chart: null,
@@ -307,7 +322,10 @@
  methods: {
    changeTab(key) {
      this.activeTabs = key;
      console.log(this.activeTabs, "activeTabs");
      // console.log(this.activeTabs, "activeTabs");
      if (key == "chart") {
        this.initChart();
      }
    },
    initChart() {
      this.chart = echarts.init(this.$refs.chart);
@@ -318,8 +336,8 @@
          backgroundColor: "#FDF8F0",
          formatter: (params) => {
            const data = params.data;
            this.currentNodeInfo = data;
            console.log(data, "data");
            // this.currentNodeInfo = data;
            // console.log(data, "data");
            if (data.cmsItemType == "student") {
              return `
              <div style="
@@ -363,27 +381,27 @@
              </div>
            `;
            } else {
              return `
              <div style="
                padding: 10px;
                background: #FDF8F0;
                border-radius: 5px;
                max-width: 300px;
                width: 360px;
                text-align: center;
              ">
                <div style="width: 80px;height: 80px;position: relative; margin: 0 auto; margin-bottom: 10px;background: #D8D8D8;">
      <img class="autoImg"  src="${require("@/assets/images/directory/touxiang.png")}" alt="">
                  </div>
                <div style="font-size: 16px; font-weight: bold; margin-bottom: 5px;">${
                  data.name
                }</div>
                <div>   <span> ${data.academicDegreeName || "-"} </span></div>
              </div>
            `;
            }
            //       } else {
            //         return `
            //         <div style="
            //           padding: 10px;
            //           background: #FDF8F0;
            //           border-radius: 5px;
            //           max-width: 300px;
            //           width: 360px;
            //           text-align: center;
            //         ">
            //           <div style="width: 80px;height: 80px;position: relative; margin: 0 auto; margin-bottom: 10px;background: #D8D8D8;">
            // <img class="autoImg"  src="${require("@/assets/images/directory/touxiang.png")}" alt="">
            //             </div>
            //           <div style="font-size: 16px; font-weight: bold; margin-bottom: 5px;">${data.name
            //           }</div>
            //           <div>   <span> ${data.academicDegreeName || "-"} </span></div>
            //         </div>
            //       `;
            //       }
          },
        },
        textStyle: {
@@ -410,10 +428,10 @@
            },
            label: {
              position: "top", //标签的位置。
              // position: "left", //标签的位置。
              verticalAlign: "middle", //文字垂直对齐方式,默认自动。
              fontSize: 12, //文字的字体大小
              color: "#bc1c00",
              // color: "#bc1c00",
            },
            // leaves: {
            //   symbol: "emptyCircle",
@@ -423,7 +441,6 @@
            // },
            expandAndCollapse: false,
            lineStyle: {
              color: "#bc1c00",
              width: 1,
            },
            itemStyle: {
@@ -441,8 +458,12 @@
      this.chart.setOption(option);
      this.chart.on("click", (params) => {
        console.log("点击时的回调", params);
        // console.log("点击时的回调", params);
        console.log(params, "params");
        if (params.data?.cmsItemType && params.data?.cmsItemType == "student") {
        this.tooltipShow = true;
        this.currentNodeInfo = params.data;
        }
      });
    },
    handleResize() {
@@ -465,7 +486,6 @@
          };
        });
        this.academicDegreeList = academicDegreeListResult.option;
        console.log(this.academicDegreeList, "this.academicDegreeList");
      } catch (error) {
        console.error("获取下拉框数据失败:", error);
      }
@@ -477,7 +497,6 @@
      return MG.store
        .getProductTypeField(requestData)
        .then((res) => {
          console.log(res, "下拉框数据");
          const selestList = JSON.parse(res[0].config);
          return selestList;
        })
@@ -516,6 +535,27 @@
        })
        .then((res) => {
          let arrList = [];
          let schoolList = [];
          console.log(this.unitList, "unitList");
          console.log(this.academicDegreeList, "this.academicDegreeList");
          this.unitList.forEach((item, index) => {
            schoolList.push({
              unitName: item.name,
              unitValue: item.value,
              isShow: index === 0, // 如果是第一个元素(index为0),则isShow为true,否则为false
              agreelist: [],
            });
          });
          this.academicDegreeList.forEach((item) => {
            schoolList.forEach((citem) => {
              citem.agreelist.push({
                academicDegreeName: item.name,
                academicDegreeValue: item.value,
                studentList: [],
              });
            });
          });
          console.log(schoolList, "schoolList");
          this.unitList.forEach((item) => {
            this.academicDegreeList.forEach((citem) => {
              arrList.push({
@@ -531,13 +571,11 @@
                    this.legendList.find(
                      (legendItem) => legendItem.value === item.value
                    )?.color || "#000000",
                },
                },
                children: [],
              });
            });
          });
          this.loading = false;
          console.log(res, "res");
          if (res.datas && res.datas.length) {
            res.datas.forEach((item) => {
              arrList.forEach((citem) => {
@@ -549,22 +587,50 @@
                    (f) => f.value == item.academicDegree
                  )?.name;
                  citem.studentList.push(item);
                  item['itemStyle'] = citem.itemStyle;
                  citem.children.push(item);
                }
              });
            });
            res.datas.forEach((item) => {
              schoolList.forEach((citem) => {
                citem.agreelist.forEach((ditem) => {
                  if (
                    item.unit == citem.unitValue &&
                    item.academicDegree == ditem.academicDegreeValue
                  ) {
                    ditem.studentList.push(item);
                  }
                });
              });
            });
            console.log(schoolList, "schoolList");
            // 使用filter方法过滤schoolList,删除agreelist长度为0的item
            schoolList = schoolList.filter((item) => {
              // 先过滤掉那些studentList长度为0的citem
              item.agreelist = item.agreelist.filter(
                (citem) => citem.studentList.length > 0
              );
              // 然后检查过滤后的agreelist长度是否大于0
              return item.agreelist.length > 0;
            });
            // 此时schoolList中不包含agreelist长度为0的item
            console.log(schoolList, "处理好的schoolList");
            this.universityList = schoolList;
            arrList = arrList.filter((item) => item.studentList.length);
            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();
            this.loading = false;
          }
        })
        .catch((error) => {
@@ -660,6 +726,7 @@
  overflow: hidden;
  margin-bottom: 100px;
  padding-top: 50px;
  table {
    width: 100%;
    border-collapse: collapse;
@@ -670,6 +737,7 @@
    background-color: #fff;
    background-clip: padding-box;
    border-bottom: 2px solid transparent;
    line-height: 20px;
  }
  th {
@@ -678,6 +746,7 @@
    font-weight: bold;
    padding: 4px 41px;
    text-wrap: nowrap;
    line-height: 30px;
  }
  td {
@@ -687,10 +756,12 @@
    text-align: center;
    display: table-cell;
    vertical-align: middle;
    line-height: 20px;
  }
  td:nth-child(1) {
    text-wrap: nowrap;
    line-height: 20px;
  }
  tr:last-child td {
@@ -711,9 +782,10 @@
  align-items: center;
  justify-content: space-between;
  padding: 10px 28px;
  background-color: #d8cbb6;
  background-color: #937950;
  margin-bottom: 4px;
  margin-top: 2px;
  line-height: 35px;
  .table-title-left {
    display: flex;
@@ -721,23 +793,11 @@
  }
  .table-title-name {
    color: #fff;
    width: 200px;
    overflow: hidden;
    font-family: Source Han Serif CN;
    font-size: 18px;
    font-weight: bold;
  }
  .table-title-degree {
    font-family: Source Han Serif CN;
    font-size: 14px;
    font-weight: bold;
    margin-right: 40px;
  }
  .table-title-number {
    font-family: Source Han Serif CN;
    font-size: 14px;
    font-weight: bold;
  }
@@ -746,8 +806,32 @@
  }
  img {
    display: flex;
    align-items: center;
    width: 20px;
    height: auto;
  }
}
.agree-title {
  display: flex;
  line-height: 45px;
  background-color: #d8cbb6;
  margin-bottom: 4px;
  margin-top: 2px;
  .table-title-degree {
    font-family: Source Han Serif CN;
    font-size: 14px;
    font-weight: bold;
    margin-right: 40px;
    margin-left: 50px;
  }
  .table-title-number {
    font-family: Source Han Serif CN;
    font-size: 14px;
    font-weight: bold;
  }
}
@@ -786,6 +870,7 @@
.tagText {
  margin-left: 30px;
}
::v-deep .el-loading-spinner {
  color: #937950 !important;
}
@@ -794,4 +879,16 @@
  font-size: 14px;
  color: #937950;
}
::v-deep .el-loading-spinner {
  .el-loading-text {
    font-size: 14px;
    color: #937950;
  }
  .el-icon-loading {
    font-size: 14px;
    color: #937950;
  }
}
</style>
src/views/home/index.vue
@@ -23,7 +23,7 @@
            </div>
            <div class="menuTitle">{{ item.title }}</div>
            <div class="menuSubTitle">{{ item.subTitle }}</div>
            <div class="menuLine"><i class="el-icon-right"></i></div>
            <div class="menuLine"><img class="autoImg" :src="arrow" alt="" /></div>
          </div>
        </div>
      </div>
@@ -47,7 +47,7 @@
import rongyu from "@/assets/images/menuIcon/rongyu.png";
import xueshu from "@/assets/images/menuIcon/xueshu.png";
import homeBg from "@/assets/images/homeBg1.jpg";
import arrow from "@/assets/images/right_arrow.svg";
export default {
  components: {
    SearchBox,
@@ -55,6 +55,7 @@
  data() {
    return {
      arrow,
      menuList: [
        {
          icon: nianpu1,
@@ -129,6 +130,7 @@
  background-size: 98% 95%;
  position: relative;
  box-sizing: border-box;
  font-family: siyuan;
}
.bgBox {
  width: 100%;
@@ -206,12 +208,17 @@
  font-size: 40px;
  font-weight: 600;
  margin-top: 20px;
  font-family: siyuan;
}
.menuSubTitle {
  font-size: 28px;
  margin-top: 20px;
  font-family: siyuan;
}
.menuLine {
  width: 30px;
  height: 30px;
  position: relative;
  margin-top: 40px;
  font-size: 40px;
}
@@ -246,10 +253,10 @@
  text-align: center;
}
@media screen and (min-width: 1950px) {
/* @media screen and (min-width: 1950px) {
  .textInfo {
    font-size: 20px;
    line-height: 24px;
  }
}
} */
</style>
src/views/honors/index.vue
@@ -11,8 +11,8 @@
          <!-- 左边标题 -->
          <div class="honors-main-title">荣<br />誉<br />奖<br />项</div>
          <!-- 右边内容 -->
          <div class="honors-text" v-loading="loading"  element-loading-background="rgba(0, 0, 0, 0)" element-loading-text="学生列表加载中"
          element-loading-spinner="el-icon-loading">
          <div class="honors-text" v-loading="loading" element-loading-background="rgba(0, 0, 0, 0)"
            element-loading-text="学生列表加载中" element-loading-spinner="el-icon-loading">
            <div style="min-height: 646px;">
              <ul>
                <li v-for="(item, index) in honorList" :key="index">
@@ -24,14 +24,17 @@
                </li>
              </ul>
            </div>
            <!-- 分页 -->
            <div class="pagination">
              <el-pagination @current-change="handleCurrentChange" class="msg-pagination-container"
                :background="isBackground" layout="prev, pager, next" :total="total">
              </el-pagination>
            <div class="honor-main-bottom">
              <!-- “山”图片 -->
              <img class="honor-Bg" src="../../assets/images/honors/honor-Bg.png" alt="" />
              <!-- 分页 -->
              <div class="pagination">
                <el-pagination @current-change="handleCurrentChange" class="msg-pagination-container"
                  :background="isBackground" layout="prev, pager, next" :total="total">
                </el-pagination>
              </div>
            </div>
            <!-- “山”图片 -->
            <img class="honor-Bg" src="../../assets/images/honors/honor-Bg.png" alt="" />
            <el-empty v-if="!loading && !honorList.length"></el-empty>
          </div>
        </div>
      </div>
@@ -49,7 +52,7 @@
      honorList: [],
      total: 0,
      currentPage: 1,
      loading: false,
      loading: true,
    };
  },
  mounted() {
@@ -70,9 +73,6 @@
          start: (this.currentPage - 1) * 10,
          size: 10,
        },
        // coverSize: {
        //   height: 70
        // }
      }).then((res) => {
        console.log(res, "res");
        if (res.datas && res.datas.length) {
@@ -237,6 +237,23 @@
  }
}
.honor-main-bottom {
  display: flex;
  justify-content: space-between
}
::v-deep .el-loading-spinner {
  .el-loading-text {
    font-size: 14px;
    color: #937950;
  }
  .el-icon-loading {
    font-size: 14px;
    color: #937950;
  }
}
@font-face {
  font-family: "Alimama DongFangDaKai";
  src: url("../../assets/font/阿里妈妈东方大楷.ttf");
@@ -318,6 +335,11 @@
  background-color: #937950;
  color: #fff;
  border-radius: 5px;
  border: 1px solid #cccccc;
  border: 1px solid#cccccc;
}
//修改鼠标滑过的颜色
:deep.el-pagination.is-background .el-pager li:not(.disabled):hover {
  color: #937950
}
</style>