From ad52f4748553b77116ce2e74d29f4f76356c15b1 Mon Sep 17 00:00:00 2001 From: Tianyi Pu <912396513@qq.com> Date: Sun, 12 May 2024 16:21:36 +0100 Subject: [PATCH 1/5] =?UTF-8?q?=E6=9F=A5=E9=87=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- back_end/saolei/videomanager/views.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/back_end/saolei/videomanager/views.py b/back_end/saolei/videomanager/views.py index 2ada841d..5daa75a7 100644 --- a/back_end/saolei/videomanager/views.py +++ b/back_end/saolei/videomanager/views.py @@ -48,6 +48,11 @@ def video_upload(request): # 如果标识是首次使用的,需要得到管理员的审核 data['review_code'] = 2 + # 查重 + collisions = list(VideoModel.objects.filter(timems=data["timems"], bv=data["bv"]).filter(video__cl=data["cl"], video__op=data["op"], video__isl=data["isl"], video__designator=data["designator"])) + if collisions: + return JsonResponse({"status": 200, "msg": "录像已存在"}) + # 表中添加数据 e_video = ExpandVideoModel.objects.create(designator=data["designator"], left=data["left"], right=data["right"], From 5cde111b0334080e654b3ef724bdd15c0ead0ffe Mon Sep 17 00:00:00 2001 From: Tianyi Pu <912396513@qq.com> Date: Sun, 12 May 2024 16:22:02 +0100 Subject: [PATCH 2/5] =?UTF-8?q?=E4=B8=BB=E8=8F=9C=E5=8D=95=E5=88=A0?= =?UTF-8?q?=E6=8E=89=E4=B8=8A=E4=BC=A0=E5=BD=95=E5=83=8F=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- front_end/src/App.vue | 3 --- 1 file changed, 3 deletions(-) diff --git a/front_end/src/App.vue b/front_end/src/App.vue index d1b48100..c6056f8a 100644 --- a/front_end/src/App.vue +++ b/front_end/src/App.vue @@ -27,9 +27,6 @@
我的地盘
- -
上传录像
-
From 73b4c3c6d844f2b6385f68d0e4ca126950326d91 Mon Sep 17 00:00:00 2001 From: Tianyi Pu <912396513@qq.com> Date: Sun, 12 May 2024 16:22:28 +0100 Subject: [PATCH 3/5] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=BB=E9=A1=B5?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=8A=E4=BC=A0=E5=BD=95=E5=83=8F=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- front_end/src/views/PlayerView.vue | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/front_end/src/views/PlayerView.vue b/front_end/src/views/PlayerView.vue index 4d992737..a6e636ca 100644 --- a/front_end/src/views/PlayerView.vue +++ b/front_end/src/views/PlayerView.vue @@ -79,7 +79,9 @@ - + + + @@ -94,6 +96,7 @@ import useCurrentInstance from "@/utils/common/useCurrentInstance"; // import PreviewDownload from '@/components/PreviewDownload.vue'; import PlayerRecordView from '@/views/PlayerRecordView.vue'; import PlayerVideosView from '@/views/PlayerVideosView.vue'; +import UploadView from './UploadView.vue'; // const AsyncPlayerVideosView = defineAsyncComponent(() => import('@/views/PlayerVideosView.vue')); @@ -106,6 +109,7 @@ const imageUrl = ref(require('@/assets/person.png')) const avatar_changed = ref(false); import { Record, RecordBIE } from "@/utils/common/structInterface"; import { compress, compressAccurately } from 'image-conversion'; +import store from '@/store'; const loading = ref(true) From bdab7fc3af96be0b48a09ed676cecd3a6e3377a9 Mon Sep 17 00:00:00 2001 From: Tianyi Pu <912396513@qq.com> Date: Sun, 12 May 2024 16:25:10 +0100 Subject: [PATCH 4/5] Update UploadView.vue --- front_end/src/views/UploadView.vue | 421 +++++++++++++++++------------ 1 file changed, 253 insertions(+), 168 deletions(-) diff --git a/front_end/src/views/UploadView.vue b/front_end/src/views/UploadView.vue index 8cdb5ba9..73a8187b 100644 --- a/front_end/src/views/UploadView.vue +++ b/front_end/src/views/UploadView.vue @@ -1,10 +1,10 @@ -->
@@ -23,13 +23,50 @@
-
+ + + + + + + + + + + + + + + + From aa599dcd75b3435a8591520f4ee7f86bcd89053e Mon Sep 17 00:00:00 2001 From: Tianyi Pu <912396513@qq.com> Date: Sun, 12 May 2024 16:29:53 +0100 Subject: [PATCH 5/5] Update UploadView.vue --- front_end/src/views/UploadView.vue | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/front_end/src/views/UploadView.vue b/front_end/src/views/UploadView.vue index 73a8187b..6dabfee4 100644 --- a/front_end/src/views/UploadView.vue +++ b/front_end/src/views/UploadView.vue @@ -2,9 +2,6 @@ -
@@ -60,13 +57,6 @@ -