From b68046e52f374a983311775f0a7dba5807d14299 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A7=9A=E4=B8=B9ab?= <1421553879@qq.com>
Date: Sat, 15 Jul 2023 00:57:20 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E5=AE=9E=E6=93=8D-=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E9=A2=98=E7=9B=AE=E9=80=89=E6=8B=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../static/js/jlw/resourcesInfo/index.js      |  2 +-
 .../add.js                                    | 28 +++++++++----------
 .../add.html                                  |  4 +--
 3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/web/src/main/resources/static/js/jlw/resourcesInfo/index.js b/web/src/main/resources/static/js/jlw/resourcesInfo/index.js
index 0a39f4f8..c71b1542 100644
--- a/web/src/main/resources/static/js/jlw/resourcesInfo/index.js
+++ b/web/src/main/resources/static/js/jlw/resourcesInfo/index.js
@@ -70,7 +70,7 @@ layui.define(['form', 'laydate', 'table'], function (exports) {
         selectList += htmY + '</optgroup>' + htmK + '</optgroup>' + htmL + '</optgroup>' + "</select>";
         //console.log($("#isUser").val())
     }else {
-        selectList+= htmL + '</optgroup>' + htmO + '</optgroup>' + "</select>";
+        selectList+=  htmO + '</optgroup>' + "</select>";
     }
 
     /*$.each(courseLabelTypes, function (key, value) {
diff --git a/web/src/main/resources/static/js/jlw/teacherOpenCourseHandsOnSimulationTasks/add.js b/web/src/main/resources/static/js/jlw/teacherOpenCourseHandsOnSimulationTasks/add.js
index 0034d7c9..390263b8 100644
--- a/web/src/main/resources/static/js/jlw/teacherOpenCourseHandsOnSimulationTasks/add.js
+++ b/web/src/main/resources/static/js/jlw/teacherOpenCourseHandsOnSimulationTasks/add.js
@@ -225,7 +225,7 @@ layui.define([ 'form', 'laydate', 'table','teacherOpenCourseHandsOnSimulationTas
             , btn: ['保存','关闭']
             ,success:function () {
                 resourcesQuestionTable();
-                Lib.getCourseInfo($("select[name='courseInfoId_1']"), teacherOpenCourseId);
+                Lib.getCourseInfo($("select[name='courseInfoId_1']"), teacherOpenCourseId,2,1);
             }
             , yes: function (index, layero) {
                 var ret = Common.getAjax('/jlw/handsOnSimulationTasks/getObjectiveProblem.do?problemIds='+resourcesQuestionIds);
@@ -250,8 +250,8 @@ layui.define([ 'form', 'laydate', 'table','teacherOpenCourseHandsOnSimulationTas
     btn.on('click', function () {
         resourcesQuestionTable1.reload({
             where: {
-                'courseInfoParentId':teacherOpenCourseId,
-                'courseInfoId':$("#resourcesQuestionTable_demo select[name='courseInfoId_1']").find("option:selected").val(),
+                'teacherOpenCourseId':teacherOpenCourseId,
+                'teacherOpenCourseMergeCourseInfoId':$("#resourcesQuestionTable_demo select[name='courseInfoId_1']").find("option:selected").val(),
                 "questionStem":$("#resourcesQuestionTable_demo input[name='generalQuestionSettingName']").val(),
                 'questionType':$("#resourcesQuestionTable_demo select[name='questionType']").find("option:selected").val()
             },
@@ -263,22 +263,23 @@ layui.define([ 'form', 'laydate', 'table','teacherOpenCourseHandsOnSimulationTas
             if (obj.type == "all") {//全选
                 var checkStatus = table.checkStatus('resourcesQuestionTable').data;
                 for (var i = 0; i < checkStatus.length; i++) {
-                    if (("," + resourcesQuestionIds + ",").indexOf(checkStatus[i].resourcesQuestionId) < 0) {
+                    if (("," + resourcesQuestionIds + ",").indexOf(checkStatus[i].teacherOpenCourseMergeResourcesQuestionId) < 0) {
                         if (!$.isEmpty(resourcesQuestionIds)) {
-                            resourcesQuestionIds += "," + checkStatus[i].resourcesQuestionId;
+                            resourcesQuestionIds += "," + checkStatus[i].teacherOpenCourseMergeResourcesQuestionId;
                         } else {
-                            resourcesQuestionIds = checkStatus[i].resourcesQuestionId;
+                            resourcesQuestionIds = checkStatus[i].teacherOpenCourseMergeResourcesQuestionId;
                         }
                     }
                 }
             } else {
+                console.log(obj.data)
                 if (!$.isEmpty(resourcesQuestionIds)) {
-                    resourcesQuestionIds += "," + obj.data.resourcesQuestionId;
+                    resourcesQuestionIds += "," + obj.data.teacherOpenCourseMergeResourcesQuestionId;
                 } else {
-                    resourcesQuestionIds = obj.data.resourcesQuestionId;
+                    resourcesQuestionIds = obj.data.teacherOpenCourseMergeResourcesQuestionId;
                 }
             }
-        } else {//取消全选
+        } else {//取消选中
             if (obj.type == "all") {//全选
                 var checkStatus = table.cache["resourcesQuestionTable"];
                 for (var i = 0; i < checkStatus.length; i++) {
@@ -288,7 +289,6 @@ layui.define([ 'form', 'laydate', 'table','teacherOpenCourseHandsOnSimulationTas
                 resourcesQuestionIds = Lib.stringRemove(resourcesQuestionIds, obj.data.resourcesQuestionId);
             }
         }
-
         $("#countQ").html(resourcesQuestionIds.split(',').length)
     });
 
@@ -316,10 +316,10 @@ layui.define([ 'form', 'laydate', 'table','teacherOpenCourseHandsOnSimulationTas
             method: 'post',
             even: true,
             size: "sms",
-            url: Common.ctxPath + '/jlw/resourcesQuestion/list.json' // 数据接口
+            url: Common.ctxPath + '/api/teacherOpenCourseMergeResourcesQuestion/getManagePageList.do' // 数据接口
             , page: Lib.tablePage // 开启分页
             , limit: 8
-            , where: {"courseInfoParentId": teacherOpenCourseId}
+            , where: {"teacherOpenCourseId": teacherOpenCourseId}
             ,cols: [[ // 表头
                 {
                     type: 'checkbox', align: "center"
@@ -335,11 +335,11 @@ layui.define([ 'form', 'laydate', 'table','teacherOpenCourseHandsOnSimulationTas
                     }
                 },
                 {
-                    field: 'courseInfoParentName',
+                    field: 'teacherOpenCourseIdText',
                     title: '归属课程', align: "center"
                 },
                 {
-                    field: 'courseInfoName',
+                    field: 'teacherOpenCourseMergeCourseInfoIdText',
                     title: '归属章节', align: "center"
                 }
             ]],done: function(res, curr, count){
diff --git a/web/src/main/resources/templates/jlw/teacherOpenCourseHandsOnSimulationTasks/add.html b/web/src/main/resources/templates/jlw/teacherOpenCourseHandsOnSimulationTasks/add.html
index e8821e72..5abbfae0 100644
--- a/web/src/main/resources/templates/jlw/teacherOpenCourseHandsOnSimulationTasks/add.html
+++ b/web/src/main/resources/templates/jlw/teacherOpenCourseHandsOnSimulationTasks/add.html
@@ -248,7 +248,7 @@
                     <div class="layui-input-block">
                         <input type="hidden" name="taskList" value="${teacherOpenCourseHandsOnSimulationTasks.taskList}">
                         <button type="button" class="layui-btn bg_button button_add" id="manualProblemSetting1"
-                                style="float: left">题库选择
+                                style="float: left">教师的试题
                         </button>
                     </div>
                     <div class="layui-row">
@@ -651,7 +651,7 @@
         <div class="layui-inline" id="first">
             <label class="layui-form-label">归属章节：</label>
             <layui:simpleDictSelect style='layui-input-block'
-                                    type="course_info.course_info_name.course_info_status=1,course_info_type=2"
+                                    type="teacher_open_course_merge_course_info.course_info_name.course_info_status=1,course_info_type=2,course_info_parent_id=${teacherOpenCourseId}"
                                     id="courseInfoId1" name="courseInfoId_1" layFilter="select_courseInfoIds_"/>
         </div>
         <div class="layui-inline" id="second">