Browse Source

修正bug

lipengtao 6 years ago
parent
commit
7ea0b09f86

+ 2 - 5
src/views/baseInfoManage/sensorsConfig/index.vue

@ -125,7 +125,7 @@ export default {
125 125
    var device = (rule, value, callback) => {
126 126
      const that = this
127 127
      setTimeout(function() {
128
        if (value === '' || that.ruleForm2.deviceId === '') {
128
        if (that.ruleForm2.device === '' || that.ruleForm2.deviceId === '') {
129 129
          callback(new Error('请选择采集盒编号'))
130 130
        } else {
131 131
          callback()
@ -392,10 +392,6 @@ export default {
392 392
      this.dialogTableVisible = true
393 393
    },
394 394
    querySearchAsync(queryString, cb) {
395
      if (queryString === '') {
396
        cb([])
397
        return
398
      }
399 395
      this.ruleForm2.deviceId = ''
400 396
      clearTimeout(this.timeout)
401 397
      this.timeout = setTimeout(() => {
@ -419,6 +415,7 @@ export default {
419 415
    },
420 416
    handleSelect(item) {
421 417
      this.ruleForm2.deviceId = item.id
418
      this.ruleForm2.device = item.value
422 419
    }
423 420
  }
424 421
}

+ 2 - 6
src/views/baseInfoManage/serversConfig/index.vue

@ -100,7 +100,7 @@ export default {
100 100
    var bridge = (rule, value, callback) => {
101 101
      const that = this
102 102
      setTimeout(function() {
103
        if (value === '' || that.ruleForm2.bridgeId === '') {
103
        if (that.ruleForm2.bridge === '' || that.ruleForm2.bridgeId === '') {
104 104
          callback(new Error('请选择所属桥梁'))
105 105
        } else {
106 106
          callback()
@ -112,7 +112,7 @@ export default {
112 112
        callback(new Error('请输入内部编号'))
113 113
      } else {
114 114
        if (!this.ruleForm2.bridgeId) {
115
          callback('请先选择服务器编号')
115
          callback('请先选择所属桥梁')
116 116
          return
117 117
        }
118 118
        if (this.edit) {
@ -337,10 +337,6 @@ export default {
337 337
      this.dialogTableVisible = true
338 338
    },
339 339
    querySearchAsync(queryString, cb) {
340
      if (queryString === '') {
341
        cb([])
342
        return
343
      }
344 340
      this.ruleForm2.bridgeId = ''
345 341
      clearTimeout(this.timeout)
346 342
      this.timeout = setTimeout(() => {

+ 2 - 2
src/views/peoplesManage/infoManage/editUser.vue

@ -277,7 +277,7 @@ export default {
277 277
  .el-col{
278 278
    margin-bottom: 15px
279 279
  }
280
  .el-form-item__label{
281
    padding: 0px
280
  .el-form--label-top .el-form-item__label {
281
    padding: 0
282 282
  }
283 283
</style>