diff --git a/safesite/edu/urls.py b/safesite/edu/urls.py
index 241ae9e1..3bf19db2 100644
--- a/safesite/edu/urls.py
+++ b/safesite/edu/urls.py
@@ -2,12 +2,12 @@ from django.urls import path
 from . import views
 
 urlpatterns = [
-    path('', views.index),
-    path('add',views.add),
     path('addwj',views.addwj),
     path('api',views.api),
     path('selectDate',views.selectDate),#查询
     path('api/upload',views.upload),#上传
     path('eduvideoshow',views.showvideo),
     path('html/edulessondetail/detail/<int:jyid>/', views.edulessondetail),#观看历史
+    path('file/edit/<int:id>/',views.edulessonedit),
+    path('', views.index),
  ]
diff --git a/safesite/edu/views.py b/safesite/edu/views.py
index 241ee8e6..848efed1 100644
--- a/safesite/edu/views.py
+++ b/safesite/edu/views.py
@@ -36,6 +36,8 @@ def addwj(req):
 def edulessondetail(req,jyid):
     return render(req,'edulessondetail.html',{'jyid':jyid}) 
 
+def edulessonedit(req,id):
+    return render(req,'edulessonedit.html',{'id':id})
 #上传视频，文件，返回地址和名称
 def upload(req):
     username = User.objects.get(userid=req.session['userid']).username
diff --git a/safesite/static/safesite/mystatic/js/util.js b/safesite/static/safesite/mystatic/js/util.js
index 0714c6d0..f415e7f0 100644
--- a/safesite/static/safesite/mystatic/js/util.js
+++ b/safesite/static/safesite/mystatic/js/util.js
@@ -194,12 +194,22 @@ function convert(rows, x) {
     for (var i = 0; i < rows.length; i++) {
         var row = rows[i];
         if (!exists(rows, row.parentId)) {
-            nodes.push({
+            let node = {
                 id: row.id,
                 text: row.name,
                 state: x,
                 pic: row.pic
-            });
+            }
+            if(row.name=='默认分类'){
+                node = {
+                    id: row.id,
+                    text: row.name,
+                    state: 'closed',
+                    pic: row.pic
+                }
+            }
+            
+            nodes.push(node);
         }
     }
 
diff --git a/safesite/templates/edulessonaddwj.html b/safesite/templates/edulessonaddwj.html
index c256c85f..aec9942d 100644
--- a/safesite/templates/edulessonaddwj.html
+++ b/safesite/templates/edulessonaddwj.html
@@ -182,6 +182,17 @@
 </div>
 <script type="text/javascript">
 
+$("#cate").combotree({
+onBeforeSelect: function (node) {
+//返回树对象
+var tree = $(this).tree;
+//选中的节点是否为叶子节点,如果不是叶子节点,清除选中
+var isLeaf = tree('isLeaf', node.target);
+if (!isLeaf) {
+$("#cate").treegrid("unselect");
+}
+}
+});
     function wssubmitForm() {
        
       
diff --git a/safesite/templates/edulessonedit.html b/safesite/templates/edulessonedit.html
new file mode 100644
index 00000000..dd436a13
--- /dev/null
+++ b/safesite/templates/edulessonedit.html
@@ -0,0 +1,360 @@
+<style type="text/css">
+
+    #content {
+        border: 1px solid saddlebrown;
+        padding: 16px;
+        border-radius: 2px;
+        margin-top: 50px;
+    }
+
+    .list {
+        top: 15px;
+        width: 140px;
+        height: 40px;
+        border: 1px solid #0082E6;
+        display: inline-block;
+        border-radius: 2px;
+        position: relative;
+        line-height: 40px;
+    }
+
+    #file {
+        position: absolute;
+        opacity: 0;
+        color: white;
+        width: 100%;
+        height: 100%;
+        z-index: 100;
+    }
+
+    .list span {
+        display: inline-block;
+        text-align: center;
+        width: 100%;
+        line-height: 40px;
+        position: absolute;
+        color: #0082E6;
+    }
+
+    video {
+        margin-top: 8px;
+        border-radius: 4px;
+    }
+
+    ._p {
+        margin: 14px;
+    }
+
+        ._p input {
+            display: inline-block;
+            width: 70%;
+            margin-left: 6px;
+        }
+
+        ._p span {
+            font-size: 15px;
+        }
+    .container {
+         width: 100%;
+         height: 20px;
+         background-color: gray;
+        
+        
+    }
+
+     #progress {
+         height: 20px;
+         background-color: orange;
+         display: inline-block;
+        
+    }
+    .btn {
+        text-align: center;
+       
+        color: #0082E6;
+        width: 140px;
+        height: 41px;
+        border: 1px solid #0082E6;
+        display: inline-block;
+        border-radius: 2px;
+        position: relative;
+        line-height: 40px;
+        background-color: white;
+    }
+    .ploadname {
+        display: inline-block;
+        text-align: center;
+        color: #0082E6;
+        height: 40px;
+        display: inline-block;
+        border-radius: 2px;
+        position: relative;
+        line-height: 40px;
+        background-color: white;
+    }
+    
+  
+</style>
+<div class="easyui-layout" style="width:100%;height:100%;">
+    <form id="edu" method="post" name="edu" enctype="multipart/form-data">
+        <div data-options="region:'center'" style="padding:15px 15px;">
+
+            <table style="line-height: 30px;">
+                <tr>
+                    <td>标题：</td>
+                    <td>
+                        <input id="title" class="easyui-textbox" name="title" style="width:480px">
+                    </td>
+                </tr>
+
+                <!-- <tr>
+                    <td>上传时间：</td>
+                    <td>
+                        <input id="submittime" editable="false" name="submittime" class="easyui-datetimebox" style="width:480px"
+                               data-options="currentText:'今天',closeText:'关闭',showSeconds:false" />
+                    </td>
+                </tr> -->
+                <!-- <tr>
+                    <td>资料类型：</td>
+                    <td>
+                        <select name='type' id='type' style="width:480px;height:32px">
+                            <option value="2" selected>office文档</option>
+                            <option value="3">压缩包</option>
+                        </select>
+
+                    </td>
+                </tr> -->
+                <tr>
+                    <td>文件描述：</td>
+                    <td>
+                        <input id="desciption" class="easyui-textbox" name="desciption" style="width:480px;height:100px" data-options="multiline:true" />
+                    </td>
+                </tr>
+                <tr>
+                    <td>所属类别：</td>
+                    <td>
+                        <input id="cate" class="easyui-combotree" name="cate" style="width:480px" data-options="url:'api/questioncat?a=tree',loadFilter: function (rows) {
+                    return convert(rows);
+                },">
+                    </td>
+                </tr>
+               
+
+            </table>
+            <div id="content">
+
+                <p class="_p">
+
+                    <a class="list" href="javascript:;">
+                        <input id="file" type="file" name="myfile" accept=".xls,.ppt,.doc,.pdf,.rar,.zip,.pptx,.docx,.xlsx"  onchange="UpladFile(this); " /><span>选择文件</span>
+                    </a>
+                    <!--<button class="btn" type="button" onclick="sub();">上传</button>-->
+                    <a class="el-upload-list__item-name">
+                        <i class="el-icon-document"></i><span class="ploadname" id="fileName">上传文件名称</span>
+                    </a>
+                    <span id="url" style="display:none"></span>
+                </p>
+               
+
+                <!--进度条-->
+                <div class="el-progress el-progress--line" style="display: none;">
+                    <div class='container'>
+                        <span id="progress"></span>
+
+                    </div>
+                    <!--上传速度显示-->
+                    <span id="time"></span>
+                </div>
+
+
+              
+            </div>
+        
+        </div>
+        
+            
+        <div id='southdiv' data-options="region:'south'" style="height:50px;text-align:center;padding:5px">
+            <a href="javascript:void(0)" iconCls="fa-check" class="easyui-linkbutton" onclick="wssubmitForm()" id="submitb">提交</a>
+            <a href="javascript:void(0)" iconCls="fa-close" class="easyui-linkbutton" onclick="closeForm()">取消</a>
+        </div>
+       
+    </form>
+</div>
+<script type="text/javascript">
+
+$("#cate").combotree({
+onBeforeSelect: function (node) {
+//返回树对象
+var tree = $(this).tree;
+//选中的节点是否为叶子节点,如果不是叶子节点,清除选中
+var isLeaf = tree('isLeaf', node.target);
+if (!isLeaf) {
+$("#cate").treegrid("unselect");
+}
+}
+});
+    function wssubmitForm() {
+       
+      
+        var edudata = $('#edu').serializeJSON();
+        edudata['url'] = document.getElementById('url').innerHTML;
+      
+        $.ajax({
+            type: "POST",
+            url: 'edu/api?a=addwj',
+            data: JSON.stringify(edudata),
+            datatype: "json",
+            processData: false,
+            contentType: "application/json;charset=utf-8",
+            beforeSend: function () {
+                var bo = $('#edu').form('validate')
+                if (bo == false) {
+                    return bo
+                } else {
+                    $('#submitb').linkbutton('disable');
+                }
+            },
+            success: function (data) {
+                if (data.code == 1) {
+                    $('#edutab').datagrid('reload');
+                    $("#dd").dialog("close");
+                } else { $.messager.alert('提示', '失败!'); }
+                $('#submitb').linkbutton('enable');
+            },
+        });
+
+    }
+
+    var xhr;//异步请求对象
+    var ot; //时间
+    var oloaded;//大小
+    //上传文件方法
+    function UpladFile(target, id) {
+       
+        var fileObj = document.getElementById("file").files[0]; // js 获取文件对象
+        if (fileObj.name) {
+            $(".el-upload-list").css("display", "block");
+            $(".el-upload-list li").css("border", "1px solid #20a0ff");
+            if (fileObj == undefined || fileObj == "") {
+                alert("请选择文件");
+                return false;
+            };
+
+
+            var filetypes = [".xls",".txt",".ppt",".doc",".pdf",".dot",".rar",".zip",".docx", ".pptx", ".xlsx"];
+            var filepath = target.value;
+            if (filepath) {
+                var isnext = false;
+                var fileend = filepath.substring(filepath.indexOf("."));
+                if (filetypes && filetypes.length > 0) {
+                    for (var i = 0; i < filetypes.length; i++) {
+                        if (filetypes[i] == fileend) {
+                            isnext = true;
+                            break;
+                        }
+                    }
+                }
+                if (!isnext) {
+                    alert("不接受此文件类型！");
+                    target.value = "";
+                    $("#videoName").text('文件格式不支持，请重新选择上传文件！');
+                    return false;
+                }
+            } else {
+                return false;
+            }
+
+
+            var imagSize = fileObj.size;
+            if (imagSize > 1024 * 1024 * 10) {
+                alert("文件大小为：" + (imagSize / (1024 * 1024)).toFixed(2) + "M，超出了上传大小，" + "请选择10M以内的文件！");
+                $("#videoName").text('文件太大了超出范围！');
+                return false;
+            }
+
+            var url = "edu/api/upload"; // 接收上传文件的后台地址 
+            var form = new FormData(); // FormData 对象
+            form.append("mf", fileObj); // 文件对象
+            xhr = new XMLHttpRequest(); // XMLHttpRequest 对象
+            xhr.open("post", url, true); //post方式，url为服务器请求地址，true 该参数规定请求是否异步处理。
+            xhr.onload = uploadComplete; //请求完成
+            xhr.onerror = uploadFailed; //请求失败
+            xhr.upload.onprogress = progressFunction; //【上传进度调用方法实现】
+            xhr.upload.onloadstart = function () { //上传开始执行方法
+                ot = new Date().getTime(); //设置上传开始时间
+                oloaded = 0; //设置上传开始时，以上传的文件大小为0
+            };
+            xhr.send(form); //开始上传，发送form数据
+            $("#fileName").text(fileObj.name);
+        }
+       
+        else {
+            alert("请选择文件");
+        }
+    }
+   
+   
+    //上传进度实现方法，上传过程中会频繁调用该方法
+    function progressFunction(evt) {
+        // event.total是需要传输的总字节，event.loaded是已经传输的字节。如果event.lengthComputable不为真，则event.total等于0
+        if (evt.lengthComputable) {
+
+            $(".el-progress--line").css("display", "block");
+            var percent = Math.round(evt.loaded * 100 / evt.total);
+            
+            /*进度条显示进度*/
+            document.getElementById('progress').innerHTML = Math.round(evt.loaded / evt.total * 100) + "%";
+            document.getElementById('progress').style.width = percent.toFixed(2) + '%';
+            
+        }
+
+        var time = document.getElementById("time");
+        var nt = new Date().getTime(); //获取当前时间
+        var pertime = (nt - ot) / 1000; //计算出上次调用该方法时到现在的时间差，单位为s
+        ot = new Date().getTime(); //重新赋值时间，用于下次计算
+
+        var perload = evt.loaded - oloaded; //计算该分段上传的文件大小，单位b 
+        oloaded = evt.loaded; //重新赋值已上传文件大小，用以下次计算
+
+        //上传速度计算
+        var speed = perload / pertime; //单位b/s
+        var bspeed = speed;
+        var units = 'b/s'; //单位名称
+        if (speed / 1024 > 1) {
+            speed = speed / 1024;
+            units = 'k/s';
+        }
+        if (speed / 1024 > 1) {
+            speed = speed / 1024;
+            units = 'M/s';
+        }
+        speed = speed.toFixed(1);
+        //剩余时间
+        var resttime = ((evt.total - evt.loaded) / bspeed).toFixed(1);
+        time.innerHTML = '上传速度：' + speed + units + ',剩余时间：' + resttime + 's';
+        if (bspeed == 0)
+            time.innerHTML = '上传已取消';
+    }
+    //上传成功响应
+    function uploadComplete(evt) {
+        //服务断接收完文件返回的结果  注意返回的字符串要去掉双引号
+       
+        if (evt.target.responseText) {
+            var data = JSON.parse(evt.target.responseText);
+            if (data.code = 1) {
+               
+                var str = data.filepath;
+                document.getElementById('url').innerHTML = str;
+                alert("上传成功！");
+            }
+            } else {
+            alert("上传失败");
+        }
+    }
+    //上传失败
+    function uploadFailed(evt) {
+        alert("上传失败！");
+    }
+  
+    
+    </script>
diff --git a/safesite/templates/edulessonindex.html b/safesite/templates/edulessonindex.html
index 0e603f14..ec8e37d7 100644
--- a/safesite/templates/edulessonindex.html
+++ b/safesite/templates/edulessonindex.html
@@ -15,12 +15,15 @@
         </div>        
         <div >
             {% load myfilter %}
-            {% if request|has_permission:'b_edu_addvideo' %}
+            <!-- {% if request|has_permission:'b_edu_addvideo' %}
             <a id="addedu" class="easyui-linkbutton" onclick="javascript:opendg('新增视频','edu/add')" data-options="iconCls: 'fa-plus',plain:true">上传视频</a>
-            {% endif %}
+            {% endif %} -->
             {% if request|has_permission:'b_edu_addfile' %}
-            <a id="addedu" class="easyui-linkbutton" onclick="javascript:opendg('新增文件','edu/addwj')" data-options="iconCls: 'fa-plus',plain:true">上传文件</a>
+            <a id="addedu" class="easyui-linkbutton" onclick="javascript:opendg('新增资料','edu/addwj')" data-options="iconCls: 'fa-plus',plain:true">上传资料</a>
             {% endif %}
+            <!-- {% if request|has_permission:'b_edu_change' %}
+            <a id="editedu" class="easyui-linkbutton" onclick="editedu()" data-options="iconCls: 'fa-pencil',plain:true">编辑资料</a>
+            {% endif %} -->
             {% if request|has_permission:'b_edu_del' %}
             <a id="deledu" class="easyui-linkbutton" onclick="deledu()" data-options="iconCls: 'fa-trash',plain:true">删除文件</a>
             {% endif %}
@@ -165,4 +168,15 @@
         }
         else { $.messager.alert('提示', '请选择一行数据!'); }
     }
+    function editedu(){
+        var row = $('#edutab').datagrid('getSelected');
+        if (row) {
+            var url = 'edu/file/edit/' + row.id
+            opendg('编辑资料',url)
+
+        }
+        else {
+            $.messager.alert('提示', '请选择一行数据!');
+        }
+    }
 </script>
\ No newline at end of file