diff --git a/src/renderer/components/workAdd/files/file.vue b/src/renderer/components/workAdd/files/file.vue index d6125bc..8526c86 100644 --- a/src/renderer/components/workAdd/files/file.vue +++ b/src/renderer/components/workAdd/files/file.vue @@ -142,27 +142,25 @@ export default { const _this = this; dialog .showOpenDialog({ - properties: ["openFile"], + properties: ["multiSelections"], }) .then(async (rel) => { console.log(rel); for (const item of rel.filePaths) { const stats = fs.statSync(item); - let folder = false if (stats.isFile()) { - folder = true - } - await fs.stat(item, function (err, res) { - if (err) { - return false; - } - _this.insertList({ - name: getFileName(item), - path: item, - size: res.size, - folder: folder, + await fs.stat(item, function (err, res) { + if (err) { + return false; + } + _this.insertList({ + name: getFileName(item), + path: item, + size: res.size, + folder: false, + }); }); - }); + } } }); }, diff --git a/src/renderer/components/workAdd/workAdd.vue b/src/renderer/components/workAdd/workAdd.vue index 6a29181..994249e 100644 --- a/src/renderer/components/workAdd/workAdd.vue +++ b/src/renderer/components/workAdd/workAdd.vue @@ -116,10 +116,10 @@
内容
- +
添加文件
diff --git a/src/renderer/views/dashboard/index.vue b/src/renderer/views/dashboard/index.vue index 13d1528..f7a0448 100644 --- a/src/renderer/views/dashboard/index.vue +++ b/src/renderer/views/dashboard/index.vue @@ -242,7 +242,7 @@
作业列表
- + @@ -263,6 +263,7 @@ @@ -396,8 +397,9 @@ export default { if (item.ass_task&&item.ass_task.length) { let task_size = 0 item.cdType = this.$store.state.chat.CDTypes[item.ass_task[0].cd_type] + item.id = item.task_uuid item.ass_task.forEach((item2, idx) => { - item2.task_uuid = item.task_uuid+'_'+(idx+1) + item2.id = item.task_uuid+'_'+(idx+1) item2.cdType = this.$store.state.chat.CDTypes[item2.cd_type] + '_' + (idx+1) task_size = this.$accAdd(task_size, item2.task_size) }) @@ -702,6 +704,27 @@ export default { } that.showAll = !that.showAll }, + // 作业重试 + workRetry(e) { + that.$store.dispatch('chat/websocketsend', { + req_name: 'retry task', + req_type: 1, + req_info: { + task_uuid: that.task_list[e].task_uuid + } + }).then(() => { + that.$message({ + message: '重试成功', + type: 'success' + }) + that.task_list[e].task_status = 1 + if (that.task_list[e].ass_task&&that.task_list[e].ass_task.length > 0) { + that.task_list[e].ass_task.forEach(item => { + item.task_status = 1 + }) + } + }) + }, // 跳转设置 goSet(e) { that.$router.push({ path: e }) @@ -1321,6 +1344,14 @@ $red: #ff0000; font-size: 14px; color: #000000; height: 30px; + .work_status_retry { + width: 40px; + height: 22px; + line-height: 22px; + font-size: 12px; + padding: 0; + margin-left: 12px; + } } } .child_table {