更新
This commit is contained in:
USER-20220102CG\noblelift
@@ -10,36 +10,36 @@
|
|||||||
<el-row>
|
<el-row>
|
||||||
<el-col :span="12">
|
<el-col :span="12">
|
||||||
<el-form-item label="排：" label-width="150px" prop="x">
|
<el-form-item label="排：" label-width="150px" prop="x">
|
||||||
<el-input v-model.number="form.x" />
|
<el-input v-model.number="form.x" value="1" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="12">
|
<el-col :span="12">
|
||||||
<el-form-item label="巷道：" label-width="150px" prop="tunnel">
|
<el-form-item label="巷道：" label-width="150px" prop="tunnel">
|
||||||
<el-input v-model.number="form.tunnel" />
|
<el-input v-model.number="form.tunnel" value="1" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
</el-row>
|
</el-row>
|
||||||
<el-row>
|
<el-row>
|
||||||
<el-col :span="12">
|
<el-col :span="12">
|
||||||
<el-form-item label="最大列：" label-width="150px" prop="maxY">
|
<el-form-item label="最大列：" label-width="150px" prop="maxY">
|
||||||
<el-input v-model.number="form.maxY" />
|
<el-input v-model.number="form.maxY" value="9" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="12">
|
<el-col :span="12">
|
||||||
<el-form-item label="最小列：" label-width="150px" prop="minY">
|
<el-form-item label="最小列：" label-width="150px" prop="minY">
|
||||||
<el-input v-model.number="form.minY" />
|
<el-input v-model.number="form.minY" value="1" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
</el-row>
|
</el-row>
|
||||||
<el-row>
|
<el-row>
|
||||||
<el-col :span="12">
|
<el-col :span="12">
|
||||||
<el-form-item label="最大层：" label-width="150px" prop="maxZ">
|
<el-form-item label="最大层：" label-width="150px" prop="maxZ">
|
||||||
<el-input v-model.number="form.maxZ" />
|
<el-input v-model.number="form.maxZ" value="1" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="12">
|
<el-col :span="12">
|
||||||
<el-form-item label="最小层：" label-width="150px" prop="minZ">
|
<el-form-item label="最小层：" label-width="150px" prop="minZ">
|
||||||
<el-input v-model.number="form.minZ" />
|
<el-input v-model.number="form.minZ" value="1" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
</el-row>
|
</el-row>
|
||||||
@@ -86,34 +86,34 @@ export default {
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
data() {
|
data() {
|
||||||
const checkMaxY = (rule, value, callback) => {
|
// const checkMaxY = (rule, value, callback) => {
|
||||||
if (value < this.form.minY) {
|
// if (value < this.form.minY) {
|
||||||
callback(new Error('最大列应大于最小列！'))
|
// callback(new Error('最大列应大于最小列！'))
|
||||||
} else {
|
// } else {
|
||||||
callback()
|
// callback()
|
||||||
}
|
// }
|
||||||
}
|
// }
|
||||||
const checkMinY = (rule, value, callback) => {
|
// const checkMinY = (rule, value, callback) => {
|
||||||
if (value > this.form.maxY) {
|
// if (value > this.form.maxY) {
|
||||||
callback(new Error('最小列应小于最大列！'))
|
// callback(new Error('最小列应小于最大列！'))
|
||||||
} else {
|
// } else {
|
||||||
callback()
|
// callback()
|
||||||
}
|
// }
|
||||||
}
|
// }
|
||||||
const checkMaxZ = (rule, value, callback) => {
|
// const checkMaxZ = (rule, value, callback) => {
|
||||||
if (value < this.form.minZ) {
|
// if (value < this.form.minZ) {
|
||||||
callback(new Error('最大层应大于最小层！'))
|
// callback(new Error('最大层应大于最小层！'))
|
||||||
} else {
|
// } else {
|
||||||
callback()
|
// callback()
|
||||||
}
|
// }
|
||||||
}
|
// }
|
||||||
const checkMinZ = (rule, value, callback) => {
|
// const checkMinZ = (rule, value, callback) => {
|
||||||
if (value > this.form.maxZ) {
|
// if (value > this.form.maxZ) {
|
||||||
callback(new Error('最小层应小于最大层！'))
|
// callback(new Error('最小层应小于最大层！'))
|
||||||
} else {
|
// } else {
|
||||||
callback()
|
// callback()
|
||||||
}
|
// }
|
||||||
}
|
// }
|
||||||
return {
|
return {
|
||||||
device_code: '',
|
device_code: '',
|
||||||
device_id: '',
|
device_id: '',
|
||||||
@@ -128,36 +128,36 @@ export default {
|
|||||||
data1: [],
|
data1: [],
|
||||||
data2: [],
|
data2: [],
|
||||||
form: {
|
form: {
|
||||||
x: 0,
|
x: 1,
|
||||||
tunnel: 0,
|
tunnel: 1,
|
||||||
maxY: 0,
|
maxY: 9,
|
||||||
maxZ: 0,
|
maxZ: 1,
|
||||||
minY: 0,
|
minY: 1,
|
||||||
minZ: 0
|
minZ: 1
|
||||||
},
|
},
|
||||||
rules: {
|
rules: {
|
||||||
x: [
|
// x: [
|
||||||
{ required: true, message: '排不能为空', trigger: 'blur' }
|
// { required: true, message: '排不能为空', trigger: 'blur' }
|
||||||
],
|
// ],
|
||||||
tunnel: [
|
// tunnel: [
|
||||||
{ required: true, type: 'number', min: 0, message: '请输入大于0的数字', trigger: 'blur' }
|
// { required: true, type: 'number', min: 0, message: '请输入大于0的数字', trigger: 'blur' }
|
||||||
],
|
// ],
|
||||||
maxY: [
|
// maxY: [
|
||||||
{ required: true, type: 'number', min: 0, message: '请输入大于0的数字', trigger: 'blur' },
|
// { required: true, type: 'number', min: 0, message: '请输入大于0的数字', trigger: 'blur' },
|
||||||
{ validator: checkMaxY, trigger: 'blur' }
|
// { validator: checkMaxY, trigger: 'blur' }
|
||||||
],
|
// ],
|
||||||
maxZ: [
|
// maxZ: [
|
||||||
{ required: true, type: 'number', min: 0, message: '请输入大于0的数字', trigger: 'blur' },
|
// { required: true, type: 'number', min: 0, message: '请输入大于0的数字', trigger: 'blur' },
|
||||||
{ validator: checkMaxZ, trigger: 'blur' }
|
// { validator: checkMaxZ, trigger: 'blur' }
|
||||||
],
|
// ],
|
||||||
minY: [
|
// minY: [
|
||||||
{ required: true, type: 'number', min: 0, message: '请输入大于0的数字', trigger: 'blur' },
|
// { required: true, type: 'number', min: 0, message: '请输入大于0的数字', trigger: 'blur' },
|
||||||
{ validator: checkMinY, trigger: 'blur' }
|
// { validator: checkMinY, trigger: 'blur' }
|
||||||
],
|
// ],
|
||||||
minZ: [
|
// minZ: [
|
||||||
{ required: true, type: 'number', min: 0, message: '请输入大于0的数字', trigger: 'blur' },
|
// { required: true, type: 'number', min: 0, message: '请输入大于0的数字', trigger: 'blur' },
|
||||||
{ validator: checkMinZ, trigger: 'blur' }
|
// { validator: checkMinZ, trigger: 'blur' }
|
||||||
]
|
// ]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@@ -168,19 +168,19 @@ export default {
|
|||||||
this.device_code = this.$props.parentForm.device_code
|
this.device_code = this.$props.parentForm.device_code
|
||||||
queryDriverConfig(this.device_id, this.$props.parentForm.driver_code).then(data => {
|
queryDriverConfig(this.device_id, this.$props.parentForm.driver_code).then(data => {
|
||||||
// 给表单赋值，并且属性不能为空
|
// 给表单赋值，并且属性不能为空
|
||||||
if (data.form) {
|
// if (data.form) {
|
||||||
const arr = Object.keys(data.form)
|
// const arr = Object.keys(data.form)
|
||||||
// 不为空
|
// // 不为空
|
||||||
if (arr.length > 0) {
|
// if (arr.length > 0) {
|
||||||
data.form.x = parseInt(data.form.x)
|
// // data.form.x = parseInt(data.form.x)
|
||||||
data.form.tunnel = parseInt(data.form.tunnel)
|
// // data.form.tunnel = parseInt(data.form.tunnel)
|
||||||
data.form.minY = parseInt(data.form.minY)
|
// // data.form.minY = parseInt(data.form.minY)
|
||||||
data.form.maxY = parseInt(data.form.maxY)
|
// // data.form.maxY = parseInt(data.form.maxY)
|
||||||
data.form.minZ = parseInt(data.form.minZ)
|
// // data.form.minZ = parseInt(data.form.minZ)
|
||||||
data.form.maxZ = parseInt(data.form.maxZ)
|
// // data.form.maxZ = parseInt(data.form.maxZ)
|
||||||
this.form = data.form
|
// this.form = data.form
|
||||||
}
|
// }
|
||||||
}
|
// }
|
||||||
|
|
||||||
// 给表单赋值，并且属性不能为空
|
// 给表单赋值，并且属性不能为空
|
||||||
if (data.parentForm) {
|
if (data.parentForm) {
|
||||||
|
|||||||
Reference in New Issue
Block a user