From 700d54b8e95f80d239e6997e047308a00f9f1cf9 Mon Sep 17 00:00:00 2001
From: GoEdgeLab <goedgecloud@gmail.com>
Date: Tue, 19 Apr 2022 19:51:29 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0components.js?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/public/js/components.js     | 4 ++++
 web/public/js/components.src.js | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/web/public/js/components.js b/web/public/js/components.js
index 869ea50a..8721e723 100644
--- a/web/public/js/components.js
+++ b/web/public/js/components.js
@@ -3686,6 +3686,10 @@ Vue.component("traffic-map-box",{props:["v-stats","v-is-attack"],mounted:functio
 					<keyword :v-word="keyword">{{item.ipFrom}}</keyword> <span> <span class="small red" v-if="item.isRead != null && !item.isRead">&nbsp;New&nbsp;</span>&nbsp;<a :href="'/servers/iplists?ip=' + item.ipFrom" v-if="vShowSearchButton" title="搜索此IP"><span><i class="icon search small" style="color: #ccc"></i></span></a></span>
 					<span v-if="item.ipTo.length > 0"> - <keyword :v-word="keyword">{{item.ipTo}}</keyword></span></span>
 					<span v-else class="disabled">*</span>
+					<div v-if="item.region != null && item.region.length > 0">
+						<span class="grey small">{{item.region}}</span>
+						<span v-if="item.isp != null && item.isp.length > 0 && item.isp != '内网IP'" class="grey small"><span class="disabled">|</span> {{item.isp}}</span>
+					</div>
 					<div v-if="item.createdTime != null">
 						<span class="small grey">添加于 {{item.createdTime}}
 							<span v-if="item.list != null && item.list.id > 0">
diff --git a/web/public/js/components.src.js b/web/public/js/components.src.js
index f28d4ef6..38b03715 100755
--- a/web/public/js/components.src.js
+++ b/web/public/js/components.src.js
@@ -10618,6 +10618,10 @@ Vue.component("ip-list-table", {
 					<keyword :v-word="keyword">{{item.ipFrom}}</keyword> <span> <span class="small red" v-if="item.isRead != null && !item.isRead">&nbsp;New&nbsp;</span>&nbsp;<a :href="'/servers/iplists?ip=' + item.ipFrom" v-if="vShowSearchButton" title="搜索此IP"><span><i class="icon search small" style="color: #ccc"></i></span></a></span>
 					<span v-if="item.ipTo.length > 0"> - <keyword :v-word="keyword">{{item.ipTo}}</keyword></span></span>
 					<span v-else class="disabled">*</span>
+					<div v-if="item.region != null && item.region.length > 0">
+						<span class="grey small">{{item.region}}</span>
+						<span v-if="item.isp != null && item.isp.length > 0 && item.isp != '内网IP'" class="grey small"><span class="disabled">|</span> {{item.isp}}</span>
+					</div>
 					<div v-if="item.createdTime != null">
 						<span class="small grey">添加于 {{item.createdTime}}
 							<span v-if="item.list != null && item.list.id > 0">