From 71e6a0857c5f411b8b8df3df4102cc32e7d32ba1 Mon Sep 17 00:00:00 2001
From: 杨磊 <505174330@qq.com>
Date: 星期三, 12 六月 2024 18:42:39 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/TCM_CharacterLibrary
---
src/pages/character/detail.vue | 170 ++++++++++-----------------
src/pages/Register/Register.vue | 4
src/pages/academicGenres/chart.vue | 111 +++++++++++-------
src/pages/fileDetail/index.vue | 63 ++++++++--
src/pages/forgetPass/forgetPass.vue | 4
src/components/table1/table1.vue | 2
6 files changed, 187 insertions(+), 167 deletions(-)
diff --git a/src/components/table1/table1.vue b/src/components/table1/table1.vue
index a156e3b..c721d0f 100644
--- a/src/components/table1/table1.vue
+++ b/src/components/table1/table1.vue
@@ -6,6 +6,8 @@
v-for="column in columns"
:key="column.prop"
:label="column.label"
+ :width="column.width"
+ :show-overflow-tooltip="column.showOverflowTooltip"
header-align="center"
>
<template slot-scope="scope" class="font-family">
diff --git a/src/pages/Register/Register.vue b/src/pages/Register/Register.vue
index 49b8e76..9db858f 100644
--- a/src/pages/Register/Register.vue
+++ b/src/pages/Register/Register.vue
@@ -824,12 +824,12 @@
}
::v-deep .el-form-item__label {
- min-width: 0.6rem;
+ min-width: 0.8rem;
padding: 0;
color: #244a7b;
font-size: 0.14rem;
font-weight: 500;
- margin-right: 0.29rem;
+ margin-right: 0.1rem;
display: flex;
align-items: center;
text-align: right;
diff --git a/src/pages/academicGenres/chart.vue b/src/pages/academicGenres/chart.vue
index 5136fb3..bb7717e 100644
--- a/src/pages/academicGenres/chart.vue
+++ b/src/pages/academicGenres/chart.vue
@@ -65,8 +65,17 @@
</li>
</ul>
</view>
- <view class="contentBox">
- <view id="main" style="width: 100%; height: 100%"></view>
+ <view class="contentBox" style="position: relative;">
+ <div
+ v-if="nodeData.length == 0"
+ style="color: #666; text-align: center; font-size: 16px; position: absolute;top: 1rem;left: 0;right: 0;"
+ >
+ 鏆傛棤鏁版嵁
+ </div>
+ <view id="main" style="width: 100%; height: 100%">
+
+ </view>
+
</view>
</view>
</template>
@@ -134,11 +143,15 @@
return {
content: item.content,
source:
- "鍑哄锛氥��" +
+ res.object.bookList &&
res.object.bookList.find((citem) => citem.id == item.bookId)
- .name +
- "銆� P" +
- item.pageNo
+ ? "鍑哄锛氥��" +
+ res.object.bookList.find(
+ (citem) => citem.id == item.bookId
+ ).name +
+ "銆� P" +
+ item.pageNo
+ : ""
};
})
: [],
@@ -147,11 +160,15 @@
return {
content: item.content,
source:
- "鍑哄锛氥��" +
+ res.object.bookList &&
res.object.bookList.find((citem) => citem.id == item.bookId)
- .name +
- "銆� P" +
- item.pageNo
+ ? "鍑哄锛氥��" +
+ res.object.bookList.find(
+ (citem) => citem.id == item.bookId
+ ).name +
+ "銆� P" +
+ item.pageNo
+ : ""
};
})
: [],
@@ -160,11 +177,15 @@
return {
content: item.content,
source:
- "鍑哄锛氥��" +
+ res.object.bookList &&
res.object.bookList.find((citem) => citem.id == item.bookId)
- .name +
- "銆� P" +
- item.pageNo
+ ? "鍑哄锛氥��" +
+ res.object.bookList.find(
+ (citem) => citem.id == item.bookId
+ ).name +
+ "銆� P" +
+ item.pageNo
+ : ""
};
})
: [],
@@ -173,11 +194,15 @@
return {
content: item.content,
source:
- "鍑哄锛氥��" +
+ res.object.bookList &&
res.object.bookList.find((citem) => citem.id == item.bookId)
- .name +
- "銆� P" +
- item.pageNo
+ ? "鍑哄锛氥��" +
+ res.object.bookList.find(
+ (citem) => citem.id == item.bookId
+ ).name +
+ "銆� P" +
+ item.pageNo
+ : ""
};
})
: []
@@ -207,30 +232,32 @@
searchSchoolPerson({
keyword: item
}).then((res) => {
- for (let i = 0; i < res.list.length; i++) {
- const citem = res.list[i];
- // 鑺傜偣
- this.nodeData.push({
- name: citem.name2,
- x: Math.random() * 1000,
- y: Math.random() * 600,
- itemStyle: {
- color: citem.relationType == "浜虹墿钁椾綔" ? "#eee" : "#FDEFE4",
- borderWidth: 4,
- borderColor:
- citem.relationType == "浜虹墿钁椾綔" ? "#9e9e9e" : "#DA7A2B",
- borderRadius: 30
- },
- symbolSize: 100
- });
- // 鍏崇郴
- this.links.push({
- source: item,
- target: citem.name2,
- label: {
- show: false
- }
- });
+ if (res.list) {
+ for (let i = 0; i < res.list.length; i++) {
+ const citem = res.list[i];
+ // 鑺傜偣
+ this.nodeData.push({
+ name: citem.name2,
+ x: Math.random() * 1000,
+ y: Math.random() * 600,
+ itemStyle: {
+ color: citem.relationType == "浜虹墿钁椾綔" ? "#eee" : "#FDEFE4",
+ borderWidth: 4,
+ borderColor:
+ citem.relationType == "浜虹墿钁椾綔" ? "#9e9e9e" : "#DA7A2B",
+ borderRadius: 30
+ },
+ symbolSize: 100
+ });
+ // 鍏崇郴
+ this.links.push({
+ source: item,
+ target: citem.name2,
+ label: {
+ show: false
+ }
+ });
+ }
}
this.init();
});
diff --git a/src/pages/character/detail.vue b/src/pages/character/detail.vue
index c6c4778..88f065a 100644
--- a/src/pages/character/detail.vue
+++ b/src/pages/character/detail.vue
@@ -100,7 +100,6 @@
>
</view>
<view
- v-if="biogData.length > 1"
style="font-size: 0.12rem; color: #244a7b; cursor: pointer"
@click="ProfileClick"
>闃呰鏇村></view
@@ -408,6 +407,7 @@
getPersonInfo,
getRelationTypeTreeList,
getWebBasic,
+ getDynastyAll,
getIntroduction,
getSource,
getPersonImages,
@@ -415,7 +415,7 @@
getPersonWritings,
getPersonRelationAtSchool,
getSpaceTime,
- getDynastyData,
+ getDynastyData
} from "@/api/index.js";
import { getImg } from "@/static/tool.js";
import L from "leaflet";
@@ -478,6 +478,8 @@
},
{
prop: "d",
+ width: 300,
+ showOverflowTooltip: true,
label: "鍑哄"
}
],
@@ -556,7 +558,6 @@
});
},
toLink(item) {
- console.log(item);
if (item.url) {
window.open(item.url);
}
@@ -585,6 +586,20 @@
}
console.log(obj);
this.detailInfo = obj;
+ getDynastyAll().then((dynastyData) => {
+ getWebBasic({
+ personId: this.detailId
+ }).then((res) => {
+ const obj = res.object;
+ if (obj.school) {
+ getIntroduction(Number(obj.school)).then((sres) => {
+ this.handleData(obj, sres, dynastyData.list);
+ });
+ } else {
+ this.handleData(obj, null, dynastyData.list);
+ }
+ });
+ });
// 鍏崇郴鍥捐氨
this.getMappingData(this.detailInfo.NAME);
});
@@ -594,19 +609,6 @@
type: "PERSON_RESEARCH"
}).then((res) => {
this.personResearchList = res.object.personResearchList;
- });
-
- getWebBasic({
- personId: this.detailId
- }).then((res) => {
- const obj = res.object;
- if (obj.school) {
- getIntroduction(Number(obj.school)).then((sres) => {
- this.handleData(obj, sres);
- });
- } else {
- this.handleData(obj);
- }
});
// 娲诲姩骞磋氨
@@ -620,19 +622,19 @@
a: item.time,
b: item.activityName,
c: item.activityAddrOld,
- d: item.desc // 杩欓噷缂哄皯娲诲姩鎻忚堪瀛楁
+ d: item.desc
};
});
}
});
},
- handleData(obj, sres) {
+ handleData(obj, sres, dynastyData) {
this.tableArr = [
{
list: [
{
- name: "鍒悕",
- value: obj.alias || "-"
+ name: "濮撳悕",
+ value: obj.name || "-"
},
{
name: "瀛�",
@@ -644,7 +646,9 @@
},
{
name: "鎵�澶勬椂鏈�",
- value: obj.dynastyDesc || "-",
+ value:
+ dynastyData.find((item) => item.dynastyId == obj.dynastyId)
+ .name || "-",
valueClick: () => {
uni.navigateTo({
url:
@@ -744,93 +748,64 @@
});
},
getRelationship() {
- getRelationTypeTreeList().then((res) => {
- console.log(res, "getRelationTypeTreeList");
- console.log(res);
- });
- // getPersonRelationAtSchool({
- // personId: this.detailId,
- // }).then((res) => {
- // this.personRelationList = res.object.personRelationList;
- // if (this.personRelationList.length) {
- // this.tableData4 = this.personRelationList.map((f) => {
- // return {
- // a: f.nodeName,
- // b: f.relationTypeName,
- // };
- // });
- // }
- // });
getPersonInfo({
id: this.detailId,
type: "PERSON_RELATIONS"
}).then((res) => {
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,
+ c: f.textualResearch,
+ d:
+ res.object.bookList &&
+ res.object.bookList.find((citem) => citem.id == f.bookId)
+ ? "銆�" +
+ res.object.bookList.find((citem) => citem.id == f.bookId)
+ .name +
+ "銆� P" +
+ f.pageNo
+ : ""
};
});
}
if (res.object.personRelationMap.teacherStudent.length) {
- this.tableData3 = res.object.personRelationMap.teacherStudent.map((f) => {
- return {
- a: f.nodeName,
- b: f.relationTypeName,
- };
- });
+ this.tableData3 = res.object.personRelationMap.teacherStudent.map(
+ (f) => {
+ return {
+ a: f.nodeName,
+ b: f.relationTypeName,
+ c: f.textualResearch,
+ d:
+ res.object.bookList &&
+ res.object.bookList.find((citem) => citem.id == f.bookId)
+ ? "銆�" +
+ res.object.bookList.find((citem) => citem.id == f.bookId)
+ .name +
+ "銆� P" +
+ f.pageNo
+ : ""
+ };
+ }
+ );
}
if (res.object.personRelationMap.social.length) {
this.tableData4 = res.object.personRelationMap.social.map((f) => {
return {
a: f.nodeName,
b: f.relationTypeName,
- };
- });
- }
- });
- // 绀句細鍏崇郴
- getPersonRelationAtSchool({
- personId: this.detailId,
- relationSearchTypeEO: "SOCIAL"
- }).then((res) => {
- if (res.list && res.list.length) {
- this.tableData4 = res.list.map((f) => {
- return {
- a: f.name1,
- b: f.relationName
- };
- });
- }
- });
- // 浜插睘鍏崇郴
- getPersonRelationAtSchool({
- personId: this.detailId,
- relationSearchTypeEO: "KINSHIP"
- }).then((res) => {
- console.log(res, "123123");
- if (res.list && res.list.length) {
- this.tableData2 = res.list.map((f) => {
- return {
- a: f.name1,
- b: f.relationName
- };
- });
- }
- });
- // 甯堟壙鍏崇郴
- getPersonRelationAtSchool({
- personId: this.detailId,
- relationSearchTypeEO: "INHERITANCE"
- }).then((res) => {
- if (res.list && res.list.length) {
- this.tableData3 = res.list.map((f) => {
- return {
- a: f.name1,
- b: f.relationName
+ c: f.textualResearch,
+ d:
+ res.object.bookList &&
+ res.object.bookList.find((citem) => citem.id == f.bookId)
+ ? "銆�" +
+ res.object.bookList.find((citem) => citem.id == f.bookId)
+ .name +
+ "銆� P" +
+ f.pageNo
+ : ""
};
});
}
@@ -1027,25 +1002,8 @@
let FontSize = 12; // 瀛椾綋澶у皬
let BorderWidth = 2; // 杈规澶у皬
- let SymbolSize = 80; // 灏哄璺濈
+ let SymbolSize = 50; // 灏哄璺濈
let Distance = 10;
- // 涓嶅悓灏哄涓嬩慨鏀筫charts鐨勫瓧浣�
- if (window.innerWidth > 2560 && window.innerWidth <= 3840) {
- FontSize = 28;
- BorderWidth = 5;
- SymbolSize = 100;
- Distance = 33;
- } else if (window.innerWidth > 1920 && window.innerWidth <= 2560) {
- FontSize = 28;
- BorderWidth = 4;
- SymbolSize = 90;
- Distance = 22;
- } else if (window.innerWidth >= 1366 && window.innerWidth <= 1920) {
- FontSize = 18;
- BorderWidth = 4;
- SymbolSize = 70;
- Distance = 22;
- }
// 鏍规嵁鍏崇郴鏁版嵁鐢熸垚杩炴帴绾�
var links = [];
relationships.forEach((relationship, i) => {
diff --git a/src/pages/fileDetail/index.vue b/src/pages/fileDetail/index.vue
index d38d632..0f51bc1 100644
--- a/src/pages/fileDetail/index.vue
+++ b/src/pages/fileDetail/index.vue
@@ -1,12 +1,22 @@
<template>
- <view id="box">
- <pre v-if="options.outputType == 'XML' || options.outputType == 'JSON'">
- <code>
- {{ data }}
- </code>
- </pre>
- <div v-else-if="'NT'" v-html="data"></div>
- <div v-else-if="'RDF'" v-html="data"></div>
+ <view class="pageBox">
+ <headNav :idIndex="1 + ''" text="涓尰浜虹墿鏁版嵁搴�" />
+ <div class="contentBox">
+ <pre v-if="options.outputType == 'XML' || options.outputType == 'JSON'">
+ <code>
+ {{ data }}
+ </code>
+ </pre>
+ <div v-else-if="options.outputType == 'NT'" v-html="data"></div>
+ <div v-else-if="options.outputType == 'RDF'">
+ <ul>
+ <li v-for="key in Object.keys(data)" class="itemBox">
+ <span style="color: #666;">{{key.split(':')[0]}}:<b style="color: #000">{{key.split(':')[1]}}</b></span>
+ <span>{{data[key]}}</span>
+ </li>
+ </ul>
+ </div>
+ </div>
</view>
</template>
@@ -17,7 +27,7 @@
data() {
return {
options: {},
- data: "",
+ data: ""
};
},
onLoad(options) {
@@ -29,23 +39,46 @@
if (this.options.type == "Person") {
getPersonDataOutput({
personId: this.options.id,
- dataTypeEO: this.options.outputType,
+ dataTypeEO: this.options.outputType
}).then((res) => {
- this.data = res;
+ if (this.options.outputType == 'RDF') {
+ this.data = res.object;
+ } else {
+ this.data = res;
+ }
});
} else {
getMedicalDataOutput(this.options).then((res) => {
this.data = res;
- console.log(this.data, "data");
});
}
- },
- },
+ }
+ }
};
</script>
<style>
-#box {
+.pageBox {
font-size: 14px;
}
+.contentBox {
+ padding: 30px;
+}
+.itemBox{
+ margin-bottom: 10px;
+ display: flex;
+}
+.itemBox span{
+ display: inline-block;
+}
+.itemBox span:first-child{
+ width: 200px;
+ line-height: 40px;
+}
+.itemBox span:last-child{
+ flex: 1;
+ line-height: 40px;
+ border-bottom: 1px solid #ccc;
+}
+
</style>
diff --git a/src/pages/forgetPass/forgetPass.vue b/src/pages/forgetPass/forgetPass.vue
index 1dca867..c4b1853 100644
--- a/src/pages/forgetPass/forgetPass.vue
+++ b/src/pages/forgetPass/forgetPass.vue
@@ -54,7 +54,7 @@
:rules="rules"
:model="resetDataPass"
>
- <el-form-item label="鎵嬫満/閭" prop="cellphoneORmailbox">
+ <el-form-item label="鎵嬫満鍙�/閭" prop="cellphoneORmailbox">
<el-input v-model="resetDataPass.cellphoneORmailbox"></el-input>
</el-form-item>
<el-form-item label="楠岃瘉鐮�" prop="verifyCode">
@@ -200,7 +200,7 @@
cellphoneORmailbox: [
{
required: true,
- message: "璇疯緭鍏ユ墜鏈哄彿",
+ message: "璇疯緭鍏ユ墜鏈哄彿/閭",
trigger: "blur"
},
{
--
Gitblit v1.9.1