bug修改

杨磊

9 小时以前 c6189f35d8744bf9c90bc15fd132ceb2a51d902c

 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-if="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,45 +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="@/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">
@@ -95,35 +71,49 @@
                        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>

              <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>
                ">
                <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,20 +128,17 @@
                <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 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-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.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>
@@ -159,20 +146,13 @@
                  {{ 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"
            >
            <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>
@@ -200,7 +180,7 @@
                <td>
                  {{
                    citem.professionalTitle === undefined ||
                    citem.professionalTitle === ""
                      citem.professionalTitle === ""
                      ? "-"
                      : citem.professionalTitle
                  }}
@@ -209,6 +189,7 @@
            </table>
          </div>
        </div>
        <!-- <el-empty v-if="!resultList.length"></el-empty> -->
      </div>
    </div>
  </div>
@@ -287,7 +268,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);
@@ -299,7 +283,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="
@@ -311,30 +295,26 @@
                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 || "-"
                <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>
@@ -352,12 +332,9 @@
                <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.academicDegreeValue} </span> <span> ${
                data.academicDegreeName
              } </span></div>
                <div>   <span> ${data.academicDegreeName || "-"} </span></div>
   
              </div>
            `;
@@ -391,7 +368,7 @@
              position: "top", //标签的位置。
              verticalAlign: "middle", //文字垂直对齐方式，默认自动。
              fontSize: 12, //文字的字体大小
              color: "#bc1c00",
              // color: "#bc1c00",
            },
            // leaves: {
            //   symbol: "emptyCircle",
@@ -401,7 +378,7 @@
            // },
            expandAndCollapse: false,
            lineStyle: {
              color: "#bc1c00",
              // color: "#bc1c00",
              width: 1,
            },
            itemStyle: {
@@ -419,7 +396,7 @@

      this.chart.setOption(option);
      this.chart.on("click", (params) => {
        console.log("点击时的回调", params);
        // console.log("点击时的回调", params);
        this.tooltipShow = true;
      });
    },
@@ -443,7 +420,6 @@
          };
        });
        this.academicDegreeList = academicDegreeListResult.option;
        console.log(this.academicDegreeList, "this.academicDegreeList");
      } catch (error) {
        console.error("获取下拉框数据失败:", error);
      }
@@ -455,7 +431,6 @@
      return MG.store
        .getProductTypeField(requestData)
        .then((res) => {
          console.log(res, "下拉框数据");
          const selestList = JSON.parse(res[0].config);
          return selestList;
        })
@@ -494,6 +469,8 @@
        })
        .then((res) => {
          let arrList = [];
          console.log(this.unitList, "unitList");
          console.log(this.academicDegreeList, "this.academicDegreeList");
          this.unitList.forEach((item) => {
            this.academicDegreeList.forEach((citem) => {
              arrList.push({
@@ -514,8 +491,9 @@
              });
            });
          });
          this.loading = false;
          console.log(arrList, "arrList");
          console.log(res, "res");
   
          if (res.datas && res.datas.length) {
            res.datas.forEach((item) => {
              arrList.forEach((citem) => {
@@ -531,20 +509,19 @@
                }
              });
            });
            console.log(arrList, "去除arrList");
            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: "",
              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) => {
@@ -593,6 +570,7 @@
  flex: 1;
  width: 100%;
  height: 100%;
  min-width: 1200px;
  overflow: auto;
  padding-top: 2%;
  padding-bottom: 2%;
@@ -639,6 +617,7 @@
  overflow: hidden;
  margin-bottom: 100px;
  padding-top: 50px;

  table {
    width: 100%;
    border-collapse: collapse;
@@ -765,6 +744,7 @@
.tagText {
  margin-left: 30px;
}

::v-deep .el-loading-spinner {
  color: #937950 !important;
}
@@ -773,4 +753,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>