diff --git a/help/User Manual.pdf b/help/User Manual.pdf
new file mode 100644
index 0000000..eb7ab5f
Binary files /dev/null and b/help/User Manual.pdf differ
diff --git a/package.json b/package.json
index 08055a1..6089d42 100644
--- a/package.json
+++ b/package.json
@@ -33,6 +33,10 @@
{
"from": "./cardsoonServer",
"to": "."
+ },
+ {
+ "from": "./help",
+ "to": "."
}
],
"directories": {
diff --git a/src/main/index.js b/src/main/index.js
index b052d2c..f625e7b 100644
--- a/src/main/index.js
+++ b/src/main/index.js
@@ -92,7 +92,7 @@ app.on('ready', () => {
// IPC 处理:打开帮助文件
ipcMain.on('open-help-file', async event => {
- const helpFilePath = path.join(root, "CardsoonServer", "User Manual.pdf");
+ const helpFilePath = path.join(root, "help", "User Manual.pdf");
if (!fs.existsSync(helpFilePath)) {
const errorMsg = `帮助文件不存在: ${helpFilePath}`;
diff --git a/src/renderer/assets/images/DP-4200-open.png b/src/renderer/assets/images/DP-4200-open.png
new file mode 100644
index 0000000..40dc3a2
Binary files /dev/null and b/src/renderer/assets/images/DP-4200-open.png differ
diff --git a/src/renderer/assets/images/DP-4200.png b/src/renderer/assets/images/DP-4200.png
new file mode 100644
index 0000000..4fe5f9c
Binary files /dev/null and b/src/renderer/assets/images/DP-4200.png differ
diff --git a/src/renderer/assets/images/DP-SE3-open.png b/src/renderer/assets/images/DP-SE3-open.png
new file mode 100644
index 0000000..0abd04c
Binary files /dev/null and b/src/renderer/assets/images/DP-SE3-open.png differ
diff --git a/src/renderer/assets/images/DP-SE3.png b/src/renderer/assets/images/DP-SE3.png
new file mode 100644
index 0000000..ede6b2c
Binary files /dev/null and b/src/renderer/assets/images/DP-SE3.png differ
diff --git a/src/renderer/components/workAdd/workAdd.vue b/src/renderer/components/workAdd/workAdd.vue
index a493225..e1ad4cb 100644
--- a/src/renderer/components/workAdd/workAdd.vue
+++ b/src/renderer/components/workAdd/workAdd.vue
@@ -307,12 +307,6 @@
-
取消
@@ -528,7 +522,6 @@ export default {
// 新手引导
guideStep: null,
currentStep: 0,
- tempHideStep: false, // 临时存储新手引导开关状态
}
},
watch: {
@@ -1156,109 +1149,10 @@ export default {
this.$store.dispatch('chat/setDatas', { name: 'workStatus', data: true })
this.$store.dispatch('setDatas', { name: 'setForm', data: this.setForm })
localStorage.setItem('setForm', JSON.stringify(this.setForm))
- // 根据临时变量更新 hideStep
- if (this.tempHideStep) {
- // 开启新手引导:设置 hideStep 为 0
- localStorage.setItem('hideStep', 0)
- // 初始化 guideStep(如果不存在)
- const guideStepStr = localStorage.getItem('guideStep')
- if (!guideStepStr) {
- this.initGuideStep()
- }
- } else {
- // 关闭新手引导:设置 hideStep 为 1
- localStorage.setItem('hideStep', 1)
- // 关闭当前显示的引导
- if (this.guideStep) {
- for (let key in this.guideStep) {
- this.guideStep[key].show = false
- }
- }
- this.currentStep = -1
- localStorage.setItem('currentStep', this.currentStep)
- if (this.guideStep) {
- localStorage.setItem('guideStep', JSON.stringify(this.guideStep))
- }
- }
},
initSet() {
this.setForm = { ...this.$store.state.user.setForm }
console.log(this.$store.state.user.setForm)
- // 初始化新手引导开关状态
- const hideStep = localStorage.getItem('hideStep')
- this.tempHideStep = !hideStep || hideStep == 0
- },
- // 初始化新手引导步骤
- initGuideStep() {
- const guideStep = [
- {
- show: false,
- placement: 'right',
- step: '系统状态面板,显示系统名称,耗材信息等,通过下拉菜单可以执行设置光盘桶等常见操作。',
- },
- {
- show: false,
- placement: 'left',
- step: '光驱状态面板,显示当前光驱工作状态,刻录进度和速度等相关信息。',
- },
- {
- show: false,
- placement: 'left',
- step: '日志面板,显示当前日志动态。',
- },
- {
- show: false,
- placement: 'top',
- step: '作业列表面板,显示当前作业信息。',
- },
- {
- show: false,
- placement: 'bottom',
- step: '服务启动和停止切换按钮。',
- },
- {
- show: false,
- placement: 'bottom',
- step: '任务统计面板。',
- },
- {
- show: false,
- placement: 'bottom',
- step: '系统设置按钮,详情请见软件使用手册。',
- },
- {
- show: false,
- placement: 'bottom',
- step: '新建作业和打开作业按钮。',
- },
- {
- show: false,
- placement: 'bottom',
- step: '选择作业的光盘类型和任务类型。',
- },
- {
- show: false,
- placement: 'right',
- step: '作业内容面板,选择文件夹和文件作为光盘刻录内容,修改光盘卷标名称。',
- },
- {
- show: false,
- placement: 'left',
- step: '作业标签面板,选择或创建一个光盘标签,也可以通过下拉菜单选择默认标签,默认标签路径为软件目录下User Templates文件夹中。',
- },
- {
- show: false,
- placement: 'bottom',
- step: '高级作业设置按钮,配置刻录速度,校验,跨盘,虚拟刻录等详细的作业设置。',
- },
- {
- show: false,
- placement: 'top',
- step: '点击保存作业或提交按钮,还可以点击链接查看更多软件使用手册。',
- },
- ]
- localStorage.setItem('guideStep', JSON.stringify(guideStep))
- localStorage.setItem('currentStep', 0)
},
// 退出新手引导
exitGuide() {
diff --git a/src/renderer/store/modules/chat.js b/src/renderer/store/modules/chat.js
index 2b51cfa..d1ee2a0 100644
--- a/src/renderer/store/modules/chat.js
+++ b/src/renderer/store/modules/chat.js
@@ -222,6 +222,8 @@ const defaultData = {
system_name: '', //主机名称
is_set_cddev: 0,
serial_no: '', //设备序列号
+ free_cache_space: 51587919872, //缓存空间
+ total_cache_space: 105152176128, //总缓存空间
test_use: '', //试用天数
// 左右光盘桶
strong_list: [
diff --git a/src/renderer/views/dashboard/index.vue b/src/renderer/views/dashboard/index.vue
index f530d43..0b7e418 100644
--- a/src/renderer/views/dashboard/index.vue
+++ b/src/renderer/views/dashboard/index.vue
@@ -162,7 +162,7 @@
handleCommandCD(e, 2)">
-
{{ printer_info.printer_name === 'SE3' ? '组合' :
+
{{ printer_info.printer_name && printer_info.printer_name.indexOf('SE3') > -1 ? '组合' :
CDTypes[changeCD.req_info.strong_list[1].strong_type] }} {{
printer_info.strongList[2].cd_num }}张
@@ -188,7 +188,7 @@
handleCommandCD(e, 1)">
-
{{ printer_info.printer_name === 'SE3' ? '组合' :
+
{{ printer_info.printer_name && printer_info.printer_name.indexOf('SE3') > -1 ? '组合' :
CDTypes[changeCD.req_info.strong_list[0].strong_type] }} {{
printer_info.strongList[1].cd_num }}张
@@ -248,7 +248,7 @@
系统序列号:{{ printer_info.serial_no }}
主机名:{{ printer_info.system_name }}
主机IP:{{ printer_info.system_ip }}
-
缓存空间:0G(共0G)
+
缓存空间:{{ $filterSize(printer_info.free_cache_space) }}(共{{ $filterSize(printer_info.total_cache_space) }})
@@ -551,6 +551,18 @@ export default {
img2: require('@/assets/images/SE3-open.png'),
num1: 3,
num2: 6
+ },
+ 'DP-4200': {
+ img1: require('@/assets/images/DP-4200.png'),
+ img2: require('@/assets/images/DP-4200-open.png'),
+ num1: 5,
+ num2: 10
+ },
+ 'DP-SE3': {
+ img1: require('@/assets/images/DP-SE3.png'),
+ img2: require('@/assets/images/DP-SE3-open.png'),
+ num1: 3,
+ num2: 6
}
},
// 服务状态
@@ -708,7 +720,7 @@ export default {
that = this
let data = { ...val }
this.printer_info = { ...data }
- if (val.printer_name && val.printer_name === 'SE3') {
+ if (val.printer_name && val.printer_name.indexOf('SE3') > -1) {
if (this.currentRunVal !== 6) {
this.changeCD.req_info.strong_list = [
{
diff --git a/src/renderer/views/manage/index.vue b/src/renderer/views/manage/index.vue
index cc0d1e8..5f99842 100644
--- a/src/renderer/views/manage/index.vue
+++ b/src/renderer/views/manage/index.vue
@@ -72,6 +72,12 @@
服务重启时是否删除已完成和已取消任务?
+