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

杨磊

5 天以前 35a0ab2182b812e57af749e438fc505bafd29133

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

 src/views/directory/index.vue

@@ -1,24 +1,17 @@
<template>
  <div class="page">
    <div class="page-header">
      <p>王永炎院士学生目录</p>
      <p>
        <span>王永炎院士学生目录</span>
      </p>
    </div>
    <div class="page-main-father">
      <div class="page-main-title">
        <p
          @click="changeTab('chart')"
          :class="[activeTabs == 'chart' ? 'active-tab' : '']"
        >
          <img
            :src="[activeTabs == 'chart' ? chartIcon : noChartIcon]"
            alt=""
          />
        <p @click="changeTab('chart')" :class="[activeTabs == 'chart' ? 'active-tab' : '']">
          <img :src="[activeTabs == 'chart' ? chartIcon : noChartIcon]" alt="" />
          <span>图表显示</span>
        </p>
        <p
          @click="changeTab('list')"
          :class="[activeTabs == 'list' ? 'active-tab' : '']"
        >
        <p @click="changeTab('list')" :class="[activeTabs == 'list' ? 'active-tab' : '']">
          <img :src="[activeTabs == 'list' ? listIcon : noListIcon]" alt="" />
          <span>列表显示</span>
        </p>
@@ -39,45 +32,33 @@
        </div>
        <transition name="el-fade-in-linear">
          <div class="tooltipBox" v-show="tooltipShow">
            <div
              style="
            <div style="
                padding: 10px;
                background: #fdf8f0;
                border-radius: 5px;
                width: 100%;
                max-height: 500px;
                text-align: center;
              "
            >
              ">
              <div class="closeBtn" @click="tooltipShow = false">
                <i class="el-icon-close"></i>
              </div>
              <div style="display: flex">
                <div
                  style="
                <div style="
                    width: 80px;
                    height: 80px;
                    position: relative;
                    margin-bottom: 10px;
                    background: #d8d8d8;
                  "
                >
                  <img
                    class="autoImg"
                    src="@/assets/images/directory/touxiang.png"
                    alt=""
                  />
                  ">
                  <img class="autoImg" src="@/assets/images/directory/touxiang.png" alt="" />
                </div>
                <div
                  style="padding-top: 20px; text-align: left; margin-left: 20px"
                >
                  <div
                    style="
                <div style="padding-top: 20px; text-align: left; margin-left: 20px">
                  <div style="
                      font-size: 16px;
                      font-weight: bold;
                      margin-bottom: 5px;
                    "
                  >
                    ">
                    {{ currentNodeInfo.name }}
                  </div>
                  <div style="margin-top: 20px">
@@ -87,15 +68,13 @@
                </div>
              </div>

              <div
                style="
              <div style="
                  font-size: 16px;
                  font-weight: bold;
                  margin-bottom: 5px;
                  text-align: left;
                  margin-top: 10px;
                "
              >
                ">
                <p style="margin-bottom: 15px">学习时间：1985.09 -1988.07</p>
                <p style="margin-bottom: 15px">
                  现工作单位：北京中医药大学东方医院
@@ -108,13 +87,11 @@
                  大弦嘈嘈如急雨，小弦切切如私语。嘈嘈切切错杂弹，大珠小珠落玉盘。间关莺语花底滑，幽咽泉流冰下难。冰泉冷涩弦凝绝，凝绝不通声暂歇。别有幽愁暗恨生，此时无声胜有声。银瓶乍破水浆迸，铁骑突出刀枪鸣。曲终收拨当心画，四弦一声如裂帛。东船西舫悄无言，唯见江心秋月白。
                </p>
              </div>
              <div
                style="
              <div style="
                  display: flex;
                  justify-content: space-between;
                  margin-top: 20px;
                "
              >
                ">
                <div style="text-align: left; width: 48%; line-height: 22px">
                  <p>
                    观夫明堂之宏壮也，则突兀瞳曨，乍明乍蒙，若大古元气之结空。巃嵸颓沓，若嵬若嶪，似天阃地门之开阖。尔乃划岝峉以岳立，郁穹崇而鸿纷。冠百王而垂勋，烛万象而腾文。窙惚恍以洞启，呼嵌岩而傍分。又比乎昆山之天柱，矗九霄而垂云。
@@ -130,47 +107,44 @@
      </div>
      <!-- 列表显示 -->
      <div class="page-main" v-if="activeTabs == 'list'">
        <div v-for="(item, index) in universityList" :key="index">
          <div
            class="table-title"
            v-if="item.studentList && item.studentList.length > 0"
          >
            <div class="table-title-left">
              <p class="table-title-name">{{ item.name }}</p>
              <p class="table-title-degree">{{ item.degree }}</p>
              <p class="table-title-number">{{ item.studentList.length }}人</p>
        <div v-loading="loading">
          <div v-for="(item, index) in universityList" :key="index" >
            <div class="table-title" v-if="item.studentList && item.studentList.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" @click="item.isShow = !item.isShow">
                <img :src="[item.isShow ? topIcon : bottomIcon]" alt="" />
              </div>
            </div>
            <div class="table-title-right" @click="item.isShow = !item.isShow">
              <img :src="[item.isShow ? topIcon : bottomIcon]" alt="" />
            </div>
          </div>
          <table
            cellpadding="100"
            v-if="
            <table cellpadding="100" v-if="
              item.studentList && item.studentList.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.studentName }}
              </td>
              <td>
                {{ citem.gender }}
              </td>
              <td>{{ citem.studyTime }}</td>
              <td>{{ citem.workUnit }}</td>
              <td>{{ citem.position }}</td>
              <td>{{ citem.title }}</td>
            </tr>
          </table>
            " style="vertical-align: middle;">
              <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>
        </div>
      </div>
    </div>
@@ -182,10 +156,16 @@
import axios from "axios";
import debounce from "lodash/debounce";
import treeData from "./treeData.json";
import MG from '@/assets/js/middleGround/WebMiddleGroundApi.js'
import MG from "@/assets/js/middleGround/WebMiddleGroundApi.js";
import { forEach } from "lodash";
import { method } from "lodash";
export default {
  data() {
    return {
      unitRefCode: "unit",
      academicDegreeRefCode: "academicDegree",
      unitList: [],
      academicDegreeList: [],
      chartIcon: require("@/assets/images/directory/chartIcon.png"),
      noChartIcon: require("@/assets/images/directory/noChartIcon.png"),
      listIcon: require("@/assets/images/directory/listIcon.png"),
@@ -193,176 +173,7 @@
      topIcon: require("@/assets/images/directory/topIcon.png"),
      bottomIcon: require("@/assets/images/directory/bottomIcon.png"),
      activeTabs: "chart",

      universityList: [
        {
          name: "北京中医药大学",
          degree: "硕士",
          isShow: "true",
          studentList: [
            {
              studentName: "王玉来",
              gender: "男",
              studyTime: "1985.09-1988.07",
              workUnit: "北京中医药大学东方学院",
              position: "原院长",
              title: "主任医师、教授",
            },
            {
              studentName: "王玉来",
              gender: "男",
              studyTime: "1985.09-1988.07",
              workUnit: "北京中医药大学东方学院",
              position: "原院长",
              title: "主任医师、教授",
            },
            {
              studentName: "王玉来",
              gender: "男",
              studyTime: "1985.09-1988.07",
              workUnit: "北京中医药大学东方学院",
              position: "原院长",
              title: "主任医师、教授",
            },
          ],
        },
        {
          name: "北京中医药大学",
          degree: "硕士",
          isShow: "true",
          studentList: [
            {
              studentName: "王玉来",
              gender: "男",
              studyTime: "1985.09-1988.07",
              workUnit: "北京中医药大学东方学院",
              position: "原院长",
              title: "主任医师、教授",
            },
            {
              studentName: "王玉来",
              gender: "男",
              studyTime: "1985.09-1988.07",
              workUnit: "北京中医药大学东方学院",
              position: "原院长",
              title: "主任医师、教授",
            },
            {
              studentName: "王玉来",
              gender: "男",
              studyTime: "1985.09-1988.07",
              workUnit: "北京中医药大学东方学院",
              position: "原院长",
              title: "主任医师、教授",
            },
          ],
        },
        {
          name: "北京中医药大学",
          degree: "硕士",
          isShow: "true",
          studentList: [
            {
              studentName: "王玉来",
              gender: "男",
              studyTime: "1985.09-1988.07",
              workUnit: "北京中医药大学东方学院",
              position: "原院长",
              title: "主任医师、教授",
            },
            {
              studentName: "王玉来",
              gender: "男",
              studyTime: "1985.09-1988.07",
              workUnit: "北京中医药大学东方学院",
              position: "原院长",
              title: "主任医师、教授",
            },
            {
              studentName: "王玉来",
              gender: "男",
              studyTime: "1985.09-1988.07",
              workUnit: "北京中医药大学东方学院",
              position: "原院长",
              title: "主任医师、教授",
            },
          ],
        },
        {
          name: "北京中医药大学",
          degree: "硕士",
          isShow: "true",
          studentList: [],
        },
        {
          name: "北京中医药大学",
          degree: "硕士",
          isShow: "true",
          studentList: [
            {
              studentName: "王玉来",
              gender: "男",
              studyTime: "1985.09-1988.07",
              workUnit: "北京中医药大学东方学院",
              position: "原院长",
              title: "主任医师、教授",
            },
            {
              studentName: "王玉来",
              gender: "男",
              studyTime: "1985.09-1988.07",
              workUnit: "北京中医药大学东方学院",
              position: "原院长",
              title: "主任医师、教授",
            },
            {
              studentName: "王玉来",
              gender: "男",
              studyTime: "1985.09-1988.07",
              workUnit: "北京中医药大学东方学院",
              position: "原院长",
              title: "主任医师、教授",
            },
          ],
        },
        {
          name: "北京中医药大学",
          degree: "硕士",
          isShow: "true",
          studentList: [],
        },
        {
          name: "北京中医药大学",
          degree: "硕士",
          isShow: "true",
          studentList: [
            {
              studentName: "王玉来",
              gender: "男",
              studyTime: "1985.09-1988.07",
              workUnit: "北京中医药大学东方学院",
              position: "原院长",
              title: "主任医师、教授",
            },
            {
              studentName: "王玉来",
              gender: "男",
              studyTime: "1985.09-1988.07",
              workUnit: "北京中医药大学东方学院",
              position: "原院长",
              title: "主任医师、教授",
            },
            {
              studentName: "王玉来",
              gender: "男",
              studyTime: "1985.09-1988.07",
              workUnit: "北京中医药大学东方学院",
              position: "原院长",
              title: "主任医师、教授",
            },
          ],
        },
      ],
      universityList: [],
      chart: null,
      chartData: treeData,
      currentNodeInfo: {},
@@ -389,12 +200,14 @@
          name: "拜师弟子",
        },
      ],
      loading: false,
    };
  },

  mounted() {
    this.initChart();
    this.getStudentList()
    this.getSelectData();
    this.getStudentList();
    window.addEventListener("resize", this.handleResize);
  },
  beforeDestroy() {
@@ -436,9 +249,8 @@
                <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 style="font-size: 16px; font-weight: bold; margin-bottom: 5px;">${data.name
              }</div>
                <div> <span> 男 </span> <span> 硕士 </span> <span> 北京中医药大学 </span></div>
                <div style="font-size: 16px; font-weight: bold; margin-bottom: 5px;text-align: left;margin-top: 10px;">
                  <p style="margin-bottom: 5px;">学习时间：1985.09 -1988.07</p>
@@ -515,55 +327,103 @@
        this.chart.resize();
      }
    },
    // 获取列表显示
    getStudentList() {
      this.loading = true;
      MG.resource.getItem({
        path: "WYY_student",
        fields: {
          // 性别
          gender:"",
          //学习时间
          studyTime: [],
          // 单位
          unit:[],
          // 现工作单位（到二级单位全称）
          currentEmployer_secondary:"",
          //职务
          jobTitle:"",
          //学位
          academicDegree:"",
          // 学生简介
          studentProfile:"",
        },
        paging: {
          // start: (this.currentPage - 1) * 10,
          size: 99999,
        },
        // coverSize: {
        //   height: 70
        // }
      }).then((res) => {
        console.log(res, "res");
        if (res.datas && res.datas.length) {
          this.honorList = res.datas.map(item => {
            // 将 year 字段格式化为 "2017年9月" 这种格式
            const date = new Date(item.year);
            const year = date.getFullYear();
            const month = date.getMonth() + 1; // 月份从0开始，需要加1
            return {
              ...item,
              year: `${year}年${month}月`
            };
          });
          this.total = res.total;
          this.loading = false;
        }
    //获取下拉选择框的内容
    async getSelectData() {
      try {
        // 同时发起两个异步请求，并等待它们的结果
        const [unitListResult, academicDegreeListResult] = await Promise.all([
          this.getSelectContent(this.unitRefCode),
          this.getSelectContent(this.academicDegreeRefCode)
        ]);
        this.unitList = unitListResult.option.map(item => {
          return {
            ...item,
            studentList: [] // 设置自定义字段的默认值
          };
        });
        this.academicDegreeList = academicDegreeListResult.option;
        console.log(this.unitList, "unitList");
        console.log(this.academicDegreeList, "academicDegreeList");
      } catch (error) {
        console.error("获取下拉框数据失败:", error);
      }
    },

    //获取选择内容
    getSelectContent(refCode) {
      let requestData = { refCodes: [refCode] };
      return MG.store.getProductTypeField(requestData).then(res => {
        console.log(res, '下拉框数据');
        const selestList = JSON.parse(res[0].config)
        return selestList
      }).catch((error) => {
        console.error('获取荣誉失败:', error);
        console.error("获取荣誉失败:", error);
        return null
      });
    },

    // 获取列表显示
    getStudentList() {
      this.loading = true;
      MG.resource
        .getItem({
          path: "WYY_student",
          fields: {
            // 性别
            gender: "",
            //学习时间
            studyTime: [],
            // 单位
            unit: [],
            // 现工作单位（到二级单位全称）
            currentEmployer_secondary: "",
            //职务
            jobTitle: "",
            professionalTitle:"",
            //学位
            academicDegree: "",
            // 学生简介
            studentProfile: "",
          },
          paging: {
            size: 99999,
          },
        })
        .then((res) => {
          let arrList = []
          this.unitList.forEach(item => {
            this.academicDegreeList.forEach(citem => {
              arrList.push({
                unitName: item.name,
                unitValue: item.value,
                academicDegreeName: citem.name,
                academicDegreeValue: citem.value,
                isShow: false,
                studentList:[]
              })
            })
          })
          console.log(res, "res");
          if (res.datas && res.datas.length) {
            res.datas.forEach(item => {
              arrList.forEach(citem => {
                if (item.unit == citem.unitValue && item.academicDegree == citem.academicDegreeValue){
                  citem.studentList.push(item);
                }
              })
            });
           arrList = arrList.filter(item => 
               item.studentList.length
            )
            console.log(arrList, "arrList");
            this.universityList = arrList;
            this.loading = false;
          }
        })
        .catch((error) => {
          console.error("获取荣誉失败:", error);
        });
    },
  },
};
</script>
@@ -571,35 +431,44 @@
<style lang="less" scoped>
.page {
  width: 100%;
  height: 100vh;
  height: 100%;
  box-sizing: border-box;
  background-color: #e9e1d4;
  position: relative;
  overflow: hidden;
  display: flex;
  flex-direction: column;
}

.page-header {
  height: 9.4vh;
  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: 2%;
  padding-bottom: 2%;
}

.page-main-title {
@@ -607,7 +476,7 @@
  align-items: center;
  justify-content: center;
  cursor: pointer;
  margin-bottom: 75px;
  margin-bottom: 25px;
  color: #9e9e9e;
  margin-top: 1%;

@@ -638,19 +507,22 @@

.page-main {
  width: 77.3%;
  min-height: 600px;
  margin: 0 auto;
  overflow: hidden;
  margin-bottom: 100px;

  padding-top: 50px;
  table {
    width: 100%;
    border-collapse: collapse;
  }

  tr {
    width: 100%;
    background-color: #fff;
    background-clip: padding-box;
    border-bottom: 2px solid transparent;

  }

  th {
@@ -658,6 +530,7 @@
    font-size: 14px;
    font-weight: bold;
    padding: 4px 41px;
    text-wrap: nowrap;
  }

  td {
@@ -665,6 +538,12 @@
    font-size: 14px;
    padding: 6px 41px;
    text-align: center;
    display: table-cell;
    vertical-align: middle;
  }

  td:nth-child(1) {
    text-wrap: nowrap;
  }

  tr:last-child td {
@@ -722,6 +601,7 @@
    height: auto;
  }
}

.tooltipBox {
  max-height: 500px;
  max-width: 500px;
@@ -730,25 +610,30 @@
  right: 40px;
  top: 12vh;
}

.closeBtn {
  position: absolute;
  top: 10px;
  right: 0;
  cursor: pointer;
}

.legend {
  position: absolute;
  bottom: 300px;
  left: 100px;
}

.tagItem {
  display: flex;
  margin-top: 20px;
}

.tagColor {
  width: 20px;
  height: 20px;
}

.tagText {
  margin-left: 30px;
}

 src/views/honors/index.vue

@@ -11,26 +11,26 @@
          <!-- 左边标题 -->
          <div class="honors-main-title">荣<br />誉<br />奖<br />项</div>
          <!-- 右边内容 -->
          <div class="honors-text">
            <ul v-loading="loading">
              <li v-for="(item, index) in honorList" :key="index">
                <img class="main-img" :src="item.icon ? item.icon : defaultImg" alt="" />
                <div>
                  <p class="main-time">{{ item.year }}</p>
                  <p class="main-text" :title="item.txt">{{ item.honor }}</p>
                </div>
              </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>
              <!-- “山”图片 -->
              <img class="honor-Bg" src="../../assets/images/honors/honor-Bg.png" alt="" />
          <div class="honors-text" v-loading="loading">
            <div style="min-height: 646px;">
              <ul>
                <li v-for="(item, index) in honorList" :key="index">
                  <img class="main-img" :src="item.icon ? item.icon : defaultImg" alt="" />
                  <div>
                    <p class="main-time">{{ item.year }}</p>
                    <p class="main-text" :title="item.txt">{{ item.honor }}</p>
                  </div>
                </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>
            <!-- “山”图片 -->
            <img class="honor-Bg" src="../../assets/images/honors/honor-Bg.png" alt="" />
          </div>
        </div>
      </div>
@@ -147,7 +147,6 @@

.honors-main {
  width: 77.3%;
  height: 100%;
  margin: 0 auto;

}
@@ -175,6 +174,7 @@
  padding: 0 0 0 5.8%;
  display: flex;
  flex-direction: column;
  min-height: 646px;

  ul {
    flex: 1;
@@ -220,12 +220,15 @@
    width: 70.5%;
    height: auto;
    margin-left: -33%;
    margin-bottom: -1%;

  }

  .pagination {
    // position: absolute;
    // bottom: 0;
    // right: 0;
    height: 10%;
    padding-right: 47px;
    padding-top: 30px;
    text-align: end;