diff --git a/src/views/data/dataCleansing.vue b/src/views/data/dataCleansing.vue index 43a3d6a..1c162fd 100644 --- a/src/views/data/dataCleansing.vue +++ b/src/views/data/dataCleansing.vue @@ -83,6 +83,12 @@ console.log(data); //处理订阅信息 if(data.content.length >0){ + var char = "当前同步百分比:"; + let index = content.indexOf(char); + if (index >= 0) { + let result = content.substring(index + char.length,content.length - 1); // 获取 "V" 及其后所有字符 + this.percent = result; + } this.contentList.unshift(data.content); } }, diff --git a/src/views/datalink/modules/SliceUpload.vue b/src/views/datalink/modules/SliceUpload.vue index 9999079..cbff71b 100644 --- a/src/views/datalink/modules/SliceUpload.vue +++ b/src/views/datalink/modules/SliceUpload.vue @@ -286,7 +286,7 @@ export default { currentRow.uploadStatus = 2 currentRow.result = res } else { // 未存在,走上传逻辑 - const formData = this.buildFileFormData(file.name, file.size, fileMD5Value, 1, 1, file, false,fileMD5Value) + const formData = this.buildFileFormData(file.name, file.size, fileMD5Value, 0, 0, file, false,fileMD5Value) const url = '/fileDataLink/uploadFile' try { const res = await postAction(url, formData) diff --git a/src/views/fileManage/index.vue b/src/views/fileManage/index.vue index ba8f491..a8a2f03 100644 --- a/src/views/fileManage/index.vue +++ b/src/views/fileManage/index.vue @@ -248,9 +248,10 @@ export default { this.$message.warning("必须选择文件上传目录"); return; } - this.$refs.modalForm.add(); + console.log("dirid=" + this.searchFile.dirId) this.$refs.modalForm.title = "文件上传"; this.$refs.modalForm.dirId = this.searchFile.dirId; + this.$refs.modalForm.add(); }, getcountFileNum(){ var that = this; diff --git a/src/views/fileManage/modules/SliceUpload.vue b/src/views/fileManage/modules/SliceUpload.vue index f8b9fae..79d7f87 100644 --- a/src/views/fileManage/modules/SliceUpload.vue +++ b/src/views/fileManage/modules/SliceUpload.vue @@ -89,10 +89,7 @@ export default { type: Boolean, default: false }, - dirId: { // 是否显示下载按钮 - type: String, - default: '' - } + }, data () { return { @@ -106,6 +103,7 @@ export default { pageNum :1, pageSize:999999999 }, + dirId:"" } }, created () { @@ -206,7 +204,8 @@ export default { */ customRequestUpload ({ file }) { // 开始执行上传逻辑 - if(this.dirId == "" || this.dirId ==null && this.dirId == undefined){ + console.log("upthis.dirId="+this.dirId) + if(this.dirId.length <= 0){ this.$message.error('文件目录选择异常请刷新页面') return; } @@ -301,7 +300,7 @@ export default { currentRow.uploadStatus = 2 currentRow.result = res } else { // 未存在,走上传逻辑 - const formData = this.buildFileFormData(file.name, file.size, fileMD5Value, 1, 1, file, false,fileMD5Value) + const formData = this.buildFileFormData(file.name, file.size, fileMD5Value, 0, 0, file, false,fileMD5Value) const url = '/file/uoloadFile' try { const res = await postAction(url, formData) diff --git a/src/views/fileManage/modules/uploadModal.vue b/src/views/fileManage/modules/uploadModal.vue index 8487331..007ac7d 100644 --- a/src/views/fileManage/modules/uploadModal.vue +++ b/src/views/fileManage/modules/uploadModal.vue @@ -17,7 +17,6 @@ :max-file="999999" :can-download="false" accept=".docx,.doc,.png,jpg,.pdf,.mp4" - :dirId="dirId" /> @@ -53,7 +52,11 @@ import SliceUpload from './SliceUpload' methods: { add () { this.visible =true; - this.$refs.technicalUpload.deleteFile(); + setTimeout(()=>{ + this.$refs.technicalUpload.dirId = this.dirId; + this.$refs.technicalUpload.deleteFile(); + },300) + }, onOk(value) { this.model.startDate = moment(value[0],dateFormat);