diff --git a/jero-web/src/components/libraryPush/index.vue b/jero-web/src/components/libraryPush/index.vue index 05fd201f7..ede6f8549 100644 --- a/jero-web/src/components/libraryPush/index.vue +++ b/jero-web/src/components/libraryPush/index.vue @@ -64,6 +64,7 @@ getPush(data) { this.tableKey = data this.visible = true + this.departId = '' this.queryDepartUserTreeList() }, onSelect(selectedKeys) { diff --git a/jero-web/src/components/tools/HeaderNotice.vue b/jero-web/src/components/tools/HeaderNotice.vue index f3f69f8a7..b3b622211 100644 --- a/jero-web/src/components/tools/HeaderNotice.vue +++ b/jero-web/src/components/tools/HeaderNotice.vue @@ -161,8 +161,10 @@ this.reconnect() }, websocketOnmessage: function(e) { + if (e.data != 'test') { + this.loadData() + } //系统通知 - this.loadData() }, websocketOnclose: function(e) { console.log(e) diff --git a/jero-web/src/components/uploadFile/file.vue b/jero-web/src/components/uploadFile/file.vue index f999b2dfe..851ed411e 100644 --- a/jero-web/src/components/uploadFile/file.vue +++ b/jero-web/src/components/uploadFile/file.vue @@ -37,7 +37,7 @@ visible: false, title: this.$t('clickUpload'), uploadAction: window._CONFIG['domianURL'] + '/sys/common/upload', - state:undefined, + state: undefined, myuploadAction: window._CONFIG['domianURL'] + this.thisFileUploadUrl, upDataList: [], downLoadFileUrl: window._CONFIG['domianPreviewURL'] + '/sys/common/download', @@ -101,6 +101,7 @@ }, handleChange(info) { let { file } = info + console.log(file) const status = info.file.status info.fileList.forEach((val, index) => { if (val.response && !val.response.result) { @@ -157,10 +158,13 @@ this.fileList.push(res) } }) + console.log(this.myfileList) this.$emit('uploadSuccess', this.fileList) if (this.myfileList.length > 0) { this.$message.destroy() - this.$message.success(`${info.file.name} 文件上传成功。`) + if (file.response.success) { + this.$message.success(`${info.file.name} 文件上传成功。`) + } } } else if (status === 'uploading') { this.myfileList = info.fileList