TRKJ/EdgeAdmin
2
0
Fork 0
mirror of https://github.com/TeaOSLab/EdgeAdmin.git synced 2025-11-07 07:10:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

优化界面

Browse Source
This commit is contained in:
刘祥超
2021-09-15 19:22:54 +08:00
parent 6e36528f35
commit 0f28df51f1
9 changed files with 32 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
web/public/js/components/cluster/node-clusters-labels.js
View File

@@ -19,7 +19,13 @@ Vue.component("node-clusters-labels", {
}
},
template: `<div>
<a v-if="cluster != null" :href="'/clusters/cluster?clusterId=' + cluster.id" class="ui label basic grey" :class="labelSize" title="主集群" style="margin-bottom: 0.3em;">{{cluster.name}}</a>
<a v-for="c in secondaryClusters" :href="'/clusters/cluster?clusterId=' + c.id" class="ui label basic grey" :class="labelSize" title="从集群" style="margin-bottom: 0.3em;"><span class="grey" style="text-decoration: none">{{c.name}}</span></a>
<a v-if="cluster != null" :href="'/clusters/cluster?clusterId=' + cluster.id" title="主集群" style="margin-bottom: 0.3em;">
<span class="ui label basic grey" :class="labelSize" v-if="labelSize != 'tiny'">{{cluster.name}}</span>
<grey-label v-if="labelSize == 'tiny'">{{cluster.name}}</grey-label>
</a>
<a v-for="c in secondaryClusters" :href="'/clusters/cluster?clusterId=' + c.id" :class="labelSize" title="从集群">
<span class="ui label basic grey" :class="labelSize" v-if="labelSize != 'tiny'">{{c.name}}</span>
<grey-label v-if="labelSize == 'tiny'">{{c.name}}</grey-label>
</a>
</div>`
})

2
web/public/js/components/common/labels.js
View File

@@ -26,5 +26,5 @@ Vue.component("micro-basic-label", {
// 灰色的Label
Vue.component("grey-label", {
template: `<span class="ui label basic grey tiny" style="font-size: 0.7em; border: 1px solid #ddd"><slot></slot></span>`
template: `<span class="ui label basic grey tiny" style="margin-top: 0.4em; font-size: 0.7em; border: 1px solid #ddd!important; font-weight: normal; margin-left: -0.2em"><slot></slot></span>`
})

10
web/views/@default/clusters/cluster/nodes.html
View File

@@ -67,13 +67,13 @@
</thead>
<tr v-for="node in nodes">
<td><a :href="'/clusters/cluster/node?clusterId=' + clusterId + '&nodeId=' + node.id">{{node.name}}</a>
<div style="margin-top: 0.5em" v-if="node.region != null">
<span class="ui label tiny grey basic">区域：{{node.region.name}}</span>
<div v-if="node.region != null">
<grey-label>区域：{{node.region.name}}</grey-label>
</div>
<div style="margin-top: 0.5em" v-if="node.group != null">
<span class="ui label tiny grey basic">分组：{{node.group.name}}</span>
<div v-if="node.group != null">
<grey-label>分组：{{node.group.name}}</grey-label>
</div>
<div style="margin-top: 0.5em" v-if="node.secondaryClusters != null && node.secondaryClusters.length > 0">
<div v-if="node.secondaryClusters != null && node.secondaryClusters.length > 0">
<node-clusters-labels :v-primary-cluster="node.cluster" :v-secondary-clusters="node.secondaryClusters" size="tiny"></node-clusters-labels>
</div>
</td>

1
web/views/@default/clusters/ip-addrs/addr/index.css
View File

@@ -4,6 +4,7 @@ h4 a {
font-weight: normal;
}
.chart-box {
width: 30em;
height: 20em;
}
/*# sourceMappingURL=index.css.map */

2
web/views/@default/clusters/ip-addrs/addr/index.css.map
View File

@@ -1 +1 @@
{"version":3,"sources":["index.less"],"names":[],"mappings":"AAAA,EACC;EACC,gBAAA;EACA,kBAAA;EACA,mBAAA;;AAKF;EACC,YAAA","file":"index.css"}
{"version":3,"sources":["index.less"],"names":[],"mappings":"AAAA,EACC;EACC,gBAAA;EACA,kBAAA;EACA,mBAAA;;AAKF;EACC,WAAA;EACA,YAAA","file":"index.css"}

3
web/views/@default/clusters/ip-addrs/addr/index.html
View File

@@ -56,5 +56,6 @@
<div v-if="results.length > 0">
<div class="margin"></div>
<h4>区域监控 <a :href="Tea.url('.reports', {addrId: addr.id})"><span>[详情]</span></a></h4>
<div class="ui segment chart-box" id="reports-chart-box"></div>
<div class="ui divider"></div>
<div class="chart-box" id="reports-chart-box"></div>
</div>

6
web/views/@default/clusters/ip-addrs/addr/index.js
View File

@@ -63,7 +63,8 @@ Tea.context(function () {
}
let chart = teaweb.initChart(chartBox)
chart.setOption({
radar: {
radar: [
{
splitNumber: 4,
indicator: this.results.map(function (result) {
return {
@@ -72,7 +73,8 @@ Tea.context(function () {
max: 5000
}
})
},
}
],
series: [{
name: '',
type: 'radar',

1
web/views/@default/clusters/ip-addrs/addr/index.less
View File

@@ -8,5 +8,6 @@ h4 {
.chart-box {
width: 30em;
height: 20em;
}

2
web/views/@default/clusters/monitors/reporters/index.html
View File

@@ -41,7 +41,7 @@
<tr v-for="reporter in reporters">
<td>
<a :href="Tea.url('.reporter', {reporterId: reporter.id})"><keyword :v-word="keyword">{{reporter.name}}</keyword></a>
<div v-if="reporter.groups.length > 0" style="margin-top: 0.5em">
<div v-if="reporter.groups.length > 0">
<grey-label v-for="group in reporter.groups">{{group.name}}</grey-label>
</div>
<div v-if="reporter.shouldUpgrade">