Commit ed9c7e02 authored by xinzhedeai's avatar xinzhedeai

fix: 管子长度相关修改处理;api地址改为线上地址

parent ecd1a93d
...@@ -4,5 +4,8 @@ ENV = 'development' ...@@ -4,5 +4,8 @@ ENV = 'development'
VUE_APP_LOCAL_PORT = 8080 VUE_APP_LOCAL_PORT = 8080
# VUE_APP_BASE_API = 'http://192.168.2.11:8080'
# VUE_APP_LOCAL_API = 'http://192.168.2.37:9003'
VUE_APP_BASE_API = 'http://192.168.2.11:8080' VUE_APP_BASE_API = 'http://192.168.2.11:8080'
VUE_APP_LOCAL_API = 'http://192.168.2.37:9003' VUE_APP_LOCAL_API = 'http://111.4.65.148:9001'
\ No newline at end of file
...@@ -6,7 +6,7 @@ ENV = 'production' ...@@ -6,7 +6,7 @@ ENV = 'production'
# 山西柳林安泰洗煤边坡 ------------------------ # 山西柳林安泰洗煤边坡 ------------------------
VUE_APP_BASE_API = 'http://192.168.26.8:9045' VUE_APP_BASE_API = 'http://192.168.26.8:9045'
VUE_APP_LOCAL_API = 'http://192.168.26.8:9001' VUE_APP_LOCAL_API = 'http://111.4.65.148:9001'
# 冯克贞 ------------------------ # 冯克贞 ------------------------
#VUE_APP_BASE_API = 'http://192.168.27.147:9045' #VUE_APP_BASE_API = 'http://192.168.27.147:9045'
......
var ServiceURL = 'http://192.168.3.216:9002'; var ServiceURL = 'http://111.4.65.148:9002';
window.VUE_APP_API = {ServiceURL:ServiceURL} window.VUE_APP_API = {ServiceURL:ServiceURL}
...@@ -11,7 +11,7 @@ axios.defaults.withCredentials = true; ...@@ -11,7 +11,7 @@ axios.defaults.withCredentials = true;
var baseURL = process.env.NODE_ENV === 'development' ? process.env.VUE_APP_LOCAL_API + '/' : (process.env.VUE_APP_BASE_API || process.env.VUE_APP_LOCAL_API) + '/'; var baseURL = process.env.NODE_ENV === 'development' ? process.env.VUE_APP_LOCAL_API + '/' : (process.env.VUE_APP_BASE_API || process.env.VUE_APP_LOCAL_API) + '/';
// 创建axios实例 // 创建axios实例
const service = axios.create({ const service = axios.create({
baseURL: 'http://192.168.2.37:9003', baseURL: 'http://111.4.65.148:9001',
timeout: Config.timeout // 请求超时时间 timeout: Config.timeout // 请求超时时间
}) })
......
...@@ -345,9 +345,10 @@ export default { ...@@ -345,9 +345,10 @@ export default {
x: po.width * 0.234 + 100 * (equipIndex + 1), x: po.width * 0.234 + 100 * (equipIndex + 1),
y: canvasHeight - po.height + 133, y: canvasHeight - po.height + 133,
width: 7, // 可以设置不同的宽度 width: 7, // 可以设置不同的宽度
height: (equipment.jrxTrepanning / sbHeightModulus) * 1.3, height: (equipment.jrxTrepanning / sbHeightModulus),
image: "guanImage2", // 使用不同的图片 image: "guanImage", // 使用不同的图片
}); });
console.log('管子1111')
} else { } else {
this.canvasDataReal.guanConfigs.push({ this.canvasDataReal.guanConfigs.push({
x: po.width * 0.234 + 100 * (equipIndex + 1), x: po.width * 0.234 + 100 * (equipIndex + 1),
......
...@@ -13,7 +13,9 @@ function resolve(dir) { ...@@ -13,7 +13,9 @@ function resolve(dir) {
const name = defaultSettings.title; // 网址标题 const name = defaultSettings.title; // 网址标题
const port = 9527; // 端口配置 const port = 9527; // 端口配置
const VUE_APP_BASE_API = 'http://192.168.2.37:9003'; // const VUE_APP_BASE_API = 'http://192.168.2.37:9003';
const VUE_APP_BASE_API = 'http://111.4.65.148:9001';
// All configuration item explanations can be find in https://cli.vuejs.org/config/ // All configuration item explanations can be find in https://cli.vuejs.org/config/
module.exports = { module.exports = {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment