diff --git a/package.json b/package.json index fa7f48e..863328c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "JUSTAR", - "version": "2.1.6", + "version": "2.2.0", "description": "钜星科技便民问诊系统", "main": "src/index.js", "scripts": { diff --git a/src/js/main.js b/src/js/main.js index 7527810..a3d4562 100644 --- a/src/js/main.js +++ b/src/js/main.js @@ -159,7 +159,7 @@ let main ={ } }, { - label:'版本号:2.1.9', + label:'版本号:2.2.0', icon: respath + path.sep+ "static"+ path.sep+"images"+ path.sep+"paste.png", },] }); diff --git a/src/js/setting/print_monitor.js b/src/js/setting/print_monitor.js index 0d900b0..0f46b89 100644 --- a/src/js/setting/print_monitor.js +++ b/src/js/setting/print_monitor.js @@ -73,13 +73,20 @@ let print_monitor={ if(err){ log.error("获取打印机缓存失败"); }else { - let printer_json = JSON.parse(data); - defaultPrinter = printer_json.printer_name; - data = { - listPrinter: listPrinter, - defaultPrinter: defaultPrinter, - pdf_url: pdf_url - } + if(data.length == 0){ + data = { + listPrinter: listPrinter, + pdf_url: pdf_url + } + }else{ + let printer_json = JSON.parse(data); + defaultPrinter = printer_json.printer_name; + data = { + listPrinter: listPrinter, + defaultPrinter: defaultPrinter, + pdf_url: pdf_url + } + } win.show(); let json_data = JSON.stringify(data); log.info("打印机列表数据【"+json_data+"】")