|
|
@ -97,7 +97,6 @@ export class UtilsService { |
|
|
color: this.getMaterialColor(0), |
|
|
color: this.getMaterialColor(0), |
|
|
funcBody: this.getPredefinedFunctionBody('Sin'), |
|
|
funcBody: this.getPredefinedFunctionBody('Sin'), |
|
|
settings: {}, |
|
|
settings: {}, |
|
|
_hash: Math.random() |
|
|
|
|
|
}; |
|
|
}; |
|
|
|
|
|
|
|
|
defaultDatasource: Datasource = { |
|
|
defaultDatasource: Datasource = { |
|
|
@ -153,8 +152,7 @@ export class UtilsService { |
|
|
type: DataKeyType.alarm, |
|
|
type: DataKeyType.alarm, |
|
|
label: this.translate.instant(alarmFields[name].name), |
|
|
label: this.translate.instant(alarmFields[name].name), |
|
|
color: this.getMaterialColor(i), |
|
|
color: this.getMaterialColor(i), |
|
|
settings: {}, |
|
|
settings: {} |
|
|
_hash: Math.random() |
|
|
|
|
|
}; |
|
|
}; |
|
|
this.defaultAlarmDataKeys.push(dataKey); |
|
|
this.defaultAlarmDataKeys.push(dataKey); |
|
|
} |
|
|
} |
|
|
@ -267,8 +265,7 @@ export class UtilsService { |
|
|
type, |
|
|
type, |
|
|
label, |
|
|
label, |
|
|
funcBody: keyInfo.funcBody, |
|
|
funcBody: keyInfo.funcBody, |
|
|
settings: {}, |
|
|
settings: {} |
|
|
_hash: Math.random() |
|
|
|
|
|
}; |
|
|
}; |
|
|
if (keyInfo.units) { |
|
|
if (keyInfo.units) { |
|
|
dataKey.units = keyInfo.units; |
|
|
dataKey.units = keyInfo.units; |
|
|
|