From a88314bd5d59f1dde2d430899555a3a5730f2ef9 Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@iotlink.com>
Date: 星期五, 25 九月 2020 09:37:00 +0800
Subject: [PATCH] 优化card时间显示和摄像机音频试听功能
---
src/components/subComponents/ModelCard.vue | 66 +++++++++++++++++++++++++-------
1 files changed, 51 insertions(+), 15 deletions(-)
diff --git a/src/components/subComponents/ModelCard.vue b/src/components/subComponents/ModelCard.vue
index 1b68375..7c07467 100644
--- a/src/components/subComponents/ModelCard.vue
+++ b/src/components/subComponents/ModelCard.vue
@@ -38,7 +38,7 @@
v-if="data.targetInfo == null || data.targetInfo[0].picSmUrl == ''"
>
<p>
- <span class="fontStyleForModel">{{ data.picDate }}</span>
+ <span class="fontStyleForModel">{{ data.picDate | formatTime }}</span>
</p>
<p>
<span class="fontStyleForModel">{{ data.cameraAddr }}</span>
@@ -58,7 +58,7 @@
<!-- yolo绫诲ぇ鍥� -->
<div class="describeBigImage" v-else>
<p>
- <span class="fontStyleForModel">{{ data.picDate }}</span>
+ <span class="fontStyleForModel">{{ data.picDate | formatTime}}</span>
</p>
<p>
<span class="fontStyleForModel">{{ data.cameraAddr }}</span>
@@ -134,15 +134,21 @@
<div class="baseInfo_list">
<p>
<span class="labelInfo">搴曞簱</span>
- <span class="val" :title="data.baseInfo[initialIndex].tableName">{{data.baseInfo[initialIndex].tableName}}</span>
+ <span
+ class="val"
+ :title="data.baseInfo[initialIndex].tableName"
+ >{{data.baseInfo[initialIndex].tableName}}</span>
</p>
<p>
<span class="labelInfo">濮撳悕</span>
- <span class="val" :title="data.baseInfo[initialIndex].targetName">{{data.baseInfo[initialIndex].targetName}}</span>
+ <span
+ class="val"
+ :title="data.baseInfo[initialIndex].targetName"
+ >{{data.baseInfo[initialIndex].targetName}}</span>
</p>
<p>
<span class="labelInfo">鎬у埆</span>
- <span class="val" >{{data.baseInfo[initialIndex].labels.split("/")[0]}}</span>
+ <span class="val">{{data.baseInfo[initialIndex].labels.split("/")[0]}}</span>
</p>
<p>
<span class="labelInfo">韬唤璇佸彿</span>
@@ -154,7 +160,10 @@
</p>
<p>
<span class="labelInfo">浜哄憳绛夌骇</span>
- <span class="val" :title="data.baseInfo[initialIndex].monitorLevel">{{data.baseInfo[initialIndex].monitorLevel}}</span>
+ <span
+ class="val"
+ :title="data.baseInfo[initialIndex].monitorLevel"
+ >{{data.baseInfo[initialIndex].monitorLevel}}</span>
</p>
</div>
</div>
@@ -232,15 +241,21 @@
<div class="baseInfo_list">
<p>
<span class="labelInfo">搴曞簱</span>
- <span class="val" :title="data.baseInfo[initialIndex].tableName">{{data.baseInfo[initialIndex].tableName}}</span>
+ <span
+ class="val"
+ :title="data.baseInfo[initialIndex].tableName"
+ >{{data.baseInfo[initialIndex].tableName}}</span>
</p>
<p>
<span class="labelInfo">濮撳悕</span>
- <span class="val" :title="data.baseInfo[initialIndex].targetName">{{data.baseInfo[initialIndex].targetName}}</span>
+ <span
+ class="val"
+ :title="data.baseInfo[initialIndex].targetName"
+ >{{data.baseInfo[initialIndex].targetName}}</span>
</p>
<p>
<span class="labelInfo">鎬у埆</span>
- <span class="val" >{{data.baseInfo[initialIndex].labels.split("/")[0]}}</span>
+ <span class="val">{{data.baseInfo[initialIndex].labels.split("/")[0]}}</span>
</p>
<p>
<span class="labelInfo">韬唤璇佸彿</span>
@@ -252,7 +267,10 @@
</p>
<p>
<span class="labelInfo">浜哄憳绛夌骇</span>
- <span class="val" :title="data.baseInfo[initialIndex].monitorLevel">{{data.baseInfo[initialIndex].monitorLevel}}</span>
+ <span
+ class="val"
+ :title="data.baseInfo[initialIndex].monitorLevel"
+ >{{data.baseInfo[initialIndex].monitorLevel}}</span>
</p>
</div>
</div>
@@ -262,6 +280,22 @@
</div>
</template>
<script>
+Date.prototype.Format = function (fmt) {
+ var o = {
+ "M+": this.getMonth() + 1, //鏈堜唤
+ "d+": this.getDate(), //鏃�
+ "H+": this.getHours(), //灏忔椂
+ "m+": this.getMinutes(), //鍒�
+ "s+": this.getSeconds(), //绉�
+ "q+": Math.floor((this.getMonth() + 3) / 3), //瀛ｅ害
+ "S": this.getMilliseconds() //姣
+ };
+ if (/(y+)/.test(fmt)) fmt = fmt.replace(RegExp.$1, (this.getFullYear() + "").substr(4 - RegExp.$1.length));
+ for (var k in o)
+ if (new RegExp("(" + k + ")").test(fmt)) fmt = fmt.replace(RegExp.$1, (RegExp.$1.length == 1) ? (o[k]) : (("00" + o[k]).substr(("" + o[k]).length)));
+ return fmt;
+}
+
/* eslint-disable */
import CameraPlayer from "@/components/player";
import imgDown from "@/components/subComponents/imgDown"
@@ -282,6 +316,9 @@
data: ""
},
filters: {
+ formatTime(t) {
+ return new Date(t).Format("yyyy-MM-dd HH:mm:ss")
+ },
percentage(score) {
return score.toFixed(2) + "%"
}
@@ -343,21 +380,20 @@
.baseInfo {
margin-top: 5px;
text-align: left;
- .baseInfo_list{
- p{
+ .baseInfo_list {
+ p {
display: flex;
- .labelInfo{
+ .labelInfo {
width: 80px;
color: #999;
}
- .val{
+ .val {
font-size: 12px;
color: #101010;
letter-spacing: 0.28px;
line-height: 20px;
}
}
-
}
.baseInfo_left {
float: left;
--
Gitblit v1.8.0