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 | 63 +++++++++++++++++++------------
1 files changed, 38 insertions(+), 25 deletions(-)
diff --git a/src/pages/academicSchools/index.vue b/src/pages/academicSchools/index.vue
index 62ff658..2d1985b 100644
--- a/src/pages/academicSchools/index.vue
+++ b/src/pages/academicSchools/index.vue
@@ -299,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">
@@ -312,7 +312,7 @@
<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="鍦板潃鍒楄〃"
@@ -322,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"
@@ -341,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'"
@@ -361,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
>
@@ -390,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>
@@ -408,7 +408,7 @@
getSocialDistinction,
getDynastyAll,
getAdvancedData,
- getPlaceInfo,
+ getPlaceInfo
} from "@/api/index.js";
import * as echarts from "echarts";
export default {
@@ -444,7 +444,7 @@
name: "娲诲姩鍦�",
},
{
- name: "瀛︽湳鍥捐氨"
+ name: "瀛︽湳娴佹淳"
}
],
// 褰撳墠浜虹墿淇℃伅
@@ -463,7 +463,7 @@
page: 1,
currentPage: 1,
pageSize: 10,
- total: 0,
+ total: 0
},
showPerson: false,
personList: [],
@@ -616,7 +616,7 @@
page: 1,
currentPage: 1,
pageSize: 10,
- total: 0,
+ total: 0
};
this.formData.page = 1;
this.searchFun();
@@ -626,7 +626,7 @@
return {
ancientName: item.ancientName ?? "",
dynastyId: item.dynastyId,
- currentName: item.currentName,
+ currentName: item.currentName
};
});
let Obj = {
@@ -637,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) => {
@@ -724,7 +724,7 @@
}
});
return data;
- }).join() ?? "",
+ }).join() ?? ""
};
});
if (res?.npage) {
@@ -1356,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);
@@ -1390,11 +1392,13 @@
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.infoOfSchools?.find((i) => i.schoolId == id);
const obj = {
- id: params.data.id,
+ id: id,
name: data.name[0],
character: data.important_people
? data.important_people.map((item) => item.personName).join("銆�")
@@ -1406,8 +1410,8 @@
? data.important_work.map((item) => item.literatureTitle).join("銆�")
: "",
thought: data.school_introduction
- ? data.school_introduction.map((item) => item).join("銆�")
- : "",
+ ? data.school_introduction.join("銆�")
+ : ""
};
this.detailData = obj;
}
@@ -1416,6 +1420,8 @@
closeDom() {
const div = document.getElementById("customDialog");
div.style.display = "none";
+ const div2 = document.getElementById("schoolDialog");
+ div2.style.display = "none";
},
// 鍩虹鎼滅储
@@ -1468,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鐨勬暟鎹�
--
Gitblit v1.9.1