From 2b06902e25978254f39bef49ed3cf6b1cab1c033 Mon Sep 17 00:00:00 2001
From: 杨磊 <505174330@qq.com>
Date: 星期五, 26 七月 2024 11:53:09 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/TCM_CharacterLibrary
---
src/pages/territory/territory.vue | 111 ++++++++++---------------------------------------------
1 files changed, 21 insertions(+), 90 deletions(-)
diff --git a/src/pages/territory/territory.vue b/src/pages/territory/territory.vue
index 36353af..50a4a22 100644
--- a/src/pages/territory/territory.vue
+++ b/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();
},
--
Gitblit v1.9.1