diff --git a/web/public/js/components/cluster/node-clusters-labels.js b/web/public/js/components/cluster/node-clusters-labels.js index e4dd51d2..9a67871c 100644 --- a/web/public/js/components/cluster/node-clusters-labels.js +++ b/web/public/js/components/cluster/node-clusters-labels.js @@ -19,7 +19,13 @@ Vue.component("node-clusters-labels", { } }, template: `
- {{cluster.name}} - {{c.name}} + + {{cluster.name}} + {{cluster.name}} + + + {{c.name}} + {{c.name}} +
` }) \ No newline at end of file diff --git a/web/public/js/components/common/labels.js b/web/public/js/components/common/labels.js index 86e57d0f..eb693078 100644 --- a/web/public/js/components/common/labels.js +++ b/web/public/js/components/common/labels.js @@ -26,5 +26,5 @@ Vue.component("micro-basic-label", { // 灰色的Label Vue.component("grey-label", { - template: `` + template: `` }) diff --git a/web/views/@default/clusters/cluster/nodes.html b/web/views/@default/clusters/cluster/nodes.html index a036cefc..8cff1a76 100644 --- a/web/views/@default/clusters/cluster/nodes.html +++ b/web/views/@default/clusters/cluster/nodes.html @@ -67,13 +67,13 @@ {{node.name}} -
- 区域:{{node.region.name}} +
+ 区域:{{node.region.name}}
-
- 分组:{{node.group.name}} +
+ 分组:{{node.group.name}}
-
+
diff --git a/web/views/@default/clusters/ip-addrs/addr/index.css b/web/views/@default/clusters/ip-addrs/addr/index.css index 39dcfacd..d64b1850 100644 --- a/web/views/@default/clusters/ip-addrs/addr/index.css +++ b/web/views/@default/clusters/ip-addrs/addr/index.css @@ -4,6 +4,7 @@ h4 a { font-weight: normal; } .chart-box { + width: 30em; height: 20em; } /*# sourceMappingURL=index.css.map */ \ No newline at end of file diff --git a/web/views/@default/clusters/ip-addrs/addr/index.css.map b/web/views/@default/clusters/ip-addrs/addr/index.css.map index 83a0caba..22cb129c 100644 --- a/web/views/@default/clusters/ip-addrs/addr/index.css.map +++ b/web/views/@default/clusters/ip-addrs/addr/index.css.map @@ -1 +1 @@ -{"version":3,"sources":["index.less"],"names":[],"mappings":"AAAA,EACC;EACC,gBAAA;EACA,kBAAA;EACA,mBAAA;;AAKF;EACC,YAAA","file":"index.css"} \ No newline at end of file +{"version":3,"sources":["index.less"],"names":[],"mappings":"AAAA,EACC;EACC,gBAAA;EACA,kBAAA;EACA,mBAAA;;AAKF;EACC,WAAA;EACA,YAAA","file":"index.css"} \ No newline at end of file diff --git a/web/views/@default/clusters/ip-addrs/addr/index.html b/web/views/@default/clusters/ip-addrs/addr/index.html index 6dd3130a..12c44b0b 100644 --- a/web/views/@default/clusters/ip-addrs/addr/index.html +++ b/web/views/@default/clusters/ip-addrs/addr/index.html @@ -56,5 +56,6 @@

区域监控 [详情]

-
+
+
\ No newline at end of file diff --git a/web/views/@default/clusters/ip-addrs/addr/index.js b/web/views/@default/clusters/ip-addrs/addr/index.js index 0c63d54f..f334fef4 100644 --- a/web/views/@default/clusters/ip-addrs/addr/index.js +++ b/web/views/@default/clusters/ip-addrs/addr/index.js @@ -63,16 +63,18 @@ Tea.context(function () { } let chart = teaweb.initChart(chartBox) chart.setOption({ - radar: { - splitNumber: 4, - indicator: this.results.map(function (result) { - return { - name: result.node.name, - color: result.color, - max: 5000 - } - }) - }, + radar: [ + { + splitNumber: 4, + indicator: this.results.map(function (result) { + return { + name: result.node.name, + color: result.color, + max: 5000 + } + }) + } + ], series: [{ name: '', type: 'radar', diff --git a/web/views/@default/clusters/ip-addrs/addr/index.less b/web/views/@default/clusters/ip-addrs/addr/index.less index 874c9a83..ffd07034 100644 --- a/web/views/@default/clusters/ip-addrs/addr/index.less +++ b/web/views/@default/clusters/ip-addrs/addr/index.less @@ -8,5 +8,6 @@ h4 { .chart-box { + width: 30em; height: 20em; } \ No newline at end of file diff --git a/web/views/@default/clusters/monitors/reporters/index.html b/web/views/@default/clusters/monitors/reporters/index.html index cd3705ca..a7a8a5ab 100644 --- a/web/views/@default/clusters/monitors/reporters/index.html +++ b/web/views/@default/clusters/monitors/reporters/index.html @@ -41,7 +41,7 @@ {{reporter.name}} -
+
{{group.name}}