From b4d2703e653bf702d705b18c20d9edb9066c7c8a Mon Sep 17 00:00:00 2001 From: ZZJ <zzjdsg2300@163.com> Date: 星期三, 03 十一月 2021 17:35:10 +0800 Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/web/vue-smart-ai --- src/pages/cameraAccess/components/SeparateRules.vue | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/pages/cameraAccess/components/SeparateRules.vue b/src/pages/cameraAccess/components/SeparateRules.vue index d014e4b..03a92f8 100644 --- a/src/pages/cameraAccess/components/SeparateRules.vue +++ b/src/pages/cameraAccess/components/SeparateRules.vue @@ -30,11 +30,11 @@ <div v-if="Camera.analytics" class="flex-box" v-show="cameraType === 'camera'"> <span class="label" - >鍒嗚鲸鐜�: {{Camera.resolutionOption.find(o=>o.value === Camera.selectResolution).label}}</span> + >鍒嗚鲸鐜�: {{(Camera.camearInfo.resolution_width == 0 || Camera.camearInfo.resolution_height == 0) ? '鏈満鍒嗚鲸鐜�': `${Camera.camearInfo.resolution_width} * ${Camera.camearInfo.resolution_height}` }}</span> </div> <div v-if="Camera.analytics" class="flex-box"> - <span class="label">鏅鸿兘璁$畻鑺傜偣: {{ Camera.runServerName}}</span> + <span class="label">SmartAI鑺傜偣: {{ Camera.runServerName}}</span> </div> <div v-if="Camera.analytics" class="flex-box"> @@ -535,6 +535,7 @@ //瀹炴椂銆佽疆璇㈠垏鎹� changePoll(row) { //鍒ゆ柇鏄柊澧炶繕鏄洿鏂� + debugger if (this.Camera.cameraId && this.Camera.cameraId !== undefined) { if (this.PollData.RealTimeSum < this.PollData.channelTotal) { if (row.value) { -- Gitblit v1.8.0