diff --git a/web/src/main/java/com/ibeetl/jlw/web/query/ResourcesQuestionQuery.java b/web/src/main/java/com/ibeetl/jlw/web/query/ResourcesQuestionQuery.java
index 7f84d125..b2ec0075 100644
--- a/web/src/main/java/com/ibeetl/jlw/web/query/ResourcesQuestionQuery.java
+++ b/web/src/main/java/com/ibeetl/jlw/web/query/ResourcesQuestionQuery.java
@@ -37,7 +37,7 @@ public class ResourcesQuestionQuery extends PageParam {
private String questionAnswer;
@Query(name = "解析", display = false)
private String questionAnalysis;
- @Query(name = "题目状态（1上架，0下架）", display = true, type = TYPE_DICT,dict= CoreDictType.UP_STATUS)
+ @Query(name = "题目状态（1上架，0下架）", display = false, type = TYPE_DICT,dict= CoreDictType.UP_STATUS)
private Integer questionStatus;
@Query(name = "组织机构ID", display = false)
private Long orgId;
diff --git a/web/src/main/resources/static/js/jlw/teacher/index.js b/web/src/main/resources/static/js/jlw/teacher/index.js
index 13a1b3bc..ddf07579 100644
--- a/web/src/main/resources/static/js/jlw/teacher/index.js
+++ b/web/src/main/resources/static/js/jlw/teacher/index.js
@@ -48,7 +48,7 @@ layui.define(['form', 'laydate', 'table'], function (exports) {
field: 'addTime', title: '创建日期', align: "center"
},
{
- field: 'userId', title: '操作', align: "center", templet: function (d) {
+ field: 'userId', title: '操作',width:190, align: "center", templet: function (d) {
var htm = '<a class="layui-table-link" lay-event="edit">编辑</a>';
htm += '<a class="layui-table-link" lay-event="del">删除</a>';
htm += '<a class="layui-table-link" lay-event="password">初始化密码</a>';
diff --git a/web/src/main/resources/templates/jlw/universitiesColleges/add.html b/web/src/main/resources/templates/jlw/universitiesColleges/add.html
index 938c5e5d..164fdcba 100644
--- a/web/src/main/resources/templates/jlw/universitiesColleges/add.html
+++ b/web/src/main/resources/templates/jlw/universitiesColleges/add.html
@@ -14,16 +14,6 @@
<input type="text" name="universitiesCollegesName" value="${universitiesColleges.universitiesCollegesName}" class="layui-input" >
</div>
</div>
- <div class="layui-inline">
- <label class="layui-form-label"><span class="req">*</span>院校联系人：</label>
- <div class="layui-input-inline">
- <input type="text" name="universitiesCollegesContacts" value="${universitiesColleges.universitiesCollegesContacts}" class="layui-input" >
- </div>
- </div>
- </div>
- </div>
- <div class="layui-row">
- <div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label"><span class="req">*</span>院校层次：</label>
<div class="layui-input-inline">
@@ -38,55 +28,48 @@
</select>
</div>
</div>
- <div class="layui-inline">
- <label class="layui-form-label">联系人电话：</label>
- <div class="layui-input-inline">
- <input type="text" name="universitiesCollegesContactsMobile" maxlength="11" value="${universitiesColleges.universitiesCollegesContactsMobile}" class="layui-input" >
- </div>
- </div>
- </div>
- </div>
- <div class="layui-row" id="receivingAddress">
- <div class="layui-form-item">
- <div class="layui-inline">
+ <div class="layui-inline" id="receivingAddress">
<label class="layui-form-label"><span class="req">*</span>所属省份：</label>
- <div class="layui-input-inline" style="margin-bottom: 10px;">
+ <div class="layui-input-inline">
<select name="universitiesCollegesProvince" class="province" lay-verify="required" lay-search
lay-filter="province">
<option value="">省份</option>
</select>
</div>
</div>
-
<div class="layui-inline">
<label class="layui-form-label"><span class="req">*</span>所属城市：</label>
- <div class="layui-input-inline" style="width: 152px;">
+ <div class="layui-input-inline">
<select name="universitiesCollegesCity" class="city" lay-verify="required" lay-search lay-filter="city">
<option value="">地级市</option>
</select>
</div>
</div>
-
+ <div class="layui-inline">
+ <label class="layui-form-label"><span class="req">*</span>院校联系人：</label>
+ <div class="layui-input-inline">
+ <input type="text" name="universitiesCollegesContacts" value="${universitiesColleges.universitiesCollegesContacts}" class="layui-input" >
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">联系人电话：</label>
+ <div class="layui-input-inline">
+ <input type="text" name="universitiesCollegesContactsMobile" maxlength="11" value="${universitiesColleges.universitiesCollegesContactsMobile}" class="layui-input" >
+ </div>
+ </div>
<div class="layui-inline">
<label class="layui-form-label">联系人邮箱：</label>
- <div class="layui-input-inline" style="margin-bottom: 10px;">
+ <div class="layui-input-inline">
<input type="text" name="universitiesCollegesContactsEmail" value="${universitiesColleges.universitiesCollegesContactsEmail}" class="layui-input" >
</div>
</div>
</div>
-
</div>
- <div class="layui-row">
- <div class="layui-form-item">
-
-
- </div>
- </div>
- <div class="layui-row">
+ <!--<div class="layui-row">
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">院校logo：</label>
- <div class="layui-input-inline">
+ <div class="layui-input-inline">
<input type="hidden" name="universitiesCollegesLogo" value="${universitiesColleges.universitiesCollegesLogo}" class="layui-input" >
<div class="layui-upload-drag" id="test10" style="width: 180px;height: 80px;padding: 0;float: left;">
<span id="logo" ${universitiesColleges.universitiesCollegesLogo != null?'style="display:none;"':''}>
@@ -101,6 +84,27 @@
</div>
</div>
</div>
+ </div>-->
+ <div class="layui-row" >
+ <div class="layui-form-item">
+ <blockquote class="layui-elem-quote">学校管理员账号</blockquote>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <label class="layui-form-label"><span class="req">*</span>用户名：</label>
+ <div class="layui-input-inline">
+ <input type="text" name="userName" value="${universitiesColleges.userName}" class="layui-input" >
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label"><span class="req">*</span>密码：</label>
+ <div class="layui-input-inline">
+ <input type="text" name="password" value="${universitiesColleges.password}" placeholder="不填写，默认初始密码" class="layui-input" >
+ </div>
+ </div>
+ </div>
</div>
<input type="hidden" name="universitiesCollegesId" value="${universitiesColleges.universitiesCollegesId}" />
</form>