From d944c7084df77f5f5f3aa6f18cd6aad2b1c3275f Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Tue, 8 Sep 2020 09:08:42 +0800
Subject: [PATCH] oper file size

---
 safesite/tasks.py                    | 2 +-
 safesite/templates/abdict.html       | 1 +
 safesite/templates/operproceadd.html | 6 +++---
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/safesite/tasks.py b/safesite/tasks.py
index c5e4a4fc..b064d58c 100644
--- a/safesite/tasks.py
+++ b/safesite/tasks.py
@@ -286,7 +286,7 @@ def gridtasksend():
     time2 = nowtime + datetime.timedelta(minutes=50)
     RiskActTask.objects.filter(taskexpire__lte=nowtime, usable=1).update(usable=0)
     # for i in GridTaskSet.objects.filter(is_paused=False, last_send____gte=time2):
-    for i in GridTaskSet.objects.filter(is_paused=False, start_task____gte=time2):
+    for i in GridTaskSet.objects.filter(is_paused=False, start_task____lte=time2):
         sendGridtask(i)
 
 from dateutil.relativedelta import *
diff --git a/safesite/templates/abdict.html b/safesite/templates/abdict.html
index 2afca1bf..2be01ab4 100644
--- a/safesite/templates/abdict.html
+++ b/safesite/templates/abdict.html
@@ -23,6 +23,7 @@
             <div style="margin-bottom:10px">
                 <input id="dickeydetail" name="detail" style="width:90%;height:60px" 
                     data-options="label:'描述',multiline:true"></input></div>
+            
         </form>
     </div>
     <script>
diff --git a/safesite/templates/operproceadd.html b/safesite/templates/operproceadd.html
index 1e2e76d8..967f3f59 100644
--- a/safesite/templates/operproceadd.html
+++ b/safesite/templates/operproceadd.html
@@ -138,7 +138,7 @@
                     <span>选择文件： </span>
                     <!--文件选择按钮-->
                     <a class="list" href="javascript:;">
-                        <input id="file" type="file" name="myfile" accept=".doc,.txt,.pdf,.ppt,.docx,.pptx" onchange="UpladFile(this);" /><span>选择文件</span>
+                        <input id="file" type="file" name="myfile" accept=".doc,.txt,.pdf,.ppt,.docx,.pptx,.ppt" onchange="UpladFile(this);" /><span>选择文件</span>
                     </a>
 
 
@@ -251,7 +251,7 @@
                 return false;
             };
 
-            var filetypes = [".txt", ".ppt", ".doc", ".pdf", ".pptx", "docx"];//判断上传文件格式类型
+            var filetypes = [".txt", ".ppt", ".doc", ".pdf", ".pptx", "docx", ".ppt"];//判断上传文件格式类型
             var filepath = target.value;
             if (filepath) {
                 var isnext = false;
@@ -275,7 +275,7 @@
             }
             var imagSize = fileObj.size;
 
-            if (imagSize > 1024 * 1024 * 10) {
+            if (imagSize > 1024 * 1024 * 50) {
                 alert("文件大小为：" + (imagSize / (1024 * 1024)).toFixed(2) + "M，超出了上传大小，" + "请选择10M以内的视频！");
                 $("#videoName").text('文件太大了超出范围！');
                 return false;