From a6e6f161ab9745e48f5bc6532d6a0af1c706f189 Mon Sep 17 00:00:00 2001
From: 13066656961 <1622813142@qq.com>
Date: Thu, 25 Jul 2024 20:18:39 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=88=B3=E6=A0=BC=E5=BC=8F?=
 =?UTF-8?q?=E5=8C=96=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 snowy-admin-web/src/utils/tool.js             | 39 +++++++++++++++++++
 .../src/views/index/components/visLog.vue     |  4 +-
 2 files changed, 41 insertions(+), 2 deletions(-)

diff --git a/snowy-admin-web/src/utils/tool.js b/snowy-admin-web/src/utils/tool.js
index 6703aa1a..e43efe1f 100644
--- a/snowy-admin-web/src/utils/tool.js
+++ b/snowy-admin-web/src/utils/tool.js
@@ -166,4 +166,43 @@ tool.snowyUuid = () => {
 	return 'xn' + uuid.slice(2)
 }
 
+tool.parseTime = (time, cFormat) => {
+	if (time == null || time.length === 0) {
+	  return ''
+	}
+
+	const format = cFormat || '{y}-{m}-{d} {h}:{i}:{s}'
+	let date
+	if (typeof time === 'object') {
+	  date = time
+	} else {
+	  if ((typeof time === 'string') && (/^[0-9]+$/.test(time))) {
+		time = parseInt(time)
+	  }
+	  if ((typeof time === 'number') && (time.toString().length === 10)) {
+		time = time * 1000
+	  }
+	  date = new Date(time)
+	}
+	const formatObj = {
+	  y: date.getFullYear(),
+	  m: date.getMonth() + 1,
+	  d: date.getDate(),
+	  h: date.getHours(),
+	  i: date.getMinutes(),
+	  s: date.getSeconds(),
+	  a: date.getDay()
+	}
+	const time_str = format.replace(/{(y|m|d|h|i|s|a)+}/g, (result, key) => {
+	  let value = formatObj[key]
+	  // Note: getDay() returns 0 on Sunday
+	  if (key === 'a') { return ['日', '一', '二', '三', '四', '五', '六'][value ] }
+	  if (result.length > 0 && value < 10) {
+		value = '0' + value
+	  }
+	  return value || 0
+	})
+	return time_str
+}
+
 export default tool
diff --git a/snowy-admin-web/src/views/index/components/visLog.vue b/snowy-admin-web/src/views/index/components/visLog.vue
index c855bcd3..68c3c864 100644
--- a/snowy-admin-web/src/views/index/components/visLog.vue
+++ b/snowy-admin-web/src/views/index/components/visLog.vue
@@ -3,8 +3,8 @@
 		<template #extra v-if="displayMore()"><a @click="leaveFor('/dev/vislog')">更多</a></template>
 		<div class="timeline-div">
 			<a-timeline>
-				<a-timeline-item :key="visLog.id" v-for="visLog in visLogList" :color="getTimelineColor(visLog.category)"
-					>{{ visLog.opTime }} {{ visLog.name }}
+				<a-timeline-item :key="visLog.id" v-for="visLog in visLogList" :color="getTimelineColor(visLog.category)">
+					{{ $TOOL.parseTime(visLog.opTime, '{y}-{m}-{d} {h}:{i}:{s}')  }} {{ visLog.name }}
 					<p class="timeline-item-p">{{ visLog.opIp }} {{ visLog.opAddress }}</p>
 				</a-timeline-item>
 			</a-timeline>