From 1b27559a90417a6f608be0c61e88a6f9e3ea1b40 Mon Sep 17 00:00:00 2001
From: QYF-GitLab1 <1940665526@qq.com>
Date: 星期五, 26 七月 2024 11:53:31 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/TCM_CharacterLibrary
---
src/pages/academicSchools/index.vue | 140 ++++++++++++++++++++++++++--------------------
1 files changed, 78 insertions(+), 62 deletions(-)
diff --git a/src/pages/academicSchools/index.vue b/src/pages/academicSchools/index.vue
index e8a2f12..2d1985b 100644
--- a/src/pages/academicSchools/index.vue
+++ b/src/pages/academicSchools/index.vue
@@ -2,7 +2,7 @@
<view
style="width: 100%; height: 100%; display: flex; flex-direction: column"
>
- <headNav :idIndex="'6'" text="瀛︽湳娴佹淳" />
+ <headNav :idIndex="'6'" text="瀛︽湳鍥捐氨" />
<!-- 楂樼骇鎼滅储 -->
<view
style="
@@ -135,12 +135,21 @@
<el-button
size="mini"
style="background-color: #244a7b; color: #fff"
- @click="searchFun"
+ @click="
+ () => {
+ searchKey = '';
+ formData.page = 1;
+ searchFun();
+ }
+ "
>鎼滅储</el-button
>
<el-button size="mini" @click="resetForm">閲嶇疆</el-button>
</div>
</el-form>
+ <div style="font-size: 14px">
+ 娉�:褰撳墠鏁版嵁杈冨锛屽彲鑳戒細鍑虹幇鍗℃鐨勬儏鍐碉紝璇峰敖閲忕簿纭煡璇㈡垨鏌ョ湅鏌愪竴绫绘暟鎹叧绯�
+ </div>
<div class="fromTable">
<el-table
:data="tableData"
@@ -201,7 +210,7 @@
background
@size-change="handleSizeChangeForm"
@current-change="handleCurrentChangeForm"
- :current-page="formData.currentPage"
+ :current-page="formData.page"
:page-sizes="[10, 20, 60, 100]"
:page-size="formData.pageSize"
layout="total, sizes, prev, pager, next, jumper"
@@ -220,7 +229,7 @@
}
"
></i>
- <el-table :data="personList" style="width: 100%">
+ <el-table :data="personList" style="width: 100%" :max-height="600">
<el-table-column prop="name" label="濮撳悕">
<template slot-scope="scope">
<span
@@ -290,7 +299,7 @@
<p>鍖诲鍒嗙锛� {{ detailData.medicalBranch }}</p>
<p>灏忎紶锛歿{ detailData.biography }}</p>
</div>
- <div class="btn" @click="spaceTimeArr(detailData.id)">鏌ョ湅鏇村>>></div>
+ <div class="btn" @click="spaceTimeArr(detailData.id, 1)">鏌ョ湅鏇村>>></div>
</div>
<div id="schoolDialog" class="customDialog">
<div class="title">
@@ -298,13 +307,12 @@
<span @click="closeDom">鍏抽棴</span>
</div>
<div class="content">
- <p>濮撳悕锛歿{ detailData.name }}</p>
- <p>鍒悕锛歿{ detailData.alias }}</p>
- <p>绫嶈疮锛歿{ detailData.nativePlace }}</p>
- <p>鍖诲鍒嗙锛� {{ detailData.medicalBranch }}</p>
- <p>灏忎紶锛歿{ detailData.biography }}</p>
+ <p>浠ｈ〃浜虹墿锛歿{ detailData.character }}</p>
+ <p>閲嶈鍖诲锛歿{ detailData.skilledDoctor }}</p>
+ <p>浠ｈ〃鎬ц憲浣滐細{{ detailData.works }}</p>
+ <p>瀛︽淳鎬濇兂锛� {{ detailData.thought }}</p>
</div>
- <div class="btn" @click="spaceTimeArr(detailData.id)">鏌ョ湅鏇村>>></div>
+ <div class="btn" @click="spaceTimeArr(detailData.id, 2)">鏌ョ湅鏇村>>></div>
</div>
<el-drawer
title="鍦板潃鍒楄〃"
@@ -314,12 +322,12 @@
class="customDrawer"
>
<div class="drawerContent">
- <div class="drawerTips">閬镐腑鐨勫湴鍧�锛�</div>
+ <div class="drawerTips">閫変腑鐨勫湴鍧�锛�</div>
<div class="drawerTable">
<div class="tableTabs">
<div class="inputItem">
<el-input
- placeholder="璜嬭几鍏ュ湴鍚嶆悳绱�"
+ placeholder="璇疯緭鍏ュ湴鍚嶆悳绱�"
v-model="tableKey"
class="input-with-select"
@keyup.enter="searchAddress"
@@ -333,7 +341,7 @@
</el-input>
</div>
<div class="selectItem">
- <el-select v-model="dynastyId" placeholder="璜嬮伕鎿囨檪鏈�">
+ <el-select v-model="dynastyId" placeholder="璇烽�夋嫨鏃舵湡">
<el-option
v-for="item in dynastyData"
:key="item.dynastyId + '0'"
@@ -353,14 +361,14 @@
>
<el-table-column type="selection" width="55"> </el-table-column>
<el-table-column prop="currentName" label="鍦板悕"> </el-table-column>
- <el-table-column width="250" label="骞翠唬鍗�闁�">
+ <el-table-column width="250" label="骞翠唬鍖洪棿">
<template slot-scope="scope">{{
scope.row.start + "-" + scope.row.end
}}</template>
</el-table-column>
<el-table-column
prop="dynastyName"
- label="鏅傛湡"
+ label="鏃舵湡"
width="250"
show-overflow-tooltip
>
@@ -373,7 +381,7 @@
background
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
- :current-page="currentPage"
+ :current-page="page"
:page-sizes="[10, 20, 60, 100]"
:page-size="pageSize"
layout="total, sizes, prev, pager, next, jumper"
@@ -382,9 +390,9 @@
</el-pagination>
</div>
<div class="drawerBtn">
- <el-button @click="setCurrent">鍏ㄩ伕鐣跺墠闋�</el-button>
- <el-button @click="setCurrent('cancle')">鍙栨秷鍏ㄩ伕</el-button>
- <el-button @click="drawer = false" type="primary">纰哄畾</el-button>
+ <el-button @click="setCurrent">鍏ㄩ�夊綋鍓嶉〉</el-button>
+ <el-button @click="setCurrent('cancle')">鍙栨秷鍏ㄩ��</el-button>
+ <el-button @click="drawer = false" type="primary">纭畾</el-button>
</div>
</div>
</el-drawer>
@@ -400,7 +408,7 @@
getSocialDistinction,
getDynastyAll,
getAdvancedData,
- getPlaceInfo,
+ getPlaceInfo
} from "@/api/index.js";
import * as echarts from "echarts";
export default {
@@ -436,8 +444,8 @@
name: "娲诲姩鍦�",
},
{
- name: "瀛︽湳娴佹淳",
- },
+ name: "瀛︽湳娴佹淳"
+ }
],
// 褰撳墠浜虹墿淇℃伅
ownInfo: null,
@@ -455,7 +463,7 @@
page: 1,
currentPage: 1,
pageSize: 10,
- total: 0,
+ total: 0
},
showPerson: false,
personList: [],
@@ -500,10 +508,11 @@
methods: {
// 鎼滅储鍦板潃
searchAddress() {
+ this.page = 1;
this.gridData = [];
this.getAddressList();
},
- // 鍒嗛〉
+ // 鍒嗛〉
handleSizeChange(val) {
this.pageSize = val;
this.getAddressList();
@@ -607,15 +616,17 @@
page: 1,
currentPage: 1,
pageSize: 10,
- total: 0,
+ total: 0
};
+ this.formData.page = 1;
+ this.searchFun();
},
searchFun() {
const palceData = this.formData.actively?.map((item) => {
return {
ancientName: item.ancientName ?? "",
dynastyId: item.dynastyId,
- currentName: item.currentName,
+ currentName: item.currentName
};
});
let Obj = {
@@ -626,7 +637,7 @@
socialDistinctionIdList: this.formData.socialIdentity,
dynastyIdList: this.formData.period,
page: this.formData.page,
- pageSize: this.formData.pageSize,
+ pageSize: this.formData.pageSize
};
// // 鎼滅储
getAdvancedData(Obj).then((res) => {
@@ -713,7 +724,7 @@
}
});
return data;
- }).join() ?? "",
+ }).join() ?? ""
};
});
if (res?.npage) {
@@ -983,7 +994,7 @@
// place = [...newArr];
// }
// if (obj.schoolList?.length) {
- // this.categories.push({ name: "瀛︽湳娴佹淳" });
+ // this.categories.push({ name: "瀛︽湳鍥捐氨" });
// let newArr = [];
// const data = this.changeLiterature(obj.schoolList, "schoolList");
// this.getPersonInfo(
@@ -1213,7 +1224,7 @@
if (item.placeList && item.placeList.length) {
this.handleData(item.placeList, { ...item, thisType: 3 });
}
- // 瀛︽湳娴佹淳
+ // 瀛︽湳鍥捐氨
if (item.schoolList && item.schoolList.length) {
this.handleData(item.schoolList, { ...item, thisType: 4 });
}
@@ -1345,6 +1356,8 @@
const e = params.event;
const div = document.getElementById("customDialog");
div.style.display = "block";
+ const div2 = document.getElementById("schoolDialog");
+ div2.style.display = "none";
div.style.left = e.offsetX + 50 + "px";
div.style.top = e.offsetY - 50 + "px";
const data = this.infoOfPersons?.find((i) => i.id == id);
@@ -1379,32 +1392,26 @@
const e = params.event;
const div = document.getElementById("schoolDialog");
div.style.display = "block";
+ const div2 = document.getElementById("customDialog");
+ div2.style.display = "none";
div.style.left = e.offsetX + 50 + "px";
div.style.top = e.offsetY - 50 + "px";
- const data = this.infoOfPersons?.find((i) => i.id == id);
+ const data = this.infoOfSchools?.find((i) => i.schoolId == id);
const obj = {
- id: params.data.id,
- name:
- data?.NAME?.map((e, i) => {
- i += 1;
- return e["content" + i];
- }).join("銆�") ?? "",
- alias:
- data?.ALIAS?.map((e, i) => {
- i += 1;
- return e["content" + i];
- }).join("銆�") ?? "",
- nativePlace:
- data?.NATIVE_PLACE?.map((e, i) => {
- i += 1;
- return e["content" + i];
- }).join("銆�") ?? "",
- medicalBranch:
- data?.MEDICAL_BRANCH?.map((e, i) => {
- i += 1;
- return e["content" + i];
- }).join("銆�") ?? "",
- biography: data?.BIOGRAPHY ?? "",
+ id: id,
+ name: data.name[0],
+ character: data.important_people
+ ? data.important_people.map((item) => item.personName).join("銆�")
+ : "",
+ skilledDoctor: data.important_physician
+ ? data.important_physician.map((item) => item.personName).join("銆�")
+ : "",
+ works: data.important_work
+ ? data.important_work.map((item) => item.literatureTitle).join("銆�")
+ : "",
+ thought: data.school_introduction
+ ? data.school_introduction.join("銆�")
+ : ""
};
this.detailData = obj;
}
@@ -1413,6 +1420,8 @@
closeDom() {
const div = document.getElementById("customDialog");
div.style.display = "none";
+ const div2 = document.getElementById("schoolDialog");
+ div2.style.display = "none";
},
// 鍩虹鎼滅储
@@ -1435,8 +1444,8 @@
searchPerson(key) {
academicSearch({
keyword: key,
- page: this.personPageInfo.page,
- pageSize: this.personPageInfo.limit,
+ page: 1,
+ pageSize: 999
}).then((res) => {
this.personList = res.list.map((item) => {
return {
@@ -1465,11 +1474,18 @@
},
// 鍏崇郴鍥� 鐐瑰嚮閲岄潰鐨勫厓绱�
- spaceTimeArr(id) {
- // 鍏崇郴鍥剧殑鏁版嵁
- uni.navigateTo({
- url: "/pages/character/detail?id=" + id,
- });
+ spaceTimeArr(id, type) {
+ if (type == 1) {
+ // 浜虹墿
+ uni.navigateTo({
+ url: "/pages/character/detail?id=" + id
+ });
+ } else {
+ // 瀛︽淳
+ uni.navigateTo({
+ url: "/pages/academicGenres/detail?id=" + id
+ });
+ }
},
// 鑾峰彇鏈濅唬echarts鐨勬暟鎹�
@@ -1637,7 +1653,7 @@
min-height: 240px;
display: none;
position: fixed;
- z-index: 99999999;
+ z-index: 9999999;
border-radius: 2px;
background: #fff;
}
--
Gitblit v1.9.1