From f14f98a263141d2f8ec0079866a758cc7a1c38d1 Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@smartai.com>
Date: 星期一, 22 八月 2022 03:20:29 +0800
Subject: [PATCH] 添加用户删除功能

---
 src/views/hashrate/CameraManage/CameraRules/components/CameraBox.vue |   24 +++++++++++++++---------
 1 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/src/views/hashrate/CameraManage/CameraRules/components/CameraBox.vue b/src/views/hashrate/CameraManage/CameraRules/components/CameraBox.vue
index 6420fe4..cd4e442 100644
--- a/src/views/hashrate/CameraManage/CameraRules/components/CameraBox.vue
+++ b/src/views/hashrate/CameraManage/CameraRules/components/CameraBox.vue
@@ -15,18 +15,18 @@
       </div>
 
       <div class="body">
-        <div class="row">
+        <div class="row" v-if="camera.analytics">
           <div class="label">澶勭悊鏂瑰紡:</div>
           <div
             class="button pollingBtn"
-            :class="{ active: camera.analytics && !camera.dealWay }"
+            :class="{ active: !camera.dealWay }"
             @click="changePoll(false)"
           >
             杞
           </div>
           <div
             class="button realtimeBtn"
-            :class="{ active: camera.analytics && camera.dealWay }"
+            :class="{ active: camera.dealWay }"
             @click="changePoll(true)"
           >
             瀹炴椂
@@ -36,17 +36,19 @@
           <div class="label">鍒嗚鲸鐜�:</div>
           <div class="data">
             {{
-              camera.camearInfo.resolution_width == 0 ||
-              camera.camearInfo.resolution_height == 0
+              camera.camearInfo.resolutionWidth == 0 ||
+              camera.camearInfo.resolutionHeight == 0 ||
+              !camera.camearInfo.resolutionHeight ||
+              !camera.camearInfo.resolutionWidth
                 ? "鏈満鍒嗚鲸鐜�"
-                : `${camera.camearInfo.resolution_width} * ${camera.camearInfo.resolution_height}`
+                : `${camera.camearInfo.resolutionWidth} * ${camera.camearInfo.resolutionHeight}`
             }}
           </div>
         </div>
       </div>
 
       <div class="footer">
-        <div class="button addModel">娣诲姞鍒版ā鏉�</div>
+        <!-- <div class="button addModel">娣诲姞鍒版ā鏉�</div> -->
         <div class="button addRule" @click="addRule">娣诲姞鏂板満鏅�</div>
       </div>
     </div>
@@ -108,6 +110,10 @@
 
     //瀹炴椂銆佽疆璇㈠垏鎹�
     changePoll(row) {
+      if (!this.camera.analytics) {
+        return;
+      }
+
       //鍒ゆ柇鏄柊澧炶繕鏄洿鏂�
       if (this.camera.cameraId && this.camera.cameraId !== undefined) {
         if (this.PollData.RealTimeSum < this.PollData.channelTotal) {
@@ -116,7 +122,6 @@
           } else {
             this.camera.dealWay = false;
           }
-          debugger;
           changeRunType({
             camera_ids: [this.camera.cameraId],
             run_type: this.camera.dealWay ? 1 : 0,
@@ -270,8 +275,9 @@
 
   .footer {
     box-sizing: border-box;
-    padding: 10px;
+    padding: 5px;
     display: flex;
+    justify-content: center;
     align-items: center;
 
     .addModel {

--
Gitblit v1.8.0