diff --git a/Libs/CMS_CORE_Library.dll b/Libs/CMS_CORE_Library.dll index 518831d2..0ede69b8 100644 Binary files a/Libs/CMS_CORE_Library.dll and b/Libs/CMS_CORE_Library.dll differ diff --git a/Step/wwwroot/assets/styles/base/card.less b/Step/wwwroot/assets/styles/base/card.less index 99fd91a9..08c6d583 100644 --- a/Step/wwwroot/assets/styles/base/card.less +++ b/Step/wwwroot/assets/styles/base/card.less @@ -153,11 +153,18 @@ align-items: center; margin-left: auto; input,select{ - width: 304px; + width: 294px; height: 48px; font-size: 18px; line-height: 1.11; color: @color-greyish-brown; + padding: 0 5px; + box-sizing: border-box; + + &[type=number]{ + text-align: right; + } + } } } diff --git a/Step/wwwroot/assets/styles/base/layout.less b/Step/wwwroot/assets/styles/base/layout.less index 992e92c0..edc7d8ef 100644 --- a/Step/wwwroot/assets/styles/base/layout.less +++ b/Step/wwwroot/assets/styles/base/layout.less @@ -25,6 +25,7 @@ @import "utilities.less"; @import "maintenance.less"; @import "maintenance-progress.less"; +@import "maintenance-card.less"; @background-color: rgb(216, 216, 216); @handle-width: 48px; diff --git a/Step/wwwroot/assets/styles/base/maintenance-card.less b/Step/wwwroot/assets/styles/base/maintenance-card.less new file mode 100644 index 00000000..2bd80ae7 --- /dev/null +++ b/Step/wwwroot/assets/styles/base/maintenance-card.less @@ -0,0 +1,88 @@ +// out: false, sourceMap: false, main: ../style.less +@import "colors.less"; + +.maintenance-card{ + width: 784px; + height: 760px; + border-radius: 2px; + box-shadow: 0 1px 2px 0 @color-black-40; + background-color: @color-background-white; + border: solid 2px @color-clear-blue; + .header{ + border-bottom: solid 1px @color-silver; + height: 96px; + font-size: 24px; + font-weight: bold; + color: @color-greyish-brown; + .title{ + float: left; + padding: 34px 0 0 24px; + } + .right{ + padding: 24px 16px 0 0; + float: right; + button{ + height: 48px; + width: 48px; + padding: 0; + .fa{ + font-size: 22px; + } + } + } + } + .body{ + height: calc(~'100% - 190px'); + padding: 29px 0 0 24px; + width: calc(~'98% - 24px'); + overflow-y: auto; + .box{ + height: 100%; + width: 696px; + padding-right: 32px; + overflow-y: auto; + .title-box{ + font-size: 18px; + color: @color-greyish-brown; + } + .subtitle{ + margin: 28px 0 20px 0; + text-decoration: underline; + font-size: 18px; + line-height: 1; + color: @color-greyish-brown; + } + .info{ + height: 252px; + border-top: solid 1px @color-silver; + border-bottom: solid 1px @color-silver; + .estimated-time, .expiring{ + height: calc(~'96px - 20px'); + border-radius: 2px; + background-color: @color-white2; + margin: 20px 0 20px 0; + padding: 10px; + .title{ + display: block; + margin: 18px auto; + text-align: center; + font-size: 14px; + color: @color-greyish-brown; + } + .time{ + display: block; + margin: 18px auto; + text-align: center; + font-size: 24px; + line-height: 0.75px; + color: @color-clear-blue; + } + } + } + } + } + .footer{ + height: 63px; + border-top: solid 1px @color-silver; + } +} \ No newline at end of file diff --git a/Step/wwwroot/assets/styles/base/maintenance.less b/Step/wwwroot/assets/styles/base/maintenance.less index 0650b264..487e28f4 100644 --- a/Step/wwwroot/assets/styles/base/maintenance.less +++ b/Step/wwwroot/assets/styles/base/maintenance.less @@ -88,7 +88,6 @@ border-radius: 2px; border: solid 1px @color-label-grey; table{ - height: 100%; width: 100%; border-collapse: collapse; thead tr th{ @@ -96,15 +95,17 @@ height: 46px; } tbody{ - height: 100%; + display: table-row-group; + height: 566px; tr{ - padding: 0; - } - } - tbody tr td{ - text-align: center; - div.maintenance-progress{ - margin: 0 auto; + height: 64px; + padding: 10px; + td{ + text-align: center; + div.maintenance-progress{ + margin: 0 auto; + } + } } } @@ -126,7 +127,7 @@ width: 48px; height: 48px; padding: 0; - .fa{ + .fa { width: 22px; height: 22px; } diff --git a/Step/wwwroot/assets/styles/base/utilities.less b/Step/wwwroot/assets/styles/base/utilities.less index 8bee6608..9f4ce9e7 100644 --- a/Step/wwwroot/assets/styles/base/utilities.less +++ b/Step/wwwroot/assets/styles/base/utilities.less @@ -28,13 +28,18 @@ height: calc(~'100% - 65px'); width: 100%; background-color: @color-silver; - display: flex; - flex-flow: row; - - .card-utilities{ - margin-left:24px; - margin-top: 35px; + overflow-y: auto; + .row{ + height: 216px; + display: flex; + flex-flow: row; + padding-bottom: 24px; + .card-utilities{ + margin-left:24px; + margin-top: 35px; + } } + } } } \ No newline at end of file diff --git a/Step/wwwroot/assets/styles/style.css b/Step/wwwroot/assets/styles/style.css index d083b5d3..82f9247f 100644 --- a/Step/wwwroot/assets/styles/style.css +++ b/Step/wwwroot/assets/styles/style.css @@ -2742,11 +2742,17 @@ footer .container button.big:before { } .input-box .control input, .input-box .control select { - width: 304px; + width: 294px; height: 48px; font-size: 18px; line-height: 1.11; color: #4b4b4b; + padding: 0 5px; + box-sizing: border-box; +} +.input-box .control input[type=number], +.input-box .control select[type=number] { + text-align: right; } .load-equipment { width: 495px; @@ -3556,10 +3562,15 @@ footer .container button.big:before { height: calc(100% - 65px); width: 100%; background-color: #bbbcbc; + overflow-y: auto; +} +.utilities-container .utilities-box .utilities-body .row { + height: 216px; display: flex; flex-flow: row; + padding-bottom: 24px; } -.utilities-container .utilities-box .utilities-body .card-utilities { +.utilities-container .utilities-box .utilities-body .row .card-utilities { margin-left: 24px; margin-top: 35px; } @@ -3654,7 +3665,6 @@ footer .container button.big:before { border: solid 1px #979797; } .maintenance-container .maintenance-box .maintenance-body .maintenance-box-left .maintenance-box-left-body table { - height: 100%; width: 100%; border-collapse: collapse; } @@ -3663,10 +3673,12 @@ footer .container button.big:before { height: 46px; } .maintenance-container .maintenance-box .maintenance-body .maintenance-box-left .maintenance-box-left-body table tbody { - height: 100%; + display: table-row-group; + height: 566px; } .maintenance-container .maintenance-box .maintenance-body .maintenance-box-left .maintenance-box-left-body table tbody tr { - padding: 0; + height: 64px; + padding: 10px; } .maintenance-container .maintenance-box .maintenance-body .maintenance-box-left .maintenance-box-left-body table tbody tr td { text-align: center; @@ -3747,6 +3759,94 @@ footer .container button.big:before { margin-left: 16px; color: #4b4b4b; } +.maintenance-card { + width: 784px; + height: 760px; + border-radius: 2px; + box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.4); + background-color: #fff; + border: solid 2px #1791ff; +} +.maintenance-card .header { + border-bottom: solid 1px #bbbcbc; + height: 96px; + font-size: 24px; + font-weight: bold; + color: #4b4b4b; +} +.maintenance-card .header .title { + float: left; + padding: 34px 0 0 24px; +} +.maintenance-card .header .right { + padding: 24px 16px 0 0; + float: right; +} +.maintenance-card .header .right button { + height: 48px; + width: 48px; + padding: 0; +} +.maintenance-card .header .right button .fa { + font-size: 22px; +} +.maintenance-card .body { + height: calc(100% - 190px); + padding: 29px 0 0 24px; + width: calc(98% - 24px); + overflow-y: auto; +} +.maintenance-card .body .box { + height: 100%; + width: 696px; + padding-right: 32px; + overflow-y: auto; +} +.maintenance-card .body .box .title-box { + font-size: 18px; + color: #4b4b4b; +} +.maintenance-card .body .box .subtitle { + margin: 28px 0 20px 0; + text-decoration: underline; + font-size: 18px; + line-height: 1; + color: #4b4b4b; +} +.maintenance-card .body .box .info { + height: 252px; + border-top: solid 1px #bbbcbc; + border-bottom: solid 1px #bbbcbc; +} +.maintenance-card .body .box .info .estimated-time, +.maintenance-card .body .box .info .expiring { + height: calc(96px - 20px); + border-radius: 2px; + background-color: #f1f1f1; + margin: 20px 0 20px 0; + padding: 10px; +} +.maintenance-card .body .box .info .estimated-time .title, +.maintenance-card .body .box .info .expiring .title { + display: block; + margin: 18px auto; + text-align: center; + font-size: 14px; + color: #4b4b4b; +} +.maintenance-card .body .box .info .estimated-time .time, +.maintenance-card .body .box .info .expiring .time { + display: block; + margin: 18px auto; + text-align: center; + font-size: 24px; + line-height: 0.75px; + color: #1791ff; +} +.maintenance-card .footer { + height: 63px; + border-top: solid 1px #bbbcbc; +} .persona { height: 88px; width: 88px; diff --git a/Step/wwwroot/src/app.modules.js b/Step/wwwroot/src/app.modules.js index 9ab60923..a3bf6aeb 100644 --- a/Step/wwwroot/src/app.modules.js +++ b/Step/wwwroot/src/app.modules.js @@ -7,6 +7,7 @@ import Header from "./modules/app-header.vue"; import Footer from "./modules/app-footer.vue"; import Login from "./modules/login.vue"; import alarmList from "./modules/alarms-list.vue"; +import Utilities from "./components/utilities.vue"; import UserInfoDialog from "./modules/user-info-dialog.vue"; import MachineInfoDialog from "./modules/machine-info-dialog.vue"; import AxesCalibration from "./modules/axes-calibration-dialog.vue"; @@ -20,7 +21,8 @@ export { UserInfoDialog, MachineInfoDialog, AxesCalibration, - alarmList + alarmList, + Utilities } export const Home = () => @@ -51,8 +53,14 @@ export const Maintenance = () => export const MaintenanceProgress = () => import ("./modules/base-components/maintenance-progress.vue"); -export const Utilities = () => - import ("./components/utilities.vue"); +export const MaintenanceCard = () => + import ("./modules/base-components/cards/maintenance-card.vue"); + + + + +// export const Utilities = () => +// import ("./components/utilities.vue"); export const CardUtilities = () => import ("./modules/base-components/cards/card-utilities.vue"); diff --git a/Step/wwwroot/src/app.routes.js b/Step/wwwroot/src/app.routes.js index 195204a5..6701b094 100644 --- a/Step/wwwroot/src/app.routes.js +++ b/Step/wwwroot/src/app.routes.js @@ -12,7 +12,8 @@ import { Utilities, CardUtilities, Maintenance, - MaintenanceProgress + MaintenanceProgress, + MaintenanceCard } from "./app.modules"; @@ -31,6 +32,7 @@ export let routes = [ /* Da cancellare dopo sviluppo */ { 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: "/report", meta: { title: "Step - Reports", area: "report" } }, { path: "/alarms", meta: { title: "Step - Alarms", area: "alarms" } }, diff --git a/Step/wwwroot/src/components/maintenance.vue b/Step/wwwroot/src/components/maintenance.vue index 58926770..03313373 100644 --- a/Step/wwwroot/src/components/maintenance.vue +++ b/Step/wwwroot/src/components/maintenance.vue @@ -34,10 +34,16 @@ - Effettuare la pulizia - - 7 gg - In scadenza + Effettuare la pulizia + + 7 gg + In scadenza + + + Effettuare la pulizia + + 7 gg + In scadenza diff --git a/Step/wwwroot/src/components/tooling-equipment.vue b/Step/wwwroot/src/components/tooling-equipment.vue index e9fcf72a..593016a0 100644 --- a/Step/wwwroot/src/components/tooling-equipment.vue +++ b/Step/wwwroot/src/components/tooling-equipment.vue @@ -39,41 +39,45 @@
{{'tooling_equipment_list_category_general' | localize("Generali")}}
- - + + + + +
{{'tooling_equipment_list_category_family' | localize("Famiglia")}}
- - + +
{{'tooling_equipment_list_category_state' | localize("Stato")}}
- - - - - - - + + + + + + +
{{'tooling_equipment_list_category_head' | localize("Testa")}}
- +
- - + +
{{'tooling_equipment_list_category_dimensiondepot' | localize("Dimensione in magazzino")}}
- - + + 
data: {{$data}}
+
{{'tooling_equipment_list_category_sharp_general' | localize("Generali")}}
- +
{{'tooling_equipment_list_category_sharp_geometry' | localize("Geometria")}}
@@ -82,9 +86,9 @@
{{'tooling_equipment_list_category_life_equipment' | localize("Vita Ut.")}}Vita Ut.
- - - + + +
@@ -95,55 +99,55 @@
{{'fanuc_tooling_equipment_list_category_general' | localize("Generali")}}
- + - - - + + +
{{'fanuc_tooling_equipment_list_category_family' | localize("Famiglia")}}
- - + + - - - - - - - - - - + + + + + + + + + + - - - - - - + + + + + +
{{'fanuc_tooling_equipment_list_category_geometry' | localize("Geometria")}}
- - - - - + + + + +
{{'fanuc_tooling_equipment_list_category_life_equipment' | localize("Vita Ut.")}}
- - + +
{{'fanuc_tooling_equipment_list_category_tang' | localize("Codolo")}}
- +
@@ -159,6 +163,33 @@ import equipment from "src/modules/base-components/cards/equipment.vue"; import inputBox from "src/modules/base-components/cards/input-box.vue"; export default { - components:{equipment, inputBox} + components:{equipment, inputBox}, + data (){ + return { + id: 1, + idChild: 1, + nManineDx: 1, + nManineSx: 2, + idTagliente: 1, + lifeRes: 1, + lifeNom: 1, + lifePreAllarm: 1, + selectedItem: null, + options: [{id:'456'}], + utAttivato: true, + utInibito: true, + utMisurato: true, + utInPreali: true, + utInCu: true, + utPostoFisso: true, + utInUso: true, + rotazione: true, + raffreddUno: true, + raffreddDue: true, + idIsFanucOsai: 1, + idFamily: 2, + name: 'Utensile XYZ' + } + } } diff --git a/Step/wwwroot/src/components/tooling.vue b/Step/wwwroot/src/components/tooling.vue index a90fa47f..5a39210b 100644 --- a/Step/wwwroot/src/components/tooling.vue +++ b/Step/wwwroot/src/components/tooling.vue @@ -2,7 +2,7 @@
- {{'tooling_title_label' | localize("Attrezzaggio")}} + {{'tooling_title_label' | localize("Tool-Manager")}}
diff --git a/Step/wwwroot/src/components/utilities.ts b/Step/wwwroot/src/components/utilities.ts new file mode 100644 index 00000000..bd2018d1 --- /dev/null +++ b/Step/wwwroot/src/components/utilities.ts @@ -0,0 +1,49 @@ +import Vue from "vue"; +import Component from "vue-class-component"; +import { cardutilities } from "../modules/base-components"; + +declare let cmsClient: any; + +@Component({ name: "utilities", components: {cardutilities:cardutilities}, props: { + software: Object, i: Number + }}) +export default class Utilities extends Vue{ + + // public arrayJsonSoftware: Array = cmsClient.getConfiguredProcess(); + + /** Cancellare proprietà sotto se quella commentata è ok, attendere conferma Paolo */ + + public arrayJsonSoftware: Array = [{ + id: 1234567, + path: "/test", + longName: "CMS Copy", + shortName: "CC", + iconBase64: "" + },{ + id: 3133213, + path: "/test2", + longName: "Presetting Tool", + shortName: "ES", + iconBase64: "" + },{ + id: 46456464, + path: "/test2", + longName: "Presetting Tool", + shortName: "ES", + iconBase64: "" + },{ + id: 867866, + path: "/test2", + longName: "Presetting Tool", + shortName: "ES", + iconBase64: "" + },{ + id: 827726, + path: "/test2", + longName: "Presetting Tool", + shortName: "ES", + iconBase64: "" + }]; + + +} \ No newline at end of file diff --git a/Step/wwwroot/src/components/utilities.vue b/Step/wwwroot/src/components/utilities.vue index d98efc08..9e8494d8 100644 --- a/Step/wwwroot/src/components/utilities.vue +++ b/Step/wwwroot/src/components/utilities.vue @@ -4,18 +4,27 @@
{{'utilities_header_label' | localize("Utilities")}}
-
+
+
+
+ + +
+
+ +
---> + \ No newline at end of file diff --git a/Step/wwwroot/src/modules/base-components/cards/card-utilities.vue b/Step/wwwroot/src/modules/base-components/cards/card-utilities.vue index 8b19c8c2..17eb44f1 100644 --- a/Step/wwwroot/src/modules/base-components/cards/card-utilities.vue +++ b/Step/wwwroot/src/modules/base-components/cards/card-utilities.vue @@ -5,7 +5,7 @@ {{title}}
- +
@@ -15,6 +15,11 @@ export default { props:{ title: {default:""}, letters: {default:""} + }, + methods:{ + clickEvent(){ + this.$emit("on-click-event"); + } } } \ No newline at end of file diff --git a/Step/wwwroot/src/modules/base-components/cards/input-box.vue b/Step/wwwroot/src/modules/base-components/cards/input-box.vue index 4b383f69..5076b70f 100644 --- a/Step/wwwroot/src/modules/base-components/cards/input-box.vue +++ b/Step/wwwroot/src/modules/base-components/cards/input-box.vue @@ -4,13 +4,15 @@ {{title}}
- - - + + +
@@ -24,29 +26,16 @@ export default { type: { default: "input" }, // text, select, numeric, toggle readOnly: { default: false }, - isInput: { default: false }, - isSelect: { default: false }, - isInputNumber: { default: false }, - isInputReadOnly: { default: false }, - isInputNumberReadOnly: { default: false }, - isToggle: { default: false }, - onLabel: { default: "SI" }, offLabel: { default: "NO" }, - checked: { default: false, type: Boolean } + + value:{default: null} }, - data: function() { - return { - ischecked: false - }; - }, - watch: { - checked: function(n, o) { - this.ischecked = n; + computed:{ + bindingValue:{ + get(){return this.value;}, + set(v){this.$emit('input',v);} } - }, - methods: { - toggleCheck() {} } }; - + \ No newline at end of file diff --git a/Step/wwwroot/src/modules/base-components/cards/maintenance-card.vue b/Step/wwwroot/src/modules/base-components/cards/maintenance-card.vue new file mode 100644 index 00000000..2b88ade8 --- /dev/null +++ b/Step/wwwroot/src/modules/base-components/cards/maintenance-card.vue @@ -0,0 +1,40 @@ + + \ No newline at end of file diff --git a/Step/wwwroot/src/modules/base-components/index.js b/Step/wwwroot/src/modules/base-components/index.js index 65e6fa44..65cf6f4e 100644 --- a/Step/wwwroot/src/modules/base-components/index.js +++ b/Step/wwwroot/src/modules/base-components/index.js @@ -7,5 +7,6 @@ import { ModalHelper } from "./ModalHelper"; import ProcessInfo from "./process-info.vue"; import Accordion from "./accordion.vue"; import Keypad from "./keypad.vue"; +import cardutilities from "./cards/card-utilities.vue"; -export { Loader, Modal, AppRibbon, UserInfo, ModalContainer, ModalHelper, ProcessInfo, Accordion, Keypad }; \ No newline at end of file +export { Loader, Modal, AppRibbon, UserInfo, ModalContainer, ModalHelper, ProcessInfo, Accordion, Keypad, cardutilities }; \ No newline at end of file diff --git a/Step/wwwroot/src/services/toolingService.ts b/Step/wwwroot/src/services/toolingService.ts new file mode 100644 index 00000000..b67c992a --- /dev/null +++ b/Step/wwwroot/src/services/toolingService.ts @@ -0,0 +1,5 @@ +import { baseRestService } from "src/_base/baseRestService"; + +export class ToolingService extends baseRestService{ + +} \ No newline at end of file diff --git a/Step/wwwroot/src/store/app.store.ts b/Step/wwwroot/src/store/app.store.ts index d41ed1fe..5747c45a 100644 --- a/Step/wwwroot/src/store/app.store.ts +++ b/Step/wwwroot/src/store/app.store.ts @@ -6,6 +6,7 @@ import { machineStatusStore, MachineStatusModel } from "./machineStatus.store"; import { alarmsStore, AlarmsModel } from "./alarms.store"; import { processStore, RunningProcessModel } from "./runningProcess.store"; import { localizationStore, LocalizationModel, localizationModelActions } from "./localization.store"; +import { toolingStore } from "./tooling.store"; import { LocalizationService } from "src/services/localizationService"; @@ -53,7 +54,8 @@ const _store = { machineStatus: machineStatusStore, process: processStore, alarms: alarmsStore, - localization: localizationStore + localization: localizationStore, + tooling: toolingStore }, mutations: { diff --git a/Step/wwwroot/src/store/tooling.store.ts b/Step/wwwroot/src/store/tooling.store.ts new file mode 100644 index 00000000..e5e3c05e --- /dev/null +++ b/Step/wwwroot/src/store/tooling.store.ts @@ -0,0 +1,11 @@ +export const toolingStore = { + state:{ + + }, + mutations:{ + + }, + actions:{ + + } +} \ No newline at end of file