From c181527b88758cec56479f2076f06c8df9dd45c6 Mon Sep 17 00:00:00 2001
From: lyfO_o <764716047@qq.com>
Date: 星期一, 30 五月 2022 15:11:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master
---
src/assets/icon_kongjian_s.png | 0
src/assets/icon_mangban_s.png | 0
src/views/doublePreventAction/riskLevelManage/riskSourceManage/index.vue | 13 +
src/views/systemManage/userManage/index.vue | 21 +++
src/assets/icon_gaochu_s.png | 0
src/views/login/index.vue | 4
src/assets/icon_donghuo_s.png | 0
src/assets/icon_wajue_s.png | 0
src/assets/icon_diaozhuang_s.png | 0
src/views/contractor/unitManage/index.vue | 97 +++++++++------
src/views/contractor/blackList/index.vue | 6
src/views/doublePreventAction/hiddenDanger/hiddenDangerReform/report/components/reportDialog.vue | 80 +++++++------
src/assets/icon_yongdian_s.png | 0
src/views/doublePreventAction/riskLevelManage/safetyRiskSpace/index.vue | 1
src/assets/sidebar_icon4.png | 0
src/views/doublePreventAction/riskLevelManage/analyseUnit/index.vue | 2
src/api/riskSource.js | 2
src/components/Tab/Marker.vue | 131 ++++++++++++---------
18 files changed, 212 insertions(+), 145 deletions(-)
diff --git a/src/api/riskSource.js b/src/api/riskSource.js
index 5f80b41..6421c15 100644
--- a/src/api/riskSource.js
+++ b/src/api/riskSource.js
@@ -39,7 +39,7 @@
headers: {
'Authorization': getToken()
},
- url: process.env.BASE_API + '/riskAnaUnit/del',
+ url: process.env.BASE_API + '/riskSource/del/one',
method: 'post',
data:data
})
diff --git a/src/assets/icon_diaozhuang_s.png b/src/assets/icon_diaozhuang_s.png
new file mode 100644
index 0000000..dc038a6
--- /dev/null
+++ b/src/assets/icon_diaozhuang_s.png
Binary files differ
diff --git a/src/assets/icon_donghuo_s.png b/src/assets/icon_donghuo_s.png
new file mode 100644
index 0000000..12458de
--- /dev/null
+++ b/src/assets/icon_donghuo_s.png
Binary files differ
diff --git a/src/assets/icon_gaochu_s.png b/src/assets/icon_gaochu_s.png
new file mode 100644
index 0000000..be29fc9
--- /dev/null
+++ b/src/assets/icon_gaochu_s.png
Binary files differ
diff --git a/src/assets/icon_kongjian_s.png b/src/assets/icon_kongjian_s.png
new file mode 100644
index 0000000..fa77914
--- /dev/null
+++ b/src/assets/icon_kongjian_s.png
Binary files differ
diff --git a/src/assets/icon_mangban_s.png b/src/assets/icon_mangban_s.png
new file mode 100644
index 0000000..8f490ba
--- /dev/null
+++ b/src/assets/icon_mangban_s.png
Binary files differ
diff --git a/src/assets/icon_wajue_s.png b/src/assets/icon_wajue_s.png
new file mode 100644
index 0000000..683a3af
--- /dev/null
+++ b/src/assets/icon_wajue_s.png
Binary files differ
diff --git a/src/assets/icon_yongdian_s.png b/src/assets/icon_yongdian_s.png
new file mode 100644
index 0000000..35d7ffd
--- /dev/null
+++ b/src/assets/icon_yongdian_s.png
Binary files differ
diff --git a/src/assets/sidebar_icon4.png b/src/assets/sidebar_icon4.png
new file mode 100644
index 0000000..a7ce460
--- /dev/null
+++ b/src/assets/sidebar_icon4.png
Binary files differ
diff --git a/src/components/Tab/Marker.vue b/src/components/Tab/Marker.vue
index 71b0322..3910ad5 100644
--- a/src/components/Tab/Marker.vue
+++ b/src/components/Tab/Marker.vue
@@ -9,66 +9,73 @@
<!-- />-->
</div>
<div class="model-panel-list">
- <el-row :gutter="10">
- <el-col :span="6">
- <el-button
- icon="el-icon-plus"
- size="small"
- type="primary"
- @click="showCreateHandle"
- >
- 创建
- </el-button>
+<!-- <el-row :gutter="10">-->
+<!-- <el-col :span="6">-->
+<!-- <el-button-->
+<!-- icon="el-icon-plus"-->
+<!-- size="small"-->
+<!-- type="primary"-->
+<!-- @click="showCreateHandle"-->
+<!-- >-->
+<!-- 创建-->
+<!-- </el-button>-->
+<!-- </el-col>-->
+<!-- <el-col :span="6">-->
+<!-- <el-button-->
+<!-- icon="el-icon-delete"-->
+<!-- size="small"-->
+<!-- type="danger"-->
+<!-- @click="clearHandle"-->
+<!-- >-->
+<!-- 清空-->
+<!-- </el-button>-->
+<!-- </el-col>-->
+<!-- <el-col :span="6">-->
+<!-- <el-button-->
+<!-- icon="el-icon-view"-->
+<!-- size="small"-->
+<!-- :type="showPlot ? 'success' : 'info'"-->
+<!-- @click="toggleVisible"-->
+<!-- >-->
+<!-- {{ showPlot ? '隐藏' : '显示' }}-->
+<!-- </el-button>-->
+<!-- </el-col>-->
+<!-- </el-row>-->
+<!-- <el-row :gutter="10" v-for="marker in markers" :key="marker.attr.id">-->
+ <el-row :gutter="10" v-for="item in labels" :key="item.id">
+ <el-col :span="18">
+ <img :src="item.url" style="width:30px;height:30px;" />
</el-col>
<el-col :span="6">
- <el-button
- icon="el-icon-delete"
- size="small"
- type="danger"
- @click="clearHandle"
- >
- 清空
- </el-button>
+ {{ item.name || ' ' }}
</el-col>
- <el-col :span="6">
- <el-button
- icon="el-icon-view"
- size="small"
- :type="showPlot ? 'success' : 'info'"
- @click="toggleVisible"
- >
- {{ showPlot ? '隐藏' : '显示' }}
- </el-button>
- </el-col>
- </el-row>
- <el-row :gutter="10" v-for="marker in markers" :key="marker.attr.id">
- <el-col :span="2">
- <img :src="marker.style.image" style="width:22px;height:22px;" />
- </el-col>
- <el-col :span="12">
- {{ marker.attr.name || ' ' }}
- </el-col>
- <el-col :span="10" style="textAlign:right">
- <el-button
- icon="el-icon-s-promotion"
- size="mini"
- circle
- @click="() => focusHandle(marker.attr.id)"
- />
- <el-button
- icon="el-icon-edit"
- size="mini"
- circle
- @click="() => editHandle(marker)"
- />
- <el-button
- icon="el-icon-delete"
- type="danger"
- size="mini"
- circle
- @click="() => removeHandle(marker.attr.id)"
- />
- </el-col>
+<!-- <el-col :span="20">-->
+<!-- <img :src="marker.style.image" style="width:22px;height:22px;" />-->
+<!-- </el-col>-->
+<!-- <el-col :span="4">-->
+<!-- {{ marker.attr.name || ' ' }}-->
+<!-- </el-col>-->
+<!-- <el-col :span="10" style="textAlign:right">-->
+<!-- <el-button-->
+<!-- icon="el-icon-s-promotion"-->
+<!-- size="mini"-->
+<!-- circle-->
+<!-- @click="() => focusHandle(marker.attr.id)"-->
+<!-- />-->
+<!-- <el-button-->
+<!-- icon="el-icon-edit"-->
+<!-- size="mini"-->
+<!-- circle-->
+<!-- @click="() => editHandle(marker)"-->
+<!-- />-->
+<!-- <el-button-->
+<!-- icon="el-icon-delete"-->
+<!-- type="danger"-->
+<!-- size="mini"-->
+<!-- circle-->
+<!-- @click="() => removeHandle(marker.attr.id)"-->
+<!-- />-->
+<!-- </el-col>-->
</el-row>
</div>
<el-dialog
@@ -108,6 +115,16 @@
components: {},
data() {
return {
+ labels:[
+ {id:1,url:'../../../src/assets/icon_donghuo_s.png',name:'动火作业'},
+ {id:2,url:'../../../src/assets/icon_diaozhuang_s.png',name:'吊装作业'},
+ {id:3,url:'../../../src/assets/icon_gaochu_s.png',name:'高处作业'},
+ {id:4,url:'../../../src/assets/icon_kongjian_s.png',name:'受限空间'},
+ {id:5,url:'../../../src/assets/icon_mangban_s.png',name:'盲板抽堵'},
+ {id:6,url:'../../../src/assets/icon_yongdian_s.png',name:'临时用电'},
+ {id:7,url:'../../../src/assets/icon_wajue_s.png',name:'动土作业'},
+ {id:8,url:'../../../src/assets/sidebar_icon4.png',name:'断路作业'},
+ ],
images: [
{ url: '../../../public/images/icon/1.png', type: '消防预警' },
{ url: '../../../public/images/icon/2.png', type: '风险预警' },
diff --git a/src/views/contractor/blackList/index.vue b/src/views/contractor/blackList/index.vue
index ceec0ad..9d5860b 100644
--- a/src/views/contractor/blackList/index.vue
+++ b/src/views/contractor/blackList/index.vue
@@ -22,9 +22,9 @@
<el-table-column type="index" label="序号" align="center" width="60"/>
<el-table-column label="单位名称" prop="company" align="center">
</el-table-column>
- <el-table-column label="创建人" prop="code" align="center">
+ <el-table-column label="创建人" prop="createdby" align="center">
</el-table-column>
- <el-table-column label="创建时间" prop="contactname" align="center">
+ <el-table-column label="创建时间" prop="createdat" align="center">
</el-table-column>
<el-table-column label="操作" align="center" width="280" class-name="small-padding fixed-width">
<template slot-scope="scope">
@@ -54,7 +54,7 @@
</el-form-item>
</el-form>
<div align="right">
- <el-button @click="unitFormVisible = false">取消</el-button>
+ <el-button @click="blackFormVisible = false">取消</el-button>
<el-button type="primary" @click="submitUnit()">确认</el-button>
</div>
</el-dialog>
diff --git a/src/views/contractor/unitManage/index.vue b/src/views/contractor/unitManage/index.vue
index 1aafcc0..3f1390e 100644
--- a/src/views/contractor/unitManage/index.vue
+++ b/src/views/contractor/unitManage/index.vue
@@ -77,11 +77,11 @@
<br>
</div>
<el-dialog :title="title" :visible.sync="unitFormVisible" :modal-append-to-body="false" :close-on-click-modal="false" width="40%">
- <el-form ref="dataForm" :rules="unitFormRules" :model="unitForm" label-position="right" label-width="100px" style="margin-left:50px;width:500px;">
- <el-form-item label="单位名称">
+ <el-form ref="unitForm" :rules="unitFormRules" :model="unitForm" label-position="right" label-width="100px" style="margin-left:50px;width:500px;">
+ <el-form-item label="单位名称" prop="company">
<el-input v-model="unitForm.company"></el-input>
</el-form-item>
- <el-form-item label="单位代码">
+ <el-form-item label="单位代码" prop="code">
<el-input v-model="unitForm.code"></el-input>
</el-form-item>
<el-form-item label="是否为主体单位:" prop="ismain">
@@ -95,10 +95,10 @@
</el-option>
</el-select>
</el-form-item>
- <el-form-item label="联系人">
+ <el-form-item label="联系人" prop="contactname">
<el-input v-model="unitForm.contactname"></el-input>
</el-form-item>
- <el-form-item label="联系电话">
+ <el-form-item label="联系电话" prop="contactphone">
<el-input v-model="unitForm.contactphone"></el-input>
</el-form-item>
<el-form-item label="省">
@@ -210,7 +210,6 @@
company:'',
code:'',
unitFormVisible:false,
- unitFormRules:{},
unitForm:{
id:'',
company:'',
@@ -223,6 +222,13 @@
town:'',
committee:'',
isbanned:'',
+ },
+ unitFormRules:{
+ company: [{ required: true, message: '单位名称不能为空', trigger: 'change' }],
+ code: [{ required: true, message: '单位代码不能为空', trigger: 'change' }],
+ ismain: [{ required: true, message: '是否为主体单位不能为空', trigger: 'blur' }],
+ contactname: [{ required: true, message: '联系人不能为空', trigger: 'change' }],
+ contactphone: [{ required: true, message: '联系电话不能为空', trigger: 'blur' }],
},
provinceList:[],
cityList:[],
@@ -261,6 +267,9 @@
},
showUnitForm(value,type){
this.unitFormVisible = true
+ this.$nextTick(() =>{
+ this.$refs["unitForm"].clearValidate()
+ })
if(type === '新增'){
this.title = '新增'
this.unitForm = {
@@ -282,43 +291,53 @@
}
},
submitUnit(){
- if(this.title === '新增'){
- addUnit(this.unitForm).then((res)=>{
- if(res.data.code === '200'){
- this.unitFormVisible = false
- this.getUnitData()
- this.$notify({
- type:'success',
- duration:2000,
- message:'新增成功',
- title:'成功'
+ this.$refs["unitForm"].validate(valid =>{
+ if(valid){
+ if(this.title === '新增'){
+ addUnit(this.unitForm).then((res)=>{
+ if(res.data.code === '200'){
+ this.unitFormVisible = false
+ this.getUnitData()
+ this.$notify({
+ type:'success',
+ duration:2000,
+ message:'新增成功',
+ title:'成功'
+ })
+ }else{
+ this.$message({
+ type:'warning',
+ message:res.data.message
+ })
+ }
})
}else{
- this.$message({
- type:'warning',
- message:res.data.message
+ updateUnit(this.unitForm).then((res)=>{
+ if(res.data.code === '200'){
+ this.unitFormVisible = false
+ this.getUnitData()
+ this.$notify({
+ type:'success',
+ duration:2000,
+ title:'成功',
+ message:'编辑成功'
+ })
+ }else{
+ this.$message({
+ type:'warning',
+ message:res.data.message
+ })
+ }
})
}
- })
- }else{
- updateUnit(this.unitForm).then((res)=>{
- if(res.data.code === '200'){
- this.unitFormVisible = false
- this.getUnitData()
- this.$notify({
- type:'success',
- duration:2000,
- title:'成功',
- message:'编辑成功'
- })
- }else{
- this.$message({
- type:'warning',
- message:res.data.message
- })
- }
- })
- }
+ }else{
+ this.$message({
+ type:'warning',
+ message:'请完善基本信息'
+ })
+ }
+ })
+
},
deleteById(val){
this.$confirm('删除此条信息，是否继续','提示',{
diff --git a/src/views/doublePreventAction/hiddenDanger/hiddenDangerReform/report/components/reportDialog.vue b/src/views/doublePreventAction/hiddenDanger/hiddenDangerReform/report/components/reportDialog.vue
index 60efbd7..649f583 100644
--- a/src/views/doublePreventAction/hiddenDanger/hiddenDangerReform/report/components/reportDialog.vue
+++ b/src/views/doublePreventAction/hiddenDanger/hiddenDangerReform/report/components/reportDialog.vue
@@ -1,11 +1,7 @@
<template>
- <el-dialog title="新增" :visible.sync="dialogFormVisible"
- :modal-append-to-body="false" :close-on-click-modal="false" width="800px">
- <el-form ref="dataForm" :rules="dataFormRules" :model="dataForm" label-position="right" label-width="140px"
- style="" element-loading-text="保存中...">
-
-
- <el-form-item label="隐患级别：">
+ <el-dialog title="新增" :visible.sync="dialogFormVisible" :close-on-click-modal="false" width="800px">
+ <el-form ref="dataForm" :rules="dataFormRules" :model="dataForm" label-position="right" label-width="140px" style="" element-loading-text="保存中...">
+ <el-form-item label="隐患级别：" prop="level">
<el-select v-model="dataForm.level" placeholder="请选择" :disabled="isView">
<el-option
v-for="item in levels"
@@ -16,7 +12,7 @@
</el-select>
</el-form-item>
- <el-form-item label="选择整改人：">
+ <el-form-item label="选择整改人：" prop="rectifier">
<el-input v-model="dataForm.rectifier" readonly style="width: 205px" placeholder="请选择" >
</el-input>
@@ -25,7 +21,7 @@
</el-button>
</el-form-item>
- <el-form-item label="整改措施：" >
+ <el-form-item label="整改措施：" prop="rectifymeasure">
<el-input
style="width: 400px"
type="textarea"
@@ -35,7 +31,7 @@
v-model="dataForm.rectifymeasure">
</el-input>
</el-form-item>
- <el-form-item label="整改期限 ：" >
+ <el-form-item label="整改期限：" prop="rectifydeadline">
<el-date-picker
v-model="dataForm.rectifydeadline"
type="datetime"
@@ -45,7 +41,7 @@
placeholder="选择日期时间">
</el-date-picker>
</el-form-item>
- <el-form-item label="上报说明：" >
+ <el-form-item label="上报说明：" prop="note">
<el-input
style="width: 400px"
type="textarea"
@@ -128,8 +124,14 @@
note: '',
level:''
},
+ dataFormRules:{
+ level: [{ required: true, message: '隐患级别不能为空', trigger: 'change' }],
+ rectifier: [{ required: true, message: '整改人不能为空', trigger: 'change' }],
+ rectifymeasure: [{ required: true, message: '整改措施不能为空', trigger: 'blur' }],
+ rectifydeadline: [{ required: true, message: '整改期限不能为空', trigger: 'change' }],
+ note: [{ required: true, message: '上报说明不能为空', trigger: 'blur' }],
+ },
dialogFormVisible: false,
- dataFormRules: {},
isView:false,
}
},
@@ -153,20 +155,20 @@
this.resetDataForm()
},
trigger2Submit(){
- this.submiting = true
- let formData = new FormData()
- formData.append('rectifier', this.dataForm.rectifier)
- formData.append("rectifierid",this.dataForm.rectifierid)
- formData.append("level",this.dataForm.level)
- formData.append("rectifymeasure",this.dataForm.rectifymeasure)
- formData.append("rectifydeadline",this.dataForm.rectifydeadline)
- formData.append("note",this.dataForm.note)
- this.fileList.forEach(file=>{
- formData.append("files",file.raw)
- })
-
- hiddenDangerReport(formData)
- .then(res=>{
+ this.$refs["dataForm"].validate(valid =>{
+ if(valid){
+ this.submiting = true
+ let formData = new FormData()
+ formData.append('rectifier', this.dataForm.rectifier)
+ formData.append("rectifierid",this.dataForm.rectifierid)
+ formData.append("level",this.dataForm.level)
+ formData.append("rectifymeasure",this.dataForm.rectifymeasure)
+ formData.append("rectifydeadline",this.dataForm.rectifydeadline)
+ formData.append("note",this.dataForm.note)
+ this.fileList.forEach(file=>{
+ formData.append("files",file.raw)
+ })
+ hiddenDangerReport(formData).then(res=>{
if (res.data.code === '200') {
this.dialogFormVisible = false
this.$message({
@@ -181,18 +183,22 @@
});
}
this.fileList = []
- }
- )
- .catch(err=>{
- console.log(err)
+ }).catch(err=>{
+ console.log(err)
+ this.$message({
+ message: "接口错误,请联系管理员",
+ type: 'warning'
+ });
+ }).finally(()=>{
+ this.submiting = false
+ })
+ }else{
this.$message({
- message: "接口错误,请联系管理员",
- type: 'warning'
- });
- })
- .finally(()=>{
- this.submiting = false
- })
+ type:'warning',
+ message:'请完善基本信息'
+ })
+ }
+ })
},
showPersonSelect(){
diff --git a/src/views/doublePreventAction/riskLevelManage/analyseUnit/index.vue b/src/views/doublePreventAction/riskLevelManage/analyseUnit/index.vue
index b5ec3a3..a2ddbbb 100644
--- a/src/views/doublePreventAction/riskLevelManage/analyseUnit/index.vue
+++ b/src/views/doublePreventAction/riskLevelManage/analyseUnit/index.vue
@@ -118,7 +118,7 @@
</el-form-item>
</el-form>
<div align="right">
- <el-button @click="unitFormVisible = false">取消</el-button>
+ <el-button @click="analyseUnitVisible = false">取消</el-button>
<el-button type="primary" @click="submitAnalyseUnit()">确认</el-button>
</div>
</el-dialog>
diff --git a/src/views/doublePreventAction/riskLevelManage/riskSourceManage/index.vue b/src/views/doublePreventAction/riskLevelManage/riskSourceManage/index.vue
index 0319cd9..433594a 100644
--- a/src/views/doublePreventAction/riskLevelManage/riskSourceManage/index.vue
+++ b/src/views/doublePreventAction/riskLevelManage/riskSourceManage/index.vue
@@ -190,6 +190,7 @@
import { computePageCount } from '@/utils'
import { getRiskSourceList , addRiskSource , updateRiskSource , deleteById } from '@/api/riskSource'
import {getAllDepartment, getDepartmentList} from "../../../../api/departmentManage";
+import {deleteRiskSource} from "../../../../api/riskSource";
export default {
name: 'index',
filters: {
@@ -243,7 +244,12 @@
code:'',
riskSourceVisible:false,
riskSourceFormRules:{
- name: [{ required: true, message: '风险名称不能为空', trigger: 'blur' }],
+ name: [{ required: true, message: '风险源名称不能为空', trigger: 'blur' }],
+ type: [{ required: true, message: '风险源类型不能为空', trigger: 'change' }],
+ level: [{ required: true, message: '风险等级不能为空', trigger: 'change' }],
+ accidentDesc: [{ required: true, message: '可能导致事故的主要原因不能为空', trigger: 'blur' }],
+ location: [{ required: true, message: '区域位置不能为空', trigger: 'blur' }],
+ depId: [{ required: true, message: '所属部门不能为空', trigger: 'change' }],
},
riskSourceForm:{
accidentDesc: "",
@@ -379,7 +385,7 @@
cancelButtonText:'取消',
type:'warning',
}).then(()=> {
- deleteAnalyseUnit({id:val.id}).then( ()=>{
+ deleteRiskSource({id:val.id}).then( ()=>{
this.getRiskSourceData()
this.$notify({
title:'成功',
@@ -392,6 +398,7 @@
},
refreshHandle(){
+ this.listQuery.pageIndex = 1
this.getRiskSourceData()
},
handleSizeChange(val){
@@ -411,6 +418,6 @@
padding-bottom: 10px;
}
.analyseUnit_input{
- width:200px;
+ width:300px;
}
</style>
diff --git a/src/views/doublePreventAction/riskLevelManage/safetyRiskSpace/index.vue b/src/views/doublePreventAction/riskLevelManage/safetyRiskSpace/index.vue
index eba0ccd..17edd2c 100644
--- a/src/views/doublePreventAction/riskLevelManage/safetyRiskSpace/index.vue
+++ b/src/views/doublePreventAction/riskLevelManage/safetyRiskSpace/index.vue
@@ -232,6 +232,7 @@
descInfo: null,
img: null,
}
+ this.fileList = []
}else{
this.title = '查看'
this.safetyRiskSpaceForm = value
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 3effba1..eaca46f 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -174,7 +174,7 @@
.login-container {
min-height: 100%;
width: 100%;
- background: url("../../assets/bg.jpg") center no-repeat;
+ background: url("../../assets/bg_login.png") center no-repeat;
//background-size: auto 100%;
// background-color: #2d3a4b;
overflow: hidden;
@@ -215,7 +215,7 @@
display: inline-block;
height: 474px;
width: 572px;
- background: url("../../assets/img_bg_login.png") center no-repeat;
+ background: url("../../assets/bg.jpg") center no-repeat;
}
.login-main-form{
display: inline-block;
diff --git a/src/views/systemManage/userManage/index.vue b/src/views/systemManage/userManage/index.vue
index d530bf6..719e7d8 100644
--- a/src/views/systemManage/userManage/index.vue
+++ b/src/views/systemManage/userManage/index.vue
@@ -425,6 +425,19 @@
</el-row>
<el-row>
<el-col :span="12">
+ <el-form-item label="是否安全员:" prop="issecurityofficer">
+ <el-select v-model.trim="dataForm.issecurityofficer" auto-complete="on" style="width:100%;">
+ <el-option
+ v-for="item in isSecurityOfficerList"
+ :key="item.id"
+ :value="item.id"
+ :label="item.name"
+ >
+ </el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
<el-form-item label="状态:" prop="status">
<el-select v-model.trim="dataForm.status" auto-complete="on" style="width:100%;">
<el-option
@@ -437,13 +450,14 @@
</el-select>
</el-form-item>
</el-col>
+
+ </el-row>
+ <el-row>
<el-col :span="12">
<el-form-item label="定位卡编号:" prop="empNo">
<el-input v-model.trim="dataForm.empNo"></el-input>
</el-form-item>
</el-col>
- </el-row>
- <el-row>
<el-col :span="12">
<el-form-item label="定位卡MAC地址:" prop="deviceNo">
<el-input v-model.trim="dataForm.deviceNo"></el-input>
@@ -656,6 +670,7 @@
listLoading: true,
isMain:false,
iscompanyList:[{id:1,name:'否'},{id:0,name:'是'}],
+ isSecurityOfficerList:[{id:1,name:'是'},{id:0,name:'否'}],
queryForm: {
realname:'',
username: '',
@@ -692,6 +707,7 @@
lastmodifieddate:'',
empNo:'',
deviceNo:'',
+ issecurityofficer:'',
},
cardDataForm:{
username:'',
@@ -902,6 +918,7 @@
createddate:'',
lastmodifiedby:'',
lastmodifieddate:'',
+ issecurityofficer:'',
}
},
getDepartmentData(){
--
Gitblit v1.9.2