From 709bad864df519fe1269eb9b10df5539010f295a Mon Sep 17 00:00:00 2001
From: yangzhi <765157588@qq.com>
Date: Thu, 1 Dec 2022 16:27:55 +0800
Subject: [PATCH] 兼容工作经历的数据

---
 src/views/resume/femalestaff.vue  | 18 +++++++++++-------
 src/views/resume/malestaff.vue    | 16 ++++++++++------
 src/views/resume/style/style.scss |  4 ++--
 vue.config.js                     |  4 ++--
 4 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/src/views/resume/femalestaff.vue b/src/views/resume/femalestaff.vue
index 5f9c8f4..b6b8f9e 100644
--- a/src/views/resume/femalestaff.vue
+++ b/src/views/resume/femalestaff.vue
@@ -12,7 +12,7 @@
               alt=""
             />
             <div class="star-progress">
-              <div style="width: 50%" class="star-progress-bar"></div>
+              <div :style="{'width':'calc(140px / 7 * '+(userDetail.stars||0)+')'}" class="star-progress-bar"></div>
             </div>
           </div>
           <ul class="user-items">
@@ -54,10 +54,10 @@
             <div class="info-content">
               <ul
                 v-if="
-                  userDetail.workExperience && userDetail.workExperience.length
+                  userDetail.educationalExperience && userDetail.educationalExperience.length
                 "
               >
-                <li v-for="item in userDetail.workExperience" :key="item.date">
+                <li v-for="item in userDetail.educationalExperience" :key="item.date">
                   <h3 class="flex flex-between">
                     <span>{{ item.school }}</span>
                     <span style="font-size: 16px">{{ item.date }}</span>
@@ -79,12 +79,12 @@
           <div class="info-content">
             <ul
               v-if="
-                userDetail.educationalExperience &&
-                userDetail.educationalExperience.length
+                userDetail.workExperience &&
+                userDetail.workExperience.length
               "
             >
               <li
-                v-for="item in userDetail.educationalExperience"
+                v-for="item in userDetail.workExperience"
                 :key="item.date"
               >
                 <h3 class="flex flex-between">
@@ -313,7 +313,11 @@ export default {
   },
   computed: {
     userDetail() {
-      return this.user;
+      let user = {...this.user};
+      user.educationalExperience = JSON.parse(user.educationalExperience || '[]');
+      user.skillAdvantages = JSON.parse(user.skillAdvantages || '[]')
+      user.workExperience = JSON.parse(user.workExperience || '[]')
+      return user;
     },
     infoListComputed() {
       let user = { ...this.user };
diff --git a/src/views/resume/malestaff.vue b/src/views/resume/malestaff.vue
index d28c0bf..7c5fbd7 100644
--- a/src/views/resume/malestaff.vue
+++ b/src/views/resume/malestaff.vue
@@ -12,7 +12,7 @@
               alt=""
             />
             <div class="star-progress">
-              <div style="width: 50%" class="star-progress-bar"></div>
+              <div :style="{'width':'calc(140px / 7 * '+(userDetail.stars||0)+')'}" class="star-progress-bar"></div>
             </div>
           </div>
           <ul class="user-items">
@@ -44,8 +44,8 @@
               <span>教育经历</span>
             </div>
             <div class="info-content">
-              <ul v-if="userDetail.workExperience && userDetail.workExperience.length">
-                <li v-for="item in userDetail.workExperience" :key="item.date">
+              <ul v-if="userDetail.educationalExperience && userDetail.educationalExperience.length">
+                <li v-for="item in userDetail.educationalExperience" :key="item.date">
                   <h3 class="flex flex-between">
                     <span>{{ item.school }}</span>
                     <span style="font-size: 16px">{{item.date}}</span>
@@ -65,8 +65,8 @@
             <span>工作经历</span>
           </div>
           <div class="info-content">
-            <ul v-if="userDetail.educationalExperience && userDetail.educationalExperience.length">
-              <li v-for="item in userDetail.educationalExperience" :key="item.date">
+            <ul v-if="userDetail.workExperience && userDetail.workExperience.length">
+              <li v-for="item in userDetail.workExperience" :key="item.date">
                 <h3 class="flex flex-between">
                   <span>{{item.company}}</span>
                   <span>{{item.position}}</span>
@@ -293,7 +293,11 @@ export default {
   },
   computed: {
     userDetail() {
-      return this.user;
+      let user = {...this.user};
+      user.educationalExperience = JSON.parse(user.educationalExperience || '[]');
+      user.skillAdvantages = JSON.parse(user.skillAdvantages || '[]')
+      user.workExperience = JSON.parse(user.workExperience || '[]')
+      return user;
     },
     infoListComputed() {
       let user = { ...this.user };
diff --git a/src/views/resume/style/style.scss b/src/views/resume/style/style.scss
index 7108b7c..0e8ff99 100644
--- a/src/views/resume/style/style.scss
+++ b/src/views/resume/style/style.scss
@@ -62,7 +62,7 @@ li {
 .top-panel {
     background-image: url(/static/resume/male/resume6.png);
     background-size: 100% 100%;
-    padding: 30px;
+    padding: 30px 30px 10px;
     .top-panel-content {
         display: flex;
         align-items: center;
@@ -126,7 +126,7 @@ li {
         }
     }
     .info-content {
-        padding: 20px 0;
+        padding: 20px 0 10px;
         ul {
             li {
                 margin-bottom: 10px;
diff --git a/vue.config.js b/vue.config.js
index ab8ce42..fe7e4ca 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -38,8 +38,8 @@ module.exports = {
         },
         proxy: {
             '/development': {
-                // target: `http://admin.7-stars.com.cn/`, //后台服务地址
-                target:'http://localhost:8877',
+                target: `http://admin.7-stars.com.cn/`, //后台服务地址
+                // target:'http://localhost:8877',
                 // target:'http://localhost:8009',
                 changeOrigin: true,
                 pathRewrite: {
--
libgit2 0.21.4