'1'

Merge branch 'projects/mesxc-test' of git.picaiba.com:mt-fe-group/yudao-dev into projects/mesxc-test
2023-12-14 16:07:21 +08:00 · 2023-12-13 09:49:02 +08:00 · 2023-12-13 09:48:44 +08:00 · 2023-12-07 10:06:18 +08:00 · 2023-12-07 10:06:14 +08:00
3 changed files with 4 additions and 4 deletions
--- a/.env.dev
+++ b/.env.dev
@ -13,8 +13,8 @@ VUE_APP_TITLE = MES系统

 # 芋道管理系统/开发环境
 # VUE_APP_BASE_API = 'http://100.64.0.26:48082'
-VUE_APP_BASE_API = 'http://192.168.0.33:48082'
-# VUE_APP_BASE_API = 'http://192.168.1.78:48082'
+VUE_APP_BASE_API = 'http://10.70.2.2:8080'
+# VUE_APP_BASE_API = 'http://192.168.4.173:48080'
 # VUE_APP_BASE_API = 'http://192.168.2.173:48080'
 # VUE_APP_BASE_API = 'http://192.168.1.49:48082'
 # VUE_APP_BASE_API = 'http://192.168.1.8:48082'
--- a/.env.prod
+++ b/.env.prod
@ -15,7 +15,7 @@ VUE_APP_TITLE = MES系统
 VUE_APP_BASE_API = '/prod-api'

 # 积木报表指向地址
-VUE_APP_JIMU_API = 'http://10.70.2.2:8080'
+VUE_APP_JIMU_API = 'http://10.70.2.22:8080'


 # 根据服务器或域名修改
--- a/src/views/base/custom/index.vue
+++ b/src/views/base/custom/index.vue
@ -268,7 +268,7 @@ export default {
          // })
        // } else {
          $('.hiprintEpContainer').empty()
-          console.log(this.modelData);
+          console.log(this.modelData || {});
          hiprint.PrintElementTypeManager.build('.hiprintEpContainer', provider.value)
          $('.hiprint-printTemplate').empty()
          // const templates = this.$ls.get('KEY_TEMPLATES', {})
Author	SHA1	Message	Date
gtz	8d5623bb24	'1'	2023-12-14 16:07:21 +08:00
gtz	68898ea67f	'1'	2023-12-13 09:49:02 +08:00
gtz	1299d72404	Merge branch 'projects/mesxc-test' of git.picaiba.com:mt-fe-group/yudao-dev into projects/mesxc-test	2023-12-13 09:48:44 +08:00
gtz	54953f7bc6	Merge branch 'projects/mesxc-test' of git.picaiba.com:mt-fe-group/yudao-dev into projects/mesxc-test	2023-12-07 10:06:18 +08:00
gtz	f99e979d14	'1'	2023-12-07 10:06:14 +08:00