From 501e850540313fca935c49575b8fc0cd44267f20 Mon Sep 17 00:00:00 2001
From: zhaofang <752743406@qq.com>
Date: Thu, 29 Sep 2022 17:10:21 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/Portal/noteComment.vue | 11 +++++++++--
src/views/study/coursenew.vue | 2 +-
src/views/user/Mynotes.vue | 23 ++++++++++++++++-------
src/views/user/Setting.vue | 7 +++++--
4 files changed, 31 insertions(+), 12 deletions(-)
diff --git a/src/components/Portal/noteComment.vue b/src/components/Portal/noteComment.vue
index 0aee5e76..3fa35f60 100644
--- a/src/components/Portal/noteComment.vue
+++ b/src/components/Portal/noteComment.vue
@@ -28,7 +28,7 @@
@@ -176,6 +176,10 @@
readonly:{
type:Boolean,
default:false
+ },
+ name:{
+ type:String,
+ default:''
}
},
components:{showTime,authorInfo,interactBar},
@@ -324,6 +328,7 @@
let ids=[];
let allList=[];
res.result.list.forEach(item=>{
+ item.title = this.name;
item.replyList = [];
item.avatar='';
item.orgInfo='';
@@ -334,6 +339,7 @@
ids.push(item.sysCreateAid);
if(item.replyList && item.replyList!=''){
item.replyList.forEach(reply=>{
+ reply.title=this.name;
reply.avatar='';
reply.orgInfo='';
reply.name='';
@@ -412,6 +418,7 @@
if(res.status==200){
// this.list.unshift(res.result);
// this.sex =
+ res.result.title = this.name;
res.result.sex=null;
res.result.isAll=false;
this.list.unshift(res.result);
diff --git a/src/views/study/coursenew.vue b/src/views/study/coursenew.vue
index 9e7b6805..cc27f976 100644
--- a/src/views/study/coursenew.vue
+++ b/src/views/study/coursenew.vue
@@ -114,7 +114,7 @@
-
+
-
{{userInfo.name}}{{userInfo.departFullName}}
-
{{userInfo.sign}}
+
{{userData.name}}{{userInfo.departFullName}}
+
{{userData.sign}}
@@ -184,7 +184,8 @@ import interactBar from '@/components/Portal/interactBar.vue';
import FileUpload from '@/components/NoteUpload/index.vue';
import AuthorImg from '@/components/Portal/authorImg.vue';
import { mapGetters } from 'vuex';
-import {formatDate} from '@/utils/tools.js'
+import {formatDate} from '@/utils/tools.js';
+import apiUser from "@/api/system/user.js";
export default {
components:{interactBar,FileUpload,AuthorImg},
computed: {
@@ -192,6 +193,7 @@ export default {
},
data(){
return{
+ userData:{},
formatDate,
noteFile:{
contentType:null,
@@ -245,6 +247,13 @@ export default {
mounted(){
this.noteData(null);
this.allcoures();
+ apiUser.getByIds([this.userInfo.aid]).then(res => {
+ if (res.status == 200) {
+ this.userData = res.result[0];
+ } else {
+ this.$message.error(res.message);
+ }
+ });
},
methods: {
exportCommand(e) {
@@ -258,10 +267,10 @@ export default {
}
})
let data = {
- name:this.userInfo.name,
- sign:'abcd',
+ name:this.userData.name,
+ sign:this.userData.sign,
ids:ids,
- author:this.userInfo.avatar,//this.userInfo.avatar,
+ author:this.userData.avatar,//this.userInfo.avatar,
}
if(this.exportType == '1') {
apiNote.exportPdf(data).then(res=>{
diff --git a/src/views/user/Setting.vue b/src/views/user/Setting.vue
index c0f72532..1f4c614a 100644
--- a/src/views/user/Setting.vue
+++ b/src/views/user/Setting.vue
@@ -443,12 +443,13 @@
.personSetting{
background-color: #fff;
box-sizing: border-box;
- padding: 30px 0px 0px 247px;
+ // padding: 30px 0px 0px 247px;
+ padding: 30px 0 10% 20%;
// margin: 0 auto;
position: relative;
.avatar{
position: absolute;
- left: 86px;
+ left: 5%;
top:56px;
}
.passWard-btn{
@@ -469,6 +470,8 @@
box-shadow: -1px 0 0 0 #387DF7;
}
.informationItem{
+ min-width: 600px;
+ padding-right: 10%;
margin-bottom: 82px;
.information-header{
// display: flex;
From ab60318efd5b7d102da880cb54884adff4a1f9cc Mon Sep 17 00:00:00 2001
From: zhaofang <752743406@qq.com>
Date: Thu, 29 Sep 2022 17:55:03 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E7=AC=94=E8=AE=B0bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/NoteUpload/index.vue | 21 +++++++++++++++++----
src/views/user/Mynotes.vue | 4 ++--
2 files changed, 19 insertions(+), 6 deletions(-)
diff --git a/src/components/NoteUpload/index.vue b/src/components/NoteUpload/index.vue
index 84bcfe18..9956f847 100644
--- a/src/components/NoteUpload/index.vue
+++ b/src/components/NoteUpload/index.vue
@@ -24,6 +24,7 @@
-->
-
+
@@ -105,6 +106,10 @@
type: Boolean,
default: false
},
+ isClear:{
+ type: Boolean,
+ default: false
+ }
},
data() {
return {
@@ -119,6 +124,13 @@
}
};
},
+ watch: {
+ isClear(val) {
+ if(!val) {
+ this.clearFiles();
+ }
+ }
+ },
computed: {
// 是否显示提示
showTip() {
@@ -145,8 +157,10 @@
},
},
methods: {
+ clearFiles() {
+ this.$refs["myUpload"].clearFiles();
+ },
handleUploadRemove(file) {
- console.log(file,'file');
this.$emit("remove",file);
},
// 上传前校检格式和大小
@@ -220,7 +234,6 @@
}
},
created() {
-
this.fileList = this.list;
},
};
diff --git a/src/views/user/Mynotes.vue b/src/views/user/Mynotes.vue
index 779c6fc2..9215ee18 100644
--- a/src/views/user/Mynotes.vue
+++ b/src/views/user/Mynotes.vue
@@ -122,7 +122,7 @@