From 4707139df757e848b8746f9d7dcb837cdf5d78c3 Mon Sep 17 00:00:00 2001
From: heyujie <516346543@qq.com>
Date: 星期五, 22 四月 2022 16:30:17 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/web/saas-web
---
src/views/hashrate/CameraManage/CameraRules/components/CameraBox.vue | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/views/hashrate/CameraManage/CameraRules/components/CameraBox.vue b/src/views/hashrate/CameraManage/CameraRules/components/CameraBox.vue
index 77bed71..1247b70 100644
--- a/src/views/hashrate/CameraManage/CameraRules/components/CameraBox.vue
+++ b/src/views/hashrate/CameraManage/CameraRules/components/CameraBox.vue
@@ -15,7 +15,7 @@
</div>
<div class="body">
- <div class="row">
+ <div class="row" v-if="camera.analytics">
<div class="label">澶勭悊鏂瑰紡:</div>
<div
class="button pollingBtn"
@@ -36,10 +36,12 @@
<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>
--
Gitblit v1.8.0