用户管理页面及管理员页面

src/api/bridge.js

@@ -80,3 +80,12 @@ export function uploadBridgeImg() {
  })
}
export function dictory(params) {
  return request({
    url: '/ajax/dict/items',
    method: 'get',
    params: {
      dict: 'XZQH'
    }
  })
}

src/views/baseInfoManage/boxesConfig/index.vue

@@ -213,7 +213,7 @@ export default {
            addDevice(this.ruleForm2).then(response => {
              this.getList()
              setTimeout(function() {
                that.pop('已成功添加传感器')
                that.pop('已成功添加采集盒')
              }, 1000)
              this.resetForm(this.ruleForm2)
              this.dialogTableVisible = false
@@ -226,7 +226,7 @@ export default {
            updateDevice(par).then(response => {
              if (response.success) {
                setTimeout(function() {
                  that.pop('已成功更新传感器')
                  that.pop('已成功更新采集盒')
                }, 1000)
                this.resetForm('ruleForm2')
                this.getList()
@@ -295,7 +295,7 @@ export default {
        deleteDevice({ id: row.id }).then(response => {
          if (response.success) {
            this.getList()
            this.pop('已成功删除该传感器')
            this.pop('已成功删除该采集盒')
            /*  this.$message({
              type: 'success',
              message: '已成功删除该采集盒!'

src/views/baseInfoManage/bridgesInfo/index.vue

@@ -23,7 +23,7 @@
      </el-table-column>
      <el-table-column min-width="150px" align="center" label="桥梁位置">
        <template slot-scope="scope">
          <span>{{scope.row.location}}</span>
          <span>{{citys[scope.row.addrCode]}}</span>
        </template>
      </el-table-column>
      <el-table-column min-width="150px" align="center" label="维护机构">
@@ -147,7 +147,7 @@
</template>
<script>
import { addDevice, updateDevice, deleteDevice, pageQueryDevice, DeviceOfservice, checkDeviceCode, checkBridgeShortName, checkBridgeName } from '@/api/bridge'
import { addDevice, updateDevice, deleteDevice, pageQueryDevice, checkDeviceCode, checkBridgeShortName, checkBridgeName, dictory } from '@/api/bridge'
import waves from '@/directive/waves'
import city from '../../city/linkage'
export default {
@@ -226,6 +226,8 @@ export default {
      }
    }
    return {
      provinceCityCounties: [],
      citys: [],
      edit: '',
      imageUrl: '',
      ruleForm2: {
@@ -292,7 +294,17 @@ export default {
    }
  },
  created() {
    this.getList()
    dictory().then(response => {
      if (response.success) {
        this.provinceCityCounties = response.data.sort((obj1, obj2) => {
          return obj1.code - obj2.code
        })
        response.data.map(item => {
          this.citys[item.code] = item.fullCaption
        })
        this.getList()
      }
    })
  },
  components: {
    city
@@ -433,32 +445,6 @@ export default {
      this.dialogTableVisible = true
      this.imageUrl = '/data/bridge' + row.img
    },
    querySearchAsync(queryString, cb) {
      if (queryString === '') {
        cb([])
        return
      }
      this.ruleForm2.deviceId = ''
      clearTimeout(this.timeout)
      this.timeout = setTimeout(() => {
        DeviceOfservice({ code: this.ruleForm2.device }).then(response => {
          const $info = response.data
          if ($info.length) {
            const $data = $info.map(item => {
              return { 'value': item.code, 'id': item.id }
            })
            cb($data)
            if ($info.length === 1 && this.ruleForm2.bridge === $info[0].code) {
              this.ruleForm2.deviceId = $info[0].id
            } else {
              this.ruleForm2.deviceId = ''
            }
          } else {
            cb([])
          }
        })
      }, 3000 * Math.random())
    },
    handleSelect(item) {
      this.ruleForm2.deviceId = item.id
    },

src/views/baseInfoManage/serversConfig/index.vue

@@ -213,7 +213,7 @@ export default {
            addDevice(this.ruleForm2).then(response => {
              this.getList()
              setTimeout(function() {
                that.pop('已成功添加传感器')
                that.pop('已成功添加服务器')
              }, 1000)
              this.resetForm(this.ruleForm2)
              this.dialogTableVisible = false
@@ -226,7 +226,7 @@ export default {
            updateDevice(par).then(response => {
              if (response.success) {
                setTimeout(function() {
                  that.pop('已成功更新传感器')
                  that.pop('已成功更新服务器')
                }, 1000)
                this.resetForm('ruleForm2')
                this.getList()
@@ -361,7 +361,6 @@ export default {
    },
    handleSelect(item) {
      this.ruleForm2.bridgeId = item.id
      console.log(item.id)
    }
  }
}

src/views/city/linkage.vue

@@ -35,7 +35,6 @@
    </el-select>
  </div>
</template>
<script>
import axios from 'axios'
export default {
@@ -86,7 +85,9 @@ export default {
      var that = this
      axios.get('/ajax/dict/items?dict=XZQH').then(function(response) {
        if (response.status === 200) {
          var data = response.data.data
          var data = response.data.data.sort((obj1, obj2) => {
            return obj1.code - obj2.code
          })
          that.province = []
          that.city = []
          that.block = []

src/views/peoplesManage/infoManage/editUser.vue

@@ -95,6 +95,8 @@ export default {
      } else {
        if (!regTel.test(value)) {
          callback(new Error('手机号码格式不正确'))
        } else {
          callback()
        }
      }
    }
@@ -105,6 +107,8 @@ export default {
      } else {
        if (!regTel.test(value)) {
          callback(new Error('邮箱格式不正确'))
        } else {
          callback()
        }
      }
    }

src/views/peoplesManage/infoManage/editUserPermissions.vue

@@ -181,6 +181,10 @@ export default {
      this.tableData3.map(item => {
        this.arr.push(item.address)
      })
      if (!this.arr.length) {
        this.$message.error('请至少选择一个桥梁')
        return
      }
      updatePermission({ id: this.id, bridges: this.arr }).then(response => {
        if (response.success) {
          this.tableData3 = []

src/views/peoplesManage/infoManage/index.vue

@@ -10,7 +10,6 @@
      <el-button class="filter-item" style="margin-left: 10px;" @click="handleFilter" type="primary" icon="el-icon-search">查找</el-button>
      <el-button class="filter-item" style="margin-left: 10px;" @click="handleCreate" type="primary" icon="el-icon-edit">添加用户</el-button>
    </div>
    <el-table :key='tableKey' :data="list" v-loading="listLoading" border fit highlight-current-row
      style="width: 100%;min-height:550px;">
      <el-table-column width="110px" align="center" label="账号">
@@ -64,7 +63,6 @@
      </el-table-column>
    </el-table>
    <editUser :dialog="dialogTableVisible" @chilF='chilF' :id='edit'></editUser>
    <editSystemMessage></editSystemMessage>
    <editUserPermissions :dialog='dialogPerssion' @chilF='chilF' :id='edit'></editUserPermissions>
    <div class="pagination-container" style="text-align:center;">
      <el-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="listQuery.page" :page-size="listQuery.limit" layout="prev, pager, next, jumper" :total="total">
@@ -77,7 +75,6 @@
import { deleteUser, queryResponsibleBridge, pageQueryUser } from '@/api/userManagemen'
import waves from '@/directive/waves'
import editUser from './editUser'
import editSystemMessage from './editSystemMessage'
import editUserPermissions from './editUserPermissions'
export default {
@@ -98,7 +95,6 @@ export default {
        account: '',
        name: '',
        comp: '',
        active: 0,
        pageSize: 10,
        pageNo: 1
      }
@@ -114,7 +110,6 @@ export default {
  },
  components: {
    editUser,
    editSystemMessage,
    editUserPermissions
  },
  methods: {
@@ -203,4 +198,4 @@ export default {
  .editTe{
    margin: 10px 0 0 22px
  }
</style>
</style>