From 571e12ca122d12f20689e3040a0f368ef1ae8850 Mon Sep 17 00:00:00 2001
From: YM <479443481@qq.com>
Date: 星期五, 26 七月 2024 11:16:08 +0800
Subject: [PATCH] 1
---
src/pages/academicSchools/index.vue | 152 ++++++++++++++++++++++++++++++++++----------------
1 files changed, 102 insertions(+), 50 deletions(-)
diff --git a/src/pages/academicSchools/index.vue b/src/pages/academicSchools/index.vue
index 8b05a64..0bb5433 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="
@@ -149,13 +149,14 @@
empty-text="鏆傛棤鎼滅储淇℃伅"
size="small"
:border="true"
+ :height="tableData.length > 0 ? '443' : 'auto'"
>
<el-table-column
prop="id"
label="搴忓彿"
width="70"
></el-table-column>
- <el-table-column prop="name" width="120" label="濮撳悕">
+ <el-table-column prop="name" width="150" label="濮撳悕">
<template slot-scope="scope">
<a
style="cursor: pointer; color: #027edc"
@@ -175,22 +176,22 @@
<el-table-column
prop="medicalBranch"
label="鍖诲鍒嗙"
- width="120"
+ width="150"
></el-table-column>
<el-table-column prop="workName" label="浣滃搧"></el-table-column>
<el-table-column
prop="personLabel"
- width="120"
+ width="150"
label="浜虹墿鏍囩"
></el-table-column>
<el-table-column
prop="socialDistinction"
label="绀句細韬唤"
- width="120"
+ width="150"
></el-table-column>
<el-table-column
prop="period"
- width="120"
+ width="150"
label="鏃舵湡"
></el-table-column>
</el-table>
@@ -198,8 +199,8 @@
<el-pagination
class="paging flex"
background
- @size-change="handleSizeChange"
- @current-change="handleCurrentChange"
+ @size-change="handleSizeChangeForm"
+ @current-change="handleCurrentChangeForm"
:current-page="formData.currentPage"
:page-sizes="[10, 20, 60, 100]"
:page-size="formData.pageSize"
@@ -219,7 +220,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
@@ -248,7 +249,7 @@
style="margin-top: 0.1rem; flex: 1; width: 100%; position: relative"
>
<div
- v-if="!loading && links.length == 0"
+ v-if="!loading && nodeDatas.length == 0"
style="
position: absolute;
top: 30%;
@@ -434,7 +435,7 @@
name: "娲诲姩鍦�"
},
{
- name: "瀛︽湳娴佹淳"
+ name: "瀛︽湳鍥捐氨"
}
],
// 褰撳墠浜虹墿淇℃伅
@@ -501,7 +502,7 @@
this.gridData = [];
this.getAddressList();
},
- // 鍒嗛〉
+ // 鍒嗛〉
handleSizeChange(val) {
this.pageSize = val;
this.getAddressList();
@@ -509,6 +510,15 @@
handleCurrentChange(val) {
this.page = val;
this.getAddressList();
+ },
+
+ handleSizeChangeForm(val) {
+ this.formData.pageSize = val;
+ this.searchFun();
+ },
+ handleCurrentChangeForm(val) {
+ this.formData.page = val;
+ this.searchFun();
},
// 琛ㄦ牸閫夋嫨
handleSelectionChange(val) {
@@ -599,7 +609,6 @@
total: 0,
};
},
-
searchFun() {
const palceData = this.formData.actively?.map((item) => {
return {
@@ -626,48 +635,90 @@
id: item.personId,
name:
item?.NAME?.map((e, i) => {
- i += 1;
- return e["content" + i];
- }).join("銆�") ?? "",
+ let data = [];
+ Object.entries(e).forEach((c) => {
+ if (c[0]?.indexOf("content") > -1) {
+ data.push(c[1]);
+ }
+ });
+ return data;
+ }).join() ?? "",
alias:
item?.ALIAS?.map((e, i) => {
- i += 1;
- return e["content" + i];
- }).join("銆�") ?? "",
+ let data = [];
+ Object.entries(e).forEach((c) => {
+ if (c[0]?.indexOf("content") > -1) {
+ data.push(c[1]);
+ }
+ });
+ return data;
+ }).join() ?? "",
place:
item?.NATIVE_PLACE?.map((e, i) => {
- i += 1;
- return e["content" + i];
- }).join("銆�") ?? "",
+ let data = [];
+ Object.entries(e).forEach((c) => {
+ if (c[0]?.indexOf("content") > -1) {
+ data.push(c[1]);
+ }
+ });
+ return data;
+ }).join() ?? "",
medicalBranch:
item?.MEDICAL_BRANCH?.map((e, i) => {
- i += 1;
- return e["content" + i];
- }).join("銆�") ?? "",
+ let data = [];
+ Object.entries(e).forEach((c) => {
+ if (c[0]?.indexOf("content") > -1) {
+ data.push(c[1]);
+ }
+ });
+ return data;
+ }).join() ?? "",
socialDistinction:
item?.SOCIAL_IDENTITY?.map((e, i) => {
- i += 1;
- return e["content" + i];
- }).join("銆�") ?? "",
+ let data = [];
+ Object.entries(e).forEach((c) => {
+ if (c[0]?.indexOf("content") > -1) {
+ data.push(c[1]);
+ }
+ });
+ return data;
+ }).join() ?? "",
period:
item?.PERIOD?.map((e, i) => {
- i += 1;
- return e["content" + i];
- }).join("銆�") ?? "",
+ let data = [];
+ Object.entries(e).forEach((c) => {
+ if (c[0]?.indexOf("content") > -1) {
+ data.push(c[1]);
+ }
+ });
+ return data;
+ }).join() ?? "",
workName:
item?.REPRESENTATIVE_WORKS?.map((e, i) => {
- i += 1;
- return e["content" + i];
- }).join("銆�") ?? "",
+ let data = [];
+ Object.entries(e).forEach((c) => {
+ if (c[0]?.indexOf("content") > -1) {
+ data.push(c[1]);
+ }
+ });
+ return data;
+ }).join() ?? "",
personLabel:
item?.PERSON_LABEL?.map((e, i) => {
- i += 1;
- return e["content" + i];
- }).join("銆�") ?? "",
+ let data = [];
+ Object.entries(e).forEach((c) => {
+ if (c[0]?.indexOf("content") > -1) {
+ data.push(c[1]);
+ }
+ });
+ return data;
+ }).join() ?? "",
};
});
- // 鎬绘暟閲�
- this.formData.total = res.npage.totalCount;
+ if (res?.npage) {
+ // 鎬绘暟閲�
+ this.formData.total = res.npage.totalCount;
+ }
}
});
},
@@ -931,7 +982,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(
@@ -1161,7 +1212,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 });
}
@@ -1359,7 +1410,6 @@
// 鍩虹鎼滅储
onSearch(val, index) {
- console.log(val);
if (index !== undefined) {
// 鐑棬鎼滅储鍏抽敭瀛楋紝鐩存帴鏌ヨ鏁版嵁
this.searchKey = "";
@@ -1378,8 +1428,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 {
@@ -1472,6 +1522,14 @@
font-size: 14px;
}
+.fromTable
+ .drawerPage
+ >>> .el-pagination.is-background
+ .el-pager
+ li:not(.disabled).active {
+ background-color: rgb(36, 74, 123) !important;
+}
+
.customDrawer >>> .el-drawer__header {
margin-bottom: 20px;
border-bottom: 1px solid #eee;
@@ -1513,12 +1571,6 @@
justify-content: flex-end;
padding: 20px 0;
box-sizing: border-box;
-}
-
-.drawerPage
- >>> .el-pagination.is-background
- .el-pager
- li:not(.disabled).active {
}
.drawerBtn {
--
Gitblit v1.9.1