From 2b04df341d847266c8383f8e9362d22a578a8591 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E5=89=8D=E6=98=8E?= <909355014@qq.com> Date: Mon, 27 Jun 2022 15:57:45 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9B=B8=E5=85=B3=E6=96=B9=E5=88=86=E9=85=8D?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=91=98=E8=B4=A6=E6=88=B7=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/monitor/templates/monitor/video.html | 31 ++++++++++------------- apps/rpm/migrations/0003_rparty_admin.py | 21 +++++++++++++++ apps/rpm/models.py | 1 + apps/rpm/views.py | 11 +++----- 4 files changed, 38 insertions(+), 26 deletions(-) create mode 100644 apps/rpm/migrations/0003_rparty_admin.py diff --git a/apps/monitor/templates/monitor/video.html b/apps/monitor/templates/monitor/video.html index 8270b657..fd467353 100755 --- a/apps/monitor/templates/monitor/video.html +++ b/apps/monitor/templates/monitor/video.html @@ -5,30 +5,25 @@ videojs-contrib-hls embed - - +

Video.js Example Embed

- + + if (flvjs.isSupported()) { + var videoElement = document.getElementById('videoElement'); + var flvPlayer = flvjs.createPlayer({ + type: 'flv', + url: 'http://10.0.11.21:7886/live/cameraid/1000038%240/substream/2.flv' + }); + flvPlayer.attachMediaElement(videoElement); + flvPlayer.load(); + flvPlayer.play(); + } + \ No newline at end of file diff --git a/apps/rpm/migrations/0003_rparty_admin.py b/apps/rpm/migrations/0003_rparty_admin.py new file mode 100644 index 00000000..4296383b --- /dev/null +++ b/apps/rpm/migrations/0003_rparty_admin.py @@ -0,0 +1,21 @@ +# Generated by Django 3.2.12 on 2022-06-27 07:57 + +from django.conf import settings +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ('rpm', '0002_rename_addresss_rparty_address'), + ] + + operations = [ + migrations.AddField( + model_name='rparty', + name='admin', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL), + ), + ] diff --git a/apps/rpm/models.py b/apps/rpm/models.py index fb463190..b35eb548 100644 --- a/apps/rpm/models.py +++ b/apps/rpm/models.py @@ -21,6 +21,7 @@ class Rparty(CommonBModel): email = models.EmailField('邮箱', null=True, blank=True) address = models.CharField('企业地址', max_length=200, null=True, blank=True) description = models.TextField('概述', null=True, blank=True) + admin = models.ForeignKey(User, on_delete=models.CASCADE, null=True, blank=True) class Rfile(BaseModel): diff --git a/apps/rpm/views.py b/apps/rpm/views.py index 2f7ebee4..e1efcdd5 100644 --- a/apps/rpm/views.py +++ b/apps/rpm/views.py @@ -29,21 +29,16 @@ class RpartyViewSet(CustomModelViewSet): 分配账号 """ obj = self.get_object() + if obj.admin: + raise ParseError('已存在管理员账号') username = request.data.get('username') password = make_password('0000') user = User.objects.create(username=username, password=password, type='remployee', belong_dept=obj.dept) - obj.user = user + obj.admin = user obj.save() - post, _ = Post.objects.get_or_create(code='rparty_admin', - defaults={ - 'name': '本相关方管理员', - 'code': 'rparty_admin' - }) - UserPost.objects.create(user=user, dept=obj.dept, - post=post) return Response()