Egalware/cms_thermo_active
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_thermo_active into develop

Browse Source
This commit is contained in:
NICOLA CARMINATI
2020-09-15 12:24:47 +02:00
parent 67fcba0053 a7548a6e78
commit ed8400619c
6 changed files with 32 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Thermo.Active.NC/NcAdapter.cs
+1 -1
View File
@@ -1836,7 +1836,7 @@ namespace Thermo.Active.NC
Id = item.Id,
Range = currRange,
Status = currStatus,
UnitMeasure = "",
UnitMeasure = $"{paramPLC.UnitMeasure}",
ValueAct = paramPLC.ValueAct / item.ScaleFactor,
SetpointHMI = paramPLC.SetpointHMI / item.ScaleFactor,
SetpointPLC = paramPLC.SetpointPLC / item.ScaleFactor,
Thermo.Active/Properties/AssemblyInfo.cs
+1 -1
View File
@@ -30,4 +30,4 @@ using System.Runtime.InteropServices;
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
[assembly: AssemblyVersion("0.14.80")]
[assembly: AssemblyVersion("0.14.81")]
Thermo.Active/wwwroot/assets/styles/base/dashboard.less
+1
View File
@@ -176,6 +176,7 @@
font-size: 120px;
font-weight: 300;
z-index: 1;
max-height: 140px;
}
}
Thermo.Active/wwwroot/assets/styles/style.css
+1
View File
@@ -4301,6 +4301,7 @@ article .box .body {
font-size: 120px;
font-weight: 300;
z-index: 1;
max-height: 140px;
}
.dashboard .first_col .timing-area .start::before {
background-image: url(/assets/svg/dashboard-top-left.svg);
Thermo.Active/wwwroot/src/app_modules_thermo/processo/components/gantt/gantt-component.ts
+11 -11
View File
@@ -114,17 +114,17 @@ export default class GanttComponent extends Vue {
showModalStep(step: number, subcategory: string): Promise<number> {
switch (step) {
case 0: return ModalHelper.ShowModalAsync(ShowFormatoInfo, { subcategory });
case 1: return ModalHelper.ShowModalAsync(ShowQuoteVelocitaInfo, { subcategory });
case 2: return ModalHelper.ShowModalAsync(ShowCicloInfo, { subcategory });
case 3: return ModalHelper.ShowModalAsync(ShowRiscaldamentoInfo, { subcategory });
case 4: return ModalHelper.ShowModalAsync(ShowPirometroInfo, { subcategory });
case 5: return ModalHelper.ShowModalAsync(ShowImbutituraInfo, { subcategory });
case 6: return ModalHelper.ShowModalAsync(ShowControstampoInfo, { subcategory });
case 7: return ModalHelper.ShowModalAsync(ShowRaffreddamentoInfo, { subcategory });
case 8: return ModalHelper.ShowModalAsync(ShowVuotoInfo, { subcategory });
case 9: return ModalHelper.ShowModalAsync(ShowEstrazioneInfo, { subcategory });
case 10: return ModalHelper.ShowModalAsync(ShowOpzioniInfo, { subcategory });
case 0: return ModalHelper.ShowModalAsync(ShowFormatoInfo, subcategory?.toLowerCase());
case 1: return ModalHelper.ShowModalAsync(ShowQuoteVelocitaInfo, subcategory?.toLowerCase());
case 2: return ModalHelper.ShowModalAsync(ShowCicloInfo, subcategory?.toLowerCase());
case 3: return ModalHelper.ShowModalAsync(ShowRiscaldamentoInfo, subcategory?.toLowerCase());
case 4: return ModalHelper.ShowModalAsync(ShowPirometroInfo, subcategory?.toLowerCase());
case 5: return ModalHelper.ShowModalAsync(ShowImbutituraInfo, subcategory?.toLowerCase());
case 6: return ModalHelper.ShowModalAsync(ShowControstampoInfo, subcategory?.toLowerCase());
case 7: return ModalHelper.ShowModalAsync(ShowRaffreddamentoInfo, subcategory?.toLowerCase());
case 8: return ModalHelper.ShowModalAsync(ShowVuotoInfo, subcategory?.toLowerCase());
case 9: return ModalHelper.ShowModalAsync(ShowEstrazioneInfo, subcategory?.toLowerCase());
case 10: return ModalHelper.ShowModalAsync(ShowOpzioniInfo, subcategory?.toLowerCase());
// case 11: return ModalHelper.ShowModalAsync(AvvioProduzione);
}
Thermo.Active/wwwroot/src/app_modules_thermo/processo/components/gantt/gantt.ts
+17 -4
View File
@@ -107,10 +107,22 @@ export default class Gantt extends Vue {
}
get PadY() {
if (this.follow) {
try {
let result = Math.min(...this.blocks.filter(b => !b.terminated).map(i => i.section));
switch (result) {
case 1: return 0; break;
case 2: return (this.$refs.section1 as any).rowHeight; break;
case 3: return (this.$refs.section1 as any).rowHeight + (this.$refs.section2 as any).rowHeight; break;
}
} catch { }
}
return this.padY;
}
set PadY(value: number) {
this.padY = value;
if (!this.follow)
this.padY = value;
}
follow: boolean = false;
@@ -169,14 +181,15 @@ export default class Gantt extends Vue {
doPan(event: MouseEvent | TouchEvent) {
if (this.lastPosition)
if (event.type == "touchmove" || (event.type == "mousemove" && (event as MouseEvent).buttons)) {
this.follow = false;
let p = this.getSvgCoords(event)
this.PadX = Math.min(this.PadX + p.x - this.lastPosition.x, 0);
this.PadY = Math.max(Math.min(this.PadY + p.y - this.lastPosition.y, 0), -this.maxPaddingY);
this.lastPosition = p;
}
}