mirror of
				https://github.com/TeaOSLab/EdgeAdmin.git
				synced 2025-11-04 13:10:26 +08:00 
			
		
		
		
	集群非上海时区的在列表里显示时区
This commit is contained in:
		@@ -121,6 +121,10 @@ func (this *IndexAction) RunGet(params struct {
 | 
				
			|||||||
				this.ErrorPage(err)
 | 
									this.ErrorPage(err)
 | 
				
			||||||
			}
 | 
								}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
								if cluster.TimeZone == nodeconfigs.DefaultTimeZoneLocation {
 | 
				
			||||||
 | 
									cluster.TimeZone = ""
 | 
				
			||||||
 | 
								}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
			clusterMaps = append(clusterMaps, maps.Map{
 | 
								clusterMaps = append(clusterMaps, maps.Map{
 | 
				
			||||||
				"id":                cluster.Id,
 | 
									"id":                cluster.Id,
 | 
				
			||||||
				"name":              cluster.Name,
 | 
									"name":              cluster.Name,
 | 
				
			||||||
@@ -132,6 +136,7 @@ func (this *IndexAction) RunGet(params struct {
 | 
				
			|||||||
				"dnsName":           cluster.DnsName,
 | 
									"dnsName":           cluster.DnsName,
 | 
				
			||||||
				"dnsDomainName":     dnsDomainName,
 | 
									"dnsDomainName":     dnsDomainName,
 | 
				
			||||||
				"countServers":      countServersResp.Count,
 | 
									"countServers":      countServersResp.Count,
 | 
				
			||||||
 | 
									"timeZone":          cluster.TimeZone,
 | 
				
			||||||
			})
 | 
								})
 | 
				
			||||||
		}
 | 
							}
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -41,7 +41,12 @@
 | 
				
			|||||||
            </tr>
 | 
					            </tr>
 | 
				
			||||||
        </thead>
 | 
					        </thead>
 | 
				
			||||||
        <tr v-for="cluster in clusters">
 | 
					        <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">
 | 
					            <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>
 | 
					                <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>
 | 
					                <span class="disabled" v-else="">-</span>
 | 
				
			||||||
@@ -66,7 +71,8 @@
 | 
				
			|||||||
                <span v-else class="disabled">-</span>
 | 
					                <span v-else class="disabled">-</span>
 | 
				
			||||||
            </td>
 | 
					            </td>
 | 
				
			||||||
            <td>
 | 
					            <td>
 | 
				
			||||||
                <a :href="'/clusters/cluster?clusterId=' + cluster.id">详情</a>
 | 
					                <a :href="'/clusters/cluster?clusterId=' + cluster.id">详情</a>  
 | 
				
			||||||
 | 
					                <a :href="'/clusters/cluster/settings?clusterId=' + cluster.id">设置</a>
 | 
				
			||||||
            </td>
 | 
					            </td>
 | 
				
			||||||
        </tr>
 | 
					        </tr>
 | 
				
			||||||
    </table>
 | 
					    </table>
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user