diff --git a/src/assets/img/water_house_bg.jpg b/src/assets/img/water_house_bg.jpg new file mode 100644 index 0000000..430cdf4 Binary files /dev/null and b/src/assets/img/water_house_bg.jpg differ diff --git a/src/utils/devSever.ts b/src/utils/devSever.ts index 26da8af..8cd0b4f 100644 --- a/src/utils/devSever.ts +++ b/src/utils/devSever.ts @@ -9,7 +9,7 @@ */ // export const development={xhr:process.env.VUE_APP_BASE_API,ws:"ws://192.168.3.97:9018/",imgxhr:process.env.VUE_APP_BASE_API+"/image/"} -export const development={xhr:process.env.VUE_APP_BASE_API,ws:"ws://192.168.110.238:9018/",imgxhr:process.env.VUE_APP_BASE_API+"/image/"} +export const development={xhr:process.env.VUE_APP_BASE_API,ws:"ws://8.130.165.100:9018/",imgxhr:process.env.VUE_APP_BASE_API+"/image/"} export const production={xhr:process.env.VUE_APP_BASE_API,ws:"ws://8.130.165.100:9018/",imgxhr:process.env.VUE_APP_BASE_API+"/image/"} //拼接图片url路径 export function imgurlAddXhr(img){ diff --git a/src/views/Mechanics/child/son/index.vue b/src/views/Mechanics/child/son/index.vue index d9e1aae..bf7597e 100644 --- a/src/views/Mechanics/child/son/index.vue +++ b/src/views/Mechanics/child/son/index.vue @@ -127,7 +127,7 @@ let data={ stoptime:val.stoptime,//急停时长 data:'2020-05-06',//采购日期 src:imgurlAddXhr(val.data),//设备图片 - timeguagu:95,//时间稼动率 + timeguagu:Math.abs((val.ontime)/(val.ontime+val.offtime)*100).toFixed(1),//时间稼动率 MTBF:2724,//MTBF MTTR:169,//MTTR MTTF:2555,//MTTF