@@ -20,10 +20,10 @@ VUE_APP_TITLE = MES系统 | |||||
# VUE_APP_BASE_API = 'http://192.168.1.8:48082' | # VUE_APP_BASE_API = 'http://192.168.1.8:48082' | ||||
# VUE_APP_BASE_API = 'http://192.168.4.159:48080' | # VUE_APP_BASE_API = 'http://192.168.4.159:48080' | ||||
# VUE_APP_BASE_API = 'http://192.168.1.104:48082' | # VUE_APP_BASE_API = 'http://192.168.1.104:48082' | ||||
# VUE_APP_BASE_API = 'http://192.168.0.33:48082' | |||||
VUE_APP_BASE_API = 'http://192.168.0.33:48082' | |||||
# VUE_APP_BASE_API = 'http://192.168.1.62:48082' | # VUE_APP_BASE_API = 'http://192.168.1.62:48082' | ||||
# VUE_APP_BASE_API = 'http://192.168.1.78:48082' | # VUE_APP_BASE_API = 'http://192.168.1.78:48082' | ||||
VUE_APP_BASE_API = 'http://192.168.1.47:48082' | |||||
# VUE_APP_BASE_API = 'http://192.168.1.47:48082' | |||||
# socket地址 | # socket地址 | ||||
VUE_APP_Socket_API = 'ws://192.168.0.30:8888' | VUE_APP_Socket_API = 'ws://192.168.0.30:8888' | ||||
VUE_APP_Socket_Dcs_API = 'ws://10.70.180.10:8081' | VUE_APP_Socket_Dcs_API = 'ws://10.70.180.10:8081' | ||||
@@ -233,10 +233,6 @@ export default { | |||||
// 增加 | // 增加 | ||||
emitButtonClick1() { | emitButtonClick1() { | ||||
let n = this.tableData1.length | let n = this.tableData1.length | ||||
if (n >=3) { | |||||
this.$modal.msgWarning('最多可添加3档计价') | |||||
return false | |||||
} | |||||
let obj = {} | let obj = {} | ||||
obj.startTime = n === 0 ? '' : this.tableData1[n-1].endTime | obj.startTime = n === 0 ? '' : this.tableData1[n-1].endTime | ||||
obj.endTime = '' | obj.endTime = '' | ||||
@@ -245,10 +241,6 @@ export default { | |||||
}, | }, | ||||
emitButtonClick2() { | emitButtonClick2() { | ||||
let n = this.tableData2.length | let n = this.tableData2.length | ||||
// if (n >=3) { | |||||
// this.$modal.msgWarning('最多可添加3档计价') | |||||
// return false | |||||
// } | |||||
let obj = {} | let obj = {} | ||||
obj.startUsed = n === 0 ? 0 : this.tableData2[n-1].endUsed | obj.startUsed = n === 0 ? 0 : this.tableData2[n-1].endUsed | ||||
obj.endUsed = 0 | obj.endUsed = 0 | ||||
@@ -283,7 +283,7 @@ export default { | |||||
{ | { | ||||
type: 'less', | type: 'less', | ||||
name: 'status', | name: 'status', | ||||
value: 3 | |||||
value: 2 | |||||
} | } | ||||
] | ] | ||||
} | } | ||||
@@ -293,7 +293,7 @@ export default { | |||||
{ | { | ||||
type: 'less', | type: 'less', | ||||
name: 'status', | name: 'status', | ||||
value: 3 | |||||
value: 2 | |||||
} | } | ||||
] | ] | ||||
} | } | ||||