From e33eb0eb98aa0a88d2b3a7163abf92e4e028fb31 Mon Sep 17 00:00:00 2001
From: YM <479443481@qq.com>
Date: 星期五, 17 五月 2024 21:09:39 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/TCM_CharacterLibrary
---
src/pages/character/detail.vue | 163 +++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 118 insertions(+), 45 deletions(-)
diff --git a/src/pages/character/detail.vue b/src/pages/character/detail.vue
index aa2dc67..4226957 100644
--- a/src/pages/character/detail.vue
+++ b/src/pages/character/detail.vue
@@ -11,7 +11,6 @@
}}</view>
<ul class="flex" style="line-height: 1.2; margin: 0.15rem 0">
<li
- v-for="item in 4"
style="
background-color: #fff;
padding: 0 0.08rem;
@@ -22,7 +21,46 @@
margin-right: 0.15rem;
"
>
- VSDS
+ RDF
+ </li>
+ <li
+ style="
+ background-color: #fff;
+ padding: 0 0.08rem;
+ border: 0.01rem solid #000;
+ border-radius: 0.1rem;
+ font-size: 0.12rem;
+ text-align: center;
+ margin-right: 0.15rem;
+ "
+ >
+ NT
+ </li>
+ <li
+ style="
+ background-color: #fff;
+ padding: 0 0.08rem;
+ border: 0.01rem solid #000;
+ border-radius: 0.1rem;
+ font-size: 0.12rem;
+ text-align: center;
+ margin-right: 0.15rem;
+ "
+ >
+ XML
+ </li>
+ <li
+ style="
+ background-color: #fff;
+ padding: 0 0.08rem;
+ border: 0.01rem solid #000;
+ border-radius: 0.1rem;
+ font-size: 0.12rem;
+ text-align: center;
+ margin-right: 0.15rem;
+ "
+ >
+ JSON
</li>
</ul>
<view
@@ -58,9 +96,9 @@
</view>
<view style="width: 5%"></view>
</view>
- <el-row style="padding: 0 1.2rem 0; padding-top: 0.24rem">
+ <div style="padding: 0 1.2rem 0; padding-top: 0.24rem;display: flex;">
<!-- 宸︿晶 -->
- <el-col
+ <div
:span="5"
class="BoxLeft"
style="padding-right: 0.2rem; width: 2.8rem"
@@ -148,9 +186,9 @@
</ul>
</el-card>
</div>
- </el-col>
+ </div>
<!-- 鍙充晶 -->
- <el-col :span="18" class="BoxRight">
+ <div :span="18" class="BoxRight">
<div class="grid-content bg-purple-dark" style="width: 100%">
<el-card class="box-card" style="padding: 0">
<div
@@ -222,7 +260,7 @@
<el-image
v-for="item in imageList"
:key="item"
- style="width: 2.05rem; height: 1.4rem"
+ style="width: 2.05rem; height: 2.4rem"
:src="item"
fit="fill"
></el-image>
@@ -237,30 +275,21 @@
padding-bottom: 0.1rem;
"
>
- <span>鐩稿叧闄勮〃/鍥惧儚</span>
+ <span>鐜颁唬鐮旂┒</span>
</div>
<ul class="font-family" style="font-size: 0.13rem; line-height: 2">
- <li>
- [1|鍒樼倻,璋㈣搲,寮犵,绛�.鍚戜汉鏂囩爺绌剁殑鍥藉鏁版嵁鍩虹璁炬柦寤鸿[J|.涓浗鍥句功棣嗗鎶�,2016,42(5):29-39.
- </li>
- <li>
- [2|鍛ㄦ櫒.鍥介檯鏁板瓧浜烘枃鐮旂┒鐗瑰緛涓庣煡璇嗙粨鏋剕J鍥句功棣嗚鍧�2017.37(4):1-8.
- </li>
- <li>
- [3]鍌呭痉鍗�,浜庣繝鑹�,鏉庢槬鍗�,鍏充簬鍒涘缓鈥�20
- 涓栫邯涓浗浜虹墿浼犺璧勬枡鍏ㄦ枃鏁版嵁搴撴不鐨勬瀯鎯砙宸�,涓浗鑰呭紩,2009,714):24-26.
- </li>
- <li>
- [4|浜庣繝鑹�,鍌呭痉鍗�,鏉庢槬鍗�,鍏充簬鈥�20涓栫邯涓浗浜虹墿浼犺璧勬枡鍏ㄦ枃鏁版嵁搴撴不鐨勮繘灞曚笌鍥版儜[J1.涓浗甯稿紩,2012.10111:20-22
- </li>
- <li>
- [5]璐炬銆傘�婃箹鍗楄繎浠ｄ汉鐗╂暟鎹巼銆嬭祫婧愭敹褰曡寖鍥寸爺绌秥J娌冲崡鍥句功棣嗗鍒�,2015,35(7):126.127.140.
+ <li
+ v-for="(item, index) in personResearchList"
+ :key="index"
+ @click="toLink(item)"
+ >
+ {{ "[" + Number(index + 1) + "]" + item.achievementName }}
</li>
</ul>
</el-card>
</div>
- </el-col>
- </el-row>
+ </div>
+ </div>
<!-- 杩斿洖椤堕儴 -->
<el-col style="position: absolute; bottom: 1rem; left: 1.2rem">
@@ -274,9 +303,13 @@
<!-- 涓汉灏忎紶 -->
<el-dialog :visible.sync="isProfile" :modal-append-to-body="false">
<view class="ProfileNav flex flex-center"> 涓汉灏忎紶 </view>
- <view style="padding: 0.44rem 0.3rem; min-height: 7.32rem">
+ <view
+ style="padding: 0.44rem 0.3rem; min-height: 7.32rem"
+ v-if="biogData.length > 0"
+ >
<view
- v-for="item in biogData"
+ v-for="(item, index) in biogData"
+ :key="index"
style="
margin-bottom: 0.2rem;
background-color: #f0f0f0;
@@ -297,6 +330,9 @@
</view>
</view>
</view>
+ <div v-else>
+ <el-empty description="鏆傛棤鏁版嵁"></el-empty>
+ </div>
</el-dialog>
</view>
</template>
@@ -344,6 +380,10 @@
{
prop: "a",
label: "姝ｄ功鍚�",
+ },
+ {
+ prop: "e",
+ label: "浣滆��",
},
{
prop: "b",
@@ -401,6 +441,7 @@
tableData5: [],
nodes: [],
relationships: [],
+ personResearchList: [],
};
},
onLoad(options) {
@@ -442,6 +483,9 @@
type: "success",
});
},
+ toLink(item) {
+ window.open(item.url);
+ },
getData() {
// 鍩烘湰淇℃伅
getPersonInfo({
@@ -466,9 +510,31 @@
// 鍏崇郴鍥捐氨
this.getMappingData(this.detailInfo.NAME);
});
-
+ //鐜颁唬鐮旂┒
+ getPersonInfo({
+ id: this.detailId,
+ type: "PERSON_RESEARCH",
+ }).then((res) => {
+ console.log(res, "123123123");
+ this.personResearchList = res.object.personResearchList;
+ });
+ getPersonInfo({
+ id: this.detailId,
+ type: "PERSON_RELATIONS",
+ }).then((res) => {
+ console.log(res, "PERSON_RELATIONS");
+ this.personRelationList = res.object.personRelationList;
+ if (this.personRelationList.length) {
+ this.tableData4 = this.personRelationList.map((f) => {
+ return {
+ a: f.nodeName,
+ b: f.relationTypeName,
+ };
+ });
+ }
+ });
getWebBasic({
- personId: this.detailId
+ personId: this.detailId,
}).then((res) => {
console.log(res, "resres");
const obj = res.object;
@@ -479,39 +545,39 @@
list: [
{
name: "鍒悕",
- value: obj.alias || "-"
+ value: obj.alias || "-",
},
{
name: "瀛�",
- value: obj.zi || "-"
+ value: obj.zi || "-",
},
{
name: "鍙�",
- value: obj.hao || "-"
+ value: obj.hao || "-",
},
{
name: "鎵�澶勬椂鏈�",
- value: obj.dynastyDesc || "-"
+ value: obj.dynastyDesc || "-",
},
{
name: "姘戞棌",
- value: obj.ethnic || "-"
- }
- ]
+ value: obj.ethnic || "-",
+ },
+ ],
},
{
list: [
{
name: "绫嶈疮",
- value: obj.native || "-"
+ value: obj.native || "-",
},
{
name: "鎬у埆",
- value: obj.gender || "-"
+ value: obj.gender || "-",
},
{
name: "鑱屽畼",
- value: obj.official || "-"
+ value: obj.official || "-",
},
{
name: "娴佹淳",
@@ -521,14 +587,14 @@
sres.object.school_NAME &&
sres.object.school_NAME.length
? sres.object.school_NAME[0].content
- : "-"
+ : "-",
},
{
name: "瀛︽湳鐗圭偣",
- value: obj.features || "-"
- }
- ]
- }
+ value: obj.features || "-",
+ },
+ ],
+ },
];
});
});
@@ -583,6 +649,7 @@
b: item.dynasty,
c: item.writeWay,
d: item.classify,
+ e: this.detailInfo.NAME,
};
});
});
@@ -642,7 +709,7 @@
const data = res.list.map((item) => {
return {
name: item.activityName,
- value: [item.xcoord, item.ycoord]
+ value: [item.xcoord, item.ycoord],
};
});
// 鏃剁┖鍦板浘
@@ -1086,6 +1153,12 @@
.BoxLeft ::v-deep.el-card__body {
padding: 0.1rem 0.11rem !important;
}
+.BoxLeft{
+ width: 30%;
+}
+.BoxRight{
+ width: 70%;
+}
::v-deep .el-tabs__content {
line-height: 1;
--
Gitblit v1.9.1