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

zhongshujie

13 小时以前 974aa7d5f7541ca5a4457ac0620fee7cb590b9ab

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

 dist.zip

Binary files differ

 src/views/achievements/index.vue

@@ -19,12 +19,17 @@
        </ul>
        <!-- 高级搜索 -->
        <div v-if="isDisplay" class="page-search">
          <MyForm class="myfrom" @submit="
            (data) => {
              CurrentPage = 1;
              onSubmit(data);
            }
          " @reset="resetForm" :from="from" />
          <MyForm
            class="myfrom"
            @submit="
              (data) => {
                CurrentPage = 1;
                onSubmit(data);
              }
            "
            @reset="resetForm"
            :from="from"
          />
        </div>
        <!-- 搜索结果 -->
        <div class="page-content">
@@ -34,14 +39,31 @@
              <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" 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
                  class="category-main"
                  v-for="(item, index) in category.list"
                  :key="index"
                >
                  <el-checkbox
                    class="el-checkbox"
                    v-model="item.checked"
                    :title="item.name"
                    @change="categoryChange(item)"
                    style="display: inline-block; vertical-align: middle"
                    >{{ item.name }}</el-checkbox
                  >
                  <span
                    class=""
                    style="display: inline-block; vertical-align: middle"
                    >{{ item.num }}</span
                  >
                </div>
              </li>
            </ul>
@@ -52,25 +74,50 @@
                  <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">
                  <img :src="[annual.isDisplay ? topIcon : bottomIcon]" alt="" />
                  <img
                    :src="[annual.isDisplay ? topIcon : bottomIcon]"
                    alt=""
                  />
                </p>
              </li>
              <li class="left-main" v-if="annual.isDisplay">
                <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>
                <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
                  >
                  <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>
@@ -82,23 +129,42 @@
                  <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">
                  <img :src="[sources.isDisplay ? topIcon : bottomIcon]" alt="" />
                  <img
                    :src="[sources.isDisplay ? topIcon : bottomIcon]"
                    alt=""
                  />
                </p>
              </li>
              <li class="left-main" v-if="sources.isDisplay">
                <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>
                <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
                  >
                  <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>
@@ -108,39 +174,67 @@
              <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">{{ 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>
          </div>
          <div class="content-right" v-loading="loading" element-loading-text="检索结果加载中"
            element-loading-spinner="el-icon-loading" element-loading-background="rgba(0, 0, 0, 0)">
          <div
            class="content-right"
            v-loading="loading"
            element-loading-text="检索结果加载中"
            element-loading-spinner="el-icon-loading"
            element-loading-background="rgba(0, 0, 0, 0)"
          >
            <!-- title部分 -->
            <ul class="right-header">
              <li v-for="(item, index) in associationList" :key="index">
                <p>{{ item.type }} : {{ item.content }}</p>
                <img @click="removeAssociationList(item.content)" :src="errorIcon" alt="" />
                <img
                  @click="removeAssociationList(item.content)"
                  :src="errorIcon"
                  alt=""
                />
              </li>
            </ul>
            <!-- 共xx条 -->
            <ul class="right-number">
              <ul class="number-number">
                共找到<span>{{ this.total }}</span>条结果
                共找到<span>{{ this.total }}</span
                >条结果
              </ul>
              <ul class="number-time">
                发表时间
                <span><img :src="sortBottom" alt="" /></span>
                <span @click="sortChange()"
                  ><img :src="!postedSortInfo ? sortBottom : sortTop" alt=""
                /></span>
              </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>
@@ -163,15 +257,25 @@
              </li>
              <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">
                <span
                  class="keyWord"
                  v-for="(citem, cindex) in item.keyWords"
                  :key="cindex"
                >
                  {{ citem }}
                </span>
              </li>
            </ul>
            <!-- 分页 -->
            <div class="pagination" v-if="total > 6">
              <el-pagination @current-change="handleCurrentChange" class="msg-pagination-container"
                :background="isBackground" layout="prev, pager, next" :total="total" :page-size="6">
              <el-pagination
                @current-change="handleCurrentChange"
                class="msg-pagination-container"
                :background="isBackground"
                layout="prev, pager, next"
                :total="total"
                :page-size="6"
              >
              </el-pagination>
            </div>
          </div>
@@ -315,6 +419,10 @@
          },
        ],
      },
      categoryChecList: [],
      subjectCheckList: [],

      postedSortInfo: true,
      // 年度
      annual: {
        title: "年度",
@@ -445,6 +553,14 @@
      total: 0,
      paginationPage: 1,
      loading: false,
      labelList: {
        abstract: "摘要",
        author: "作者",
        keyword: "关键词",
        source: "来源",
        title: "标题",
        year: "年份",
      },
    };
  },
  mounted() {
@@ -452,7 +568,45 @@
  },

  methods: {
    async onSubmit(val) { },
    categoryChange(val) {
      console.log(val, "val");
      if (val.checked) {
        this.categoryChecList.push(val.value);
      } else {
        const index = this.categoryChecList.findIndex(
          (item) => item === val.value
        );
        this.categoryChecList.splice(index, 1);
      }
      this.getItemList();
    },

    subjectChange(val) {
      console.log(val, "val");
      if (val.checked) {
        this.subjectCheckList.push(val.value);
      } else {
        const index = this.subjectCheckList.findIndex(
          (item) => item === val.value
        );
        this.subjectCheckList.splice(index, 1);
      }
      this.getItemList();
    },

    async onSubmit(val) {
      for (let key in val) {
        if (val[key] != "") {
          this.associationList.push({
            type: this.labelList[key],
            content: val[key],
            value: key,
          });
        }
      }
      console.log(this.associationList, "this.associationList");
      this.getItemList();
    },
    //重置搜索结果
    resetForm() {
      // this.onSearch("");
@@ -489,14 +643,15 @@
          this.getSelectContent(this.subjectAffiliationRefCode),
          this.getSelectContent(this.resourceTypeRefCode),
        ]);
        this.subject.list = subjectListResult.option
        console.log(subjectListResult.option);
        this.subject.list = subjectListResult.option;
        this.category.list = resourceListResult.option;
        if (this.category.list && this.category.list.length) {
          this.category.list.forEach((item) => {
            this.resourceTypeValueList.push(item.value)
            this.resourceTypeValueList.push(item.value);
          });
        }
        this.getItemList()
        this.getItemList();
      } catch (error) {
        console.error("获取下拉框数据失败:", error);
      }
@@ -531,13 +686,13 @@
    handleSearch(isText) {
      this.associationList = []
      if (isText.text != "") {
        this.inputValue = isText.text
        this.inputType = isText.type
        this.inputValue = isText.text;
        this.inputType = isText.type;
        this.associationList.push({
          type: isText.label,
          content: isText.text,
        });
        this.getItemList()
        this.getItemList();
      }
    },

@@ -571,11 +726,17 @@
          queryType: "*",
          paging: {
            start: (this.paginationPage - 1) * 6,
            size: 6
            size: 6,
          },
          sort: {
            year: this.postedSortInfo ? "Desc" : "Asc",
          },
          fields: {
            cmsType: ["cmsItem"],
            "resourceType*": this.resourceTypeValueList,
            "resourceType*":
              this.categoryChecList.length > 0
                ? this.categoryChecList
                : this.resourceTypeValueList,
            source: [],
            year: [],
            abstract: [],
@@ -585,6 +746,7 @@
            AIReading: [],
            file: [],
            IssueNumber: [],
            "subjectAffiliation*": this.subjectCheckList,
            ...searchData,
          },
        })
@@ -592,8 +754,8 @@
          console.log(res, "全部内容");

          res.datas.forEach((item) => {
            item.year = moment(item.year).format("YYYY-MM-DD")
            if (typeof item.keyWords === 'string') {
            item.year = moment(item.year).format("YYYY-MM-DD");
            if (typeof item.keyWords === "string") {
              item.keyWords = item.keyWords.split(";;");
            } else {
              // 设置一个默认值或者进行其他错误处理
@@ -606,7 +768,7 @@
          this.resultList = res.datas
          this.total = res.total;
          this.loading = false;
        })
        });
    },
    // 处理页码变化
    handleCurrentChange(newPage) {
@@ -623,7 +785,10 @@
        }
      });
    },

    sortChange() {
      this.postedSortInfo = !this.postedSortInfo;
      this.getItemList();
    },
  },
};
</script>
@@ -874,12 +1039,15 @@
    border-color: #d1d1d1;
  }

  ::v-deep .el-checkbox .el-checkbox__input.is-checked+.el-checkbox__label {
  ::v-deep .el-checkbox .el-checkbox__input.is-checked + .el-checkbox__label {
    color: #2c2c2c;
  }

  ::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;
  }
@@ -1004,7 +1172,6 @@
          background-color: #87a8b9;
          color: #fff;
          margin-right: 10px;

        }

        span:nth-child(2) {
@@ -1013,7 +1180,6 @@
          font-weight: 350;
          padding-right: 10px;
          color: #333;

        }

        span:nth-child(3) {
@@ -1034,8 +1200,6 @@
          color: #333;
          border-left: 1px solid #2c2c2c;
        }



        margin-bottom: 10px;
      }
@@ -1132,7 +1296,9 @@
  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;

 src/views/chronology/floatingWindow.vue

@@ -94,9 +94,7 @@
  data() {
    return {};
  },
  mounted() {
    console.log(this.info);
  },

};
</script>

@@ -136,6 +134,7 @@
.contentBox {
  margin-top: 10px;
  line-height: 18px;
  white-space: pre-line;
}
.imageBox {
  min-height: 300px;

 src/views/chronology/index.vue

@@ -49,20 +49,17 @@
                  class="gradchild"
                  v-for="(citem, cindex) in item.list"
                  :style="{ background: citem.color }"
                  @mouseover="showDetail(index, cindex, 1)"
                  @mouseleave="closeDetail(index, cindex, 0)"
                  @click.stop="showDetail(index, cindex, 1, $event)"
                  :key="cindex"
                >
                  <div class="detailDialog" v-if="citem.showDetail">
                    <!-- <div class="dialogContent" @click="gotoDetail(citem)"> -->
                    <div
                      class="closeBtn"
                      @click="closeDetail(index, cindex, 0)"
                      @click.stop="closeDetail(index, cindex, 0)"
                    >
                      <i class="el-icon-close"></i>
                    </div>
                    <floatingWindow :info="citem" />
                    <!-- </div> -->
                  </div>
                </div>
              </div>
@@ -121,7 +118,7 @@
  },

  methods: {
    showYearWindow(item) {
    showYearWindow(item, event) {
      console.log(item, "item");
      for (let i = 0; i < this.contentList.length; i++) {
        const item = this.contentList[i];
@@ -163,7 +160,7 @@
          }

          console.log(this.contentList, "this.contentList");
          this.contentList = res.datas.reverse();
          this.contentList = res.datas;
          this.showList = true;
        });
    },
@@ -226,7 +223,8 @@
      }
      this.contentList[index].list[cindex].showDetail = false;
    },
    showDetail(index, cindex, type) {
    showDetail(index, cindex, type, event) {
      console.log(event, "event");
      for (let i = 0; i < this.contentList.length; i++) {
        const item = this.contentList[i];
        if (item && item.length > 0) {
@@ -237,11 +235,11 @@
          }
        }
      }

      if (this.contentList[index].list[cindex].type) {
        this.contentList[index].list[cindex].showDetail = true;
      } else {
        this.contentList[index].list[cindex].showDetail = false;
      }
      console.log(this.contentList[index].list, "this.contentList[index].list[cindex]");
    },
  },
};
@@ -303,7 +301,7 @@
    // }
    /* 对于WebKit浏览器和Blink引擎（如Chrome, Opera） */
    ::-webkit-scrollbar {
      width: 16px; /* 滚动条的宽度 */
      width: 4px; /* 滚动条的宽度 */
      height: 16px; /* 滚动条的高度 */
    }

@@ -313,7 +311,8 @@

    ::-webkit-scrollbar-thumb {
      background: #b9a587; /* 滚动条滑块的颜色 */
      border-radius: 16px; /* 滚动条滑块的圆角 */
      border-radius: 2px; /* 滚动条滑块的圆角 */
      width: 4px;
    }

    ::-webkit-scrollbar-thumb:hover {
@@ -365,6 +364,14 @@
  position: relative;
}

.gradchild:hover {
  width: 25px;
  height: 25px;
  margin-top: 2px;
  margin-right: 2px;
  cursor: pointer;
  position: relative;
}
.item-circle {
  width: 100%;
  height: 20px;
@@ -408,6 +415,8 @@
.detailDialog {
  position: absolute;
  top: -700%;
  transform: translateY(20%);
  transform: translateX(-50%);
  width: 524px;
  z-index: 9999;
  cursor: pointer;

 src/views/chronology/yearWindow.vue

@@ -49,6 +49,7 @@
  padding: 15px;
  z-index: 20;
  box-sizing: border-box;
  background-color: #FDF8F0;
}
.content {
  display: flex;
@@ -56,16 +57,15 @@
}
.leftTxt {
  width: 350px;
  height: 100%;
  background-color: #fff;
  max-height: 260px;
  overflow: hidden;
  white-space: normal;
  overflow-x: auto;
  overflow-y: auto;
  
}
.rightimg {
  width: 350px;
  height: 100%;
  background-color: #fff;
}
.title {
  font-size: 24px;

 src/views/directory/index.vue

@@ -73,7 +73,11 @@
                >
                  <img
                    class="autoImg"
                    src="@/assets/images/directory/touxiang.png"
                    :src="
                      currentNodeInfo.icon
                        ? currentNodeInfo.icon
                        : '@/assets/images/directory/touxiang.png'
                    "
                    alt=""
                  />
                </div>
@@ -95,9 +99,14 @@
                        currentNodeInfo.gender == "male" ? "男" : "女" || "-"
                      }}
                    </span>
                    <span> {{  currentNodeInfo.academicName || "-"}} </span>
                    <span> {{              legendList.find((item) => item.value == currentNodeInfo.unit)?.name ||
                "-" }} </span>
                    <span> {{ currentNodeInfo.academicName || "-" }} </span>
                    <span>
                      {{
                        legendList.find(
                          (item) => item.value == currentNodeInfo.unit
                        )?.name || "-"
                      }}
                    </span>
                  </div>
                </div>
              </div>
@@ -111,19 +120,24 @@
                  margin-top: 10px;
                "
              >
                <p style="margin-bottom: 15px">学习时间：{{  currentNodeInfo.studyTime || "-" }}</p>
                <p style="margin-bottom: 15px">
                  现工作单位： {{currentNodeInfo.currentEmployer_secondary || '-' }}
                  学习时间：{{ currentNodeInfo.studyTime || "-" }}
                </p>
                <p style="margin-bottom: 15px">职务：{{ currentNodeInfo.jobTitle || "-" }}</p>
                <p style="margin-bottom: 15px">职称：{{ currentNodeInfo.professionalTitle || "-" }}</p>
              </div>
              <div style="text-align: left; line-height: 22px">
                <p>
                  大弦嘈嘈如急雨，小弦切切如私语。嘈嘈切切错杂弹，大珠小珠落玉盘。间关莺语花底滑，幽咽泉流冰下难。冰泉冷涩弦凝绝，凝绝不通声暂歇。别有幽愁暗恨生，此时无声胜有声。银瓶乍破水浆迸，铁骑突出刀枪鸣。曲终收拨当心画，四弦一声如裂帛。东船西舫悄无言，唯见江心秋月白。
                <p style="margin-bottom: 15px">
                  现工作单位：
                  {{ currentNodeInfo.currentEmployer_secondary || "-" }}
                </p>
                <p style="margin-bottom: 15px">
                  职务：{{ currentNodeInfo.jobTitle || "-" }}
                </p>
                <p style="margin-bottom: 15px">
                  职称：{{ currentNodeInfo.professionalTitle || "-" }}
                </p>
              </div>
              <div
              <div style="text-align: left; line-height: 22px;max-height:200px;overflow-y: auto; padding: 10px;" >
                <div v-html="currentNodeInfo.studentProfile"></div>
              </div>
              <!-- <div
                style="
                  display: flex;
                  justify-content: space-between;
@@ -138,15 +152,20 @@
                <div>
                  <img src="@/assets/images/directory/test.png" alt="" />
                </div>
              </div>
              </div> -->
            </div>
          </div>
        </transition>
      </div>
      <!-- 列表显示 -->
      <div class="page-main" v-if="activeTabs == 'list'">
        <div v-loading="loading" style="min-height: 550px;" element-loading-background="rgba(0, 0, 0, 0)" element-loading-text="学生列表加载中"
        element-loading-spinner="el-icon-loading">
        <div
          v-loading="loading"
          style="min-height: 550px"
          element-loading-background="rgba(0, 0, 0, 0)"
          element-loading-text="学生列表加载中"
          element-loading-spinner="el-icon-loading"
        >
          <div v-for="(item, index) in universityList" :key="index">
            <div
              class="table-title"
@@ -312,7 +331,11 @@
                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="">
      <img class="autoImg"  src="${
        data.icon
          ? data.icon
          : require("@/assets/images/directory/touxiang.png")
      }" alt="">
                  </div>
                <div style="font-size: 16px; font-weight: bold; margin-bottom: 5px;">${
                  data.name || "-"
@@ -356,9 +379,7 @@
                <div style="font-size: 16px; font-weight: bold; margin-bottom: 5px;">${
                  data.name
                }</div>
                <div>  <span> ${data.academicDegreeValue} </span> <span> ${
                data.academicDegreeName
              } </span></div>
                <div>   <span> ${data.academicDegreeName || "-"} </span></div>
   
              </div>
            `;
@@ -537,15 +558,13 @@
            this.universityList = arrList;
            // this.chartData.children = arrList;
            const temp_chartData = {
              name: "",
              name: "王永炎",
              children: arrList,
            };
            this.chartData = temp_chartData;

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


          }
        })
        .catch((error) => {