From 009d715035755a923b738545c2ff91cfa28e5d09 Mon Sep 17 00:00:00 2001
From: wanggang <76527413@qq.com>
Date: Thu, 6 Feb 2020 21:18:43 +0800
Subject: [PATCH] update

Former-commit-id: 137ed8a93b47c35e63a4fd71438121c89e215db9
---
 projects/WebApp/wwwroot/css/app.css                  | 7 +++++++
 projects/WebApp/wwwroot/pages/iot/device/camera.html | 4 ++--
 projects/WebApp/wwwroot/pages/iot/device/ir.html     | 1 -
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/projects/WebApp/wwwroot/css/app.css b/projects/WebApp/wwwroot/css/app.css
index 48ab54ab..34142fad 100644
--- a/projects/WebApp/wwwroot/css/app.css
+++ b/projects/WebApp/wwwroot/css/app.css
@@ -136,4 +136,11 @@ img {
     width: 12px;
     border: 6px solid rgba(230,230,230,0.8);
     border-radius: 50%;
+}
+.ptz img{
+    width:32px;
+    margin:0 auto;
+}
+.ptz td{
+    text-align:center;
 }
\ No newline at end of file
diff --git a/projects/WebApp/wwwroot/pages/iot/device/camera.html b/projects/WebApp/wwwroot/pages/iot/device/camera.html
index 708b68db..86ec84b1 100644
--- a/projects/WebApp/wwwroot/pages/iot/device/camera.html
+++ b/projects/WebApp/wwwroot/pages/iot/device/camera.html
@@ -6,9 +6,9 @@
         <div class="card-body" style="padding:0;">
             <div class="row" style="width:320px;height:240px;margin: 0 auto;background-color:#000;position:relative;">
                 <video controls muted autoplay :class="device.number" v-if="isFlvSupported" v-on:volumechange="volumeChange($event)" style="width:100%;height:100%;object-fit:contain;"></video>
-                <canvas width="1080" height="720" style="max-width:100%;height:100%;background: black;margin:0 auto;" :class="device.number+' wxinlineplayer'" v-else></canvas>
+                <canvas width="1080" height="720" style="width:100%;height:100%;object-fit:contain;background: black;margin:0 auto;" :class="device.number+' wxinlineplayer'" v-else></canvas>
                 <div class="control">
-                    <a href="javascript:;" v-on:click="play()" style="color:#fff;margin:0 10px;line-height:30px;">
+                    <a href="javascript:;" v-on:click="play()" style="color: #fff; margin: 0 10px; line-height: 30px;">
                         <i class="ion ion-md-pause" v-if="playing"></i>
                         <i v-else class="ion ion-md-play"></i>
                     </a>
diff --git a/projects/WebApp/wwwroot/pages/iot/device/ir.html b/projects/WebApp/wwwroot/pages/iot/device/ir.html
index 08ace9cc..573e347b 100644
--- a/projects/WebApp/wwwroot/pages/iot/device/ir.html
+++ b/projects/WebApp/wwwroot/pages/iot/device/ir.html
@@ -425,7 +425,6 @@
                 getData(this.device, '按键').value = newCode;
             },
             change: function (v, min, max, step) {
-                alert(v);
                 var oldValue = parseInt(v);
                 var newValue = oldValue + step;
                 if (newValue > max) {