Compare commits
No commits in common. "1def7b5d357a04cce23e02e7358f6ba445bd1343" and "26d3efd3462fa10b28d2d2ba13f456d21d985652" have entirely different histories.
1def7b5d35
...
26d3efd346
|
@ -16,6 +16,6 @@ VUE_APP_ALL_MENU = false
|
||||||
# 微前端地址
|
# 微前端地址
|
||||||
VUE_APP_REMOTES_URL="http://119.45.158.12/common/"
|
VUE_APP_REMOTES_URL="http://119.45.158.12/common/"
|
||||||
# 当前应用部署地址
|
# 当前应用部署地址
|
||||||
VUE_APP_EXPOSES_URL="http://172.16.0.77/trainingbase/"
|
VUE_APP_EXPOSES_URL=""
|
||||||
# nginx路径
|
# nginx路径
|
||||||
PUB_PATH:'/trainingbase/'
|
PUB_PATH:'/trainingbase/'
|
|
@ -16,6 +16,6 @@ VUE_APP_ALL_MENU = false
|
||||||
# 微前端地址
|
# 微前端地址
|
||||||
VUE_APP_REMOTES_URL="http://119.45.158.12/common/"
|
VUE_APP_REMOTES_URL="http://119.45.158.12/common/"
|
||||||
# 当前应用部署地址
|
# 当前应用部署地址
|
||||||
VUE_APP_EXPOSES_URL="http://192.168.1.66/dev/trainingbase/"
|
VUE_APP_EXPOSES_URL="http://192.168.1.66:8084/"
|
||||||
# nginx路径
|
# nginx路径
|
||||||
PUB_PATH:'/dev/trainingbase/'
|
PUB_PATH:'/dev/trainingbase/'
|
||||||
|
|
|
@ -22,7 +22,7 @@
|
||||||
"echarts-wordcloud": "^2.1.0",
|
"echarts-wordcloud": "^2.1.0",
|
||||||
"element-ui": "^2.15.13",
|
"element-ui": "^2.15.13",
|
||||||
"file-saver": "^2.0.5",
|
"file-saver": "^2.0.5",
|
||||||
"hbt-common": "^0.0.6",
|
"hbt-common": "0.0.6",
|
||||||
"jquery": "^3.6.4",
|
"jquery": "^3.6.4",
|
||||||
"layui-layer": "^1.0.9",
|
"layui-layer": "^1.0.9",
|
||||||
"mockjs": "^1.1.0",
|
"mockjs": "^1.1.0",
|
||||||
|
|
|
@ -152,8 +152,8 @@ export default class BaseComponent extends Vue {
|
||||||
const options = layer.data.map((item,index)=>{
|
const options = layer.data.map((item,index)=>{
|
||||||
const option = {} as any
|
const option = {} as any
|
||||||
if(item.hasPop && !item.model){
|
if(item.hasPop && !item.model){
|
||||||
const path = process.env.NODE_ENV === 'production'? process.env.VUE_APP_EXPOSES_URL : 'http://192.168.1.66/'
|
const path = process.env.NODE_ENV === 'production'? process.env.PUB_PATH : '/'
|
||||||
option.popupURL = path+"#/popup?"+new URLSearchParams(layer.popData)
|
option.popupURL = "http://192.168.1.66"+path+"#/popup?"+new URLSearchParams(layer.popData)
|
||||||
}
|
}
|
||||||
return Object.assign(option,{
|
return Object.assign(option,{
|
||||||
id:item.id,
|
id:item.id,
|
||||||
|
|
|
@ -7,7 +7,7 @@ const resolve = (dir)=>{
|
||||||
}
|
}
|
||||||
module.exports = defineConfig({
|
module.exports = defineConfig({
|
||||||
publicPath: process.env.NODE_ENV === 'production'
|
publicPath: process.env.NODE_ENV === 'production'
|
||||||
? process.env.VUE_APP_EXPOSES_URL
|
? process.env.PUB_PATH
|
||||||
: './',
|
: './',
|
||||||
productionSourceMap:process.env.NODE_ENV!=="production",
|
productionSourceMap:process.env.NODE_ENV!=="production",
|
||||||
transpileDependencies: true,
|
transpileDependencies: true,
|
||||||
|
|
Loading…
Reference in New Issue