前端提交

This commit is contained in:
zhouzy062 2024-03-13 19:57:14 +08:00
parent e81a81c460
commit ea01e0cd8d
7 changed files with 20 additions and 20 deletions

View File

@ -6,7 +6,7 @@ var prodEnv = require('./prod.env')
// var testUrl = '14.29.196.32:8802' // var testUrl = '14.29.196.32:8802'
// var testUrl = '10.14.16.165:8802' // var testUrl = '10.14.16.165:8802'
// var testUrl = '112.29.103.165:21624' //线上 // var testUrl = '112.29.103.165:21624' //线上
var testUrl = '192.168.0.14:21624' //线上 var testUrl = '192.168.0.14:21626' //线上
// var testUrl = '192.168.0.166:8080' // var testUrl = '192.168.0.166:8080'
// var testUrl = '223.243.184.53:8480' // var testUrl = '223.243.184.53:8480'
// var testUrl = 'www.lingyangplat.com' // var testUrl = 'www.lingyangplat.com'

View File

@ -20,7 +20,7 @@ module.exports = {
cssSourceMap: true, cssSourceMap: true,
proxyTable: { proxyTable: {
'/screen': { '/screen': {
target: 'http://192.168.0.14:21624', target: 'http://112.29.103.165:21626',
changeOrigin: true, changeOrigin: true,
// secure: true, //如果是https接口需要配置这个参数 // secure: true, //如果是https接口需要配置这个参数
pathRewrite: { pathRewrite: {

View File

@ -74,19 +74,19 @@ export const constantRoutes = [
} }
] ]
}, },
{ // {
path: '/dashboard', // path: '/dashboard',
component: Layout, // component: Layout,
redirect: 'dashboard', // redirect: 'dashboard',
children: [ // children: [
{ // {
path: 'dashboard', // path: 'dashboard',
component: () => import('@/views/dashboard'), // component: () => import('@/views/dashboard'),
name: 'Dashboard', // name: 'Dashboard',
meta: { title: '数据大屏', icon: 'dashboard', breadcrumb: false} // meta: { title: '数据大屏', icon: 'dashboard', breadcrumb: false}
} // }
] // ]
}, // },
{ {
path: '/user', path: '/user',
component: Layout, component: Layout,

View File

@ -15,7 +15,7 @@
}, },
methods: { methods: {
openNewWindow() { openNewWindow() {
window.open('http://192.168.0.14:21624/index01.html?token='+localStorage.getItem('token'), '_blank'); window.open('http://112.29.103.165:21624/index01.html?token='+localStorage.getItem('token'), '_blank');
} }
} }
}; };

View File

@ -507,7 +507,7 @@ export default {
codeId: true, codeId: true,
isShowQrCode: -1, isShowQrCode: -1,
labelmaCode: '', labelmaCode: '',
qrUrl:'http://112.29.103.165:21624/qrCode/qrCodePage?qrCode=', qrUrl:'http://112.29.103.165:21626/qrCode/qrCodePage?qrCode=',
json_fields:{"二维码地址":'exportUrl',"标签编号":'labelCode',"设备编码":'maCode'}, json_fields:{"二维码地址":'exportUrl',"标签编号":'labelCode',"设备编码":'maCode'},
}; };
}, },

View File

@ -384,7 +384,7 @@ export default {
title: "", title: "",
uploadOpen: false, uploadOpen: false,
qrCode: '', qrCode: '',
qrUrl:'http://112.29.103.165:21624/qrCode/qrCodePage?qrCode=', qrUrl:'http://112.29.103.165:21626/qrCode/qrCodePage?qrCode=',
rowObj:{}, rowObj:{},
// //
open: false, open: false,

View File

@ -48,8 +48,8 @@ module.exports = {
//******** 注意事项 ********* */ //******** 注意事项 ********* */
//1.全局替换qrUrl二维码扫码提供的网址-发布服务器的地址; //1.全局替换qrUrl二维码扫码提供的网址-发布服务器的地址;
//qrUrl:'http://112.29.103.165:21624/qrCode/qrCodePage?qrCode=' //qrUrl:'http://112.29.103.165:21626/qrCode/qrCodePage?qrCode='
//2.打开view文件夹根目录dashboard.vue 更换大屏项目发布的跳转地址; //2.打开view文件夹根目录dashboard.vue 更换大屏项目发布的跳转地址打开大屏项目config/index.js更改请求地址大屏打包node<16.0.0;
//3.只有南网项目产线gl发布打包时候需要注意 //3.只有南网项目产线gl发布打包时候需要注意
// 将 assetsDir:'static' 改为 assetsDir:'gl/static',还有env.development中的VUE_APP_BASE_API改为'/gl/dev-api';登录跳转地址从/login换成/gl/; // 将 assetsDir:'static' 改为 assetsDir:'gl/static',还有env.development中的VUE_APP_BASE_API改为'/gl/dev-api';登录跳转地址从/login换成/gl/;
//******** 注意事项 ********* */ //******** 注意事项 ********* */