projects/mesxc-zhp #161

Closed
zhp wants to merge 119 commits from projects/mesxc-zhp into projects/mes-test
2 changed files with 5 additions and 4 deletions
Showing only changes of commit c736992a34 - Show all commits

View File

@ -15,15 +15,15 @@ VUE_APP_TITLE = MES系统
VUE_APP_BASE_API = '/prod-api'
# 积木报表指向地址
VUE_APP_JIMU_API = 'http://10.70.2.32:8080'
VUE_APP_JIMU_API = 'http://192.168.0.33:8889/'
# 根据服务器或域名修改
# PUBLIC_PATH = 'http://my-pi.com:8888/yudao-admin/'
PUBLIC_PATH = 'http://10.70.2.32/'
PUBLIC_PATH = 'http://192.168.0.33:8889/'
# PUBLIC_PATH = 'http://10.70.2.32/'
# 二级部署路径
VUE_APP_APP_NAME ='yudao-admin'
# VUE_APP_APP_NAME ='yudao-admin'
# 多租户的开关
VUE_APP_TENANT_ENABLE = true

View File

@ -360,6 +360,7 @@ export default {
ts: Date.now(), //
}
reqGet(data).then(res => {
console.log(1)
if (res.repCode === '0000') {
this.backImgBase = res.repData.originalImageBase64
this.blockBackImgBase = res.repData.jigsawImageBase64