Merge branch 'master' of https://git.czcyedu.com/huoran/FE_middlePlatform_server

src/components/Header.vue

@@ -30,7 +30,7 @@ export default {
         getUserInfo(){
             this.$get(this.api.queryUserInfoDetails).then(res => {
                 let userInfo = res.result.hrUserInfo
-                this.avatar = userInfo.userAvatars
+                if(userInfo.userAvatars) this.avatar = userInfo.userAvatars
                 this.userName = userInfo.userName
             }).catch(err => {})
         },

src/utils/api.js

@@ -40,7 +40,7 @@ export default {
 
   // 用户管理
   delUserAccounts: `${host3}/users/users/userAccount/delUserAccounts`,
-  queryUserInfoDetails: `${host3}/users/users/userAccount/queryUserInfoDetails`,
+  queryUserInfoDetails: `${host3}/users/userAccount/queryUserInfoDetails`,
   queryUserInfoList: `${host3}/users/users/userAccount/queryUserInfoList`,
   resetPwd: `${host3}/users/users/userAccount/resetPwd`,
   selectAccountDetail: `${host3}/users/users/userAccount/selectAccountDetail`,

src/views/data/Framework.vue

@@ -94,7 +94,6 @@
 export default {
     data() {
         return {
-            schoolId: 1001,
             typeList: [],
             defaultProps: {
                 children: 'children',
@@ -227,12 +226,6 @@ export default {
         },
         preview(row){
             this.$get(`${this.api.previewData}?tableName=${row.name}&tableId=${row.id}`).then(res => {
-                this.$post(this.api.saveRecord,{
-                    tableId: row.id,
-                    type: 2,
-                    schoolId: this.schoolId,
-                }).then(res => {}).catch(res => {})
-
                 let comment = res.comment
                 let previewHead = []
                 comment.map(n => {

src/views/data/Product.vue

@@ -144,7 +144,6 @@
 export default {
     data() {
         return {
-            schoolId: 1001,
             userName: this.$store.state.userName,
             keyword: '',
             searchTimer: null,
@@ -483,12 +482,6 @@ export default {
         },
         previewConfig(row){
             this.$get(`${this.api.previewData}?tableName=${row.name}&tableId=${row.id}`).then(res => {
-                this.$post(this.api.saveRecord,{
-                    tableId: row.id,
-                    type: 2,
-                    schoolId: this.schoolId,
-                }).then(res => {}).catch(res => {})
-
                 let comment = res.comment
                 let previewHead = []
                 comment.map(n => {

src/views/setting/Person.vue

@@ -1,7 +1,7 @@
 <template>
     <div class="wrap">
         <div class="header">
-            <el-avatar :size="80" :src="this.form.avatar" class="Headtop"></el-avatar>
+            <el-avatar :size="80" :src="avatar" class="Headtop"></el-avatar>
             <div style="color:#9278FF;font-size:14px;font-family:MicrosoftYaHei;margin-top:5px;">
                 <el-upload
                     class="upload-demo"
@@ -381,6 +381,7 @@
 export default {
     data() {
         return {
+            avatar: 'https://cube.elemecdn.com/3/7c/3ea6beec64369c2642b92c6726f1epng.png',
             token: sessionStorage.getItem('token'),
             form: {
                 name:'',
@@ -565,6 +566,7 @@ export default {
         },
         //取得头像地址
         getRes(res) {
+            this.avatar = res.message
             this.$store.commit('userPhoto',{avatar:res.message})
         },
         getdata() {
@@ -574,9 +576,9 @@ export default {
                 this.form = Object.assign(userInfo,res.result.userAccountList[0])
                 this.form.schoolId = schoolId
                 this.form.accountId = userInfo.id
-                console.log(11,this.form)
                 this.originAccount = this.form.account
                 this.archivesList = res.result.personalFileList
+                if(userInfo.userAvatars) this.avatar = userInfo.userAvatars
                 this.$nextTick(() => {
                     if(this.form.provinceId){
                         this.getCityData(1)