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

QYF-GitLab1

2024-07-26 1b27559a90417a6f608be0c61e88a6f9e3ea1b40

 src/pages/academicSchools/index.vue

@@ -299,7 +299,7 @@
        <p>医学分科： {{ detailData.medicalBranch }}</p>
        <p>小传：{{ detailData.biography }}</p>
      </div>
      <div class="btn" @click="spaceTimeArr(detailData.id)">查看更多>>></div>
      <div class="btn" @click="spaceTimeArr(detailData.id, 1)">查看更多>>></div>
    </div>
    <div id="schoolDialog" class="customDialog">
      <div class="title">
@@ -312,7 +312,7 @@
        <p>代表性著作：{{ detailData.works }}</p>
        <p>学派思想： {{ detailData.thought }}</p>
      </div>
      <div class="btn" @click="spaceTimeArr(detailData.id)">查看更多>>></div>
      <div class="btn" @click="spaceTimeArr(detailData.id, 2)">查看更多>>></div>
    </div>
    <el-drawer
      title="地址列表"
@@ -322,12 +322,12 @@
      class="customDrawer"
    >
      <div class="drawerContent">
        <div class="drawerTips">選中的地址：</div>
        <div class="drawerTips">选中的地址：</div>
        <div class="drawerTable">
          <div class="tableTabs">
            <div class="inputItem">
              <el-input
                placeholder="請輸入地名搜索"
                placeholder="请输入地名搜索"
                v-model="tableKey"
                class="input-with-select"
                @keyup.enter="searchAddress"
@@ -341,7 +341,7 @@
              </el-input>
            </div>
            <div class="selectItem">
              <el-select v-model="dynastyId" placeholder="請選擇時期">
              <el-select v-model="dynastyId" placeholder="请选择时期">
                <el-option
                  v-for="item in dynastyData"
                  :key="item.dynastyId + '0'"
@@ -361,14 +361,14 @@
          >
            <el-table-column type="selection" width="55"> </el-table-column>
            <el-table-column prop="currentName" label="地名"> </el-table-column>
            <el-table-column width="250" label="年代區間">
            <el-table-column width="250" label="年代区间">
              <template slot-scope="scope">{{
                scope.row.start + "-" + scope.row.end
              }}</template>
            </el-table-column>
            <el-table-column
              prop="dynastyName"
              label="時期"
              label="时期"
              width="250"
              show-overflow-tooltip
            >
@@ -390,9 +390,9 @@
          </el-pagination>
        </div>
        <div class="drawerBtn">
          <el-button @click="setCurrent">全選當前頁</el-button>
          <el-button @click="setCurrent('cancle')">取消全選</el-button>
          <el-button @click="drawer = false" type="primary">確定</el-button>
          <el-button @click="setCurrent">全选当前页</el-button>
          <el-button @click="setCurrent('cancle')">取消全选</el-button>
          <el-button @click="drawer = false" type="primary">确定</el-button>
        </div>
      </div>
    </el-drawer>
@@ -408,7 +408,7 @@
  getSocialDistinction,
  getDynastyAll,
  getAdvancedData,
  getPlaceInfo,
  getPlaceInfo
} from "@/api/index.js";
import * as echarts from "echarts";
export default {
@@ -444,7 +444,7 @@
          name: "活动地",
        },
        {
          name: "学术图谱"
          name: "学术流派"
        }
      ],
      // 当前人物信息
@@ -463,7 +463,7 @@
        page: 1,
        currentPage: 1,
        pageSize: 10,
        total: 0,
        total: 0
      },
      showPerson: false,
      personList: [],
@@ -616,7 +616,7 @@
        page: 1,
        currentPage: 1,
        pageSize: 10,
        total: 0,
        total: 0
      };
      this.formData.page = 1;
      this.searchFun();
@@ -626,7 +626,7 @@
        return {
          ancientName: item.ancientName ?? "",
          dynastyId: item.dynastyId,
          currentName: item.currentName,
          currentName: item.currentName
        };
      });
      let Obj = {
@@ -637,7 +637,7 @@
        socialDistinctionIdList: this.formData.socialIdentity,
        dynastyIdList: this.formData.period,
        page: this.formData.page,
        pageSize: this.formData.pageSize,
        pageSize: this.formData.pageSize
      };
      // // 搜索
      getAdvancedData(Obj).then((res) => {
@@ -724,7 +724,7 @@
                    }
                  });
                  return data;
                }).join() ?? "",
                }).join() ?? ""
            };
          });
          if (res?.npage) {
@@ -1356,6 +1356,8 @@
        const e = params.event;
        const div = document.getElementById("customDialog");
        div.style.display = "block";
        const div2 = document.getElementById("schoolDialog");
        div2.style.display = "none";
        div.style.left = e.offsetX + 50 + "px";
        div.style.top = e.offsetY - 50 + "px";
        const data = this.infoOfPersons?.find((i) => i.id == id);
@@ -1390,11 +1392,13 @@
        const e = params.event;
        const div = document.getElementById("schoolDialog");
        div.style.display = "block";
        const div2 = document.getElementById("customDialog");
        div2.style.display = "none";
        div.style.left = e.offsetX + 50 + "px";
        div.style.top = e.offsetY - 50 + "px";
        const data = this.infoOfSchools?.find((i) => i.schoolId == id);
        const obj = {
          id: params.data.id,
          id: id,
          name: data.name[0],
          character: data.important_people
            ? data.important_people.map((item) => item.personName).join("、")
@@ -1406,8 +1410,8 @@
            ? data.important_work.map((item) => item.literatureTitle).join("、")
            : "",
          thought: data.school_introduction
            ? data.school_introduction.map((item) => item).join("、")
            : "",
            ? data.school_introduction.join("、")
            : ""
        };
        this.detailData = obj;
      }
@@ -1416,6 +1420,8 @@
    closeDom() {
      const div = document.getElementById("customDialog");
      div.style.display = "none";
      const div2 = document.getElementById("schoolDialog");
      div2.style.display = "none";
    },

    // 基础搜索
@@ -1468,11 +1474,18 @@
    },

    // 关系图 点击里面的元素
    spaceTimeArr(id) {
      // 关系图的数据
      uni.navigateTo({
        url: "/pages/character/detail?id=" + id,
      });
    spaceTimeArr(id, type) {
      if (type == 1) {
        // 人物
        uni.navigateTo({
          url: "/pages/character/detail?id=" + id
        });
      } else {
        // 学派
        uni.navigateTo({
          url: "/pages/academicGenres/detail?id=" + id
        });
      }
    },

    // 获取朝代echarts的数据