前端提交
This commit is contained in:
		
							parent
							
								
									e81a81c460
								
							
						
					
					
						commit
						ea01e0cd8d
					
				| 
						 | 
				
			
			@ -6,7 +6,7 @@ var prodEnv = require('./prod.env')
 | 
			
		|||
// var testUrl = '14.29.196.32:8802'
 | 
			
		||||
// var testUrl = '10.14.16.165:8802'
 | 
			
		||||
// 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 = '223.243.184.53:8480'
 | 
			
		||||
// var testUrl = 'www.lingyangplat.com'
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -20,7 +20,7 @@ module.exports = {
 | 
			
		|||
    cssSourceMap: true,
 | 
			
		||||
    proxyTable: {
 | 
			
		||||
        '/screen': {
 | 
			
		||||
          target: 'http://192.168.0.14:21624',
 | 
			
		||||
          target: 'http://112.29.103.165:21626',
 | 
			
		||||
          changeOrigin: true,
 | 
			
		||||
          // secure: true, //如果是https接口,需要配置这个参数
 | 
			
		||||
          pathRewrite: {
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -74,19 +74,19 @@ export const constantRoutes = [
 | 
			
		|||
      }
 | 
			
		||||
    ]
 | 
			
		||||
  },
 | 
			
		||||
  {
 | 
			
		||||
    path: '/dashboard',
 | 
			
		||||
    component: Layout,
 | 
			
		||||
    redirect: 'dashboard',
 | 
			
		||||
    children: [
 | 
			
		||||
      {
 | 
			
		||||
        path: 'dashboard',
 | 
			
		||||
        component: () => import('@/views/dashboard'),
 | 
			
		||||
        name: 'Dashboard',
 | 
			
		||||
        meta: { title: '数据大屏', icon: 'dashboard', breadcrumb: false}
 | 
			
		||||
      }
 | 
			
		||||
    ]
 | 
			
		||||
  },
 | 
			
		||||
  // {
 | 
			
		||||
  //   path: '/dashboard',
 | 
			
		||||
  //   component: Layout,
 | 
			
		||||
  //   redirect: 'dashboard',
 | 
			
		||||
  //   children: [
 | 
			
		||||
  //     {
 | 
			
		||||
  //       path: 'dashboard',
 | 
			
		||||
  //       component: () => import('@/views/dashboard'),
 | 
			
		||||
  //       name: 'Dashboard',
 | 
			
		||||
  //       meta: { title: '数据大屏', icon: 'dashboard', breadcrumb: false}
 | 
			
		||||
  //     }
 | 
			
		||||
  //   ]
 | 
			
		||||
  // },
 | 
			
		||||
  {
 | 
			
		||||
    path: '/user',
 | 
			
		||||
    component: Layout,
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -15,7 +15,7 @@
 | 
			
		|||
    },
 | 
			
		||||
    methods: {
 | 
			
		||||
        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');
 | 
			
		||||
        }
 | 
			
		||||
    }
 | 
			
		||||
  };  
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -507,7 +507,7 @@ export default {
 | 
			
		|||
      codeId: true,
 | 
			
		||||
      isShowQrCode: -1,
 | 
			
		||||
      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'},
 | 
			
		||||
    };
 | 
			
		||||
  },
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -384,7 +384,7 @@ export default {
 | 
			
		|||
      title: "",
 | 
			
		||||
      uploadOpen: false,
 | 
			
		||||
      qrCode: '',
 | 
			
		||||
      qrUrl:'http://112.29.103.165:21624/qrCode/qrCodePage?qrCode=',
 | 
			
		||||
      qrUrl:'http://112.29.103.165:21626/qrCode/qrCodePage?qrCode=',
 | 
			
		||||
      rowObj:{},
 | 
			
		||||
      // 是否显示弹出层
 | 
			
		||||
      open: false,
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -48,8 +48,8 @@ module.exports = {
 | 
			
		|||
 | 
			
		||||
        //******** 注意事项  ********* */
 | 
			
		||||
        //1.全局替换qrUrl二维码扫码提供的网址-发布服务器的地址;
 | 
			
		||||
        //qrUrl:'http://112.29.103.165:21624/qrCode/qrCodePage?qrCode='
 | 
			
		||||
        //2.打开view文件夹根目录dashboard.vue 更换大屏项目发布的跳转地址;
 | 
			
		||||
        //qrUrl:'http://112.29.103.165:21626/qrCode/qrCodePage?qrCode='
 | 
			
		||||
        //2.打开view文件夹根目录dashboard.vue 更换大屏项目发布的跳转地址,打开大屏项目config/index.js更改请求地址,大屏打包node<16.0.0;
 | 
			
		||||
        //3.只有南网项目产线gl发布打包时候需要注意:
 | 
			
		||||
        //  将 assetsDir:'static' 改为 assetsDir:'gl/static',还有env.development中的VUE_APP_BASE_API改为'/gl/dev-api';登录跳转地址从/login换成/gl/;
 | 
			
		||||
        //******** 注意事项  ********* */
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue