From db5872786c1e1697a59af41386136ee002bb68ad Mon Sep 17 00:00:00 2001 From: zhangzengfei <zhangzengfei@smartai.com> Date: 星期五, 30 六月 2023 17:17:12 +0800 Subject: [PATCH] 修改为汇丰默认图标,修改处理率计算方式 --- src/views/search/components/ModelCard.vue | 20 +++++++++++++------- 1 files changed, 13 insertions(+), 7 deletions(-) diff --git a/src/views/search/components/ModelCard.vue b/src/views/search/components/ModelCard.vue index 067aa62..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> - <b style="float: right; margin-right: 50px; cursor: pointer;" @click="markDialogVisible = true">鏍囪</b> + <el-button + type="text" + icon="el-icon-coordinate" + style="float: right; margin-right: 50px; font-size: 16px;" + @click="markDialogVisible = true" + >鏍囪</el-button + > </div> </div> @@ -173,7 +179,7 @@ </div> </div> <el-dialog - title="鏍囪" + title="鏍囪棰勮" :visible.sync="markDialogVisible" width="30%" style="z-index:4000;margin-top:200px;margin-left:140px;" @@ -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