Trang chủ Khám phá Trợ giúp
Đăng ký Đăng nhập
qzyReal
/
face-ui
1
0
Fork 0
Các tập tin Các vấn đề 0 Yêu cầu kéo về 0 Wiki
Browse Source

预警通知

qzyReal 3 năm trước cách đây
mục cha
c3dbddef50
commit
4b6f1b8a92
17 tập tin đã thay đổi với 1014 bổ sung và 173 xóa
Split View Hiển thị tình trạng sai khác
  1. 48 1
      sa-frame/menu-list-sp.js
  2. 4 22
      sa-view-sp/console/console-main.html
  3. 1 1
      sa-view-sp/sp-admin/admin-add.html
  4. 161 63
      sa-view-sp/sp-admin/admin-list.html
  5. 14 9
      sa-view-sp/sp-cfg/server-cfg.html
  6. 192 0
      sa-view/tb-alarm-person/tb-alarm-person-add.html
  7. 126 0
      sa-view/tb-alarm-person/tb-alarm-person-list.html
  8. 78 0
      sa-view/tb-alarm-person/tb-manager-info.html
  9. 1 0
      sa-view/tb-car-visit-record/tb-car-visit-record-list.html
  10. 33 27
      sa-view/tb-manager/tb-manager-add.html
  11. 49 42
      sa-view/tb-manager/tb-manager-list.html
  12. 0 4
      sa-view/tb-person-filing/tb-person-filing-add.html
  13. 75 0
      sa-view/tb-person-visit-record/health-code-record-info.html
  14. 218 0
      sa-view/tb-person-visit-record/health-code-record-list.html
  15. 11 1
      sa-view/tb-person-visit-record/tb-person-visit-record-list.html
  16. 2 2
      sa-view/tb-person-visit-record/tb-person-visit-temperature-list.html
  17. 1 1
      sa-view/tb-terminal/tb-terminal-list.html

+ 48 - 1
sa-frame/menu-list-sp.js
Xem Tập Tin 

@@ -542,7 +542,54 @@ window.menuList.unshift({
 
 
 				},
 
 			]
 
-		}, ]
 
+		}, 
+		{
 
+		   id: 'health-code-record-list',
 
+		   name: '健康码管理',
 
+		   url: 'sa-view/tb-person-visit-record/health-code-record-list.html',
 
+		   childList: [
 
+		      {
 
+		         id: 'health-code-record-solve',
 
+		         name: '处置',
 
+		         isShow: false,
 
+		      },
 
+			  {
 
+			     id: 'health-code-record-del',
 
+			     name: '删除',
 
+			     isShow: false,
 
+			  },
 
+		   ]
 
+		},
 
+		]
 
+	},{
 
+		id: 'alarm-monitor-system',
 
+		name: '预警监控子系统',
 
+		icon: 'el-icon-user',
 
+		parent: true,
 
+		childList: [{
 
+			id: 'tb-alarm-person-list',
 
+			name: '预警通知对象',
 
+			url: 'sa-view/tb-alarm-person/tb-alarm-person-list.html',
 
+			childList: [{
 
+					id: 'tb-alarm-person-add',
 
+					name: '新增',
 
+					isShow: false,
 
+				},
 
+				{
 
+					id: 'tb-alarm-person-edit',
 
+					name: '修改',
 
+					isShow: false,
 
+
 
+				},
 
+				{
 
+					id: 'tb-alarm-person-del',
 
+					name: '删除',
 
+					isShow: false,
 
+				},
 
+			]
 
+		}, 
+		
+		]
 
 	}, {
 
 		id: 'health-monitor-system',
 
 		name: '监控管理系统',

+ 4 - 22
sa-view-sp/console/console-main.html
Xem Tập Tin 

@@ -27,12 +27,12 @@
 
 			
 			<!-- ------------ 第一栏 - 统计数据 ------------- -->
 
 			<div class="s-row s-row-1">
 
-				<com-sta-data></com-sta-data>
 
+				<!-- <com-sta-data></com-sta-data> -->
 
 			</div>
 
 			
 			<!-- ------------ 第二栏 - 图表 ------------- -->
 
 			<div class="s-row s-row-2">
 
-				<el-row :gutter="14">
 
+				<!-- <el-row :gutter="14">
 
 					<el-col :lg="8" :xs="24">
 
 						<el-card shadow="never" header="柱状图">
 
 							<com-chart-1></com-chart-1>
 
@@ -48,30 +48,12 @@
 
 							<com-chart-3></com-chart-3>
 
 						</el-card>
 
 					</el-col>
 
-				</el-row>
 
+				</el-row> -->
 
 			</div>
 
 			
 			<!-- ------------ 第三栏 - 框架信息 ------------- -->
 
 			<div class="s-row s-row-3">
 
-				<el-row :gutter="14" type="flex" style="flex-wrap: wrap-reverse;">
 
-					<!-- 左边 -->
 
-					<el-col :lg="12" :xs="24">
 
-						<!-- 技术选型 -->
 
-						<el-card shadow="never" header="技术选型">
 
-							<com-stack></com-stack>
 
-						</el-card>
 
-						<!-- 更新日志 -->
 
-						<el-card shadow="never" header="更新日志">
 
-							<com-update-log></com-update-log>
 
-						</el-card>
 
-					</el-col>
 
-					<!-- 右边 -->
 
-					<el-col :lg="12" :xs="24">
 
-						<el-card shadow="never" header="Sa-Admin ">
 
-							<com-origin></com-origin>
 
-						</el-card>
 
-					</el-col>
 
-				</el-row>
 
+				
 			</div>
 
 			
 		</div>

+ 1 - 1
sa-view-sp/sp-admin/admin-add.html
Xem Tập Tin 

@@ -31,7 +31,7 @@
 
 					<sa-item style="display: inline;" type="text" name="手机号" v-model="m.phone" br need></sa-item>
 
 					<span style="display: inline;">即登录账号</span>
 
 					<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="deptIds" multiple :disabled="currentUser.deptId!=='9999999'">
 
 							<el-option label="请选择" v-for="(item,index) in deptList" :key="item.id" :label="item.name"
 
 								:value="item.id"></el-option>

+ 161 - 63
sa-view-sp/sp-admin/admin-list.html
Xem Tập Tin 

@@ -1,12 +1,13 @@
 
 <!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" />
 
+		<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="https://unpkg.com/element-ui@2.13.0/lib/theme-chalk/index.css">
 
-		<link rel="stylesheet" href="../../static/sa.css"> 
+		<link rel="stylesheet" href="../../static/sa.css">
 
 		<script src="https://unpkg.com/vue@2.6.10/dist/vue.min.js"></script>
 
 		<script src="https://unpkg.com/element-ui@2.13.0/lib/index.js"></script>
 
 		<script src="https://unpkg.com/http-vue-loader@1.4.2/src/httpVueLoader.js"></script>
 
@@ -15,7 +16,9 @@
 
 		<script src="../../static/sa.js"></script>
 
 		<script src="../../static/kj/upload-util.js"></script>
 
 		<style type="text/css">
 
-			.el-radio{margin-right: 10px;}
 
+			.el-radio {
 
+				margin-right: 10px;
 
+			}
 
 		</style>
 
 	</head>
 
 	<body>
 
@@ -28,7 +31,8 @@
 
 					<sa-item name="角色">
 
 						<el-select v-model="p.roleId">
 
 							<el-option label="全部" value=""></el-option>
 
-							<el-option v-for="role in roleList" :key="role.id" :label="role.name" :value="role.id"></el-option>
 
+							<el-option v-for="role in roleList" :key="role.id" :label="role.name" :value="role.id">
 
+							</el-option>
 
 						</el-select>
 
 					</sa-item>
 
 					<el-button type="primary" icon="el-icon-search" @click="p.pageNo = 1; f5()">查询</el-button>
 
@@ -43,8 +47,9 @@
 
 				</el-form>
 
 				<!-- ------------- 快捷按钮 ------------- -->
 
 				<div class="fast-btn">
 
-					<el-button type="primary" icon="el-icon-plus" @click="add" v-if="sa.isAuth('sp-admin-add')">新增</el-button>
 
-					<el-button type="info"  icon="el-icon-refresh"  @click="f5">重置</el-button>
 
+					<el-button type="primary" icon="el-icon-plus" @click="add" v-if="sa.isAuth('sp-admin-add')">新增
 
+					</el-button>
 
+					<el-button type="info" icon="el-icon-refresh" @click="f5">重置</el-button>
 
 				</div>
 
 				<!-- ------------- 数据列表 ------------- -->
 
 				<el-table class="data-table" ref="data-table" :data="dataList">
 
@@ -56,12 +61,13 @@
 
 							<span v-else>{{s.row.name}}</span>
 
 						</template>
 
 					</sa-td>
 
-					<sa-td type="text" name="部门" prop="deptName" not='系统管理'></sa-td>
 
+					<sa-td type="text" name="所属组织" prop="deptName" not='系统管理'></sa-td>
 
 					<sa-td type="text" name="所属角色" prop="roleName"></sa-td>
 
 					<sa-td type="datetime" name="创建日期" prop="createTime" width="150px"></sa-td>
 
 					<sa-td type="datetime" name="最后登录" prop="loginTime" width="150px"></sa-td>
 
 					<sa-td type="text" name="登录次数" prop="loginCount" not="0" width="100px"></sa-td>
 
-					<sa-td type="switch" name="账号状态" prop="status" :jv="{1: '正常', 2: '禁用[#ff4949]'}" @change="s => updateStatus(s.row)" width="120px"></sa-td>
 
+					<sa-td type="switch" name="账号状态" prop="status" :jv="{1: '正常', 2: '禁用[#ff4949]'}"
 
+						@change="s => updateStatus(s.row)" width="120px"></sa-td>
 
 					<el-table-column label="操作" fixed="right" width="330px">
 
 						<template slot-scope="s">
 
 							<span @click="getInfo(s.row)">
 
@@ -72,13 +78,16 @@
 
 									修改资料 <i class="el-icon-arrow-down el-icon--right"></i>
 
 								</el-button>
 
 								<el-dropdown-menu slot="dropdown">
 
+									<span @click="updateDept(s.row)" v-if="s.row.deptId!=9999999">
 
+										<el-dropdown-item>修改组织</el-dropdown-item>
 
+									</span>
 
 									<span @click="updateName(s.row)">
 
 										<el-dropdown-item>改手机号</el-dropdown-item>
 
 									</span>
 
 									<span @click="updateNickName(s.row)">
 
 										<el-dropdown-item>改姓名</el-dropdown-item>
 
 									</span>
 
-								
+
 
 									<span @click="updatePassword(s.row)">
 
 										<el-dropdown-item>改密码</el-dropdown-item>
 
 									</span>
 
@@ -89,23 +98,39 @@
 
 									修改角色为 <i class="el-icon-arrow-down el-icon--right"></i>
 
 								</el-button>
 
 								<el-dropdown-menu slot="dropdown">
 
-									<span v-for="role in roleList" :key="role.id" @click="updateRoleId(s.row, role.id, role.name)">
 
-										<el-dropdown-item :style=" s.row.roleId == role.id ? {color: 'blue'} : null ">{{role.name}}</el-dropdown-item>
 
+									<span v-for="role in roleList" :key="role.id"
 
+										@click="updateRoleId(s.row, role.id, role.name)">
 
+										<el-dropdown-item :style=" s.row.roleId == role.id ? {color: 'blue'} : null ">
 
+											{{role.name}}</el-dropdown-item>
 
 									</span>
 
 								</el-dropdown-menu>
 
 							</el-dropdown>
 
 							<span @click="del(s.row)">
 
-								<el-button v-if="sa.isAuth('sp-admin-del')" type="danger" class="c-btn" icon="el-icon-delete">删除</el-button>
 
+								<el-button v-if="sa.isAuth('sp-admin-del')" type="danger" class="c-btn"
 
+									icon="el-icon-delete">删除</el-button>
 
 							</span>
 
 						</template>
 
 					</el-table-column>
 
 				</el-table>
 
 				<!-- 分页 -->
 
-				<sa-item type="page" :curr.sync="p.pageNo" :size.sync="p.pageSize" :total="dataCount" @change="f5()"></sa-item>
 
+				<sa-item type="page" :curr.sync="p.pageNo" :size.sync="p.pageSize" :total="dataCount" @change="f5()">
 
+				</sa-item>
 
 			</div>
 
-			
+			<el-dialog title="修改组织" :modal="false" :visible.sync="modal.visible" width="400px">
 
+				<div class="c-item">
 
+					<label class="c-label"><span style="color: red;">*</span>组织：</label>
 
+					<el-select v-model="modal.deptId" multiple>
 
+						<el-option label="请选择" v-for="(item,index) in deptList" :key="item.id" :label="item.name"
 
+							:value="item.id"></el-option>
 
+					</el-select>
 
+				</div>
 
+				<span slot="footer" class="dialog-footer">
 
+					<el-button @click="modal.visible=false">取 消</el-button>
 
+					<el-button type="primary" @click="sureFn">确 定</el-button>
 
+				</span>
 
+			</el-dialog>
 
 		</div>
 
-        <script>
 
+		<script>
 
 			var app = new Vue({
 
 				components: {
 
 					"sa-item": httpVueLoader('../../sa-frame/com/sa-item.vue'),
 
@@ -113,8 +138,8 @@
 
 				},
 
 				el: '.vue-box',
 
 				data: {
 
-					sa: sa, 	// 超级对象
 
-					p: {		// 查询参数
 
+					sa: sa, // 超级对象
 
+					p: { // 查询参数
 
 						id: '',
 
 						name: '',
 
 						roleId: '',
 
@@ -122,22 +147,62 @@
 
 						pageNo: 1,
 
 						pageSize: 10,
 
 					},
 
+					deptList:[],
 
+					modal: {
 
+						visible:false,
 
+						deptId:[],
 
+						form: {
 
+							id: '',
 
+							deptId: ''
 
+						}
 
+					},
 
 					dataCount: 0,
 
-					dataList: [],	// 数据集合
 
-					roleList: [],	// 角色集合 
+					dataList: [], // 数据集合
 
+					roleList: [], // 角色集合 
 				},
 
 				methods: {
 
+					updateDept(data) {
 
+						Object.assign(this.modal,{
 
+							visible:true,
 
+							deptId:data.deptId.split(',').map(id=>parseInt(id)),
 
+							form:{
 
+								id:data.id,
 
+							}
 
+						})
 
+					},
 
+					sureFn(){
 
+						let data=this.modal.form;
 
+						let deptId=this.modal.deptId.join(',')
 
+						if(!deptId){
 
+							sa.error('请选择组织');
 
+							return;
 
+						}
 
+						data.deptId=deptId;
 
+						sa.ajax('/admin/updateDept', data, function(res) {
 
+							this.modal.visible=false;
 
+							this.f5();
 
+						}.bind(this));
 
+					},
 
+					getDeptList() {
 
+						sa.ajax('/TbDept/getList', {
 
+							pageNo: 1,
 
+							pageSize: 100
 
+						}, function(resp) {
 
+							let list = resp.data;
 
+							this.deptList = list;
 
+						}.bind(this))
 
+					},
 
 					// 刷新
 
-					f5: function(isPage){
 
-						sa.ajax('/admin/getList', this.p, function(res){
 
-							this.dataList = res.data;	// 数据
 
+					f5: function(isPage) {
 
+						sa.ajax('/admin/getList', this.p, function(res) {
 
+							this.dataList = res.data; // 数据
 
 							this.dataCount = res.dataCount;
 
-							sa.f5TableHeight();		// 刷新表格高度 
+							sa.f5TableHeight(); // 刷新表格高度 
 						}.bind(this));
 
 					},
 
 					// 新增
 
 					add: function() {
 
-						sa.showIframe('添加用户','admin-add.html','600px','80%');
 
+						sa.showIframe('添加用户', 'admin-add.html', '600px', '80%');
 
 					},
 
 					// 查看详情
 
 					getInfo: function(data) {
 
@@ -146,20 +211,26 @@
 
 					},
 
 					// 查看登录日志 
 					getAdminLogin: function(data) {
 
-						sa.showIframe('登录日志', '../sp-admin-login/sp-admin-login-list.html?accId=' + data.id, '90%', '90%');
 
+						sa.showIframe('登录日志', '../sp-admin-login/sp-admin-login-list.html?accId=' + data.id, '90%',
 
+							'90%');
 
 					},
 
 					// 查看 - 根据选中的
 
 					getBySelect: function(data) {
 
 						var selection = this.$refs['data-table'].selection;
 
-						if(selection.length == 0) {
 
+						if (selection.length == 0) {
 
 							return sa.msg('请选择一条数据')
 
 						}
 
 						this.getInfo(selection[0]);
 
 					},
 
 					updateNickName: function(data) {
 
-						layer.prompt({title: '修改姓名'}, function(pass, index){
 
+						layer.prompt({
 
+							title: '修改姓名'
 
+						}, function(pass, index) {
 
 							layer.close(index);
 
-							sa.ajax('/admin/updateNickName', {id: data.id, nickname: pass}, function(res){
 
+							sa.ajax('/admin/updateNickName', {
 
+								id: data.id,
 
+								nickname: pass
 
+							}, function(res) {
 
 								data.nickname = pass;
 
 								layer.msg('修改成功');
 
 							})
 
@@ -167,9 +238,14 @@
 
 					},
 
 					// 修改名称 
 					updateName: function(data) {
 
-						layer.prompt({title: '请输入新的手机号'}, function(pass, index){
 
+						layer.prompt({
 
+							title: '请输入新的手机号'
 
+						}, function(pass, index) {
 
 							layer.close(index);
 
-							sa.ajax('/admin/update', {id: data.id, name: pass}, function(res){
 
+							sa.ajax('/admin/update', {
 
+								id: data.id,
 
+								name: pass
 
+							}, function(res) {
 
 								data.name = pass;
 
 								layer.msg('修改成功');
 
 							})
 
@@ -178,36 +254,49 @@
 
 					// 修改头像 
 					updateAvatar: function(data) {
 
 						sa.uploadImage(function(src) {
 
-							var p = {id: data.id, avatar: src};
 
+							var p = {
 
+								id: data.id,
 
+								avatar: src
 
+							};
 
 							sa.ajax('/admin/updateAvatar', p, function(res) {
 
 								sa.msg('上传成功');
 
-								data.avatar = src;  
+								data.avatar = src;
 
 							}.bind(this));
 
 						})
 
 					},
 
 					// 修改密码
 
 					updatePassword: function(data) {
 
-						layer.prompt({title: '修改密码'}, function(pass, index){
 
+						layer.prompt({
 
+							title: '修改密码'
 
+						}, function(pass, index) {
 
 							layer.close(index);
 
-							if(pass.length < 4) {
 
+							if (pass.length < 4) {
 
 								return layer.msg('新密码长度请不要低于4位');
 
 							}
 
-							sa.ajax('/admin/updatePassword', {id: data.id, password: pass}, function(res){
 
+							sa.ajax('/admin/updatePassword', {
 
+								id: data.id,
 
+								password: pass
 
+							}, function(res) {
 
 								layer.msg('修改成功');
 
 							})
 
 						});
 
 					},
 
 					// 修改角色 
 					updateRoleId: function(data, roleId, roleName) {
 
-						if(data.id == sa.$sys.getCurrUser().id) {
 
-							return sa.alert('不能自己修改自己的角色');  
+						if (data.id == sa.$sys.getCurrUser().id) {
 
+							return sa.alert('不能自己修改自己的角色');
 
 						}
 
-						if(data.roleId == roleId) {
 
-							return sa.alert('该用户已经是' + roleName + '了');	
+						if (data.roleId == roleId) {
 
+							return sa.alert('该用户已经是' + roleName + '了');
 
 						}
 
 						var str = '将此账号修改为 [' + roleName + '], 请确认?';
 
-						layer.confirm(str, {title: '请确认'}, function() {
 
-							sa.ajax('/admin/updateRole', {id: data.id, roleId: roleId}, function(res) {
 
+						layer.confirm(str, {
 
+							title: '请确认'
 
+						}, function() {
 
+							sa.ajax('/admin/updateRole', {
 
+								id: data.id,
 
+								roleId: roleId
 
+							}, function(res) {
 
 								sa.msg('修改成功');
 
 								data.roleId = roleId;
 
 								data.roleName = roleName;
 
@@ -216,19 +305,22 @@
 
 					},
 
 					// 修改用户的状态
 
 					updateStatus: function(data) {
 
-						if(data.id == sa.$sys.getCurrUser().id) {
 
-							data.status = 3 - data.status;  
-							return sa.alert('不能自己封禁自己');  
+						if (data.id == sa.$sys.getCurrUser().id) {
 
+							data.status = 3 - data.status;
 
+							return sa.alert('不能自己封禁自己');
 
 						}
 
-						var is_ok = false;	// 记录是否成功 
-						var ajax = sa.ajax('/admin/updateStatus', {id: data.id, status: data.status}, function(res) {
 
+						var is_ok = false; // 记录是否成功 
+						var ajax = sa.ajax('/admin/updateStatus', {
 
+							id: data.id,
 
+							status: data.status
 
+						}, function(res) {
 
 							sa.msg('修改成功');
 
 							is_ok = true;
 
 						}.bind(this));
 
 						// 如果未能修改成功, 则回滚 
 						$.when(ajax).done(function() {
 
-							if(is_ok == false) {
 
-								data.status = 3 - data.status; 
+							if (is_ok == false) {
 
+								data.status = 3 - data.status;
 
 							}
 
 						})
 
 					},
 
@@ -246,12 +338,14 @@
 
 						}.bind(this));
 
 					},
 
 					// 删除 
-					del: function (data) {
 
-						sa.confirm('是否删除，此操作不可撤销', function(){
 
-							sa.ajax('/admin/delete', {id: data.id},function(res){
 
+					del: function(data) {
 
+						sa.confirm('是否删除，此操作不可撤销', function() {
 
+							sa.ajax('/admin/delete', {
 
+								id: data.id
 
+							}, function(res) {
 
 								sa.arrayDelete(app.dataList, data);
 
 								sa.ok('删除成功');
 
-								sa.f5TableHeight();		// 刷新表格高度 
+								sa.f5TableHeight(); // 刷新表格高度 
 							})
 
 						});
 
 					},
 
@@ -260,29 +354,33 @@
 
 						// 获取选中元素的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('/admin/deleteByIds', {ids: ids.join(',')}, function(res) {
 
+							sa.ajax('/admin/deleteByIds', {
 
+								ids: ids.join(',')
 
+							}, function(res) {
 
 								sa.arrayDelete(this.dataList, selection);
 
 								sa.ok('删除成功');
 
-								sa.f5TableHeight();		// 刷新表格高度 
+								sa.f5TableHeight(); // 刷新表格高度 
 							}.bind(this))
 
 						}.bind(this));
 
 					},
 
 				},
 
-				created: function(){
 
+				created: function() {
 
 					this.f5();
 
-					sa.onInputEnter();	// 监听回车执行查询 
+					this.getDeptList();
 
+					sa.onInputEnter(); // 监听回车执行查询 
 					// 加载角色 
-					sa.ajax('/role/getList', function(res){
 
-						this.roleList = res.data;	// 数据  
-					}.bind(this), {msg: null});
 
+					sa.ajax('/role/getList', function(res) {
 
+						this.roleList = res.data; // 数据  
+					}.bind(this), {
 
+						msg: null
 
+					});
 
 				}
 
 			})
 
-			
 		</script>
 
 	</body>
 
 </html>

+ 14 - 9
sa-view-sp/sp-cfg/server-cfg.html
Xem Tập Tin 

@@ -81,6 +81,7 @@
 
 				width: 30px;
 
 				height: 30px;
 
 			}
 
+
 
 			.item-num .el-input__inner {
 
 				width: 130px;
 
 			}
 
@@ -94,14 +95,18 @@
 
 					<!-- ---------------------------------- 系统参数 ---------------------------------- -->
 
 					<el-tab-pane label="参数设置" name="tab1">
 
 						<sa-item type="enum" name="备案审核" v-model="m.fillingJudge" :jv="{1: '人工审核', 2: '自动审核'}" jtype="1"
 
-							br></sa-item>
 
-							<div class="c-item">
 
-								<label class="c-label">
 
-									体温阈值(℃)：</label>
 
-								<el-input-number class="item-num" v-model="m.minTemperature" :min="1" size="mini">
 
-								</el-input-number>
 
-								<span style="margin-left: 10px;">大于此阈值会触发报警</span>
 
-							</div>
 
+							br>
 
+						</sa-item>
 
+						<div class="c-item">
 
+							<label class="c-label">
 
+								体温阈值(℃)：</label>
 
+							<el-input-number class="item-num" v-model="m.minTemperature" :min="1" size="mini">
 
+							</el-input-number>
 
+							<span style="margin-left: 10px;">大于此阈值会触发报警</span>
 
+						</div>
 
+						<sa-item type="enum" name="是否发送预警通知" v-model="m.sendAlarm" :jv="{1: '发送', 0: '不发送'}" jtype="1"
 
+							br>
 
+						</sa-item>
 
 					</el-tab-pane>
 
 
 				</el-tabs>
 
@@ -123,7 +128,7 @@
 
 				return {
 
 					fillingJudge: 1, // 预留信息 
 					minTemperature: 37.0,
 
-					userDefaultAvatar: '', // 新用户默认头像 
+					sendAlarm: 1, // 新用户默认头像 
 				}
 
 			}
 
 		</script>

+ 192 - 0
sa-view/tb-alarm-person/tb-alarm-person-add.html
Xem Tập Tin 

@@ -0,0 +1,192 @@
 
+<!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 .el-form .c-label {
 
+				width: 7.5em !important;
 
+			}
 
+
 
+			.c-panel .el-form .el-input,
 
+			.c-panel .el-form .el-textarea__inner {
 
+				width: 250px;
 
+			}
 
+
 
+			.c1-label {
 
+				width: 8em;
 
+				color: #333;
 
+				padding-right: 4px;
 
+				display: inline-block;
 
+				text-align: right;
 
+				vertical-align: top;
 
+			}
 
+		</style>
 
+	</head>
 
+	<body>
 
+		<div class="vue-box" :class="{sbot: id}" style="display: none;" :style="'display: block;'">
 
+			<!-- ------- 内容部分 ------- -->
 
+			<div class="s-body">
 
+				<div class="c-panel">
 
+					<div class="c-title" v-if="id == 0">数据添加</div>
 
+					<div class="c-title" v-else>数据修改</div>
 
+					<el-form v-if="m">
 
+						<el-row>
 
+							<el-col :span=12>
 
+								<sa-item type="text" name="姓名" v-model="m.name" br need></sa-item>
 
+								<sa-item type="text" name="联系号码" v-model="m.phone" br need></sa-item>
 
+								<div class="c-item">
 
+									<label class="c-label"><span style="color: red;">*</span>值班开始时间：</label>
 
+									<el-time-picker value-format="HH:mm:ss" v-model="m.workStartTime"></el-time-picker>
 
+								</div>
 
+								<div class="c-item">
 
+									<label class="c-label"><span style="color: red;">*</span>值班结束时间：</label>
 
+									<el-time-picker value-format="HH:mm:ss" v-model="m.workEndTime"></el-time-picker>
 
+								</div>
 
+
 
+							</el-col>
 
+							<el-col :span=12>
 
+								<div class="c-item">
 
+									<label class="c-label"><span style="color: red;">*</span>组织：</label>
 
+									<el-select v-model="m.deptId">
 
+										<el-option label="请选择" v-for="(item,index) in deptList" :key="item.id"
 
+											:label="item.name" :value="item.id"></el-option>
 
+									</el-select>
 
+								</div>
 
+								<div class="c-item">
 
+									<label class="c-label"><span style="color: red;">*</span>执勤场所：</label>
 
+									<el-select v-model="m.venuesId">
 
+										<el-option label="请选择" v-for="(item,index) in venuesList" :key="item.id"
 
+											:label="item.name" :value="item.id"></el-option>
 
+									</el-select>
 
+								</div>
 
+								<sa-item type="text" name="职能" v-model="m.position" br></sa-item>
 
+								<sa-item type="textarea" name="备注" v-model="m.remark" br></sa-item>
 
+							</el-col>
 
+						</el-row>
 
+						<sa-item name="" class="s-ok" br>
 
+							<el-button type="primary" icon="el-icon-plus" @click="ok()">保存</el-button>
 
+						</sa-item>
 
+					</el-form>
 
+				</div>
 
+			</div>
 
+			<!-- ------- 底部按钮 ------- -->
 
+			<div class="s-foot">
 
+				<el-button type="primary" @click="ok()">确定</el-button>
 
+				<el-button @click="sa.closeCurrIframe()">取消</el-button>
 
+			</div>
 
+		</div>
 
+		<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, // 实体对象
 
+					deptList: [],
 
+					venuesList: [],
 
+				},
 
+				methods: {
 
+					// 创建一个 默认Model 
+					createModel: function() {
 
+						return {
 
+							id: '', // 主键 
+							name: '', // 姓名 
+							phone: '', // 联系号码 
+							deptId: '', // 部门ID
 
+							deptName: '',
 
+							position: '', // 职能 
+							venuesId: '', // 场所ID 
+							venuesName: '', // 值班地点 
+							workStartTime: '', // 值班开始时间 
+							workEndTime: '', // 值班结束时间 
+							remark: '', // 备注
 
+						}
 
+					},
 
+					// 提交数据 
+					ok: function() {
 
+						// 表单校验 
+						let m = this.m;
 
+						sa.checkNull(m.name, '请输入 [姓名]');
 
+						sa.checkNull(m.phone, '请输入 [联系号码]');
 
+						sa.checkNull(m.workStartTime, '请输入 [值班开始时间]');
 
+						sa.checkNull(m.workEndTime, '请输入 [值班结束时间]');
 
+						sa.checkNull(m.deptId, '请选择 [组织]');
 
+						sa.checkNull(m.venuesId, '请选择 [执勤场所]');
 
+						let phone = m.phone;
 
+						if (!sa.isPhone(phone)) {
 
+							sa.error('请输入正确的联系号码');
 
+							return false;
 
+						}
 
+						m.alarm=1;
 
+						// 开始增加或修改
 
+						if (this.id <= 0) { // 添加
 
+							sa.ajax('/TbAlarmPerson/add', m, function(res) {
 
+								sa.alert('增加成功', this.clean);
 
+							}.bind(this));
 
+						} else { // 修改
 
+							sa.ajax('/TbAlarmPerson/update', m, function(res) {
 
+								sa.alert('修改成功', this.clean);
 
+							}.bind(this));
 
+						}
 
+					},
 
+					getDeptList() {
 
+						sa.ajax('/TbDept/getList', {
 
+							pageNo: 1,
 
+							pageSize: 100
 
+						}, function(resp) {
 
+							let list = resp.data;
 
+							this.deptList = list;
 
+						}.bind(this))
 
+					},
 
+					getVenuesList() {
 
+						sa.ajax('/TbVenues/getList', {
 
+							pId: -1
 
+						}, function(resp) {
 
+							this.venuesList = resp.data;
 
+
 
+						}.bind(this))
 
+					},
 
+					// 添加/修改 完成后的动作
 
+					clean: function() {
 
+						if (this.id == 0) {
 
+							this.m = this.createModel();
 
+						} else {
 
+							parent.app.f5(); // 刷新父页面列表
 
+							sa.closeCurrIframe(); // 关闭本页 
+						}
 
+					}
 
+				},
 
+				mounted: function() {
 
+					this.getDeptList();
 
+					this.getVenuesList();
 
+					// 初始化数据
 
+					if (this.id <= 0) {
 
+						this.m = this.createModel();
 
+					} else {
 
+						sa.ajax('/TbManager/getById?id=' + this.id, function(res) {
 
+							this.m = res.data;
 
+							if (res.data == null) {
 
+								sa.alert('未能查找到 id=' + this.id + " 详细数据");
 
+							}
 
+						}.bind(this))
 
+					}
 
+
 
+				}
 
+			})
 
+		</script>
 
+	</body>
 
+</html>

+ 126 - 0
sa-view/tb-alarm-person/tb-alarm-person-list.html
Xem Tập Tin 

@@ -0,0 +1,126 @@
 
+<!DOCTYPE html>
 
+<html>
 
+	<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" />
 
+		<!-- 所有的 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>
 
+	</head>
 
+	<body>
 
+		<div class="vue-box" style="display: none;" :style="'display: block;'">
 
+			<div class="c-panel">
 
+				<!-- ------------- 检索参数 ------------- -->
 
+				<div class="c-title">检索参数</div>
 
+				<el-form ref="form" :model='p' @submit.native.prevent>
 
+					<sa-item type="text" name="姓名" v-model="p.name"></sa-item>
 
+					<sa-item type="text" name="联系号码" v-model="p.phone"></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-alarm-person-add')">
 
+						新增</el-button>
 
+					<el-button type="info" icon="el-icon-refresh" @click="f5">重置</el-button>
 
+					<br />
 
+				</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="phone"></sa-td>
 
+					<sa-td name="组织" prop="deptName"></sa-td>
 
+					<sa-td name="职能" prop="position"></sa-td>
 
+					<sa-td name="执勤场所" prop="venuesName"></sa-td>
 
+					<sa-td name="值班开始时间" prop="workStartTime"></sa-td>
 
+					<sa-td name="值班结束时间" prop="workEndTime"></sa-td>
 
+					<sa-td name="备注" prop="remark"></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> -->
 
+							<el-button v-if="sa.isAuth('tb-manager-edit')" class="c-btn" type="primary"
 
+								icon="el-icon-edit" @click="update(s.row)">修改</el-button>
 
+							<el-button v-if="sa.isAuth('tb-manager-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()">
 
+				</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'),
 
+				},
 
+				el: '.vue-box',
 
+				data: {
 
+					p: { // 查询参数  
+						id: '', // 主键 
+						name: '', // 姓名 
+						phone: '', // 联系号码 
+						alarm:1,
 
+						pageNo: 1, // 当前页 
+						pageSize: 10, // 页大小 
+						sortType: 0 // 排序方式 
+					},
 
+					dataCount: 0,
 
+					dataList: [], // 数据集合
 
+					deptList: [],
 
+				},
 
+				methods: {
 
+					getDeptList() {
 
+						sa.ajax('/TbDept/getList', function(resp) {
 
+							this.deptList = resp.data;
 
+						}.bind(this))
 
+					},
 
+					// 刷新
 
+					f5: function() {
 
+						sa.ajax('/TbAlarmPerson/getList', sa.removeNull(this.p), function(res) {
 
+							this.dataList = res.data; // 数据
 
+							this.dataCount = res.dataCount; // 数据总数 
+							sa.f5TableHeight(); // 刷新表格高度 
+						}.bind(this));
 
+					},
 
+					// 查看
 
+					get: function(data) {
 
+						sa.showIframe('数据详情', 'tb-manager-info.html?id=' + data.id, '750px', '70%');
 
+					},
 
+					
+					// 修改
 
+					update: function(data) {
 
+						sa.showIframe('修改数据', 'tb-manager-add.html?id=' + data.id, '850px', '60%');
 
+					},
 
+					// 新增
 
+					add: function(data) {
 
+						sa.showIframe('新增数据', 'tb-alarm-person-add.html?id=-1', '850px', '60%');
 
+					},
 
+					// 删除
 
+					del: function(data) {
 
+						sa.confirm('是否删除，此操作不可撤销', function() {
 
+							sa.ajax('/TbAlarmPerson/delete?id=' + data.id, function(res) {
 
+								sa.arrayDelete(this.dataList, data);
 
+								sa.ok('删除成功');
 
+								sa.f5TableHeight(); // 刷新表格高度 
+							}.bind(this))
 
+						}.bind(this));
 
+					},
 
+				},
 
+				created: function() {
 
+					this.f5();
 
+					sa.onInputEnter();
 
+				}
 
+			})
 
+		</script>
 
+	</body>
 
+</html>

+ 78 - 0
sa-view/tb-alarm-person/tb-manager-info.html
Xem Tập Tin 

@@ -0,0 +1,78 @@
 
+<!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.phone}}</sa-info>
 
+								<sa-info name="职能" br>{{m.position}}</sa-info>
 
+								<sa-info name="值班地点" br>{{m.venuesName}}</sa-info>
 
+								<sa-info name="值班开始时间" br>{{m.workStartTime}}</sa-info>
 
+								<sa-info name="值班结束时间" br>{{m.workEndTime}}</sa-info>
 
+								<sa-info name="备注" br>{{m.remark}}</sa-info>
 
+							</el-col>
 
+							<el-col :span="12">
 
+								<sa-info name="创建时间" br>{{m.createTime}}</sa-info>
 
+								<sa-info name="创建人" br>{{m.createBy}}</sa-info>
 
+								<sa-info name="更新时间" br>{{m.updateTime}}</sa-info>
 
+								<sa-info name="更新人" br>{{m.updateBy}}</sa-info>
 
+							</el-col>
 
+						</el-row>
 
+
 
+
 
+					</el-form>
 
+				</div>
 
+			</div>
 
+			<!-- ------- 底部按钮 ------- -->
 
+			<div class="s-foot">
 
+				<el-button type="success" @click="sa.closeCurrIframe()">确定</el-button>
 
+				<el-button @click="sa.closeCurrIframe()">取消</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: {
 
+				},
 
+				mounted: function() {
 
+					sa.ajax('/TbManager/getById?id=' + this.id, function(res) {
 
+						this.m = res.data;
 
+						if(res.data == null) {
 
+							sa.alert('未能查找到 id=' + this.id + " 详细数据");
 
+						}
 
+					}.bind(this))
 
+				}
 
+			})
 
+			
+		</script>
 
+	</body>
 
+</html>

+ 1 - 0
sa-view/tb-car-visit-record/tb-car-visit-record-list.html
Xem Tập Tin 

@@ -46,6 +46,7 @@
 
 					<sa-td name="联系电话" prop="driverContact"></sa-td>
 
 					<sa-td name="时间" prop="visitTime"></sa-td>
 
 					<sa-td name="方向" prop="direction" type="enum" :jv="{1: '入场', 2: '离场'}"></sa-td>
 
+					<sa-td name="是否放行" prop="allowPass" type="enum" :jv="{1: '放行', 0: '禁止'}"></sa-td>
 
 					<sa-td name="图片" prop="image" type="img"></sa-td>
 
 					<sa-td name="方式" prop="recordType" type="enum" :jv="{1: '手动', 2: '自动'}"></sa-td>
 
 					<el-table-column label="操作" fixed="right" width="240px">

+ 33 - 27
sa-view/tb-manager/tb-manager-add.html
Xem Tập Tin 

@@ -46,10 +46,6 @@
 
 							<el-col :span=12>
 
 								<sa-item type="text" name="姓名" v-model="m.name" br need></sa-item>
 
 								<sa-item type="text" name="联系号码" v-model="m.phone" br need></sa-item>
 
-								<sa-item type="text" name="职能" v-model="m.position" br need></sa-item>
 
-							</el-col>
 
-							<el-col :span=12>
 
-								<sa-item type="text" name="值班地点" v-model="m.venuesName" br need></sa-item>
 
 								<div class="c-item">
 
 									<label class="c-label"><span style="color: red;">*</span>值班开始时间：</label>
 
 									<el-time-picker value-format="HH:mm:ss" v-model="m.workStartTime"></el-time-picker>
 
@@ -58,9 +54,27 @@
 
 									<label class="c-label"><span style="color: red;">*</span>值班结束时间：</label>
 
 									<el-time-picker value-format="HH:mm:ss" v-model="m.workEndTime"></el-time-picker>
 
 								</div>
 
+
 
+							</el-col>
 
+							<el-col :span=12>
 
+								<div class="c-item">
 
+									<label class="c-label"><span style="color: red;">*</span>组织：</label>
 
+									<el-select v-model="m.deptId">
 
+										<el-option label="请选择" v-for="(item,index) in deptList" :key="item.id"
 
+											:label="item.name" :value="item.id"></el-option>
 
+									</el-select>
 
+								</div>
 
+								<div class="c-item">
 
+									<label class="c-label"><span style="color: red;">*</span>执勤场所：</label>
 
+									<el-select v-model="m.venuesId">
 
+										<el-option label="请选择" v-for="(item,index) in venuesList" :key="item.id"
 
+											:label="item.name" :value="item.id"></el-option>
 
+									</el-select>
 
+								</div>
 
+								<sa-item type="text" name="职能" v-model="m.position" br></sa-item>
 
+								<sa-item type="textarea" name="备注" v-model="m.remark" br></sa-item>
 
 							</el-col>
 
 						</el-row>
 
-						<sa-item type="text" name="备注" v-model="m.remark" br></sa-item>
 
 						<sa-item name="" class="s-ok" br>
 
 							<el-button type="primary" icon="el-icon-plus" @click="ok()">保存</el-button>
 
 						</sa-item>
 
@@ -84,10 +98,8 @@
 
 					m: null, // 实体对象
 
 					deptList: [],
 
 					venuesList: [],
 
-
 
 				},
 
 				methods: {
 
-
 
 					// 创建一个 默认Model 
 					createModel: function() {
 
 						return {
 
@@ -108,18 +120,17 @@
 
 					ok: function() {
 
 						// 表单校验 
 						let m = this.m;
 
-						// sa.checkNull(m.id, '请输入 [主键]');
 
 						sa.checkNull(m.name, '请输入 [姓名]');
 
-						sa.checkNull(m.position, '请输入 [职能]');
 
-						sa.checkNull(m.venuesName, '请输入 [值班地点]');
 
+						sa.checkNull(m.phone, '请输入 [联系号码]');
 
 						sa.checkNull(m.workStartTime, '请输入 [值班开始时间]');
 
 						sa.checkNull(m.workEndTime, '请输入 [值班结束时间]');
 
+						sa.checkNull(m.deptId, '请选择 [组织]');
 
+						sa.checkNull(m.venuesId, '请选择 [执勤场所]');
 
 						let phone = m.phone;
 
 						if (!sa.isPhone(phone)) {
 
 							sa.error('请输入正确的联系号码');
 
 							return false;
 
 						}
 
-
 
 						// 开始增加或修改
 
 						if (this.id <= 0) { // 添加
 
 							sa.ajax('/TbManager/add', m, function(res) {
 
@@ -131,27 +142,20 @@
 
 							}.bind(this));
 
 						}
 
 					},
 
-					deptChange(val) {
 
-						let dept = this.deptList.filter(obj => obj.id === val).pop();
 
-						this.m.deptName = dept.name;
 
-					},
 
-					venuesChange(val) {
 
-						let venue = this.venuesList.filter(obj => obj.id === val).pop();
 
-						this.m.venuesName = venue.name;
 
-					},
 
 					getDeptList() {
 
-						console.log(1);
 
-						sa.ajax('/TbVenues/getList', {
 
-							pId: -1
 
+						sa.ajax('/TbDept/getList', {
 
+							pageNo: 1,
 
+							pageSize: 100
 
 						}, function(resp) {
 
-							this.venuesList = resp.data;
 
-
 
+							let list = resp.data;
 
+							this.deptList = list;
 
 						}.bind(this))
 
 					},
 
 					getVenuesList() {
 
-						console.log(2);
 
-						sa.ajax('/TbDept/getList', function(resp) {
 
-							this.deptList = resp.data;
 
+						sa.ajax('/TbVenues/getList', {
 
+							pId: -1
 
+						}, function(resp) {
 
+							this.venuesList = resp.data;
 
 
 						}.bind(this))
 
 					},
 
@@ -166,6 +170,8 @@
 
 					}
 
 				},
 
 				mounted: function() {
 
+					this.getDeptList();
 
+					this.getVenuesList();
 
 					// 初始化数据
 
 					if (this.id <= 0) {
 
 						this.m = this.createModel();

+ 49 - 42
sa-view/tb-manager/tb-manager-list.html
Xem Tập Tin 

@@ -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">
 
@@ -26,57 +27,62 @@
 
 					<br />
 
 				</el-form>
 
 				<!-- ------------- 快捷按钮 ------------- -->
 
-				<el-button type="primary" icon="el-icon-plus" @click="add" v-if="sa.isAuth('tb-person-filing-add')">
 
+				<el-button type="primary" icon="el-icon-plus" @click="add" v-if="sa.isAuth('tb-manager-add')">
 
 					新增</el-button>
 
 				<el-button type="info" icon="el-icon-refresh" @click="f5">重置</el-button>
 
 				<!-- ------------- 数据列表 ------------- -->
 
-				<el-table class="data-table" ref="data-table" :data="dataList" >
 
+				<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="phone" ></sa-td>
 
-					<sa-td name="职能" prop="position" ></sa-td>
 
-					<sa-td name="值班地点" prop="venuesName" ></sa-td>
 
-					<sa-td name="值班开始时间" prop="workStartTime" ></sa-td>
 
-					<sa-td name="值班结束时间" prop="workEndTime" ></sa-td>
 
-					<sa-td name="备注" prop="remark" ></sa-td>
 
-					<el-table-column label="操作" fixed="right"  width="240px">
 
+					<sa-td name="姓名" prop="name"></sa-td>
 
+					<sa-td name="联系号码" prop="phone"></sa-td>
 
+					<sa-td name="组织" prop="deptName"></sa-td>
 
+					<sa-td name="职能" prop="position"></sa-td>
 
+					<sa-td name="执勤场所" prop="venuesName"></sa-td>
 
+					<sa-td name="值班开始时间" prop="workStartTime"></sa-td>
 
+					<sa-td name="值班结束时间" prop="workEndTime"></sa-td>
 
+					<sa-td name="备注" prop="remark"></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>
 
-							<el-button class="c-btn" type="primary" icon="el-icon-edit" @click="update(s.row)">修改</el-button>
 
-							<el-button class="c-btn" type="danger" icon="el-icon-delete" @click="del(s.row)">删除</el-button>
 
+							<!-- <el-button class="c-btn" type="success" icon="el-icon-view" @click="get(s.row)">查看
 
+							</el-button> -->
 
+							<el-button v-if="sa.isAuth('tb-manager-edit')" class="c-btn" type="primary"
 
+								icon="el-icon-edit" @click="update(s.row)">修改</el-button>
 
+							<el-button v-if="sa.isAuth('tb-manager-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()"></sa-item>
 
+				<sa-item type="page" :curr.sync="p.pageNo" :size.sync="p.pageSize" :total="dataCount" @change="f5()">
 
+				</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: '',		// 主键 
-						name: '',		// 姓名 
-						phone: '',		// 联系号码 
-						deptId: '',		// 部门ID 
-						position: '',		// 职能 
-						venuesId: '',		// 场所ID 
-						venuesName: '',		// 值班地点 
-						workStartTime: '',		// 值班开始时间 
-						workEndTime: '',		// 值班结束时间 
-						remark: '',		// 备注 
-						createTime: '',		// 创建时间 
-						createBy: '',		// 创建人 
-						updateTime: '',		// 更新时间 
-						updateBy: '',		// 更新人 
-						pageNo: 1,		// 当前页 
-						pageSize: 10,	// 页大小 
-						sortType: 0		// 排序方式 
+						id: '', // 主键 
+						name: '', // 姓名 
+						phone: '', // 联系号码 
+						deptId: '', // 部门ID 
+						position: '', // 职能 
+						venuesId: '', // 场所ID 
+						venuesName: '', // 值班地点 
+						workStartTime: '', // 值班开始时间 
+						workEndTime: '', // 值班结束时间 
+						remark: '', // 备注 
+						createTime: '', // 创建时间 
+						createBy: '', // 创建人 
+						updateTime: '', // 更新时间 
+						updateBy: '', // 更新人 
+						pageNo: 1, // 当前页 
+						pageSize: 10, // 页大小 
+						sortType: 0 // 排序方式 
 					},
 
 					dataCount: 0,
 
 					dataList: [], // 数据集合
 
@@ -93,7 +99,7 @@
 
 						sa.ajax('/TbManager/getList', sa.removeNull(this.p), function(res) {
 
 							this.dataList = res.data; // 数据
 
 							this.dataCount = res.dataCount; // 数据总数 
-							sa.f5TableHeight();		// 刷新表格高度 
+							sa.f5TableHeight(); // 刷新表格高度 
 						}.bind(this));
 
 					},
 
 					// 查看
 
@@ -103,14 +109,14 @@
 
 					// 查看 - 根据选中的
 
 					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]);
 
 					},
 
 					// 修改
 
 					update: function(data) {
 
-						sa.showIframe('修改数据', 'tb-manager-add.html?id=' + data.id, '550px', '90%');
 
+						sa.showIframe('修改数据', 'tb-manager-add.html?id=' + data.id, '850px', '60%');
 
 					},
 
 					// 新增
 
 					add: function(data) {
 
@@ -122,7 +128,7 @@
 
 							sa.ajax('/TbManager/delete?id=' + data.id, function(res) {
 
 								sa.arrayDelete(this.dataList, data);
 
 								sa.ok('删除成功');
 
-								sa.f5TableHeight();		// 刷新表格高度 
+								sa.f5TableHeight(); // 刷新表格高度 
 							}.bind(this))
 
 						}.bind(this));
 
 					},
 
@@ -131,22 +137,23 @@
 
 						// 获取选中元素的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('/TbManager/deleteByIds', {ids: ids.join(',')}, function(res) {
 
+							sa.ajax('/TbManager/deleteByIds', {
 
+								ids: ids.join(',')
 
+							}, function(res) {
 
 								sa.arrayDelete(this.dataList, selection);
 
 								sa.ok('删除成功');
 
-								sa.f5TableHeight();		// 刷新表格高度 
+								sa.f5TableHeight(); // 刷新表格高度 
 							}.bind(this))
 
 						}.bind(this));
 
 					},
 
 				},
 
 				created: function() {
 
 					this.f5();
 
-					this.getDeptList()
 
 					sa.onInputEnter();
 
 				}
 
 			})

+ 0 - 4
sa-view/tb-person-filing/tb-person-filing-add.html
Xem Tập Tin 

@@ -85,10 +85,6 @@
 
 							pageSize: 100
 
 						}, function(resp) {
 
 							let list = resp.data;
 
-							// let deptId = this.currentUser.deptId;
 
-							// if (deptId != '9999999') {
 
-							// 	this.m.deptId = deptId;
 
-							// }
 
 							this.deptList = list;
 
 						}.bind(this))
 
 					},

+ 75 - 0
sa-view/tb-person-visit-record/health-code-record-info.html
Xem Tập Tin 

@@ -0,0 +1,75 @@
 
+<!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 type="enum" name="出入" :value="m.direction" :jv="{1: '入场', 2: '离场'}" br></sa-info>
 
+                        <sa-info name="部门名称" br>{{m.deptName}}</sa-info>
 
+                        <sa-info name="姓名" br>{{m.name}}</sa-info>
 
+                        <sa-info type="img" name="图片" :value="m.picture" br></sa-info>
 
+                        <sa-info name="身份证" br>{{m.idCard}}</sa-info>
 
+                        <sa-info name="通过通道" br>{{m.channel}}</sa-info>
 
+                    </el-col>
 
+                    <el-col :span="12">
 
+                        <sa-info name="体温" br>{{m.temperature}}</sa-info>
 
+                        <sa-info name="健康码" br>{{m.healthStatus}}</sa-info>
 
+                        <sa-info name="检测时间" br>{{m.visitDate}}</sa-info>
 
+                        <sa-info name="上传时间" br>{{m.createTime}}</sa-info>
 
+                    </el-col>
 
+                </el-row>
 
+            </el-form>
 
+        </div>
 
+    </div>
 
+    <!-- ------- 底部按钮 ------- -->
 
+    <div class="s-foot">
 
+        <el-button type="success" @click="sa.closeCurrIframe()">确定</el-button>
 
+        <el-button @click="sa.closeCurrIframe()">取消</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: {
 
+        },
 
+        mounted: function() {
 
+            sa.ajax('/TbPersonVisitRecord/getById?id=' + this.id, function(res) {
 
+                this.m = res.data;
 
+                if(res.data == null) {
 
+                    sa.alert('未能查找到 id=' + this.id + " 详细数据");
 
+                }
 
+            }.bind(this))
 
+        }
 
+    })
 
+
 
+</script>
 
+</body>
 
+</html>

+ 218 - 0
sa-view/tb-person-visit-record/health-code-record-list.html
Xem Tập Tin 

@@ -0,0 +1,218 @@
 
+<!DOCTYPE html>
 
+<html>
 
+<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"/>
 
+    <!-- 所有的 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>
 
+</head>
 
+<body>
 
+<div class="vue-box" style="display: none;" :style="'display: block;'">
 
+    <div class="c-panel">
 
+        <!-- ------------- 检索参数 ------------- -->
 
+        <div class="c-title">检索参数</div>
 
+        <el-form ref="form" :model='p' @submit.native.prevent>
 
+            <el-row>
 
+                <el-col :span="20">
 
+                    <div>
 
+                        <div class="c-item">
 
+                            <label class="c-label">数据类型：</label>
 
+                            <el-select v-model="p.dataType" placeholder="请选择">
 
+                                <el-option label="-全部-" value=""> </el-option>
 
+                                <el-option label="健康码正常" value="0"> </el-option>
 
+                                <el-option label="健康码异常" value="1"> </el-option>
 
+                            </el-select>
 
+                        </div>
 
+                        <sa-item type="text" name="姓名" v-model="p.name"></sa-item>
 
+                        <sa-item type="enum" name="出入场" v-model="p.direction" :jv="{1: '入场', 2: '离场'}" jtype="4"
 
+                                 def="不限">
 
+                        </sa-item>
 
+
 
+
 
+                    </div>
 
+                    <div>
 
+                        <div class="c-item">
 
+                            <label class="c-label">健康码：</label>
 
+                            <el-select v-model="p.healthStatus" placeholder="请选择">
 
+                                <el-option label="-全部-" value=""> </el-option>
 
+                                <el-option label="绿码" value="绿码"> </el-option>
 
+                                <el-option label="黄码" value="黄码"> </el-option>
 
+                                <el-option label="红码" value="红码"> </el-option>
 
+                            </el-select>
 
+                        </div>
 
+                        <sa-item type="datetime" name="开始时间" v-model="p.startTime"></sa-item>
 
+                        <sa-item type="datetime" name="结束时间" v-model="p.endTime"></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.direction='';p.name='';p.healthStatus='';p.startTime='';p.endTime='';f5()">
 
+                            重置
 
+                        </el-button>
 
+                    </div>
 
+                </el-col>
 
+                <el-col :span="4">
 
+                </el-col>
 
+            </el-row>
 
+
 
+        </el-form>
 
+        <!-- ------------- 快捷按钮 ------------- -->
 
+        <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" width="120"></sa-td>-->
 
+            <sa-td name="姓名" prop="name"></sa-td>
 
+            <sa-td name="联系号码" prop="phone"></sa-td>
 
+            <!--      <sa-td name="图片" prop="picture" type="img"></sa-td>-->
 
+            <!--      <sa-td name="体温" prop="temperature"></sa-td>-->
 
+            <sa-td name="健康码" prop="healthStatus"></sa-td>
 
+            <sa-td name="场所/通道" prop="channel"></sa-td>
 
+            <sa-td name="出/入" prop="direction" type="enum" :jv="{1: '入场', 2: '离场'}"></sa-td>
 
+            <!--      <sa-td name="检测设备" prop="terminalName"></sa-td>-->
 
+            <sa-td name="检测时间" prop="visitDate" width="160"></sa-td>
 
+<!--            <sa-td name="分类" prop="type" type="enum" :jv="{1: '补录', 2: '设备上传'}"></sa-td>-->
 
+            <sa-td name="通知状态" prop="isNotify" type="enum" :jv="{1: '未通知', 2: '已通知', 0: '-'}"></sa-td>
 
+            <sa-td name="处置状态" prop="isSolve" type="enum" :jv="{1: '未处置', 2: '已处置', 0: '-'}"></sa-td>
 
+            <sa-td name="处置方法" prop="way"></sa-td>
 
+            <el-table-column label="操作"  width="240px">
 
+                <template slot-scope="s">
 
+                    <el-button v-if="!s.row.isSolve" class="c-btn" type="primary"
 
+                                @click="solveFn1(s.row.id)">处置
 
+                    </el-button>
 
+                    <el-button class="c-btn" type="success" icon="el-icon-view" @click="get(s.row)">查看
 
+                    </el-button>
 
+                    <el-button v-if="sa.isAuth('health-code-record-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()">
 
+        </sa-item>
 
+    </div>
 
+    <el-dialog title="请填写处置方法" :visible.sync="solveDate.visible" width="38%">
 
+        <sa-item type="textarea" name="处置方法" v-model="solveDate.form.way"></sa-item>
 
+        <span slot="footer" class="dialog-footer">
 
+					<el-button @click="solveDate.visible = false">取 消</el-button>
 
+					<el-button type="primary" @click="solve">保 存</el-button>
 
+				</span>
 
+    </el-dialog>
 
+</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'),
 
+        },
 
+        el: '.vue-box',
 
+        data: {
 
+
 
+              healthStatusList: [{
 
+                  name: '全部',
 
+                  value: ''
 
+                },
 
+                {
 
+                    name: '绿码',
 
+                    value: '绿码'
 
+                },
 
+                {
 
+                    name: '红码',
 
+                    value: '红码'
 
+                },
 
+                {
 
+                    name: '黄码',
 
+                    value: '黄码'
 
+                },
 
+            ],
 
+            p: { // 查询参数
 
+                id: '', // 主键
 
+                direction: '', // 出入(1=入场,2=离场)
 
+                deptName: '', // 部门名称
 
+                startTime: '',
 
+                endTime: '',
 
+                name: '', // 姓名
 
+                idCard: '', // 身份证
 
+                channel: '', // 通过通道
 
+                venues: '', // 场所
 
+                temperature: '', // 体温
 
+                healthStatus: '', // 健康码
 
+                unhealthy: '',
 
+                dataType: "",
 
+                pageNo: 1, // 当前页
 
+                pageSize: 10, // 页大小
 
+                sortType: 0 // 排序方式
 
+            },
 
+            dataCount: 0,
 
+            dataList: [], // 数据集合
 
+            solveDate: {
 
+                visible: false,
 
+                form: {
 
+                    id:'',
 
+                    way: '',
 
+                },
 
+            },
 
+        },
 
+        methods: {
 
+            solveFn1(id){
 
+                this.solveDate.visible = true;
 
+                this.solveDate.form.id = id;
 
+            },
 
+            solve(){
 
+                sa.ajax('/health-status/solve?' , this.solveDate.form, function(res) {
 
+                    sa.alert('操作成功');
 
+                    this.solveDate.visible = false;
 
+                    this.f5();
 
+                }.bind(this))
 
+            },
 
+
 
+            // 刷新
 
+            f5: function () {
 
+                sa.ajax('/health-status/getList', sa.removeNull(this.p), function (res) {
 
+                    this.dataList = res.data; // 数据
 
+                    this.dataCount = res.dataCount; // 数据总数
 
+                    sa.f5TableHeight(); // 刷新表格高度
 
+                }.bind(this));
 
+            },
 
+           
+            // 查看
 
+            get: function (data) {
 
+                sa.showIframe('数据详情', 'health-code-record-info.html?id=' + data.id, '700px', '70%');
 
+            },
 
+            // 查看 - 根据选中的
 
+            getBySelect: function (data) {
 
+                var selection = this.$refs['data-table'].selection;
 
+                if (selection.length == 0) {
 
+                    return sa.msg('请选择一条数据')
 
+                }
 
+                this.get(selection[0]);
 
+            },
 
+           
+            // 删除
 
+            del: function (data) {
 
+                sa.confirm('是否删除，此操作不可撤销', function () {
 
+                    sa.ajax('/TbPersonVisitRecord/deleteHealthRecord?id=' + data.id, function (res) {
 
+                        sa.arrayDelete(this.dataList, data);
 
+                        sa.ok('删除成功');
 
+                        sa.f5TableHeight(); // 刷新表格高度
 
+                    }.bind(this))
 
+                }.bind(this));
 
+            },
 
+
 
+        },
 
+        created: function () {
 
+            this.f5();
 
+            sa.onInputEnter();
 
+        }
 
+    })
 
+</script>
 
+</body>
 
+</html>

+ 11 - 1
sa-view/tb-person-visit-record/tb-person-visit-record-list.html
Xem Tập Tin 

@@ -31,6 +31,9 @@
 
 								<sa-item type="enum" name="健康码" v-model="p.healthStatus"
 
 									:jv="{'绿码': '绿码', '黄码': '黄码', '红码': '红码'}" jtype="4" def="全部">
 
 								</sa-item>
 
+								<sa-item type="enum" name="是否放行" v-model="p.allowPass"
 
+									:jv="{1: '放行', 0: '禁止'}" jtype="4" def="全部">
 
+								</sa-item>
 
 							</div>
 
 							<div>
 
 								<sa-item type="datetime" name="开始时间" v-model="p.startTime"></sa-item>
 
@@ -38,7 +41,7 @@
 
 								<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.direction='';p.name='';p.healthStatus='';p.startTime='';p.endTime='';f5()">
 
+									@click="p.direction='';p.name='';p.allowPass='';p.healthStatus='';p.startTime='';p.endTime='';f5()">
 
 									重置</el-button>
 
 								<el-button type="primary" v-if="sa.isAuth('tb-person-visit-record-export')"
 
 									icon="el-icon-s-unfold" @click="exportFn">导出</el-button>
 
@@ -67,6 +70,12 @@
 
 					<sa-td name="健康码" prop="healthStatus"></sa-td>
 
 					<sa-td name="检测设备" prop="terminalName"></sa-td>
 
 					<sa-td name="检测时间" prop="visitDate" width="160"></sa-td>
 
+					<sa-td name="是否放行" prop="allowPass">
 
+						<template slot-scope="s">
 
+							<label v-if="s.row.allowPass">放行</label>
 
+							<label v-else>禁止通行</label>
 
+						</template>
 
+					</sa-td>
 
 					<sa-td name="分类" prop="type" type="enum" :jv="{1: '补录', 2: '设备上传'}"></sa-td>
 
 					<el-table-column label="操作" fixed="right" width="240px">
 
 						<template slot-scope="s">
 
@@ -112,6 +121,7 @@
 
 						id: '', // 主键 
 						direction: '', // 出入(1=入场,2=离场) 
 						deptName: '', // 部门名称 
+						allowPass:'',
 
 						startTime: '',
 
 						endTime: '',
 
 						name: '', // 姓名

+ 2 - 2
sa-view/tb-person-visit-record/tb-person-visit-temperature-list.html
Xem Tập Tin 

@@ -42,10 +42,10 @@
 
 				<!-- ------------- 快捷按钮 ------------- -->
 
 				<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="name"></sa-td>
 
 					<sa-td name="联系号码" prop="phone"></sa-td>
 
-					<sa-td name="场所" prop="venues"></sa-td>
 
+					<sa-td name="场所" prop="channel"></sa-td>
 
 					<sa-td name="图片" prop="picture" type="img"></sa-td>
 
 					<sa-td name="体温" prop="temperature"></sa-td>
 
 					<sa-td name="时间" prop="visitDate" width="160"></sa-td>

+ 1 - 1
sa-view/tb-terminal/tb-terminal-list.html
Xem Tập Tin 

@@ -40,7 +40,7 @@
 
 					<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="人员数" prop="personNum"></sa-td>
 
 					<sa-td name="通道名称" prop="channelName"></sa-td>
 
 					<sa-td name="创建时间" prop="createTime" width="160"></sa-td>
 
 					<el-table-column label="操作" fixed="right" width="360px">