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

QYF-GitLab1

2024-07-24 68cf4babb70ef2892f210e2b9a2bdea9a174fa81

 src/pages/territory/territory.vue

@@ -94,7 +94,7 @@
          class="information"
          v-for="(item, index) in SearchArr"
          :key="index"
          style="cursor: pointer;"
          style="cursor: pointer"
          @click="showCard(item)"
        >
          <li style="font-size: 0.18rem; font-weight: 700">
@@ -131,14 +131,28 @@
                  姓名:
                  {{ currentMark[0].name ? currentMark[0].name : "-" }}
                </li>
                <li>别名: {{ currentMark[0].nikeName ? currentMark[0].nikeName : "-" }}</li>
                <li>籍贯: {{ currentMark[0].nativePlace ? currentMark[0].nativePlace : "-" }}</li>
                <li>医学分科: {{ currentMark[0].barnch ? currentMark[0].barnch : "-" }}</li>
                <li>
                  别名:
                  {{ currentMark[0].nikeName ? currentMark[0].nikeName : "-" }}
                </li>
                <li>
                  籍贯:
                  {{
                    currentMark[0].nativePlace
                      ? currentMark[0].nativePlace
                      : "-"
                  }}
                </li>
                <li>
                  医学分科:
                  {{ currentMark[0].barnch ? currentMark[0].barnch : "-" }}
                </li>
                <li
                  class="medicalLi"
                  :title="currentMark[0].medical ? currentMark[0].medical : '-'"
                >
                  小传: {{ currentMark[0].medical ? currentMark[0].medical : "-" }}
                  小传:
                  {{ currentMark[0].medical ? currentMark[0].medical : "-" }}
                </li>
              </ul>
              <el-button
@@ -158,6 +172,7 @@
              <el-collapse-item
                v-for="(item, index) in currentMark"
                :name="index"
                :key="index"
              >
                <template slot="title">
                  <div class="titleImg">
@@ -194,7 +209,6 @@
                >
              </el-collapse-item>
            </el-collapse>
            
          </div>
        </div>
      </div>
@@ -300,10 +314,8 @@
<!-- <script src="https://api.map.baidu.com/api?v=3.0&ak=5USVDAhhS4ssz44HLq3gNPZai7naXf4Q&callback=initializeMap"></script> -->
<!-- 5USVDAhhS4ssz44HLq3gNPZai7naXf4Q -->
<script>
import { loadBMap } from "@/static/map.js";
import L from "leaflet";
import "leaflet.chinatmsproviders";
import * as echarts from "echarts";
import "echarts/extension/bmap/bmap";
import {
  getRetrieval,
@@ -322,30 +334,6 @@
      isEchTrue: false,
      isLeft: 0,
      isTop: 0,
      // 用户信息
      information: [
        {
          label: "姓名",
          content: "李时珍"
        },
        {
          label: "别名",
          content: "东丽先生"
        },
        {
          label: "籍贯",
          content: "湖北"
        },
        {
          label: "医学分科",
          content: "中药,针灸"
        },
        {
          label: "小传",
          content:
            "李时珍(约1518年~1593 年)， 字东璧， 晚年自号濒湖山人， 湖广黄州府薪州(今湖北省薪春县) 人， 明代著名医药学家。 与“ 医圣” 万密斋齐名， 古有“ 万密斋的方， 李时珍的药” 之说。 后为楚干府..."
        }
      ],
      // 下面的朝代1
      dynasty1Color: "",
      dynasty1: [
@@ -427,66 +415,10 @@
      ],
      // 标题顶部栏需要的东西
      idIndex: 0,
      // 朝代
      dynasty: [
        {
          name: "夏",
          color: "#90BBD8",
          id: 1
        },
        {
          name: "商",
          color: "#EDD28B",
          id: 2
        },
        {
          name: "西周",
          color: "#CF746D",
          id: 3
        },
        {
          name: "秦",
          color: "#9CC27A",
          id: 4
        },
        {
          name: "汉",
          color: "#5B6CB9",
          id: 5
        },
        {
          name: "隋",
          color: "#8860A8",
          id: 6
        },
        {
          name: "唐",
          color: "#DE8E66",
          id: 7
        },
        {
          name: "明",
          color: "#DE8E66",
          id: 8
        }
      ],
      // 搜索后是否显示弹框
      isSearch: false,
      currentMark: null,
      SearchArr: [
        {
          id: 1,
          name: "李时珍",
          birthAndDeath: "1518-1593",
          source: "国图规范档，CBDB，上图古籍数据库 籍贯：湖北"
        },
        {
          id: 2,
          name: "李时珍",
          birthAndDeath: "1518-1593",
          source: "国图规范档，CBDB，上图古籍数据库 籍贯：湖北"
        }
      ],
      SearchArr: [],
      zoomLevel: 5,
      oldMarkList: [],
      aggregatedData: [],
@@ -498,7 +430,6 @@
  },
  mounted() {
    this.getDynastyList();

    this.getDataList();
    this.getHaveDataDynasty();
  },