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

杨磊

5 天以前 f37631dc48856e728ea96ed47d5dfd52fa8583f6

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

 src/views/achievements/index.vue

@@ -1,7 +1,9 @@
<template>
  <div class="page">
    <div class="page-header">
      <p>王永炎院士学术成果</p>
      <p>
        <span>王永炎院士学术成果</span>
      </p>
    </div>
    <div class="page-main-father">
    <div class="page-main">
@@ -17,17 +19,12 @@
      </ul>
      <!-- 高级搜索 -->
      <div v-if="isDisplay" class="page-search">
        <MyForm
          class="myfrom"
          @submit="
          <MyForm class="myfrom" @submit="
            (data) => {
              CurrentPage = 1;
              onSubmit(data);
            }
          "
          @reset="resetForm"
          :from="from"
        />
          " @reset="resetForm" :from="from" />
      </div>
      <!-- 搜索结果 -->
      <div class="page-content">
@@ -37,25 +34,14 @@
            <li class="left-title">
              <span>{{ category.title }}</span>
              <p @click="category.isDisplay = !category.isDisplay">
                <img
                  :src="[category.isDisplay ? topIcon : bottomIcon]"
                  alt=""
                />
                  <img :src="[category.isDisplay ? topIcon : bottomIcon]" alt="" />
              </p>
            </li>
            <li class="left-main" v-if="category.isDisplay">
              <div
                class="category-main"
                v-for="(item, index) in category.list"
                :key="index"
              >
                <el-checkbox
                  class="el-checkbox"
                  v-model="item.checked"
                  :title="item.name"
                  >{{ item.name }}</el-checkbox
                >
                <span class="">{{ item.num }}</span>
                <div class="category-main" v-for="(item, index) in category.list" :key="index">
                  <el-checkbox class="el-checkbox" style="display: inline-block; vertical-align: middle;"
                    v-model="item.checked" :title="item.name">{{ item.name }}</el-checkbox>
                  <span class="" style="display: inline-block; vertical-align: middle;">{{ item.num }}</span>
              </div>
            </li>
          </ul>
@@ -66,19 +52,10 @@
                <span>{{ annual.title }}</span>
                <span>
                  时间
                  <img
                    class="sort-Icon"
                    :src="[isDisplay ? sortTop : sortBottom]"
                    alt=""
                  />
                    <img class="sort-Icon" :src="[isDisplay ? sortTop : sortBottom]" alt="" />
                </span>
                <span
                  >文献量
                  <img
                    class="sort-Icon"
                    :src="[isDisplay ? sortBottom : sortTop]"
                    alt=""
                  />
                  <span>文献量
                    <img class="sort-Icon" :src="[isDisplay ? sortBottom : sortTop]" alt="" />
                </span>
              </div>
              <p @click="annual.isDisplay = !annual.isDisplay">
@@ -86,27 +63,14 @@
              </p>
            </li>
            <li class="left-main" v-if="annual.isDisplay">
              <div
                class="annual-main"
                :style="{
                <div class="annual-main" :style="{
                  display: index + 1 > professionIndex ? 'none' : '',
                }"
                v-for="(item, index) in annual.list"
                :key="index"
              >
                <el-checkbox
                  class="el-checkbox"
                  v-model="item.checked"
                  :title="item.years"
                  >{{ item.years }}</el-checkbox
                >
                }" v-for="(item, index) in annual.list" :key="index">
                  <el-checkbox class="el-checkbox" v-model="item.checked" :title="item.years">{{ item.years
                  }}</el-checkbox>
                <span class="">{{ item.num }}</span>
              </div>
              <p
                class="annual-footer"
                v-if="annual.list && annual.list.length > 5"
                @click="shrinkClick('a', '年度')"
              >
                <p class="annual-footer" v-if="annual.list && annual.list.length > 5" @click="shrinkClick('a', '年度')">
                {{ activeBox !== "a" ? "更多  ∨" : "收起  ∧" }}
              </p>
            </li>
@@ -118,11 +82,7 @@
                <span>{{ sources.title }}</span>
                <span>
                  文献量
                  <img
                    class="sort-Icon"
                    :src="[isDisplay ? sortBottom : sortTop]"
                    alt=""
                  />
                    <img class="sort-Icon" :src="[isDisplay ? sortBottom : sortTop]" alt="" />
                </span>
              </div>
              <p @click="sources.isDisplay = !sources.isDisplay">
@@ -130,27 +90,15 @@
              </p>
            </li>
            <li class="left-main" v-if="sources.isDisplay">
              <div
                class="sources-main"
                v-for="(item, index) in sources.list"
                :key="index"
                :style="{
                <div class="sources-main" v-for="(item, index) in sources.list" :key="index" :style="{
                  display: index + 1 > dynastyIndex ? 'none' : '',
                }"
              >
                <el-checkbox
                  class="el-checkbox"
                  :title="item.name"
                  v-model="item.checked"
                  >{{ item.name }}</el-checkbox
                >
                }">
                  <el-checkbox class="el-checkbox" :title="item.name" v-model="item.checked">{{ item.name
                  }}</el-checkbox>
                <span class="">{{ item.num }}</span>
              </div>
              <p
                class="sources-footer"
                v-if="sources.list && sources.list.length > 5"
                @click="shrinkClick('b', '文献来源')"
              >
                <p class="sources-footer" v-if="sources.list && sources.list.length > 5"
                  @click="shrinkClick('b', '文献来源')">
                {{ activeBox !== "b" ? "更多  ∨" : "收起  ∧" }}
              </p>
            </li>
@@ -164,17 +112,9 @@
              </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"
                  >{{ 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">{{ item.name
                  }}</el-checkbox>
                <span class="">{{ item.num }}</span>
              </div>
            </li>
@@ -191,8 +131,7 @@
          <!-- 共xx条 -->
          <ul class="right-number">
            <ul class="number-number">
              共找到<span>{{ resultList.length }}</span
              >条结果
                共找到<span>{{ resultList.length }}</span>条结果
            </ul>
            <ul class="number-time">
              发表时间
@@ -200,11 +139,7 @@
            </ul>
          </ul>
          <!-- 结果展示 -->
          <ul
            class="right-main"
            v-for="(item, index) in resultList"
            :key="index"
          >
            <ul class="right-main" v-for="(item, index) in resultList" :key="index">
            <li class="main-name">
              <p>{{ item.name }}</p>
              <p>
@@ -225,23 +160,15 @@
            </li>
            <li class="main-keyword">
              <span>关键词：</span>
              <span
                class="keyWord"
                v-for="(citem, cindex) in item.keyword"
                :key="cindex"
              >
                <span class="keyWord" v-for="(citem, cindex) in item.keyword" :key="cindex">
                {{ citem.name }}
              </span>
            </li>
          </ul>
          <!-- 分页 -->
          <div class="pagination">
            <el-pagination
              class="msg-pagination-container"
              :background="isBackground"
              layout="prev, pager, next"
              :total="200"
            >
              <el-pagination class="msg-pagination-container" :background="isBackground" layout="prev, pager, next"
                :total="200">
            </el-pagination>
          </div>
        </div>
@@ -687,30 +614,39 @@
  background-color: #e9e1d4;
  position: relative;
  overflow: hidden;
  display: flex;
  flex-direction: column;
}

.page-header {
  background-color: #e9e1d4;
  padding: 8px 0;
  height: 9.4%;
  width: 100%;
  text-align: left;
  border-bottom: 2px solid #937950;
  background-color: #e9e1d4;
  position: sticky;
  top: 0;
  z-index: 10;
  z-index: 100;

  p {
    padding: 1.6% 0 1.55% 0;
    height: 100%;
    font-family: Alimama DongFangDaKai;
    font-size: 30px;
    text-indent: 1em;
    border-bottom: 1px solid #937950;
    display: flex;
    align-items: center;
  }
}

.page-main-father{
  height: calc(100% - 9.4%);
  flex: 1;
  width: 100%;
  height: 100%;
  overflow: auto;
  padding-top: 1%;
  padding-bottom: 2%;
}

.page-main {
@@ -843,13 +779,14 @@
    border-bottom: 1px solid #e4dace;
    padding: 10px;
    display: flex;
    align-items: center;
    flex-wrap: wrap;
  }

  .category-main {
    width: 50%;
    margin-bottom: 10px;
    display: flex;
    align-items: center;

    span {
      font-family: Source Han Sans;
@@ -897,7 +834,10 @@
  }

  .el-checkbox {
    vertical-align: middle;
    font-family: "Tahoma";
    width: 70%;
    vertical-align: middle;
  }

  /* 设置鼠标经过对勾框，对勾框边框的颜色 */
@@ -915,10 +855,7 @@
  }

  ::v-deep .el-checkbox .el-checkbox__input.is-checked .el-checkbox__inner,
  ::v-deep
    .el-checkbox
    .el-checkbox__input.is-indeterminate
    .el-checkbox__inner {
  ::v-deep .el-checkbox .el-checkbox__input.is-indeterminate .el-checkbox__inner {
    border-color: #8f7a5a;
    background-color: #8f7a5a;
  }
@@ -1149,9 +1086,7 @@
  border: 1px solid #cccccc;
}

:deep.msg-pagination-container.is-background
  .el-pager
  li:not(.disabled).active {
:deep.msg-pagination-container.is-background .el-pager li:not(.disabled).active {
  /*当前选中页数的样式进行修改*/
  background-color: #937950;
  color: #fff;