Merge remote-tracking branch 'origin/beetlsql3-dev' into beetlsql3-dev

web/src/main/java/com/ibeetl/jlw/web/IndexController.java

@@ -677,11 +677,13 @@ public class IndexController {
 
 	@PostMapping("/login.json")
 	@ResponseBody
-	public JsonResult login(String code, String password, Integer type, Long typeId) {
+	public JsonResult login(HttpServletRequest request, HttpServletResponse response,String code, String password, Integer type, Long typeId) {
 		UniversitiesCollegesJurisdictionExperimentalSystem uSystem = new UniversitiesCollegesJurisdictionExperimentalSystem();
 		uSystem.setType(type);
 		uSystem.setTypeId(typeId);
-
+		Cookie c1 = new Cookie("JSESSIONID", request.getSession().getId());
+		c1.setPath("/");
+		response.addCookie(c1);
 		UserLoginInfo info = null;
 		try {
 			info = userService.login(code, password);

web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseQuery.java

@@ -11,36 +11,37 @@ import java.util.Date;
 import static com.ibeetl.admin.core.util.enums.CoreDictType.GLOBAL_OPEN_STATUS;
 
 /**
- *TeacherOpenCourse查询
+ * TeacherOpenCourse查询
  */
 public class TeacherOpenCourseQuery extends PageParam {
-    @NotNull(message = "ID不能为空", groups =ValidateConfig.UPDATE.class)
+    @NotNull(message = "ID不能为空", groups = ValidateConfig.UPDATE.class)
     @Query(name = "课程开课ID", display = false)
     private Long teacherOpenCourseId;
-    @NotNull(message = "开课名称不能为空", groups =ValidateConfig.ADD.class)
+    @NotNull(message = "开课名称不能为空", groups = ValidateConfig.ADD.class)
     @Query(name = "开课名称", display = true)
     private String teacherOpenCourseTitle;
 
-    @Query(name = "课程编码", display = true)
+    @Query(name = "课程编码", display = false)
     private String teacherOpenCourseCode;
-//    @Query(name = "封面列表（JSON格式: {封面URL：is默认封面}）", display = false)
+    //    @Query(name = "封面列表（JSON格式: {封面URL：is默认封面}）", display = false)
     @Query(name = "封面列表", display = false)
     private String teacherOpenCourseCover;
-//    @Query(name = "开课状态（1启用 2禁用）", display = true,type=Query.TYPE_DICT,dict=GLOBAL_OPEN_STATUS)
-    @Query(name = "开课状态", display = true,type=Query.TYPE_DICT,dict=GLOBAL_OPEN_STATUS)
+    @Query(name = "上课教师", display = true, type = Query.TYPE_DICT, dict = "teacher.teacher_name.teacher_status=1")
+    private Long teacherId;
+    //    @Query(name = "开课状态（1启用 2禁用）", display = true,type=Query.TYPE_DICT,dict=GLOBAL_OPEN_STATUS)
+    @Query(name = "开课状态", display = true, type = Query.TYPE_DICT, dict = GLOBAL_OPEN_STATUS)
     private Integer teacherOpenCourseStatus;
 
     @Query(name = "开课简介", display = false)
     private String teacherOpenCourseSummary;
-    @Query(name = "教师", display = true, type=Query.TYPE_DICT, dict = "teacher.teacher_name.teacher_status=1")
-    private Long teacherId;
+
 
     // 开课授权码（外表）
-    @Query(name = "开课授权码", display = true)
+    @Query(name = "开课授权码", display = false)
     private String teacherOpenCourseMergeAuthCode;
-    @Query(name = "开课时间", display = true)
+    @Query(name = "开课时间", display = false)
     private Date startTime;
-    @Query(name = "结课时间", display = true)
+    @Query(name = "结课时间", display = false)
     private Date endTime;
     @Query(name = "组织ID", display = false)
     private Long orgId;
@@ -67,68 +68,87 @@ public class TeacherOpenCourseQuery extends PageParam {
         this.teacherIdPlural = teacherIdPlural;
     }
 
-    public Long getTeacherOpenCourseId(){
-        return  teacherOpenCourseId;
+    public Long getTeacherOpenCourseId() {
+        return teacherOpenCourseId;
     }
-    public void setTeacherOpenCourseId(Long teacherOpenCourseId ){
+
+    public void setTeacherOpenCourseId(Long teacherOpenCourseId) {
         this.teacherOpenCourseId = teacherOpenCourseId;
     }
-    public String getTeacherOpenCourseTitle(){
-        return  teacherOpenCourseTitle;
+
+    public String getTeacherOpenCourseTitle() {
+        return teacherOpenCourseTitle;
     }
-    public void setTeacherOpenCourseTitle(String teacherOpenCourseTitle ){
+
+    public void setTeacherOpenCourseTitle(String teacherOpenCourseTitle) {
         this.teacherOpenCourseTitle = teacherOpenCourseTitle;
     }
-    public String getTeacherOpenCourseCode(){
-        return  teacherOpenCourseCode;
+
+    public String getTeacherOpenCourseCode() {
+        return teacherOpenCourseCode;
     }
-    public void setTeacherOpenCourseCode(String teacherOpenCourseCode ){
+
+    public void setTeacherOpenCourseCode(String teacherOpenCourseCode) {
         this.teacherOpenCourseCode = teacherOpenCourseCode;
     }
-    public String getTeacherOpenCourseCover(){
-        return  teacherOpenCourseCover;
+
+    public String getTeacherOpenCourseCover() {
+        return teacherOpenCourseCover;
     }
-    public void setTeacherOpenCourseCover(String teacherOpenCourseCover ){
+
+    public void setTeacherOpenCourseCover(String teacherOpenCourseCover) {
         this.teacherOpenCourseCover = teacherOpenCourseCover;
     }
-    public Integer getTeacherOpenCourseStatus(){
-        return  teacherOpenCourseStatus;
+
+    public Integer getTeacherOpenCourseStatus() {
+        return teacherOpenCourseStatus;
     }
-    public void setTeacherOpenCourseStatus(Integer teacherOpenCourseStatus ){
+
+    public void setTeacherOpenCourseStatus(Integer teacherOpenCourseStatus) {
         this.teacherOpenCourseStatus = teacherOpenCourseStatus;
     }
-    public Date getStartTime(){
-        return  startTime;
+
+    public Date getStartTime() {
+        return startTime;
     }
-    public void setStartTime(Date startTime ){
+
+    public void setStartTime(Date startTime) {
         this.startTime = startTime;
     }
-    public Date getEndTime(){
-        return  endTime;
+
+    public Date getEndTime() {
+        return endTime;
     }
-    public void setEndTime(Date endTime ){
+
+    public void setEndTime(Date endTime) {
         this.endTime = endTime;
     }
-    public Long getOrgId(){
-        return  orgId;
+
+    public Long getOrgId() {
+        return orgId;
     }
-    public void setOrgId(Long orgId ){
+
+    public void setOrgId(Long orgId) {
         this.orgId = orgId;
     }
-    public Long getUserId(){
-        return  userId;
+
+    public Long getUserId() {
+        return userId;
     }
-    public void setUserId(Long userId ){
+
+    public void setUserId(Long userId) {
         this.userId = userId;
     }
-    public Date getCreateTime(){
-        return  createTime;
+
+    public Date getCreateTime() {
+        return createTime;
     }
-    public void setCreateTime(Date createTime ){
+
+    public void setCreateTime(Date createTime) {
         this.createTime = createTime;
     }
 
-    public TeacherOpenCourse pojo(){
+    public TeacherOpenCourse pojo() {
         TeacherOpenCourse pojo = new TeacherOpenCourse();
         pojo.setTeacherOpenCourseId(this.getTeacherOpenCourseId());
         pojo.setTeacherOpenCourseTitle(this.getTeacherOpenCourseTitle());
@@ -145,39 +165,50 @@ public class TeacherOpenCourseQuery extends PageParam {
         return pojo;
     }
 
-    public String getTeacherOpenCourseIdPlural(){
-        return  teacherOpenCourseIdPlural;
+    public String getTeacherOpenCourseIdPlural() {
+        return teacherOpenCourseIdPlural;
     }
-    public void setTeacherOpenCourseIdPlural(String teacherOpenCourseIdPlural){
+
+    public void setTeacherOpenCourseIdPlural(String teacherOpenCourseIdPlural) {
         this.teacherOpenCourseIdPlural = teacherOpenCourseIdPlural;
     }
-    public String getTeacherOpenCourseStatusPlural(){
-        return  teacherOpenCourseStatusPlural;
+
+    public String getTeacherOpenCourseStatusPlural() {
+        return teacherOpenCourseStatusPlural;
     }
-    public void setTeacherOpenCourseStatusPlural(String teacherOpenCourseStatusPlural){
+
+    public void setTeacherOpenCourseStatusPlural(String teacherOpenCourseStatusPlural) {
         this.teacherOpenCourseStatusPlural = teacherOpenCourseStatusPlural;
     }
-    public String getOrgIdPlural(){
-        return  orgIdPlural;
+
+    public String getOrgIdPlural() {
+        return orgIdPlural;
     }
-    public void setOrgIdPlural(String orgIdPlural){
+
+    public void setOrgIdPlural(String orgIdPlural) {
         this.orgIdPlural = orgIdPlural;
     }
-    public String getUserIdPlural(){
-        return  userIdPlural;
+
+    public String getUserIdPlural() {
+        return userIdPlural;
     }
-    public void setUserIdPlural(String userIdPlural){
+
+    public void setUserIdPlural(String userIdPlural) {
         this.userIdPlural = userIdPlural;
     }
-    public String getTeacherOpenCourseJsonStr(){
-        return  teacherOpenCourseJsonStr;
+
+    public String getTeacherOpenCourseJsonStr() {
+        return teacherOpenCourseJsonStr;
     }
-    public void setTeacherOpenCourseJsonStr(String teacherOpenCourseJsonStr ){
+
+    public void setTeacherOpenCourseJsonStr(String teacherOpenCourseJsonStr) {
         this.teacherOpenCourseJsonStr = teacherOpenCourseJsonStr;
     }
+
     public String get_given() {
         return _given;
     }
+
     public void set_given(String _given) {
         this._given = _given;
     }

web/src/main/resources/static/js/jlw/teacherOpenCourse/index.js

@@ -1,174 +1,185 @@
-layui.define([ 'form', 'laydate', 'table' ], function(exports) {
+layui.define(['form', 'laydate', 'table'], function (exports) {
     var form = layui.form;
     var laydate = layui.laydate;
     var table = layui.table;
     var teacherOpenCourseTable = null;
-    var view ={
-        init:function(){
+    var view = {
+        init: function () {
             var that = this
             this.initTable();
             this.initSearchForm();
             this.initToolBar();
-            window.dataReload = function(){
-                Lib.doSearchForm($("#searchForm"),teacherOpenCourseTable)
+            window.dataReload = function () {
+                Lib.doSearchForm($("#searchForm"), teacherOpenCourseTable)
                 that.initToolBar()
             }
         },
-        initTable:function(){
-            var sx_ = localStorage.getItem("teacherOpenCourseTable_field_"+Common.userInfoId); //筛选值显示、隐藏缓存
-            if($.isEmpty(sx_)){sx_ = {};}else {sx_ = JSON.parse(sx_);}
+        initTable: function () {
+            var sx_ = localStorage.getItem("teacherOpenCourseTable_field_" + Common.userInfoId); //筛选值显示、隐藏缓存
+            if ($.isEmpty(sx_)) {
+                sx_ = {};
+            } else {
+                sx_ = JSON.parse(sx_);
+            }
             teacherOpenCourseTable = table.render({
-                elem : '#teacherOpenCourseTable',
-                height : Lib.getTableHeight(1),
+                elem: '#teacherOpenCourseTable',
+                height: Lib.getTableHeight(1),
                 cellMinWidth: 100,
-                method : 'post',
-                url : Common.ctxPath + '/jlw/teacherOpenCourse/list.json' // 数据接口
-                ,page : Lib.tablePage // 开启分页
-                ,toolbar: '#toolbar_teacherOpenCourse' //自定义头部左侧工具栏
-                ,defaultToolbar: ['filter', 'print', 'exports'] //头部右侧工具栏
-                ,limit : 10,
-                cols : [ [ // 表头
-                    {
+                method: 'post',
+                url: Common.ctxPath + '/jlw/teacherOpenCourse/list.json' // 数据接口
+                , page: Lib.tablePage // 开启分页
+                /*,toolbar: '#toolbar_teacherOpenCourse' //自定义头部左侧工具栏
+                ,defaultToolbar: ['filter', 'print', 'exports'] //头部右侧工具栏*/
+                , limit: 10,
+                cols: [[ // 表头
+                    /*{
                         type : 'checkbox',
 
+                    },*/
+                    {
+                        field: 'teacherOpenCourseId',
+                        title: '课程开课ID',
+                        align: "center",
+                        hideField: false,
+                        hide: true,
+                        width: 60,
+                    },
+                    {
+                        field: 'teacherOpenCourseTitle',
+                        title: '开课名称',
+                        align: "center",
+                        hideField: false,
+                        hide: $.isEmpty(sx_['teacherOpenCourseTitle']) ? false : sx_['teacherOpenCourseTitle'],
+                    },
+                    {
+                        field: 'teacherIdText',
+                        title: '上课教师',
+                        align: "center",
+                        hideField: false,
+                        hide: $.isEmpty(sx_['teacherIdText']) ? false : sx_['teacherIdText'],
+                    },
+                    {
+                        field: 'schoolClassText',
+                        title: '上课班级',
+                        align: "center",
                     },
-                {
-                    field : 'teacherOpenCourseId', 
-                    title : '课程开课ID',
-                    align:"center",
-                    hideField :false,
-                    hide:$.isEmpty(sx_['teacherOpenCourseId'])?false:sx_['teacherOpenCourseId'],
+                    {
+                        field: 'time',
+                        title: '课程学时',
+                        align: "center",
+                        hideField: false,
+                        hide: $.isEmpty(sx_['endTime']) ? false : sx_['endTime'],
+                        templet: function (d) {
+                            var v = Common.GetDateDiff(d.startTime, d.endTime, 'hour');
 
-                        width : 60,
-                },
-                {
-                    field : 'teacherOpenCourseTitle', 
-                    title : '开课名称',
-                    align:"center",
-                    hideField :false,
-                    hide:$.isEmpty(sx_['teacherOpenCourseTitle'])?false:sx_['teacherOpenCourseTitle'],
-                },
-                {
-                    field : 'teacherOpenCourseCode', 
-                    title : '课程编码',
-                    align:"center",
-                    hideField :false,
-                    hide:$.isEmpty(sx_['teacherOpenCourseCode'])?false:sx_['teacherOpenCourseCode'],
-                },
-                {
-                    field : 'teacherIdText',
-                    title : '教师名称',
-                    align:"center",
-                    hideField :false,
-                    hide:$.isEmpty(sx_['teacherIdText'])?false:sx_['teacherIdText'],
-                },
-                {
-                    field : 'teacherOpenCourseCover', 
-                    // title : '封面列表（JSON格式: {封面URL：is默认封面}）',
-                    title : '封面列表',
-                    align:"center",
-                    hideField :false,
-                    hide:$.isEmpty(sx_['teacherOpenCourseCover'])?false:sx_['teacherOpenCourseCover'],
-                },
-                {
-                    field : 'teacherOpenCourseSummary',
-                    title : '简介',
-                    align:"center",
-                    hideField :false,
-                    hide:$.isEmpty(sx_['teacherOpenCourseSummary'])?false:sx_['teacherOpenCourseSummary'],
-                },
-                {
-                    field : 'teacherOpenCourseStatusText', //数据字典类型为 global_open_status
-                    // title : '开课状态（1启用 2禁用）',
-                    title : '开课状态',
-                    align:"center",
-                    hideField :false,
-                    hide:$.isEmpty(sx_['teacherOpenCourseStatusText'])?false:sx_['teacherOpenCourseStatusText'],
-                },
-                {
-                    field : 'startTime', 
-                    title : '开课时间',
-                    align:"center",
-                    hideField :false,
-                    hide:$.isEmpty(sx_['startTime'])?false:sx_['startTime'],
-                },
-                {
-                    field : 'endTime', 
-                    title : '结课时间',
-                    align:"center",
-                    hideField :false,
-                    hide:$.isEmpty(sx_['endTime'])?false:sx_['endTime'],
-                },
-                // {
-                //     field : 'orgId',
-                //     title : '组织ID',
-                //     align:"center",
-                //     hideField :false,
-                //     hide:$.isEmpty(sx_['orgId'])?false:sx_['orgId'],
-                // },
-                // {
-                //     field : 'userId',
-                //     title : '用户ID',
-                //     align:"center",
-                //     hideField :false,
-                //     hide:$.isEmpty(sx_['userId'])?false:sx_['userId'],
-                // },
+                            console.log(Common.getDate(d.startTime), Common.getDate(d.endTime))
+                            return v + "学时";
+                        }
+                    },
                     {
-                        field : 'teacherOpenCourseMergeTeacherAuthCode',
-                        title : '开课授权码',
-                        align:"center",
-                        hideField :false,
-                        hide:$.isEmpty(sx_['teacherOpenCourseMergeTeacherAuthCode'])?false:sx_['teacherOpenCourseMergeTeacherAuthCode'],
+                        field: 'teacherOpenCourseCode',
+                        title: '课程编码',
+                        align: "center",
+                        hideField: false,
+                        hide: true,
                     },
-                {
-                    field : 'createTime', 
-                    title : '创建时间',
-                    align:"center",
-                    hideField :false,
-                    hide:$.isEmpty(sx_['createTime'])?false:sx_['createTime'],
-                }
-                ,{
-                    field : 'operation_',title : '操作',align:"center", templet: function (d) {
-                        var htm = '<button type="button" class="layui-btn layui-btn-normal layui-btn-xs" lay-event="edit">编辑</button>';
-                        htm += '<button type="button" class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">删除</button>';
-                        return htm;
+                    {
+                        field: 'teacherOpenCourseCover',
+                        // title : '封面列表（JSON格式: {封面URL：is默认封面}）',
+                        title: '封面列表',
+                        align: "center",
+                        hideField: false,
+                        hide: true,
+                    },
+                    {
+                        field: 'teacherOpenCourseSummary',
+                        title: '简介',
+                        align: "center",
+                        hideField: false,
+                        hide: true,
+                    },
+                    {
+                        field: 'teacherOpenCourseMergeTeacherAuthCode',
+                        title: '开课授权码',
+                        align: "center",
+                        hideField: false,
+                        hide: $.isEmpty(sx_['teacherOpenCourseMergeTeacherAuthCode']) ? false : sx_['teacherOpenCourseMergeTeacherAuthCode'],
+                    },
+                    {
+                        field: 'createTime',
+                        title: '创建时间',
+                        align: "center",
+                        hideField: false,
+                        hide: $.isEmpty(sx_['createTime']) ? false : sx_['createTime'],
+                    },
+                    {
+                        field: 'teacherOpenCourseStatusText', //数据字典类型为 global_open_status
+                        // title : '开课状态（1启用 2禁用）',
+                        title: '开课状态',
+                        align: "center",
+                        hideField: false,
+                        hide: $.isEmpty(sx_['teacherOpenCourseStatusText']) ? false : sx_['teacherOpenCourseStatusText'],
+                        templet: function (d) {
+                            var css = d.teacherOpenCourseStatus == 2 ? "textType2" : 'textType';
+                            return '<span class="' + css + '">' + d.teacherOpenCourseStatusText + '</span>';
+                        }
+                    }, {
+                        field: 'operation_', title: '操作', align: "center", width: "200", templet: function (d) {
+                            var htm = '<a class="layui-table-link" lay-event="edit">去排课</a>';
+                            htm += '<a class="layui-table-link" lay-event="qiyong">启用</a>';
+                            htm += '<a class="layui-table-link" lay-event="jinyong">禁用</a>';
+                            htm += '<a class="layui-table-link" lay-event="del">删除</a>';
+                            return htm;
+                        }
                     }
-                }
+                    // {
+                    //     field : 'orgId',
+                    //     title : '组织ID',
+                    //     align:"center",
+                    //     hideField :false,
+                    //     hide:$.isEmpty(sx_['orgId'])?false:sx_['orgId'],
+                    // },
+                    // {
+                    //     field : 'userId',
+                    //     title : '用户ID',
+                    //     align:"center",
+                    //     hideField :false,
+                    //     hide:$.isEmpty(sx_['userId'])?false:sx_['userId'],
+                    // },
+                ]]
 
-        ] ]
-
-        });
+            });
 
-            table.on('checkbox(teacherOpenCourseTable)', function(obj){
+            table.on('checkbox(teacherOpenCourseTable)', function (obj) {
                 var teacherOpenCourse = obj.data;
-                if(obj.checked){
+                if (obj.checked) {
                     //按钮逻辑Lib.buttonEnable()
-                }else{
+                } else {
 
                 }
             })
         },
 
-        initSearchForm:function(){
-            Lib.initSearchForm( $("#searchForm"),teacherOpenCourseTable,form);
+        initSearchForm: function () {
+            Lib.initSearchForm($("#searchForm"), teacherOpenCourseTable, form);
         },
 
-        initToolBar:function(){
+        initToolBar: function () {
             toolbar = {
                 add: function () {
                     var url = "/jlw/teacherOpenCourse/add.do";
-                    Common.openDlg(url,"TeacherOpenCourse管理>新增");
+                    Common.openDlg(url, "TeacherOpenCourse管理>新增");
                 },
                 edit: function () {
-                    var data = Common.getOneFromTable(table,"teacherOpenCourseTable");
-                    if(data==null){
-                        return ;
+                    var data = Common.getOneFromTable(table, "teacherOpenCourseTable");
+                    if (data == null) {
+                        return;
                     }
-                    var url = "/jlw/teacherOpenCourse/add.do?teacherOpenCourseId="+data.teacherOpenCourseId;
-                    Common.openDlg(url,"TeacherOpenCourse管理>"+data.teacherOpenCourseId+">编辑");
+                    var url = "/jlw/teacherOpenCourse/add.do?teacherOpenCourseId=" + data.teacherOpenCourseId;
+                    Common.openDlg(url, "TeacherOpenCourse管理>" + data.teacherOpenCourseId + ">编辑");
                 },
                 del: function () {
-                    layui.use(['del'], function(){
+                    layui.use(['del'], function () {
                         var delView = layui.del
                         delView.delBatch();
                     });
@@ -184,7 +195,7 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) {
                 },
             }
             //触发事件
-            $('.ext-toolbar').on('click', function() {
+            $('.ext-toolbar').on('click', function () {
                 var type = $(this).data('type');
                 toolbar[type] ? toolbar[type].call(this) : '';
             });
@@ -192,17 +203,17 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) {
         }, initTableTool: table.on('tool(teacherOpenCourseTable)', function (obj) {
             var data = obj.data;
             if (obj.event === 'edit') {
-                var url = "/jlw/teacherOpenCourse/add.do?teacherOpenCourseId="+data.teacherOpenCourseId;
-                Common.openDlg(url,"TeacherOpenCourse管理>"+data.teacherOpenCourseId+">编辑");
-            }else if(obj.event === "del"){
+                var url = "/jlw/teacherOpenCourse/add.do?teacherOpenCourseId=" + data.teacherOpenCourseId;
+                Common.openDlg(url, "TeacherOpenCourse管理>" + data.teacherOpenCourseId + ">编辑");
+            } else if (obj.event === "del") {
                 layer.confirm('是否确定删除该信息？', function (index) {
-                    var ret = Common.postAjax("/jlw/teacherOpenCourse/delete.json",{ids:data.teacherOpenCourseId});
-                    layer.msg(ret.code == 0?"删除成功！":ret.msg, {
+                    var ret = Common.postAjax("/jlw/teacherOpenCourse/delete.json", {ids: data.teacherOpenCourseId});
+                    layer.msg(ret.code == 0 ? "删除成功！" : ret.msg, {
                         offset: ['50%'],
-                        icon: ret.code == 0?1:2,
+                        icon: ret.code == 0 ? 1 : 2,
                         time: 1500 //2秒关闭（如果不配置，默认是3秒）
-                    },function (){
-                        if(ret.code == 0){
+                    }, function () {
+                        if (ret.code == 0) {
                             Lib.tableRefresh();
                         }
                     });
@@ -210,6 +221,6 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) {
             }
         })
     }
-    exports('index',view);
+    exports('index', view);
 
 });

web/src/main/resources/templates/jlw/teacherOpenCourse/index.html

@@ -1,4 +1,21 @@
 <!--#layout("/common/layout.html",{"jsBase":"/js/jlw/teacherOpenCourse/"}){ -->
+<style>
+    .layui-table a {
+        margin-right: 10px;
+    }
+    .textType {
+        border: 1px solid #0f9cfd;
+        color: #0f9cfd;
+        border-radius: 5px;
+        padding: 3px
+    }
+    .textType2 {
+        border: 1px solid #919191;
+        color: #919191;
+        border-radius: 5px;
+        padding: 3px
+    }
+</style>
 <layui:searchForm formId="searchForm" searchList="" condition="${search}">
 </layui:searchForm>
 <table id="teacherOpenCourseTable" lay-filter="teacherOpenCourseTable"></table>
@@ -7,15 +24,10 @@
 <script type="text/html" id="toolbar_teacherOpenCourse">
     <div class="layui-btn-container">
         <div class="layui-btn-group" >
-            <!--# if(core.searchIsShow(search)) {-->
-            <layui:accessButton function="teacherOpenCourse.query"  id="searchFormSearch" action="search"><i class="layui-icon">&#xe615;</i>搜索</layui:accessButton>
-            <!--# }-->
-            <layui:accessButton function="teacherOpenCourse.add"  action="add">添加</layui:accessButton>
+            <layui:accessButton function="teacherOpenCourse.add"  action="add"><i class="layui-icon">&#xe61f;</i>添加</layui:accessButton>
             <layui:accessButton function="teacherOpenCourse.edit"  action="edit">修改</layui:accessButton>
             <layui:accessButton function="teacherOpenCourse.del"  action="del">删除</layui:accessButton>
-            <!--#            if(!isEmpty(search)) {-->
-            <layui:accessButton function="teacherOpenCourse.query"  action="refresh"><i class="layui-icon">&#xe669;</i>刷新</layui:accessButton>
-            <!--#            }-->
+
         </div>
     </div>
 </script>