修正关于管理员内容的bug

src/views/baseInfoManage/boxesConfig/index.vue

@@ -196,12 +196,14 @@ export default {
        if (valid) {
          if (!this.edit) {
            addDevice(this.ruleForm2).then(response => {
              this.getList()
              setTimeout(function() {
                that.pop('已成功添加采集盒')
              }, 1000)
              this.resetForm('ruleForm2')
              this.dialogTableVisible = false
              if (response.success) {
                this.getList()
                setTimeout(function() {
                  that.pop('已成功添加采集盒')
                }, 1000)
                this.resetForm('ruleForm2')
                this.dialogTableVisible = false
              }
            }).catch(error => {
              console.log(error)
            })
@@ -244,29 +246,31 @@ export default {
      var that = this
      this.listLoading = true
      pageQueryDevice(this.listQuery).then(response => {
        const $data = response.data.data
        var hdata = { num: 1, data: $data }
        for (let i = 0; i < $data.length; i++) {
          hdata.num++
          const str = $data[i]
          queryBase.getServer(str.serverId, function(sc, value) {
            if (sc) {
              str.serverName = value.code
              hdata.num--
              if (hdata.num === 0) {
                that.list = hdata.data
        if (response.success) {
          const $data = response.data.data
          var hdata = { num: 1, data: $data }
          for (let i = 0; i < $data.length; i++) {
            hdata.num++
            const str = $data[i]
            queryBase.getServer(str.serverId, function(sc, value) {
              if (sc) {
                str.serverName = value.code
                hdata.num--
                if (hdata.num === 0) {
                  that.list = hdata.data
                }
              }
            }
          })
        }
        hdata.num--
        if (hdata.num === 0) {
          that.list = hdata.data
            })
          }
          hdata.num--
          if (hdata.num === 0) {
            that.list = hdata.data
          }
          that.total = response.data.total
          setTimeout(() => {
            that.listLoading = false
          }, 1.5 * 1000)
        }
        that.total = response.data.total
        setTimeout(() => {
          that.listLoading = false
        }, 1.5 * 1000)
      })
    },
    handleFilter() {
@@ -340,7 +344,7 @@ export default {
      this.ruleForm2.serverId = ''
      clearTimeout(this.timeout)
      this.timeout = setTimeout(() => {
        DeviceOfservice({ code: this.ruleForm2.server }).then(response => {
        DeviceOfservice({ code: this.ruleForm2.server, active: 1 }).then(response => {
          const $info = response.data
          if ($info.length) {
            const $data = $info.map(item => {

src/views/baseInfoManage/bridgesInfo/index.vue

@@ -313,12 +313,14 @@ export default {
        if (valid) {
          if (!this.edit) {
            addDevice(this.ruleForm2).then(response => {
              this.getList()
              setTimeout(function() {
                that.pop('已成功添加桥梁')
              }, 1000)
              this.resetForm('ruleForm2')
              this.dialogTableVisible = false
              if (response.success) {
                this.getList()
                setTimeout(function() {
                  that.pop('已成功添加桥梁')
                }, 1000)
                this.resetForm('ruleForm2')
                this.dialogTableVisible = false
              }
            }).catch(error => {
              console.log(error)
            })
@@ -368,11 +370,13 @@ export default {
    getList() {
      this.listLoading = true
      pageQueryDevice(this.listQuery).then(response => {
        this.list = response.data.data
        this.total = response.data.total
        setTimeout(() => {
          this.listLoading = false
        }, 1.5 * 1000)
        if (response.success) {
          this.list = response.data.data
          this.total = response.data.total
          setTimeout(() => {
            this.listLoading = false
          }, 1.5 * 1000)
        }
      })
    },
    handleFilter() {

src/views/baseInfoManage/sensorsConfig/index.vue

@@ -241,12 +241,14 @@ export default {
        if (valid) {
          if (!this.edit) {
            addDevice(this.ruleForm2).then(response => {
              this.getList()
              setTimeout(function() {
                that.pop('已成功添加传感器')
              }, 1000)
              this.resetForm('ruleForm2')
              this.dialogTableVisible = false
              if (response.success) {
                this.getList()
                setTimeout(function() {
                  that.pop('已成功添加传感器')
                }, 1000)
                this.resetForm('ruleForm2')
                this.dialogTableVisible = false
              }
            }).catch(error => {
              console.log(error)
            })
@@ -290,31 +292,33 @@ export default {
      var that = this
      this.listLoading = true
      pageQueryDevice(that.listQuery).then(response => {
        var $data = response.data.data
        var hdata = { num: 1, data: $data }
        for (let i = 0; i < $data.length; i++) {
          hdata.num++
          $data[i].cableType = that.cableMain[$data[i].cableType]
          $data[i].locType = that.addr[$data[i].locType]
          const str = $data[i]
          queryBase.getDevice(str.deviceId, function(sc, value) {
            if (sc) {
              str.deviceName = value.code
              hdata.num--
              if (hdata.num === 0) {
                that.listG = hdata.data
        if (response.success) {
          var $data = response.data.data
          var hdata = { num: 1, data: $data }
          for (let i = 0; i < $data.length; i++) {
            hdata.num++
            $data[i].cableType = that.cableMain[$data[i].cableType]
            $data[i].locType = that.addr[$data[i].locType]
            const str = $data[i]
            queryBase.getDevice(str.deviceId, function(sc, value) {
              if (sc) {
                str.deviceName = value.code
                hdata.num--
                if (hdata.num === 0) {
                  that.listG = hdata.data
                }
              }
            }
          })
        }
        hdata.num--
        if (hdata.num === 0) {
          that.listG = hdata.data
            })
          }
          hdata.num--
          if (hdata.num === 0) {
            that.listG = hdata.data
          }
          that.total = response.data.total
          setTimeout(() => {
            that.listLoading = false
          }, 1.5 * 1000)
        }
        that.total = response.data.total
        setTimeout(() => {
          that.listLoading = false
        }, 1.5 * 1000)
      })
    },
    handleFilter() {
@@ -385,7 +389,7 @@ export default {
      this.ruleForm2.deviceId = ''
      clearTimeout(this.timeout)
      this.timeout = setTimeout(() => {
        DeviceOfservice({ code: this.ruleForm2.device }).then(response => {
        DeviceOfservice({ code: this.ruleForm2.device, active: 1 }).then(response => {
          const $info = response.data
          if ($info.length) {
            const $data = $info.map(item => {

src/views/baseInfoManage/serversConfig/index.vue

@@ -196,12 +196,14 @@ export default {
        if (valid) {
          if (!this.edit) {
            addDevice(this.ruleForm2).then(response => {
              this.getList()
              setTimeout(function() {
                that.pop('已成功添加服务器')
              }, 1000)
              this.resetForm('ruleForm2')
              this.dialogTableVisible = false
              if (response.success) {
                this.getList()
                setTimeout(function() {
                  that.pop('已成功添加服务器')
                }, 1000)
                this.resetForm('ruleForm2')
                this.dialogTableVisible = false
              }
            }).catch(error => {
              console.log(error)
            })
@@ -244,29 +246,31 @@ export default {
      var that = this
      this.listLoading = true
      pageQueryDevice(this.listQuery).then(response => {
        const $data = response.data.data
        var hdata = { num: 1, data: $data }
        for (let i = 0; i < $data.length; i++) {
          hdata.num++
          const str = $data[i]
          queryBase.getBridge(str.bridgeId, function(sc, value) {
            if (sc) {
              str.bridgeName = value.shortName
              hdata.num--
              if (hdata.num === 0) {
                that.list = hdata.data
        if (response.success) {
          const $data = response.data.data
          var hdata = { num: 1, data: $data }
          for (let i = 0; i < $data.length; i++) {
            hdata.num++
            const str = $data[i]
            queryBase.getBridge(str.bridgeId, function(sc, value) {
              if (sc) {
                str.bridgeName = value.shortName
                hdata.num--
                if (hdata.num === 0) {
                  that.list = hdata.data
                }
              }
            }
          })
        }
        hdata.num--
        if (hdata.num === 0) {
          that.list = hdata.data
            })
          }
          hdata.num--
          if (hdata.num === 0) {
            that.list = hdata.data
          }
          that.total = response.data.total
          setTimeout(() => {
            that.listLoading = false
          }, 1.5 * 1000)
        }
        that.total = response.data.total
        setTimeout(() => {
          that.listLoading = false
        }, 1.5 * 1000)
      })
    },
    handleFilter() {
@@ -291,7 +295,7 @@ export default {
        deleteDevice({ id: row.id }).then(response => {
          if (response.success) {
            this.getList()
            this.pop('已成功删除该传感器')
            this.pop('已成功删除该服务器')
          }
        })
      }).catch(() => {

src/views/peoplesManage/infoManage/editUser.vue

@@ -189,12 +189,14 @@ export default {
        if (valid) {
          if (!this.edit) {
            addRegister(this.ruleForm2).then(response => {
              this.$emit('chilF')
              setTimeout(function() {
                that.pop('已成功添加')
              }, 1000)
              this.resetForm(this.ruleForm2)
              this.dialogTableVisible = false
              if (response.success) {
                this.$emit('chilF')
                setTimeout(function() {
                  that.pop('已成功添加')
                }, 1000)
                this.resetForm(this.ruleForm2)
                this.dialogTableVisible = false
              }
            }).catch(error => {
              console.log(error)
            })

src/views/peoplesManage/infoManage/editUserPermissions.vue

@@ -138,13 +138,15 @@ export default {
  methods: {
    getAllBridges() {
      DeviceOfservice({ key: this.state4, active: 1 }).then(response => {
        const $info = response.data
        if ($info.length) {
          this.bridgeListsChecked.push($info[0].id)
          const $data = $info.map(item => {
            return { 'value': item.shortName, 'id': item.id }
             return { 'value': item.shortName, 'id': item.id })
          this.bridgeLists = $data
        if (response.success) {
          const $info = response.data
          if ($info.length) {
            this.bridgeListsChecked.push($info[0].id)
            const $data = $info.map(item => {
              return { 'value': item.shortName, 'id': item.id    return { 'value': item.shortName, 'id': item.id }
            })
            this.bridgeLists = $data
          }
        }
      })
    },

src/views/peoplesManage/infoManage/index.vue

@@ -117,33 +117,35 @@ export default {
    getList() {
      this.listLoading = true
      pageQueryUser(this.listQuery).then(response => {
        if (response.data === null) {
          this.list = []
          this.total = 0
        if (response.success) {
          if (response.data === null) {
            this.list = []
            this.total = 0
            setTimeout(() => {
              this.listLoading = false
            }, 1.5 * 1000)
            return
          }
          const $data = response.data.data
          for (let i = 0; i < $data.length; i++) {
            $data[i].bridgeName = ''
            queryResponsibleBridge({ uid: $data[i].id, active: 1 }).then(response => {
              if (response.success) {
                const arr = []
                const $info = response.data
                for (let j = 0; j < $info.length; j++) {
                  arr.push($info[j].shortName)
                }
                $data[i].bridgeName = arr.join(',')
              }
            })
          }
          this.list = $data
          this.total = response.data.total
          setTimeout(() => {
            this.listLoading = false
          }, 1.5 * 1000)
          return
        }
        const $data = response.data.data
        for (let i = 0; i < $data.length; i++) {
          $data[i].bridgeName = ''
          queryResponsibleBridge({ uid: $data[i].id, active: 1 }).then(response => {
            if (response.success) {
              const arr = []
              const $info = response.data
              for (let j = 0; j < $info.length; j++) {
                arr.push($info[j].shortName)
              }
              $data[i].bridgeName = arr.join(',')
            }
             })
        }
        this.list = $data
        this.total = response.data.total
        setTimeout(() => {
          this.listLoading = false
        }, 1.5 * 1000)
      })
    },
    handleFilter() {