diff --git a/web/src/main/resources/static/js/jlw/handsOnSimulationTasks/add.js b/web/src/main/resources/static/js/jlw/handsOnSimulationTasks/add.js
index 84a042b3..0e687d8b 100644
--- a/web/src/main/resources/static/js/jlw/handsOnSimulationTasks/add.js
+++ b/web/src/main/resources/static/js/jlw/handsOnSimulationTasks/add.js
@@ -1,12 +1,16 @@
 layui.define([ 'form','laytpl', 'laydate', 'table','element','handsOnSimulationTasksApi', 'upload', 'layedit','layer','table'], function(exports) {
-    var form = layui.form;
-    var laytpl = layui.laytpl;
     var handsOnSimulationTasksApi = layui.handsOnSimulationTasksApi;
-    var index = layui.index;
-    var element = layui.element, upload = layui.upload, layedit = layui.layedit
+    var form = layui.form,
+        laytpl = layui.laytpl,
+        index = layui.index,
+        element = layui.element,
+        upload = layui.upload,
+        layedit = layui.layedit,
+        layer = layui.layer,
+        table  = layui.table;
+
     element.render();
-    var layer = layui.layer;
-    var table  = layui.table;
+
     layedit.set({ //富文本上传图片
         uploadImage: {
             url: Common.ctxPath + "/jlw/file/update.do",
@@ -20,6 +24,7 @@ layui.define([ 'form','laytpl', 'laydate', 'table','element','handsOnSimulationT
     var selectResourcesQuestion = [];
     var tableData4 = [];
     var resourcesQuestionIds = ""; //选中题目id
+    var resourcesInfoTable = [];
 
     var courseInfoIds = $("input[name=courseInfoId_1]").val();
     var typeInfo = $("#taskTypeInfo input[name='taskType']:checked").val(); //当前操作的类型
@@ -72,18 +77,20 @@ layui.define([ 'form','laytpl', 'laydate', 'table','element','handsOnSimulationT
         ,url: Common.ctxPath +'/jlw/file/update.do'
         ,accept:'video'
         , progress: function(value) {
-            element.progress('progressBar',value + '%');
+            var v =
+            element.progress('progressBar',v);
         }
         ,choose: function(obj){
             $("#mp4Info").append('<div class="progressCss_mp4">\n' +
                 '<span type="text" class="nameV" style="width: 300px"></span>\n' +
-                '<span class="mv_m" style="float: right;"></span>\n' +
+                '<span class="mv_m" style="float: left;"></span>\n' +
                 '<span class="fileUrl" style="display: none;"></span>\n' +
                 '<div class="layui-progress " lay-showPercent="yes" lay-filter="progressBar" style="margin-top: 15px; width:300px">\n' +
-                '<div class="layui-progress-bar layui-bg-blue" lay-percent="0%"></div>\n' +
+                '<div class="layui-progress-bar layui-bg-blue" lay-percent="100%"></div>\n' +
                 '</div>\n' +
                 '<span class="closeInfo">X</span>\n' +
                 '</div>');
+            element.init();//进度条更新
         },
         before: function(obj) {
             obj.preview(function(index, file, result) {
@@ -92,6 +99,7 @@ layui.define([ 'form','laytpl', 'laydate', 'table','element','handsOnSimulationT
                 var size =   (file.size/1014).toFixed(1)+'kb';
                 $('.progressCss_mp4:last .mv_m').html(size);
             });
+
         }
         ,done: function(res){
             //如果上传失败
@@ -127,13 +135,14 @@ layui.define([ 'form','laytpl', 'laydate', 'table','element','handsOnSimulationT
         ,choose: function(obj){
             $("#pptInfo").append('<div class="progressCss_ppt">\n' +
                 '<span type="text" class="nameV" style="width: 300px"></span>\n' +
-                '<span class="mv_m" style="float: right;"></span>\n' +
+                '<span class="mv_m" style="float: left;"></span>\n' +
                 '<span class="fileUrl" style="display: none;"></span>\n' +
                 '<div class="layui-progress " lay-showPercent="yes" lay-filter="progressBarPPT" style="margin-top: 15px; width:300px">\n' +
-                '<div class="layui-progress-bar layui-bg-blue" lay-percent="0%"></div>\n' +
+                '<div class="layui-progress-bar layui-bg-blue" lay-percent="100%"></div>\n' +
                 '</div>\n' +
                 '<span class="closeInfo">X</span>\n' +
                 '</div>');
+            element.init();//进度条更新
         },
         before: function(obj) {
             obj.preview(function(index, file, result) {
@@ -179,13 +188,14 @@ layui.define([ 'form','laytpl', 'laydate', 'table','element','handsOnSimulationT
         choose: function(obj){
             $("#fileInfo").append('<div class="progressCss_file">\n' +
                 '<span type="text" class="nameV" style="width: 300px"></span>\n' +
-                '<span class="mv_m" style="float: right;"></span>\n' +
+                '<span class="mv_m" style="float: left;"></span>\n' +
                 '<span class="fileUrl" style="display: none;"></span>\n' +
                 '<div class="layui-progress " lay-showPercent="yes" lay-filter="progressBarFile" style="margin-top: 15px; width:300px">\n' +
-                '<div class="layui-progress-bar layui-bg-blue" lay-percent="0%"></div>\n' +
+                '<div class="layui-progress-bar layui-bg-blue" lay-percent="100%"></div>\n' +
                 '</div>\n' +
                 '<span class="closeInfo">X</span>\n' +
                 '</div>');
+            element.init();//进度条更新
         },
         before: function(obj) {
             obj.preview(function(index, file, result) {
@@ -603,5 +613,201 @@ layui.define([ 'form','laytpl', 'laydate', 'table','element','handsOnSimulationT
             getScoreInfo();
         });
     }
+    
+    $("#videoClick").click(function (obj) {
+        updataResourcesOpenRe("",1);
+    });
+
+    /*资源库上传弹出框*/
+    function updataResourcesOpenRe(dataOld,resourcesInfoType) {
+        layer.open({
+            type: 1,
+            title: "资源库上传",
+            shadeClose: true,
+            btn: ['保存', '关闭'],
+            btnAlign: 'c',
+            area: ['820px', '600px'],
+            content: $("#edit_dialog"),
+            success: function (layero, index) {
+                loadResourcesInfo(resourcesInfoType);
+                $(".search").unbind();
+                $(".search").click(function () {searchList(resourcesInfoType);}); //搜索
+            }, yes: function (index) {
+                var checkStatus = table.checkStatus("resourcesInfoTable"); //获取选中行状态
+                var dataNew = checkStatus.data, ids = Common.concatBatchId(dataNew, "resourcesInfoId");  //获取选中行数据
+
+                resourcesInfoShowTable(dataNew)
+
+                form.render()
+                layer.close(index);
+            }, btn2: function (index, layero) {
+                layer.close(index);
+            }
+        });
+    }
+
+    //资源库表格
+    function loadResourcesInfo(resourcesInfoType) {
+        $("#edit_dialog input[name='resourcesInfoName']").val("");
+        resourcesInfoTable = table.render({
+            elem: '#resourcesInfoTable',
+            height: Lib.getTableHeight(),
+            cellMinWidth: 100,
+            method: 'post',
+            even: true,
+            //url: Common.ctxPath + '/jlw/resourcesInfo/list.json' // 数据接口
+            url: Common.ctxPath + '/jlw/resourcesInfo/resourcesList.json' // 数据接口
+            , where: getParamRe(resourcesInfoType)
+            , page: Lib.tablePage // 开启分页
+            , limit: 10,
+            cols: [[ // 表头
+                {
+                    type: 'checkbox'
+                },
+                {
+                    field: 'resourcesInfoName', title: '资源名称', align: "center", style: "text-align: left;"
+                },
+                {
+                    field: 'courseInfoParentParentName', title: '归属课程', align: "center", width: 150
+                },
+                {
+                    field: 'resourcesInfoType', width: 150, title: '资源类型', align: "center", templet: function (d) {//(1视频 2PPT 3PDF)
+                        var text = d.resourcesInfoType == 1 ? "视频" : d.resourcesInfoType == 2 ? "PPT" : d.resourcesInfoType == 3 ? "PDF" : d.resourcesInfoType == 4 ? "链接" : d.resourcesInfoType == 5 ? "图文" : '-';
+                        return '<span class="textType">' + text + '</span>';
+                    }
+                },
+                {
+                    field: 'userId',
+                    title: '操作',
+                    width: 80,
+                    align: "center",
+                    templet: function (d) {
+                        var htm = '<button type="button" class="layui-btn layui-btn-xs bg_button" lay-event="previewPage">查看</button></a>';
+                        return htm;
+                    }
+                }
+            ]]
+        });
+        table.on('tool(resourcesInfoTable)', function (obj) {
+            var data = obj.data;
+            if (obj.event === 'previewPage') { //预览
+                Lib.downloadFile(data);
+            }
+        });
+        table.on('checkbox(resourcesInfoTable)', function(obj){
+            var htm = "已选中：";
+            var resourcesInfoTable = obj.data;
+            if(obj.checked){
+                htm += table.checkStatus("resourcesInfoTable").data.length;
+                //按钮逻辑Lib.buttonEnable()
+            }else{
+                htm += table.checkStatus("resourcesInfoTable").data.length;
+            }
+            $("#checkNumber").html(htm)
+        })
+    }
+
+    function resourcesInfoShowTable(data) {
+        table.render({
+            elem: '#resourcesInfoShowTable',
+            height: Lib.getTableHeight(),
+            cellMinWidth: 100,
+            method: 'post',
+            even: true,
+            data:data,
+            cols: [[ // 表头
+                {
+                    field: 'resourcesInfoName', title: '资源名称', align: "center", style: "text-align: left;"
+                },
+                {
+                    field: 'courseInfoParentParentName', title: '归属课程', align: "center", width: 150
+                },
+                {
+                    field: 'resourcesInfoType', width: 150, title: '资源类型', align: "center", templet: function (d) {//(1视频 2PPT 3PDF)
+                        var text = d.resourcesInfoType == 1 ? "视频" : d.resourcesInfoType == 2 ? "PPT" : d.resourcesInfoType == 3 ? "PDF" : d.resourcesInfoType == 4 ? "链接" : d.resourcesInfoType == 5 ? "图文" : '-';
+                        return '<span class="textType">' + text + '</span>';
+                    }
+                },
+                {
+                    field: 'userId',
+                    title: '操作',
+                    width: 160,
+                    align: "center",
+                    templet: function (d) {
+                        var htm = '<button type="button" class="layui-btn layui-btn-xs bg_button" lay-event="previewPage">查看</button></a>';
+                        htm += '<button type="button" class="layui-btn layui-btn-xs bg_button"  lay-event="del">删除</button></a>';
+                        return htm;
+                    }
+                }
+            ]]
+        });
+        table.on('tool(resourcesInfoShowTable)', function (obj) {
+            var data = obj.data;
+            if (obj.event === 'previewPage') { //预览
+                Lib.downloadFile(data);
+            }else if(obj.event === 'del'){
+                /*
+        resourcesInfoTable.reload({
+            where: getParamRe(resourcesInfoType),
+            page: {
+                curr: 1
+            }
+        });*/
+                console.log(table.cache.resourcesInfoShowTable)
+            }
+        });
+    }
+
+    /*资源数据提交*/
+    function postResourcesInfo(id, param,index) {
+        layer.load(0,{
+            shadeClose: false,
+            shade: [0.5]
+        });
+        setTimeout(function () {
+            var url = "/jlw/resourcesInfo/add.json";
+            if (!$.isEmpty(id)) {
+                url = "/jlw/resourcesInfo/edit.json";
+            }
+            var ret = Common.postAjax(url, param);
+            if (ret.code == 0) {
+                layer.close(index);
+                courseInfoTable();
+            }
+            layer.msg(ret.code == 0 ? "操作成功！" : ret.msg, {
+                offset: ['50%'],
+                icon: ret.code == 0 ? 1 : 2,
+                time: 1500 //2秒关闭（如果不配置，默认是3秒）
+            }, function () {
+
+                layer.closeAll();
+                if (ret.code == 0) {
+                    Lib.tableRefresh();
+                }
+            });
+        }, 50);
+    }
+    
+    /*资源表格搜索*/
+    /*资源表格搜索*/
+    function searchList(resourcesInfoType) {
+        resourcesInfoTable.reload({
+            where: getParamRe(resourcesInfoType),
+            page: {
+                curr: 1
+            }
+        });
+    }
+
+    /*资源库搜索条件*/
+    function getParamRe(resourcesInfoType){
+       var  param = {
+            "courseInfoFullId": $("#edit_dialog select[name='courseInfoId_1']").val(),
+            "resourcesInfoName": $("#edit_dialog input[name = 'resourcesInfoName']").val(),
+            "resourcesInfoType":resourcesInfoType
+        };
+       return param;
+    }
+    
     exports('add',view);
 });
diff --git a/web/src/main/resources/templates/jlw/handsOnSimulationTasks/add.html b/web/src/main/resources/templates/jlw/handsOnSimulationTasks/add.html
index e76d9b60..70f34e07 100644
--- a/web/src/main/resources/templates/jlw/handsOnSimulationTasks/add.html
+++ b/web/src/main/resources/templates/jlw/handsOnSimulationTasks/add.html
@@ -119,7 +119,11 @@
                         <div class="layui-form-label">添加视频</div>
                         <div class="layui-input-block">
                             <div class="layui-upload">
-                                <button type="button" style="margin-bottom: 10px;" class="layui-btn layui-btn-primary layui-font-blue" id="test-upload-normal"><i class="layui-icon"></i>点击添加</button>
+                                <div class="layui-btn-container">
+                                    <button type="button" id="test-upload-normal" style="margin-bottom: 10px;" class="layui-btn layui-btn-primary layui-font-blue"><i class="layui-icon"></i>点击添加</button>
+                                    <button type="button" id="videoClick" style="margin-bottom: 10px;" class="layui-btn layui-btn-normal">视频资源库</button>
+                                </div>
+
                                 <div id="mp4Info">
                                     <!--#if(handsOnSimulationTasks.tasksFileList != null){-->
                                         <!--#for(item in handsOnSimulationTasks.tasksFileList){ -->
@@ -142,6 +146,9 @@
                         </div>
                     </div>
                 </div>
+                <div class="layui-row" style="width: 50%;">
+                    <table id="resourcesInfoShowTable" lay-filter="resourcesInfoShowTable"></table>
+                </div>
             </div>
             <!--PPT-->
             <div taskType="2" class="layui-tab-item ${handsOnSimulationTasks.taskType=='2'?'layui-show':''}">
@@ -509,6 +516,10 @@
             </div>
         </div>
     </div>
+    <script id="checkResourcesInfoTableDemo" type="text/html">
+
+    </script>
+
     <!-- 业务对象须有hidden字段，保存delFlag和version字段-->
     <input type="hidden" name="taskId" value="${handsOnSimulationTasks.taskId}"/>
     <input type="hidden" name="courseInfoId_1" value="${courseInfoId}"/>
@@ -521,6 +532,7 @@
                 type="button" id="addButton" lay-submit="" lay-filter="form">确定</button>
     </div>
 
+    <!--题库弹窗开始-->
     <div id="resourcesQuestionTable_demo" style="display: none;padding: 20px 50px;min-height: 400px">
         <div class="layui-inline">
             <input type="text" name="generalQuestionSettingName" class="layui-input" placeholder="请输入题干名称">
@@ -551,6 +563,33 @@
         <table id="resourcesQuestionTable" lay-filter="resourcesQuestionTable"></table>
         <span>已选题目：<span id="countQ"></span></span>
     </div>
+    <!--试题弹窗结束-->
+
+    <!--资源库上传-->
+    <div id="edit_dialog" class="layui-form" style="display: none;padding: 20px 20px 0;overflow: auto;">
+        <div class="layui-inline">
+            <label class="layui-form-label" style="width: 80px">资源名称:</label>
+            <div class="layui-input-block" style="margin-left: 110px;">
+                <input type="text" id="resourcesInfoName" name="resourcesInfoName" class="layui-input">
+            </div>
+        </div>
+        <div class="layui-inline">
+            <label class="layui-form-label" style="width: 80px">归属课程:</label>
+            <div class="layui-input-block" style="margin-left: -80px;">
+                <layui:simpleDictSelect style='layui-input-block'
+type="course_info.course_info_name.course_info_status!=3,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="courseInfoIds" name="courseInfoId_1"
+                                        layFilter="select_courseInfoIds"/>
+            </div>
+        </div>
+        <div class="layui-inline" style="left: 30px;">
+            <button type="button" class="layui-btn bg_button search"><i class="layui-icon">&#xe615;</i></button>
+        </div>
+
+        <table id="resourcesInfoTable" lay-filter="resourcesInfoTable"></table>
+        <div id="checkNumber"></div>
+    </div>
+    <!--资源上传结束-->
 </form>
 <!--#} -->
 <script>