From f20a554bdb24e9dfde9dc6a69d78595944f61d15 Mon Sep 17 00:00:00 2001
From: mark <mark18340872469@163.com>
Date: 星期二, 25 十月 2022 14:53:57 +0800
Subject: [PATCH] 设备管理 样式调整
---
src/views/hashrate/CameraManage/CameraRules/components/CameraBox.vue | 21 +++++++++++++--------
1 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/src/views/hashrate/CameraManage/CameraRules/components/CameraBox.vue b/src/views/hashrate/CameraManage/CameraRules/components/CameraBox.vue
index 6420fe4..1be8e23 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,
--
Gitblit v1.8.0