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 | 14 +++++++-------
src/pages/Register/Register.vue | 4 ++--
src/pages/academicGenres/chart.vue | 2 +-
src/api/index.js | 4 ++--
src/components/headNav/headNav.vue | 4 ++--
src/pages/index/index.vue | 4 ++--
src/pages/Login/Login.vue | 4 ++--
src/pages/academicGenres/index.vue | 2 +-
src/pages/changePassword/changePassword.vue | 4 ++--
src/pages/academicGenres/detail.vue | 2 +-
10 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/src/api/index.js b/src/api/index.js
index 9f6ac7e..cff73ae 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -272,7 +272,7 @@
});
};
-// 瀛︽湳娴佹淳
+// 瀛︽湳鍥捐氨
export const getDynastyStatistics = () => {
return req1({
url: "/school/dynasty/statistics",
@@ -310,7 +310,7 @@
});
};
-// 鏌ヨ浜虹墿瀛︽湳娴佹淳
+// 鏌ヨ浜虹墿瀛︽湳鍥捐氨
export const getSchoolInfo = (id) => {
return req1({
url: "/person/chain/search/school?schoolId=" + id + "&maxStep=3",
diff --git a/src/components/headNav/headNav.vue b/src/components/headNav/headNav.vue
index 64c56dd..180027a 100644
--- a/src/components/headNav/headNav.vue
+++ b/src/components/headNav/headNav.vue
@@ -144,10 +144,10 @@
<span slot="title">瀹跺浼犳壙</span>
</el-menu-item>
<el-menu-item index="6">
- <span slot="title">瀛︽湳娴佹淳</span>
+ <span slot="title">瀛︽湳鍥捐氨</span>
</el-menu-item>
<el-menu-item index="3">
- <span slot="title">瀛︽湳鍥捐氨</span>
+ <span slot="title">瀛︽湳娴佹淳</span>
</el-menu-item>
<el-menu-item index="4">
<span slot="title">鍦板煙鍥捐氨</span>
diff --git a/src/pages/Login/Login.vue b/src/pages/Login/Login.vue
index bb49c2c..f118fc5 100644
--- a/src/pages/Login/Login.vue
+++ b/src/pages/Login/Login.vue
@@ -243,11 +243,11 @@
id: 2
},
{
- name: "瀛︽湳娴佹淳",
+ name: "瀛︽湳鍥捐氨",
id: 6
},
{
- name: "瀛︽湳鍥捐氨",
+ name: "瀛︽湳娴佹淳",
id: 3
},
{
diff --git a/src/pages/Register/Register.vue b/src/pages/Register/Register.vue
index 85cba92..63d83f8 100644
--- a/src/pages/Register/Register.vue
+++ b/src/pages/Register/Register.vue
@@ -301,11 +301,11 @@
id: 2
},
{
- name: "瀛︽湳娴佹淳",
+ name: "瀛︽湳鍥捐氨",
id: 6
},
{
- name: "瀛︽湳鍥捐氨",
+ name: "瀛︽湳娴佹淳",
id: 3
},
{
diff --git a/src/pages/academicGenres/chart.vue b/src/pages/academicGenres/chart.vue
index afae207..3cc5b8c 100644
--- a/src/pages/academicGenres/chart.vue
+++ b/src/pages/academicGenres/chart.vue
@@ -3,7 +3,7 @@
style="width: 100%; height: 100%; display: flex; flex-direction: column"
>
<!-- 椤堕儴瀵艰埅 -->
- <headNav :idIndex="3 + ''" text="瀛︽湳鍥捐氨" />
+ <headNav :idIndex="3 + ''" text="瀛︽湳娴佹淳" />
<view class="Midde flex">
<!-- <view class="MiddeBack">杩斿洖</view> -->
<el-button class="MiddeBack flex flex-center" @click="goBack"
diff --git a/src/pages/academicGenres/detail.vue b/src/pages/academicGenres/detail.vue
index 3b27a9b..e42a8b2 100644
--- a/src/pages/academicGenres/detail.vue
+++ b/src/pages/academicGenres/detail.vue
@@ -1,7 +1,7 @@
<template>
<view class="bag">
<!-- 椤堕儴瀵艰埅 -->
- <headNav idIndex="3" text="瀛︽湳鍥捐氨" />
+ <headNav idIndex="3" text="瀛︽湳娴佹淳" />
<view class="Midde flex">
<!-- <view class="MiddeBack">杩斿洖</view> -->
<el-button class="MiddeBack flex flex-center" @click="goBack"
diff --git a/src/pages/academicGenres/index.vue b/src/pages/academicGenres/index.vue
index 90a64e9..ebc146c 100644
--- a/src/pages/academicGenres/index.vue
+++ b/src/pages/academicGenres/index.vue
@@ -1,7 +1,7 @@
<template>
<view style="width: 100%;height: 100%;display: flex;flex-direction: column;">
<!-- 椤堕儴瀵艰埅 -->
- <headNav :idIndex="idIndex" text="瀛︽湳鍥捐氨" />
+ <headNav :idIndex="idIndex" text="瀛︽湳娴佹淳" />
<view id="line-chart" style="flex: 1;overflow: hidden;padding: 50px;"></view>
</view>
</template>
diff --git a/src/pages/academicSchools/index.vue b/src/pages/academicSchools/index.vue
index 1e8272e..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="
@@ -220,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
@@ -435,7 +435,7 @@
name: "娲诲姩鍦�"
},
{
- name: "瀛︽湳娴佹淳"
+ name: "瀛︽湳鍥捐氨"
}
],
// 褰撳墠浜虹墿淇℃伅
@@ -982,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(
@@ -1212,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 });
}
@@ -1428,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 {
diff --git a/src/pages/changePassword/changePassword.vue b/src/pages/changePassword/changePassword.vue
index 8eaf491..9489408 100644
--- a/src/pages/changePassword/changePassword.vue
+++ b/src/pages/changePassword/changePassword.vue
@@ -241,11 +241,11 @@
id: 2
},
{
- name: "瀛︽湳娴佹淳",
+ name: "瀛︽湳鍥捐氨",
id: 6
},
{
- name: "瀛︽湳鍥捐氨",
+ name: "瀛︽湳娴佹淳",
id: 3
},
{
diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue
index 63770e5..10c5c47 100644
--- a/src/pages/index/index.vue
+++ b/src/pages/index/index.vue
@@ -202,11 +202,11 @@
id: 2,
},
{
- name: "瀛︽湳娴佹淳",
+ name: "瀛︽湳鍥捐氨",
id: 6,
},
{
- name: "瀛︽湳鍥捐氨",
+ name: "瀛︽湳娴佹淳",
id: 3,
},
{
--
Gitblit v1.9.1