From fba8fd83a9612225ce726a7ff443a9e4167c8b33 Mon Sep 17 00:00:00 2001 From: yzw <2431960323@qq.com> Date: Tue, 20 Dec 2022 20:57:44 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E5=90=8Evuex=E4=B8=AD=E5=AD=98=E5=82=A8=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E8=A7=92=E8=89=B2=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 | 4 ++-- src/store/modules/user.js | 11 ++++++++++- vue.config.js | 3 +-- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/src/api/person.js b/src/api/person.js index 73da75b..a72ce11 100644 --- a/src/api/person.js +++ b/src/api/person.js @@ -2,7 +2,7 @@ import request from '@/utils/request' export function getPersonData(params) { return request({ - url: '/person/person-information2', + url: '/person/information2', method: 'get', params }) @@ -10,7 +10,7 @@ export function getPersonData(params) { export function getPersonTag(params) { return request({ - url: '/person/person_tag', + url: '/person/tag', method: 'get', params }) diff --git a/src/store/modules/user.js b/src/store/modules/user.js index 8a06aea..4b805e3 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -4,7 +4,8 @@ import { resetRouter } from '@/router' const getDefaultState = () => { return { token: '', - id_card: '' + id_card: '', + role: '' } } @@ -19,6 +20,9 @@ const mutations = { }, SET_ID_CARD: (state, id_card) => { state.id_card = id_card; + }, + SET_ROLE: (state, role) => { + state.role = role } } @@ -30,6 +34,11 @@ const actions = { login({ user_num: username.trim(), password: password }).then(response => { commit('SET_TOKEN', response.token) commit('SET_ID_CARD', username) + // 解码jwt 获得role + let payload = response.token.split('.')[1] + let data = JSON.parse(decodeURIComponent(escape(window.atob(payload)))); + let role = data.role + commit('SET_ROLE', role) // 存储到本地 关闭页面后，自动登录的功能还在考虑 // if (response.code == 0) { // sessionStorage['zssr_token'] = response.token; diff --git a/vue.config.js b/vue.config.js index 99c8caa..7329422 100644 --- a/vue.config.js +++ b/vue.config.js @@ -39,9 +39,8 @@ module.exports = { proxy: { '/': { // target: 'http://127.0.0.1:4523/m1/1256020-0-default/', - target: 'http://127.0.0.1:8000', - // target: 'http://192.168.31.102:8000', // target: 'http://222.20.95.239:8000', + target: 'http://127.0.0.1:8123', changeOrigin: true, pathRewrite: { } From d11c5e4856d8c192840bb6507e0951c282829cdc Mon Sep 17 00:00:00 2001 From: yzw <2431960323@qq.com> Date: Mon, 26 Dec 2022 19:19:24 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E5=91=98=E5=B7=A5=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=A2=9E=E5=8A=A0=E4=BA=86=E4=B8=AA=E4=BA=BA?= =?UTF-8?q?=E7=BB=8F=E5=8E=86=E5=92=8C=E8=80=83=E6=A0=B8=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E7=9A=84=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 | 9 + src/views/person/components/PersonPicture.vue | 239 +++++++++++++++++- .../person/components/WorkInformation.vue | 3 +- src/views/person/information.vue | 8 +- 4 files changed, 241 insertions(+), 18 deletions(-) diff --git a/src/api/person.js b/src/api/person.js index a72ce11..bf156d6 100644 --- a/src/api/person.js +++ b/src/api/person.js @@ -79,3 +79,12 @@ export function getReviewRoutine(params) { params }) } + +export function getAppraise(params) { + return request({ + url: '/person/appraise', + method: 'get', + params + }) +} + diff --git a/src/views/person/components/PersonPicture.vue b/src/views/person/components/PersonPicture.vue index 7b0cccb..095ab5a 100644 --- a/src/views/person/components/PersonPicture.vue +++ b/src/views/person/components/PersonPicture.vue @@ -22,10 +22,81 @@

个人经历

+
+
+ 工作经历 + {{ industryExperience }}年工厂经验 + {{ jobExperience }}年岗位经验 +
+
+ 教育经历 + {{ + personData["全日制毕（肄）业学校（单位）名称"] + }} + {{ + personData["全日制毕（肄）业专业名称"] + }} + {{ + personData["在职毕（肄）业学校（单位）名称"] + }} + {{ + personData["在职毕（肄）业专业名称"] + }} +
+
+ 知识技能 + {{ personData["最高专业技术资格等级"] + }}{{ personData["最高专业技术资格名称"] }} + {{ personData["最高职业技能等级级别"] + }}{{ personData["最高职业技能等级名称"] }} +
+
+
+
+

考核

+
+
+
+
+
+ +
+
+

州级以上荣誉

-

绩效

+

年度先进

+
+
+
+ +
+
+

创新

+
+
+
+

活动

+
+
+
+ +
+
+

事务

+
+
+
+

党务

@@ -37,6 +108,8 @@ import * as echarts from "echarts"; import "echarts-wordcloud"; +import * as personApi from "@/api/person"; + export default { props: ["data"], data() { @@ -63,11 +136,91 @@ export default { { name: "创新达人", value: 90 }, { name: "初级助理工程师", value: 80 }, ], + radarData: [ + { + value: [49, 45, 34, 20, 78], + name: "个人", + }, + { + value: [33, 73, 21, 22, 57], + name: "全员平均", + }, + ], + appraiseData: {}, }; }, mounted() { - this.showRadarChart(); - this.showWordCloud(); + if (!this.personData.hasOwnProperty("姓名")) { + return; + } + // 发送词云请求 + personApi + .getPersonTag({ + query: this.$store.state.user.id_card, + }) + .then( + (res) => { + this.wordcloudData = res.data.wordcloud; + this.radarData = res.data.radar; + this.showWordCloud(); + this.showRadarChart(); + }, + (err) => { + console.log("err", err); + } + ); + + // 发送考核请求 + personApi + .getAppraise({ + id_card: this.$store.state.user.id_card, + }) + .then( + (res) => { + let resData = res.data; + let xAxisData = [], + yAxisData = [], + nameData = []; + let appraiseMap = { + 不确定等次: 0, + 不合格: 1, + 不称职: 1, + 基本合格: 2, + 基本称职: 2, + 合格: 3, + 称职: 3, + 优秀: 4, + }; + // 此处不需要对年份进行排序，接口返回的数据有序 + for (let year in resData) { + xAxisData.push(year); + let appraiseValue = resData[year]; + if (appraiseValue in appraiseMap) { + yAxisData.push(appraiseMap[appraiseValue]); + } else { + yAxisData.push(0); + } + nameData.push(appraiseValue); + } + this.appraiseData = { + xAxis: xAxisData, + yAxis: yAxisData, + name: nameData, + }; + this.showAppraiseChart(); + }, + (err) => { + console.log("err", err); + } + ); + }, + computed: { + industryExperience() { + return this.getAge(this.personData["进入行业时间"]); + }, + jobExperience() { + return this.getAge(this.personData["现岗位起始时间"]); + }, }, methods: { showRadarChart() { @@ -79,11 +232,13 @@ export default { title: { text: "", }, + color: ["#5470c6", "#91cc75"], legend: { data: ["个人", "全员平均"], }, + tooltip: {}, radar: { - shape: "circle", + // shape: "circle", indicator: [ // { name: "工作态度", max: 100 }, { name: "工作能力", max: 100 }, @@ -97,16 +252,7 @@ export default { { name: "员工表现雷达图", type: "radar", - data: [ - { - value: [49, 45, 34, 20, 78], - name: "个人", - }, - { - value: [33, 73, 21, 22, 57], - name: "全员平均", - }, - ], + data: this.radarData, }, ], }; @@ -158,6 +304,61 @@ export default { ], }); }, + getAge(birthday) { + //出生时间 毫秒 + let birthDayTime = new Date(birthday).getTime(); + if (birthDayTime !== birthDayTime) { + // NaN + return null; + } + //当前时间 毫秒 + let nowTime = new Date().getTime(); + //一年毫秒数(365 * 86400000 = 31536000000) + return Math.ceil((nowTime - birthDayTime) / 31536000000); + }, + showAppraiseChart() { + let myChart = echarts.init(document.getElementById("appraise_chart")); + let option = { + tooltip: { + trigger: "axis", + formatter: (params) => { + let year = params[0]["name"]; + let value = params[0]["value"]; + let yearIndex = this.appraiseData["xAxis"].indexOf(year); + let name = this.appraiseData["name"][yearIndex]; + return `${name}: ${value}`; + }, + }, + xAxis: { + type: "category", + data: this.appraiseData["xAxis"], + }, + yAxis: { + type: "value", + }, + grid: { + top: "6%", + left: "1%", + right: "1%", + bottom: "1%", + containLabel: true, + }, + dataZoom: [ + { + type: "inside", + start: 0, + end: 100, + }, + ], + series: [ + { + data: this.appraiseData["yAxis"], + type: "line", + }, + ], + }; + myChart.setOption(option); + }, }, }; @@ -234,4 +435,14 @@ export default { height: 80%; border: 1px #e4e7ed solid; } + +.tag-bar { + margin: 10px 0px 0px 10px; +} + + + \ No newline at end of file diff --git a/src/views/person/components/WorkInformation.vue b/src/views/person/components/WorkInformation.vue index 0fe90e4..43a7331 100644 --- a/src/views/person/components/WorkInformation.vue +++ b/src/views/person/components/WorkInformation.vue @@ -124,7 +124,8 @@ export default { personData: this.data, }; }, - mounted() {}, + mounted() { + }, computed: { workAge: function () { return this.getAge(this.personData.参加工作时间); diff --git a/src/views/person/information.vue b/src/views/person/information.vue index ad22423..f660887 100644 --- a/src/views/person/information.vue +++ b/src/views/person/information.vue @@ -33,7 +33,7 @@ - + @@ -56,12 +56,12 @@ export default { data() { return { comName: "ComPersonPicture", - personData: null, + personData: {}, avatarUrl: require("@/assets/images/女.png") }; }, mounted() { - // 发送请求 + // 发送获取基本信息请求 personApi.getPersonData({ "id_card": this.$store.state.user.id_card }).then( @@ -73,6 +73,8 @@ export default { console.log('err:', err); } ) + + }, computed: { personAge() { From d2f6374d7f460911a7ac489c6cb884799b16a7da Mon Sep 17 00:00:00 2001 From: yzw <2431960323@qq.com> Date: Tue, 27 Dec 2022 16:45:27 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E5=AE=8C=E6=88=90=E5=91=98=E5=B7=A5?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E7=9A=84=E8=8D=A3=E8=AA=89=E4=BB=A5=E5=8F=8A?= =?UTF-8?q?=E5=85=88=E8=BF=9B=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 | 15 ++ src/icons/svg/先进.svg | 1 + src/icons/svg/橙色勋章.svg | 1 + src/icons/svg/红色勋章.svg | 1 + src/icons/svg/绿色勋章.svg | 1 + src/icons/svg/蓝色勋章.svg | 1 + src/views/person/components/PersonPicture.vue | 173 +++++++++++++----- 7 files changed, 146 insertions(+), 47 deletions(-) create mode 100644 src/icons/svg/先进.svg create mode 100644 src/icons/svg/橙色勋章.svg create mode 100644 src/icons/svg/红色勋章.svg create mode 100644 src/icons/svg/绿色勋章.svg create mode 100644 src/icons/svg/蓝色勋章.svg diff --git a/src/api/person.js b/src/api/person.js index bf156d6..05c4de2 100644 --- a/src/api/person.js +++ b/src/api/person.js @@ -88,3 +88,18 @@ export function getAppraise(params) { }) } +export function getHonor(params) { + return request({ + url: '/person/honor', + method: 'get', + params + }) +} + +export function getAdvance(params) { + return request({ + url: '/person/advance', + 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..44eff49 --- /dev/null +++ b/src/icons/svg/先进.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/橙色勋章.svg b/src/icons/svg/橙色勋章.svg new file mode 100644 index 0000000..6e35b79 --- /dev/null +++ b/src/icons/svg/橙色勋章.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/红色勋章.svg b/src/icons/svg/红色勋章.svg new file mode 100644 index 0000000..da14d89 --- /dev/null +++ b/src/icons/svg/红色勋章.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/绿色勋章.svg b/src/icons/svg/绿色勋章.svg new file mode 100644 index 0000000..3ead8a1 --- /dev/null +++ b/src/icons/svg/绿色勋章.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/蓝色勋章.svg b/src/icons/svg/蓝色勋章.svg new file mode 100644 index 0000000..42515f0 --- /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 095ab5a..16373f7 100644 --- a/src/views/person/components/PersonPicture.vue +++ b/src/views/person/components/PersonPicture.vue @@ -3,26 +3,15 @@
培训推荐
-
-
- - 关键词云 -
+
+
关键词云
人才评价

个人经历

-
+
工作经历
教育经历 - {{ - personData["全日制毕（肄）业学校（单位）名称"] - }} - {{ - personData["全日制毕（肄）业专业名称"] - }} - {{ - personData["在职毕（肄）业学校（单位）名称"] - }} - {{ - personData["在职毕（肄）业专业名称"] - }} + 全日制 + {{ personData["全日制毕（肄）业学校（单位）名称"] }} + 全日制 {{ personData["全日制毕（肄）业专业名称"] }} + 在职 {{ personData["在职毕（肄）业学校（单位）名称"] }} + 在职 {{ personData["在职毕（肄）业专业名称"] }}
知识技能 @@ -68,21 +58,10 @@
-
-
-

州级以上荣誉

-
-
-
-

年度先进

-
-
-
-

创新

-
+

活动

@@ -93,13 +72,43 @@

事务

-
+

党务

+ +
+
+

荣誉

+
+
+ + {{ value }} +
+
+
+
+

年度先进

+
+
+ + {{ value }} +
+
+
+
+
@@ -147,6 +156,8 @@ export default { }, ], appraiseData: {}, + honorData: [], + advanceData: [], }; }, mounted() { @@ -213,6 +224,34 @@ export default { console.log("err", err); } ); + + // 发送荣誉请求 + personApi.getHonor({ id_card: this.$store.state.user.id_card }).then( + (res) => { + this.honorData = res.data; + }, + (err) => { + console.log("err", err); + } + ); + + // 发送先进请求 + personApi.getAdvance({ id_card: this.$store.state.user.id_card }).then( + (res) => { + let advanceData = res.data; + // 按时间降序排列 + function sortByTime(x, y) { + let numX = parseInt(x), + numY = parseInt(y); + return numY - numX; + } + advanceData.sort(sortByTime); + this.advanceData = advanceData; + }, + (err) => { + console.log("err", err); + } + ); }, computed: { industryExperience() { @@ -359,6 +398,40 @@ export default { }; myChart.setOption(option); }, + getHonorTagType(value) { + if (value.includes("全国")) { + // 红色 + return "danger"; + } + if (value.includes("省级")) { + // 橙色 + return "warning"; + } + if (value.includes("州级")) { + // 蓝色 + return ""; + } + if (value.includes("厂级")) { + // 绿色 + return "success"; + } + return ""; + }, + getHonorIconName(value) { + if (value.includes("全国")) { + return "红色勋章"; + } + if (value.includes("省级")) { + return "橙色勋章"; + } + if (value.includes("州级")) { + return "蓝色勋章"; + } + if (value.includes("厂级")) { + return "绿色勋章"; + } + return "蓝色勋章"; + }, }, }; @@ -382,6 +455,10 @@ export default { float: right; } +.pp-block1 { + overflow: hidden; +} + .pp-block1-left { float: left; margin-right: 1%; @@ -399,6 +476,7 @@ export default { .pp-block2 { margin-top: 0px; + /* overflow: hidden; */ } .pp-block2-left { @@ -416,14 +494,6 @@ export default { width: 50%; } -.pp-half-block2 { - display: inline-block; - /* border: 1px #e4e7ed solid; */ - /* box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1); */ - height: 200px; - width: 50%; -} - .item-title-p { border-left: 4px solid #000; padding-left: 10px; @@ -434,15 +504,24 @@ export default { width: 100%; height: 80%; border: 1px #e4e7ed solid; + margin-right: 10px; } .tag-bar { margin: 10px 0px 0px 10px; } + +.honor-bar { + margin: 10px 0px 0px 10px; +} \ No newline at end of file From 2b180f8dd3b4d9126809259c1b2652460751b259 Mon Sep 17 00:00:00 2001 From: yzw <2431960323@qq.com> Date: Wed, 28 Dec 2022 17:27:56 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E5=AE=9E=E7=8E=B0=E4=BA=86=E5=91=98?= =?UTF-8?q?=E5=B7=A5=E9=A1=B5=E9=9D=A2=E7=9A=84=E5=88=9B=E6=96=B0=E3=80=81?= =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E3=80=81=E8=AE=BA=E6=96=87=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/person.js | 24 +++ src/views/person/components/PersonPicture.vue | 178 ++++++++++++++---- 2 files changed, 167 insertions(+), 35 deletions(-) diff --git a/src/api/person.js b/src/api/person.js index 05c4de2..c892699 100644 --- a/src/api/person.js +++ b/src/api/person.js @@ -102,4 +102,28 @@ export function getAdvance(params) { method: 'get', params }) +} + +export function getInnovation(params) { + return request({ + url: '/person/innovation', + method: 'get', + params + }) +} + +export function getArticle(params) { + return request({ + url: '/person/article', + method: 'get', + params + }) +} + +export function getActivity(params) { + return request({ + url: '/person/activity', + method: 'get', + params + }) } \ No newline at end of file diff --git a/src/views/person/components/PersonPicture.vue b/src/views/person/components/PersonPicture.vue index 16373f7..fa37b13 100644 --- a/src/views/person/components/PersonPicture.vue +++ b/src/views/person/components/PersonPicture.vue @@ -59,12 +59,79 @@
-
+

创新

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

活动

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

论文

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

项目

@@ -108,7 +175,6 @@
-
@@ -124,40 +190,14 @@ export default { data() { return { personData: this.data, - wordcloudData: [ - { name: "女", value: 1 }, - { name: "三连优秀", value: 90 }, - { name: "学士", value: 40 }, - { name: "大学", value: 40 }, - { name: "90后", value: 1 }, - { name: "兴趣盎然", value: 24 }, - { name: "初出茅庐", value: 10 }, - { name: "中共党员", value: 25 }, - { name: "本省人", value: 1 }, - { name: "三次优秀", value: 90 }, - { name: "文思敏捷", value: 70 }, - { name: "新党员", value: 25 }, - { name: "运动达人", value: 24 }, - { name: "初来乍到", value: 20 }, - { name: "四级电工", value: 80 }, - { name: "优秀员工", value: 90 }, - { name: "积极踊跃", value: 8 }, - { name: "创新达人", value: 90 }, - { name: "初级助理工程师", value: 80 }, - ], - radarData: [ - { - value: [49, 45, 34, 20, 78], - name: "个人", - }, - { - value: [33, 73, 21, 22, 57], - name: "全员平均", - }, - ], + wordcloudData: [], + radarData: [], appraiseData: {}, honorData: [], advanceData: [], + innovationData: [], + articleData: [], + activityData: [], }; }, mounted() { @@ -252,6 +292,36 @@ export default { console.log("err", err); } ); + + // 发送创新请求 + personApi.getInnovation({ id_card: this.$store.state.user.id_card }).then( + (res) => { + this.innovationData = res.data; + }, + (err) => { + console.log("err", err); + } + ); + + // 发送论文请求 + personApi.getArticle({ id_card: this.$store.state.user.id_card }).then( + (res) => { + this.articleData = res.data; + }, + (err) => { + console.log("err", err); + } + ); + + // 发送活动请求 + personApi.getActivity({ id_card: this.$store.state.user.id_card }).then( + (res) => { + this.activityData = res.data; + }, + (err) => { + console.log("err", err); + } + ); }, computed: { industryExperience() { @@ -260,6 +330,40 @@ export default { jobExperience() { return this.getAge(this.personData["现岗位起始时间"]); }, + activityColumns() { + let columns = [ + { + prop: "year", + label: "年份", + width: "100", + sortable: true, + }, + { + prop: "name", + label: "活动名", + }, + { + prop: "item", + label: "项目名", + }, + { + prop: "grade", + label: "级别", + width: "80", + }, + ]; + // 动态添加列名 + if (this.activityData.length > 0) { + let row = this.activityData[0]; + if ("prize" in row) { + columns.push({ prop: "prize", label: "奖品" }); + } + if ("role" in row) { + columns.push({ prop: "role", label: "角色", width: "80" }); + } + } + return columns; + }, }, methods: { showRadarChart() { @@ -494,6 +598,10 @@ export default { width: 50%; } +.height-350 { + height: 350px; +} + .item-title-p { border-left: 4px solid #000; padding-left: 10px; 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 5/5] =?UTF-8?q?=E5=AE=9E=E7=8E=B0=E5=91=98=E5=B7=A5?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E9=A1=B5=E9=9D=A2=E7=9A=84=E4=BA=8B=E5=8A=A1?= =?UTF-8?q?=E5=92=8C=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个项目。