From 66f781ab21e9cb63ab6e04ad9ddf2557c12db4f9 Mon Sep 17 00:00:00 2001
From: GoEdgeLab <goedgecloud@gmail.com>
Date: Tue, 12 Oct 2021 14:39:13 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9B=86=E7=BE=A4=E9=9D=9E=E4=B8=8A=E6=B5=B7?=
 =?UTF-8?q?=E6=97=B6=E5=8C=BA=E7=9A=84=E5=9C=A8=E5=88=97=E8=A1=A8=E9=87=8C?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E6=97=B6=E5=8C=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 internal/web/actions/default/clusters/index.go |  5 +++++
 web/views/@default/clusters/index.html         | 10 ++++++++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/internal/web/actions/default/clusters/index.go b/internal/web/actions/default/clusters/index.go
index 8d2dcfc8..2662db04 100644
--- a/internal/web/actions/default/clusters/index.go
+++ b/internal/web/actions/default/clusters/index.go
@@ -121,6 +121,10 @@ func (this *IndexAction) RunGet(params struct {
 				this.ErrorPage(err)
 			}
 
+			if cluster.TimeZone == nodeconfigs.DefaultTimeZoneLocation {
+				cluster.TimeZone = ""
+			}
+
 			clusterMaps = append(clusterMaps, maps.Map{
 				"id":                cluster.Id,
 				"name":              cluster.Name,
@@ -132,6 +136,7 @@ func (this *IndexAction) RunGet(params struct {
 				"dnsName":           cluster.DnsName,
 				"dnsDomainName":     dnsDomainName,
 				"countServers":      countServersResp.Count,
+				"timeZone":          cluster.TimeZone,
 			})
 		}
 	}
diff --git a/web/views/@default/clusters/index.html b/web/views/@default/clusters/index.html
index 36f37329..39285c70 100644
--- a/web/views/@default/clusters/index.html
+++ b/web/views/@default/clusters/index.html
@@ -41,7 +41,12 @@
             </tr>
         </thead>
         <tr v-for="cluster in clusters">
-            <td><a :href="'/clusters/cluster?clusterId=' + cluster.id"><keyword :v-word="keyword">{{cluster.name}}</keyword></a></td>
+            <td>
+                <a :href="'/clusters/cluster?clusterId=' + cluster.id"><keyword :v-word="keyword">{{cluster.name}}</keyword></a>
+                <div v-if="cluster.timeZone != null && cluster.timeZone.length > 0">
+                    <grey-label>时区：{{cluster.timeZone}}</grey-label>
+                </div>
+            </td>
             <td class="center">
                 <a :href="'/clusters/cluster/nodes?clusterId=' + cluster.id" v-if="cluster.countAllNodes > 0"><span :class="{red:cluster.countAllNodes > cluster.countActiveNodes}">{{cluster.countAllNodes}}</span></a>
                 <span class="disabled" v-else="">-</span>
@@ -66,7 +71,8 @@
                 <span v-else class="disabled">-</span>
             </td>
             <td>
-                <a :href="'/clusters/cluster?clusterId=' + cluster.id">详情</a>
+                <a :href="'/clusters/cluster?clusterId=' + cluster.id">详情</a> &nbsp;
+                <a :href="'/clusters/cluster/settings?clusterId=' + cluster.id">设置</a>
             </td>
         </tr>
     </table>