From 77811571d428365d5fd458b08f9e8021a1eb7b5d Mon Sep 17 00:00:00 2001
From: 24kycj <1637269896@qq.com>
Date: Wed, 30 Apr 2025 22:57:52 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/renderer/components/workAdd/workAdd.vue | 11 ++++++-
src/renderer/store/modules/user.js | 3 +-
src/renderer/views/dashboard/index.vue | 36 ++++++++++-----------
src/renderer/views/manage/index.vue | 35 ++++++++++++++++++++
4 files changed, 65 insertions(+), 20 deletions(-)
diff --git a/src/renderer/components/workAdd/workAdd.vue b/src/renderer/components/workAdd/workAdd.vue
index 54eb416..2df0063 100644
--- a/src/renderer/components/workAdd/workAdd.vue
+++ b/src/renderer/components/workAdd/workAdd.vue
@@ -87,6 +87,12 @@
+
分盘设置:
@@ -273,6 +279,7 @@ export default {
ass_task: [],
task_freq: 1,
archive_path: '',
+ is_sim: true
},
testForm: {
req_name: 'submit_task',
@@ -296,7 +303,8 @@ export default {
]
}
],
- task_freq: 1
+ task_freq: 1,
+ is_sim: true
}
},
// CD类型:CD 700MB:1,DVD 4.7GB:2, DVD_DL 8.5GB:3,BD 25GB:4,BD_DL 50GB:5,BD_TL 100GB:6,BD_QL 128GB:7
@@ -749,6 +757,7 @@ export default {
that.form.is_finished_close = that.setForm.isClose
that.form.is_finished_delete = that.setForm.isDel
that.form.is_printer_labal_failed = that.setForm.isPrint
+ that.form.is_sim = that.setForm.is_sim
// csv文件处理
if (!that.form.udf_file && that.soonList.length > 0) {
that.soonList.forEach((item) => {
diff --git a/src/renderer/store/modules/user.js b/src/renderer/store/modules/user.js
index 2e156f4..80377e5 100644
--- a/src/renderer/store/modules/user.js
+++ b/src/renderer/store/modules/user.js
@@ -9,7 +9,8 @@ const setFormDefault = {
isClose: true,
isArrow: true,
isPrint: true,
- disk: 1
+ disk: 1,
+ is_sim: true
}
const user = {
state: {
diff --git a/src/renderer/views/dashboard/index.vue b/src/renderer/views/dashboard/index.vue
index 469bf4a..d54da9e 100644
--- a/src/renderer/views/dashboard/index.vue
+++ b/src/renderer/views/dashboard/index.vue
@@ -950,25 +950,25 @@ export default {
},
// 新建作业
showWork() {
- // if (!that.workStatus) {
- // that.$message({
- // message: '请先连接服务',
- // type: 'warning'
- // })
- // return
- // }
- // if (that.printer_info.is_set_cddev == 1) {
- // that.$confirm('上下光驱未设置,请前往设置', '温馨提示', {
- // confirmButtonText: '确定',
- // cancelButtonText: '取消',
- // type: 'warning'
- // }).then(() => {
- // that.goSet('/manage?type=cddev')
- // }).catch(() => {
+ if (!that.workStatus) {
+ that.$message({
+ message: '请先连接服务',
+ type: 'warning'
+ })
+ return
+ }
+ if (that.printer_info.is_set_cddev == 1) {
+ that.$confirm('上下光驱未设置,请前往设置', '温馨提示', {
+ confirmButtonText: '确定',
+ cancelButtonText: '取消',
+ type: 'warning'
+ }).then(() => {
+ that.goSet('/manage?type=cddev')
+ }).catch(() => {
- // });
- // return
- // }
+ });
+ return
+ }
that.isNew = true
that.workShow = true
that.$nextTick(() => {
diff --git a/src/renderer/views/manage/index.vue b/src/renderer/views/manage/index.vue
index 1a20dc1..8ef58cd 100644
--- a/src/renderer/views/manage/index.vue
+++ b/src/renderer/views/manage/index.vue
@@ -153,6 +153,10 @@ export default {
{
id: 4,
name: '校准光盘桶'
+ },
+ {
+ id: 5,
+ name: '校准打印头'
}
],
actionList: [
@@ -257,6 +261,10 @@ export default {
{
id: 4,
name: '校准光盘桶'
+ },
+ {
+ id: 5,
+ name: '校准打印头'
}
]
this.cdOptions = [
@@ -300,6 +308,10 @@ export default {
{
id: 4,
name: '校准光盘桶'
+ },
+ {
+ id: 5,
+ name: '校准打印头'
}
]
this.cdOptions = [
@@ -483,6 +495,29 @@ export default {
})
})
break
+ case 5:
+ // 校准打印头
+ that
+ .$confirm('请校准好打印头再点击确定', '温馨提示', {
+ confirmButtonText: '确定',
+ cancelButtonText: '取消',
+ type: 'warning'
+ })
+ .then(() => {
+ that.$store
+ .dispatch('chat/websocketsend', {
+ req_name: 'CaliPrinterHead',
+ req_type: 1,
+ req_info: {}
+ })
+ .then(() => {
+ that.$message({
+ message: '执行成功',
+ type: 'success'
+ })
+ })
+ })
+ break
}
},
// 设置设备