首页默认时间，上传进度

admin-core/src/main/resources/templates/teacherIndex.html

@@ -62,8 +62,8 @@
         <span style="position: absolute;left: 4%;">
             时间：
             <div class="layui-input-inline">
-                <input type="text" name="" style="width: 340px" placeholder="开始时间 —— 结束时间" autocomplete="off" class="layui-input"
+                <input type="text" name="" style="width: 340px" placeholder="开始时间 —— 结束时间" autocomplete="off"
-                       id="allDate">
+                       class="layui-input" id="allDate">
             </div>
         </span>
     <!--#if(isSignRole.get()!''== 2){ -->
@@ -283,12 +283,13 @@
         var adminIndexDetailData = [];
         var adminIndexBarchartData = [];
 
-        locadInfo();
+        locadInfo(Common.getNowDate(-30),Common.getNowDate(1));
         //日期时间范围选择
         laydate.render({
             elem: '#allDate'
             , type: 'date'
             , range: true
+            , value: [Common.getNowDate(-30) +' - '+Common.getNowDate(1)]
             , done: function (value, date) {
                 if ($.isEmpty(value)) {
                     Common.info("请选择时间！！");

web/src/main/resources/templates/jlw/courseInfo/courseConfigureNew.html

@@ -54,6 +54,16 @@
         position: relative;
         overflow: visible !important;
     }
+    .progressCss_mp4,.progressCss_file,.progressCss_ppt{
+        width: 100%;
+        background: #f0f0f0;
+        padding: 14px;
+        position: relative;
+        margin-top:10px;
+    }
+    .closeInfo{
+        position: absolute;right: 10px;bottom: 10px;cursor: pointer;color: red;
+    }
 </style>
 <input name="courseInfoId" type="hidden" value="${courseInfo.courseInfoId}"/>
 <div class="layui-row" style="margin: 0 auto;">
@@ -65,36 +75,48 @@
 <table id="courseInfoTable" lay-filter="courseInfoTable"></table>
 <!--本地上传-->
 <div style="display: none;" id="resources_demo">
-    <div class="layui-col-xs6" style="padding: 20px;border-right:thin solid #f4f4f4;height:200px">
+    <div class="layui-row">
-        <div class="grid-demo">
+        <div class="layui-col-xs6" style="padding: 20px;border-right:thin solid #f4f4f4;height:280px">
-        <div class="layui-upload-drag" id="resourcesUpload">
+            <div class="grid-demo layui-row">
-            <i class="layui-icon" style="color: #3a71a8"></i>
+                <div class="layui-upload-drag" id="resourcesUpload">
-            <p>点击上传，或将文件拖拽到此处</p>
+                    <i class="layui-icon" style="color: #3a71a8"></i>
-            <div id="uploadDemoView" style="display: none;">
+                    <p>点击上传，或将文件拖拽到此处</p>
-                <hr>
+                    <div id="uploadDemoView" style="display: none;">
-                <span style="color: #1E9FFF;">上传成功</span>
+                        <hr>
-                <input type="hidden" name="resourcesInfoContent" />
+                        <span style="color: #1E9FFF;">上传成功</span>
-                <input type="hidden" name="resourcesInfoId" />
+                        <input type="hidden" name="resourcesInfoContent" />
+                        <input type="hidden" name="resourcesInfoId" />
+                    </div>
+                    <!-- <div style="width: 100%;">
+                         <p id="showName"></p>
+                         <div class="layui-progress layui-progress-big" lay-showpercent="yes" lay-filter="demo">
+                             <div class="layui-progress-bar" lay-percent=""></div>
+                         </div>
+                     </div>-->
+                </div>
             </div>
+            <div class="layui-row" id="fildInfo"></div>
         </div>
+
+        <div class="layui-col-xs6" style="padding: 20px">
+            <div class="grid-demo">
+                <p>上传须知：</p> <p style="text-indent: 2em;">1、可上传视频格式：MP4</p>
+                <p style="text-indent: 2em;">2、可上传文档包括：word、ppt、pdf</p>
+                <p style="text-indent: 2em;">3、默认使用文件名称，可自行修改</p>
+                <!--<div class="el-col el-col-12">
+
+                </div>-->
+            </div>
         </div>
     </div>
-    <div class="layui-col-xs6" style="padding: 20px">
+   <div class="layui-row">
-        <div class="grid-demo">
+       <div class="layui-form-item">
-            <p>上传须知：</p> <p style="text-indent: 2em;">1、可上传视频格式：MP4</p>
+           <label class="layui-form-label" style="width: 90px;">资源名称：</label>
-            <p style="text-indent: 2em;">2、可上传文档包括：word、ppt、pdf</p>
+           <div class="layui-input-block" style="margin-left: 120px">
-            <p style="text-indent: 2em;">3、默认使用文件名称，可自行修改</p>
+               <input type="text" style="width: 90%;" name="resourcesInfoName" placeholder="请输入资源名称" autocomplete="off" class="layui-input">
-            <!--<div class="el-col el-col-12">
+           </div>
-
+       </div>
-            </div>-->
+   </div>
-        </div>
-    </div>
-    <div class="layui-form-item">
-        <label class="layui-form-label" style="width: 90px;">资源名称：</label>
-        <div class="layui-input-block" style="margin-left: 120px">
-            <input type="text" style="width: 90%;" name="resourcesInfoName" placeholder="请输入资源名称" autocomplete="off" class="layui-input">
-        </div>
-    </div>
 </div>
 <!--资源库上传-->
 <div id="edit_dialog" class="layui-form" style="display: none;padding: 20px 20px 0;overflow: auto;">
@@ -216,9 +238,37 @@ type="course_info.course_info_name.course_info_status!=3,course_info_type=1,find
 
         upload.render({
             elem: '#resourcesUpload'
-            ,url: Common.ctxPath +  '/jlw/file/update.do'
+            , url: Common.ctxPath +  '/jlw/file/update.do'
             , accept: 'file'
-            ,exts:"ppt|pptx|pdf|mp4|doc|docx"
+            , exts:"ppt|pptx|pdf|mp4|doc|docx"
+            ,progress: function(n, elem, e){
+                /*element.progress('demo', n + '%'); //可配合 layui 进度条元素使用
+                if(n == 100){
+                    layer.msg('上传完毕', {icon: 1});
+                }*/
+                element.progress('progressBar',n + '%');
+            }
+            ,choose: function(obj){
+                $("#fildInfo").append('<div class="progressCss_mp4">\n' +
+                    '<span type="text" class="nameV" style="width: 92%"></span>\n' +
+                    '<span class="mv_m" style="float: right;"></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:90%">\n' +
+                    '<div class="layui-progress-bar layui-bg-blue" lay-percent="0%"></div>\n' +
+                    '</div>\n' +
+                    '<span class="closeInfo">X</span>\n' +
+                    '</div>');
+            }
+            , before: function(obj){
+               /* element.progress('demo', '0%'); //进度条复位
+                layer.msg('上传中', {icon: 16, time: 0});*/
+                obj.preview(function(index, file, result) {
+                    //$('input[name="src"]').html(file.name);
+                    $('.progressCss_mp4:last .nameV').html(file.name);
+                    var size =   (file.size/1014).toFixed(1)+'kb';
+                    $('.progressCss_mp4:last .mv_m').html(size);
+                });
+            }
             ,done: function(res){
                 if(res.code == 0){
                     $("#uploadDemoView").show();
@@ -229,10 +279,21 @@ type="course_info.course_info_name.course_info_status!=3,course_info_type=1,find
                     }else {
                         $('#resources_demo input[name="resourcesInfoContent"]').val(res.data.src);
                     }
+                    $(".progressCss_mp4 .closeInfo").click(function (){
+                        $(this).parents(".progressCss_mp4").remove();
+                        $('#resources_demo input[name="resourcesInfoName"]').val("");
+                    })
                 }else {
+                    $('.progressCss_mp4:last .fileUrl').html(res.data.url);
+                    $(".progressCss_mp4 .closeInfo").unbind();
+                    $(".progressCss_mp4 .closeInfo").click(function (){
+                        $(this).parents(".progressCss_mp4").remove();
+                        $('#resources_demo input[name="resourcesInfoName"]').val("");
+                    })
                     layer.msg(res.msg);
                 }
-            }
+            } //进度条
+
         });
         var uploadInst = upload.render({
             elem: '#picWordUp' //上传图文
@@ -438,6 +499,7 @@ type="course_info.course_info_name.course_info_status!=3,course_info_type=1,find
                 addOpen("",'子章节名称',"",param);
             }else if (obj.event === 'updataResources') {//上传资源
                 updataResourcesOpen(data);
+
             }else if (obj.event === 'addLine') {//添加链接
                 addLine(data);
             } else if (obj.event === 'addPW') {//添加图文
@@ -585,6 +647,7 @@ type="course_info.course_info_name.course_info_status!=3,course_info_type=1,find
 
         /*资源类型弹出框*/
         function updataResourcesOpen(data) {
+            $(".progressCss_mp4").remove();
             layer.open({
                 title: '上传资源类型'
                 , shadeClose: true
@@ -641,7 +704,7 @@ type="course_info.course_info_name.course_info_status!=3,course_info_type=1,find
                 ,type:1
                 , shadeClose: true
                 , content: $("#resources_demo")
-                , area: ['650px','380px']
+                , area: ['650px','450px']
                 , btn: ['确定', '关闭']
                 ,yes:function (index, layero){
                     var resourcesInfoName = $('#resources_demo input[name="resourcesInfoName"]').val();
@@ -672,10 +735,12 @@ type="course_info.course_info_name.course_info_status!=3,course_info_type=1,find
                     if(resourcesInfoContent.indexOf(".PDF") >=0 || resourcesInfoContent.indexOf(".pdf") >=0){
                         param.resourcesInfoType = 3;
                     }
-                    postResourcesInfo(resourcesInfoId, param,index)
+                    postResourcesInfo(resourcesInfoId, param,index);
+                    $(".progressCss_mp4").remove();
                 }
                 , btn2: function (index, layero) {
                     layer.close(index);
+                    $(".progressCss_mp4").remove(); //进度条复位
                 }
             });
         }