From f9754b7c9ef2b062be1d5032fdc87119644699dc Mon Sep 17 00:00:00 2001 From: Alessandro Francia Date: Tue, 10 Jul 2018 15:00:43 +0200 Subject: [PATCH] process select and head production --- Step/wwwroot/assets/styles/base/layout.less | 1 + .../styles/base/program-management.less | 30 +++++++++++++++++++ Step/wwwroot/assets/styles/style.css | 28 +++++++++++++++++ Step/wwwroot/src/app.modules.js | 3 ++ Step/wwwroot/src/app.routes.js | 5 +++- Step/wwwroot/src/components/production.vue | 10 ++++++- .../cards/process-selection-maintenance.vue | 16 ++++++---- .../src/modules/heads/head-production.vue | 6 ++++ .../src/modules/program-management.vue | 24 +++++++++++++++ 9 files changed, 115 insertions(+), 8 deletions(-) create mode 100644 Step/wwwroot/assets/styles/base/program-management.less create mode 100644 Step/wwwroot/src/modules/program-management.vue diff --git a/Step/wwwroot/assets/styles/base/layout.less b/Step/wwwroot/assets/styles/base/layout.less index 97a30533..ca36294f 100644 --- a/Step/wwwroot/assets/styles/base/layout.less +++ b/Step/wwwroot/assets/styles/base/layout.less @@ -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; diff --git a/Step/wwwroot/assets/styles/base/program-management.less b/Step/wwwroot/assets/styles/base/program-management.less new file mode 100644 index 00000000..a384956e --- /dev/null +++ b/Step/wwwroot/assets/styles/base/program-management.less @@ -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; + } +} \ No newline at end of file diff --git a/Step/wwwroot/assets/styles/style.css b/Step/wwwroot/assets/styles/style.css index a6493717..14f05cb4 100644 --- a/Step/wwwroot/assets/styles/style.css +++ b/Step/wwwroot/assets/styles/style.css @@ -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; diff --git a/Step/wwwroot/src/app.modules.js b/Step/wwwroot/src/app.modules.js index 708e8bfe..3fcea621 100644 --- a/Step/wwwroot/src/app.modules.js +++ b/Step/wwwroot/src/app.modules.js @@ -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"); diff --git a/Step/wwwroot/src/app.routes.js b/Step/wwwroot/src/app.routes.js index 72f6b49a..ec566e2b 100644 --- a/Step/wwwroot/src/app.routes.js +++ b/Step/wwwroot/src/app.routes.js @@ -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" } }, diff --git a/Step/wwwroot/src/components/production.vue b/Step/wwwroot/src/components/production.vue index 37bcace0..7ef124e4 100644 --- a/Step/wwwroot/src/components/production.vue +++ b/Step/wwwroot/src/components/production.vue @@ -63,7 +63,8 @@ :isSelected="getHeadsProperty(h.id).isSelected" :isActive="getHeadsProperty(h.id).isActive" :abrasiveIsActive="getHeadsProperty(h.id).abrasiveIsActive" - @click="selectHead(h)"> + @click="selectHead(h)" + @overridePlus="overridePlus(h.id)" @overrideMinus="overrideMinus(h.id)">
@@ -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); } diff --git a/Step/wwwroot/src/modules/base-components/cards/process-selection-maintenance.vue b/Step/wwwroot/src/modules/base-components/cards/process-selection-maintenance.vue index 2683019b..4da93a7c 100644 --- a/Step/wwwroot/src/modules/base-components/cards/process-selection-maintenance.vue +++ b/Step/wwwroot/src/modules/base-components/cards/process-selection-maintenance.vue @@ -9,21 +9,25 @@ \ No newline at end of file