修改bug

web/src/main/resources/static/js/jlw/handsOnSimulationTasks/add.js

@@ -511,6 +511,7 @@ layui.define([ 'form','laytpl', 'laydate', 'table','element','handsOnSimulationT
     			
     }
 
+    // noinspection BadExpressionStatementJS
     form.on('radio(taskType)', obj => {
         element.tabChange('demo', obj.value);
         if (obj.value === "4") {

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

@@ -1,10 +1,10 @@
 <!--#layout("/common/layout.html",{"jsBase":"/js/jlw/handsOn/"}){ -->
 <style>
     /* 分页确定按钮*/
-    .layui-laypage-btn{
         color: white!important;
     }
-    .layui-table a {
+    .layui    .layui-laypage-btn{
+    -table a {
         margin-right: 10px;
     }
 </style>
@@ -13,7 +13,8 @@
         <label class="layui-form-label">课程筛选</label>
         <div class="layui-input-inline">
             <layui:simpleDictSelect style='layui-input-inline'
-                                    type="course_info.course_info_name.course_info_status=1,course_info_type=1,find_in_set(course_label_id,(select group_concat(course_label_id) from course_label where course_label_status = 1))"
+                                    type="course_info.course_info_name.course_info_status=1,course_info_type=1,
+                                    find_in_set(course_label_id,(select group_concat(course_label_id) from course_label where course_label_status = 1))"
                                     id="courseInfoId" name="courseInfoId"
                                     layFilter="select_courseInfoIds"/>
         </div>

web/src/main/resources/templates/jlw/handsOnSimulationTasks/add.html

@@ -77,7 +77,7 @@
                         </div>
                     </div>
                 </div>
-                <div class="layui-row">
+                <!--<div class="layui-row">
                     <div class="layui-form-item">
                         <label class="layui-form-label">任务顺序</label>
                         <div class="layui-input-block">
@@ -86,7 +86,7 @@
                                    class="layui-input">
                         </div>
                     </div>
-                </div>
+                </div>-->
                 <div class="layui-row">
                     <div class="layui-form-item">
                         <label class="layui-form-label">任务分值</label>
@@ -155,7 +155,7 @@
                         </div>
                     </div>
                 </div>
-                <div class="layui-row">
+                <!--<div class="layui-row">
                     <div class="layui-form-item">
                         <label class="layui-form-label">任务顺序</label>
                         <div class="layui-input-block">
@@ -164,7 +164,7 @@
                                    class="layui-input">
                         </div>
                     </div>
-                </div>
+                </div>-->
                 <div class="layui-row">
                     <div class="layui-form-item">
                         <label class="layui-form-label">任务分值</label>
@@ -235,7 +235,7 @@
                         </div>
                     </div>
                 </div>
-                <div class="layui-row">
+                <!--<div class="layui-row">
                     <div class="layui-form-item">
                         <label class="layui-form-label">任务顺序</label>
                         <div class="layui-input-block">
@@ -244,7 +244,7 @@
                                    class="layui-input">
                         </div>
                     </div>
-                </div>
+                </div>-->
                 <div class="layui-row">
                     <label class="layui-form-label">客观题设置：</label>
                     <div class="layui-input-block">
@@ -346,7 +346,7 @@
                         </div>
                     </div>
                 </div>
-                <div class="layui-row">
+                <!--<div class="layui-row">
                     <div class="layui-form-item">
                         <label class="layui-form-label">任务顺序</label>
                         <div class="layui-input-block">
@@ -355,7 +355,7 @@
                                    class="layui-input">
                         </div>
                     </div>
-                </div>
+                </div>-->
                 <div class="layui-row">
                     <label class="layui-form-label">考核内容：</label>
                     <div class="layui-input-block">
@@ -450,7 +450,7 @@
                         </div>
                     </div>
                 </div>
-                <div class="layui-row">
+                <!--<div class="layui-row">
                     <div class="layui-form-item">
                         <label class="layui-form-label">任务顺序</label>
                         <div class="layui-input-block">
@@ -459,7 +459,7 @@
                                    class="layui-input">
                         </div>
                     </div>
-                </div>
+                </div>-->
                 <div class="layui-row">
                     <div class="layui-form-item">
                         <label class="layui-form-label">报告要求：</label>

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

@@ -21,13 +21,15 @@
         <div class="layui-inline">
             <label class="layui-form-label">链接类型</label>
             <div class="layui-input-inline">
-                <input type="text" name="studentClientLinkType" id="studentClientLinkType" value="THIRD_APPL" autocomplete="off" placeholder="请输入检索条件" class="layui-input">
+                <input type="text" name="studentClientLinkType" id="studentClientLinkType" value="THIRD_APPL"
+                       autocomplete="off" placeholder="请输入检索条件" class="layui-input">
             </div>
         </div>
         <div class="layui-inline">
             <label class="layui-form-label">状态</label>
             <div class="layui-input-inline">
-                <input type="text" name="studentClientLinkStatus" id="studentClientLinkStatus" value="1" autocomplete="off" placeholder="请输入检索条件" class="layui-input">
+                <input type="text" name="studentClientLinkStatus" id="studentClientLinkStatus" value="1"
+                       autocomplete="off" placeholder="请输入检索条件" class="layui-input">
             </div>
         </div>
     </div>
@@ -107,8 +109,15 @@
                         },
                         {
                             field: 'userId', title: '操作', align: "center", width: 150, templet: function (d) {
-                                var htm = '<a class="layui-table-link" lay-event="edit">编辑</a>';
+                                var htm = '';
+                                if (d.isEdit) {
+                                    htm = '<a class="layui-table-link" lay-event="edit">编辑</a>';
                                     htm += '<a class="layui-table-link" lay-event="del" >删除</a>';
+                                } else {
+                                    htm = '<a class="layui-table-link layui-btn-disabled" style="color: #b1b1b1">编辑</a>';
+                                    htm += '<a class="layui-table-link layui-btn-disabled" style="color: #b1b1b1">删除</a>';
+                                }
+
                                 return htm;
                             }
                         }

web/src/main/resources/templates/jlw/universitiesCollegesJurisdictionExperimentalSystem/add.html

@@ -66,8 +66,8 @@
                 <th>使用层次</th>
                 <th>开始时间</th>
                 <th>结束时间</th>
-                <!--<th>子系统<br/>登录页logo设计</th>
-                <th>子系统logo设计</th>-->
+                <th>子系统<br/>登录页logo设计</th>
+                <th>子系统logo设计</th>
                 <th>子系统底栏名称</th>
             </tr>
             </thead>
@@ -95,7 +95,7 @@
                                value="{{Common.getDate(item.useEndTime,'yyyy-MM-dd HH:mm')}}" name="useEndTime"
                                class="layui-input"/>
                     </td>
-                    <!--<td>
+                    <td>
                         {{#if(!$.isEmpty(item.subsystemIndexLogo)){}}
                         <img id="subsystemIndexLogo_xt_{{index}}" src="${ctxPath}{{item.subsystemIndexLogo}}"/>
                         {{#}else{}}
@@ -109,7 +109,7 @@
                         {{#}else{}}
                         <i class="iconfont" id="subsystemLogo_xt_{{index}}" style="font-size: 30px;color: #73a2f8;">&#xebb8;</i>
                         {{#}}}
-                    </td>-->
+                    </td>
                     <td>
                         <textarea name="subsystemBottomBar" style="min-height: 30px;"
                                   id="subsystemBottomBar_xt_{{index}}" placeholder="请输入内容" class="layui-textarea">
@@ -276,7 +276,8 @@
         function loadkcInfo() {
             var typeIds = '';
             $("input[name='xt_id']:checked").each(function (obj) {typeIds += obj+',';});
-            var ret = Common.getAjax("/jlw/universitiesCollegesJurisdictionCurriculumResources/getAllAuthCourseInfoByOrgId.json", {
+
+            var ret = Common.getAjax("/jlw/universitiesCollegesJurisdictionCurriculumResources/getAllByQuery.json", {
                 universitiesCollegesId: $("select[name='universitiesCollegesId']").val() || onUniversitiesCollegesId,
                 applicationIds:typeIds.substring(0,typeIds.length-1)
             });//获取课程系统