bonus
/
devicesmgt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
devicesmgt/sgzb-ui/src/utils/globalUrl.js

30 lines
1.0 KiB
JavaScript
Raw Normal View History

前端问题修改
2024-03-27 09:06:10 +08:00
优化
2024-04-25 17:48:06 +08:00
// const qrUrl = 'http://192.168.0.14:21624/qrCode/qrCodePage?qrCode='; //测试
Merge remote-tracking branch 'origin/dev-nw' into dev-nwcc # Conflicts: # sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/system/api/model/LoginUser.java # sgzb-auth/src/main/java/com/bonus/sgzb/auth/controller/TokenController.java # sgzb-auth/src/main/java/com/bonus/sgzb/auth/utils/RsaUtil.java # sgzb-common/sgzb-common-core/src/main/java/com/bonus/sgzb/common/core/constant/Constants.java # sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/BackReceiveController.java # sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/domain/ParamsDto.java # sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/InventoryAndWarehousingController.java # sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/MachIneDto.java # sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/InventoryAndWarehousingServiceImpl.java # sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackApplyMapper.xml # sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/config/RsaUtil.java # sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/controller/SysConfigController.java # sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/controller/SysProfileController.java # sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/controller/SysUserController.java # sgzb-ui/package.json # sgzb-ui/src/api/claimAndRefund/return.js # sgzb-ui/src/router/index.js # sgzb-ui/src/store/modules/user.js # sgzb-ui/src/utils/globalUrl.js # sgzb-ui/src/views/base/section/index.vue # sgzb-ui/src/views/claimAndRefund/return/returnInDetail.vue # sgzb-ui/src/views/claimAndreturn/picking/outbound/index.vue # sgzb-ui/src/views/index.vue # sgzb-ui/src/views/oldLogin.vue # sgzb-ui/src/views/resetPassword.vue # sgzb-ui/src/views/system/config/index.vue # sgzb-ui/src/views/system/user/index.vue # sgzb-ui/src/views/warehouseManage/machinery/coding/index.vue # sgzb-ui/src/views/warehouseManage/newPurchase/toolsAcceptance/component/queryTools.vue # sgzb-ui/vue.config.js
2024-07-15 10:21:48 +08:00
// const qrUrl = 'http://192.168.0.14:18866/qrCode/qrCodePage?qrCode='; // 重庆测试环境
领退料问题修改
2024-04-20 10:23:04 +08:00
// const qrUrl = 'http://112.29.103.165:21626/qrCode/qrCodePage?qrCode='; //重庆
前端上线代码优化
2024-04-08 09:01:54 +08:00
// const qrUrl = 'http://112.29.103.165:21624/qrCode/qrCodePage?qrCode='; //宁夏
前端代码修改，领料出库对接
2024-03-28 10:02:48 +08:00
// const qrUrl = 'https://z.csgmall.com.cn/gl/qrCode/qrCodePage?qrCode='; //南网
前端问题修改
2024-03-27 09:06:10 +08:00
动态配置大屏跳转地址
2024-06-19 10:02:46 +08:00
// const qrUrl = process.env.NODE_ENV === 'production' ? 'http://192.168.0.14:18866/qrCode/qrCodePage?qrCode=' : 'http://192.168.0.14:21624/qrCode/qrCodePage?qrCode='
let qrUrl = ''
const origin = window.location.origin
if (origin == 'http://112.29.103.165:21626') {
qrUrl = 'http://112.29.103.165:21626/qrCode/qrCodePage?qrCode='
} else {
qrUrl = 'http://192.168.0.14:18866/qrCode/qrCodePage?qrCode='
}
前端问题修改
2024-03-27 09:06:10 +08:00
解决冲突
2024-07-15 11:22:34 +08:00
// const qrUrl = process.env.NODE_ENV === 'production' ? 'https://z.csgmall.com.cn/sgzbgl/qrCode/qrCodePage?qrCode=' : 'http://192.168.0.14:18866/qrCode/qrCodePage?qrCode='
// export default {
// qrUrl,
// }
前端问题修改
2024-03-27 09:06:10 +08:00