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

杨磊

10 小时以前 de962e6331d7ebf3c660a3b0d7fa1dbdc81c645f

 src/views/directory/index.vue

@@ -7,33 +7,18 @@
    </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>
      </div>
      <!-- 图表显示 -->
      <div
        class="charts-main"
        v-show="activeTabs == 'chart'"
        v-loading="loading"
        element-loading-text="图表加载中"
        element-loading-spinner="el-icon-loading"
        element-loading-background="rgba(0, 0, 0, 0)"
      >
      <div class="charts-main" v-show="activeTabs == 'chart'" v-loading="loading" element-loading-text="图表加载中"
        element-loading-spinner="el-icon-loading" element-loading-background="rgba(0, 0, 0, 0)">
        <div class="radial-tree-container" v-show="!loading">
          <div ref="chart" style="width: 100%; height: 70vh"></div>
        </div>
@@ -48,49 +33,36 @@
        </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="
                      currentNodeInfo.icon
                        ? currentNodeInfo.icon
                        : '@/assets/images/directory/touxiang.png'
                    "
                    alt=""
                  />
                  ">
                  <img class="autoImg" :src="currentNodeInfo.icon
                    ? currentNodeInfo.icon
                    : '@/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">
@@ -111,15 +83,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">
                  学习时间：{{ currentNodeInfo.studyTime || "-" }}
                </p>
@@ -134,15 +104,13 @@
                  职称：{{ currentNodeInfo.professionalTitle || "-" }}
                </p>
              </div>
              <div
                style="
              <div style="
                  text-align: left;
                  line-height: 22px;
                  max-height: 200px;
                  overflow-y: auto;
                  padding: 10px;
                "
              >
                ">
                <div v-html="currentNodeInfo.studentProfile"></div>
              </div>
              <!-- <div
@@ -167,74 +135,65 @@
      </div>
      <!-- 列表显示 -->
      <div class="page-main" v-show="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"
              v-if="item.studentList && item.studentList.length > 0">
            <div class="table-title" 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"
                @click="item.isShow = !item.isShow">
              <div class="table-title-right" @click="item.isShow = !item.isShow">
                <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"
            >
              <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-if="item.agreelist && item.agreelist.length > 0 && item.isShow">
              <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>
@@ -259,8 +218,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,
@@ -313,7 +272,7 @@
  methods: {
    changeTab(key) {
      this.activeTabs = key;
      console.log(this.activeTabs, "activeTabs");
      // console.log(this.activeTabs, "activeTabs");
      if (key == "chart") {
        this.initChart();
      }
@@ -328,7 +287,7 @@
          formatter: (params) => {
            const data = params.data;
            this.currentNodeInfo = data;
            console.log(data, "data");
            // console.log(data, "data");
            if (data.cmsItemType == "student") {
              return `
              <div style="
@@ -340,34 +299,26 @@
                text-align: center;
              ">
                <div style="width: 80px;height: 80px;position: relative; margin: 0 auto; margin-bottom: 10px;background: #D8D8D8;">
      <img class="autoImg"  src="${
        data.icon
          ? data.icon
          : 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 || "-"
                <div style="font-size: 16px; font-weight: bold; margin-bottom: 5px;">${data.name || "-"
                }</div>
                <div> <span> ${
                  data.gender == "male" ? "男" : "女" || "-"
                } </span> <span> ${data.academicName || "-"} </span> <span> ${
                this.legendList.find((item) => item.value == data.unit)?.name ||
                <div> <span> ${data.gender == "male" ? "男" : "女" || "-"
                } </span> <span> ${data.academicName || "-"} </span> <span> ${this.legendList.find((item) => item.value == data.unit)?.name ||
                "-"
              }  </span></div>
                }  </span></div>
                <div style="font-size: 16px; font-weight: bold; margin-bottom: 5px;text-align: left;margin-top: 10px;overflow: hidden;">
                  <p style="margin-bottom: 5px;">学习时间：${
                    data.studyTime || "-"
                  }</p>
                  <p style="margin-bottom: 5px; white-space: pre-wrap" >现工作单位：${
                    data.currentEmployer_secondary || "-"
                  }</p>
                  <p style="margin-bottom: 5px;">职务：${
                    data.jobTitle || "-"
                  }</p>
                  <p style="margin-bottom: 5px;">职称：${
                    data.professionalTitle || "-"
                  }</p>
                  <p style="margin-bottom: 5px;">学习时间：${data.studyTime || "-"
                }</p>
                  <p style="margin-bottom: 5px; white-space: pre-wrap" >现工作单位：${data.currentEmployer_secondary || "-"
                }</p>
                  <p style="margin-bottom: 5px;">职务：${data.jobTitle || "-"
                }</p>
                  <p style="margin-bottom: 5px;">职称：${data.professionalTitle || "-"
                }</p>
                  </div>

              </div>
@@ -385,8 +336,7 @@
                <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 style="font-size: 16px; font-weight: bold; margin-bottom: 5px;">${data.name
                }</div>
                <div>   <span> ${data.academicDegreeName || "-"} </span></div>
   
@@ -422,7 +372,7 @@
              position: "top", //标签的位置。
              verticalAlign: "middle", //文字垂直对齐方式，默认自动。
              fontSize: 12, //文字的字体大小
              color: "#bc1c00",
              // color: "#bc1c00",
            },
            // leaves: {
            //   symbol: "emptyCircle",
@@ -432,7 +382,7 @@
            // },
            expandAndCollapse: false,
            lineStyle: {
              color: "#bc1c00",
              // color: "#bc1c00",
              width: 1,
            },
            itemStyle: {
@@ -450,7 +400,7 @@

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

            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) => {
@@ -594,7 +583,6 @@
  overflow: hidden;
  display: flex;
  flex-direction: column;
  font-family: Source Han Sans;
}

.page-header {
@@ -670,6 +658,7 @@
  overflow: hidden;
  margin-bottom: 100px;
  padding-top: 50px;

  table {
    width: 100%;
    border-collapse: collapse;
@@ -680,7 +669,9 @@
    background-color: #fff;
    background-clip: padding-box;
    border-bottom: 2px solid transparent;
    line-height: 20px;
  }


  th {
    font-family: Source Han Serif CN;
@@ -688,6 +679,7 @@
    font-weight: bold;
    padding: 4px 41px;
    text-wrap: nowrap;
    line-height: 30px;
  }

  td {
@@ -697,10 +689,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 {
@@ -721,9 +715,11 @@
  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;
@@ -731,23 +727,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;
  }

@@ -756,8 +740,33 @@
  }

  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;
  }
}

@@ -796,6 +805,7 @@
.tagText {
  margin-left: 30px;
}

::v-deep .el-loading-spinner {
  color: #937950 !important;
}