size调整

src/renderer/store/modules/chat.js

@@ -104,41 +104,42 @@ const CDTypes = {
   6: 'BD_TL',
   7: 'BD_QL'
 }
+const size = process.platform === 'linux' ? 1000 : 1024
 const cd_types = [
   {
     value: 1,
     label: 'CD 700MB',
-    size: 700 * 1024 * 1024
+    size: 700 * size * size
   },
   {
     value: 2,
     label: 'DVD 4.7GB',
-    size: 4.7 * 1024 * 1024 * 1024
+    size: 4.7 * size * size * size
   },
   {
     value: 3,
     label: 'DVD_DL 8.5GB',
-    size: 8.5 * 1024 * 1024 * 1024
+    size: 8.5 * size * size * size
   },
   {
     value: 4,
     label: 'BD 25GB',
-    size: 25 * 1024 * 1024 * 1024
+    size: 25 * size * size * size
   },
   {
     value: 5,
     label: 'BD_DL 50GB',
-    size: 50 * 1024 * 1024 * 1024
+    size: 50 * size * size * size
   },
   {
     value: 6,
     label: 'BD_TL 100GB',
-    size: 100 * 1024 * 1024 * 1024
+    size: 100 * size * size * size
   },
   {
     value: 7,
     label: 'BD_QL 128GB',
-    size: 128 * 1024 * 1024 * 1024
+    size: 128 * size * size * size
   }
 ]
 

src/renderer/views/dashboard/index.vue

@@ -515,6 +515,9 @@ export default {
           this.is_set_cddev = true
           this.goSet('/manage?type=cddev')
         }
+        if (this.printer_info.cartridge_flag == 0) {
+          this.$store.commit('chat/setData', { name: 'printer_error', data: { type: 'error', notify: '请检查墨盒错误或墨盒未安装，否则作业将失败。' } })
+        }
       },
       deep: true,
       immediate: true
@@ -879,41 +882,42 @@ export default {
         .then(() => {
           clearTimeout(outTimer)
           that.currentRunVal = 0
+          const size = process.platform === 'linux' ? 1000 : 1024
           let typeLists = [
             {
               value: 1,
               label: 'CD 700MB',
-              size: 700 * 1024 * 1024
+              size: 700 * size * size
             },
             {
               value: 2,
               label: 'DVD 4.7GB',
-              size: 4.7 * 1024 * 1024 * 1024
+              size: 4.7 * size * size * size
             },
             {
               value: 3,
               label: 'DVD_DL 8.5GB',
-              size: 8.5 * 1024 * 1024 * 1024
+              size: 8.5 * size * size * size
             },
             {
               value: 4,
               label: 'BD 25GB',
-              size: 25 * 1024 * 1024 * 1024
+              size: 25 * size * size * size
             },
             {
               value: 5,
               label: 'BD_DL 50GB',
-              size: 50 * 1024 * 1024 * 1024
+              size: 50 * size * size * size
             },
             {
               value: 6,
               label: 'BD_TL 100GB',
-              size: 100 * 1024 * 1024 * 1024
+              size: 100 * size * size * size
             },
             {
               value: 7,
               label: 'BD_QL 128GB',
-              size: 128 * 1024 * 1024 * 1024
+              size: 128 * size * size * size
             }
           ]
           let isBD = that.changeCD.req_info.strong_list.findIndex(item => parseInt(item.strong_type) > 3)
@@ -1038,13 +1042,13 @@ export default {
         })
     },
     // 作业取消
-    workCancel(e) {
+    workCancel(row) {
       that.$store
         .dispatch('chat/websocketsend', {
           req_name: 'cancle_task',
           req_type: 1,
           req_info: {
-            task_uuid: that.task_list[e].task_uuid
+            task_uuid: row.task_uuid
           }
         })
         .then(() => {
@@ -1052,9 +1056,9 @@ export default {
             message: '取消成功',
             type: 'success'
           })
-          that.task_list[e].task_status = 7
-          if (that.task_list[e].ass_task && that.task_list[e].ass_task.length > 0) {
-            that.task_list[e].ass_task.forEach((item) => {
+          row.task_status = 7
+          if (row.ass_task && row.ass_task.length > 0) {
+            row.ass_task.forEach((item) => {
               item.task_status = 7
             })
           }