locky 2 anni fa
parent
commit
fce710f5a3
2 ha cambiato i file con 5 aggiunte e 5 eliminazioni
  1. 1 1
      Controller/FileController.py
  2. 4 4
      Controller/LogController.py

+ 1 - 1
Controller/FileController.py

@@ -351,7 +351,7 @@ class UploadSerialNumberFileView(View):
             'content': json.dumps(content),
             'ip': ip,
             'time': now_time,
-            'url': 'upload',
+            'url': 'uploadSerialNumber',
             'operation': operation,
             'user': user_qs[0]
         }

+ 4 - 4
Controller/LogController.py

@@ -51,11 +51,11 @@ class LogView(View):
         line = request_dict.get('line', None)
 
         if page and line:
+            # 过滤登录登出,获取/重置序列号日志
             log_qs = LogModel.objects.filter(
-                Q(user__id=token.userID) & ~Q(operation='登录账号') & ~Q(operation='退出登录') & ~Q(
-                    operation__contains='获取序列号')).values('id', 'operation',
-                                                         'time', 'ip',
-                                                         'user__username')
+                Q(user__id=token.userID) & ~Q(url='user/login') & ~Q(url='user/logout') & ~Q(
+                    url='serialNumber/getSerial') & ~Q(url='uploadSerialNumber')).\
+                values('id', 'operation', 'time', 'ip', 'user__username')
             if log_qs.exists():
                 page = int(page)
                 line = int(line)