Commit f4ad3832 by 米嘉伟

重复文件过滤

parent 276dfbd3
......@@ -567,6 +567,9 @@ export default {
expandedLeft: null, // 左边表格展开关闭标志
expandedRight: null, // 左边表格展开关闭标志
NumId: 1
}
},
created () {
......@@ -793,7 +796,8 @@ export default {
let that = this
let newlist = fileList
for (let i = 0; i < fileList.length; i++) {
let fatherId = (i + 1)
let fatherId = that.NumId
that.NumId = that.NumId + 1;
let file = fileList[i].raw
// console.log(file.webkitRelativePath, 999)
// 读取文件
......@@ -1048,7 +1052,6 @@ export default {
}
this.dialogVisible = true
NetUtil.drFptx.upload(formData, this.drlx, (progressEvent) => {
logger.info('11111111111')
that.UploadPercent = Number((((progressEvent.loaded / 10 * 10) / progressEvent.total) * 100).toFixed(2))
}).then(res => {
if (res.code === 0) {
......@@ -1138,6 +1141,13 @@ export default {
// 选中
handelSelect () {
// let self = this
// console.log('重复文件过滤1', this.nowSelectData)
// console.log('重复文件过滤2', this.selectArr)
......@@ -1186,9 +1196,32 @@ export default {
this.nowSelectRightData = []
},
handleConcatArr (selectArr, nowSelectData) {
var out = [];
var flag = true;
for (var i = 0; i < nowSelectData.length; i++) {
flag = true;
for (var j = 0; j < selectArr.length; j++) {
if (nowSelectData[i].name == selectArr[j].name) { // 如果数据能保证id和name一直配对,则可以少一个比较条件
flag = false;
break;
}
}
if (flag) {
out.push(nowSelectData[i]);
}
}
this.$message.success('重复文件已过滤!')
console.log(out, 'out')
let arr = []
arr = arr.concat(selectArr, nowSelectData)
arr = arr.concat(out, selectArr)
return arr
// let arr = []
// arr = arr.concat(selectArr, nowSelectData)
// return arr
},
handleRemoveTabList (isNeedArr, originalArr) {
if (isNeedArr.length && originalArr.length) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment