yangchunjin/SoonWorkerD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化bug

Browse Source
This commit is contained in:
24kycj
2024-11-26 16:41:52 +08:00
parent 93212a8e96
commit ba8b99b7d2
3 changed files with 38 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/renderer/components/workAdd/workAdd.vue
+16 -14
View File
@@ -283,18 +283,18 @@ export default {
value: 2, value: 2,
label: 'ISO文件刻录' label: 'ISO文件刻录'
}, },
// { {
// value: 3, value: 3,
// label: '复制光盘' label: '复制光盘'
// }, },
// { {
// value: 4, value: 4,
// label: '自动批量读取光盘' label: '自动批量读取光盘'
// }, },
// { {
// value: 5, value: 5,
// label: '自动归档任务' label: '自动归档任务'
// }, },
], ],
fileProgess: 30, fileProgess: 30,
// 模板列表 // 模板列表
@@ -455,6 +455,7 @@ export default {
const files = this.$refs.files.getLists() const files = this.$refs.files.getLists()
let fileList = [] let fileList = []
that.submitFlag = true that.submitFlag = true
that.form.ass_task = []
setTimeout(() => { setTimeout(() => {
that.submitFlag = false that.submitFlag = false
}, 1000) }, 1000)
@@ -520,8 +521,7 @@ export default {
}) })
return return
} }
total_size += fileList[i].size if (total_size + fileList[i].size > diskSize) {
if (total_size > diskSize) {
that.form.ass_task.push(task) that.form.ass_task.push(task)
total_size = 0 total_size = 0
index++ index++
@@ -531,10 +531,12 @@ export default {
path_file: [] path_file: []
} }
} }
total_size += fileList[i].size
task.path_file.push(fileList[i].path) task.path_file.push(fileList[i].path)
task.task_size += fileList[i].size task.task_size += fileList[i].size
if (i === fileList.length - 1) that.form.ass_task.push(task) if (i === fileList.length - 1) that.form.ass_task.push(task)
} }
console.log(that.form.ass_task)
} else { } else {
let task = { let task = {
ass_task_index: 1, ass_task_index: 1,
src/renderer/store/modules/chat.js
+9 -9
View File
@@ -157,25 +157,25 @@ const defaultData = {
// 左右盘仓 // 左右盘仓
strong_list: [ strong_list: [
{ {
strong_pos: 1, // 1：左盘仓，2：右盘仓 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 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 cd_num: 0
}, },
{ {
strong_pos: 2, strong_pos: 2,
cd_type: 1, cd_type: 2,
cd_num: 0 cd_num: 0
} }
], ],
strongList: { strongList: {
1: { 1: {
strong_pos: 1, strong_pos: 1,
cd_type: 2, cd_type: 1,
cd_num: 0 cd_num: 0
}, },
2: { 2: {
strong_pos: 2, strong_pos: 2,
cd_type: 1, cd_type: 2,
cd_num: 0 cd_num: 0
} }
} }
@@ -183,22 +183,22 @@ const defaultData = {
// 光驱信息 // 光驱信息
cd_list: [ cd_list: [
{ {
cd_pos: 1, // 设备位置 1：下光驱，2：上光驱 cd_pos: 2, // 设备位置 1：下光驱，2：上光驱
cd_status: 1, // 设备状态 0：无法确定光盘状态 ，1：没有光盘 ， 2：光驱托盘打开， 3：光驱未准备好，4：光盘状态正常，光盘已插入 cd_status: 1, // 设备状态 0：无法确定光盘状态 ，1：没有光盘 ， 2：光驱托盘打开， 3：光驱未准备好，4：光盘状态正常，光盘已插入
cd_taskid: '', // 当前任务id cd_taskid: '', // 当前任务id
dev_path: '', // 光驱路径 dev_path: '', // 光驱路径
dev_type: 2, // 光驱类型 dev_type: 1, // 光驱类型
cd_assid: '', // 作业的卷标名 cd_assid: '', // 作业的卷标名
total_size: 0, // 总容量 total_size: 0, // 总容量
use_size: 0, // 已使用容量 use_size: 0, // 已使用容量
copy_scheduler: 0 // 任务进度 copy_scheduler: 0 // 任务进度
}, },
{ {
cd_pos: 2, cd_pos: 1,
cd_status: 1, cd_status: 1,
cd_taskid: '', cd_taskid: '',
dev_path: '', dev_path: '',
dev_type: 1 dev_type: 2
} }
], ],
// 日志信息 // 日志信息
src/renderer/views/dashboard/index.vue
+13 -9
View File
@@ -48,7 +48,7 @@
<div class="device_info_box"> <div class="device_info_box">
<div class="device_info_main" :class="{ device_info_main1: infoStatus === 1 }"> <div class="device_info_main" :class="{ device_info_main1: infoStatus === 1 }">
<div class="device_info_item"> <div class="device_info_item">
<div class="device_info_title">{{ printer_info.printer_name }}</div> <div class="device_info_title">卡树光盘刻录一体机{{ printer_info.printer_name }}</div>
<div class="device_info_sure"> <div class="device_info_sure">
<div v-if="currentRunVal === 6" class="flex_box flex_row_between device_info_sure_box"> <div v-if="currentRunVal === 6" class="flex_box flex_row_between device_info_sure_box">
<div class="device_info_sure_text">{{ sureText }}</div> <div class="device_info_sure_text">{{ sureText }}</div>
@@ -114,11 +114,14 @@
<div :style="{ height: parseInt(printer_info.yellow_last) + '%' }" class="device_info_option_content"></div> <div :style="{ height: parseInt(printer_info.yellow_last) + '%' }" class="device_info_option_content"></div>
</div> </div>
</div> </div>
<div class="flex_box flex_row_between device_info_option_b"> <div v-if="!isLast" @click="isLast = true" class="flex_box flex_row_between device_info_option_b">
<div class="device_info_option_b_text device_info_option_b_text1">{{ parseInt(printer_info.blue_last) }}%</div> <div class="device_info_option_b_text device_info_option_b_text1">{{ parseInt(printer_info.blue_last) }}%</div>
<div class="device_info_option_b_text device_info_option_b_text1">{{ parseInt(printer_info.red_last) }}%</div> <div class="device_info_option_b_text device_info_option_b_text1">{{ parseInt(printer_info.red_last) }}%</div>
<div class="device_info_option_b_text device_info_option_b_text1">{{ parseInt(printer_info.yellow_last) }}%</div> <div class="device_info_option_b_text device_info_option_b_text1">{{ parseInt(printer_info.yellow_last) }}%</div>
</div> </div>
<div v-if="isLast" @click="isLast = false" class="flex_box flex_row_center device_info_option_b">
<div class="device_info_option_b_text device_info_option_b_text1">{{ $accDiv($accAdd($accAdd(printer_info.blue_last,printer_info.red_last),printer_info.yellow_last),3) }}%</div>
</div>
</div> </div>
</div> </div>
</div> </div>
@@ -162,7 +165,7 @@
<img v-if="cd_list[0].cd_status == 4" src="@/assets/images/device3.png" /> <img v-if="cd_list[0].cd_status == 4" src="@/assets/images/device3.png" />
<img v-if="cd_list[0].cd_status != 4" src="@/assets/images/device2.png" /> <img v-if="cd_list[0].cd_status != 4" src="@/assets/images/device2.png" />
<div class="device_right_top_img_text" v-if="cd_list[0].cd_status != 4">{{ diskTypes[cd_list[0].dev_type] }}</div> <div class="device_right_top_img_text" v-if="cd_list[0].cd_status != 4">{{ diskTypes[cd_list[0].dev_type] }}</div>
<div class="device_right_top_img_text device_right_top_img_text1" v-if="cd_list[0].cd_status !== 4">{{ CDTypes[cd_list[0].cd_type] }}</div> <div class="device_right_top_img_text device_right_top_img_text1" v-if="cd_list[0].cd_status == 4">{{ CDTypes[cd_list[0].cd_type] }}</div>
</div> </div>
<div class="device_right_top_content"> <div class="device_right_top_content">
<div class="device_right_top_title">{{ cd_list[0].dev_path || '' }}({{ $store.state.chat.CDName[cd_list[0].cd_pos] }})</div> <div class="device_right_top_title">{{ cd_list[0].dev_path || '' }}({{ $store.state.chat.CDName[cd_list[0].cd_pos] }})</div>
@@ -170,7 +173,7 @@
<div class="flex_box device_right_top_progress"> <div class="flex_box device_right_top_progress">
<div class="device_right_top_progress_box" :style="{ 'width': cd_list[0].copy_scheduler + '%' }"></div> <div class="device_right_top_progress_box" :style="{ 'width': cd_list[0].copy_scheduler + '%' }"></div>
</div> </div>
<div class="device_right_top_text">已刻录{{ $filterSize(cd_list[0].use_size) }}，共{{ $filterSize(cd_list[0].total_size) }}，{{ cd_list[0].burn_speed }}X</div> <div class="device_right_top_text">已刻录{{ $filterSize(cd_list[0].use_size) }}，共{{ $filterSize(cd_list[0].total_size) }}<span v-if="cd_list[0].burn_speed">，速度{{ cd_list[0].burn_speed }}X</span></div>
</template> </template>
<div class="device_right_top_text">状态：{{ $store.state.chat.CDStatus[cd_list[0].cd_status] }}</div> <div class="device_right_top_text">状态：{{ $store.state.chat.CDStatus[cd_list[0].cd_status] }}</div>
<div class="device_right_top_text">任务：{{ cd_list[0].cd_taskid || '' }}</div> <div class="device_right_top_text">任务：{{ cd_list[0].cd_taskid || '' }}</div>
@@ -183,7 +186,7 @@
<img v-if="cd_list[1].cd_status == 4" src="@/assets/images/device3.png" /> <img v-if="cd_list[1].cd_status == 4" src="@/assets/images/device3.png" />
<img v-if="cd_list[1].cd_status != 4" src="@/assets/images/device2.png" /> <img v-if="cd_list[1].cd_status != 4" src="@/assets/images/device2.png" />
<div class="device_right_top_img_text" v-if="cd_list[1].cd_status != 4">{{ diskTypes[cd_list[1].dev_type] }}</div> <div class="device_right_top_img_text" v-if="cd_list[1].cd_status != 4">{{ diskTypes[cd_list[1].dev_type] }}</div>
<div class="device_right_top_img_text device_right_top_img_text1" v-if="cd_list[1].cd_status !== 4">{{ CDTypes[cd_list[1].cd_type] }}</div> <div class="device_right_top_img_text device_right_top_img_text1" v-if="cd_list[1].cd_status == 4">{{ CDTypes[cd_list[1].cd_type] }}</div>
</div> </div>
<div class="device_right_top_content"> <div class="device_right_top_content">
<div class="device_right_top_title">{{ cd_list[1].dev_path || '' }}({{ $store.state.chat.CDName[cd_list[1].cd_pos] }})</div> <div class="device_right_top_title">{{ cd_list[1].dev_path || '' }}({{ $store.state.chat.CDName[cd_list[1].cd_pos] }})</div>
@@ -191,7 +194,7 @@
<div class="flex_box device_right_top_progress"> <div class="flex_box device_right_top_progress">
<div class="device_right_top_progress_box" :style="{ 'width': cd_list[1].copy_scheduler + '%' }"></div> <div class="device_right_top_progress_box" :style="{ 'width': cd_list[1].copy_scheduler + '%' }"></div>
</div> </div>
<div class="device_right_top_text">已刻录{{ $filterSize(cd_list[1].use_size) }}，共{{ $filterSize(cd_list[1].total_size) }}，{{ cd_list[1].burn_speed }}X</div> <div class="device_right_top_text">已刻录{{ $filterSize(cd_list[1].use_size) }}，共{{ $filterSize(cd_list[1].total_size) }}<span v-if="cd_list[1].burn_speed">，速度{{ cd_list[1].burn_speed }}X</span></div>
</template> </template>
<div class="device_right_top_text">状态：{{ $store.state.chat.CDStatus[cd_list[1].cd_status] }}</div> <div class="device_right_top_text">状态：{{ $store.state.chat.CDStatus[cd_list[1].cd_status] }}</div>
<div class="device_right_top_text">任务：{{ cd_list[1].cd_taskid || '' }}</div> <div class="device_right_top_text">任务：{{ cd_list[1].cd_taskid || '' }}</div>
@@ -396,6 +399,7 @@ export default {
}, },
// 设备信息 // 设备信息
printer_info: {}, printer_info: {},
isLast: false,
// 光盘信息 // 光盘信息
default_cd: {}, default_cd: {},
diskTypes: {}, diskTypes: {},
@@ -824,7 +828,6 @@ $red: #ff0000;
margin-bottom: 24px; margin-bottom: 24px;
.device_img { .device_img {
width: 255px; width: 255px;
height: 180px;
margin-right: 35px; margin-right: 35px;
} }
.device_info { .device_info {
@@ -875,7 +878,8 @@ $red: #ff0000;
} }
.device_info_options { .device_info_options {
.device_info_option { .device_info_option {
margin-right: 30px; padding: 0 10px;
margin-right: 40px;
&:last-child { &:last-child {
margin-right: 0; margin-right: 0;
} }
@@ -941,7 +945,7 @@ $red: #ff0000;
} }
} }
.device_info_option_list { .device_info_option_list {
width: 200px; width: 130px;
.device_info_option_item { .device_info_option_item {
width: 36px; width: 36px;
height: 67px; height: 67px;