更新

src/renderer/store/modules/chat.js

@@ -233,6 +233,7 @@ const defaultData = {
     system_name: '', //主机名称
     is_set_cddev: 0,
     serial_no: '', //设备序列号
+    test_use: '', //试用天数
     // 左右光盘桶
     strong_list: [
       {
@@ -481,7 +482,7 @@ const actions = {
               if (req) {
                 commit('setData', { name: 'printer_error', data: { type: 'error', confirm: Error[errors[i]], req: req, noJump: noJump, isClear: isClear } })
               } else {
-                commit('setData', { name: 'printer_error', data: { type: 'error', notify: Error[errors[i]], isClear: isClear } })
+                commit('setData', { name: 'printer_error', data: { type: 'error', notify: Error[errors[i]], isClear: isClear, noJump: noJump } })
               }
             }, 500)
           }

src/renderer/views/manage/index.vue

@@ -156,11 +156,7 @@ export default {
         },
         {
           id: 5,
-          name: '校准打印头'
+          name: '对齐打印机墨盒'
-        },
-        {
-          id: 6,
-          name: '清洗打印头'
         }
       ],
       actionList: [
@@ -193,6 +189,10 @@ export default {
         {
           id: 5,
           name: '进入循环模式'
+        },
+        {
+          id: 6,
+          name: '清洗打印机墨头'
         }
       ],
       refreshTime: 10,
@@ -268,11 +268,7 @@ export default {
             },
             {
               id: 5,
-              name: '校准打印头'
+              name: '对齐打印机墨盒'
-            },
-            {
-              id: 6,
-              name: '清洗打印头'
             }
           ]
           this.cdOptions = [
@@ -301,6 +297,10 @@ export default {
             {
               id: 5,
               name: '进入循环模式'
+            },
+            {
+              id: 6,
+              name: '清洗打印机墨头'
             }
           ]
         } else {
@@ -323,11 +323,7 @@ export default {
             },
             {
               id: 5,
-              name: '校准打印头'
+              name: '对齐打印机墨盒'
-            },
-            {
-              id: 6,
-              name: '清洗打印头'
             }
           ]
           this.cdOptions = [
@@ -364,6 +360,10 @@ export default {
             {
               id: 5,
               name: '进入循环模式'
+            },
+            {
+              id: 6,
+              name: '清洗打印机墨头'
             }
           ]
         }
@@ -546,29 +546,6 @@ export default {
                 })
             })
           break
-        case 6:
-          // 清洗墨盒上的打印头
-          that
-            .$confirm('请在进盘仓放入一张空白的可打印光盘，再点击确定', '温馨提示', {
-              confirmButtonText: '确定',
-              cancelButtonText: '取消',
-              type: 'warning'
-            })
-            .then(() => {
-              that.$store
-                .dispatch('chat/websocketsend', {
-                  req_name: 'CleanPrinterHead',
-                  req_type: 2,
-                  req_info: {}
-                })
-                .then(() => {
-                  that.$message({
-                    message: '已发送指令',
-                    type: 'success'
-                  })
-                })
-            })
-          break
       }
     },
     // 设置设备
@@ -732,6 +709,29 @@ export default {
                 })
             })
           break
+        case 6:
+          // 清洗墨盒上的打印头
+          that
+            .$confirm('请在进盘仓放入一张空白的可打印光盘，再点击确定', '温馨提示', {
+              confirmButtonText: '确定',
+              cancelButtonText: '取消',
+              type: 'warning'
+            })
+            .then(() => {
+              that.$store
+                .dispatch('chat/websocketsend', {
+                  req_name: 'CleanPrinterHead',
+                  req_type: 2,
+                  req_info: {}
+                })
+                .then(() => {
+                  that.$message({
+                    message: '已发送指令',
+                    type: 'success'
+                  })
+                })
+            })
+          break
       }
     },
     cdChange(index, e) {