diff --git a/src/api/model/wpm.js b/src/api/model/wpm.js index 56b4e1f6..8d62634e 100644 --- a/src/api/model/wpm.js +++ b/src/api/model/wpm.js @@ -548,9 +548,9 @@ export default { }, prints: { name: "打印", - req: async function (data) { + req: async function (ip, data) { // return await http.post("http://localhost:8080/prints/", data); - return await http.post("http://127.0.0.1:8080/prints/", data); + return await http.post(`http://${ip}:8080/prints/`, data); }, }, ana:{ diff --git a/src/layout/components/userbar.vue b/src/layout/components/userbar.vue index 38b62c7b..36040479 100644 --- a/src/layout/components/userbar.vue +++ b/src/layout/components/userbar.vue @@ -90,6 +90,11 @@ + + + + + @@ -138,6 +143,7 @@ export default { scanId:'', scanType:'', printer_name:'', + printer_ip:'', scanVisible:false, }; }, @@ -157,6 +163,7 @@ export default { this.userName = userInfo.username; this.userNameF = this.userName.substring(0, 1); this.printer_name = localStorage.getItem("printer_name") || ""; + this.printer_ip = localStorage.getItem("printer_ip") || "127.0.0.1"; }, methods: { openBook() { @@ -250,7 +257,10 @@ export default { this.setNameVisible=true; }, savePrinter(){ - this.$TOOL.setPrint(this.printer_name); + this.$TOOL.setPrint({ + "printer_name":this.printer_name, + "printer_ip":this.printer_ip + }); this.setNameVisible=false; }, //显示短消息 diff --git a/src/utils/tool.js b/src/utils/tool.js index ddedb5d2..35d080dc 100644 --- a/src/utils/tool.js +++ b/src/utils/tool.js @@ -140,7 +140,12 @@ tool.screen = function (element) { } } tool.setPrint = function (val) { - localStorage.setItem('printer_name', val) + if (val.printer_name) { + localStorage.setItem('printer_name', val.printer_name) + localStorage.setItem('printer_ip', val.printer_ip) + }else{ + localStorage.setItem('printer_name', val) + } } /* 复制对象 */ tool.objCopy = function (obj) {