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

zhongshujie

2025-04-08 96de5562aa8245de24582623951fed016cf90a00

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

 src/assets/images/chronology/photoTest.png

 src/assets/images/directory/touxiang.png

 src/views/chronology/floatingWindow.vue

@@ -1,6 +1,9 @@
<template>
  <div class="dialogBox">
    <div class="journalBox">
    <div
      class="journalBox"
      v-if="info.type === 'journal' || info.type === 'book'"
    >
      <div class="title">复方剂量配比多目标优化的ED-NM-MO三联法</div>
      <div class="subtitle">
        <div class="source">中国中医基础医学杂志</div>
@@ -22,10 +25,55 @@
        试验设计-非线性建模-多目标优化的三联法
      </div>
    </div>
    <div class="imageBox"></div>
    <div class="BookBox"></div>
    <div class="videoBox"></div>
    <div class="audioBox"></div>
    <div class="imageBox" v-if="info.type === 'image'">
      <div style="width: 500px; height: 300px">
        <img
          class="autoImg"
          src="@/assets/images/chronology/photoTest.png"
          alt=""
        />
      </div>
    </div>
    <div class="BookBox" v-if="info.type === 'book'">book</div>
    <div class="videoBox" v-if="info.type === 'video'">
      <video
        width="370"
        height="240"
        controls
        src="https://www.w3schools.com/html/mov_bbb.mp4"
      ></video>

      <div>
        <div class="subtitle">
          <div class="source">中国中医基础医学杂志</div>
          <div class="journalInformation">2005 3月 第40卷 第4期</div>
        </div>
        <div class="contentBox" style="text-align: left">
          <p>王睿 中国科学院大连化学物理研究所</p>
          <p>王睿 中国科学院大连化学物理研究所</p>
          <p>王睿 中国科学院大连化学物理研究所</p>
          <p>王睿 中国科学院大连化学物理研究所</p>
          <p>王睿 中国科学院大连化学物理研究所</p>
        </div>
      </div>
    </div>
    <div class="audioBox" v-if="info.type === 'audio'">
      <audio src="https://www.w3schools.com/html/horse.ogg" controls></audio>

      <div>
        <div class="subtitle">
          <div class="source">中国中医基础医学杂志</div>
          <div class="journalInformation">2005 3月 第40卷 第4期</div>
        </div>
        <div class="contentBox" style="text-align: left">
          <p>王睿 中国科学院大连化学物理研究所</p>
          <p>王睿 中国科学院大连化学物理研究所</p>
          <p>王睿 中国科学院大连化学物理研究所</p>
          <p>王睿 中国科学院大连化学物理研究所</p>
          <p>王睿 中国科学院大连化学物理研究所</p>
        </div>
      </div>
    </div>
  </div>
</template>

@@ -78,4 +126,31 @@
  margin-top: 10px;
  line-height: 18px;
}
.imageBox {
  min-height: 300px;
  padding: 10px;
}

.videoBox {
  min-height: 240;
  text-align: center;
}
.videoTitle {
  background: #ffffff;
  box-sizing: border-box;
  border: 1px solid #dcdcdc;
  box-shadow: 0px 0px 10px 0px;
  display: flex;
  justify-content: center;
  align-items: center;
  border-radius: 5px;
  padding: 10px;
  width: 100%;
  height: 100%;
}
.autoImg {
  width: 100%;
  height: 100%;
  object-fit: cover;
}
</style>

 src/views/chronology/index.vue

@@ -48,7 +48,7 @@
                >
                  <div class="detailDialog" v-if="citem.showDetail">
                    <!-- <div class="dialogContent" @click="gotoDetail(citem)"> -->
                      <floatingWindow :info="citem" />
                    <floatingWindow :info="citem" />
                    <!-- </div> -->
                  </div>
                </div>
@@ -87,6 +87,7 @@
              showDetail: false,
              name: "王永炎",
              year: "1938",
              type: "journal",
              id: "1",
            },
          ],
@@ -100,6 +101,7 @@
              showDetail: false,
              name: "王永炎",
              year: "1937",
              type: "image",
              id: "1",
            },
            {
@@ -107,6 +109,7 @@
              showDetail: false,
              name: "王永炎",
              year: "1937",
              type: "book",
              id: "2",
            },
          ],
@@ -126,12 +129,14 @@
              color: "#87A7B9",
              showDetail: false,
              name: "王永炎",
              type: "video",
              id: "3",
            },
            {
              color: "#87A7B9",
              showDetail: false,
              name: "王永炎",
              type: "audio",
              id: "4",
            },
            {
@@ -990,7 +995,7 @@
  z-index: 9999;
  cursor: pointer;
  background: #fff;
  border: 2px solid #CBBEAA;
  border: 2px solid #cbbeaa;
  box-shadow: 2px 2px 4px 1px rgba(0, 0, 0, 0.5);
}


 src/views/directory/index.vue

@@ -4,12 +4,18 @@
      <p>王永炎院士学生目录</p>
    </div>
    <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' : '']">
        <img :src="[activeTabs == 'list' ? listIcon : noListIcon]" alt="">
      <p
        @click="changeTab('list')"
        :class="[activeTabs == 'list' ? 'active-tab' : '']"
      >
        <img :src="[activeTabs == 'list' ? listIcon : noListIcon]" alt="" />
        <span>列表显示</span>
      </p>
    </div>
@@ -28,8 +34,9 @@
            <p class="table-title-degree">{{ item.degree }}</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 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">
          <tr class="table-heading">
@@ -245,7 +252,7 @@
        name: "Root",
        children: [
          {
            name: "Node 1",
            name: "王玉来",
            children: [
              { name: "Leaf 1-1" },
              { name: "Leaf 1-2" },
@@ -303,38 +310,26 @@
            return `
              <div style="
                padding: 10px;
                background: #fff;
                background: #FDF8F0;
                border-radius: 5px;
                box-shadow: 0 2px 10px rgba(0,0,0,0.1);
                max-width: 300px;
                width: 360px;
                text-align: center;
              ">
                <div style="
                  border-bottom: 1px solid #eee;
                  padding-bottom: 5px;
                  margin-bottom: 5px;
                ">
                  <span style="
                    font-size: 16px;
                    color: #333;
                    font-weight: bold;
                  ">${data.name}</span>
                  ${data.customInfo
                ? `<span style="
                    background: #ffeb3b;
                    padding: 2px 5px;
                    border-radius: 3px;
                    margin-left: 8px;
                    font-size: 12px;
                  ">${data.customInfo}</span>`
                : ""
              }
                </div>
                <div style="margin-top: 8px;">
                  <div>节点值: <span style="color: #4f8ff7;">${data.value || 0
              }</span></div>
                  <div>描述: ${data.description || "暂无描述"}</div>
        
                </div>
                <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> <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>
                  <p style="margin-bottom: 5px;">现工作单位：北京中医药大学东方医院</p>
                  <p style="margin-bottom: 5px;">职务：原院长</p>
                  <p style="margin-bottom: 5px;">职称：主任医师、教授</p>
                  </div>
                
              </div>
            `;
          },