车辆道闸

sa-frame/menu-list-sp.js

@@ -167,14 +167,15 @@ window.menuList.unshift({
 		parent: true,
 		icon: 'el-icon-setting',
 		info: '有关系统的一些配置',
-		childList: [{
-				id: 'sp-cfg-app',
-				name: '系统对公配置',
-				url: 'sa-view-sp/sp-cfg/app-cfg.html'
-			},
+		childList: [
+			// {
+			// 	id: 'sp-cfg-app',
+			// 	name: '系统对公配置',
+			// 	url: 'sa-view-sp/sp-cfg/app-cfg.html'
+			// },
 			{
 				id: 'sp-cfg-server',
-				name: '服务器私有配置',
+				name: '系统配置',
 				url: 'sa-view-sp/sp-cfg/server-cfg.html'
 			},
 		]
@@ -192,7 +193,13 @@ window.menuList.unshift({
 						id: 'tb-car-filing-list',
 						name: '车辆备案',
 						url: 'sa-view/tb-car-filing/tb-car-filing-list.html',
-						childList: [{
+						childList: [
+							{
+								id: 'tb-car-filing-judge',
+								name: '审核',
+								isShow: false,
+							},
+							{
 								id: 'tb-car-filing-add',
 								name: '添加',
 								isShow: false,
@@ -215,7 +222,13 @@ window.menuList.unshift({
 						id: 'tb-person-filing-list',
 						name: '人员备案',
 						url: 'sa-view/tb-person-filing/tb-person-filing-list.html',
-						childList: [{
+						childList: [
+							{
+								id: 'tb-person-filing-judge',
+								name: '审核',
+								isShow: false,
+							},
+							{
 								id: 'tb-person-filing-add',
 								name: '添加',
 								isShow: false,

sa-view-sp/sp-cfg/server-cfg.html

@@ -43,33 +43,25 @@
 		<div class="vue-box" style="display: none;" :style="'display: block;'">
 			<div class="c-panel" v-if="m != null">
 				<!-- 提示 -->
-				<el-alert style="margin: 10px 0;"
+				<!-- <el-alert style="margin: 10px 0;"
 					type="blue" show-icon 
 					title="Server-Config 非对外开放，用来配置一些敏感信息。"
 					>
-				</el-alert>
+				</el-alert> -->
 				<!-- tab卡片 -->
 				<el-tabs class="s-tab" v-model="activeTab">
 					<!-- ---------------------------------- 系统参数 ---------------------------------- -->
-					<el-tab-pane label="系统参数" name="tab1">
-						<div class="c-item br">
-							<label class="c-label">预留信息：</label>
-							<el-input v-model="m.reserveInfo"></el-input>
-						</div>
-						<div style="height: 1px;"></div>
-						<sa-item type="img-list" name="新用户默认头像" v-model="m.userDefaultAvatar" br></sa-item>
-						<sa-item name="" style="margin-top: -20px;" br>
-							<span style="color: #999;">系统将从以上图片中随机选择一张作为新用户头像</span>
-						</sa-item>
+					<el-tab-pane label="系统配置" name="tab1">
+						<sa-item type="enum" name="备案审核" v-model="m.fillingJudge" :jv="{1: '人工审核', 2: '自动审核'}" jtype="1" br></sa-item>
 					</el-tab-pane>
 				</el-tabs>
 				
 				<!-- ---------------------------------- 其它配置 ---------------------------------- -->
-				<el-tab-pane label="其它配置" name="tab2">
+			<!-- 	<el-tab-pane label="其它配置" name="tab2">
 					<br>
 					<span>其它配置</span>
 				</el-tab-pane>
-
+ -->
 				<!-- 确定按钮 -->
 				<div style="position: absolute; bottom: 0px; width: calc(100% - 3em); line-height: 80px; background-color: #FFF;">
 					<hr style="height: 2px;">
@@ -85,7 +77,7 @@
 			// 创建一个默认的配置对象
 			function create_m() {
 				return {
-					reserveInfo: '预留信息', // 预留信息 
+					fillingJudge: 1, // 预留信息 
 					
 					userDefaultAvatar: '',	// 新用户默认头像 
 				}

sa-view/tb-car-black/tb-car-black-list.html

@@ -30,7 +30,7 @@
 				<!-- ------------- 数据列表 ------------- -->
 				<el-table class="data-table" ref="data-table" :data="dataList" style="margin-top: 10px;">
 					<sa-td name="序号" type="index"></sa-td>
-					<sa-td name="部门" prop="deptName" ></sa-td>
+					<sa-td name="所属组织" prop="deptName" ></sa-td>
 					<sa-td name="车牌号" prop="carNo" ></sa-td>
 					<sa-td name="禁行原因" prop="reason" ></sa-td>
 					<sa-td name="开始时间" prop="startTime" ></sa-td>

sa-view/tb-car-filing/tb-car-filing-add.html

@@ -34,7 +34,7 @@
 					<div class="c-title" v-else>数据修改</div>
 					<el-form v-if="m">
 						<div class="c-item">
-							<label class="c-label"><span style="color: red;">*</span>部门：</label>
+							<label class="c-label"><span style="color: red;">*</span>所属组织：</label>
 							<el-select v-model="m.deptId" :disabled="currentUser.deptId!=='9999999'">
 								<el-option label="请选择" v-for="(item,index) in deptList" :key="item.id"
 									:label="item.name" :value="item.id"></el-option>
@@ -90,7 +90,13 @@
 						// 表单校验 
 						let m = this.m;
 						sa.checkNull(m.deptId, '请选择部门');
-						sa.checkNull(m.carNo, '请输入 [车牌号]');
+						let carNo=m.carNo;
+						sa.checkNull(carNo, '请输入 [车牌号]');
+						carNo=carNo.toUpperCase();
+						if(!sa.isCarNo(carNo)){
+							sa.error('请填写正确的车牌号');
+							return false;
+						}
 						sa.checkNull(m.driverName, '请输入 [联系人]');
 						let contact = m.driverContact;
 						if (!sa.isPhone(contact)) {

sa-view/tb-car-filing/tb-car-filing-info.html

@@ -28,17 +28,20 @@
 					<el-form v-if="m">
 						<el-row>
 							<el-col :span="12">
-								<sa-info name="部门" br>{{m.deptName}}</sa-info>
+								<sa-info name="所属组织" br>{{m.deptName}}</sa-info>
 								<sa-info name="车牌号" br>{{m.carNo}}</sa-info>
 								<sa-info name="联系人" br>{{m.driverName}}</sa-info>
 								<sa-info name="联系电话" br>{{m.driverContact}}</sa-info>
+								<sa-info name="联系人身份证" br>{{m.driverIdCard}}</sa-info>
 							</el-col>
 							<el-col :span="12">
-								<sa-info name="联系人身份证" br>{{m.driverIdCard}}</sa-info>
 								<sa-info type="enum" name="类型" :value="m.type" :jv="{1: '临时', 2: '内部'}" br></sa-info>
-								<sa-info name="备注" br>{{m.remark}}</sa-info>
 								<sa-info name="创建时间" br>{{m.createTime}}</sa-info>
+								<sa-info type="enum" name="审核状态" :value="m.judgeState" :jv="{0: '未审核', 1: '通过',2:'不通过'}" br></sa-info>
+								<sa-info name="审核时间" br>{{m.judgeTime}}</sa-info>
+								<sa-info name="审核人" br>{{m.judgeBy}}</sa-info>
 							</el-col>
+							<sa-info name="备注" br>{{m.remark}}</sa-info>
 						</el-row>
 
 					</el-form>

sa-view/tb-car-filing/tb-car-filing-judge.html

@@ -0,0 +1,89 @@
+<!DOCTYPE html>
+<html>
+	<head>
+		<title>车辆备案-详情</title>
+		<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+		<meta name="viewport"
+			content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
+		<!-- 所有的 css js 资源 -->
+		<link rel="stylesheet" href="../../static/kj/element-ui/theme-chalk/index.css">
+		<link rel="stylesheet" href="../../static/sa.css">
+		<script src="../../static/kj/vue.min.js"></script>
+		<script src="../../static/kj/element-ui/index.js"></script>
+		<script src="../../static/kj/httpVueLoader.js"></script>
+		<script src="../../static/kj/jquery.min.js"></script>
+		<script src="../../static/kj/layer/layer.js"></script>
+		<script src="../../static/sa.js"></script>
+		<style type="text/css">
+			.c-panel .c-label {
+				width: 8em;
+			}
+		</style>
+	</head>
+	<body>
+		<div class="vue-box sbot" style="display: none;" :style="'display: block;'">
+			<!-- ------- 内容部分 ------- -->
+			<div class="s-body">
+				<div class="c-panel">
+					<el-form v-if="m">
+						<el-row>
+							<el-col :span="12">
+								<sa-info name="所属组织" br>{{m.deptName}}</sa-info>
+								<sa-info name="联系人" br>{{m.driverName}}</sa-info>
+								<sa-info name="联系电话" br>{{m.driverContact}}</sa-info>
+								<sa-info name="联系人身份证" br>{{m.driverIdCard}}</sa-info>
+							</el-col>
+							<el-col :span="12">
+								<sa-info name="车牌号" br>{{m.carNo}}</sa-info>
+								<sa-info type="enum" name="类型" :value="m.type" :jv="{1: '临时', 2: '内部'}" br></sa-info>
+								<sa-info name="创建时间" br>{{m.createTime}}</sa-info>
+								<sa-info name="备注" br>{{m.remark}}</sa-info>
+							</el-col>
+						</el-row>
+					</el-form>
+				</div>
+			</div>
+			<!-- ------- 底部按钮 ------- -->
+			<div class="s-foot">
+				<el-button type="success" @click="judge(1)">通过</el-button>
+				<el-button type="danger" @click="judge(2)">不通过</el-button>
+			</div>
+		</div>
+		<script>
+			var app = new Vue({
+				components: {
+					"sa-info": httpVueLoader('../../sa-frame/com/sa-info.vue')
+				},
+				el: '.vue-box',
+				data: {
+					id: sa.p('id', 0), // 获取数据ID 
+					m: null
+				},
+				methods: {
+					judge(state){
+						sa.ajax('/TbCarFiling/judge',{id:this.id,judgeState:state} ,function(res) {
+						sa.alert('操作成功');
+						setTimeout(() => {
+							parent.app.f5(); // 刷新父页面列表
+							sa.closeCurrIframe(); // 关闭本页 
+						}, 2000)
+						}.bind(this))
+					}
+				},
+				// 添加/修改 完成后的动作
+				clean: function() {
+					parent.app.f5(); // 刷新父页面列表
+					sa.closeCurrIframe(); // 关闭本页 
+				},
+				mounted: function() {
+					sa.ajax('/TbCarFiling/getById?id=' + this.id, function(res) {
+						this.m = res.data;
+						if (res.data == null) {
+							sa.alert('未能查找到 id=' + this.id + " 详细数据");
+						}
+					}.bind(this))
+				}
+			})
+		</script>
+	</body>
+</html>

sa-view/tb-car-filing/tb-car-filing-list.html

@@ -26,30 +26,41 @@
 					</sa-item>
 					<sa-item type="text" name="联系人" v-model="p.driverName"></sa-item>
 					<sa-item type="text" name="联系电话" v-model="p.driverContact"></sa-item>
-					<el-button type="primary" icon="el-icon-search" @click="p.pageNo = 1; f5()">查询</el-button>
-					<el-button type="primary" icon="el-icon-plus" @click="add" v-if="sa.isAuth('tb-car-filing-add')">新增</el-button>
-					<el-button type="info"  icon="el-icon-refresh"  @click="p.carNo='',p.type='',p.driverName='',p.driverContact='',f5()">重置</el-button>
-
+					<sa-item type="enum" name="审核状态" v-model="p.judgeState" :jv="{0: '未审核', 1: '通过',2:'不通过'}" jtype="4"
+						def="全部">
+					</sa-item>
+					<div>
+						<el-button type="primary" icon="el-icon-search" @click="p.pageNo = 1; f5()">查询</el-button>
+						<el-button type="info" icon="el-icon-refresh"
+							@click="p.carNo='',p.type='',p.driverName='',p.driverContact='',p.judgeState='',f5()">重置</el-button>
+						<el-button type="primary" icon="el-icon-plus" @click="add"
+							v-if="sa.isAuth('tb-car-filing-add')">新增</el-button>
+					</div>
 				</el-form>
-				
+
 				<!-- ------------- 数据列表 ------------- -->
-				<el-table class="data-table" ref="data-table" :data="dataList">
-					<sa-td type="selection"></sa-td>
-					<sa-td  name="部门" prop="deptName"></sa-td>
+				<el-table class="data-table" ref="data-table" :data="dataList" style="margin-top: 5px;">
+					<sa-td name="序号" type="index"></sa-td>
+					<sa-td name="所属组织" prop="deptName" width="200"></sa-td>
 					<sa-td name="车牌号" prop="carNo"></sa-td>
 					<sa-td name="类型" prop="type" type="enum" :jv="{1: '临时', 2: '内部'}"></sa-td>
 					<sa-td name="联系人" prop="driverName"></sa-td>
-					<sa-td name="联系电话" prop="driverContact"></sa-td>
-					<sa-td name="联系人身份证" prop="driverIdCardStr" width="150"></sa-td>
-					<sa-td name="创建时间" prop="createTime"></sa-td>
-					<sa-td name="更新时间" prop="updateTime"></sa-td>
+					<sa-td name="联系电话" prop="driverContact" width="120"></sa-td>
+					<sa-td name="审核状态" prop="judgeState" type="enum" :jv="{0: '未审核', 1: '通过', 2: '不通过'}"></sa-td>
+					<sa-td name="审核时间" prop="judgeTime" not="-" width="140"></sa-td>
+					<sa-td name="创建时间" prop="createTime" width="140"></sa-td>
+					<sa-td name="更新时间" prop="updateTime" width="140"></sa-td>
 					<el-table-column label="操作" fixed="right" width="240px">
 						<template slot-scope="s">
-							<el-button class="c-btn" type="success" icon="el-icon-view" @click="get(s.row)">查看
+							<el-button v-if="sa.isAuth('tb-car-filing-judge')&&s.row.judgeState==0" class="c-btn" type="success"  @click="judgeFn(s.row)">审核
 							</el-button>
-							<el-button v-if="sa.isAuth('tb-car-filing-edit')" class="c-btn" type="primary" icon="el-icon-edit" @click="update(s.row)">修改
+							<el-button class="c-btn" type="success"  @click="get(s.row)">查看
 							</el-button>
-							<el-button v-if="sa.isAuth('tb-car-filing-del')" class="c-btn" type="danger" icon="el-icon-delete" @click="del(s.row)">删除
+							<el-button v-if="sa.isAuth('tb-car-filing-edit')" class="c-btn" type="primary"
+								 @click="update(s.row)">修改
+							</el-button>
+							<el-button v-if="sa.isAuth('tb-car-filing-del')" class="c-btn" type="danger"
+								 @click="del(s.row)">删除
 							</el-button>
 						</template>
 					</el-table-column>
@@ -74,7 +85,7 @@
 						driverContact: '', // 联系电话 
 						driverIdCard: '', // 联系人身份证 
 						visit: '', // 状态 
-						remark: '', // 备注 
+						judgeState: '', // 备注 
 						pageNo: 1, // 当前页 
 						pageSize: 10, // 页大小 
 						sortType: 0 // 排序方式 
@@ -83,6 +94,9 @@
 					dataList: [], // 数据集合 
 				},
 				methods: {
+					judgeFn(data){
+						sa.showIframe('审核', 'tb-car-filing-judge.html?id=' + data.id, '700px', '70%');
+					},
 					// 刷新
 					f5: function() {
 						sa.ajax('/TbCarFiling/getList', sa.removeNull(this.p), function(res) {

sa-view/tb-car-visit-record/tb-car-visit-record-list.html

@@ -39,7 +39,7 @@
 				<!-- ------------- 数据列表 ------------- -->
 				<el-table class="data-table" ref="data-table" :data="dataList">
 					<sa-td name="序号" type="index"></sa-td>
-					<sa-td name="部门" prop="deptName"></sa-td>
+					<sa-td name="组织" prop="deptName"></sa-td>
 					<sa-td name="通道" prop="channel"></sa-td>
 					<sa-td name="车牌" prop="carNo"></sa-td>
 					<sa-td name="联系人" prop="driverName"></sa-td>

sa-view/tb-dept/tb-dept-add.html

@@ -29,6 +29,7 @@
 						<sa-item type="text" name="名称" v-model="m.name" br need></sa-item>
 						<sa-item type="text" name="负责人" v-model="m.chargePerson" br need></sa-item>
 						<sa-item type="text" name="联系号码" v-model="m.contact" br need></sa-item>
+						<sa-item type="enum" name="放行条件" v-model="m.passType" :jv="{1: '人车均备案', 2: '满足其一'}" jtype="3" br></sa-item>
 						<sa-item type="text" name="部门描述" v-model="m.deptDesc" br ></sa-item>
 						<sa-item type="textarea" name="备注" v-model="m.remark" br></sa-item>
 						<sa-item name="" class="s-ok" br>
@@ -63,6 +64,7 @@
 							peopleNum: '',		// 人数 
 							desc: '',		// 描述 
 							chargePerson: '',		// 负责人 
+							passType:1,
 							contact: '',		// 联系号码 
 							createTime: '',		// 创建时间 
 							createBy: '',		// 创建人 

sa-view/tb-gate-terminal/tb-gate-terminal-info.html

@@ -23,7 +23,6 @@
 			<div class="s-body">
 				<div class="c-panel">
 					<el-form v-if="m">
-						<sa-info type="num" name="主键" :value="m.id" br></sa-info>
 						<sa-info name="名称" br>{{m.name}}</sa-info>
 						<sa-info name="部门id" br>{{m.deptId}}</sa-info>
 						<sa-info name="序列号" br>{{m.sn}}</sa-info>

sa-view/tb-gate-terminal/tb-gate-terminal-list.html

@@ -31,10 +31,8 @@
 				<el-table class="data-table" ref="data-table" :data="dataList" >
 					<sa-td name="序号" type="index"></sa-td>
 					<sa-td name="名称" prop="name" ></sa-td>
-					<sa-td name="所属组织" prop="deptName" ></sa-td>
 					<sa-td name="所在道闸" prop="venuesName" ></sa-td>
 					<sa-td name="方向" prop="direction" type="enum" :jv="{1: '入场', 2: '离场'}"></sa-td>
-					<sa-td name="序列号" prop="sn" ></sa-td>
 					<sa-td name="IP地址" prop="ip" ></sa-td>
 					<el-table-column label="通讯">
 						<template slot-scope="s">
@@ -112,7 +110,7 @@
 					},
 					// 修改
 					update: function(data) {
-						sa.showIframe('修改数据', 'tb-gate-terminal-add.html?id=' + data.id, '1000px', '90%');
+						sa.showIframe('修改数据', 'tb-gate-terminal-add.html?id=' + data.id, '600px', '60%');
 					},
 					// 新增
 					add: function(data) {

sa-view/tb-person-filing/tb-person-filing-add.html

@@ -35,7 +35,7 @@
 					<div class="c-title" v-else>数据修改</div>
 					<el-form v-if="m">
 						<div class="c-item">
-							<label class="c-label"><span style="color: red;">*</span>部门：</label>
+							<label class="c-label"><span style="color: red;">*</span>备案组织：</label>
 							<el-select v-model="m.deptId" :disabled="currentUser.deptId!=='9999999'">
 								<el-option label="请选择" v-for="(item,index) in deptList" :key="item.id"
 									:label="item.name" :value="item.id"></el-option>

sa-view/tb-person-filing/tb-person-filing-info.html

@@ -32,13 +32,18 @@
 								<sa-info name="部门" br>{{m.deptName}}</sa-info>
 								<sa-info type="enum" name="类型" :value="m.type" :jv="{1: '临时', 2: '内部'}" br></sa-info>
 								<sa-info name="身份证" br>{{m.idCadStr}}</sa-info>
+								<sa-info name="来访事由" br>{{m.visitReason}}</sa-info>
 							</el-col>
 							<el-col :span="12">
-								<sa-info name="来访事由" br>{{m.visitReason}}</sa-info>
-								<sa-info name="备注" br>{{m.remark}}</sa-info>
+
 								<sa-info name="创建时间" br>{{m.createTime}}</sa-info>
 								<sa-info name="更新时间" br>{{m.updateTime}}</sa-info>
+								<sa-info type="enum" name="审核状态" :value="m.judgeState"
+									:jv="{0: '未审核', 1: '已审核',2:'不通过'}" br></sa-info>
+								<sa-info name="审核时间" br>{{m.judgeTime}}</sa-info>
+								<sa-info name="审核人" br>{{m.judgeBy}}</sa-info>
 							</el-col>
+							<sa-info name="备注" br>{{m.remark}}</sa-info>
 						</el-row>
 
 					</el-form>

sa-view/tb-person-filing/tb-person-filing-judge.html

@@ -0,0 +1,88 @@
+<!DOCTYPE html>
+<html>
+	<head>
+		<title>人员备案-详情</title>
+		<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+		<meta name="viewport"
+			content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
+		<!-- 所有的 css js 资源 -->
+		<link rel="stylesheet" href="../../static/kj/element-ui/theme-chalk/index.css">
+		<link rel="stylesheet" href="../../static/sa.css">
+		<script src="../../static/kj/vue.min.js"></script>
+		<script src="../../static/kj/element-ui/index.js"></script>
+		<script src="../../static/kj/httpVueLoader.js"></script>
+		<script src="../../static/kj/jquery.min.js"></script>
+		<script src="../../static/kj/layer/layer.js"></script>
+		<script src="../../static/sa.js"></script>
+		<style type="text/css">
+			.c-panel .c-label {
+				width: 8em;
+			}
+		</style>
+	</head>
+	<body>
+		<div class="vue-box sbot" style="display: none;" :style="'display: block;'">
+			<!-- ------- 内容部分 ------- -->
+			<div class="s-body">
+				<div class="c-panel">
+					<el-form v-if="m">
+						<el-row>
+							<el-col :span="12">
+								<sa-info name="姓名" br>{{m.name}}</sa-info>
+								<sa-info name="部门" br>{{m.deptName}}</sa-info>
+								<sa-info type="enum" name="类型" :value="m.type" :jv="{1: '临时', 2: '内部'}" br></sa-info>
+								<sa-info name="身份证" br>{{m.idCadStr}}</sa-info>
+							</el-col>
+							<el-col :span="12">
+								<sa-info name="来访事由" br>{{m.visitReason}}</sa-info>
+								<sa-info name="备注" br>{{m.remark}}</sa-info>
+								<sa-info name="创建时间" br>{{m.createTime}}</sa-info>
+								<sa-info name="更新时间" br>{{m.updateTime}}</sa-info>
+							</el-col>
+						</el-row>
+
+					</el-form>
+				</div>
+			</div>
+			<!-- ------- 底部按钮 ------- -->
+			<div class="s-foot">
+				<el-button type="success" @click="judge(1)">通过</el-button>
+				<el-button type="danger" @click="judge(2)">不通过</el-button>
+			</div>
+		</div>
+		<script>
+			var app = new Vue({
+				components: {
+					"sa-info": httpVueLoader('../../sa-frame/com/sa-info.vue')
+				},
+				el: '.vue-box',
+				data: {
+					id: sa.p('id', 0), // 获取数据ID 
+					m: null
+				},
+				methods: {
+					judge(state) {
+						sa.ajax('/TbPersonFiling/judge', {
+							id: this.id,
+							judgeState: state
+						}, function(res) {
+							sa.alert('操作成功');
+							setTimeout(() => {
+								parent.app.f5(); // 刷新父页面列表
+								sa.closeCurrIframe(); // 关闭本页 
+							}, 2000)
+						}.bind(this))
+					}
+				},
+				mounted: function() {
+					sa.ajax('/TbPersonFiling/getById?id=' + this.id, function(res) {
+						this.m = res.data;
+						if (res.data == null) {
+							sa.alert('未能查找到 id=' + this.id + " 详细数据");
+						}
+					}.bind(this))
+				}
+			})
+		</script>
+	</body>
+</html>

sa-view/tb-person-filing/tb-person-filing-list.html

@@ -25,34 +25,42 @@
 					<sa-item type="enum" name="类型" v-model="p.type" :jv="{1: '临时', 2: '内部'}" jtype="2" def="不限">
 					</sa-item>
 					<sa-item type="text" name="身份证" v-model="p.idCard"></sa-item>
+					<sa-item type="enum" name="审核状态" v-model="p.judgeState" :jv="{0: '未审核', 1: '通过',2:'不通过'}" jtype="4"
+						def="全部">
+					</sa-item>
 					<el-button type="primary" icon="el-icon-search" @click="p.pageNo = 1; f5()">查询</el-button>
+					<el-button type="info" icon="el-icon-refresh"
+						@click="p.name='',p.type='',p.idCard='',p.judgeState='',f5()">重置</el-button>
 					<el-button type="primary" icon="el-icon-plus" @click="add" v-if="sa.isAuth('tb-person-filing-add')">
 						新增</el-button>
-					<el-button type="info" icon="el-icon-refresh" @click="f5">重置</el-button>
-
 				</el-form>
 
 				<!-- ------------- 数据列表 ------------- -->
 				<el-table class="data-table" ref="data-table" :data="dataList">
 					<sa-td name="序号" type="index"></sa-td>
 					<sa-td name="姓名" prop="name"></sa-td>
-					<sa-td name="部门" prop="deptName"></sa-td>
+					<sa-td name="组织" prop="deptName"></sa-td>
 					<sa-td name="联系号码" prop="phone"></sa-td>
 					<sa-td name="身份证" prop="idCadStr" width="150"></sa-td>
 					<sa-td type="img" name="人脸" prop="photo"> </sa-td>
 					<sa-td name="类型" prop="type" type="enum" :jv="{1: '临时', 2: '内部'}"></sa-td>
 					<sa-td name="来访事由" prop="visitReason"></sa-td>
-					<sa-td name="创建时间" prop="createTime"></sa-td>
-					<sa-td name="更新时间" prop="updateTime"></sa-td>
+					<sa-td name="审核状态" prop="judgeState" type="enum" :jv="{0: '未审核', 1: '通过', 2: '不通过'}"></sa-td>
+					<sa-td name="审核时间" prop="judgeTime" not="-" width="140"></sa-td>
+					<sa-td name="创建时间" prop="createTime" width="140"></sa-td>
+					<sa-td name="更新时间" prop="updateTime" width="140"></sa-td>
 					<el-table-column label="操作" fixed="right" width="240px">
 						<template slot-scope="s">
-							<el-button class="c-btn" type="success" icon="el-icon-view" @click="get(s.row)">查看
+							<el-button v-if="sa.isAuth('tb-person-filing-judge')&&s.row.judgeState==0" class="c-btn" type="success"
+								@click="judgeFn(s.row)">审核
+							</el-button>
+							<el-button class="c-btn" type="success" @click="get(s.row)">查看
 							</el-button>
 							<el-button v-if="sa.isAuth('tb-person-filing-edit')" class="c-btn" type="primary"
-								icon="el-icon-edit" @click="update(s.row)">修改
+								@click="update(s.row)">修改
 							</el-button>
 							<el-button v-if="sa.isAuth('tb-person-filing-del')" class="c-btn" type="danger"
-								icon="el-icon-delete" @click="del(s.row)">删除
+								@click="del(s.row)">删除
 							</el-button>
 						</template>
 					</el-table-column>
@@ -72,27 +80,20 @@
 				data: {
 					p: { // 查询参数  
 						id: '', //  
-						deptId: '', // 部门ID 
+						judgeState: '', // 部门ID 
 						name: '', // 姓名 
 						type: '', // 类型(1=临时,2=内部) 
 						idCard: '', // 身份证 
-						visitReason: '', // 来访事由 
-						preComeTime: '', // 预计来访时间 
-						preLeaveTime: '', // 预计结束时间 
-						visit: '', // 状态 
-						remark: '', // 备注 
-						createTime: '', // 创建时间 
-						createBy: '', // 创建人 
-						updateTime: '', // 更新时间 
-						updateBy: '', // 更新人 
-						pageNo: 1, // 当前页 
-						pageSize: 10, // 页大小 
+						pageSize: 15, // 页大小 
 						sortType: 0 // 排序方式 
 					},
 					dataCount: 0,
 					dataList: [], // 数据集合 
 				},
 				methods: {
+					judgeFn(data) {
+						sa.showIframe('审核', 'tb-person-filing-judge.html?id=' + data.id, '700px', '70%');
+					},
 					// 刷新
 					f5: function() {
 						sa.ajax('/TbPersonFiling/getList', sa.removeNull(this.p), function(res) {

sa-view/tb-terminal/tb-terminal-info.html

@@ -24,12 +24,10 @@
 				<div class="c-panel">
 					<el-form v-if="m">
 						<sa-info name="" br>{{m.id}}</sa-info>
-						<sa-info name="部门ID" br>{{m.deptId}}</sa-info>
 						<sa-info name="名称" br>{{m.name}}</sa-info>
 						<sa-info name="IP地址" br>{{m.ipAddress}}</sa-info>
 						<sa-info type="enum" name="状态" :value="m.state" :jv="{0: '离线', 1: '正常 no-add no-s'}" br></sa-info>
 						<sa-info name="序列号" br>{{m.sn}}</sa-info>
-						<sa-info name="场所ID" br>{{m.venuesId}}</sa-info>
 						<sa-info name="场所名称" br>{{m.venuesName}}</sa-info>
 						<sa-info name="通道名称" br>{{m.channelName}}</sa-info>
 						<sa-info name="最近一次上线" br>{{m.lastOnLine}}</sa-info>

sa-view/tb-terminal/tb-terminal-list.html

@@ -37,15 +37,13 @@
 				<el-table class="data-table" ref="data-table" :data="dataList">
 					<sa-td name="序号" type="index"></sa-td>
 					<sa-td name="名称" prop="name"></sa-td>
-					<sa-td name="组织" prop="deptName" width="180"></sa-td>
-					<sa-td name="IP地址" prop="ipAddress"></sa-td>
+					<sa-td name="IP地址" prop="ipAddress" width="140"></sa-td>
 					<sa-td name="方向" prop="direction" type="enum" :jv="{1: '入场', 2: '离场'}"></sa-td>
 					<sa-td name="状态" prop="state"></sa-td>
 					<sa-td name="人脸数" prop="personNum"></sa-td>
-					<sa-td name="SN" prop="sn" width="260"></sa-td>
 					<sa-td name="通道名称" prop="channelName"></sa-td>
-					<sa-td name="创建时间" prop="createTime"></sa-td>
-					<el-table-column label="操作" fixed="right" width="320px">
+					<sa-td name="创建时间" prop="createTime" width="160"></sa-td>
+					<el-table-column label="操作" fixed="right" width="360px">
 						<template slot-scope="s">
 							<el-button v-if="sa.isAuth('tb-terminal-edit')" class="c-btn" type="primary"
 								 @click="update(s.row)">修改

sa-view/tb-venues/tb-venues-add.html

@@ -26,14 +26,6 @@
                     <div class="c-title" v-if="id == 0">数据添加</div>
 					<div class="c-title" v-else>数据修改</div>
 					<el-form v-if="m">
-						<div class="c-item">
-							<label class="c-label"><span style="color: red;">*</span>部门：</label>
-							<el-select v-model="m.deptId" :disabled="currentUser.deptId!=='9999999'">
-								<el-option label="请选择" v-for="(item,index) in deptList" :key="item.id"
-									:label="item.name" :value="item.id"></el-option>
-						
-							</el-select>
-						</div>
 						<sa-item type="text" name="场所名称" v-model="m.name" br need></sa-item>
 						<sa-item name="" class="s-ok" br>
 							<el-button type="primary" icon="el-icon-plus" @click="ok()">保存</el-button>
@@ -78,10 +70,9 @@
 					createModel: function() {
 						return {
 							id: '',		//  
-							deptId: '',		// 部门ID 
-							deptName: '',		// 部门 
 							pId: sa.p('pId', '-1'),		// 父ID 
 							name: '',		// 名称 
+							type:3,
 							createTime: '',		// 创建时间 
 							createBy: '',		// 创建人 
 							updateTime: '',		// 更新时间 
@@ -92,9 +83,7 @@
 					ok: function(){
 						// 表单校验 
 						let m = this.m;
-						sa.checkNull(m.deptId, '请选择 [部门]');
 						sa.checkNull(m.name, '请输入 [名称]');
-				
 						// 开始增加或修改
 						if(this.id <= 0) {	// 添加
 							sa.ajax('/TbVenues/add', m, function(res){

sa-view/tb-venues/tb-venues-addchildren.html

@@ -3,7 +3,8 @@
 	<head>
 		<title>场所管理-添加/修改</title>
 		<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-		<meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
+		<meta name="viewport"
+			content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
 		<!-- 所有的 css js 资源 -->
 		<link rel="stylesheet" href="../../static/kj/element-ui/theme-chalk/index.css">
 		<link rel="stylesheet" href="../../static/sa.css">
@@ -14,8 +15,14 @@
 		<script src="../../static/kj/layer/layer.js"></script>
 		<script src="../../static/sa.js"></script>
 		<style type="text/css">
-			.c-panel .el-form .c-label{width: 7em !important;}
-			.c-panel .el-form .el-input, .c-panel .el-form .el-textarea__inner{width: 250px;}
+			.c-panel .el-form .c-label {
+				width: 7em !important;
+			}
+
+			.c-panel .el-form .el-input,
+			.c-panel .el-form .el-textarea__inner {
+				width: 250px;
+			}
 		</style>
 	</head>
 	<body>
@@ -23,10 +30,11 @@
 			<!-- ------- 内容部分 ------- -->
 			<div class="s-body">
 				<div class="c-panel">
-                    <div class="c-title" v-if="id == 0">数据添加</div>
+					<div class="c-title" v-if="id == 0">数据添加</div>
 					<div class="c-title" v-else>数据修改</div>
 					<el-form v-if="m">
 						<sa-item type="text" name="通道名称" v-model="m.name" br need></sa-item>
+						<sa-item type="enum" name="类型" v-model="m.type" :jv="{1: '人行通道', 2: '车行通道'}" jtype="3" br></sa-item>
 						<sa-item name="" class="s-ok" br>
 							<el-button type="primary" icon="el-icon-plus" @click="ok()">保存</el-button>
 						</sa-item>
@@ -39,69 +47,68 @@
 				<el-button @click="sa.closeCurrIframe()">取消</el-button>
 			</div>
 		</div>
-        <script>
-			
+		<script>
 			var app = new Vue({
 				components: {
 					"sa-item": httpVueLoader('../../sa-frame/com/sa-item.vue')
 				},
 				el: '.vue-box',
 				data: {
-					id: sa.p('id', 0),		// 获取超链接中的id参数（0=添加，非0=修改） 
-					m: null,		// 实体对象 
+					id: sa.p('id', 0), // 获取超链接中的id参数（0=添加，非0=修改） 
+					m: null, // 实体对象 
 				},
 				methods: {
 					// 创建一个 默认Model 
 					createModel: function() {
 						return {
-							id: '',		//  
-							deptId: sa.p('deptId', '-1'),		// 部门ID 
-							deptName: '',		// 部门 
-							pId: sa.p('pId', '-1'),		// 父ID 
-							name: '',		// 名称 
+							id: '', //  
+							deptId: sa.p('deptId', '-1'), // 部门ID 
+							deptName: '', // 部门 
+							pId: sa.p('pId', '-1'), // 父ID 
+							name: '', // 名称 
+							type:1,
 						}
 					},
 					// 提交数据 
-					ok: function(){
+					ok: function() {
 						// 表单校验 
 						let m = this.m;
 						sa.checkNull(m.name, '请输入通道 [名称]');
 						// 开始增加或修改
-						if(this.id <= 0) {	// 添加
-							sa.ajax('/TbVenues/add', m, function(res){
-								sa.alert('增加成功', this.clean); 
+						if (this.id <= 0) { // 添加
+							sa.ajax('/TbVenues/add', m, function(res) {
+								sa.alert('增加成功', this.clean);
 							}.bind(this));
-						} else {	// 修改
-							sa.ajax('/TbVenues/update', m, function(res){
+						} else { // 修改
+							sa.ajax('/TbVenues/update', m, function(res) {
 								sa.alert('修改成功', this.clean);
 							}.bind(this));
 						}
 					},
 					// 添加/修改 完成后的动作
 					clean: function() {
-						if(this.id == 0) {
+						if (this.id == 0) {
 							this.m = this.createModel();
 						} else {
-							parent.app.f5();		// 刷新父页面列表
-							sa.closeCurrIframe();	// 关闭本页 
+							parent.app.f5(); // 刷新父页面列表
+							sa.closeCurrIframe(); // 关闭本页 
 						}
 					}
 				},
-				mounted: function(){
+				mounted: function() {
 					// 初始化数据 
-					if(this.id <= 0) {	
+					if (this.id <= 0) {
 						this.m = this.createModel();
-					} else {	
+					} else {
 						sa.ajax('/TbVenues/getById?id=' + this.id, function(res) {
 							this.m = res.data;
-							if(res.data == null) {
+							if (res.data == null) {
 								sa.alert('未能查找到 id=' + this.id + " 详细数据");
 							}
 						}.bind(this))
 					}
 				}
 			})
-			
 		</script>
 	</body>
-</html>
+</html>

sa-view/tb-venues/tb-venues-info.html

@@ -23,7 +23,6 @@
 			<div class="s-body">
 				<div class="c-panel">
 					<el-form v-if="m">
-						<sa-info name="部门" br>{{m.deptName}}</sa-info>
 						<sa-info name="名称" br>{{m.name}}</sa-info>
 						<sa-info name="创建时间" br>{{m.createTime}}</sa-info>
 						<sa-info name="更新时间" br>{{m.updateTime}}</sa-info>

sa-view/tb-venues/tb-venues-list.html

@@ -3,7 +3,8 @@
 	<head>
 		<title>场所管理-列表</title>
 		<meta charset="utf-8">
-		<meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
+		<meta name="viewport"
+			content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
 		<!-- 所有的 css & js 资源 -->
 		<link rel="stylesheet" href="../../static/kj/element-ui/theme-chalk/index.css">
 		<link rel="stylesheet" href="../../static/sa.css">
@@ -22,53 +23,66 @@
 				<el-form ref="form" :model='p' @submit.native.prevent>
 					<sa-item type="text" name="场所名称" v-model="p.name"></sa-item>
 					<el-button type="primary" icon="el-icon-search" @click="p.pageNo = 1; f5()">查询</el-button>
-					<el-button type="primary" icon="el-icon-plus" @click="add" v-if="sa.isAuth('tb-venues-add')">新增场所</el-button>
-					<el-button type="info"  icon="el-icon-refresh"  @click="p.name='',f5()">重置</el-button>
-					
+					<el-button type="primary" icon="el-icon-plus" @click="add" v-if="sa.isAuth('tb-venues-add')">新增场所
+					</el-button>
+					<el-button type="info" icon="el-icon-refresh" @click="p.name='',f5()">重置</el-button>
+
 				</el-form>
 				<!-- ------------- 快捷按钮 ------------- -->
-				
+
 				<!-- ------------- 数据列表 ------------- -->
-				<el-table class="data-table" ref="data-table" :data="dataList"  row-key="id" border @expand-change="sa.f5TableHeight()">
+				<el-table class="data-table" ref="data-table" :data="dataList" row-key="id" border
+					@expand-change="sa.f5TableHeight()">
 					<sa-td name="序号" type="index"></sa-td>
-					<sa-td name="部门" prop="deptName" ></sa-td>
-					<sa-td name="名称" prop="name" ></sa-td>
-					<sa-td name="创建时间" prop="createTime" ></sa-td>
-					<sa-td name="更新时间" prop="updateTime" ></sa-td>
-					<el-table-column label="操作" fixed="right"  width="320px">
+					<sa-td name="名称" prop="name"></sa-td>
+					<el-table-column label="类型" prop="type">
+							<template slot-scope="s">
+								<span v-if="s.row.type==1">人行道</span>
+								<span v-else-if="s.row.type==2">车行道</span>
+								<span v-else-if="s.row.type==3">场所</span>
+							</template>
+					</el-table-column>
+					<sa-td name="创建时间" prop="createTime"></sa-td>
+					<sa-td name="更新时间" prop="updateTime"></sa-td>
+					<el-table-column label="操作" fixed="right" width="320px">
 						<template slot-scope="s">
-							<el-button v-if="s.row.pId===-1&&sa.isAuth('tb-venues-edit')" class="c-btn" type="primary" icon="el-icon-edit" @click="update(s.row)">修改</el-button>
-							<el-button v-if="s.row.pId!==-1&&sa.isAuth('tb-venues-edit')" class="c-btn" type="primary" icon="el-icon-edit" @click="updateChild(s.row)">修改</el-button>
-							<el-button v-if="s.row.pId===-1&&sa.isAuth('tb-venues-add')" class="c-btn" type="primary" icon="el-icon-plus" @click="addChildren(s.row)">添加通道</el-button>
-							<el-button v-if="sa.isAuth('tb-venues-del')" class="c-btn" type="danger" icon="el-icon-delete" @click="del(s.row)">删除</el-button>
+							<el-button v-if="s.row.pId===-1&&sa.isAuth('tb-venues-edit')" class="c-btn" type="primary"
+								icon="el-icon-edit" @click="update(s.row)">修改</el-button>
+							<el-button v-if="s.row.pId!==-1&&sa.isAuth('tb-venues-edit')" class="c-btn" type="primary"
+								icon="el-icon-edit" @click="updateChild(s.row)">修改</el-button>
+							<el-button v-if="s.row.pId===-1&&sa.isAuth('tb-venues-add')" class="c-btn" type="primary"
+								icon="el-icon-plus" @click="addChildren(s.row)">添加通道</el-button>
+							<el-button v-if="sa.isAuth('tb-venues-del')" class="c-btn" type="danger"
+								icon="el-icon-delete" @click="del(s.row)">删除</el-button>
 						</template>
 					</el-table-column>
 				</el-table>
 				<!-- ------------- 分页 ------------- -->
-				<sa-item type="page" :curr.sync="p.pageNo" :size.sync="p.pageSize" :total="dataCount" @change="f5()" :sizes="[1000]"></sa-item>
+				<sa-item type="page" :curr.sync="p.pageNo" :size.sync="p.pageSize" :total="dataCount" @change="f5()"
+					:sizes="[1000]"></sa-item>
 			</div>
 		</div>
 		<script>
 			var app = new Vue({
 				components: {
-					"sa-item": httpVueLoader('../../sa-frame/com/sa-item.vue'),  
-					"sa-td": httpVueLoader('../../sa-frame/com/sa-td.vue'),		
+					"sa-item": httpVueLoader('../../sa-frame/com/sa-item.vue'),
+					"sa-td": httpVueLoader('../../sa-frame/com/sa-td.vue'),
 				},
 				el: '.vue-box',
 				data: {
 					p: { // 查询参数  
-						id: '',		//  
-						deptId: '',		// 部门ID 
-						deptName: '',		// 部门 
-						pId: '',		// 父ID 
-						name: '',		// 名称 
-						createTime: '',		// 创建时间 
-						createBy: '',		// 创建人 
-						updateTime: '',		// 更新时间 
-						updateBy: '',		// 更新人 
-						pageNo: 1,		// 当前页 
-						pageSize: 10,	// 页大小 
-						sortType: 0		// 排序方式 
+						id: '', //  
+						deptId: '', // 部门ID 
+						deptName: '', // 部门 
+						pId: '', // 父ID 
+						name: '', // 名称 
+						createTime: '', // 创建时间 
+						createBy: '', // 创建人 
+						updateTime: '', // 更新时间 
+						updateBy: '', // 更新人 
+						pageNo: 1, // 当前页 
+						pageSize: 10, // 页大小 
+						sortType: 0 // 排序方式 
 					},
 					dataCount: 0,
 					dataList: [], // 数据集合 
@@ -79,7 +93,7 @@
 						sa.ajax('/TbVenues/getTree', sa.removeNull(this.p), function(res) {
 							this.dataList = res.data; // 数据
 							this.dataCount = res.dataCount; // 数据总数 
-							sa.f5TableHeight();		// 刷新表格高度 
+							sa.f5TableHeight(); // 刷新表格高度 
 						}.bind(this));
 					},
 					// 查看
@@ -89,7 +103,7 @@
 					// 查看 - 根据选中的
 					getBySelect: function(data) {
 						var selection = this.$refs['data-table'].selection;
-						if(selection.length == 0) {
+						if (selection.length == 0) {
 							return sa.msg('请选择一条数据')
 						}
 						this.get(selection[0]);
@@ -98,9 +112,10 @@
 					update: function(data) {
 						sa.showIframe('修改场所', 'tb-venues-add.html?id=' + data.id, '600px', '60%');
 					},
-					updateChild(data){
-						sa.showIframe('修改通道', 'tb-venues-addchildren.html?id=' + data.id+'&deptId='+data.deptId, '500px', '60%');
-						
+					updateChild(data) {
+						sa.showIframe('修改通道', 'tb-venues-addchildren.html?id=' + data.id + '&deptId=' + data.deptId,
+							'500px', '60%');
+
 					},
 					// 新增
 					add: function(data) {
@@ -108,7 +123,8 @@
 					},
 					// 新增子级
 					addChildren: function(data) {
-						sa.showIframe('新增通道', 'tb-venues-addchildren.html?id=-1&pId=' + data.id+'&deptId='+data.deptId, '500px', '50%');
+						sa.showIframe('新增通道', 'tb-venues-addchildren.html?id=-1&pId=' + data.id + '&deptId=' + data
+							.deptId, '500px', '50%');
 					},
 					// 删除
 					del: function(data) {
@@ -123,12 +139,14 @@
 						// 获取选中元素的id列表 
 						let selection = this.$refs['data-table'].selection;
 						let ids = sa.getArrayField(selection, 'id');
-						if(selection.length == 0) {
+						if (selection.length == 0) {
 							return sa.msg('请至少选择一条数据')
 						}
 						// 提交删除 
 						sa.confirm('是否批量删除选中数据？此操作不可撤销', function() {
-							sa.ajax('/TbVenues/deleteByIds', {ids: ids.join(',')}, function(res) {
+							sa.ajax('/TbVenues/deleteByIds', {
+								ids: ids.join(',')
+							}, function(res) {
 								this.f5();
 							}.bind(this))
 						}.bind(this));

static/sa.js

@@ -669,7 +669,14 @@ var sa = {
 			} 
 			return false;
 		}
-		
+		me.isCarNo=function(str){
+			str=str+'';
+			let reg=/^(([京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼使领][A-Z](([0-9]{5}[DF])|([DF]([A-HJ-NP-Z0-9])[0-9]{4})))|([京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼使领][A-Z][A-HJ-NP-Z0-9]{4}[A-HJ-NP-Z0-9挂学警港澳使领]))$/
+			if(reg.test(str)){
+				return true;
+			}
+			return false;
+		}
 		// 产生随机字符串
 		me.randomString = function(len) {
 		　　len = len || 32;