From bf399dc65aa67c4355b0fdc516f8da5ca7234c82 Mon Sep 17 00:00:00 2001
From: mark <mark18340872469@163.com>
Date: 星期日, 09 十月 2022 16:34:22 +0800
Subject: [PATCH] Merge branch 'shandong' of http://192.168.5.5:10010/r/web/saas-web into shandong
---
src/views/search/components/ModelCard.vue | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/views/search/components/ModelCard.vue b/src/views/search/components/ModelCard.vue
index 4bfa5ab..10703d1 100644
--- a/src/views/search/components/ModelCard.vue
+++ b/src/views/search/components/ModelCard.vue
@@ -44,7 +44,7 @@
<span class="fontStyleForModel" style="font-weight: normal">{{ data.picDate | formatTime }}</span>
</p>
<p>
- <span class="fontStyleForModel">{{ data.cameraAddr }}</span>
+ <span class="fontStyleForModel">{{ data.cameraName }}</span>
<span class="fontStyleForModel analyServer" style="margin-left: 20px">{{ data.analyServerName }}</span>
</p>
<p></p>
@@ -66,8 +66,8 @@
<span class="fontStyleForModel">{{ data.picDate | formatTime }}</span>
</p>
<p class="align-right">
- <span class="fontStyleForModel text-overflow" :title="data.cameraAddr">{{ data.cameraAddr }}</span>
- <span class="fontStyleForModel text-overflow" :title="data.cameraAddr" style="margin-left: 20px">{{
+ <span class="fontStyleForModel text-overflow" :title="data.cameraName">{{ data.cameraName }}</span>
+ <span class="fontStyleForModel text-overflow" :title="data.analyServerName" style="margin-left: 20px">{{
data.analyServerName
}}</span>
</p>
--
Gitblit v1.8.0