From ba50073d4aeda7a1e30243e6469be9c2cec472b3 Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@smartai.com>
Date: 星期六, 08 十月 2022 18:17:25 +0800
Subject: [PATCH] 修改检索显示的摄像机地址,调整上报页面的查询
---
src/views/search/components/ModelCard.vue | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/src/views/search/components/ModelCard.vue b/src/views/search/components/ModelCard.vue
index f3a9744..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>
@@ -85,7 +85,13 @@
<span style="white-space: nowrap; font-weight: 600; font-size: 13px">{{ data.showLabels }}</span>
</p>
</div>
- <el-button type="text" icon="el-icon-coordinate" style="float: right; margin-right: 50px; font-size: 16px;" >鏍囪</el-button>
+ <el-button
+ type="text"
+ icon="el-icon-coordinate"
+ style="float: right; margin-right: 50px; font-size: 16px;"
+ @click="markDialogVisible = true"
+ >鏍囪</el-button
+ >
</div>
</div>
@@ -181,8 +187,8 @@
:modal="false"
>
<el-radio v-model="warningFlag" label="1">璇姤</el-radio>
- <el-radio v-model="warningFlag" label="2">鏈暣鏀�</el-radio>
- <el-radio v-model="warningFlag" label="3">宸叉暣鏀�</el-radio>
+ <el-radio v-model="warningFlag" label="3">鏈暣鏀�</el-radio>
+ <el-radio v-model="warningFlag" label="2">宸叉暣鏀�</el-radio>
<span slot="footer" class="dialog-footer">
<el-button @click="markDialogVisible = false" size="mini">鍙� 娑�</el-button>
<el-button type="primary" @click="saveWarningFlag(data)" size="mini">纭� 瀹�</el-button>
--
Gitblit v1.8.0