diff --git a/src/renderer/components/workAdd/workAdd.vue b/src/renderer/components/workAdd/workAdd.vue index 8ac9947..5d32ff9 100644 --- a/src/renderer/components/workAdd/workAdd.vue +++ b/src/renderer/components/workAdd/workAdd.vue @@ -283,18 +283,18 @@ export default { value: 2, label: 'ISO文件刻录' }, - // { - // value: 3, - // label: '复制光盘' - // }, - // { - // value: 4, - // label: '自动批量读取光盘' - // }, - // { - // value: 5, - // label: '自动归档任务' - // }, + { + value: 3, + label: '复制光盘' + }, + { + value: 4, + label: '自动批量读取光盘' + }, + { + value: 5, + label: '自动归档任务' + }, ], fileProgess: 30, // 模板列表 @@ -455,6 +455,7 @@ export default { const files = this.$refs.files.getLists() let fileList = [] that.submitFlag = true + that.form.ass_task = [] setTimeout(() => { that.submitFlag = false }, 1000) @@ -520,8 +521,7 @@ export default { }) return } - total_size += fileList[i].size - if (total_size > diskSize) { + if (total_size + fileList[i].size > diskSize) { that.form.ass_task.push(task) total_size = 0 index++ @@ -531,10 +531,12 @@ export default { path_file: [] } } + total_size += fileList[i].size task.path_file.push(fileList[i].path) task.task_size += fileList[i].size if (i === fileList.length - 1) that.form.ass_task.push(task) } + console.log(that.form.ass_task) } else { let task = { ass_task_index: 1, diff --git a/src/renderer/store/modules/chat.js b/src/renderer/store/modules/chat.js index 1185d4d..5e83617 100644 --- a/src/renderer/store/modules/chat.js +++ b/src/renderer/store/modules/chat.js @@ -157,25 +157,25 @@ const defaultData = { // 左右盘仓 strong_list: [ { - strong_pos: 1, // 1:左盘仓,2:右盘仓 - cd_type: 2, //CD类型:CD:1,DVD:2, DVD_DL:3,BD:4,BD_DL:5,BD_TL:6,BD_QL:7 + strong_pos: 1, // 1:右盘仓,2:左盘仓 + cd_type: 1, //CD类型:CD:1,DVD:2, DVD_DL:3,BD:4,BD_DL:5,BD_TL:6,BD_QL:7 cd_num: 0 }, { strong_pos: 2, - cd_type: 1, + cd_type: 2, cd_num: 0 } ], strongList: { 1: { strong_pos: 1, - cd_type: 2, + cd_type: 1, cd_num: 0 }, 2: { strong_pos: 2, - cd_type: 1, + cd_type: 2, cd_num: 0 } } @@ -183,22 +183,22 @@ const defaultData = { // 光驱信息 cd_list: [ { - cd_pos: 1, // 设备位置 1:下光驱,2:上光驱 + cd_pos: 2, // 设备位置 1:下光驱,2:上光驱 cd_status: 1, // 设备状态 0:无法确定光盘状态 ,1:没有光盘 , 2:光驱托盘打开, 3:光驱未准备好,4:光盘状态正常,光盘已插入 cd_taskid: '', // 当前任务id dev_path: '', // 光驱路径 - dev_type: 2, // 光驱类型 + dev_type: 1, // 光驱类型 cd_assid: '', // 作业的卷标名 total_size: 0, // 总容量 use_size: 0, // 已使用容量 copy_scheduler: 0 // 任务进度 }, { - cd_pos: 2, + cd_pos: 1, cd_status: 1, cd_taskid: '', dev_path: '', - dev_type: 1 + dev_type: 2 } ], // 日志信息 diff --git a/src/renderer/views/dashboard/index.vue b/src/renderer/views/dashboard/index.vue index 18cbe49..ae8118a 100644 --- a/src/renderer/views/dashboard/index.vue +++ b/src/renderer/views/dashboard/index.vue @@ -48,7 +48,7 @@
-
{{ printer_info.printer_name }}
+
卡树光盘刻录一体机{{ printer_info.printer_name }}
{{ sureText }}
@@ -114,11 +114,14 @@
-
+
{{ parseInt(printer_info.blue_last) }}%
{{ parseInt(printer_info.red_last) }}%
{{ parseInt(printer_info.yellow_last) }}%
+
+
{{ $accDiv($accAdd($accAdd(printer_info.blue_last,printer_info.red_last),printer_info.yellow_last),3) }}%
+
@@ -162,7 +165,7 @@
{{ diskTypes[cd_list[0].dev_type] }}
-
{{ CDTypes[cd_list[0].cd_type] }}
+
{{ CDTypes[cd_list[0].cd_type] }}
{{ cd_list[0].dev_path || '' }}({{ $store.state.chat.CDName[cd_list[0].cd_pos] }})
@@ -170,7 +173,7 @@
-
已刻录{{ $filterSize(cd_list[0].use_size) }},共{{ $filterSize(cd_list[0].total_size) }},{{ cd_list[0].burn_speed }}X
+
已刻录{{ $filterSize(cd_list[0].use_size) }},共{{ $filterSize(cd_list[0].total_size) }},速度{{ cd_list[0].burn_speed }}X
状态:{{ $store.state.chat.CDStatus[cd_list[0].cd_status] }}
任务:{{ cd_list[0].cd_taskid || '' }}
@@ -183,7 +186,7 @@
{{ diskTypes[cd_list[1].dev_type] }}
-
{{ CDTypes[cd_list[1].cd_type] }}
+
{{ CDTypes[cd_list[1].cd_type] }}
{{ cd_list[1].dev_path || '' }}({{ $store.state.chat.CDName[cd_list[1].cd_pos] }})
@@ -191,7 +194,7 @@
-
已刻录{{ $filterSize(cd_list[1].use_size) }},共{{ $filterSize(cd_list[1].total_size) }},{{ cd_list[1].burn_speed }}X
+
已刻录{{ $filterSize(cd_list[1].use_size) }},共{{ $filterSize(cd_list[1].total_size) }},速度{{ cd_list[1].burn_speed }}X
状态:{{ $store.state.chat.CDStatus[cd_list[1].cd_status] }}
任务:{{ cd_list[1].cd_taskid || '' }}
@@ -396,6 +399,7 @@ export default { }, // 设备信息 printer_info: {}, + isLast: false, // 光盘信息 default_cd: {}, diskTypes: {}, @@ -824,7 +828,6 @@ $red: #ff0000; margin-bottom: 24px; .device_img { width: 255px; - height: 180px; margin-right: 35px; } .device_info { @@ -875,7 +878,8 @@ $red: #ff0000; } .device_info_options { .device_info_option { - margin-right: 30px; + padding: 0 10px; + margin-right: 40px; &:last-child { margin-right: 0; } @@ -941,7 +945,7 @@ $red: #ff0000; } } .device_info_option_list { - width: 200px; + width: 130px; .device_info_option_item { width: 36px; height: 67px;