This commit is contained in:
Paolo Possanzini
2018-07-31 10:47:24 +02:00
parent f7e7b79122
commit 45e5a903ea
3 changed files with 73 additions and 61 deletions
@@ -1,6 +1,6 @@
<template>
<!-- <div class="test-container"> -->
<div class="card-job-production" :class="{'width-100':noQueue}">
<div class="card-job-production" :class="{'width-100':noQueue}">
<div class="card-job-production-header">
<div class="title">
<label>Job</label>
@@ -21,15 +21,16 @@
<button class="tab" :class="{'active': enableFileSections}" @click="selectTab('FileSections')">Sezioni File</button>
</div>
<div class="content-box" v-if="enableIsoLines">
<div class="row " :class="{selected: true,'width-100':noQueue}">
<div class="triangle"></div><label>Lorem ipsum dolor sit amet, consectetur.</label>
<!-- <div class="row " :class="{selected: true,'width-100':noQueue}" v-for="(l, idx) in currentProgram.isoLines" :key="idx">
<div class="triangle"></div><label>{{l}}</label>
</div> -->
<div class="row" :class="{'width-100':noQueue}" v-for="(l, idx) in currentProgram.isoLines" :key="idx">
<div class="triangle"></div><label>{{l}}</label>
<!-- <div class="triangle"></div><label>Sed do eiusmod tempor incididunt ut.</label> -->
</div>
<div class="row" :class="{'width-100':noQueue}">
<div class="triangle"></div><label>Sed do eiusmod tempor incididunt ut.</label>
</div>
<div class="row" :class="{'width-100':noQueue}">
<!-- <div class="row" :class="{'width-100':noQueue}">
<div class="triangle"></div><label>Magna aliqua ut enim ad minim veniam.</label>
</div>
</div> -->
</div>
<div class="content-box scrollable" v-if="enableFileSections">
<card-production-section-file type="check"></card-production-section-file>
@@ -44,37 +45,40 @@
<script>
import cardProductionSectionFile from "./card-production-section-file.vue";
export default {
components:{
cardProductionSectionFile
},
props:{
noQueue: false
},
data: function(){
return{
enableIsoLines: true,
enableFileSections: false,
rowSelected: ""
}
},
methods:{
selectTab(tab){
if(tab == "IsoLines"){
this.enableIsoLines = true;
this.enableFileSections = false;
}
else if(tab == "FileSections"){
this.enableIsoLines = false;
this.enableFileSections = true;
}
else{
this.enableIsoLines = true;
this.enableFileSections = false;
}
},
selectRow(row){
this.rowSelected = row;
}
components: {
cardProductionSectionFile
},
props: {
noQueue: false
},
data: function() {
return {
enableIsoLines: true,
enableFileSections: false,
rowSelected: ""
};
},
computed: {
currentProgram: function() {
return this.$store.state.process.currentProgram;
}
}
</script>
},
methods: {
selectTab(tab) {
if (tab == "IsoLines") {
this.enableIsoLines = true;
this.enableFileSections = false;
} else if (tab == "FileSections") {
this.enableIsoLines = false;
this.enableFileSections = true;
} else {
this.enableIsoLines = true;
this.enableFileSections = false;
}
},
selectRow(row) {
this.rowSelected = row;
}
}
};
</script>
+11 -11
View File
@@ -86,13 +86,12 @@ export class Hub {
$.connection.hub.disconnected(() => {
Hub.manageServerStatus("disconnected");
console.log("SERVER CONNECTION: restart-connection")
setTimeout(function() {
setTimeout(function () {
$.connection.hub.start();
}, 5000); // Restart connection after 5 seconds.
});
$.connection.hub.stateChanged((state) =>{
if(state.newState == $.signalR.connectionState.connected)
{
$.connection.hub.stateChanged((state) => {
if (state.newState == $.signalR.connectionState.connected) {
Hub.manageServerStatus("connected");
}
});
@@ -107,8 +106,9 @@ export class Hub {
appModelActions.CheckLogoff(store, e.id);
}
private static activeProgramData(data){
console.log(data);
private static activeProgramData(data) {
// console.log(data);
processModelActions.setCurrentProgram(store, data)
}
private static axesNamesDataChanged(data) {
@@ -119,8 +119,8 @@ export class Hub {
processModelActions.setValueAxisSelected(store, data);
}
private static magazineStatusChanged(data){
depotActions.setMagazineStatusModel(store,data);
private static magazineStatusChanged(data) {
depotActions.setMagazineStatusModel(store, data);
// for (const k in data) {
// if (data.hasOwnProperty(k)) {
// // machineStatusActions.setHeadsProperty(store, status[k]);
@@ -177,10 +177,10 @@ export class Hub {
for (const key in status) {
if (status.hasOwnProperty(key)) {
const element = status[key];
if(element.createdByCms){
alarmsModelActions.addServiceAlarm(store, { guid: "maint_" + element.id, id: element.id, dateTime: new Date(element.expirationDate), message: null} as any)
if (element.createdByCms) {
alarmsModelActions.addServiceAlarm(store, { guid: "maint_" + element.id, id: element.id, dateTime: new Date(element.expirationDate), message: null } as any)
}
else{
else {
alarmsModelActions.addServiceAlarm(store, { guid: "maint_" + element.id, id: element.id, dateTime: new Date(element.expirationDate), message: element.title } as any)
}
+17 -9
View File
@@ -16,25 +16,30 @@ export interface ProcessModelActionsInterface {
selectAxis(context, axisId: number);
setAxes(context, data: signalr_process.AxisData[]);
setValueAxisSelected(context, data: signalr_process.AxisValueData);
setCurrentProgram(context,data);
}
export const processStore = {
state: {
currentProgram: null,
_process: new Map<number, signalr_process.ProcessData>(),
process: [],
axes: [],
running: false,
selectedProcess: 0,
selectedAxis: 0,
valueAxisSelected: {interpolated: Object, machine: Object, programmePos: Object, toGo: Object }
valueAxisSelected: { interpolated: Object, machine: Object, programmePos: Object, toGo: Object }
} as RunningProcessModel,
mutations: {
SetValueAxisSelected(store, data: signalr_process.AxisValueData){
SetCurrentProgram(store, data){
store.currentProgram = data;
},
SetValueAxisSelected(store, data: signalr_process.AxisValueData) {
store.valueAxisSelected = data;
},
SetAxes(store, data: signalr_process.AxisData[]){
SetAxes(store, data: signalr_process.AxisData[]) {
store.axes = data;
},
AddProcess(store, process: signalr_process.ProcessData) {
@@ -66,15 +71,18 @@ export const processStore = {
if (removed)
store.process = Array.from(store._process.values());
},
selectProcess(store, processId: number){
selectProcess(store, processId: number) {
store.selectedProcess = processId;
},
selectAxis(store, axisId: number){
selectAxis(store, axisId: number) {
store.selectedAxis = axisId;
}
},
actions: {
setValueAxisSelected(context, data: signalr_process.AxisValueData){
setCurrentProgram(context,data){
context.commit("SetCurrentProgram", data);
},
setValueAxisSelected(context, data: signalr_process.AxisValueData) {
context.commit("SetValueAxisSelected", data);
},
isRunning(context, status: boolean) {
@@ -92,13 +100,13 @@ export const processStore = {
checkRemove(context, keys: Array<number>) {
context.commit("checkRemoveProcess", keys);
},
selectProcess(context, processId: number){
selectProcess(context, processId: number) {
context.commit("selectProcess", processId);
},
selectAxis(context, axisId: number){
selectAxis(context, axisId: number) {
context.commit("selectAxis", axisId);
},
setAxes(context, data: signalr_process.AxisData[]){
setAxes(context, data: signalr_process.AxisData[]) {
context.commit("SetAxes", data);
}