Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_step into develop
This commit is contained in:
@@ -29,6 +29,7 @@
|
||||
@import "depot-action-modal.less";
|
||||
@import "production.less";
|
||||
@import "create-queue.less";
|
||||
@import "program-management.less";
|
||||
|
||||
@background-color: rgb(216, 216, 216);
|
||||
@handle-width: 48px;
|
||||
|
||||
@@ -0,0 +1,30 @@
|
||||
// out: false, sourceMap: false, main: ../style.less
|
||||
|
||||
.program-management-container{
|
||||
width: 1504px;
|
||||
height: 759px;
|
||||
display: flex;
|
||||
flex-flow: column;
|
||||
.header{
|
||||
height: 65px;
|
||||
width: 100%;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
background-color: @color-background-white;
|
||||
font-size: 24px;
|
||||
font-weight: 600;
|
||||
color: @color-darkish-blue;
|
||||
label{
|
||||
margin-left: 24px;
|
||||
}
|
||||
}
|
||||
.program-management-body{
|
||||
width: 100%;
|
||||
height: 694px;
|
||||
background-color: @color-silver;
|
||||
display: flex;
|
||||
flex-flow: row;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
}
|
||||
}
|
||||
@@ -10749,6 +10749,34 @@ footer .container button.big:before {
|
||||
justify-content: flex-end;
|
||||
align-items: center;
|
||||
}
|
||||
.program-management-container {
|
||||
width: 1504px;
|
||||
height: 759px;
|
||||
display: flex;
|
||||
flex-flow: column;
|
||||
}
|
||||
.program-management-container .header {
|
||||
height: 65px;
|
||||
width: 100%;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
background-color: #fff;
|
||||
font-size: 24px;
|
||||
font-weight: 600;
|
||||
color: #002680;
|
||||
}
|
||||
.program-management-container .header label {
|
||||
margin-left: 24px;
|
||||
}
|
||||
.program-management-container .program-management-body {
|
||||
width: 100%;
|
||||
height: 694px;
|
||||
background-color: #bbbcbc;
|
||||
display: flex;
|
||||
flex-flow: row;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
}
|
||||
.persona {
|
||||
height: 88px;
|
||||
width: 88px;
|
||||
|
||||
@@ -137,6 +137,9 @@ export const CardProductionSectionFile = () =>
|
||||
export const ModalLoadProgram = () =>
|
||||
import ("./modules/base-components/modal-load-program.vue");
|
||||
|
||||
export const ProgramManagement = () =>
|
||||
import ("./modules/program-management.vue");
|
||||
|
||||
// Test pages
|
||||
export const TestLoader = () =>
|
||||
import ("./components/test-loader.vue");
|
||||
|
||||
@@ -41,7 +41,8 @@ import {
|
||||
CardQueueProduction,
|
||||
CardJobProduction,
|
||||
CardProductionSectionFile,
|
||||
ModalLoadProgram
|
||||
ModalLoadProgram,
|
||||
ProgramManagement
|
||||
} from "./app.modules";
|
||||
|
||||
export let routes = [
|
||||
@@ -84,6 +85,8 @@ export let routes = [
|
||||
{ path: "/depot-action-unloading", component: DepotActionUnloading, meta: { title: "Step - Depot-Action-Unloading", area: "depot-action-unloading" } },
|
||||
{ path: "/depot-action-generic", component: DepotActionGeneric, meta: { title: "Step - Depot-Action-Generic", area: "depot-action-generic" } },
|
||||
|
||||
{ path: "/program-management", component: ProgramManagement, meta: { title: "Step - Program-Management", area: "program-management" } },
|
||||
|
||||
{ path: "/maintenance-progress", component: MaintenanceProgress, meta: { title: "Step - Maintenance-Progress", area: "maintenance-progress" } },
|
||||
{ path: "/maintenance-card", component: MaintenanceCard, meta: { title: "Step - Maintenance-Card", area: "maintenance-card" } },
|
||||
{ path: "/card-maintenance-wizard", component: MaintenanceWizard, meta: { title: "Step - Maintenance-Wizard", area: "card-maintenance-wizard" } },
|
||||
|
||||
@@ -63,7 +63,8 @@
|
||||
:isSelected="getHeadsProperty(h.id).isSelected"
|
||||
:isActive="getHeadsProperty(h.id).isActive"
|
||||
:abrasiveIsActive="getHeadsProperty(h.id).abrasiveIsActive"
|
||||
@click="selectHead(h)"></head-production>
|
||||
@click="selectHead(h)"
|
||||
@overridePlus="overridePlus(h.id)" @overrideMinus="overrideMinus(h.id)"></head-production>
|
||||
</div>
|
||||
<div class="box-softkeys-prefered">
|
||||
<div class="box-softkeys-prefered-header">
|
||||
@@ -86,6 +87,7 @@ import headProduction from "../modules/heads/head-production.vue"
|
||||
import cardAxesProduction from "../modules/base-components/cards/card-axes-production.vue"
|
||||
import processSelectionMaintenance from "../modules/base-components/cards/process-selection-maintenance.vue";
|
||||
import cardProductionCms from "../modules/base-components/cards/card-production-cms.vue";
|
||||
import { Hub } from "src/services/hub";
|
||||
import { Factory, MessageService } from "src/_base";
|
||||
import { alarmsModelActions,store } from "src/store";
|
||||
import { ModalHelper } from "src/modules/base-components";
|
||||
@@ -174,6 +176,12 @@ export default {
|
||||
if (r) return r.value;
|
||||
return false;
|
||||
},
|
||||
overrideMinus: function(id) {
|
||||
Hub.Current.headOverrideMinus(id);
|
||||
},
|
||||
overridePlus: function(id) {
|
||||
Hub.Current.headOverridePlus(id);
|
||||
},
|
||||
positionBox(arg1){
|
||||
this.selectedPositionTop = (arg1.offsetTop - (this.$refs.scrollable).scrollTop - (this.$refs.scrollable).offsetTop - (this.$refs.scrollable).offsetHeight + 134);
|
||||
}
|
||||
|
||||
@@ -9,21 +9,25 @@
|
||||
</template>
|
||||
<script>
|
||||
import { Hub } from "src/services/hub";
|
||||
import { processModelActions } from "src/store/runningProcess.store";
|
||||
export default {
|
||||
data: function(){
|
||||
return {
|
||||
selectedProcess: 1
|
||||
}
|
||||
},
|
||||
// data: function(){
|
||||
// return {
|
||||
// selectedProcess: 1
|
||||
// }
|
||||
// },
|
||||
computed: {
|
||||
processes: function() {
|
||||
return this.$store.state.process.process;
|
||||
},
|
||||
selectedProcess: function() {
|
||||
return this.$store.state.process.selectedProcess;
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
selectProcess: function(id) {
|
||||
if(this.selectedProcess != id){
|
||||
this.selectedProcess = id;
|
||||
Hub.Current.selectProcess(id);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -99,6 +99,12 @@ export default {
|
||||
if(this.load> this.dangerlevel) return "danger";
|
||||
if(this.load> this.warningllevel) return "warning";
|
||||
return null;
|
||||
},
|
||||
overridePlus(){
|
||||
this.$emit("overridePlus");
|
||||
},
|
||||
overrideMinus(){
|
||||
this.$emit("overrideMinus");
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -0,0 +1,24 @@
|
||||
<template>
|
||||
<div class="test-container">
|
||||
<div class="program-management-container">
|
||||
<div class="header">
|
||||
<label>{{'program_management_title_label' | localize("Gestione programmi")}}</label>
|
||||
</div>
|
||||
<div class="program-management-body">
|
||||
<card :title="'program_management_open_program' | localize('Apri Programma')"></card>
|
||||
<card :title="'program_management_create_queue' | localize('Crea coda')"></card>
|
||||
<card :title="'program_management_create_part_program' | localize('Crea Part program')"></card>
|
||||
<card :title="'program_management_create_job' | localize('Crea Job')"></card>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</template>
|
||||
<script>
|
||||
import card from "./base-components/cards/card.vue";
|
||||
export default {
|
||||
components: {
|
||||
card
|
||||
}
|
||||
};
|
||||
</script>
|
||||
Reference in New Issue
Block a user