From 8288a11ac7af4d4fb40d3d3b038b772ee154f616 Mon Sep 17 00:00:00 2001
From: YM <479443481@qq.com>
Date: 星期一, 22 七月 2024 18:20:19 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/TCM_CharacterLibrary
---
src/pages/academicSchools/index.vue | 599 +++++++++++++++++++++++++++++++----------------------------
1 files changed, 318 insertions(+), 281 deletions(-)
diff --git a/src/pages/academicSchools/index.vue b/src/pages/academicSchools/index.vue
index fdcddfe..45652ba 100644
--- a/src/pages/academicSchools/index.vue
+++ b/src/pages/academicSchools/index.vue
@@ -4,30 +4,148 @@
>
<headNav :idIndex="'6'" text="瀛︽湳娴佹淳" />
<!-- 楂樼骇鎼滅储 -->
- <view style="margin-top: 0.1rem">
+ <view
+ style="
+ padding-left: 0.6rem;
+ margin-top: 0.1rem;
+ display: flex;
+ position: relative;
+ "
+ >
<advancedSearch
@onSearch="onSearch"
- @onSubmit="onSubmit"
- :from="From"
placehold="璇疯緭鍏ュ叧閿瓧"
+ :isAvancedTrue="false"
:keyword="searchKey"
- :advancedSearchBack="advancedSearchBack"
/>
+ <view
+ @click="isAvancedClick"
+ style="
+ color: #244a7b;
+ cursor: pointer;
+ font-size: 0.12rem;
+ margin-left: 0.35rem;
+ line-height: 0.58rem;
+ "
+ >楂樼骇鎼滅储 {{ isAdvancedSearch ? "鈭�" : "鈭�" }}</view
+ >
+ <!-- 鐑棬鎼滅储 -->
+ <view class="flex flex-center hotSearch" style="margin-left: 2rem">
+ 鐑棬鎼滅储锛�
+ <ul class="flex" style="margin-right: 10rpx">
+ <li
+ @click="onSearch({ text: item }, index)"
+ :class="{ cursor: true, active: hotAciveIndex === index }"
+ v-for="(item, index) in hotKeyList"
+ :key="item"
+ >
+ {{ item.name }}
+ </li>
+ </ul>
+ </view>
+ <view v-if="isAdvancedSearch" class="searchDialog">
+ <h3 style="margin-bottom: 0.2rem">楂樼骇鎼滅储</h3>
+ <el-form label-width="100px" :model="formData" size="mini">
+ <el-row>
+ <el-col :span="8">
+ <el-form-item label="濮撳悕/鍒悕锛�">
+ <el-input v-model="formData.name"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="8">
+ <el-form-item label="娲诲姩鍦帮細">
+ <el-select
+ style="width: 100%"
+ v-model="formData.actively"
+ placeholder="璇烽�夋嫨娲诲姩鍦�"
+ >
+ <!-- <el-option label="鍖哄煙涓�" value="shanghai"></el-option> -->
+ <!-- <el-option label="鍖哄煙浜�" value="beijing"></el-option> -->
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="8">
+ <el-form-item label="浣滃搧锛�">
+ <el-input v-model="formData.works"></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="8">
+ <el-form-item label="浜虹墿鏍囩锛�">
+ <el-select
+ style="width: 100%"
+ v-model="formData.personTags"
+ placeholder="璇烽�夋嫨浜虹墿鏍囩"
+ >
+ <!-- <el-option label="鍖哄煙涓�" value="shanghai"></el-option> -->
+ <!-- <el-option label="鍖哄煙浜�" value="beijing"></el-option> -->
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="8">
+ <el-form-item label="绀句細韬唤锛�">
+ <el-select
+ style="width: 100%"
+ v-model="formData.socialIdentity"
+ placeholder="璇烽�夋嫨绀句細韬唤"
+ >
+ <!-- <el-option label="鍖哄煙涓�" value="shanghai"></el-option> -->
+ <!-- <el-option label="鍖哄煙浜�" value="beijing"></el-option> -->
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="8">
+ <el-form-item label="鏃舵湡锛�">
+ <el-select
+ style="width: 100%"
+ v-model="formData.period"
+ placeholder="璇烽�夋嫨鏃舵湡"
+ >
+ <!-- <el-option label="鍖哄煙涓�" value="shanghai"></el-option> -->
+ <!-- <el-option label="鍖哄煙浜�" value="beijing"></el-option> -->
+ </el-select>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ </el-form>
+ <div style="text-align: right">
+ <el-button type="primary" size="mini">鎼滅储</el-button>
+ <el-button size="mini">閲嶇疆</el-button>
+ </div>
+ </view>
+ <div v-if="showPerson" class="personDialog">
+ <i
+ class="el-icon-circle-close closeBtn"
+ @click="
+ () => {
+ showPerson = false;
+ }
+ "
+ ></i>
+ <el-table :data="personList" style="width: 100%">
+ <el-table-column prop="name" label="濮撳悕">
+ <template slot-scope="scope">
+ <span
+ style="color: #409eff; cursor: pointer"
+ @click="
+ () => {
+ currentId = scope.row.id;
+ getData();
+ }
+ "
+ >{{ scope.row.name }}</span
+ >
+ </template>
+ </el-table-column>
+ <el-table-column prop="age" label="鏃朵唬"> </el-table-column>
+ <el-table-column prop="nativePlace" label="绫嶈疮"> </el-table-column>
+ <el-table-column prop="alias" label="鍒悕"> </el-table-column>
+ <el-table-column prop="division" label="鍖诲鍒嗙"> </el-table-column>
+ </el-table>
+ </div>
</view>
- <!-- 鐑棬鎼滅储 -->
- <view class="flex flex-center hotSearch">
- 鐑棬鎼滅储锛�
- <ul class="flex" style="margin-right: 10rpx">
- <li
- @click="onSearch({ text: item }, index)"
- :class="{ cursor: true, active: hotAciveIndex === index }"
- v-for="(item, index) in hotKeyList"
- :key="item"
- >
- {{ item }}
- </li>
- </ul>
- </view>
+
<!-- 鍏崇郴琛ㄥ湴鍥� -->
<div
id="relation"
@@ -47,6 +165,19 @@
>
鏆傛棤鐩稿叧鏁版嵁
</div>
+ <div
+ v-if="loading"
+ v-loading="loading"
+ style="
+ position: absolute;
+ top: 30%;
+ left: 0;
+ right: 0;
+ text-align: center;
+ font-size: 0.2rem;
+ color: #666;
+ "
+ ></div>
</div>
<div id="customDialog" class="customDialog">
<div class="title">
@@ -70,8 +201,10 @@
getPersonData,
getHotSearch,
getPDataStatistics,
+ academicSearch,
} from "@/api/index.js";
import * as echarts from "echarts";
+import MyForm from "@/components/form/form.vue";
export default {
data() {
return {
@@ -82,172 +215,6 @@
nodes: [],
// echarts涓よ�呯殑鍏崇郴
relationships: [],
- // 楂樼骇鎼滅储
- From: {
- from: [
- {
- type: "input",
- label: "濮撳悕",
- name: "name",
- value: "",
- },
- {
- type: "input",
- label: "鍒悕",
- name: "alias",
- value: "",
- },
- {
- type: "input",
- label: "绫嶈疮",
- name: "location",
- value: "",
- },
- {
- type: "select",
- label: "鑱屼笟",
- name: "sdId",
- value: "",
- options: [
- {
- label: "鏈寚鏄�",
- value: "UNKNOWN",
- },
- ],
- },
- {
- type: "input",
- label: "瀹樿亴",
- name: "office",
- value: "",
- },
- {
- type: "select",
- label: "鎬у埆",
- value: "",
- name: "genderTypeEO",
- options: [
- {
- label: "鏈寚鏄�",
- value: "UNKNOWN",
- },
- {
- label: "鐢�",
- value: "MALE",
- },
- {
- label: "濂�",
- value: "WOMAN",
- },
- ],
- },
- {
- type: "input",
- label: "鏃舵湡",
- name: "period",
- value: "",
- },
- {
- type: "input",
- label: "鏈烘瀯",
- name: "inst",
- value: "",
- },
- {
- type: "number",
- label: "椤电爜",
- name: "page",
- value: "",
- },
- {
- type: "number",
- label: "椤靛ぇ灏�",
- name: "pageSize",
- value: "",
- },
- ],
- },
- // 涓嬮潰鐨勬湞浠�1
- dynastyColor: 1,
- // 鏈濅唬
- dynasty: [
- {
- name: "澶忔湞",
- coord: "2070BC",
- id: 1,
- },
- {
- name: "鍟嗘湞",
- id: 2,
- coord: "1600BC",
- },
- {
- name: "瑗垮懆",
- id: 3,
- coord: "1600BC",
- },
- {
- name: "鏄ョ鎴樺浗",
- id: 4,
- coord: "770BC",
- },
- {
- name: "绉︽湞",
- id: 5,
- coord: "221BC",
- },
- {
- name: "姹夋湞",
- id: 6,
- coord: "202BC",
- },
- {
- name: "涓夊浗涓ゆ檵鍗楀寳鏈�",
- id: 7,
- coord: "184",
- },
- {
- name: "闅嬫湞",
- id: 8,
- coord: "581",
- },
- {
- name: "鍞愭湞",
- id: 9,
- coord: "618",
- },
- {
- name: "浜斾唬鍗佸浗",
- id: 10,
- coord: "907",
- },
- {
- name: "杈藉閲�",
- id: 11,
- coord: "907",
- },
- {
- name: "瀹嬫湞",
- id: 12,
- coord: "960",
- },
- {
- name: "鍏冩湞",
- id: 13,
- coord: "1271",
- },
-
- {
- name: "鏄庢湞",
- id: 14,
- coord: "1368",
- },
- {
- name: "娓呮湞",
- id: 15,
- coord: "1636",
- },
- ],
// 鐑棬鎼滅储
hotKeyList: [],
searchKey: "",
@@ -263,6 +230,22 @@
detailData: {
name: "",
},
+ isAdvancedSearch: false,
+ formData: {
+ name: "",
+ actively: "",
+ works: "",
+ personTags: "",
+ socialIdentity: "",
+ period: ""
+ },
+ showPerson: false,
+ personList: [],
+ personPageInfo: {
+ totalCount: 0,
+ page: 1,
+ limit: 10,
+ },
};
},
mounted() {
@@ -271,7 +254,6 @@
this.hotSearch();
// 鐩戝惉绐楀彛澶у皬鍙樺寲
window.addEventListener("resize", this.relation);
- this.innt();
},
onLoad(options) {
this.searchKey = options.keyword;
@@ -288,12 +270,15 @@
const obj = {
personId: ele.personId,
parentId: parent.id,
- id2: personInfo.id,
relationTypeName: ele.relationTypeName,
parentName: parent?.NAME[0]?.content1 ?? parent.parentName,
- name2: personInfo?.NAME[0]?.content1,
+ name: personInfo?.NAME[0]?.content1,
category: type,
+ symbolSize: 15,
};
+ if (order > 80) {
+ order = 80;
+ }
if (str == "literatureList") {
obj.relationTypeName = ele.literatureName;
}
@@ -308,7 +293,7 @@
}
newArr.push(obj);
if (ele["kinList"] && ele["kinList"]?.length) {
- order++;
+ order += 15;
this.getPersonInfo(
ele["kinList"],
"kinList",
@@ -319,7 +304,7 @@
);
}
if (ele["teacherStudentList"] && ele["teacherStudentList"]?.length) {
- order++;
+ order += 15;
this.getPersonInfo(
ele["teacherStudentList"],
"teacherStudentList",
@@ -334,7 +319,7 @@
ele["literatureList"],
"literatureList"
);
- order++;
+ order += 15;
this.getPersonInfo(
data,
"literatureList",
@@ -347,7 +332,7 @@
if (ele["socialList"] && ele["socialList"]?.length) {
const data = this.changeLiterature(ele["socialList"], "socialList");
- order++;
+ order += 15;
this.getPersonInfo(
data,
"socialList",
@@ -359,12 +344,12 @@
}
if (ele["placeList"] && ele["placeList"]?.length) {
const data = this.changeLiterature(ele["placeList"], "placeList");
- order++;
+ order += 15;
this.getPersonInfo(data, "placeList", newArr, order, 4, personInfo);
}
if (ele["schoolList"] && ele["schoolList"]?.length) {
const data = this.changeLiterature(ele["schoolList"], "schoolList");
- order++;
+ order += 15;
this.getPersonInfo(
data,
"schoolList",
@@ -385,16 +370,16 @@
if (!ele.personId && ele.personList?.length) {
ele.literatureList = [];
ele.personId = this.ownInfo.id;
- if (ele[str] && ele[str]?.length) {
- for (let j = 0; j < ele.personList.length; j++) {
- const item = ele.personList[j];
+ if (ele["personList"] && ele["personList"]?.length) {
+ for (let j = 0; j < ele["personList"].length; j++) {
+ const item = ele["personList"][j];
const data = item[str]?.map((e) => {
return {
...e,
personId: item.personId,
};
});
- if (data?.length) {
+ if (ele[str] && data?.length) {
ele[str].push(...data);
}
}
@@ -403,6 +388,8 @@
}
return arr;
},
+
+ // 鏂囩尞
//鏁扮粍鍘婚噸
deduplicateArray(arr, idKey) {
@@ -437,9 +424,9 @@
let place = [];
let school = [];
if (res && res.success && res.object) {
- // console.log(res.object);
this.infoOfPersons = res.object?.infoOfPersons;
this.infoOfSchools = res.object?.infoOfSchools;
+ console.log(res.object);
if (res.object?.personChain) {
this.ownInfo = this.infoOfPersons.find(
(item) => item.id == res.object?.personChain.personId
@@ -507,6 +494,7 @@
this.categories.push({ name: "娲诲姩鍦�" });
let newArr = [];
const data = this.changeLiterature(obj.placeList, "placeList");
+ console.log(data, "place");
this.getPersonInfo(data, "placeList", newArr, 1, 4, this.ownInfo);
place = [...newArr];
}
@@ -533,40 +521,16 @@
...place,
...school,
];
- // const k = personData.filter((item) => item.category == 0);
- // const t = personData.filter((item) => item.category == 1);
- // const l = personData.filter((item) => item.category == 2);
- // const o = personData.filter((item) => item.category == 3);
- // const p = personData.filter((item) => item.category == 4);
- // const s = personData.filter((item) => item.category == 5);
- // const nodesList = [...k, ...t, ...l, ...o, ...p, ...s];
- // console.log(nodesList);
+
personData.forEach((item) => {
- let exists1 = this.nodes.some(
- (node) =>
- node.id === item.parentId && node.name === item.parentName
- );
- let exists2 = this.nodes.some(
- (node) => node.id === item.parentId && node.name === item.name2
- );
- // 璇佹槑涓嶅瓨鍦�
- if (item.name1 && exists1 !== true) {
- this.nodes.push({
- name: item.parentName,
- id: item.parentId,
- ...item,
- });
- }
- if (item.name2 && exists2 !== true) {
- this.nodes.push({
- name: item.name2,
- id: item.id2,
- ...item,
- });
- }
+ this.nodes.push({
+ name: item.name,
+ id: item.personId,
+ ...item,
+ });
let obj = {
source: item.parentName,
- target: item.name2,
+ target: item.name,
relation: item.relationTypeName || "", // 濡傛灉瀛樺湪 relationName 瀛楁鍒欎娇鐢紝鍚﹀垯涓虹┖瀛楃涓�
};
this.relationships.push(obj);
@@ -583,6 +547,23 @@
// 鍋囪鎮ㄦ湁鑺傜偣鍚嶇О鍜屽畠浠箣闂寸殑鍏崇郴鏁版嵁
var nodes = this.deduplicateArray(this.nodes, "id");
var relationships = this.relationships;
+
+ nodes = nodes.map((item) => {
+ let size = item.symbolSize;
+ for (let i = 0; i < relationships.length; i++) {
+ const linkItem = relationships[i];
+ if (linkItem.source == item.parentName) {
+ size += 5;
+ }
+ if (linkItem.target == item.parentName) {
+ size += 5;
+ }
+ }
+ return {
+ ...item,
+ symbolSize: size > 80 ? 80 : size,
+ };
+ });
let FontSize = 12; // 瀛椾綋澶у皬
let BorderWidth = 2; // 杈规澶у皬
@@ -609,7 +590,7 @@
var links = [];
relationships.forEach((relationship, i) => {
var sourceIndex = nodes.findIndex(
- (node) => node.name === relationship.source
+ (node) => node.parentName === relationship.source
);
var targetIndex = nodes.findIndex(
(node) => node.name === relationship.target
@@ -645,13 +626,13 @@
var nodeData = nodes;
var option;
option = {
- backgroundColor: {
- type: "image",
- image: "/static/image/characterRelationBg.png",
- size: "100% 100%", // 鑳屾櫙鍥剧墖鐨勫昂瀵革紝鍙互鏄櫨鍒嗘瘮鎴栬�呭儚绱�
- position: "center center", // 鑳屾櫙鍥剧墖鐨勪綅缃紝鍙互鏄� top, bottom, middle 鎴栬�呯櫨鍒嗘瘮
- },
- tooltip: {},
+ // backgroundColor: {
+ // type: "image",
+ // image: "/static/image/characterRelationBg.png",
+ // size: "100% 100%", // 鑳屾櫙鍥剧墖鐨勫昂瀵革紝鍙互鏄櫨鍒嗘瘮鎴栬�呭儚绱�
+ // position: "center center", // 鑳屾櫙鍥剧墖鐨勪綅缃紝鍙互鏄� top, bottom, middle 鎴栬�呯櫨鍒嗘瘮
+ // },
+ // tooltip: {},
legend: [
{
left: 20,
@@ -665,9 +646,9 @@
series: [
{
type: "graph",
- legendHoverLink: true,
+ legendHoverLink: false,
layout: "force",
- symbolSize: 40,
+ symbolSize: 15,
data: nodeData,
links: links,
categories: this.categories,
@@ -748,34 +729,50 @@
},
// 鍩虹鎼滅储
onSearch(val, index) {
+ console.log(val);
if (index !== undefined) {
+ // 鐑棬鎼滅储鍏抽敭瀛楋紝鐩存帴鏌ヨ鏁版嵁
this.searchKey = "";
this.hotAciveIndex = index;
+ this.currentId = val.text.id;
+ this.getData();
} else {
this.hotAciveIndex = "";
+ // 鎼滅储鍏堟樉绀轰汉鐗╁垪琛�
+ this.personPageInfo.page = 1;
+ this.searchPerson(val.text);
}
- this.getData(val.text);
},
- // 楂樼骇鎼滅储
- onSubmit(val) {
- getAdvanceSearch({
- ...val,
- page: 1,
- pageSize: 100,
+ // 鏍规嵁鍏抽敭瀛楁绱汉鐗�
+ searchPerson(key) {
+ academicSearch({
+ keyword: key,
+ page: this.personPageInfo.page,
+ pageSize: this.personPageInfo.limit,
}).then((res) => {
- console.log(res, "res");
- });
- },
- advancedSearchBack() {
- uni.navigateTo({
- url: "/pages/knowledgeBase/knowledgeBase",
- });
- },
- // 鐐瑰嚮涓嬮潰鐨勬湞浠ｆ寜閽�
- dynastyBottomClick(item) {
- this.dynastyColor = item.id;
- this.onSearch({
- text: item.name,
+ this.personList = res.list.map((item) => {
+ return {
+ id: item.personId,
+ name: item.name,
+ age:
+ item.periodList && item.periodList.length
+ ? item.periodList[0].content2
+ : "-",
+ nativePlace:
+ item.nativePlaceList && item.nativePlaceList.length
+ ? item.nativePlaceList[0].content1
+ : "-",
+ alias:
+ item.aliasList && item.aliasList.length
+ ? item.aliasList[0].content2
+ : "-",
+ division:
+ item.medicalBranchList && item.medicalBranchList.length
+ ? item.medicalBranchList[0].content1
+ : "-",
+ };
+ });
+ this.showPerson = true;
});
},
// 鍏崇郴鍥� 鐐瑰嚮閲岄潰鐨勫厓绱�
@@ -804,40 +801,37 @@
const indexList = Object.keys(res.object);
indexList.sort((a, b) => parseInt(b) - parseInt(a));
this.hotKeyList = indexList.map((item) => {
- return res.object[item];
+ return {
+ id: item,
+ name: res.object[item],
+ };
});
});
},
-
- // 楂樼骇鎼滅储閲岄潰鑱屼笟鐨勪笅鎷夎彍鍗�
- innt() {
- getPDataStatistics().then((res) => {
- const professionIndex = this.From.from.findIndex(
- (field) => field.label === "鑱屼笟"
- );
- // 濡傛灉鎵惧埌浜嗚亴涓氬瓧娈�
- if (professionIndex !== -1) {
- // 灏� profession.list 杞崲涓� options 鏍煎紡
- const options = res.object.occupationStatistic.details.map(
- (item) => ({
- label: item.tagName,
- value: item.tagId.toString(), // 灏� id 杞崲涓哄瓧绗︿覆锛岀‘淇濅笌 value 绫诲瀷涓�鑷�
- })
- );
- // 鏇存柊鑱屼笟瀛楁鐨� options 灞炴��
- this.$set(this.From.from[professionIndex], "options", options);
- }
- });
+ isAvancedClick() {
+ this.isAdvancedSearch = !this.isAdvancedSearch;
+ // this.$nextTick(() => {
+ // var box1Height = document.querySelector(".fbox").offsetHeight;
+ // // let box2Height= document.querySelector('.fbox1').style.height = box1Height + 'px';
+ // let box2Height = document.querySelector(".fbox1").offsetHeight;
+ // if (box1Height <= box2Height) {
+ // document.querySelector(".fbox1").style.height = box1Height + "px";
+ // }
+ // });
},
},
};
</script>
<style>
-#relatio {
+#relation {
width: 100%;
height: 100%;
position: relative;
+ background-image: url("../../static/image/characterRelationBg.png");
+ background-size: 100% 100%;
+ background-repeat: no-repeat;
+ background-position: center;
}
.customDialog {
@@ -918,5 +912,48 @@
.hotSearch {
font-size: 0.12rem;
color: #2c2c2c;
+
+ li {
+ color: #244a7b;
+ margin: 0 0.1rem;
+ color: #244a7b;
+ &.active {
+ color: #027edc;
+ font-weight: bold;
+ }
+ }
+}
+
+.searchDialog {
+ position: absolute;
+ top: 0.68rem;
+ left: 0;
+ right: 0;
+ z-index: 999;
+ padding: 0.1rem 0.4rem;
+ background: #fff;
+ min-height: 2rem;
+}
+
+.personDialog {
+ position: absolute;
+ top: 0.68rem;
+ z-index: 999;
+ padding: 0.1rem;
+ background: #fff;
+ border-radius: 6px;
+ box-shadow: 0 0 10px -3px #000;
+ .closeBtn {
+ position: absolute;
+ right: -10px;
+ top: -10px;
+ width: 24px;
+ height: 24px;
+ font-size: 24px;
+ background-color: #fff;
+ border-radius: 50%;
+ color: #f56c6c;
+ cursor: pointer;
+ }
}
</style>
--
Gitblit v1.9.1