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

header buttons & plc click

Browse Source
This commit is contained in:
Paolo Possanzini
2018-02-06 11:23:37 +01:00
parent 2d653e385f
commit bccfa8247e
11 changed files with 179 additions and 205 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Step.Config/serverConfig.xml
+2 -2
View File
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<ncConfig>
<ncVendor>OSAI</ncVendor> <!-- NO_NC/DEMO/FANUC/SIEMENS/OSAI -->
<ncVendor>DEMO</ncVendor> <!-- NO_NC/DEMO/FANUC/SIEMENS/OSAI -->
<showNcHMI>true</showNcHMI>
<ncIpAddress>192.168.157.2</ncIpAddress>
<ncIpAddress>127.0.0.1</ncIpAddress>
<ncPort>8080</ncPort>
<machineModel>Ares 37 OF</machineModel>
</ncConfig>
Step/wwwroot/dist/1.build.js
Vendored
+2 -10
View File
File diff suppressed because one or more lines are too long
Step/wwwroot/dist/2.build.js
Vendored
+2 -2
View File
File diff suppressed because one or more lines are too long
Step/wwwroot/dist/build.js
Vendored
+76 -53
View File
File diff suppressed because one or more lines are too long
Step/wwwroot/src/components/test-status.ts
-57
View File
@@ -11,64 +11,7 @@ import {
@Component({})
export default class TestStatus extends Vue {
toggleAssi() {
machineStatusActions.setPowerAlarm(
this.$store,
!this.$store.state.machineStatus.powerOnAlarm
);
}
toggleAria() {
machineStatusActions.setAirPressureAlarm(
this.$store,
!this.$store.state.machineStatus.airPressureAlarm
);
}
toggleProtezioni() {
machineStatusActions.setProtectionsAlarm(
this.$store,
!this.$store.state.machineStatus.protectionsAlarm
);
}
toggleEmergenza() {
machineStatusActions.setEmergencyAlarm(
this.$store,
!this.$store.state.machineStatus.emergencyAlarm
);
}
toggleSettings() {
machineStatusActions.setSettingsModeAlarm(
this.$store,
!this.$store.state.machineStatus.settingsModeAlarm
);
}
toggleChiave() {
machineStatusActions.setKeyReadyAlarm(
this.$store,
!this.$store.state.machineStatus.keyReadyAlarm
);
}
toggleResetAxes() {
machineStatusActions.setResetAxesAlarm(
this.$store,
!this.$store.state.machineStatus.resetAxesAlarm
);
}
toggleWaterJet1() {
machineStatusActions.setWaterJet1Alarm(
this.$store,
!this.$store.state.machineStatus.waterJet1Alarm
);
}
toggleWaterJet2() {
machineStatusActions.setWaterJet2Alarm(
this.$store,
!this.$store.state.machineStatus.waterJet2Alarm
);
}
addProcess() {
processModelActions.addProcess(this.$store, {});
}
Step/wwwroot/src/components/test-status.vue
+1 -16
View File
@@ -11,22 +11,7 @@
<button @click="addService()">Aggiungi richiesta manutenzione</button>
</div>
<hr>
<h3>test per la barra di stato macchina</h3>
<div class="row">
<button @click="toggleAssi()">Power On/Off assi</button>
<button @click="toggleAria()">Pressione aria</button>
<button @click="toggleProtezioni()">Apri/Chiudi protezioni</button>
<button @click="toggleEmergenza()">Attiva/Disattiva pulsanti emergenza</button>
<button @click="toggleSettings()">Attiva/Disattiva modalità settings</button>
<button @click="toggleChiave()">Inserisci/Rimuovi chiave per avviamento</button>
</div>
<hr>
<h3>test per le icone di taratura macchina</h3>
<div class="row">
<button @click="toggleResetAxes()">Taratura Assi</button>
<button @click="toggleWaterJet1()">Waterjet 1</button>
<button @click="toggleWaterJet2()">Waterjet 2</button>
</div>
</div>
</template>
Step/wwwroot/src/modules/app-header.ts
+8 -1
View File
@@ -1,8 +1,9 @@
import Vue from "vue";
import Component from "vue-class-component";
import { AppRibbon, UserInfo, ProcessInfo } from "./base-components";
import { AppModel } from "src/store";
import { AppModel, buttonStatus } from "src/store";
import { Factory, MessageService } from "src/_base";
import { Hub } from "src/services/hub";
@Component({ name: "app-header", components: { appRibbon: AppRibbon, userInfo: UserInfo, processInfo: ProcessInfo } })
@@ -75,6 +76,12 @@ export default class AppHeader extends Vue {
Factory.Get(MessageService).publishToChannel(name);
}
public manageClick(btn: buttonStatus)
{
if(btn.Clickable)
Hub.Current.sendPowerCommand(btn.Id);
}
}
enum ribbonStatusEnum {
Step/wwwroot/src/modules/app-header.vue
+10 -9
View File
@@ -23,19 +23,20 @@
<button :class="{ red: mainStatus, blue: !mainStatus }">
<img class="h-24" src="assets/icons/png/switch-icon@2x.png">
</button>
<button class="power-on" v-if="state.powerOnAlarm"><img src="assets/icons/png/control-icon-error@2x.png"></button>
<button class="airflow" v-if="state.airPressureAlarm"><img src="assets/icons/png/air-icon@2x.png"></button>
<button class="protections" v-if="state.protectionsAlarm"><img src="assets/icons/png/lock-icon-error@2x.png"></button>
<button class="emergency" v-if="state.emergencyAlarm"><img src="assets/icons/png/refresh-icon-error@2x.png"></button>
<button class="settings-mode" v-if="state.settingsModeAlarm"><img src="assets/icons/png/no-settings@2x.png"></button>
<button class="key" v-if="state.keyReadyAlarm"><img src="assets/icons/png/key-icon-error@2x.png"></button>
<button class="power-on" v-if="state.powerOnAlarm.Active" @click="manageClick(state.powerOnAlarm)"><img src="assets/icons/png/control-icon-error@2x.png"></button>
<button class="airflow" v-if="state.airPressureAlarm.Active" @click="manageClick(state.airPressureAlarm)"><img src="assets/icons/png/air-icon@2x.png"></button>
<button class="protections" v-if="state.protectionsAlarm.Active" @click="manageClick(state.protectionsAlarm)"><img src="assets/icons/png/lock-icon-error@2x.png"></button>
<button class="emergency" v-if="state.emergencyAlarm.Active" @click="manageClick(state.emergencyAlarm)"><img src="assets/icons/png/refresh-icon-error@2x.png"></button>
<button class="settings-mode" v-if="state.settingsModeAlarm.Active" @click="manageClick(state.settingsModeAlarm)"><img src="assets/icons/png/no-settings@2x.png"></button>
<button class="key" v-if="state.keyReadyAlarm.Active" @click="manageClick(state.keyReadyAlarm)"><img src="assets/icons/png/key-icon-error@2x.png"></button>
<button :class="{ red: powerOnStatus, blue: !powerOnStatus }">
<img src="assets/icons/png/ok-white.png" class="h-20" v-if="!powerOnStatus">
<img src="assets/icons/png/not-ok-white.png" class="h-20" v-if="powerOnStatus">
</button>
<button class="key" v-if="state.resetAxesAlarm" @click="sendMessage('show-axes-calibration')"><img src="assets/icons/png/taratura-icon-error@2x.png"></button>
<button class="key" v-if="state.waterJet1Alarm"></button>
<button class="key" v-if="state.waterJet2Alarm"></button>
<button class="key" v-if="state.resetAxesAlarm.Active"
@click="manageClick(state.resetAxesAlarm)"><img src="assets/icons/png/taratura-icon-error@2x.png"></button>
<button class="key" v-if="state.waterJet1Alarm.Active" @click="manageClick(state.waterJet1Alarm)"></button>
<button class="key" v-if="state.waterJet2Alarm.Active" @click="manageClick(state.waterJet2Alarm)"></button>
<process-info :running="true" :counter="2" v-if="!mainStatus">
<strong>Part file 01</strong>
Step/wwwroot/src/services/hub.ts
+24 -8
View File
@@ -22,9 +22,21 @@ export class Hub {
static _ncConnectionNotificationVisible?: boolean = false;
// singleton hub implementation
private static _current: Hub;
static get Current(): Hub {
if (!Hub._current) new Hub();
return Hub._current;
}
private _hub: any;
constructor() {
Hub._current = this;
this._hub = $.connection.ncHub;
@@ -98,16 +110,20 @@ export class Hub {
Hub.manageNcStatus({ connected: true });
// Pre-power on
machineStatusActions.setAirPressureAlarm(store, power.prePowerOn.AirPressure.Active);
machineStatusActions.setPowerAlarm(store, power.prePowerOn.PowerOn.Active);
machineStatusActions.setEmergencyAlarm(store, power.prePowerOn.EmergencyButtons.Active);
machineStatusActions.setProtectionsAlarm(store, power.prePowerOn.ProtectionStatus.Active);
machineStatusActions.setSettingsModeAlarm(store, power.prePowerOn.SettingMode.Active);
machineStatusActions.setKeyReadyAlarm(store, power.prePowerOn.StartingKey.Active);
machineStatusActions.setAirPressureAlarm(store, power.prePowerOn.AirPressure);
machineStatusActions.setPowerAlarm(store, power.prePowerOn.PowerOn);
machineStatusActions.setEmergencyAlarm(store, power.prePowerOn.EmergencyButtons);
machineStatusActions.setProtectionsAlarm(store, power.prePowerOn.ProtectionStatus);
machineStatusActions.setSettingsModeAlarm(store, power.prePowerOn.SettingMode);
machineStatusActions.setKeyReadyAlarm(store, power.prePowerOn.StartingKey);
// Post-power on
machineStatusActions.setResetAxesAlarm(store, power.postPowerOn.AxisReset.Active);
machineStatusActions.setWaterJet1Alarm(store, power.postPowerOn.WaterjetPump.Active);
machineStatusActions.setResetAxesAlarm(store, power.postPowerOn.AxisReset);
machineStatusActions.setWaterJet1Alarm(store, power.postPowerOn.WaterjetPump);
}
public sendPowerCommand(id: number){
this._hub.server.putPowerOnData(id);
}
public Hello() {
Step/wwwroot/src/store/index.js
+3 -2
View File
@@ -1,6 +1,6 @@
import { store, AppModel, appModelActions } from "./app.store";
import { machineInfoActions, MachineInfoModel } from "./machineInfo.store";
import { machineStatusActions, MachineStatusModel } from "./machineStatus.store";
import { machineStatusActions, MachineStatusModel, buttonStatus } from "./machineStatus.store";
import { AlarmsModel, alarmsModelActions, alarmsStore, AlarmModel } from "./alarms.store";
import { processModelActions, processStore, RunningProcessModel } from "./runningProcess.store";
import { LocalizationModel, languageModel, localizationModelActions } from "./localization.store";
@@ -20,5 +20,6 @@ export {
LocalizationModel,
languageModel,
localizationModelActions,
AlarmModel
AlarmModel,
buttonStatus
}
Step/wwwroot/src/store/machineStatus.store.ts
+51 -45
View File
@@ -9,32 +9,38 @@ export interface AreaModel {
}
export interface MachineStatusModel {
powerOnAlarm: boolean,
airPressureAlarm: boolean,
protectionsAlarm: boolean,
emergencyAlarm: boolean,
settingsModeAlarm: boolean,
keyReadyAlarm: boolean,
powerOnAlarm: buttonStatus,
airPressureAlarm: buttonStatus,
protectionsAlarm: buttonStatus,
emergencyAlarm: buttonStatus,
settingsModeAlarm: buttonStatus,
keyReadyAlarm: buttonStatus,
resetAxesAlarm: boolean,
waterJet1Alarm: boolean,
waterJet2Alarm: boolean,
resetAxesAlarm: buttonStatus,
waterJet1Alarm: buttonStatus,
waterJet2Alarm: buttonStatus,
ncReady: boolean,
areasConfiguration: Array<AreaModel>
}
export interface buttonStatus{
Active: boolean,
Clickable: boolean,
Id: number
}
export interface MachineStatusActions {
setPowerAlarm(context, status: boolean),
setAirPressureAlarm(context, status: boolean),
setProtectionsAlarm(context, status: boolean),
setEmergencyAlarm(context, status: boolean),
setSettingsModeAlarm(context, status: boolean),
setKeyReadyAlarm(context, status: boolean),
setResetAxesAlarm(context, status: boolean)
setWaterJet1Alarm(context, status: boolean)
setWaterJet2Alarm(context, status: boolean)
setPowerAlarm(context, status: buttonStatus),
setAirPressureAlarm(context, status: buttonStatus),
setProtectionsAlarm(context, status: buttonStatus),
setEmergencyAlarm(context, status: buttonStatus),
setSettingsModeAlarm(context, status: buttonStatus),
setKeyReadyAlarm(context, status: buttonStatus),
setResetAxesAlarm(context, status: buttonStatus)
setWaterJet1Alarm(context, status: buttonStatus)
setWaterJet2Alarm(context, status: buttonStatus)
setAreasConfg(context, areas: Array<AreaModel>)
isAreaEnabled(context, areaname: string): boolean;
isAreaVisible(context, areaname): boolean;
@@ -44,16 +50,16 @@ export interface MachineStatusActions {
export const machineStatusStore = {
state: {
powerOnAlarm: true,
airPressureAlarm: true,
protectionsAlarm: true,
emergencyAlarm: true,
settingsModeAlarm: true,
keyReadyAlarm: true,
powerOnAlarm: { Active: true, Clickable: true, Id:1 },
airPressureAlarm: { Active: true, Clickable: true, Id:1 },
protectionsAlarm: { Active: true, Clickable: true, Id:1 },
emergencyAlarm: { Active: true, Clickable: true, Id:1 },
settingsModeAlarm: { Active: true, Clickable: true, Id:1 },
keyReadyAlarm: { Active: true, Clickable: true, Id:1 },
resetAxesAlarm: true,
waterJet1Alarm: false,
waterJet2Alarm: false,
resetAxesAlarm: { Active: true, Clickable: true, Id:1 },
waterJet1Alarm: { Active: true, Clickable: true, Id:1 },
waterJet2Alarm: { Active: true, Clickable: true, Id:1 },
ncReady: false,
@@ -62,17 +68,17 @@ export const machineStatusStore = {
} as MachineStatusModel,
getters: {
mainStatus: state => {
return state.powerOnAlarm ||
state.airPressureAlarm ||
state.protectionsAlarm ||
state.emergencyAlarm ||
state.settingsModeAlarm ||
state.keyReadyAlarm;
return state.powerOnAlarm.Active ||
state.airPressureAlarm.Active ||
state.protectionsAlarm.Active ||
state.emergencyAlarm.Active ||
state.settingsModeAlarm.Active ||
state.keyReadyAlarm.Active;
},
powerOnAlarms: state => {
return state.resetAxesAlarm ||
state.waterJet1Alarm ||
state.waterJet2Alarm;
return state.resetAxesAlarm.Active ||
state.waterJet1Alarm.Active ||
state.waterJet2Alarm.Active;
}
},
mutations: {
@@ -83,32 +89,32 @@ export const machineStatusStore = {
}
},
actions: {
setPowerAlarm(context, status: boolean) {
setPowerAlarm(context, status: buttonStatus) {
context.commit('UpdateMachineStatus', { powerOnAlarm: status });
},
setAirPressureAlarm(context, status: boolean) {
setAirPressureAlarm(context, status: buttonStatus) {
context.commit('UpdateMachineStatus', { airPressureAlarm: status });
},
setProtectionsAlarm(context, status: boolean) {
setProtectionsAlarm(context, status: buttonStatus) {
context.commit('UpdateMachineStatus', { protectionsAlarm: status });
},
setEmergencyAlarm(context, status: boolean) {
setEmergencyAlarm(context, status: buttonStatus) {
context.commit('UpdateMachineStatus', { emergencyAlarm: status });
},
setSettingsModeAlarm(context, status: boolean) {
setSettingsModeAlarm(context, status: buttonStatus) {
context.commit('UpdateMachineStatus', { settingsModeAlarm: status });
},
setKeyReadyAlarm(context, status: boolean) {
setKeyReadyAlarm(context, status: buttonStatus) {
context.commit('UpdateMachineStatus', { keyReadyAlarm: status });
},
setResetAxesAlarm(context, status: boolean) {
setResetAxesAlarm(context, status: buttonStatus) {
context.commit('UpdateMachineStatus', { resetAxesAlarm: status });
},
setWaterJet1Alarm(context, status: boolean) {
setWaterJet1Alarm(context, status: buttonStatus) {
context.commit('UpdateMachineStatus', { waterJet1Alarm: status });
},
setWaterJet2Alarm(context, status: boolean) {
setWaterJet2Alarm(context, status: buttonStatus) {
context.commit('UpdateMachineStatus', { waterJet2Alarm: status });
},
setAreasConfg(context, areas: Array<AreaModel>) {