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

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

@@ -119,7 +119,7 @@ public class ResourcesInfoController{
 
     //跳转至资料预览页面  视频、课件 类
     @GetMapping(MODEL + "/previewData.do")
-    @Function("resourcesInfo.add")
+//    @Function("resourcesInfo.add")
     @ResponseBody
     public ModelAndView previewData(Long resourcesInfoId) {
         ModelAndView view = new ModelAndView("/jlw/previewPage/previewData.html");

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

@@ -133,7 +133,7 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) {
                 layer.confirm('是否确定左移  “<span style="color: red">'+data.studentClientLinkTitle+'</span>”  该信息？', function (index) {
                     var ret = Common.postAjax("/jlw/studentClientLink/move.json",
                         {id:data.studentClientLinkId,moveType:'MOVE_LEFT'});
-                    layer.msg(ret.code == 0?"移动成功！":ret.msg, {
+                    layer.msg(ret.code == 0?"操作成功！":ret.msg, {
                         offset: ['50%'],
                         icon: ret.code == 0?1:2,
                         time: 1500 //2秒关闭（如果不配置，默认是3秒）
@@ -147,7 +147,7 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) {
                 layer.confirm('是否确定右移 "<span style="color: red">'+data.studentClientLinkTitle+'</span>" 该信息？', function (index) {
                     var ret = Common.postAjax("/jlw/studentClientLink/move.json",
                         {id:data.studentClientLinkId,moveType:'MOVE_RIGHT'});
-                    layer.msg(ret.code == 0?"移动成功！":ret.msg, {
+                    layer.msg(ret.code == 0?"操作成功！":ret.msg, {
                         offset: ['50%'],
                         icon: ret.code == 0?1:2,
                         time: 1500 //2秒关闭（如果不配置，默认是3秒）

web/src/main/resources/templates/jlw/studentClientLink/logOnLink.html

@@ -174,7 +174,7 @@
                     layer.confirm('是否确定左移  “<span style="color: red">'+data.studentClientLinkTitle+'</span>”  该信息？', function (index) {
                         var ret = Common.postAjax("/jlw/studentClientLink/move.json",
                             {id:data.studentClientLinkId,moveType:'MOVE_LEFT'});
-                        layer.msg(ret.code == 0?"移动成功！":ret.msg, {
+                        layer.msg(ret.code == 0?"操作成功！":ret.msg, {
                             offset: ['50%'],
                             icon: ret.code == 0?1:2,
                             time: 1500 //2秒关闭（如果不配置，默认是3秒）
@@ -188,7 +188,7 @@
                     layer.confirm('是否确定右移 "<span style="color: red">'+data.studentClientLinkTitle+'</span>" 该信息？', function (index) {
                         var ret = Common.postAjax("/jlw/studentClientLink/move.json",
                             {id:data.studentClientLinkId,moveType:'MOVE_RIGHT'});
-                        layer.msg(ret.code == 0?"移动成功！":ret.msg, {
+                        layer.msg(ret.code == 0?"操作成功！":ret.msg, {
                             offset: ['50%'],
                             icon: ret.code == 0?1:2,
                             time: 1500 //2秒关闭（如果不配置，默认是3秒）

web/src/main/resources/templates/jlw/studentClientLink/popularizeLink.html

@@ -184,7 +184,7 @@
                     layer.confirm('是否确定左移  “<span style="color: red">'+data.studentClientLinkTitle+'</span>”  该信息？', function (index) {
                         var ret = Common.postAjax("/jlw/studentClientLink/move.json",
                             {id:data.studentClientLinkId,moveType:'MOVE_LEFT'});
-                        layer.msg(ret.code == 0?"移动成功！":ret.msg, {
+                        layer.msg(ret.code == 0?"操作成功！":ret.msg, {
                             offset: ['50%'],
                             icon: ret.code == 0?1:2,
                             time: 1500 //2秒关闭（如果不配置，默认是3秒）
@@ -198,7 +198,7 @@
                     layer.confirm('是否确定右移 "<span style="color: red">'+data.studentClientLinkTitle+'</span>" 该信息？', function (index) {
                         var ret = Common.postAjax("/jlw/studentClientLink/move.json",
                             {id:data.studentClientLinkId,moveType:'MOVE_RIGHT'});
-                        layer.msg(ret.code == 0?"移动成功！":ret.msg, {
+                        layer.msg(ret.code == 0?"操作成功！":ret.msg, {
                             offset: ['50%'],
                             icon: ret.code == 0?1:2,
                             time: 1500 //2秒关闭（如果不配置，默认是3秒）
@@ -212,7 +212,7 @@
                     layer.confirm('是否确定置顶 "<span style="color: red">'+data.studentClientLinkTitle+'</span>" 该信息？', function (index) {
                         var ret = Common.postAjax("/jlw/studentClientLink/move.json",
                             {id:data.studentClientLinkId,moveType:'MOVE_TOP'});
-                        layer.msg(ret.code == 0?"移动成功！":ret.msg, {
+                        layer.msg(ret.code == 0?"操作成功！":ret.msg, {
                             offset: ['50%'],
                             icon: ret.code == 0?1:2,
                             time: 1500 //2秒关闭（如果不配置，默认是3秒）

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

@@ -1,9 +1,9 @@
 <!--#layout("/common/layout.html",{"jsBase":"/js/jlw/teachingManagement/"}){ -->
 <style>
     /* 分页确定按钮*/
-    .layui-laypage-btn{
-        color: white!important;
-    }
+    /*.layui-laypage-btn{*/
+    /*    color: white!important;*/
+    /*}*/
     .layui-table a {
         margin-right: 10px;
     }