Merge remote-tracking branch 'origin/dev' into test
This commit is contained in:
commit
9a2d5f4602
@ -84,7 +84,6 @@ export default {
|
||||
signalLeftValue: [
|
||||
{label: '输入-故障表示位', value: 'i_f'},
|
||||
{label: '输入-绿灯表示位', value: 'i_g'},
|
||||
{label: '输入-红灯表示位', value: 'i_r'},
|
||||
{label: '输入-黄灯表示位', value: 'i_y'},
|
||||
{label: '输入-黄红灯表示位', value: 'i_yr'}
|
||||
],
|
||||
@ -260,7 +259,6 @@ export default {
|
||||
{ prop:'i_addr', label:'输入网关字地址:', type: 'number', min: 0, max: 20000, step: 1, precisionFlag: true, precision: 0},
|
||||
{ prop: 'i_f', label: '输入-故障表示位:', type: 'text', rightWidth: '100px', maxlength: 4},
|
||||
{ prop: 'i_g', label: '输入-绿灯表示位:', type: 'text', rightWidth: '100px', maxlength: 4},
|
||||
{ prop: 'i_r', label: '输入-红灯表示位:', type: 'text', rightWidth: '100px', maxlength: 4},
|
||||
{ prop: 'i_y', label: '输入-黄灯表示位:', type: 'text', rightWidth: '100px', maxlength: 4},
|
||||
{ prop: 'i_yr', label: '输入-黄红灯表示位:', type: 'text', rightWidth: '100px', maxlength: 4}
|
||||
]
|
||||
@ -275,9 +273,6 @@ export default {
|
||||
i_g: [
|
||||
{ validator: validateDevice, messageEmpty: '请填写输入-绿灯表示位', list: this.signalLeftValue, trigger: 'blur' }
|
||||
],
|
||||
i_r: [
|
||||
{ validator: validateDevice, messageEmpty: '请填写输入-红灯表示位', list: this.signalLeftValue, trigger: 'blur' }
|
||||
],
|
||||
i_y: [
|
||||
{ validator: validateDevice, messageEmpty: '请填写输入-黄灯表示位', list: this.signalLeftValue, trigger: 'blur' }
|
||||
],
|
||||
|
Loading…
Reference in New Issue
Block a user