From 540eeb47fa86e32121ca2a78b1d58251dfa949c2 Mon Sep 17 00:00:00 2001
From: kgdxpr <kgdxpr@163.com>
Date: Tue, 9 May 2023 11:05:32 +0800
Subject: [PATCH] 'commit'

---
 WebRoot/html/dangjian/view/exam.html  | 26 +++++++++++++++++---------
 WebRoot/html/dangjian/view/login.html | 24 +++++++++++++-----------
 target/classes/Sql/Exam.sql           |  2 +-
 3 files changed, 31 insertions(+), 21 deletions(-)
diff --git a/WebRoot/html/dangjian/view/exam.html b/WebRoot/html/dangjian/view/exam.html
index 3908851..eb26a7b 100644
--- a/WebRoot/html/dangjian/view/exam.html
+++ b/WebRoot/html/dangjian/view/exam.html
@@ -127,15 +127,23 @@
         <!-- 主页面容器 -->
         <div class="mui-inner-wrap">
             <!-- 主页面标题 -->
-            <header id="header" class="mui-bar mui-bar-nav">
-                <h1 class="mui-title">长春市教育局党建知识问答</h1>
+            <header class="mui-bar mui-bar-nav" style="height: 70px;text-align: center;">
+                <div style="margin-top: 3px;">长春市教育局</div>
+                <div>学习贯彻习近平新时代中国特色社会主义思想</div>
+                <div>知识答题</div>
             </header>
 
-            <div class="mui-content mui-scroll-wrapper">
+            <div class="mui-content mui-scroll-wrapper" style="margin-top: 25px;">
                 <div style="margin-left: 10px;margin-top: 10px;"><span
                         class="mui-icon-extra mui-icon-extra-outline"></span><span
                         style="margin-left: 3px;">考试剩余时间：</span><span id="time"
-                        style="color: red;font-weight: bold;"></span></div>
+                        style="color: red;font-weight: bold;"></span>
+
+                    <span style="float: right;margin-right: 10px;"><button id="submit" type="button" class="mui-btn mui-btn-danger">
+                            提 交
+                        </button></span>
+
+                </div>
 
 
                 <div class="mui-card" id="examinfo"></div>
@@ -268,11 +276,11 @@
             getAnswerSheet();
 
             // 右上角增加提交按钮
-            var header = document.getElementById("header");
-            var submitBtn = document.createElement('button');
-            submitBtn.className = 'mui-btn mui-btn-red  mui-pull-right';
-            submitBtn.innerText = '交卷';
-            header.appendChild(submitBtn);
+            var submitBtn = document.getElementById("submit");
+            // var submitBtn = document.createElement('button');
+            // submitBtn.className = 'mui-btn mui-btn-red  mui-pull-right';
+            // submitBtn.innerText = '交卷';
+            // header.appendChild(submitBtn);
             submitBtn.addEventListener('tap', function () {
                 var btnArray = ['取消', '确认'];
                 var message = "是否确认交卷？";
diff --git a/WebRoot/html/dangjian/view/login.html b/WebRoot/html/dangjian/view/login.html
index a829f94..c78dee3 100644
--- a/WebRoot/html/dangjian/view/login.html
+++ b/WebRoot/html/dangjian/view/login.html
@@ -37,25 +37,27 @@
 </head>
 
 <body>
-	<header class="mui-bar mui-bar-nav">
-		<h1 class="mui-title">长春市教育局党建知识问答</h1>
+	<header class="mui-bar mui-bar-nav" style="height: 70px;text-align: center;">		
+		<div style="margin-top: 3px;">长春市教育局</div>
+		<div>学习贯彻习近平新时代中国特色社会主义思想</div>
+		<div>知识答题</div>
 	</header>
 	<div class="mui-content">
-		<form id='login-form' class="mui-input-group">
+		<form id='login-form' class="mui-input-group" style="margin-top: 38px;">
 			<div class="mui-input-row">
-				<label style="width: 29%;"><span
+				<label style="width: 35%;"><span
 						style="margin-right: 2px;color: red;">*</span>姓&nbsp&nbsp&nbsp名：</label>
-				<input style="width: 71%;" id='name' type="text" class="mui-input-clear mui-input" placeholder="请输入姓名">
+				<input style="width: 65%;" id='name' type="text" class="mui-input-clear mui-input" placeholder="请输入姓名">
 			</div>
 			<div class="mui-input-row">
-				<label style="width: 29%;"><span
-						style="margin-right: 2px;color: red;">*</span>科&nbsp&nbsp&nbsp室：</label>
-				<input style="width: 71%;" id='bureau' type="text" class="mui-input-clear mui-input"
-					placeholder="请输入科室">
+				<label style="width: 35%;"><span
+						style="margin-right: 2px;color: red;">*</span>处&nbsp&nbsp&nbsp室：</label>
+				<input style="width: 65%;" id='bureau' type="text" class="mui-input-clear mui-input"
+					placeholder="请输入处室">
 			</div>
 			<div class="mui-input-row">
-				<label style="width: 29%;"><span style="margin-right: 2px;color: red;">*</span>手机号：</label>
-				<input style="width: 71%;" id='tel' type="text" class="mui-input-clear mui-input" placeholder="请输入手机号">
+				<label style="width: 35%;"><span style="margin-right: 2px;color: red;">*</span>办公电话：</label>
+				<input style="width: 65%;" id='tel' type="text" class="mui-input-clear mui-input" placeholder="请输入办公电话">
 			</div>
 
 		</form>
diff --git a/target/classes/Sql/Exam.sql b/target/classes/Sql/Exam.sql
index 7fe9ee2..9bb2348 100644
--- a/target/classes/Sql/Exam.sql
+++ b/target/classes/Sql/Exam.sql
@@ -2,7 +2,7 @@
   #sql("getPageSummary")
      select t1.person_id,t2.person_name,sum(t1.score) as score,t2.start_time,t2.end_time from t_exam_record as t1
      inner join t_exam_person as t2  on t1.person_id=t2.person_id
-     where t1.reply=t1.answer and t2.end_time is not null
+     where t1.reply=t1.answer and t2.end_time is not null and t1.b_use=1 and t2.b_use=1
      group by t1.person_id,t2.person_name  order by sum(t1.score) desc,timediff(t2.end_time,t2.start_time) asc
   #end
 
