From f2d21625f21f87cc3ae1e6d4c893890ba0e6b596 Mon Sep 17 00:00:00 2001 From: zelian_wu Date: Wed, 19 Jun 2024 13:59:56 +0800 Subject: [PATCH] 1 --- src/element-ui/index.js | 1 - src/views/modules/label/printer.vue | 8 ++++---- src/views/modules/part/picture/picture.vue | 1 + static/config/index-prod.js | 4 +++- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/element-ui/index.js b/src/element-ui/index.js index 038b60f..3366b05 100644 --- a/src/element-ui/index.js +++ b/src/element-ui/index.js @@ -4,7 +4,6 @@ import Element from 'element-ui'; import locale from 'element-ui/lib/locale' import en from 'element-ui/lib/locale/lang/en' - Vue.use(Element, {size: 'medium', zIndex: 3000,locale: en}); import { Loading, diff --git a/src/views/modules/label/printer.vue b/src/views/modules/label/printer.vue index c4a3cd6..c932730 100644 --- a/src/views/modules/label/printer.vue +++ b/src/views/modules/label/printer.vue @@ -554,11 +554,11 @@ export default { } } this.printCurrentPart = JSON.parse(JSON.stringify(this.currentPart)) - this.printCurrentPart.serialNumber= ''; - this.printCurrentPart.manufacturerNo= ''; - this.printCurrentPart.moldCode= ''; - this.printCurrentPart.manufacturerTime= dayjs().format('YYYY-MM-DD HH:mm:ss'); this.$set(this.printCurrentPart,'cartonCount',1) + this.$set(this.printCurrentPart,'manufacturerNo','') + this.$set(this.printCurrentPart,'moldCode','') + this.$set(this.printCurrentPart,'serialNumber',undefined) + this.$set(this.printCurrentPart,'manufacturerTime',dayjs().format('YYYY-MM-DD HH:mm:ss')) if (this.currentPart.serialNumberRequired === 'Y'){ this.printCurrentPart.qtyPerRoll = 1; this.printCurrentPart.rollsPerCarton = 1; diff --git a/src/views/modules/part/picture/picture.vue b/src/views/modules/part/picture/picture.vue index 12fd3c3..0c93cb9 100644 --- a/src/views/modules/part/picture/picture.vue +++ b/src/views/modules/part/picture/picture.vue @@ -62,6 +62,7 @@ export default { partNo: this.part.partNo, createBy: this.$store.state.user.name, } + this.baseUrl = process.env.NODE_ENV !== 'production' && process.env.OPEN_PROXY ? '/proxyApi' : window.SITE_CONFIG['baseUrl'] this.saveVisible = true; }, savePicture(){ diff --git a/static/config/index-prod.js b/static/config/index-prod.js index 2b4b99d..b252a70 100644 --- a/static/config/index-prod.js +++ b/static/config/index-prod.js @@ -6,7 +6,9 @@ // api接口请求地址 // window.SITE_CONFIG['baseUrl'] = 'http://172.26.68.17:9008';// 客户 - window.SITE_CONFIG['baseUrl'] = 'http://192.168.1.83:8086';// 83 + // window.SITE_CONFIG['baseUrl'] = 'http://192.168.254.12:9008/';// 客户 + window.SITE_CONFIG['baseUrl'] = 'http://qrcode.checkpt.com:9008/';// 客户 + // window.SITE_CONFIG['baseUrl'] = 'http://192.168.1.83:8086';// 83 // cdn地址 = 域名 + 版本号 window.SITE_CONFIG['domain'] = './'; // 域名