监控管理

sa-frame/menu-list-sp.js

@@ -163,19 +163,14 @@ window.menuList.unshift({
 		]
 	}, {
 		id: 'sp-cfg',
-		name: '系统配置',
+		name: '防疫参数设置',
 		parent: true,
 		icon: 'el-icon-setting',
-		info: '有关系统的一些配置',
+		info: '有防疫的一些配置',
 		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'
 			},
 		]
@@ -193,8 +188,7 @@ 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,
@@ -222,8 +216,7 @@ 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,
@@ -371,10 +364,6 @@ window.menuList.unshift({
 					isShow: false
 				}
 			]
-		}, {
-			id: 'tb-car-visit-record-handler',
-			name: '手动放行',
-			url: 'sa-view/tb-car-visit-record/tb-car-visit-record-handler.html',
 		}]
 	},
 
@@ -525,65 +514,45 @@ window.menuList.unshift({
 
 		]
 
-	},
-	{
+	}, {
 		id: 'ep-monitor-system',
 		name: '防疫监控子系统',
 		icon: 'el-icon-folder-opened',
 		parent: true,
-		childList: [
-			{
-				id: 'tb-manager-list',
-				name: '防疫人员',
-				url: 'sa-view/tb-manager/tb-manager-list.html',
-				childList: [
-					{
-						id: 'tb-manager-add',
-						name: '新增',
-						isShow: false,
+		childList: [{
+			id: 'tb-manager-list',
+			name: '防疫人员',
+			url: 'sa-view/tb-manager/tb-manager-list.html',
+			childList: [{
+					id: 'tb-manager-add',
+					name: '新增',
+					isShow: false,
 
-					},
-					{
-						id: 'tb-manager-edit',
-						name: '修改',
-						isShow: false,
+				},
+				{
+					id: 'tb-manager-edit',
+					name: '修改',
+					isShow: false,
 
-					},
-					{
-						id: 'tb-manager-del',
-						name: '删除',
-						isShow: false,
+				},
+				{
+					id: 'tb-manager-del',
+					name: '删除',
+					isShow: false,
 
-					},
-				]
-			},
-			{
-				id: 'health-code-record-list',
-				name: '健康码管理',
-				url: 'sa-view/tb-person-visit-record/health-code-record-list.html',
-				childList: [
-					{
-						id: 'health-code-record-edit',
-						name: '修改',
-						isShow: false,
-					},
-					{
-						id: 'health-code-record-del',
-						name: '删除',
-						isShow: false
-					},
-					{
-						id: 'health-code-record-add',
-						name: '新增',
-						isShow: false
-					},
-					{
-						id: 'health-code-record-solve',
-						name: '处置',
-						isShow: false,
-					},
-				]
-			},
-		]
+				},
+			]
+		}, ]
+	}, {
+		id: 'health-monitor-system',
+		name: '监控管理系统',
+		icon: 'el-icon-folder-opened',
+		parent: true,
+		childList:[
+		{
+			id: 'tb-monitor',
+			name: '实时监控系统',
+			url: 'sa-view/monitor/tb-monitor.html'
+		}]
 	},
 );

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

@@ -14,56 +14,100 @@
 		<script src="../../static/sa.js"></script>
 		<script src="../../static/kj/upload-util.js"></script>
 		<style type="text/css">
-			html,body,.vue-box{height: 100%; overflow: hidden;}
+			html,
+			body,
+			.vue-box {
+				height: 100%;
+				overflow: hidden;
+			}
+
 			/* .vue-box{padding: 0px;} */
-			.c-panel{height: calc(100% - 4em); position: relative;}
-			.c-panel .c-label{width: 10em;}
-			.c-panel .el-input{width: 500px;}
-			.c-panel .el-textarea{width: 500px;}
-			.logo-img{
-				width: 35px; 
-				height: 35px; 
-				border-radius: 2px; 
-				vertical-align: middle; 
+			.c-panel {
+				height: calc(100% - 4em);
+				position: relative;
+			}
+
+			.c-panel .c-label {
+				width: 10em;
+			}
+
+			.c-panel .el-input {
+				width: 500px;
+			}
+
+			.c-panel .el-textarea {
+				width: 500px;
+			}
+
+			.logo-img {
+				width: 35px;
+				height: 35px;
+				border-radius: 2px;
+				vertical-align: middle;
 				margin-right: 0.5em;
 				cursor: pointer;
 			}
-			.s-tab{height: 100%; }
-			.el-tabs__content{height: calc(100% - 130px); overflow: auto;}
-			
+
+			.s-tab {
+				height: 100%;
+			}
+
+			.el-tabs__content {
+				height: calc(100% - 130px);
+				overflow: auto;
+			}
+
 			/* 让头像样式小一点 */
-			.c-item-mline{width: 600px;}
-			.c-item-mline .image-box-2{width: 60px; height: 100px;}
-			.c-item-mline .image-box-2 img{width: 60px; height: 60px;}
-			.c-item-mline .image-box-2.up_img{height: 60px;}
-			.c-item-mline .image-box-2.up_img img{margin: 15px; width: 30px; height: 30px;}
+			.c-item-mline {
+				width: 600px;
+			}
+
+			.c-item-mline .image-box-2 {
+				width: 60px;
+				height: 100px;
+			}
+
+			.c-item-mline .image-box-2 img {
+				width: 60px;
+				height: 60px;
+			}
+
+			.c-item-mline .image-box-2.up_img {
+				height: 60px;
+			}
+
+			.c-item-mline .image-box-2.up_img img {
+				margin: 15px;
+				width: 30px;
+				height: 30px;
+			}
+			.item-num .el-input__inner {
+				width: 130px;
+			}
 		</style>
 	</head>
 	<body>
 		<div class="vue-box" style="display: none;" :style="'display: block;'">
 			<div class="c-panel" v-if="m != null">
-				<!-- 提示 -->
-				<!-- <el-alert style="margin: 10px 0;"
-					type="blue" show-icon 
-					title="Server-Config 非对外开放，用来配置一些敏感信息。"
-					>
-				</el-alert> -->
-				<!-- tab卡片 -->
+
 				<el-tabs class="s-tab" v-model="activeTab">
 					<!-- ---------------------------------- 系统参数 ---------------------------------- -->
-					<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 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>
 					</el-tab-pane>
+
 				</el-tabs>
-				
-				<!-- ---------------------------------- 其它配置 ---------------------------------- -->
-			<!-- 	<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;">
+
+				<div
+					style="position: absolute; bottom: 0px; width: calc(100% - 3em); line-height: 80px; background-color: #FFF;">
 					<hr style="height: 2px;">
 					<div class="c-item">
 						<label class="c-label"></label>
@@ -78,8 +122,8 @@
 			function create_m() {
 				return {
 					fillingJudge: 1, // 预留信息 
-					
-					userDefaultAvatar: '',	// 新用户默认头像 
+					minTemperature: 37.0,
+					userDefaultAvatar: '', // 新用户默认头像 
 				}
 			}
 		</script>
@@ -131,9 +175,6 @@
 					this.f5();
 				}
 			})
-
-
-
 		</script>
 	</body>
 </html>

sa-view/monitor/tb-monitor.html

@@ -0,0 +1,205 @@
+<!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>
+		<style>
+			/* 第一行 */
+			.sa-wnk {
+				background-color: #FFF;
+				border: 1px #ddd solid;
+				margin-bottom: 14px;
+				min-height: 100px;
+				cursor: pointer;
+				transition: all 0.3s;
+				overflow: hidden;
+			}
+
+			.sa-wnk:hover {
+				box-shadow: 0 0 20px #999;
+			}
+
+			.sa-wnk img {
+				float: left;
+				line-height: 100px;
+				margin: 25px 0px 0 20px;
+				width: 50px;
+				height: 50px;
+				vertical-align: middle;
+			}
+
+			.sa-wnk .sa-wnk-tv {
+				float: left;
+				margin-left: 10px;
+				max-width: calc(100% - 100px);
+			}
+
+			.sa-wnk-title {
+				margin-top: 25px;
+				font-size: 16px;
+			}
+
+			.sa-wnk-value {
+				margin-top: 4px;
+				font-size: 24px;
+				padding-bottom: 20px;
+			}
+		</style>
+	</head>
+	<body>
+		<div class="vue-box" style="display: none;" :style="'display: block;'">
+			<el-card>
+				<div slot="header">
+					<h2>进出记录监控</h2>
+				</div>
+				<el-row :gutter="14">
+					<el-col :lg="5" :sm="8" :xs="24">
+						<div class="sa-wnk">
+							<img src="../../static/icon/icon-user.png">
+							<div class="sa-wnk-tv">
+								<p class="sa-wnk-title">今日进出人数</p>
+								<p class="sa-wnk-value">{{sta.todayCount}}</p>
+							</div>
+						</div>
+					</el-col>
+					<el-col :lg="5" :sm="8" :xs="24">
+						<div class="sa-wnk">
+							<img src="../../static/icon/icon-user.png">
+							<div class="sa-wnk-tv">
+								<p class="sa-wnk-title">最近一周进出人数</p>
+								<p class="sa-wnk-value">{{sta.weekCount}}</p>
+							</div>
+						</div>
+					</el-col>
+					<el-col :lg="5" :sm="8" :xs="24">
+						<div class="sa-wnk">
+							<img src="../../static/icon/icon-user.png">
+							<div class="sa-wnk-tv">
+								<p class="sa-wnk-title">最近一个月进出人数</p>
+								<p class="sa-wnk-value">{{sta.monthCount}}</p>
+							</div>
+						</div>
+					</el-col>
+					<el-col :lg="5" :sm="8" :xs="24">
+						<div class="sa-wnk">
+							<img src="../../static/icon/icon-user.png">
+							<div class="sa-wnk-tv">
+								<p class="sa-wnk-title">最近一年进出人数</p>
+								<p class="sa-wnk-value">{{sta.yearCount}}</p>
+							</div>
+						</div>
+					</el-col>
+					<el-col :lg="4" :sm="8" :xs="24">
+						<div class="sa-wnk">
+							<img src="../../static/icon/icon-user.png">
+							<div class="sa-wnk-tv">
+								<p class="sa-wnk-title">平均每天进出人数</p>
+								<p class="sa-wnk-value">{{sta.avg}}</p>
+							</div>
+						</div>
+					</el-col>
+				</el-row>
+			</el-card>
+			<el-card>
+				<div slot="header">
+					<h2>健康码监控</h2>
+				</div>
+				<el-row :gutter="14">
+					<el-col :lg="5" :sm="8" :xs="24">
+						<div class="sa-wnk">
+							<img src="../../static/icon/icon-error.png">
+							<div class="sa-wnk-tv">
+								<p class="sa-wnk-title">今日健康码异常数</p>
+								<p class="sa-wnk-value">{{sta.todayHealthErrorCount}}</p>
+							</div>
+						</div>
+					</el-col>
+					<el-col :lg="5" :sm="8" :xs="24">
+						<div class="sa-wnk">
+							<img src="../../static/icon/icon-error.png">
+							<div class="sa-wnk-tv">
+								<p class="sa-wnk-title">最近一周健康码异常数</p>
+								<p class="sa-wnk-value">{{sta.weekHealthErrorCount}}</p>
+							</div>
+						</div>
+					</el-col>
+					<el-col :lg="5" :sm="8" :xs="24">
+						<div class="sa-wnk">
+							<img src="../../static/icon/icon-error.png">
+							<div class="sa-wnk-tv">
+								<p class="sa-wnk-title">最近一个月健康码异常数</p>
+								<p class="sa-wnk-value">{{sta.monthHealthErrorCount}}</p>
+							</div>
+						</div>
+					</el-col>
+					<el-col :lg="5" :sm="8" :xs="24">
+						<div class="sa-wnk">
+							<img src="../../static/icon/icon-error.png">
+							<div class="sa-wnk-tv">
+								<p class="sa-wnk-title">最近一年健康码异常数</p>
+								<p class="sa-wnk-value">{{sta.yearHealthErrorCount}}</p>
+							</div>
+						</div>
+					</el-col>
+					<el-col :lg="4" :sm="8" :xs="24">
+						<div class="sa-wnk">
+							<img src="../../static/icon/icon-error.png">
+							<div class="sa-wnk-tv">
+								<p class="sa-wnk-title">平均每天健康码异常数</p>
+								<p class="sa-wnk-value">{{sta.avgError}}</p>
+							</div>
+						</div>
+					</el-col>
+				</el-row>
+			</el-card>
+		</div>
+		<script>
+			var app = new Vue({
+
+				el: '.vue-box',
+				data: {
+					timmer:null,
+					sta: {
+						todayCount: 0,
+						todayHealthErrorCount: 0,
+						weekCount: 0,
+						weekHealthErrorCount: 0,
+						monthCount: 0,
+						monthHealthErrorCount: 0,
+						yearCount: 0,
+						yearHealthErrorCount: 0,
+						avg: 0,
+						avgError: 0
+					},
+				},
+				methods: {
+					getMonitor() {
+						sa.ajax('/monitor/watch', function(res) {
+							this.sta = res.data;
+						}.bind(this));
+					}
+				},
+				created: function() {
+					this.getMonitor();
+					this.timmer=setInterval(()=>{
+						this.getMonitor()
+					},30000)
+				},
+				onbeforeunload() {
+					clearInterval(this.timmer)
+				}
+			})
+		</script>
+	</body>
+</html>

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

@@ -35,15 +35,13 @@
 					<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-select v-model="m.deptId" >
+							<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>
 						<sa-item type="text" name="车牌号" v-model="m.carNo" br need></sa-item>
-						
+
 						<sa-item type="datetime" name="开始时间" v-model="m.startTime" br need></sa-item>
 						<sa-item type="datetime" name="结束时间" v-model="m.endTime" br need></sa-item>
 						<sa-item type="textarea" name="禁行原因" v-model="m.reason" br need></sa-item>
@@ -67,7 +65,7 @@
 				el: '.vue-box',
 				data: {
 					currentUser: sa.$sys.getCurrUser(),
-					deptList:[],
+					deptList: [],
 					id: sa.p('id', 0), // 获取超链接中的id参数（0=添加，非0=修改） 
 					m: null, // 实体对象 
 				},
@@ -78,10 +76,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))
 					},
@@ -107,7 +101,7 @@
 						sa.checkNull(m.deptId, '请选择部门');
 						sa.checkNull(m.startTime, '请输入 [禁行开始]');
 						sa.checkNull(m.endTime, '请输入 [禁行结束]');
-						m=sa.removeNull(m);
+						m = sa.removeNull(m);
 						// 开始增加或修改
 						if (this.id <= 0) { // 添加
 							sa.ajax('/TbCarBlack/add', m, function(res) {

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

@@ -34,17 +34,10 @@
 					<div class="c-title" v-else>数据修改</div>
 					<el-form v-if="m">
 						<div class="c-item">
-<<<<<<< HEAD
 							<label class="c-label"><span style="color: red;">*</span>所属组织：</label>
-							<el-select v-model="m.deptId" :disabled="currentUser.deptId!=='9999999'">
-=======
-							<label class="c-label"><span style="color: red;">*</span>部门：</label>
-<!--							<el-select v-model="m.deptId" :disabled="currentUser.deptId!=='9999999'">-->
-							<el-select v-model="m.deptId" >
->>>>>>> 51f36421ae8b879e7e627a50ee37601903b857de
+							<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>
 						<sa-item type="text" name="车牌号" v-model="m.carNo" br need></sa-item>
@@ -138,10 +131,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))
 					},

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

@@ -1,134 +0,0 @@
-<!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: 7em !important;}
-			.c-panel .el-form .el-input, .c-panel .el-form .el-textarea__inner{width: 250px;}
-		</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">
-						<sa-item type="text" name="" v-model="m.id" br></sa-item>
-						<sa-item type="text" name="部门ID" v-model="m.deptId" br></sa-item>
-						<sa-item type="text" name="名称" v-model="m.name" br></sa-item>
-						<sa-item type="text" name="场所ID" v-model="m.venuesId" br></sa-item>
-						<sa-item type="text" name="场所名称" v-model="m.venuesName" br></sa-item>
-						<sa-item type="text" name="设备数" v-model="m.terminalNum" br></sa-item>
-						<sa-item type="text" name="备注" v-model="m.remark" br></sa-item>
-						<sa-item type="text" name="创建时间" v-model="m.createTime" br></sa-item>
-						<sa-item type="text" name="创建人" v-model="m.createBy" br></sa-item>
-						<sa-item type="text" name="更新时间" v-model="m.updateTime" br></sa-item>
-						<sa-item type="text" name="更新人" v-model="m.updateBy" br></sa-item>
-						<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,		// 实体对象 
-				},
-				methods: {
-					// 创建一个 默认Model 
-					createModel: function() {
-						return {
-							id: '',		//  
-							deptId: '',		// 部门ID 
-							name: '',		// 名称 
-							venuesId: '',		// 场所ID 
-							venuesName: '',		// 场所名称 
-							terminalNum: '',		// 设备数 
-							remark: '',		// 备注 
-							createTime: '',		// 创建时间 
-							createBy: '',		// 创建人 
-							updateTime: '',		// 更新时间 
-							updateBy: '',		// 更新人 
-						}
-					},
-					// 提交数据 
-					ok: function(){
-						// 表单校验 
-						let m = this.m;
-						sa.checkNull(m.id, '请输入 []');
-						sa.checkNull(m.deptId, '请输入 [部门ID]');
-						sa.checkNull(m.name, '请输入 [名称]');
-						sa.checkNull(m.venuesId, '请输入 [场所ID]');
-						sa.checkNull(m.venuesName, '请输入 [场所名称]');
-						sa.checkNull(m.terminalNum, '请输入 [设备数]');
-						sa.checkNull(m.remark, '请输入 [备注]');
-						sa.checkNull(m.createTime, '请输入 [创建时间]');
-						sa.checkNull(m.createBy, '请输入 [创建人]');
-						sa.checkNull(m.updateTime, '请输入 [更新时间]');
-						sa.checkNull(m.updateBy, '请输入 [更新人]');
-				
-						// 开始增加或修改
-						if(this.id <= 0) {	// 添加
-							sa.ajax('/TbChannel/add', m, function(res){
-								sa.alert('增加成功', this.clean); 
-							}.bind(this));
-						} else {	// 修改
-							sa.ajax('/TbChannel/update', m, function(res){
-								sa.alert('修改成功', this.clean);
-							}.bind(this));
-						}
-					},
-					// 添加/修改 完成后的动作
-					clean: function() {
-						if(this.id == 0) {
-							this.m = this.createModel();
-						} else {
-							parent.app.f5();		// 刷新父页面列表
-							sa.closeCurrIframe();	// 关闭本页 
-						}
-					}
-				},
-				mounted: function(){
-					// 初始化数据 
-					if(this.id <= 0) {	
-						this.m = this.createModel();
-					} else {	
-						sa.ajax('/TbChannel/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-channel/tb-channel-info.html

@@ -1,70 +0,0 @@
-<!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">
-						<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="场所ID" br>{{m.venuesId}}</sa-info>
-						<sa-info name="场所名称" br>{{m.venuesName}}</sa-info>
-						<sa-info name="设备数" br>{{m.terminalNum}}</sa-info>
-						<sa-info name="备注" br>{{m.remark}}</sa-info>
-						<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-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('/TbChannel/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-channel/tb-channel-list.html

@@ -1,172 +0,0 @@
-<!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.id"></sa-item>
-					<sa-item type="text" name="部门ID" v-model="p.deptId"></sa-item>
-					<sa-item type="text" name="名称" v-model="p.name"></sa-item>
-					<sa-item type="text" name="场所ID" v-model="p.venuesId"></sa-item>
-					<sa-item type="text" name="场所名称" v-model="p.venuesName"></sa-item>
-					<sa-item type="text" name="设备数" v-model="p.terminalNum"></sa-item>
-					<sa-item type="text" name="备注" v-model="p.remark"></sa-item>
-					<sa-item type="text" name="创建时间" v-model="p.createTime"></sa-item>
-					<sa-item type="text" name="创建人" v-model="p.createBy"></sa-item>
-					<sa-item type="text" name="更新时间" v-model="p.updateTime"></sa-item>
-					<sa-item type="text" name="更新人" v-model="p.updateBy"></sa-item>
-					<el-button type="primary" icon="el-icon-search" @click="p.pageNo = 1; f5()">查询</el-button>
-					<br />
-					<sa-item name="综合排序">
-						<el-radio-group v-model="p.sortType" class="s-radio-text">
-							<el-radio :label="0">默认</el-radio>
-							<el-radio :label="1"></el-radio>
-							<el-radio :label="2">部门ID</el-radio>
-							<el-radio :label="3">名称</el-radio>
-							<el-radio :label="4">场所ID</el-radio>
-							<el-radio :label="5">场所名称</el-radio>
-							<el-radio :label="6">设备数</el-radio>
-							<el-radio :label="7">备注</el-radio>
-							<el-radio :label="8">创建时间</el-radio>
-							<el-radio :label="9">创建人</el-radio>
-							<el-radio :label="10">更新时间</el-radio>
-							<el-radio :label="11">更新人</el-radio>
-						</el-radio-group>
-					</sa-item>
-				</el-form>
-				<!-- ------------- 快捷按钮 ------------- -->
-				<sa-item type="fast-btn" show="add,get,delete,export,reset"></sa-item>
-				<!-- ------------- 数据列表 ------------- -->
-				<el-table class="data-table" ref="data-table" :data="dataList" >
-					<sa-td type="selection"></sa-td>
-					<sa-td name="" prop="id" ></sa-td>
-					<sa-td name="部门ID" prop="deptId" ></sa-td>
-					<sa-td name="名称" prop="name" ></sa-td>
-					<sa-td name="场所ID" prop="venuesId" ></sa-td>
-					<sa-td name="场所名称" prop="venuesName" ></sa-td>
-					<sa-td name="设备数" prop="terminalNum" ></sa-td>
-					<sa-td name="备注" prop="remark" ></sa-td>
-					<sa-td name="创建时间" prop="createTime" ></sa-td>
-					<sa-td name="创建人" prop="createBy" ></sa-td>
-					<sa-td name="更新时间" prop="updateTime" ></sa-td>
-					<sa-td name="更新人" prop="updateBy" ></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>
-						</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: '',		//  
-						deptId: '',		// 部门ID 
-						name: '',		// 名称 
-						venuesId: '',		// 场所ID 
-						venuesName: '',		// 场所名称 
-						terminalNum: '',		// 设备数 
-						remark: '',		// 备注 
-						createTime: '',		// 创建时间 
-						createBy: '',		// 创建人 
-						updateTime: '',		// 更新时间 
-						updateBy: '',		// 更新人 
-						pageNo: 1,		// 当前页 
-						pageSize: 10,	// 页大小 
-						sortType: 0		// 排序方式 
-					},
-					dataCount: 0,
-					dataList: [], // 数据集合 
-				},
-				methods: {
-					// 刷新
-					f5: function() {
-						sa.ajax('/TbChannel/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-channel-info.html?id=' + data.id, '1050px', '90%');
-					},
-					// 查看 - 根据选中的
-					getBySelect: function(data) {
-						var selection = this.$refs['data-table'].selection;
-						if(selection.length == 0) {
-							return sa.msg('请选择一条数据')
-						}
-						this.get(selection[0]);
-					},
-					// 修改
-					update: function(data) {
-						sa.showIframe('修改数据', 'tb-channel-add.html?id=' + data.id, '1000px', '90%');
-					},
-					// 新增
-					add: function(data) {
-						sa.showIframe('新增数据', 'tb-channel-add.html?id=-1', '1000px', '90%');
-					},
-					// 删除
-					del: function(data) {
-						sa.confirm('是否删除，此操作不可撤销', function() {
-							sa.ajax('/TbChannel/delete?id=' + data.id, function(res) {
-								sa.arrayDelete(this.dataList, data);
-								sa.ok('删除成功');
-								sa.f5TableHeight();		// 刷新表格高度 
-							}.bind(this))
-						}.bind(this));
-					},
-					// 批量删除
-					deleteByIds: function() {
-						// 获取选中元素的id列表 
-						let selection = this.$refs['data-table'].selection;
-						let ids = sa.getArrayField(selection, 'id');
-						if(selection.length == 0) {
-							return sa.msg('请至少选择一条数据')
-						}
-						// 提交删除 
-						sa.confirm('是否批量删除选中数据？此操作不可撤销', function() {
-							sa.ajax('/TbChannel/deleteByIds', {ids: ids.join(',')}, function(res) {
-								sa.arrayDelete(this.dataList, selection);
-								sa.ok('删除成功');
-								sa.f5TableHeight();		// 刷新表格高度 
-							}.bind(this))
-						}.bind(this));
-					},
-				},
-				created: function() {
-					this.f5();
-					sa.onInputEnter();
-				}
-			})
-		</script>
-	</body>
-</html>

sa-view/tb-manager/tb-manager-add.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,9 +15,23 @@
 		<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;}
-			.c1-label{width: 8em; color: #333; padding-right: 4px; display: inline-block; text-align: right; vertical-align: top;}
+			.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>
@@ -24,40 +39,27 @@
 			<!-- ------- 内容部分 ------- -->
 			<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="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-select v-model="m.deptId" @change="deptChange">
-								<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.position" br need></sa-item>
-<!--						<sa-item type="text" name="场所ID" v-model="m.venuesId" br></sa-item>-->
-						<div class="c-item">
-							<label class="c-label"><span style="color: red;">*</span>场所：</label>
-							<el-select v-model="m.venuesId" @change="venuesChange">
-								<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.venuesName" br need></sa-item>
-<!--						<sa-item type="text" name="值班开始时间" v-model="m.workStartTime" br></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>
-<!--						<sa-item type="text" name="值班结束时间" v-model="m.workEndTime" br></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.workEndTime"></el-time-picker>
-						</div>
+						<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>
+								<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>
+								</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-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>
@@ -71,16 +73,15 @@
 				<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, // 实体对象
 					deptList: [],
 					venuesList: [],
 
@@ -90,28 +91,26 @@
 					// 创建一个 默认Model 
 					createModel: function() {
 						return {
-							id: '',		// 主键 
-							name: '',		// 姓名 
-							phone: '',		// 联系号码 
-							deptId: '',		// 部门ID
+							id: '', // 主键 
+							name: '', // 姓名 
+							phone: '', // 联系号码 
+							deptId: '', // 部门ID
 							deptName: '',
-							position: '',		// 职能 
-							venuesId: '',		// 场所ID 
-							venuesName: '',		// 值班地点 
-							workStartTime: '',		// 值班开始时间 
-							workEndTime: '',		// 值班结束时间 
-							remark: '',		// 备注
+							position: '', // 职能 
+							venuesId: '', // 场所ID 
+							venuesName: '', // 值班地点 
+							workStartTime: '', // 值班开始时间 
+							workEndTime: '', // 值班结束时间 
+							remark: '', // 备注
 						}
 					},
 					// 提交数据 
-					ok: function(){
+					ok: function() {
 						// 表单校验 
 						let m = this.m;
 						// sa.checkNull(m.id, '请输入 [主键]');
 						sa.checkNull(m.name, '请输入 [姓名]');
-						sa.checkNull(m.deptId, '请选择 [部门]');
 						sa.checkNull(m.position, '请输入 [职能]');
-						sa.checkNull(m.venuesId, '请输入 [场所]');
 						sa.checkNull(m.venuesName, '请输入 [值班地点]');
 						sa.checkNull(m.workStartTime, '请输入 [值班开始时间]');
 						sa.checkNull(m.workEndTime, '请输入 [值班结束时间]');
@@ -122,12 +121,12 @@
 						}
 
 						// 开始增加或修改
-						if(this.id <= 0) {	// 添加
-							sa.ajax('/TbManager/add', m, function(res){
-								sa.alert('增加成功', this.clean); 
+						if (this.id <= 0) { // 添加
+							sa.ajax('/TbManager/add', m, function(res) {
+								sa.alert('增加成功', this.clean);
 							}.bind(this));
-						} else {	// 修改
-							sa.ajax('/TbManager/update', m, function(res){
+						} else { // 修改
+							sa.ajax('/TbManager/update', m, function(res) {
 								sa.alert('修改成功', this.clean);
 							}.bind(this));
 						}
@@ -158,24 +157,22 @@
 					},
 					// 添加/修改 完成后的动作
 					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() {
 					// 初始化数据
-					this.getDeptList();
-					this.getVenuesList();
-					if(this.id <= 0) {	
+					if (this.id <= 0) {
 						this.m = this.createModel();
-					} else {	
+					} else {
 						sa.ajax('/TbManager/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))
@@ -183,7 +180,6 @@
 
 				}
 			})
-			
 		</script>
 	</body>
-</html>
+</html>

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

@@ -27,7 +27,6 @@
 							<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.deptName}}</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-view/tb-manager/tb-manager-list.html

@@ -22,14 +22,6 @@
 				<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>
-					<div class="c-item">
-						<label class="c-label">部门：</label>
-						<el-select v-model="p.deptId">
-							<el-option label="请选择" v-for="(item,index) in deptList" :key="item.id"
-									   :label="item.name" :value="item.id"></el-option>
-
-						</el-select>
-					</div>
 					<el-button type="primary" icon="el-icon-search" @click="p.pageNo = 1; f5()">查询</el-button>
 					<br />
 				</el-form>
@@ -39,14 +31,10 @@
 				<el-button type="info" icon="el-icon-refresh" @click="f5">重置</el-button>
 				<!-- ------------- 数据列表 ------------- -->
 				<el-table class="data-table" ref="data-table" :data="dataList" >
-					<sa-td type="selection"></sa-td>
 					<sa-td name="序号" type="index"></sa-td>
 					<sa-td name="姓名" prop="name" ></sa-td>
 					<sa-td name="联系号码" prop="phone" ></sa-td>
-<!--					<sa-td name="部门ID" prop="deptId" ></sa-td>-->
-					<sa-td name="部门" prop="deptName" ></sa-td>
 					<sa-td name="职能" prop="position" ></sa-td>
-<!--					<sa-td name="场所ID" prop="venuesId" ></sa-td>-->
 					<sa-td name="值班地点" prop="venuesName" ></sa-td>
 					<sa-td name="值班开始时间" prop="workStartTime" ></sa-td>
 					<sa-td name="值班结束时间" prop="workEndTime" ></sa-td>
@@ -126,7 +114,7 @@
 					},
 					// 新增
 					add: function(data) {
-						sa.showIframe('新增数据', 'tb-manager-add.html?id=-1', '550px', '90%');
+						sa.showIframe('新增数据', 'tb-manager-add.html?id=-1', '850px', '60%');
 					},
 					// 删除
 					del: function(data) {

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

@@ -35,17 +35,10 @@
 					<div class="c-title" v-else>数据修改</div>
 					<el-form v-if="m">
 						<div class="c-item">
-<<<<<<< HEAD
 							<label class="c-label"><span style="color: red;">*</span>备案组织：</label>
-							<el-select v-model="m.deptId" :disabled="currentUser.deptId!=='9999999'">
-=======
-							<label class="c-label"><span style="color: red;">*</span>部门：</label>
-<!--							<el-select v-model="m.deptId" :disabled="currentUser.deptId!=='9999999'">-->
-							<el-select v-model="m.deptId" >
->>>>>>> 51f36421ae8b879e7e627a50ee37601903b857de
+							<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>
 						<sa-item type="text" name="姓名" v-model="m.name" br need></sa-item>

sa-view/tb-person-visit-record/health-code-record-add.html

@@ -1,196 +0,0 @@
-<!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>
-    <script src="../../static/kj/upload-util.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;
-        }
-    </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>
-                <el-card>
-                    <div slot="header" class="clearfix">
-                        <span>人员信息</span>
-                    </div>
-                    <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.idCard" br need></sa-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <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-select v-model="m.healthStatus" :disabled="currentUser.deptId!=='9999999'">
-                                    <el-option label="请选择" v-for="(item,index) in healthList" :key="index"
-                                               :label="item" :value="item"></el-option>
-
-                                </el-select>
-                            </div>
-                        </el-col>
-
-                    </el-row>
-                </el-card>
-                <el-card>
-                    <div slot="header" class="clearfix">
-                        <span>出入信息</span>
-                    </div>
-                    <div style="display: flex;">
-                        <div class="c-item">
-                            <label class="c-label">入场通道：</label>
-                            <el-select v-model="m.inChannel" placeholder="请选择">
-                                <el-option-group v-for="(area,index) in areaList" :key="index"
-                                                 :label="area.name">
-                                    <el-option v-for="item in area.children" :key="item.id" :label="item.name"
-                                               :value="item.id">
-                                    </el-option>
-                                </el-option-group>
-                            </el-select>
-                        </div>
-                        <sa-item type="num" name="入场体温" v-model="m.inTemperature" br></sa-item>
-                        <sa-item type="datetime" name="入场时间" v-model="m.inTime" br></sa-item>
-                    </div>
-                    <div style="display: flex;">
-                        <div class="c-item">
-                            <label class="c-label">离场通道：</label>
-                            <el-select v-model="m.outChannel" placeholder="请选择">
-                                <el-option-group v-for="(area,index) in areaList" :key="index"
-                                                 :label="area.name">
-                                    <el-option v-for="item in area.children" :key="item.id" :label="item.name"
-                                               :value="item.id">
-                                    </el-option>
-                                </el-option-group>
-                            </el-select>
-                        </div>
-                        <sa-item type="text" name="离场体温" v-model="m.outTemperature" br></sa-item>
-                        <sa-item type="datetime" name="离场时间" v-model="m.outTime" br></sa-item>
-                    </div>
-                </el-card>
-                <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: {
-            currentUser: sa.$sys.getCurrUser(),
-            healthList: [
-                '绿码', '黄码', '红码', '未知'
-            ],
-            areaList: [],
-            id: sa.p('id', 0), // 获取超链接中的id参数（0=添加，非0=修改）
-            m: {
-                id: '', // 主键
-                deptId: '', // 部门ID
-                healthStatus: '绿码', // 健康码
-                name: '', // 姓名
-                idCard: '', // 身份证
-                phone: '',
-                inChannel: '', // 场所
-                outChannel: '',
-                inTemperature: '36.5', // 体温
-                outTemperature: '36.5',
-                inTime: '', // 时间
-                outTime: '',
-                isNotify: '0',
-            }, // 实体对象
-        },
-        methods: {
-            init(){
-                if(this.isError === 1){
-
-                }
-            },
-            getVenuesList() {
-                console.log(this.currentUser)
-                sa.ajax('/TbVenues/getTree', function(res) {
-                    this.areaList = res.data; // 数据
-                }.bind(this));
-            },
-            // 创建一个 默认Model
-            createModel: function() {
-                return {
-                    id: '', // 主键
-                    deptId: '', // 部门ID
-                    healthStatus: '绿码', // 健康码
-                    name: '', // 姓名
-                    idCard: '', // 身份证
-                    phone: '',
-                    inChannel: '', // 场所
-                    outChannel: '',
-                    inTemperature: '36.5', // 体温
-                    outTemperature: '36.5',
-                    inTime: '', // 时间
-                    outTime: ''
-                }
-            },
-
-            // 提交数据
-            ok: function() {
-                // 表单校验
-                let m = this.m;
-                sa.checkNull(m.name, '请输入 [姓名]');
-                let phone = m.phone;
-                if (!sa.isPhone(phone)) {
-                    sa.error('请输入正确的号码');
-                    return false;
-                }
-                sa.checkNull(m.idCard, '请输入 [身份证]');
-                sa.ajax('/TbPersonVisitRecord/addHealthRecord', m, function(res) {
-                    sa.alert('增加成功', this.clean);
-                }.bind(this));
-            },
-            // 添加/修改 完成后的动作
-            clean: function() {
-                parent.app.f5(); // 刷新父页面列表
-                sa.closeCurrIframe(); // 关闭本页
-            }
-        },
-        mounted: function() {
-            this.getVenuesList();
-            this.init();
-        }
-    })
-</script>
-</body>
-</html>

sa-view/tb-person-visit-record/health-code-record-edit.html

@@ -1,179 +0,0 @@
-<!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>
-    <script src="../../static/kj/upload-util.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;
-        }
-    </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">
-                        <div class="c-item">
-                            <label class="c-label"><span style="color: red;">*</span>部门：</label>
-                            <el-select v-model="m.deptId" disabled>
-                                <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 type="text" name="身份证" v-model="m.idCard" br need></sa-item>
-                        <sa-item type="text" name="联系号码" v-model="m.phone" br need></sa-item>
-                    </el-col>
-                    <el-col :span="12">
-                        <sa-item type="text" name="体温" v-model="m.temperature" br need></sa-item>
-                        <div class="c-item">
-                            <label class="c-label">离场通道：</label>
-                            <el-select v-model="m.channel" placeholder="请选择">
-                                <el-option-group v-for="(area,index) in areaList" :key="index"
-                                                 :label="area.name">
-                                    <el-option v-for="item in area.children" :key="item.id" :label="item.name"
-                                               :value="item.id">
-                                    </el-option>
-                                </el-option-group>
-                            </el-select>
-                        </div>
-                        <div class="c-item">
-                            <label class="c-label"><span style="color: red;">*</span>健康码：</label>
-                            <el-select v-model="m.healthStatus" :disabled="currentUser.deptId!=='9999999'">
-                                <el-option label="请选择" v-for="(item,index) in healthList" :key="index"
-                                           :label="item" :value="item"></el-option>
-
-                            </el-select>
-                        </div>
-                        <sa-item type="datetime" name="时间" v-model="m.visitDate" br need></sa-item>
-                    </el-col>
-                </el-row>
-            </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: {
-            currentUser: sa.$sys.getCurrUser(),
-            areaList: [],
-            healthList: [
-                '绿码', '黄码', '红码', '未知'
-            ],
-            deptList: [],
-            id: sa.p('id', 0), // 获取超链接中的id参数（0=添加，非0=修改）
-            m: null, // 实体对象
-        },
-        methods: {
-            // 创建一个 默认Model
-            createModel: function() {
-                return {
-                    id: '', // 主键
-                    direction: '', // 出入(1=入场,2=离场)
-                    deptId: '', // 部门ID
-                    phone: '', // 部门名称
-                    name: '', // 姓名
-                    picture: '', // 图片
-                    idCard: '', // 身份证
-                    channel: '', // 通过通道
-                    venues: '', // 场所
-                    temperature: '', // 体温
-                    healthStatus: '', // 健康码
-                    sn: '', // 上传设备
-                    visitDate: '', // 时间
-                    createTime: '', // 创建时间
-                }
-            },
-            // 提交数据
-            ok: function() {
-                // 表单校验
-                let m = this.m;
-                sa.checkNull(m.name, '请输入 [姓名]');
-                let phone = m.phone;
-                if (!sa.isPhone(phone)) {
-                    sa.error('请输入正确的号码');
-                    return false;
-                }
-                sa.checkNull(m.idCard, '请输入 [身份证]');
-                sa.checkNull(m.channel, '请输入 [通过通道]');
-                sa.checkNull(m.venues, '请输入 [场所]');
-                sa.checkNull(m.temperature, '请输入 [体温]');
-                sa.checkNull(m.healthStatus, '请输入 [健康码]');
-                sa.ajax('/TbPersonVisitRecord/updateHealthRecord', m, function(res) {
-                    sa.alert('修改成功', this.clean);
-                }.bind(this));
-            },
-            getVenuesList() {
-                sa.ajax('/TbVenues/getTree', function(res) {
-                    this.areaList = res.data; // 数据
-                }.bind(this));
-            },
-            getDeptList() {
-                sa.ajax('/TbDept/getList', {
-                    pageNo: 1,
-                    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))
-            },
-            // 添加/修改 完成后的动作
-            clean: function() {
-                parent.app.f5(); // 刷新父页面列表
-                sa.closeCurrIframe(); // 关闭本页
-            },
-            getById() {
-                sa.ajax('/TbPersonVisitRecord/getById?id=' + this.id, function(res) {
-                    this.m = res.data;
-                    if (res.data == null) {
-                        sa.alert('未能查找到 id=' + this.id + " 详细数据");
-                    }
-                }.bind(this))
-            }
-        },
-        mounted: function() {
-            this.getDeptList();
-            this.getVenuesList();
-            this.getById();
-        }
-    })
-</script>
-</body>
-</html>

sa-view/tb-person-visit-record/health-code-record-info.html

@@ -1,75 +0,0 @@
-<!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>

sa-view/tb-person-visit-record/health-code-record-list.html

@@ -1,233 +0,0 @@
-<!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>
-                    <div>
-
-                        <el-button type="primary" icon="el-icon-plus" @click="add"
-                                   v-if="sa.isAuth('health-code-record-add')">手工补录
-                        </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 == 1" 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-add')" class="c-btn" type="primary"
-                               icon="el-icon-edit" @click="update(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('/TbPersonVisitRecord/solve?' , this.solveDate.form, function(res) {
-                    sa.alert('保存成功');
-                    this.solveDate.visible = false;
-                    this.f5();
-                }.bind(this))
-            },
-
-            // 刷新
-            f5: function () {
-                sa.ajax('/TbPersonVisitRecord/getList', sa.removeNull(this.p), function (res) {
-                    this.dataList = res.data; // 数据
-                    this.dataCount = res.dataCount; // 数据总数
-                    sa.f5TableHeight(); // 刷新表格高度
-                }.bind(this));
-            },
-            add() {
-                sa.showIframe('新增数据', 'health-code-record-add.html?id=-1', '1200px', '90%');
-            },
-            // 查看
-            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]);
-            },
-            // 修改
-            update: function (data) {
-                sa.showIframe('修改数据', 'health-code-record-edit.html?id=' + data.id, '900px', '70%');
-            },
-            // 删除
-            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>

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

@@ -26,18 +26,6 @@
                     <div class="c-title" v-if="id == 0">数据添加</div>
 					<div class="c-title" v-else>数据修改</div>
 					<el-form v-if="m">
-<<<<<<< HEAD
-=======
-						<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-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>
->>>>>>> 51f36421ae8b879e7e627a50ee37601903b857de
 						<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>