diff --git a/safesite/edu/views.py b/safesite/edu/views.py index 62d5bfd3..e4ba9299 100644 --- a/safesite/edu/views.py +++ b/safesite/edu/views.py @@ -143,9 +143,9 @@ def api(req): obj.save() return JsonResponse({"code":1,"url": a.url}) #观看详情 + elif a=='detail': - id =req.GET.get('eduid') - a = EdulessonWatch.objects.filter(edulesson=id).values('id','user__name','submittime') - total = a.count() - return HttpResponse(transjson(total,a),content_type="application/json") - \ No newline at end of file + id=req.GET.get('zrid') + a = EdulessonWatch.objects.filter(edulesson=id).values('id','user__name','submittime') + total = a.count() + return HttpResponse(transjson(total,a),content_type="application/json") \ No newline at end of file diff --git a/safesite/migrations/0297_merge_20191216_1700.py b/safesite/migrations/0297_merge_20191216_1700.py new file mode 100644 index 00000000..1b213678 --- /dev/null +++ b/safesite/migrations/0297_merge_20191216_1700.py @@ -0,0 +1,14 @@ +# Generated by Django 2.2.8 on 2019-12-16 17:00 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('safesite', '0296_auto_20191206_1559'), + ('safesite', '0296_auto_20191209_1029'), + ] + + operations = [ + ] diff --git a/safesite/migrations/0298_auto_20191216_1700.py b/safesite/migrations/0298_auto_20191216_1700.py new file mode 100644 index 00000000..cc26ea48 --- /dev/null +++ b/safesite/migrations/0298_auto_20191216_1700.py @@ -0,0 +1,37 @@ +# Generated by Django 2.2.8 on 2019-12-16 17:00 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('safesite', '0297_merge_20191216_1700'), + ] + + operations = [ + migrations.RemoveField( + model_name='companyinfo', + name='liaison_fax', + ), + migrations.AddField( + model_name='operproce', + name='filepath', + field=models.CharField(blank=True, max_length=200, null=True), + ), + migrations.AddField( + model_name='operproce', + name='operprocepath', + field=models.CharField(blank=True, max_length=200, null=True), + ), + migrations.AddField( + model_name='resbility', + name='filepath', + field=models.CharField(blank=True, max_length=200, null=True), + ), + migrations.AddField( + model_name='resbility', + name='resbilitypath', + field=models.CharField(blank=True, max_length=200, null=True), + ), + ] diff --git a/safesite/models.py b/safesite/models.py index 15a6c14b..a455388b 100644 --- a/safesite/models.py +++ b/safesite/models.py @@ -1121,10 +1121,12 @@ class Resbility(models.Model): jobs = models.ForeignKey(Group,on_delete=models.CASCADE,null=True,blank=True)#岗位 homeworktype=models.ForeignKey(Dickey,on_delete=models.CASCADE,null=True,blank=True)#作业许可类型 department = models.ForeignKey(Partment,related_name='resbbm',on_delete=models.CASCADE,null=True,blank=True)#部门 + resbilitypath = models.CharField(max_length=200,null=True,blank=True)#上传文件 createuser = models.ForeignKey(User,on_delete=models.CASCADE)#上传者 createdate = models.DateTimeField(default = timezone.now)#上传时间 usecomp = models.ForeignKey(Partment,related_name='resbgs',on_delete=models.CASCADE,null=True,blank=True)#所属公司 deletemark = models.IntegerField(default=1)#是否删除 + filepath=models.CharField(max_length=200,null=True,blank=True) reads = models.IntegerField(default='0') #操作规程 class Operproce(models.Model): @@ -1133,10 +1135,12 @@ class Operproce(models.Model): jobs = models.ForeignKey(Group,on_delete=models.CASCADE,null=True,blank=True)#岗位 homeworktype=models.ForeignKey(Dickey,on_delete=models.CASCADE,null=True,blank=True)#作业许可类型 department = models.ForeignKey(Partment,related_name='optbm',on_delete=models.CASCADE,null=True,blank=True)#部门 + operprocepath = models.CharField(max_length=200,null=True,blank=True)#上传文件 createuser = models.ForeignKey(User,on_delete=models.CASCADE)#上传者 createdate = models.DateTimeField(default = timezone.now)#上传时间 usecomp = models.ForeignKey(Partment,related_name='optgs',on_delete=models.CASCADE,null=True,blank=True)#所属公司 deletemark = models.IntegerField(default=1)#是否删除 + filepath=models.CharField(max_length=200,null=True,blank=True) reads = models.IntegerField(default='0') #责任阅读表 class Readerblility(models.Model): diff --git a/safesite/templates/edulessonadd.html b/safesite/templates/edulessonadd.html index 00cbb214..0fc8cd81 100644 --- a/safesite/templates/edulessonadd.html +++ b/safesite/templates/edulessonadd.html @@ -133,7 +133,7 @@ 选择视频： - 选择视频 + 选择视频 @@ -214,20 +214,47 @@ var ot; //时间 var oloaded;//大小 //上传文件方法 - function UpladFile() { + 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"); - $("#videoName").text(fileObj.name); - var fileObj = document.getElementById("file").files[0]; // js 获取文件对象 if (fileObj == undefined || fileObj == "") { alert("请选择文件"); return false; }; - var imagSize = document.getElementById("file").files[0].size; + + + + var filetypes = [".mp4"]; + 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，超出了上传大小，" + "请选择3M以内的视频！"); + alert("视频大小为：" + (imagSize / (1024 * 1024)).toFixed(2) + "M，超出了上传大小，" + "请选择10M以内的视频！"); + $("#videoName").text('文件太大了超出范围！'); return false; } var url = "edu/api/upload"; // 接收上传文件的后台地址 @@ -241,8 +268,10 @@ xhr.upload.onloadstart = function () { //上传开始执行方法 ot = new Date().getTime(); //设置上传开始时间 oloaded = 0; //设置上传开始时，以上传的文件大小为0 + }; xhr.send(form); //开始上传，发送form数据 + $("#videoName").text(fileObj.name); } else { alert("请选择文件"); } diff --git a/safesite/templates/edulessonaddwj.html b/safesite/templates/edulessonaddwj.html index 2a581e55..1ea9e144 100644 --- a/safesite/templates/edulessonaddwj.html +++ b/safesite/templates/edulessonaddwj.html @@ -148,7 +148,7 @@

- 选择文件 + 选择文件 @@ -221,21 +221,46 @@ var ot; //时间 var oloaded;//大小 //上传文件方法 - function UpladFile() { + 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"); - $("#fileName").text(fileObj.name); - var fileObj = document.getElementById("file").files[0]; // js 获取文件对象 if (fileObj == undefined || fileObj == "") { alert("请选择文件"); return false; }; - var imagSize = document.getElementById("file").files[0].size; + + + var filetypes = [".xls",".txt",".ppt",".doc",".pdf",".dot"]; + 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 * 3) { alert("文件大小为：" + (imagSize / (1024 * 1024)).toFixed(2) + "M，超出了上传大小，" + "请选择3M以内的文件！"); + $("#videoName").text('文件太大了超出范围！'); return false; } @@ -252,6 +277,7 @@ oloaded = 0; //设置上传开始时，以上传的文件大小为0 }; xhr.send(form); //开始上传，发送form数据 + $("#fileName").text(fileObj.name); } else { @@ -312,7 +338,6 @@ var str = data.filepath; document.getElementById('url').innerHTML = str; alert("上传成功！"); - } } else { alert("上传失败"); diff --git a/safesite/templates/mgtadd.html b/safesite/templates/mgtadd.html index 484383fa..595b63cb 100644 --- a/safesite/templates/mgtadd.html +++ b/safesite/templates/mgtadd.html @@ -126,21 +126,16 @@ 选择文件： - 选择文件 + 选择文件 - + + + +

- - - + +