diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index aba306b..4b805e3 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -35,17 +35,10 @@ const actions = {
         commit('SET_TOKEN', response.token)
         commit('SET_ID_CARD', username)
         // 解码jwt 获得role
-<<<<<<< HEAD
-        // let payload = response.token.split('.')[1]
-        // let data = JSON.parse(decodeURIComponent(escape(window.atob(payload))));
-        // let role = data.role
-        // commit('SET_ROLE', role)
-=======
         let payload = response.token.split('.')[1]
         let data = JSON.parse(decodeURIComponent(escape(window.atob(payload))));
         let role = data.role
         commit('SET_ROLE', role)
->>>>>>> a025baf3ccfea2fef8bc69b80776e0c33d2153a5
         // 存储到本地 关闭页面后，自动登录的功能还在考虑
         // if (response.code == 0) {
         //   sessionStorage['zssr_token'] = response.token;
diff --git a/src/views/job/score.vue b/src/views/job/score.vue
index a6a07cf..ba0550c 100644
--- a/src/views/job/score.vue
+++ b/src/views/job/score.vue
@@ -76,22 +76,23 @@
         </template>
       </el-table> -->
       <el-row>
-        <p v-for="(item,index) in chosen_row[0].content">{{index+1}}.{{item}}</p>
+        <p v-for="(item, index) in chosen_row[0].content" :key="index">{{index+1}}.{{item}}</p>
       </el-row>
       <el-row
         v-for="(row, row_index) in current_matrix_obj"
+        :key="row_index"
         style="display: flex; justify-content: space-between"
       >
         <input
           v-for="(item, col_index) in current_matrix_obj[row_index].value"
-
+          :key="col_index"
           v-model="current_matrix_obj[row_index].value[col_index].value"
           type="number"
           oninput="if(value.length>1)value=value.slice(0,1)"
           style="width:45px"
           :disabled="col_index===row_index?true:false"
           @input="input_change(event,row_index,col_index)"
-        ></input>
+        >
       </el-row>
       <el-button style="float:right" @click="postMatrix">提交</el-button>
     </el-dialog>
diff --git a/src/views/person/components/PersonPicture.vue b/src/views/person/components/PersonPicture.vue
index 29eea71..5c61ad0 100644
--- a/src/views/person/components/PersonPicture.vue
+++ b/src/views/person/components/PersonPicture.vue
@@ -376,6 +376,7 @@ export default {
         console.log("err", err);
       }
     );
+    
   },
   computed: {
     industryExperience() {
diff --git a/src/views/person/review.vue b/src/views/person/review.vue
index 433ea92..da9b409 100644
--- a/src/views/person/review.vue
+++ b/src/views/person/review.vue
@@ -602,7 +602,6 @@ export default {
       fullSchoolData: {},
       workSchoolData: {},
       schoolCategory: ["211", "985"],
-      majorData: [],
       fullMajorData: [],
       workMajorData: [],
 
@@ -1054,25 +1053,22 @@ export default {
           tempArr.push(workSchoolData["级别"][key]);
         }
         this.workSchoolData["级别"] = tempArr;
+
         //专业
+        // 全日制专业
         tempArr = [];
-        tempObj = { 类别: "全日制" };
-        Object.assign(tempObj, resData["全日制专业"]);
-        tempArr.push(tempObj);
-        tempObj = { 类别: "在职" };
-        Object.assign(tempObj, resData["在职专业"]);
-        tempArr.push(tempObj);
-        this.majorData = tempArr;
-        tempArr = [];
-        tempArr2 = [];
-        for (let major in this.majorData[0]) {
-          tempArr.push({ name: major, value: this.majorData[0][major] });
+        let fullMajorData = resData['全日制专业']
+        for (let major in fullMajorData) {
+          tempArr.push({name: major, value: fullMajorData[major]})
         }
         this.fullMajorData = tempArr;
-        for (let major in this.majorData[1]) {
-          tempArr2.push({ name: major, value: this.majorData[1][major] });
-          this.workMajorData = tempArr2;
+        // 在职专业
+        tempArr = []
+        let workMajorData = resData['在职专业']
+        for (let major in workMajorData) {
+          tempArr.push({name: major, value: workMajorData[major]})
         }
+        this.workMajorData = tempArr;
       },
       (err) => {
         console.log("err", err);
@@ -1907,30 +1903,10 @@ export default {
     },
     showFullMajorPie() {
       let option = {
-        grid: [
-          {
-            x: "70%",
-            y: "20%",
-            width: "30%",
-            height: "60%",
-          },
-        ],
-        xAxis: [
-          {
-            gridIndex: 0,
-            type: "category",
-            data: this.majorCategory,
-          },
-        ],
-        yAxis: [
-          {
-            gridIndex: 0,
-          },
-        ],
         title: [
           {
             text: "全日制教育专业分布饼图",
-            x: "20%",
+            x: "center",
             y: "3%",
           },
         ],
@@ -1942,8 +1918,8 @@ export default {
         series: [
           {
             type: "pie",
-            radius: "50%",
-            center: ["30%", "50%"],
+            // radius: "50%",
+            // center: ["30%", "50%"],
             data: this.fullMajorData,
           },
         ],
@@ -1952,30 +1928,10 @@ export default {
     },
     showWorkMajorPie() {
       let option = {
-        grid: [
-          {
-            x: "70%",
-            y: "20%",
-            width: "30%",
-            height: "60%",
-          },
-        ],
-        xAxis: [
-          {
-            gridIndex: 0,
-            type: "category",
-            data: this.majorCategory,
-          },
-        ],
-        yAxis: [
-          {
-            gridIndex: 0,
-          },
-        ],
         title: [
           {
             text: "在职教育专业分布饼图",
-            x: "20%",
+            x: "center",
             y: "3%",
           },
         ],
@@ -1987,8 +1943,8 @@ export default {
         series: [
           {
             type: "pie",
-            radius: "50%",
-            center: ["30%", "50%"],
+            // radius: "50%",
+            // center: ["30%", "50%"],
             data: this.workMajorData,
           },
         ],
@@ -1999,12 +1955,6 @@ export default {
       if (tab.label == "在职") {
         setTimeout(this.showWorkMajorPie, 10);
       }
-      console.log(this.majorData);
-      console.log(this.degreeData);
-      personApi.getReviewEducation().then((res) => {
-        console.log(res.data);
-      });
-      console.log(this.fullEduData);
     },
     showFullCheckBar() {
       let option = {
diff --git a/vue.config.js b/vue.config.js
index 1ac3c11..52e4358 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -38,17 +38,9 @@ module.exports = {
     },
     proxy: {
       '/': {
-        // target: 'http://127.0.0.1:4523/m1/1256020-0-default/',
-<<<<<<< HEAD
-        // 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:4523/m1/1256020-0-default',
-        // target: 'http://127.0.0.1:8123',
-=======
         // target: 'http://222.20.95.239:8000',
+        // target: 'http://127.0.0.1:4523/m1/1256020-0-default',
         target: 'http://127.0.0.1:8123',
->>>>>>> a025baf3ccfea2fef8bc69b80776e0c33d2153a5
         changeOrigin: true,
         pathRewrite: {
         }