From a4fe90ef374a9a3144fb8de5d7229dd11bfa7ff4 Mon Sep 17 00:00:00 2001
From: YM <479443481@qq.com>
Date: 星期二, 11 六月 2024 10:24:02 +0800
Subject: [PATCH] 1
---
src/pages/character/detail.vue | 123 +++++++++++++++++++++++++++++++++-------
1 files changed, 100 insertions(+), 23 deletions(-)
diff --git a/src/pages/character/detail.vue b/src/pages/character/detail.vue
index 2333598..c6c4778 100644
--- a/src/pages/character/detail.vue
+++ b/src/pages/character/detail.vue
@@ -290,11 +290,16 @@
<span>鐩稿叧闄勮〃/鍥惧儚</span>
</div>
<view>
- <div class="flex">
+ <div style="overflow: auto">
<el-image
v-for="item in imageList"
:key="item"
- style="width: 2.05rem; height: 2.4rem"
+ style="
+ width: 2.05rem;
+ height: 2.4rem;
+ margin-right: 0.2rem;
+ margin-bottom: 0.1rem;
+ "
:src="item"
fit="fill"
></el-image>
@@ -318,7 +323,7 @@
>
<span>鐜颁唬鐮旂┒</span>
</div>
- <ul class="font-family" style="font-size: 0.13rem; line-height: 2">
+ <ul class="fileul" style="font-size: 0.13rem; line-height: 2">
<li
style="cursor: pointer"
v-for="(item, index) in personResearchList"
@@ -409,9 +414,10 @@
getPersonBiog,
getPersonWritings,
getPersonRelationAtSchool,
- getSpaceTime
+ getSpaceTime,
+ getDynastyData,
} from "@/api/index.js";
-import { getImg, getFile } from "@/static/tool.js";
+import { getImg } from "@/static/tool.js";
import L from "leaflet";
import "leaflet.chinatmsproviders";
@@ -536,7 +542,8 @@
},
methods: {
copyText() {
- const textToCopy = this.biogData[0].content + " 鏉ユ簮锛氫腑鍖诲尰瀛︿汉鐗╃煡璇嗗簱";
+ const textToCopy =
+ this.biogData[0].content + "\n鏉ユ簮锛氫腑鍖诲尰瀛︿汉鐗╃煡璇嗗簱";
const textarea = document.createElement("textarea");
textarea.value = textToCopy;
document.body.appendChild(textarea);
@@ -554,7 +561,7 @@
window.open(item.url);
}
if (item.filePath) {
- window.open(getFile(item.filePath));
+ window.open(getImg(item.filePath));
}
},
getData() {
@@ -637,7 +644,14 @@
},
{
name: "鎵�澶勬椂鏈�",
- value: obj.dynastyDesc || "-"
+ value: obj.dynastyDesc || "-",
+ valueClick: () => {
+ uni.navigateTo({
+ url:
+ "/pages/knowledgeBase/knowledgeBase?dynasty=" +
+ obj.dynastyId
+ });
+ }
},
{
name: "姘戞棌",
@@ -657,7 +671,14 @@
},
{
name: "鑱屽畼",
- value: obj.official || "-"
+ value: obj.official || "-",
+ valueClick: () => {
+ uni.navigateTo({
+ url:
+ "/pages/knowledgeBase/knowledgeBase?isAdvancedSearch=1&official=" +
+ obj.official
+ });
+ }
},
{
name: "娴佹淳",
@@ -698,7 +719,11 @@
this.biogData = res.list.map((item) => {
return {
content: item.content1,
- bookName: "銆�" + item.bookName + "銆� " + "P " + item.pageNo // 杩欓噷鍙湁bookid鏃犳硶鍖归厤鍒颁功鍚�
+ bookName:
+ "銆�" +
+ item.bookName +
+ "銆� " +
+ (item.pageNo ? "P " + item.pageNo : "") // 杩欓噷鍙湁bookid鏃犳硶鍖归厤鍒颁功鍚�
};
});
});
@@ -719,10 +744,10 @@
});
},
getRelationship() {
- getRelationTypeTreeList().then(res=>{
- console.log(res,"getRelationTypeTreeList");
+ getRelationTypeTreeList().then((res) => {
+ console.log(res, "getRelationTypeTreeList");
console.log(res);
- })
+ });
// getPersonRelationAtSchool({
// personId: this.detailId,
// }).then((res) => {
@@ -740,8 +765,32 @@
id: this.detailId,
type: "PERSON_RELATIONS"
}).then((res) => {
- this.tableData4
- console.log(res,"PERSON_RELATIONS");
+ this.tableData4;
+ console.log(res, "PERSON_RELATIONS");
+ if (res.object.personRelationMap.kin.length) {
+ this.tableData2 = res.object.personRelationMap.kin.map((f) => {
+ return {
+ a: f.nodeName,
+ b: f.relationTypeName,
+ };
+ });
+ }
+ if (res.object.personRelationMap.teacherStudent.length) {
+ this.tableData3 = res.object.personRelationMap.teacherStudent.map((f) => {
+ return {
+ a: f.nodeName,
+ b: f.relationTypeName,
+ };
+ });
+ }
+ if (res.object.personRelationMap.social.length) {
+ this.tableData4 = res.object.personRelationMap.social.map((f) => {
+ return {
+ a: f.nodeName,
+ b: f.relationTypeName,
+ };
+ });
+ }
});
// 绀句細鍏崇郴
getPersonRelationAtSchool({
@@ -762,6 +811,7 @@
personId: this.detailId,
relationSearchTypeEO: "KINSHIP"
}).then((res) => {
+ console.log(res, "123123");
if (res.list && res.list.length) {
this.tableData2 = res.list.map((f) => {
return {
@@ -829,15 +879,23 @@
personId: this.detailId
}).then((res) => {
if (res.list && res.list.length) {
- const data = res.list.map((item) => {
- return {
- name: item.activityName,
- value: [item.xcoord, item.ycoord]
- };
- });
+ const data = [];
+ for (let i = 0; i < res.list.length; i++) {
+ const item = res.list[i];
+ if (item.xcoord && item.ycoord) {
+ const obj = {
+ name: item.activityName,
+ value: [item.xcoord, item.ycoord]
+ };
+ data.push(obj);
+ }
+ }
this.markerList = data;
// 鏃剁┖鍦板浘
- this.initMap(data[0]);
+ // 杩欓噷鍙彇浜嗙涓�鏉★紝闇�瑕佸叏閮ㄦ暟鎹�
+ if (data && data.length) {
+ this.initMap(data);
+ }
}
// loadBMap("1NJdwrI1CfT6lrykVhDkmWgsO6O2bjQK").then(() => {
@@ -849,9 +907,16 @@
var map = L.map("spaceTime", {
preferCanvas: true,
attributionControl: false
- }).setView([markerList.value[1], markerList.value[0]], 13);
+ }).setView([markerList[0].value[1], markerList[0].value[0]], 13);
L.tileLayer
.chinaProvider("TianDiTu.Normal.Map", {
+ key: "76bc34ead7e30e663a4eded8aeaf5860",
+ maxZoom: 18,
+ minZoom: 3
+ })
+ .addTo(map);
+ L.tileLayer
+ .chinaProvider("TianDiTu.Normal.Annotion", {
key: "76bc34ead7e30e663a4eded8aeaf5860",
maxZoom: 18,
minZoom: 3
@@ -866,6 +931,14 @@
const temp_mark = L.marker([markerList.value[1], markerList.value[0]], {
icon: icon
}).addTo(map);
+ if (markerList.length) {
+ for (let i = 0; i < markerList.length; i++) {
+ const item = markerList[i];
+ const temp_mark = L.marker([item.value[1], item.value[0]], {
+ icon: icon
+ }).addTo(map);
+ }
+ }
},
// 鏀惧ぇ鍦板浘璺宠浆
fangdaClick(index) {
@@ -1512,4 +1585,8 @@
opacity: 0;
}
}
+
+.fileul li:hover {
+ color: #597aa5;
+}
</style>
--
Gitblit v1.9.1