diff --git a/acs/nladmin-ui/src/views/acs/device/driver/standard_storage.vue b/acs/nladmin-ui/src/views/acs/device/driver/standard_storage.vue index 6f89389..d9deeb0 100644 --- a/acs/nladmin-ui/src/views/acs/device/driver/standard_storage.vue +++ b/acs/nladmin-ui/src/views/acs/device/driver/standard_storage.vue @@ -10,36 +10,36 @@ - + - + - + - + - + - + @@ -86,34 +86,34 @@ export default { } }, data() { - const checkMaxY = (rule, value, callback) => { - if (value < this.form.minY) { - callback(new Error('最大列应大于最小列!')) - } else { - callback() - } - } - const checkMinY = (rule, value, callback) => { - if (value > this.form.maxY) { - callback(new Error('最小列应小于最大列!')) - } else { - callback() - } - } - const checkMaxZ = (rule, value, callback) => { - if (value < this.form.minZ) { - callback(new Error('最大层应大于最小层!')) - } else { - callback() - } - } - const checkMinZ = (rule, value, callback) => { - if (value > this.form.maxZ) { - callback(new Error('最小层应小于最大层!')) - } else { - callback() - } - } + // const checkMaxY = (rule, value, callback) => { + // if (value < this.form.minY) { + // callback(new Error('最大列应大于最小列!')) + // } else { + // callback() + // } + // } + // const checkMinY = (rule, value, callback) => { + // if (value > this.form.maxY) { + // callback(new Error('最小列应小于最大列!')) + // } else { + // callback() + // } + // } + // const checkMaxZ = (rule, value, callback) => { + // if (value < this.form.minZ) { + // callback(new Error('最大层应大于最小层!')) + // } else { + // callback() + // } + // } + // const checkMinZ = (rule, value, callback) => { + // if (value > this.form.maxZ) { + // callback(new Error('最小层应小于最大层!')) + // } else { + // callback() + // } + // } return { device_code: '', device_id: '', @@ -128,36 +128,36 @@ export default { data1: [], data2: [], form: { - x: 0, - tunnel: 0, - maxY: 0, - maxZ: 0, - minY: 0, - minZ: 0 + x: 1, + tunnel: 1, + maxY: 9, + maxZ: 1, + minY: 1, + minZ: 1 }, rules: { - x: [ - { required: true, message: '排不能为空', trigger: 'blur' } - ], - tunnel: [ - { required: true, type: 'number', min: 0, message: '请输入大于0的数字', trigger: 'blur' } - ], - maxY: [ - { required: true, type: 'number', min: 0, message: '请输入大于0的数字', trigger: 'blur' }, - { validator: checkMaxY, trigger: 'blur' } - ], - maxZ: [ - { required: true, type: 'number', min: 0, message: '请输入大于0的数字', trigger: 'blur' }, - { validator: checkMaxZ, trigger: 'blur' } - ], - minY: [ - { required: true, type: 'number', min: 0, message: '请输入大于0的数字', trigger: 'blur' }, - { validator: checkMinY, trigger: 'blur' } - ], - minZ: [ - { required: true, type: 'number', min: 0, message: '请输入大于0的数字', trigger: 'blur' }, - { validator: checkMinZ, trigger: 'blur' } - ] + // x: [ + // { required: true, message: '排不能为空', trigger: 'blur' } + // ], + // tunnel: [ + // { required: true, type: 'number', min: 0, message: '请输入大于0的数字', trigger: 'blur' } + // ], + // maxY: [ + // { required: true, type: 'number', min: 0, message: '请输入大于0的数字', trigger: 'blur' }, + // { validator: checkMaxY, trigger: 'blur' } + // ], + // maxZ: [ + // { required: true, type: 'number', min: 0, message: '请输入大于0的数字', trigger: 'blur' }, + // { validator: checkMaxZ, trigger: 'blur' } + // ], + // minY: [ + // { required: true, type: 'number', min: 0, message: '请输入大于0的数字', trigger: 'blur' }, + // { validator: checkMinY, trigger: 'blur' } + // ], + // minZ: [ + // { required: true, type: 'number', min: 0, message: '请输入大于0的数字', trigger: 'blur' }, + // { validator: checkMinZ, trigger: 'blur' } + // ] } } }, @@ -168,19 +168,19 @@ export default { this.device_code = this.$props.parentForm.device_code queryDriverConfig(this.device_id, this.$props.parentForm.driver_code).then(data => { // 给表单赋值,并且属性不能为空 - if (data.form) { - const arr = Object.keys(data.form) - // 不为空 - if (arr.length > 0) { - data.form.x = parseInt(data.form.x) - data.form.tunnel = parseInt(data.form.tunnel) - data.form.minY = parseInt(data.form.minY) - data.form.maxY = parseInt(data.form.maxY) - data.form.minZ = parseInt(data.form.minZ) - data.form.maxZ = parseInt(data.form.maxZ) - this.form = data.form - } - } + // if (data.form) { + // const arr = Object.keys(data.form) + // // 不为空 + // if (arr.length > 0) { + // // data.form.x = parseInt(data.form.x) + // // data.form.tunnel = parseInt(data.form.tunnel) + // // data.form.minY = parseInt(data.form.minY) + // // data.form.maxY = parseInt(data.form.maxY) + // // data.form.minZ = parseInt(data.form.minZ) + // // data.form.maxZ = parseInt(data.form.maxZ) + // this.form = data.form + // } + // } // 给表单赋值,并且属性不能为空 if (data.parentForm) {