mirror of
https://github.com/ClusterCockpit/cc-backend
synced 2024-11-10 08:57:25 +01:00
fix merge bugs
This commit is contained in:
parent
e347659db4
commit
82f5257cf1
@ -32,7 +32,8 @@
|
|||||||
scope,
|
scope,
|
||||||
subCluster,
|
subCluster,
|
||||||
isShared,
|
isShared,
|
||||||
hwthreads,
|
numhwthreads,
|
||||||
|
numaccs
|
||||||
) {
|
) {
|
||||||
// console.log('NAME ' + metricConfig.name + ' / SCOPE ' + scope + ' / SUBCLUSTER ' + subCluster.name)
|
// console.log('NAME ' + metricConfig.name + ' / SCOPE ' + scope + ' / SUBCLUSTER ' + subCluster.name)
|
||||||
if (!metricConfig || !scope || !subCluster) {
|
if (!metricConfig || !scope || !subCluster) {
|
||||||
@ -157,7 +158,8 @@
|
|||||||
export let subCluster;
|
export let subCluster;
|
||||||
export let isShared = false;
|
export let isShared = false;
|
||||||
export let forNode = false;
|
export let forNode = false;
|
||||||
export let hwthreads = 0;
|
export let numhwthreads = 0;
|
||||||
|
export let numaccs = 0;
|
||||||
|
|
||||||
if (useStatsSeries == null) useStatsSeries = statisticsSeries != null;
|
if (useStatsSeries == null) useStatsSeries = statisticsSeries != null;
|
||||||
|
|
||||||
@ -182,7 +184,8 @@
|
|||||||
? cluster.subClusters.find((sc) => sc.name == subCluster)
|
? cluster.subClusters.find((sc) => sc.name == subCluster)
|
||||||
: subCluster,
|
: subCluster,
|
||||||
isShared,
|
isShared,
|
||||||
hwthreads,
|
numhwthreads,
|
||||||
|
numaccs
|
||||||
);
|
);
|
||||||
|
|
||||||
// converts the legend into a simple tooltip
|
// converts the legend into a simple tooltip
|
||||||
|
Loading…
Reference in New Issue
Block a user