diff --git a/safesite/templates/behavior.html b/safesite/templates/behavior.html
index 8e007297..12794295 100644
--- a/safesite/templates/behavior.html
+++ b/safesite/templates/behavior.html
@@ -297,9 +297,9 @@
用户ID |
- 观察记录人姓名 |
- 观察部门 |
- 行为观察数 |
+ 观察记录人姓名 |
+ 观察部门 |
+ 行为观察数 |
diff --git a/safesite/templates/edulessonadd.html b/safesite/templates/edulessonadd.html
index e5b33e16..00cbb214 100644
--- a/safesite/templates/edulessonadd.html
+++ b/safesite/templates/edulessonadd.html
@@ -133,7 +133,7 @@
选择视频:
- 选择视频
+ 选择视频
diff --git a/safesite/templates/equipmentfigure.html b/safesite/templates/equipmentfigure.html
index c038d430..874eaa0b 100644
--- a/safesite/templates/equipmentfigure.html
+++ b/safesite/templates/equipmentfigure.html
@@ -250,30 +250,7 @@
-
-
-
-
- 姓名 |
- 用户名 |
- 培训次数 |
-
-
-
-
-
+
diff --git a/safesite/templates/trainfigure.html b/safesite/templates/trainfigure.html
index d5a4bd3f..a311db25 100644
--- a/safesite/templates/trainfigure.html
+++ b/safesite/templates/trainfigure.html
@@ -299,9 +299,9 @@
- 姓名 |
- 用户名 |
- 培训次数 |
+ 姓名 |
+ 用户名 |
+ 培训次数 |
diff --git a/safesite/views.py b/safesite/views.py
index 4e9011fe..09f9ad50 100644
--- a/safesite/views.py
+++ b/safesite/views.py
@@ -2204,7 +2204,7 @@ def fxhandle(req):
objs = objs.filter(fxsj__gte=req.GET.get('qssj'))
if req.GET.get('jssj'):
objs = objs.filter(fxsj__lte=req.GET.get('jssj'))
- objs = objs.values('zgr__userid','zgr__name','zgbm__partname').annotate(number = Count('zgr')).order_by('-number')
+ objs = objs.values('zgr__userid','zgr__name','zgbm__partname').annotate(number = Count('zgr')).order_by('-zgsj')
total = objs.count()
return HttpResponse(transjson(total,objs),content_type="application/json")
# elif a == 'exportexcel':