Merge branch 'master' of https://e.coding.net/ctcdevteam/cma_search

client/src/views/system/user.vue

@@ -45,7 +45,6 @@
              <el-select
               v-model="listQuery.roles"
               placeholder="角色"
-              clearable
               style="width: 90px"
               class="filter-item"
               @change="handleFilter"

server/apps/vod/views.py

@@ -94,11 +94,18 @@ class MyViewRecordAPIView(APIView):
             video = Video.objects.get(pk=id)
         except:
             return Response('视频不存在', status=HTTP_400_BAD_REQUEST)
-        record, _ = ViewRecord.objects.get_or_create(video=video, user=request.user, defaults={'video':video, 'user':request.user})
+        record, fcreated = ViewRecord.objects.get_or_create(video=video, user=request.user, defaults={'video':video, 'user':request.user})
+        if fcreated:
+            video.viewsp = video.viewsp + 1
+            video.views = video.views + 1
+            record.views = 1
+            video.save()
         if request.data.get('current', None):
             record.current = request.data.get('current')
-        if timezone.now() > record.update_time + timedelta(hours=6) or record.create_time == record.update_time:
+        if timezone.now() > record.update_time + timedelta(hours=6):
             record.views = record.views + 1
+            video.views = video.views + 1
+            video.save()
         record.save()
         return Response()