Compare commits

..

1 Commits

Author SHA1 Message Date
e28cd67e20 Merge pull request 'projects/mes-test' (#133) from projects/mes-test into projects/mes
Reviewed-on: #133
2023-11-30 09:11:32 +08:00
4 changed files with 14 additions and 18 deletions

View File

@@ -15,14 +15,15 @@ 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://192.168.0.33:48082'
# 根据服务器或域名修改
PUBLIC_PATH = 'http://10.70.2.32'
# PUBLIC_PATH = 'http://my-pi.com:8888/yudao-admin/'
PUBLIC_PATH = 'http://192.168.0.33:8889/'
# 二级部署路径
# VUE_APP_APP_NAME ='yudao-admin'
VUE_APP_APP_NAME ='yudao-admin'
# 多租户的开关
VUE_APP_TENANT_ENABLE = true

View File

@@ -1,21 +1,16 @@
# 生产环境配置
ENV = 'production'
NODE_ENV = production
# 页面标题
VUE_APP_TITLE = MES系统
VUE_APP_TITLE = 产线监控系统
# 芋道管理系统/生产环境
VUE_APP_BASE_API = '/prod-api'
# 测试环境配置
ENV = 'staging'
# 积木报表指向地址
VUE_APP_JIMU_API = 'http://192.168.0.33:48082'
# 芋道管理系统/测试环境
VUE_APP_BASE_API = 'http://api-dashboard.yudao.iocoder.cn'
# 根据服务器或域名修改
PUBLIC_PATH = 'http://192.168.0.33:8889/'
# 二级部署路径
# VUE_APP_APP_NAME ='yudao-admin'
# 静态资源地址
PUBLIC_PATH = 'http://static.yudao.iocoder.cn/'
# 多租户的开关
VUE_APP_TENANT_ENABLE = true
@@ -25,3 +20,4 @@ VUE_APP_DOC_ENABLE = false
# 百度统计
VUE_APP_BAIDU_CODE = fadc1bd5db1a1d6f581df60a1807f8ab

View File

@@ -360,7 +360,6 @@ 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

View File

@@ -104,7 +104,7 @@ export const constantRoutes = [
// this generates a separate chunk (about.[hash].js) for this route
// which is lazy-loaded when the route is visited.
component: () => import(/* webpackChunkName: "about" */ '@/views/OperationalOverview/coldBoard.vue')
},
},
{
path: '/processingBoard',
name: 'processingBoard',