From a025baf3ccfea2fef8bc69b80776e0c33d2153a5 Mon Sep 17 00:00:00 2001 From: yzw <2431960323@qq.com> Date: Thu, 29 Dec 2022 11:16:44 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E7=8E=B0=E5=91=98=E5=B7=A5=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E9=A1=B5=E9=9D=A2=E7=9A=84=E4=BA=8B=E5=8A=A1=E5=92=8C?= =?UTF-8?q?=E5=85=9A=E5=8A=A1=E6=A8=A1=E5=9D=97=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/person.js | 16 +++ src/icons/svg/优秀党员.svg | 1 + src/views/person/components/PersonPicture.vue | 106 +++++++++++++----- src/views/person/review.vue | 2 +- 4 files changed, 98 insertions(+), 27 deletions(-) create mode 100644 src/icons/svg/优秀党员.svg diff --git a/src/api/person.js b/src/api/person.js index c892699..87af371 100644 --- a/src/api/person.js +++ b/src/api/person.js @@ -126,4 +126,20 @@ export function getActivity(params) { method: 'get', params }) +} + +export function getRoutine(params) { + return request({ + url: '/person/routine', + method: 'get', + params + }) +} + +export function getParty(params) { + return request({ + url: '/person/party', + method: 'get', + params + }) } \ No newline at end of file diff --git a/src/icons/svg/优秀党员.svg b/src/icons/svg/优秀党员.svg new file mode 100644 index 0000000..eeb33d1 --- /dev/null +++ b/src/icons/svg/优秀党员.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/views/person/components/PersonPicture.vue b/src/views/person/components/PersonPicture.vue index fa37b13..29eea71 100644 --- a/src/views/person/components/PersonPicture.vue +++ b/src/views/person/components/PersonPicture.vue @@ -104,46 +104,36 @@
-

论文

+

事务

+ + - - - - - - - - + +
-

项目

-
-
-
- -
-
-

事务

-
-
-

党务

-
+
+
+ + {{ value }} +
+
@@ -175,6 +165,40 @@ + +
+
+

论文

+
+ + + + + + + + + + + + + +
+
+
+

项目

+
+
+
@@ -198,6 +222,8 @@ export default { innovationData: [], articleData: [], activityData: [], + routineData: [], + partyData: [], }; }, mounted() { @@ -322,6 +348,34 @@ export default { console.log("err", err); } ); + + // 发送事务请求 + personApi.getRoutine({ id_card: this.$store.state.user.id_card }).then( + (res) => { + this.routineData = res.data; + }, + (err) => { + console.log("err", err); + } + ); + + // 发送党务请求 + personApi.getParty({ id_card: this.$store.state.user.id_card }).then( + (res) => { + let partyData = res.data; + // 按时间降序排列 + function sortByTime(x, y) { + let numX = parseInt(x), + numY = parseInt(y); + return numY - numX; + } + partyData.sort(sortByTime); + this.partyData = partyData; + }, + (err) => { + console.log("err", err); + } + ); }, computed: { industryExperience() { diff --git a/src/views/person/review.vue b/src/views/person/review.vue index f9d82bd..85e332d 100644 --- a/src/views/person/review.vue +++ b/src/views/person/review.vue @@ -546,7 +546,7 @@

厂里累计有 {{ totalPersonProjectNum }} - 人负责过项目，最多有人负责过7次项目。 + 人负责过项目，最多有人负责过5次项目。

立项最多的年份是2021年，共计13个项目；立项最少的年份是2022年，仅1个项目。