From 8728733ad60e1698bb6cf0fa2e428c28a6bffbe7 Mon Sep 17 00:00:00 2001
From: linzhijie <19970921lzj>
Date: 星期二, 06 四月 2021 10:34:12 +0800
Subject: [PATCH] 需求提交。
---
src/main/resources/templates/main.html | 92 +++++++++++++++++++++++++++------------------
1 files changed, 55 insertions(+), 37 deletions(-)
diff --git a/src/main/resources/templates/main.html b/src/main/resources/templates/main.html
index d40f39d..ad95bc4 100644
--- a/src/main/resources/templates/main.html
+++ b/src/main/resources/templates/main.html
@@ -11,11 +11,13 @@
<div class="select-list">
<ul>
<li>
- <p>[[#{jsp.exam.enterprise.companyname}]]锛�</p><input type="text" name="userName"
- id="userName" value=""/>
+ <p>[[#{jsp.exam.enterprise.companyname}]]锛�</p>
+ <input type="text" name="userName" id="userName" value=""/>
</li>
- <li><a class="btn btn-primary btn-rounded btn-sm" onclick="openUserList()"><i
- class="fa fa-search"></i> [[#{menu.exam.enterprise.view1}]]</a></li>
+ <li>
+ <a class="btn btn-primary btn-rounded btn-sm" onclick="openUserList()">
+ <i class="fa fa-search"></i> [[#{menu.exam.enterprise.view}]]</a>
+ </li>
<li>
<input type="text" name="queryValue" id="queryValue" value=""/>
<select name="queryType" id="queryType" th:with="type=${@dict.getType('quickQueryType')}">
@@ -23,8 +25,19 @@
th:value="${dict.dictValue}"/>
</select>
</li>
- <li><a class="btn btn-primary btn-rounded btn-sm" onclick="openMemberSearch()"><i
- class="fa fa-search"></i> [[#{menu.exam.testMember.list}]]</a></li>
+ <li>
+ <a class="btn btn-primary btn-rounded btn-sm" onclick="openMemberSearch()">
+ <i class="fa fa-search"></i> [[#{menu.exam.testMember.list}]]</a>
+ </li>
+
+ <li>
+ <p>[[#{jsp.exam.report.006}]]锛�</p>
+ <input type="text" name="testName" id="testName" value=""/>
+ </li>
+ <li>
+ <a class="btn btn-primary btn-rounded btn-sm" onclick="openPackageList()">
+ <i class="fa fa-search"></i> [[#{menu.exam.test_package.search}]]</a>
+ </li>
</ul>
</div>
</form>
@@ -340,8 +353,8 @@
showColumns: false,
sortName: "updateTime",
sortOrder: "desc",
- pageSize: 25,
- pageList: [25, 100, 200],
+ pageSize: 50,
+ pageList: [50, 100, 200],
queryParams: querylistTopAnsweFinished,
columns: [
{
@@ -405,7 +418,12 @@
function openUserList() {
var url = ctx + 'exam/enterprise?userName=' + $("#userName").val();
- $.modal.openTab([[#{menu.exam.enterprise.view1}]], url);
+ $.modal.openTab([[#{menu.exam.enterprise.view}]], url);
+ }
+
+ function openPackageList() {
+ var url = ctx + 'exam/test_package/searchTestPackage?testName=' + $("#testName").val();
+ $.modal.openTab([[#{menu.exam.test_package.search}]], url);
}
function openMemberSearch() {
@@ -429,8 +447,8 @@
showColumns: false,
sortName: "updateTime",
sortOrder: "desc",
- pageSize: 25,
- pageList: [25, 100, 200],
+ pageSize: 50,
+ pageList: [50, 100, 200],
queryParams: querylistTopAnswering,
columns: [
{
@@ -470,16 +488,16 @@
field: 'langType',
title: [[#{language.used.in.the.test}]]
},
- // {
- // field: 'status',
- // title: [[#{basis.state}]],
- // formatter: function (value, row, index) {
- // return $.table.selectDictLabel(test_member_status, value);
- // }
- // },
+ {
+ field: 'status',
+ title: [[#{basis.state}]],
+ formatter: function (value, row, index) {
+ return $.table.selectDictLabel(test_member_status, value);
+ }
+ },
{
field: 'startTime',
- title: [[#{jsp.main.other.004}]]
+ title: [[#{current.time}]]
},
]
};
@@ -531,7 +549,7 @@
},
{
field: 'userName',
- title: [[#{enterprise.customer.name}]],
+ title: [[#{jsp.exam.enterprise.companyname}]],
formatter: function (value, row, index) {
// return '<a href="javascript:void(0)" onclick="userDetail(\'' + row.userId + '\')">' + value + '</a>';
return '<a href="javascript:void(0)" onclick="freelogin(\'' + row.userId + '\')">' + value + '</a>';
@@ -543,7 +561,7 @@
},
{
field: 'testType',
- title: [[#{jsp.main.other.005}]],
+ title: [[#{basis.type}]],
formatter: function (value, row, index) {
return $.table.selectDictLabel(testTypeDatas, value);
}
@@ -559,21 +577,21 @@
field: 'testNum',
title: [[#{jsp.exam.test_package.009}]]
},
- // {
- // field: 'finishNum',
- // title: [[#{jsp.exam.test_package.010}]]
- // }, {
- // field: 'testingNum',
- // title: [[#{jsp.exam.test_package.0101}]]
- // },
- // {
- // field: 'unTestNum',
- // title: [[#{jsp.exam.test_package.011}]]
- // },
- // {
- // field: 'testEmail',
- // title: [[#{jsp.exam.test_package.012}]]
- // },
+ {
+ field: 'finishNum',
+ title: [[#{jsp.exam.test_package.010}]]
+ }, {
+ field: 'testingNum',
+ title: [[#{jsp.exam.test_package.0101}]]
+ },
+ {
+ field: 'unTestNum',
+ title: [[#{jsp.exam.test_package.011}]]
+ },
+ {
+ field: 'testEmail',
+ title: [[#{jsp.exam.test_package.012}]]
+ },
{
field: 'invalidTime',
title: [[#{jsp.exam.test_package.004}]],
@@ -633,7 +651,7 @@
/*浼佷笟鐢ㄦ埛鎴栬�呭垎閿�鍟嗙晫闈�-璇︾粏*/
function userDetail(userId) {
var url = ctx + "exam/distributor";
- $.modal.openTab([[#{menu.exam.enterprise.view1}]], url);
+ $.modal.openTab([[#{menu.exam.enterprise.view}]], url);
}
</script>
</body>
--
Gitblit v1.9.1