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

Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_step into develop

Browse Source
This commit is contained in:
Nicola Carminati
2018-04-20 08:54:18 +02:00
parent 7f5ead8387 85c66123b4
commit bd32c31033
21 changed files with 474 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Libs/CMS_CORE_Library.dll
BIN
View File
Binary file not shown.
Step/wwwroot/assets/styles/base/card.less
+8 -1
View File
@@ -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;
}
}
}
}
Step/wwwroot/assets/styles/base/layout.less
+1
View File
@@ -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;
Step/wwwroot/assets/styles/base/maintenance-card.less
+88
View File
@@ -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;
}
}
Step/wwwroot/assets/styles/base/maintenance.less
+11 -10
View File
@@ -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;
}
Step/wwwroot/assets/styles/base/utilities.less
+11 -6
View File
@@ -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;
}
}
}
}
}
Step/wwwroot/assets/styles/style.css
+105 -5
View File
@@ -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;
Step/wwwroot/src/app.modules.js
+11 -3
View File
@@ -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");
Step/wwwroot/src/app.routes.js
+3 -1
View File
@@ -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" } },
Step/wwwroot/src/components/maintenance.vue
+10 -4
View File
@@ -34,10 +34,16 @@
</thead>
<tbody>
<tr>
<td>Effettuare la pulizia</td>
<td><maintenanceprogress></maintenanceprogress></td>
<td>7 gg</td>
<td>In scadenza</td>
<td colspan="1">Effettuare la pulizia</td>
<td colspan="1"><maintenanceprogress></maintenanceprogress></td>
<td colspan="1">7 gg</td>
<td colspan="1">In scadenza</td>
</tr>
<tr>
<td colspan="1">Effettuare la pulizia</td>
<td colspan="1"><maintenanceprogress progress="50" warning-value="40"></maintenanceprogress></td>
<td colspan="1">7 gg</td>
<td colspan="1">In scadenza</td>
</tr>
</tbody>
<tfoot>
Step/wwwroot/src/components/tooling-equipment.vue
+82 -51
View File
@@ -39,41 +39,45 @@
<div class="list-skill-equipment scrollable">
<div class="list-skill-equipment-category">
<div class="skill-equipment-category">{{'tooling_equipment_list_category_general' | localize("Generali")}}</div>
<input-box title="Id" type="numeric" :read-only="true"></input-box>
<input-box title="Tipo Utensile" type="select"></input-box>
<input-box title="Id" type="numeric" v-model="id" :read-only="true"></input-box>
<input-box title="Tipo Utensile" v-model="selectedItem" type="select">
<option :value="3">tre</option>
</input-box>
</div>
<div class="list-skill-equipment-category">
<div class="skill-equipment-category">{{'tooling_equipment_list_category_family' | localize("Famiglia")}}</div>
<input-box title="Nome" type="text" :read-only="true"></input-box>
<input-box title="Id Figlio" type="numeric" :read-only="true"></input-box>
<input-box title="Nome" type="text" v-model="name" :read-only="true"></input-box>
<input-box title="Id Figlio" type="numeric" v-model="idChild" :read-only="true"></input-box>
</div>
<div class="list-skill-equipment-category">
<div class="skill-equipment-category">{{'tooling_equipment_list_category_state' | localize("Stato")}}</div>
<input-box title="Ut. Attivato" type="toggle"></input-box>
<input-box title="Ut. Inibito" type="toggle"></input-box>
<input-box title="Ut. Misurato" type="toggle"></input-box>
<input-box title="Ut. in Preali" type="toggle"></input-box>
<input-box title="Ut. in CU" type="toggle"></input-box>
<input-box title="Ut. Posto fisso" type="toggle"></input-box>
<input-box title="Ut. in uso" type="toggle"></input-box>
<input-box title="Ut. Attivato" v-model="utAttivato" type="toggle"></input-box>
<input-box title="Ut. Inibito" v-model="utInibito" type="toggle"></input-box>
<input-box title="Ut. Misurato" v-model="utMisurato" type="toggle"></input-box>
<input-box title="Ut. in Preali" v-model="utInPreali" type="toggle"></input-box>
<input-box title="Ut. in CU" v-model="utInCu" type="toggle"></input-box>
<input-box title="Ut. Posto fisso" v-model="utPostoFisso" type="toggle"></input-box>
<input-box title="Ut. in uso" v-model="utInUso" type="toggle"></input-box>
</div>
<div class="list-skill-equipment-category">
<div class="skill-equipment-category">{{'tooling_equipment_list_category_head' | localize("Testa")}}</div>
<input-box title="Rotazione" type="select"></input-box>
<input-box title="Rotazione" v-model="rotazione" type="select"></input-box>
</div>
<div class="list-skill-equipment-category">
<div class="skill-equipment-category"></div>
<input-box title="Raffredd 1" type="toggle"></input-box>
<input-box title="Raffredd 2" type="toggle"></input-box>
<input-box title="Raffredd 1" v-model="raffreddUno" type="toggle"></input-box>
<input-box title="Raffredd 2" v-model="raffreddDue" type="toggle"></input-box>
</div>
<div class="list-skill-equipment-category">
<div class="skill-equipment-category">{{'tooling_equipment_list_category_dimensiondepot' | localize("Dimensione in magazzino")}}</div>
<input-box title="N. Manine Dx" type="numeric"></input-box>
<input-box title="N. Manine Sx" type="numeric"></input-box>
<input-box title="N. Manine Dx" v-model="nManineDx" type="numeric"></input-box>
<pre>data: {{$data}}</pre>
<input-box title="N. Manine Sx" v-model="nManineSx" type="numeric"></input-box>
</div>
<div class="list-skill-equipment-category">
<div class="skill-equipment-category">{{'tooling_equipment_list_category_sharp_general' | localize("Generali")}}</div>
<input-box title="Id" type="numeric" :read-only="true"></input-box>
<input-box title="Id" type="numeric" v-model="idTagliente" :read-only="true"></input-box>
</div>
<div class="list-skill-equipment-category">
<div class="skill-equipment-category">{{'tooling_equipment_list_category_sharp_geometry' | localize("Geometria")}}</div>
@@ -82,9 +86,9 @@
<div class="list-skill-equipment-category">
<div class="skill-equipment-category">{{'tooling_equipment_list_category_life_equipment' | localize("Vita Ut.")}}Vita Ut.</div>
<input-box title="Tipo Vita" type="select"></input-box>
<input-box title="Vita residua" type="numeric"></input-box>
<input-box title="Vita Nominale" type="numeric"></input-box>
<input-box title="Vita Preallarme" type="numeric"></input-box>
<input-box title="Vita residua" v-model="lifeRes" type="numeric"></input-box>
<input-box title="Vita Nominale" v-model="lifeNom" type="numeric"></input-box>
<input-box title="Vita Preallarme" v-model="lifePreAllarm" type="numeric"></input-box>
</div>
</div>
</div>
@@ -95,55 +99,55 @@
<div class="list-skill-equipment scrollable">
<div class="list-skill-equipment-category">
<div class="skill-equipment-category">{{'fanuc_tooling_equipment_list_category_general' | localize("Generali")}}</div>
<input-box title="Id" type="numeric" :read-only="true"></input-box>
<input-box title="Id" type="numeric" v-model="idIsFanucOsai" :read-only="true"></input-box>
<input-box title="Tipo Utensile" type="select"></input-box>
<input-box title="Ut. Disabilitato" type="toggle"></input-box>
<input-box title="Ut. Rotto" type="toggle"></input-box>
<input-box title="Ut. Misurato" type="toggle"></input-box>
<input-box title="Ut. Disabilitato" v-model="utDisabilitato" type="toggle"></input-box>
<input-box title="Ut. Rotto" v-model="utRotto" type="toggle"></input-box>
<input-box title="Ut. Misurato" v-model="utMisuratoFanuc" type="toggle"></input-box>
</div>
<div class="list-skill-equipment-category">
<div class="skill-equipment-category">{{'fanuc_tooling_equipment_list_category_family' | localize("Famiglia")}}</div>
<input-box title="Id" type="numeric" :read-only="true"></input-box>
<input-box title="Descrizione" type="text"></input-box>
<input-box title="Id" type="numeric" v-model="idFamily" :read-only="true"></input-box>
<input-box title="Descrizione" v-model="descrizione" type="text"></input-box>
<input-box title="Rotazione" type="select"></input-box>
<input-box title="Tcp Associata" type="select"></input-box>
<input-box title="Raffredd 1" type="toggle"></input-box>
<input-box title="Raffredd 2" type="toggle"></input-box>
<input-box title="Raffredd 3" type="toggle"></input-box>
<input-box title="Raffredd 4" type="toggle"></input-box>
<input-box title="Raffredd 5" type="toggle"></input-box>
<input-box title="Raffredd 6" type="toggle"></input-box>
<input-box title="Raffredd 7" type="toggle"></input-box>
<input-box title="Raffredd 8" type="toggle"></input-box>
<input-box title="Vita Nominale" type="numeric"></input-box>
<input-box title="Delta Ravvivat" type="numeric"></input-box>
<input-box title="Raffredd 1" v-model="raffreddUnoFanuc" type="toggle"></input-box>
<input-box title="Raffredd 2" v-model="raffreddDueFanuc" type="toggle"></input-box>
<input-box title="Raffredd 3" v-model="raffreddTre" type="toggle"></input-box>
<input-box title="Raffredd 4" v-model="raffreddQuattro" type="toggle"></input-box>
<input-box title="Raffredd 5" v-model="raffreddCinque" type="toggle"></input-box>
<input-box title="Raffredd 6" v-model="raffreddSei" type="toggle"></input-box>
<input-box title="Raffredd 7" v-model="raffreddSette" type="toggle"></input-box>
<input-box title="Raffredd 8" v-model="raffreddOtto" type="toggle"></input-box>
<input-box title="Vita Nominale" v-model="lifeNomFamily" type="numeric"></input-box>
<input-box title="Delta Ravvivat" v-model="deltaRavv" type="numeric"></input-box>
<input-box title="Inverter Dataset" type="select"></input-box>
<input-box title="Carico Min P.A." type="numeric"></input-box>
<input-box title="Carico Max P.A." type="numeric"></input-box>
<input-box title="Caric Min C Din" type="numeric"></input-box>
<input-box title="Caric Max C Din" type="numeric"></input-box>
<input-box title="N. Manine Dx" type="numeric"></input-box>
<input-box title="N. Manine Sx" type="numeric"></input-box>
<input-box title="Carico Min P.A." v-model="loadMinPA" type="numeric"></input-box>
<input-box title="Carico Max P.A." v-model="loadMaxPA" type="numeric"></input-box>
<input-box title="Caric Min C Din" v-model="loadMinCDin" type="numeric"></input-box>
<input-box title="Caric Max C Din" v-model="loadMaxCDin" type="numeric"></input-box>
<input-box title="N. Manine Dx" v-model="nManineDxFanucOsai" type="numeric"></input-box>
<input-box title="N. Manine Sx" v-model="nManineSxFanucOsai" type="numeric"></input-box>
</div>
<div class="list-skill-equipment-category">
<div class="skill-equipment-category">{{'fanuc_tooling_equipment_list_category_geometry' | localize("Geometria")}}</div>
<input-box title="Id Correttore" type="select"></input-box>
<input-box title="Lunghezza" type="numeric"></input-box>
<input-box title="Raggio" type="numeric"></input-box>
<input-box title="Usura Lungh." type="numeric"></input-box>
<input-box title="Usura Raggio" type="numeric"></input-box>
<input-box title="Ravviv Residua" type="numeric"></input-box>
<input-box title="Lunghezza" v-model="lunghezza" type="numeric"></input-box>
<input-box title="Raggio" v-model="raggio" type="numeric"></input-box>
<input-box title="Usura Lungh." v-model="usuraLungh" type="numeric"></input-box>
<input-box title="Usura Raggio" v-model="usuraRaggio" type="numeric"></input-box>
<input-box title="Ravviv Residua" v-model="ravvivResidua" type="numeric"></input-box>
</div>
<div class="list-skill-equipment-category">
<div class="skill-equipment-category">{{'fanuc_tooling_equipment_list_category_life_equipment' | localize("Vita Ut.")}}</div>
<input-box title="Tipo Vita" type="select"></input-box>
<input-box title="Vita residua" type="numeric"></input-box>
<input-box title="Val Preallarme" type="numeric"></input-box>
<input-box title="Vita residua" v-model="lifeRes" type="numeric"></input-box>
<input-box title="Val Preallarme" v-model="lifePreAllarm" type="numeric"></input-box>
</div>
<div class="list-skill-equipment-category">
<div class="skill-equipment-category">{{'fanuc_tooling_equipment_list_category_tang' | localize("Codolo")}}</div>
<input-box title="Tipo man rich" type="select"></input-box>
<input-box title="Pastiglia" type="numeric"></input-box>
<input-box title="Pastiglia" v-model="pastiglia" type="numeric"></input-box>
</div>
</div>
</div>
@@ -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'
}
}
}
</script>
Step/wwwroot/src/components/tooling.vue
+1 -1
View File
@@ -2,7 +2,7 @@
<div class="tooling-container">
<div class="tooling-box">
<div class="header">
{{'tooling_title_label' | localize("Attrezzaggio")}}
{{'tooling_title_label' | localize("Tool-Manager")}}
</div>
<div class="tooling-boxbody">
<div class="list-top scrollable">
Step/wwwroot/src/components/utilities.ts
+49
View File
@@ -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<Object> = cmsClient.getConfiguredProcess();
/** Cancellare proprietà sotto se quella commentata è ok, attendere conferma Paolo */
public arrayJsonSoftware: Array<Object> = [{
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: ""
}];
}
Step/wwwroot/src/components/utilities.vue
+13 -4
View File
@@ -4,18 +4,27 @@
<div class="utilities-header">
<span>{{'utilities_header_label' | localize("Utilities")}}</span>
</div>
<div class="utilities-body">
<div class="utilities-body scrollable">
<div class="row" v-for="i in Math.ceil(arrayJsonSoftware.length / 4)" :key="i">
<div v-for="software in arrayJsonSoftware.slice((i - 1) * 4, i * 4)" :key="software.id">
<cardutilities @on-click-event="cmsClient.openOrStartProcess(software.id)" :title="software.longName" :letters="software.iconBase64 || software.shortName">
</cardutilities>
</div>
</div>
<!-- Cancellare commenti una volta approvato da Paolo -->
<!-- </div>
<cardutilities title="CMS Copy" letters="CC"></cardutilities>
<cardutilities title="Presetting Tool" letters="PT"></cardutilities>
<cardutilities title="Easystone" letters="ES"></cardutilities>
<cardutilities title="Easyglass" letters="EG"></cardutilities>
<cardutilities title="Easyglass" letters="EG"></cardutilities> -->
</div>
</div>
</div>
</template>
<script>
<!--<script>
import cardutilities from "src/modules/base-components/cards/card-utilities.vue";
export default {
components:{cardutilities}
}
</script>
</script>-->
<script src="./utilities.ts" lang="ts"></script>
Step/wwwroot/src/modules/base-components/cards/card-utilities.vue
+6 -1
View File
@@ -5,7 +5,7 @@
<span>{{title}}</span>
</div>
<div class="card-utilities-body">
<button class="btn"><div class="card-utilities-body-label">{{letters}}</div></button>
<button class="btn" @click="clickEvent"><div class="card-utilities-body-label">{{letters}}</div></button>
</div>
</div>
<!-- </div> -->
@@ -15,6 +15,11 @@ export default {
props:{
title: {default:""},
letters: {default:""}
},
methods:{
clickEvent(){
this.$emit("on-click-event");
}
}
}
</script>
Step/wwwroot/src/modules/base-components/cards/input-box.vue
+14 -25
View File
@@ -4,13 +4,15 @@
{{title}}
</div>
<div class="control">
<input v-if="type=='text'" :readonly="readOnly">
<select class="arrow" v-if="type=='select'"></select>
<input v-if="type=='numeric'" type="number" :readonly="readOnly">
<input v-if="type=='text'" v-model="bindingValue" :readonly="readOnly">
<select class="arrow" v-model="bindingValue" v-if="type=='select'">
<slot></slot>
</select>
<input v-if="type=='numeric'" v-model.number="bindingValue" type="number" :readonly="readOnly">
<div class="togglebutton" v-if="type=='toggle'">
<label>
<input type="checkbox" :checked="ischecked" @click="toggleCheck()">
<span class="toggle">{{checked ? onLabel : offLabel}}</span>
<input type="checkbox" v-model="bindingValue">
<span class="toggle">{{bindingValue == true ? onLabel : offLabel}}</span>
</label>
</div>
</div>
@@ -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() {}
}
};
</script>
</script>
Step/wwwroot/src/modules/base-components/cards/maintenance-card.vue
+40
View File
@@ -0,0 +1,40 @@
<template>
<div class="test-container">
<div class="maintenance-card">
<div class="header">
<div class="title">{{'maintenance_card_label_title' | localize("Effettuare pulizia macchina")}}</div>
<div class="right">
<button class="btn"><i class="fa fa-pencil-square-o"></i></button>
<button class="btn"><i class="fa fa-trash"></i></button>
</div>
</div>
<div class="body">
<div class="box scrollable">
<div class="title-box">Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna.</div>
<div class="subtitle">Ultimo intervento effettuato 23 gg fa</div>
<div class="info">
<div class="estimated-time">
<div class="title">Tempo stimato</div>
<div class="time">7 giorni</div>
</div>
<div class="expiring">
<div class="title">In scadenza</div>
<div class="time">21/07/2017</div>
</div>
</div>
</div>
</div>
<div class="footer">
<div class="title-footer">{{'maintenance_card_label_footer' | localize("Segna questa manutenzione come eseguita")}}</div>
<div class="right-footer">
<button class="btn">{{'maintenance_card_label_btn_footer' | localize("Eseguita")}}</button>
</div>
</div>
</div>
</div>
</template>
<script>
export default {
}
</script>
Step/wwwroot/src/modules/base-components/index.js
+2 -1
View File
@@ -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 };
export { Loader, Modal, AppRibbon, UserInfo, ModalContainer, ModalHelper, ProcessInfo, Accordion, Keypad, cardutilities };
Step/wwwroot/src/services/toolingService.ts
+5
View File
@@ -0,0 +1,5 @@
import { baseRestService } from "src/_base/baseRestService";
export class ToolingService extends baseRestService{
}
Step/wwwroot/src/store/app.store.ts
+3 -1
View File
@@ -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: {
Step/wwwroot/src/store/tooling.store.ts
+11
View File
@@ -0,0 +1,11 @@
export const toolingStore = {
state:{
},
mutations:{
},
actions:{
}
}