'commit'

WebRoot/html/tp/console.html

@@ -56,7 +56,7 @@
 					<div class="layui-card-body">
 						<div class="layui-row layui-col-space5">
 							<div class="layui-col-xs8 layui-col-md8 top-panel-number"
-								style="color: #28333E;cursor: pointer;" id="value2">
+								style="color: #28333E;cursor: pointer;" id="value2" onclick="info();">
 								0
 							</div>
 							<div class="layui-col-xs4 layui-col-md4 top-panel-tips">
@@ -81,7 +81,7 @@
 					<div class="layui-card-body">
 						<div class="layui-row layui-col-space5">
 							<div class="layui-col-xs8 layui-col-md8 top-panel-number"
-								style="color: #28333E;cursor: pointer;" id="value3">
+								style="color: #28333E;cursor: pointer;" id="value3" onclick="info();">
 								0
 							</div>
 							<div class="layui-col-xs4 layui-col-md4  top-panel-tips">
@@ -113,7 +113,7 @@
 					<div class="layui-card-body">
 						<div class="layui-row layui-col-space5">
 							<div class="layui-col-xs8 layui-col-md8 top-panel-number"
-								style="color: #28333E;cursor: pointer;" id="value4">
+								style="color: #28333E;cursor: pointer;" id="value4" onclick="info();">
 								0
 							</div>
 							<div class="layui-col-xs4 layui-col-md4 top-panel-tips">
@@ -415,7 +415,7 @@
 					type: 2,
 					title: '查看',
 					shadeClose: true,
-					shade: false,
+					shade: [0.1, '#000', true],
 					maxmin: false,
 					move: false,
 					area: ['800px', '600px'],

WebRoot/html/tp/info.html

@@ -23,6 +23,14 @@
 		{{# } }}
 	</script>
 
+	<script type="text/html" id="tpIdentity">
+		{{#if (d.toupiaoren_type_id == 1) { }}
+			<span>评委会</span>
+		{{# }else{ }}
+			<span>群众</span>
+		{{# } }}
+	</script>
+
 
 
 	<script src="./component/layui/layui.js"></script>
@@ -35,9 +43,10 @@
 			let common = layui.common;
 
 			let cols = [
-				[{ field: '', title: '序号', align: 'center', type: 'numbers', width: "20%" },
+				[{ field: '', title: '序号', align: 'center', type: 'numbers', width: "10%" },
-				{ title: '姓名', field: 'toupiaoren_name', align: 'center', width: "40%" },
+				{ title: '姓名', field: 'toupiaoren_name', align: 'center', width: "30%" },
-				{ title: '是否投票', field: 'c', align: 'center', width: "40%", templet: '#tpStatus' }]
+				{ title: '投票人身份',  align: 'center', width: "30%", templet: '#tpIdentity' },
+				{ title: '是否投票',  align: 'center', width: "30%", templet: '#tpStatus' }]
 			]
 
 			table.render({