企业端门口门禁开发完成并且用户信息增加门口门禁卡号字段

pull/8/head
zhaoyu 2024-01-23 14:24:59 +08:00
parent f60cbeb34a
commit 54ab694f2f
7 changed files with 240 additions and 20 deletions

View File

@ -66,6 +66,9 @@
<el-form-item label="定位卡号" prop="CARDNO">
<el-input v-model="form.CARDNO" placeholder="这里输入定位卡号..."/>
</el-form-item>
<el-form-item label="门口门禁卡号" prop="MKMJCARD">
<el-input v-model="form.MKMJCARD" placeholder="这里输入门口门禁卡号..."/>
</el-form-item>
<el-form-item label="是否为隐患确认人" prop="IS_HAZARDCONFIRMER">
<el-radio-group v-model="form.IS_HAZARDCONFIRMER">
<el-radio :label="0" value="0"></el-radio>
@ -818,6 +821,7 @@ export default {
IS_HAZARDCONFIRMER: 0,
INFORPOST: '',
CARDNO: '',
MKMJCARD: '',
INFORTITLE: '',
INFORTITLEValue: '',
infortitleType: 'select',

View File

@ -208,16 +208,16 @@ export default {
},
hasButton: function() {
var keys = 'listmanager:add,listmanager:del,listmanager:edit,toExcel'
var keys = 'mkmjArea:add,mkmjArea:del,mkmjArea:edit,toExcel'
requestFN(
'/head/hasButton',
{
keys: keys
}
).then((data) => {
this.add = data.listmanagerfhadminadd //
this.del = data.listmanagerfhadmindel //
this.edit = data.listmanagerfhadminedit //
this.add = data.mkmjAreafhadminadd //
this.del = data.mkmjAreafhadmindel //
this.edit = data.mkmjAreafhadminedit //
this.toExcel = data.toExcel // excel
}).catch((e) => {
this.listLoading = false

View File

@ -0,0 +1,198 @@
<template>
<div class="app-container">
<div class="rightCont">
<el-form label-width="50px">
<el-row>
<el-col :span="4">
<el-form-item label="区域名称/编码" label-width="110px">
<el-input v-model="KEYWORDS" placeholder="请输入关键字"/>
</el-form-item>
</el-col>
<el-col :span="4"/>
<el-col :span="4">
<el-form-item label-width="10px">
<el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="getQuery">
搜索
</el-button>
<el-button v-waves class="filter-item" type="success" icon="el-icon-refresh" @click="goKeyReset">
重置
</el-button>
</el-form-item>
</el-col>
</el-row>
</el-form>
<div>
<el-table
v-loading="listLoading"
ref="multipleTable"
:data="varList"
:row-key="getRowKey"
border
tooltip-effect="dark"
style="width: 100%">
<el-table-column :selectable="selectable" type="selection" reserve-selection width="55" align="center"/>
<el-table-column type="index" label="序号" width="55" align="center"/>
<el-table-column prop="NAME" label="人员姓名"/>
<el-table-column prop="GATE_NAME" label="闸机名称"/>
<el-table-column prop="GATE_TYPE" label="闸机类型">
<template slot-scope="{row}">
<span v-if="row.GATE_TYPE === '1'" class="color-red"></span>
<span v-if="row.GATE_TYPE === '2'" class="color-green"></span>
</template>
</el-table-column>
<el-table-column prop="LOG_TIME" label="时间"/>
<el-table-column prop="STATE" label="状态">
<template slot-scope="{row}">
<span v-if="row.STATE === '0'" class="color-red"></span>
<span v-if="row.STATE === '1'" class="color-green"></span>
<span v-if="row.STATE === '2'" class="color-green"></span>
<span v-if="row.STATE === '3'" class="color-green"></span>
</template>
</el-table-column>
</el-table>
<div class="page-btn-group">
<div>
<!--<el-button type="primary" icon="el-icon-plus" @click="handleAdd"></el-button>
<el-button type="danger" icon="el-icon-plus" @click="handelDelete"></el-button>-->
</div>
<pagination
:total="total"
:page.sync="listQuery.page"
:limit.sync="listQuery.limit"
@pagination="getList(HIDDENREGION_ID)"/>
</div>
</div>
</div>
<div class="ui-foot">
<el-button plain type="info" @click="goBack"> </el-button>
</div>
</div>
</template>
<script>
import Pagination from '@/components/Pagination'
import { requestFN } from '@/utils/request'
import waves from '@/directive/waves' // waves directive
import SelectTree from '@/components/SelectTree'
export default {
components: { Pagination, SelectTree },
directives: { waves },
data() {
return {
AREA_ID: '',
AREA_LEAVE: '',
addBtnType: true,
listLoading: true,
add: false,
del: false,
edit: false,
listQuery: {
page: 1,
limit: 20
},
ls: [],
dates: [],
total: 0,
KEYWORDS: '',
filterText: '',
varList: [],
pd: []
}
},
watch: {
filterText(val) {
console.log(val)
this.$refs.tree.filter(val)
}
},
created() {
this.AREA_LEAVE = this.$parent.AREA_LEAVE
this.AREA_ID = this.$parent.AREA_ID
this.getList()
this.hasButton()
},
methods: {
getRowKey(row) {
return row.FIRE_REGION_ID
},
selectable(row, index) {
return row.ITEMCOUNT == 0
},
//
getQuery() {
// this.$refs.multipleTable.clearSelection()
this.getList()
},
//
getList(pid) {
this.listLoading = true
this.varList = []
this.HIDDENREGION_ID = pid
requestFN(
'/mkmjGateLog/list?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page,
{
KEYWORDS: this.KEYWORDS,
AREA_ID: this.AREA_ID
}
).then((data) => {
this.listLoading = false
this.varList = data.varList
this.total = data.page.totalResult
this.hasButton()
}).catch((e) => {
this.listLoading = false
})
},
goKeyReset() {
this.KEYWORDS = ''
this.getList()
},
hasButton: function() {
var keys = 'mkmjArea:add,mkmjArea:del,mkmjArea:edit,toExcel'
requestFN(
'/head/hasButton',
{
keys: keys
}
).then((data) => {
this.add = data.mkmjAreafhadminadd //
this.del = data.mkmjAreafhadmindel //
this.edit = data.mkmjAreafhadminedit //
this.toExcel = data.toExcel // excel
}).catch((e) => {
this.listLoading = false
})
},
//
goBack() {
if (this.AREA_LEAVE === '1') {
this.$parent.activeName = 'List'
} else if (this.AREA_LEAVE === '2') {
this.$parent.activeName = 'ListTwo'
} else if (this.AREA_LEAVE === '3') {
this.$parent.activeName = 'ListThree'
}
}
}
}
</script>
<style scoped>
.returnBtn {
float: right;
}
.app-container {
display: flex; /**/
align-items: baseline;
}
.rightCont {
width: 100%
}
</style>

View File

@ -55,7 +55,7 @@
type="warning"
icon="el-icon-circle-close"
size="mini"
@click="handleClose(row.FIRE_REGION_ID,row.FIRE_REGION_NAME)">进出记录
@click="handleClose(row)">进出记录
</el-button>
<el-button
v-show="edit"
@ -203,6 +203,11 @@ export default {
this.$parent.AREA_ID = row.AREA_ID
this.$parent.activeName = 'ListGate'
},
handleClose(row) {
this.$parent.AREA_LEAVE = this.AREA_LEAVE
this.$parent.AREA_ID = row.AREA_ID
this.$parent.activeName = 'ListLog'
},
clickChild(row) {
this.$parent.AREA_PARENT_ID = row.AREA_ID
this.$parent.AREA_OLD_ID = row.AREA_ID
@ -237,16 +242,16 @@ export default {
},
hasButton: function() {
var keys = 'listmanager:add,listmanager:del,listmanager:edit,toExcel'
var keys = 'mkmjArea:add,mkmjArea:del,mkmjArea:edit,toExcel'
requestFN(
'/head/hasButton',
{
keys: keys
}
).then((data) => {
this.add = data.listmanagerfhadminadd //
this.del = data.listmanagerfhadmindel //
this.edit = data.listmanagerfhadminedit //
this.add = data.mkmjAreafhadminadd //
this.del = data.mkmjAreafhadmindel //
this.edit = data.mkmjAreafhadminedit //
this.toExcel = data.toExcel // excel
}).catch((e) => {
this.listLoading = false

View File

@ -49,7 +49,7 @@
type="warning"
icon="el-icon-circle-close"
size="mini"
@click="handleClose(row.FIRE_REGION_ID,row.FIRE_REGION_NAME)">进出记录
@click="handleClose(row)">进出记录
</el-button>
<el-button
v-show="edit"
@ -195,6 +195,11 @@ export default {
this.$parent.AREA_ID = AREA_ID
this.$parent.activeName = 'Edit'
},
handleClose(row) {
this.$parent.AREA_LEAVE = this.AREA_LEAVE
this.$parent.AREA_ID = row.AREA_ID
this.$parent.activeName = 'ListLog'
},
handleOpen(row) {
this.$parent.AREA_LEAVE = this.AREA_LEAVE
this.$parent.AREA_ID = row.AREA_ID
@ -229,16 +234,16 @@ export default {
},
hasButton: function() {
var keys = 'listmanager:add,listmanager:del,listmanager:edit,toExcel'
var keys = 'mkmjArea:add,mkmjArea:del,mkmjArea:edit,toExcel'
requestFN(
'/head/hasButton',
{
keys: keys
}
).then((data) => {
this.add = data.listmanagerfhadminadd //
this.del = data.listmanagerfhadmindel //
this.edit = data.listmanagerfhadminedit //
this.add = data.mkmjAreafhadminadd //
this.del = data.mkmjAreafhadmindel //
this.edit = data.mkmjAreafhadminedit //
this.toExcel = data.toExcel // excel
}).catch((e) => {
this.listLoading = false

View File

@ -55,7 +55,7 @@
type="warning"
icon="el-icon-circle-close"
size="mini"
@click="handleClose(row.FIRE_REGION_ID,row.FIRE_REGION_NAME)">进出记录
@click="handleClose(row)">进出记录
</el-button>
<el-button
v-show="edit"
@ -168,6 +168,11 @@ export default {
this.$parent.AREA_PARENT_ID = this.AREA_PARENT_ID
this.$parent.AREA_ID = this.AREA_ID
},
handleClose(row) {
this.$parent.AREA_LEAVE = this.AREA_LEAVE
this.$parent.AREA_ID = row.AREA_ID
this.$parent.activeName = 'ListLog'
},
clickChild(row) {
this.$parent.AREA_PARENT_ID = row.AREA_ID
this.$parent.activeName = 'ListThree'
@ -239,16 +244,16 @@ export default {
},
hasButton: function() {
var keys = 'listmanager:add,listmanager:del,listmanager:edit,toExcel'
var keys = 'mkmjArea:add,mkmjArea:del,mkmjArea:edit,toExcel'
requestFN(
'/head/hasButton',
{
keys: keys
}
).then((data) => {
this.add = data.listmanagerfhadminadd //
this.del = data.listmanagerfhadmindel //
this.edit = data.listmanagerfhadminedit //
this.add = data.mkmjAreafhadminadd //
this.del = data.mkmjAreafhadmindel //
this.edit = data.mkmjAreafhadminedit //
this.toExcel = data.toExcel // excel
}).catch((e) => {
this.listLoading = false

View File

@ -7,6 +7,7 @@
<ListGate v-if="activeName=='ListGate'" />
<Edit v-if="activeName=='Edit'" />
<EditGate v-if="activeName=='EditGate'" />
<ListLog v-if="activeName=='ListLog'" />
</div>
</template>
@ -17,6 +18,7 @@ import ListThree from './components/listThree'
import ListGate from './components/listGate'
import Edit from './components/edit'
import EditGate from './components/editGate'
import ListLog from './components/listLog'
export default {
components: {
@ -25,7 +27,8 @@ export default {
ListTwo: ListTwo,
ListThree: ListThree,
ListGate: ListGate,
EditGate: EditGate
EditGate: EditGate,
ListLog: ListLog
},
data() {
return {