From 88fda3d63170480aaa2e7421b1218d826ec9e7a4 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Fri, 25 Dec 2020 17:51:54 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=A8=E4=BD=93=E5=91=98=E5=B7=A5=20?=
 =?UTF-8?q?=E9=9A=90=E8=97=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 safesite/templates/abtrain.html   | 4 ++--
 safesite/templates/getusers.html  | 2 +-
 safesite/templates/train.html     | 2 +-
 safesite/templates/usergroup.html | 2 +-
 safesite/views.py                 | 4 ++--
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/safesite/templates/abtrain.html b/safesite/templates/abtrain.html
index ea0b5090..7789f70c 100644
--- a/safesite/templates/abtrain.html
+++ b/safesite/templates/abtrain.html
@@ -60,9 +60,9 @@
                 <input id="duration" class="easyui-numberbox" name="duration" style="width:480px" data-options="min:0,precision:1,label:'培训时长',prompt:'小时'"
                     required=true>
             </div>
-            <div style="margin-bottom:5px">
+            <!-- <div style="margin-bottom:5px">
                 <input id="jsqd" class="easyui-checkbox" name="jsqd" value=1 label="结束签到:"><span style="color:blue">  开启后可精确员工培训时间,开始签到默认开启</span>
-            </div>
+            </div> -->
             <div id='knownumdiv' style="margin-bottom:5px;display:none">
                 <input id="knownum" class="easyui-numberbox" name="knownum" style="width:480px" data-options="label:'掌握人数',required:true">
             </div>
diff --git a/safesite/templates/getusers.html b/safesite/templates/getusers.html
index 5e2114ee..59b8e334 100644
--- a/safesite/templates/getusers.html
+++ b/safesite/templates/getusers.html
@@ -114,7 +114,7 @@
             }
         });
         $('#ddgrouptable').datagrid({
-            url: 'grouphandle?a=list',
+            url: 'grouphandle?a=list2',
             rownumbers: true,
             singleSelect: true,
             striped: true,
diff --git a/safesite/templates/train.html b/safesite/templates/train.html
index e48c7c55..209e308e 100644
--- a/safesite/templates/train.html
+++ b/safesite/templates/train.html
@@ -83,7 +83,7 @@
                         return 'background-color:yellow;';
                     }
                     else {
-                        return 'background-color:green;';
+                        return 'background-color:green;color:white';
                     }
                 }, formatter: function (value, row, index) {
                     if (value == 0) {
diff --git a/safesite/templates/usergroup.html b/safesite/templates/usergroup.html
index be3f3982..fc145ebc 100644
--- a/safesite/templates/usergroup.html
+++ b/safesite/templates/usergroup.html
@@ -37,7 +37,7 @@
     </div>
 <script>
      $('#grouptable').datagrid({
-        url: 'grouphandle?a=list',
+        url: 'grouphandle?a=list2',
         rownumbers: true,
         singleSelect: true,
         striped: true,
diff --git a/safesite/views.py b/safesite/views.py
index 3fba795e..415718ca 100644
--- a/safesite/views.py
+++ b/safesite/views.py
@@ -1863,7 +1863,7 @@ def grouphandle(req):
         userid = req.session['userid']
         companyid = getcompany(userid)
         a = Group.objects.filter(usecomp__partid=companyid).exclude(
-            grouptype=0).exclude(grouptype=3).values('groupid', 'groupname', 'grouptype')
+            grouptype=0).exclude(grouptype=3).order_by('groupid').values('groupid', 'groupname', 'grouptype')
         total = a.count()
         return HttpResponse(transjson(total, a), content_type="application/json")
     elif req.GET.get('a') == 'combobox':
@@ -6356,7 +6356,7 @@ def apiexamtest(req):
             a['notinTime'] = 1
         if 'endtime' in a and a['endtime'] < datetime.now():
             a['notinTime'] = 1
-        objs = ExamTestDetail.objects.filter(examtest__id=id).order_by('-score','-took').values(
+        objs = ExamTestDetail.objects.filter(examtest__id=id).order_by('-score','took').values(
             'id', 'user__name', 'user__ubelongpart__partname', 'took', 'score', 'remainnum', 'passcode','starttime', 'testnum')
         a['cjrydetail'] = list(objs)
         return HttpResponse(json.dumps(a, cls=MyEncoder), content_type="application/json")