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

完善新建作业流程

Browse Source
This commit is contained in:
24kycj
2024-11-07 21:50:06 +08:00
parent ca1a2e11b5
commit 2384fcf7f1
18 changed files with 1585 additions and 341 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/renderer/views/dashboard/index.vue
+62 -70
View File
@@ -111,7 +111,7 @@
</el-option>
</el-select>
</div>
<el-button type="primary" class="device_run_btn">执行</el-button>
<el-button @click="handleRun" type="primary" class="device_run_btn">执行</el-button>
</div>
</div>
<!-- 右侧 -->
@@ -121,14 +121,14 @@
<img class="device_right_top_img" src="@/assets/images/device2.png" />
<div class="device_right_top_content">
<div class="device_right_top_title">BD驱动器(S)(顶部)</div>
<div class="device_right_top_text">状态：插入光盘中</div>
<div class="device_right_top_text">任务：文件刻录_20210323095213</div>
<div class="device_right_top_text">光盘：56210323002</div>
<div class="device_right_top_text">状态：空闲、无盘</div>
<div class="device_right_top_text">任务：</div>
<div class="device_right_top_text">光盘：</div>
</div>
</div>
<div class="device_right_top_line"></div>
<div class="flex_box flex_row_between device_right_top_item">
<img class="device_right_top_img" src="@/assets/images/device2.png" />
<img class="device_right_top_img" src="@/assets/images/device3.png" />
<div class="device_right_top_content">
<div class="device_right_top_title">21032200009(H)(底部)</div>
<div class="flex_box device_right_top_progress">
@@ -136,7 +136,7 @@
</div>
<div class="device_right_top_text">15GB可用，共60GB</div>
<div class="device_right_top_text">状态：插入光盘中</div>
<div class="device_right_top_text">任务：文件刻录_20210323095213</div>
<div class="device_right_top_text">任务：文件刻录_20241107175818</div>
<div class="device_right_top_text">光盘：56210323002</div>
</div>
</div>
@@ -169,18 +169,24 @@
<el-table max-height="250" class="work_table" :data="workList" empty-text="暂无作业列表">
<el-table-column type="index" width="50" label="序号"></el-table-column>
<el-table-column prop="jId" label="作业ID"></el-table-column>
<el-table-column prop="DataSource" label="作业来源"></el-table-column>
<el-table-column prop="PrinterID" label="工作站"></el-table-column>
<el-table-column prop="PrinterType" label="存储卡类型"></el-table-column>
<el-table-column prop="TaskCapacity" label="拷贝数"></el-table-column>
<el-table-column prop="CreateTime" label="开始时间"></el-table-column>
<el-table-column prop="FinishTime" label="结束时间"></el-table-column>
<el-table-column prop="username" label="用户"></el-table-column>
<el-table-column prop="DataSource" label="来源"></el-table-column>
<el-table-column prop="PrinterType" label="类型">
<template slot-scope="scope">
<div class="work_status_box">
<div>{{typeList[scope.row.PrinterType]}}</div>
</div>
</template>
</el-table-column>
<el-table-column prop="TaskCapacity" label="大小"></el-table-column>
<!-- <el-table-column prop="CreateTime" label="开始时间"></el-table-column> -->
<!-- <el-table-column prop="FinishTime" label="结束时间"></el-table-column> -->
<el-table-column prop="JobCompletion" label="完成"></el-table-column>
<el-table-column prop="JobStatus" label="状态">
<template slot-scope="scope">
<div class="flex_box work_status_box">
<div>{{scope.row.JobStatus==1?'成功':'失败'}}</div>
<i class="el-icon-caret-bottom"></i>
<div>{{statusList[scope.row.JobStatus]}}</div>
<!-- <i class="el-icon-caret-bottom"></i> -->
</div>
</template>
</el-table-column>
@@ -220,88 +226,66 @@ export default {
runList: [
{
value: 1,
label: '检查打印机',
label: '重启设备',
},
{
value: 2,
label: '打印机换纸',
label: '清除错误',
},
{
value: 3,
label: '校准光盘桶',
},
{
value: 4,
label: '校准打印机',
}
},
{
value: 5,
label: '自动设置刻录机',
},
{
value: 6,
label: '设置左右盘仓',
},
],
// 剩余容量
progressW: 50,
progressW: 75,
// 日志
noticeList: [
{
id: 1,
message: '《CRMEB 开源/标准版商城系统客服配置教程》',
message: '[2024-11-07 17:58:18][文件刻录 20241107175818][执行任务完成]',
createtime: '2024 10-13'
},
{
id: 2,
message: '《CRMEB 开源/标准版商城系统客服配置教程》',
message: '[2024-11-07 17:53:13][文件刻录 20241107175313][开始执行文件刻录任务]',
createtime: '2024 10-13'
},
{
id: 3,
message: '《CRMEB 开源/标准版商城系统客服配置教程》',
createtime: '2024 10-13'
}
// {
// id: 3,
// message: '[2024-11-07 17:52:28][文件刻录 20241107175228][接收到任务]',
// createtime: '2024 10-13'
// },
],
// 作业列表
workList: [
{
ID: '1',
jId: '202410145423408',
username: 'Admin',
DataSource: '127.0.0.1',
PrinterID: '002A',
PrinterType: '4GB丨2.0',
TaskCapacity: '1GB278MB',
CreateTime: '10-14 15:46:24',
FinishTime: '10-14 16:10:01',
PrinterType: 1,
TaskCapacity: '2.41GB',
CreateTime: '11-07 15:46:24',
FinishTime: '11-07 16:10:01',
JobCompletion: '5/10',
JobStatus: '1'
JobStatus: '4'
},
{
ID: '1',
jId: '202410145423408',
DataSource: '127.0.0.1',
PrinterID: '002A',
PrinterType: '4GB丨2.0',
TaskCapacity: '1GB278MB',
CreateTime: '10-14 15:46:24',
FinishTime: '10-14 16:10:01',
JobCompletion: '5/10',
JobStatus: '1'
},
{
ID: '1',
jId: '202410145423408',
DataSource: '127.0.0.1',
PrinterID: '002A',
PrinterType: '4GB丨2.0',
TaskCapacity: '1GB278MB',
CreateTime: '10-14 15:46:24',
FinishTime: '10-14 16:10:01',
JobCompletion: '5/10',
JobStatus: '1'
},
{
ID: '1',
jId: '202410145423408',
DataSource: '127.0.0.1',
PrinterID: '002A',
PrinterType: '4GB丨2.0',
TaskCapacity: '1GB278MB',
CreateTime: '10-14 15:46:24',
FinishTime: '10-14 16:10:01',
JobCompletion: '5/10',
JobStatus: '1'
},
]
],
typeList: ['', '文件刻录', '光盘拷贝', '定期归档', '光盘读取'],
statusList: ['', '新建', '等待中', '文件准备中', '正在刻录', '正在打印', '已失败', '已取消', '已完成'],
}
},
computed: {
@@ -311,6 +295,14 @@ export default {
that = this
},
methods: {
// 执行
handleRun() {
const index = that.runList.findIndex(item => item.value == that.runVal)
that.$message({
message: that.runList[index].label,
type: 'success'
})
},
// 新建作业
showWork() {
that.$refs.workAdd.show()
@@ -643,7 +635,7 @@ export default {
}
}
.notice_list {
max-height: 200px;
height: 200px;
overflow-y: scroll;
padding: 6px;
::-webkit-scrollbar {
@@ -698,7 +690,7 @@ export default {
}
}
.work_box {
height: calc(100vh - 590px);
height: calc(100vh - 640px);
.work_top {
height: 72px;
.work_top_text {
src/renderer/views/login/index.vue
+1 -1
View File
@@ -81,7 +81,7 @@ export default {
this.loading = true
setToken('data.token')
this.$store.commit('SET_TOKEN', 'data.token')
// this.$store.dispatch('chat/initWebSocket') // 初始化websocket
this.$store.dispatch('chat/initWebSocket') // 初始化websocket
setTimeout(() => {
this.loading = false
this.$router.push({ path: '/' })