~mayuhao/HazardInvestigationSystem.git

			@@ -200,7 +200,7 @@
			<span>{{ scope.row.roles \| parseRoles }}</span>
			</template>
			</el-table-column>
			<el-table-column label="人员MAC地址" prop="deviceNo" align="center" width="100px">
			<!-- <el-table-column label="人员MAC地址" prop="deviceNo" align="center" width="100px">
			<template slot-scope="scope">
			<span>{{ scope.row.deviceNo}}</span>
			</template>
			@@ -226,7 +226,7 @@
			<span>{{ scope.row.endtime}}</span>
			</template>

			</el-table-column>
			</el-table-column> -->
			<el-table-column label="是否单位负责人" prop="iscompany" align="center" width="100px">
			<template slot-scope="scope">
			<div v-for="item in isList">
			@@ -348,11 +348,11 @@
			<el-row>
			<el-col :span="12">
			<el-form-item label="单位:" prop="company">
			<el-select v-model.trim="dataForm.company" auto-complete="on" style="width:100%;">
			<el-select v-model.trim="dataForm.company" value-key="item" auto-complete="on" style="width:100%;" @change="companyChange">
			<el-option
			v-for="item in companyList"
			:key="item.id"
			:value="item.company"
			:value="item"
			:label="item.company"
			>
			</el-option>
			@@ -360,7 +360,7 @@
			</el-form-item>
			</el-col>
			<el-col :span="12">
			<el-form-item label="部门:" prop="department">
			<el-form-item label="部门:" prop="department" v-if="isMain">
			<el-select v-model.trim="dataForm.department" auto-complete="on" style="width:100%;">
			<el-option
			v-for="item in departmentList"
			@@ -654,6 +654,7 @@
			tableKey: 0,
			userData: null,
			listLoading: true,
			isMain:false,
			iscompanyList:[{id:1,name:'否'},{id:0,name:'是'}],
			queryForm: {
			realname:'',
			@@ -761,6 +762,15 @@
			this.order = param.order;
			this.getUserList()
			},
			companyChange(val){
			this.dataForm.company = val.company
			if (val.ismain === 1) {
			this.isMain = true;
			}else{
			this.isMain = false;
			this.dataForm.department = ''
			}
			},
			getUserList() {
			const _this = this
			const params = {}
			@@ -786,8 +796,14 @@
			_this.pageTotal = computePageCount(result.totalCount, result.pageSize)
			_this.currentPage = result.pageIndex
			_this.userData = result.result
			} else {
			parseError({ error: res.data.message, vm: _this })
			}else if(res.code === '100'){
			this.$store.dispatch('LogOut').then(() => {
			location.reload()// In order to re-instantiate the vue-router object to avoid bugs
			parseError({ error: res.message, vm: _this })
			})
			}
			else {
			parseError({ error: res.message, vm: _this })
			}
			_this.listLoading = false
			}).catch(error => {
			@@ -820,7 +836,7 @@
			})
			_this.getUserList()
			} else {
			parseError({ error: res.data.message, vm: _this })
			parseError({ error: res.message, vm: _this })
			}
			}).catch(error => {
			parseError({ error: error, vm: _this })
			@@ -856,7 +872,7 @@
			})
			_this.getUserList()
			} else {
			parseError({ error: res.data.message, vm: _this })
			parseError({ error: res.message, vm: _this })
			}
			}).catch(error => {
			parseError({ error: error, vm: _this })
			@@ -944,7 +960,7 @@
			})
			_this.getUserList()
			} else {
			parseError({ error: res.data.message, vm: _this })
			parseError({ error: res.message, vm: _this })
			}
			}).catch(error => {
			parseError({ error: error, vm: _this })
			@@ -1002,7 +1018,7 @@
			})
			_this.getUserList()
			} else {
			parseError({ error: res.data.message, vm: _this })
			parseError({ error: res.message, vm: _this })
			}
			})
			}
			@@ -1014,6 +1030,8 @@
			this.dataForm.password = null
			this.dialogStatus = 'update'
			this.dialogFormVisible = true
			let ismain = this.companyList.find(item=>item.company === row.company).ismain
			this.isMain = ismain === 1;
			this.$nextTick(() => {
			this.$refs['dataForm'].clearValidate()
			})
			@@ -1160,7 +1178,7 @@
			})
			_this.getUserList()
			} else {
			parseError({ error: res.data.message, vm: _this })
			parseError({ error: res.message, vm: _this })
			}
			})
			.catch((error) => {
			@@ -1331,7 +1349,6 @@
			const _this = this;
			bindCard(_this.cardDataForm).then(response => {
			const res = response.data
			debugger
			if (res.code === '200'){
			_this.$message({
			message: '绑定成功',