From 6c2ff4772608d38d0a694cfb8d311ef92d549d32 Mon Sep 17 00:00:00 2001 From: Alessandro Date: Mon, 21 Jan 2019 09:37:59 +0100 Subject: [PATCH] labels e progress --- Step/wwwroot/src/@types/scada.d.ts | 2 ++ .../src/app_modules/alarms/components/alarm-detail.ts | 5 ----- .../src/app_modules/alarms/components/alarm-history.ts | 6 ------ Step/wwwroot/src/app_modules/scada/components/scada.vue | 8 ++++++++ Step/wwwroot/src/services/alarmsService.ts | 1 - Step/wwwroot/src/services/scadaService.ts | 1 + Step/wwwroot/src/store/scada.ts | 6 ++++++ 7 files changed, 17 insertions(+), 12 deletions(-) diff --git a/Step/wwwroot/src/@types/scada.d.ts b/Step/wwwroot/src/@types/scada.d.ts index 3accc70f..02e811d6 100644 --- a/Step/wwwroot/src/@types/scada.d.ts +++ b/Step/wwwroot/src/@types/scada.d.ts @@ -15,6 +15,7 @@ declare module scada { images: imageControl[], progressBars: progressControl[], inputs: inputControl[], + labels: labelControl[], } interface status { @@ -33,6 +34,7 @@ declare module scada { } interface label { + id?: number, backgroundColor: string, textAlign: string, textColor: string, diff --git a/Step/wwwroot/src/app_modules/alarms/components/alarm-detail.ts b/Step/wwwroot/src/app_modules/alarms/components/alarm-detail.ts index 7f88f669..fc75039a 100644 --- a/Step/wwwroot/src/app_modules/alarms/components/alarm-detail.ts +++ b/Step/wwwroot/src/app_modules/alarms/components/alarm-detail.ts @@ -56,13 +56,11 @@ export default class AlarmDetail extends Vue { } async mounted() { - debugger this.attaches = await alarmsService.getAttachments(this.alarm.id, this.sources.indexOf(this.alarm.source)); this.notes = await alarmsService.getNote(this.alarm.id, this.sources.indexOf(this.alarm.source)); } async onChange(e) { - debugger this.newAttach = e.target.files[0]; let result = await alarmsService.postAttachment(this.alarm.id, this.sources.indexOf(this.alarm.source), this.newAttach); this.attaches.push(result.data); @@ -148,7 +146,6 @@ export default class AlarmDetail extends Vue { } } async saveNote(note) { - debugger if (!note) return; let result = await alarmsService.postNote(this.alarm.id, this.sources.indexOf(this.alarm.source), note.message); @@ -157,7 +154,6 @@ export default class AlarmDetail extends Vue { } async saveModifyNoteMaintenance(note){ - debugger if(!note){ this.enableModifyNote = true; return; @@ -175,7 +171,6 @@ export default class AlarmDetail extends Vue { } } async onClickDeleteNote(note){ - debugger let $this = this; if(note){ ModalHelper.AskConfirm(this.$options.filters.localize("modal_confirm_title", "Richiesta di conferma"), diff --git a/Step/wwwroot/src/app_modules/alarms/components/alarm-history.ts b/Step/wwwroot/src/app_modules/alarms/components/alarm-history.ts index d366e599..4b784028 100644 --- a/Step/wwwroot/src/app_modules/alarms/components/alarm-history.ts +++ b/Step/wwwroot/src/app_modules/alarms/components/alarm-history.ts @@ -88,7 +88,6 @@ export default class AlarmHistory extends Vue { @Watch("filter", { deep: true }) async filterChanged(n, o) { - debugger let $this = this; let from = this.filter.interval && this.filter.interval.length ? this.filter.interval[0] : null; let to = this.filter.interval && this.filter.interval.length ? this.filter.interval[1] : null; @@ -135,14 +134,12 @@ export default class AlarmHistory extends Vue { } async selectAlarm(alarm){ - debugger this.selectedAlarm = alarm; this.attaches = await alarmsService.getAttachments(this.selectedAlarm.alarmId, this.selectedAlarm.source); this.notes = await alarmsService.getNote(this.selectedAlarm.alarmId, this.selectedAlarm.source); } updateLimitation() { - debugger if (this.limitationList > 3) this.limitationList = 3; else @@ -193,7 +190,6 @@ export default class AlarmHistory extends Vue { } async onClickDeleteNote(note){ - debugger let $this = this; if(note){ ModalHelper.AskConfirm(this.$options.filters.localize("modal_confirm_title", "Richiesta di conferma"), @@ -223,7 +219,6 @@ export default class AlarmHistory extends Vue { } async saveModifyNoteMaintenance(note){ - debugger if(!note){ this.enableModifyNote = true; return; @@ -242,7 +237,6 @@ export default class AlarmHistory extends Vue { } async saveNote(note) { - debugger if (!note) return; let result = await alarmsService.postNote(this.selectedAlarm.alarmId, this.selectedAlarm.source, note.message); diff --git a/Step/wwwroot/src/app_modules/scada/components/scada.vue b/Step/wwwroot/src/app_modules/scada/components/scada.vue index 79f31808..e424303a 100644 --- a/Step/wwwroot/src/app_modules/scada/components/scada.vue +++ b/Step/wwwroot/src/app_modules/scada/components/scada.vue @@ -49,6 +49,14 @@ width: `${item.size.x}px`, height: `${item.size.y}px` }"> + diff --git a/Step/wwwroot/src/services/alarmsService.ts b/Step/wwwroot/src/services/alarmsService.ts index 123a0035..9eb3ddda 100644 --- a/Step/wwwroot/src/services/alarmsService.ts +++ b/Step/wwwroot/src/services/alarmsService.ts @@ -48,7 +48,6 @@ export class AlarmsService extends baseRestService { // "language": "en" // } , true); - debugger return result; } diff --git a/Step/wwwroot/src/services/scadaService.ts b/Step/wwwroot/src/services/scadaService.ts index 678c5297..61d3d9cb 100644 --- a/Step/wwwroot/src/services/scadaService.ts +++ b/Step/wwwroot/src/services/scadaService.ts @@ -5,6 +5,7 @@ import { store } from "../store"; export class ScadaService extends baseRestService { async ListScada(): Promise { + debugger let result = await this.Get('/api/scada/list'); scadaActions.setScada(store, result); diff --git a/Step/wwwroot/src/store/scada.ts b/Step/wwwroot/src/store/scada.ts index bd7b8487..5e51c806 100644 --- a/Step/wwwroot/src/store/scada.ts +++ b/Step/wwwroot/src/store/scada.ts @@ -50,6 +50,12 @@ export const scadaStore = { state.layerItems.push({ scadaId: element.id, layerId: layer.id, id: input.id, item: input }); } + for (const idx in layer.labels) { + const label = layer.labels[idx]; + label.type = "labelControl"; + state.layerItems.push({ scadaId: element.id, layerId: layer.id, id: label.id, item: label }); + } + for (const idx in layer.images) { const img = layer.images[idx]; img.type = "imageControl";