Merge remote-tracking branch 'CMS/feature/sottocofano' into feature/sottocofano

This commit is contained in:
=
2021-02-05 17:45:40 +01:00
6 changed files with 165 additions and 658 deletions
@@ -1,6 +1,6 @@
<template>
<div class="main-container">
<div class="column-page">
<div class="column-page-one-column">
<AssiTable></AssiTable>
</div>
</div>
@@ -1,29 +1,27 @@
@import "../../../../variable.less";
.log-assi-table {
width: 1384px;
height: 886px;
margin: 20px 20px 0 20px;
tbody {
height: 752px;
th,
td {
width: 114px;
max-width: 114px;
&.assi-axis {
width: 183px;
max-width: 183px;
}
thead {
width: 1400px;
height: 34px;
opacity: 0.5;
background-color: @fill-under-grey-1-2;
&.velocity {
width: 63px;
max-width: 63px;
}
th {
display: inline-block;
&.position {
width: 63px;
max-width: 63px;
}
tbody {
vertical-align: unset;
border-color: unset;
tr {
display: table;
}
&.assi-buttons {
width: 445px;
max-width: 445px;
}
}
.fill-under-grey-3-2 {
background-color: @fill-under-grey-3-2;
}
@@ -31,521 +29,73 @@
background-color: @fill-under-grey-1-2;
}
.axis-assi {
width: 63px;
height: 12px;
margin: 10px 0px 12px 9px;
font-size: 14px;
font-weight: normal;
font-stretch: normal;
font-style: normal;
line-height: 0.86;
letter-spacing: normal;
color: @white;
text-align: left !important;
float: left;
&-inner {
.axis-container {
display: flex;
align-items: center;
.fa {
font-size: 30px;
padding: 5px;
}
}
.position-assi {
width: 63px;
height: 12px;
margin: 10px 0px 12px 111px;
.buttons-container {
display: inline-flex;
margin: 0 0 0 10px;
}
font-size: 14px;
font-weight: normal;
font-stretch: normal;
font-style: normal;
line-height: 0.86;
letter-spacing: normal;
text-align: left !important;
float: left;
color: @white;
&-inner {
.buttons-container {
> button {
cursor: pointer;
border: none;
margin: 0px 8px 0px 8px;
display: flex;
justify-content: center;
align-items: center;
border-radius: 2px;
box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.4);
background-image: linear-gradient(to bottom, #818a8f 0%, #42494e 98%);
}
}
.velocity-assi {
width: 63px;
height: 12px;
margin: 10px 0 12px 60px;
font-size: 14px;
font-weight: normal;
font-stretch: normal;
font-style: normal;
line-height: 0.86;
letter-spacing: normal;
text-align: left !important;
float: left;
color: @white;
&-inner {
}
}
.torque-assi {
width: 114px;
height: 12px;
margin: 10px 0px 12px 34px;
font-size: 14px;
font-weight: normal;
font-stretch: normal;
font-style: normal;
line-height: 0.86;
letter-spacing: normal;
text-align: center;
text-align: left !important;
color: @white;
&-inner {
width: 253px;
height: 16px;
margin: 24px 69px 24px 142px;
font-size: 14px;
font-weight: normal;
font-stretch: normal;
font-style: normal;
line-height: normal;
letter-spacing: normal;
float: left;
text-align: initial;
color: @very-light-pink;
}
}
.status-assi {
width: 114px;
height: 12px;
margin: 10px 0px 12px 7px;
font-size: 14px;
font-weight: normal;
font-stretch: normal;
font-style: normal;
line-height: 0.86;
letter-spacing: normal;
text-align: center;
text-align: left !important;
color: @white;
&-inner {
}
}
.error-code-assi {
width: 114px;
height: 12px;
margin: 0 34px 0 13px;
font-size: 14px;
font-weight: normal;
font-stretch: normal;
font-style: normal;
line-height: 0.86;
letter-spacing: normal;
text-align: center;
text-align: left !important;
color: @white;
&-inner {
}
}
.fase-motion-assi {
width: 114px;
height: 12px;
margin: 10px 430px 12px 0px;
font-size: 14px;
font-weight: normal;
font-stretch: normal;
font-style: normal;
line-height: 0.86;
letter-spacing: normal;
text-align: center;
text-align: left !important;
color: @white;
&-inner {
}
}
.tr-zero-level {
width: 1400px;
.icon-toggle {
width: 16px;
height: 16px;
margin: 20px 0px 23px 7px;
float: left;
.icon-closed {
width: 16px;
height: 11px;
width: 0;
height: 0;
border-left: 8px solid transparent;
border-right: 8px solid transparent;
border-top: 8px solid @white;
cursor: pointer;
}
.icon-open {
width: 16px;
height: 11px;
width: 0;
height: 0;
border-top: 8px solid transparent;
border-bottom: 8px solid transparent;
border-left: 8px solid @white;
cursor: pointer;
}
}
.axis {
width: 21px;
height: 16px;
margin: 24px 0px 24px 10px;
font-size: 14px;
font-weight: bold;
font-stretch: normal;
font-style: normal;
line-height: normal;
letter-spacing: normal;
float: left;
color: @very-light-pink;
}
.position {
width: 42px;
height: 16px;
margin: 24px 0px 24px 133px;
font-size: 14px;
font-weight: normal;
font-stretch: normal;
font-style: normal;
line-height: normal;
letter-spacing: normal;
text-align: center;
float: left;
color: @very-light-pink;
}
.velocity {
width: 25px;
height: 16px;
margin: 24px 0px 24px 95px;
font-size: 14px;
font-weight: normal;
font-stretch: normal;
font-style: normal;
line-height: normal;
letter-spacing: normal;
text-align: center;
float: left;
color: @very-light-pink;
}
.torque {
width: 58px;
height: 16px;
margin: 24px 0px 24px 55px;
font-size: 14px;
font-weight: normal;
font-stretch: normal;
font-style: normal;
line-height: normal;
letter-spacing: normal;
text-align: center !important;
float: left;
color: @very-light-pink;
}
.status {
width: 58px;
height: 16px;
margin: 24px 0px 24px 42px;
font-size: 14px;
font-weight: normal;
font-stretch: normal;
font-style: normal;
line-height: normal;
letter-spacing: normal;
text-align: right;
float: left;
color: @very-light-pink;
}
.error-code {
width: 21px;
height: 16px;
margin: 24px 0px 24px 100px;
font-size: 14px;
font-weight: normal;
font-stretch: normal;
font-style: normal;
line-height: normal;
letter-spacing: normal;
text-align: center;
float: left;
color: @very-light-pink;
}
.fase-motion {
width: 21px;
height: 16px;
margin: 24px 0px 24px 119px;
font-size: 14px;
font-weight: normal;
font-stretch: normal;
font-style: normal;
line-height: normal;
letter-spacing: normal;
text-align: center;
float: left;
color: @very-light-pink;
}
}
.tr-n-level {
margin-left: 33px;
width: 1370px;
.axis {
width: 23px;
height: 16px;
margin: 24px 0px 24px 19px;
font-size: 14px;
font-weight: bold;
font-stretch: normal;
font-style: normal;
line-height: normal;
letter-spacing: normal;
float: left;
color: @very-light-pink;
}
.position {
width: 45px;
height: 16px;
margin: 24px 0px 24px 110px;
font-size: 14px;
font-weight: normal;
font-stretch: normal;
font-style: normal;
line-height: normal;
letter-spacing: normal;
text-align: center;
float: left;
color: @very-light-pink;
}
.velocity {
width: 26px;
height: 16px;
margin: 24px 0px 24px 94px;
font-size: 14px;
font-weight: normal;
font-stretch: normal;
font-style: normal;
line-height: normal;
letter-spacing: normal;
text-align: center;
float: left;
color: @very-light-pink;
}
.torque {
width: 55px;
height: 16px;
margin: 24px 0px 24px 55px;
font-size: 14px;
font-weight: normal;
font-stretch: normal;
font-style: normal;
line-height: normal;
letter-spacing: normal;
text-align: center;
float: left;
color: @very-light-pink;
}
.status {
width: 43px;
height: 16px;
margin: 24px 0px 24px 59px;
font-size: 14px;
font-weight: normal;
font-stretch: normal;
font-style: normal;
line-height: normal;
letter-spacing: normal;
text-align: right;
float: left;
color: @very-light-pink;
}
.error-code {
width: 21px;
height: 16px;
margin: 24px 0px 24px 100px;
font-size: 14px;
font-weight: normal;
font-stretch: normal;
font-style: normal;
line-height: normal;
letter-spacing: normal;
text-align: center;
float: left;
color: @very-light-pink;
}
.fase-motion {
width: 42px;
height: 16px;
margin: 24px 40px 24px 119px;
font-size: 14px;
font-weight: normal;
font-stretch: normal;
font-style: normal;
line-height: normal;
letter-spacing: normal;
text-align: center;
float: left;
color: @very-light-pink;
}
}
.button-align {
.button-align-probe {
width: 81px;
height: 48px;
object-fit: contain;
margin: 8px 0 8px 100px;
border-radius: 2px;
box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.4);
background-image: linear-gradient(to bottom, #818a8f 0%, #42494e 98%);
&-label {
width: 44px;
height: 21px;
padding: 14px 18px 13px 19px;
object-fit: contain;
> label {
cursor: pointer;
font-size: 18px;
font-weight: 500;
font-stretch: normal;
font-style: normal;
line-height: normal;
letter-spacing: normal;
text-align: center;
color: @very-light-pink;
}
}
.button-slaves-position {
width: 205px;
height: 48px;
margin-left: 10px;
object-fit: contain;
border-radius: 2px;
box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.4);
background-image: linear-gradient(to bottom, #818a8f 0%, #42494e 98%);
&-label {
width: 168px;
height: 21px;
padding: 14px 18px 13px 19px;
object-fit: contain;
> label {
cursor:pointer;
font-size: 18px;
font-weight: 500;
font-stretch: normal;
font-style: normal;
line-height: normal;
letter-spacing: normal;
text-align: center;
color: @very-light-pink;
}
}
.button-probe {
width: 89px;
height: 48px;
margin: 0 18px 0 10px;
object-fit: contain;
border-radius: 2px;
box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.4);
background-image: linear-gradient(to bottom, #818a8f 0%, #42494e 98%);
&-label {
width: 52px;
height: 21px;
padding: 14px 18px 13px 19px;
object-fit: contain;
.assi-input-container {
display: flex;
align-items: center;
input {
width: 106px;
height: 48px;
background-color: #dddddd;
box-shadow: inset 0 1px 3px 0 rgb(0 0 0 / 50%);
border: none;
box-sizing: border-box;
font-size: 18px;
font-weight: 500;
font-stretch: normal;
font-style: normal;
line-height: normal;
letter-spacing: normal;
text-align: center;
color: @very-light-pink;
font-weight: bold;
padding: 0 10px;
color: #4b4b4b;
text-align: right;
}
}
tbody {
.tr-n-level {
margin-left: 33px;
}
}
.controlli-button-group-container {
display: inline-block;
margin-left: 30px;
margin-right: 187px;
.controlli-button-group-n {
position: relative;
display: flex;
align-items: center;
.button-control-minus {
width: 48px;
height: 48px;
margin: 8px;
display: flex;
justify-content: center;
object-fit: contain;
border-radius: 2px;
box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.4);
background-image: linear-gradient(to bottom, #818a8f 0%, #42494e 98%);
}
.button-control-plus {
width: 48px;
height: 48px;
margin: 8px;
display: flex;
justify-content: center;
object-fit: contain;
border-radius: 2px;
box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.4);
background-image: linear-gradient(to bottom, #818a8f 0%, #42494e 98%);
}
.controlli-field {
width: 106px;
height: 48px;
display: flex;
justify-content: center;
align-items: center;
border-radius: 2px;
box-shadow: 0 1px 3px 0 @black-50;
background-color: @very-light-pink-two;
}
}
}
.button-control-value-label {
margin: 8px 8px 8px 8px;
}
.controlli-button-minus-icon {
margin-top: 4px;
}
.controlli-button-plus-icon {
margin-top: 4px;
}
.controlli {
object-fit: contain;
}
@@ -32,39 +32,39 @@ export default class AssiTable extends Vue {
errorCode: 150,
faseMotion: 123654
},
{
axis: "W3",
group: "W",
level: 1,
position: 227.71,
velocity: 374,
torque: "0.85 Nm",
status: "Upper",
errorCode: 150,
faseMotion: 123654
},
{
axis: "Z1",
group: "Z",
level: 0,
position: 227.71,
velocity: 374,
torque: "0.85 Nm",
status: "Upper",
errorCode: 150,
faseMotion: 123654
},
{
axis: "Z2",
group: "Z",
level: 1,
position: 227.71,
velocity: 374,
torque: "0.85 Nm",
status: "Upper",
errorCode: 150,
faseMotion: 123654
}
// {
// axis: "W3",
// group: "W",
// level: 1,
// position: 227.71,
// velocity: 374,
// torque: "0.85 Nm",
// status: "Upper",
// errorCode: 150,
// faseMotion: 123654
// },
// {
// axis: "Z1",
// group: "Z",
// level: 0,
// position: 227.71,
// velocity: 374,
// torque: "0.85 Nm",
// status: "Upper",
// errorCode: 150,
// faseMotion: 123654
// },
// {
// axis: "Z2",
// group: "Z",
// level: 1,
// position: 227.71,
// velocity: 374,
// torque: "0.85 Nm",
// status: "Upper",
// errorCode: 150,
// faseMotion: 123654
// }
];
this.groupReduce(this.data);
}
@@ -1,173 +1,122 @@
<template>
<div>
<table class="log-assi-table">
<div class="one-column-table-container scrollable">
<table>
<thead>
<tr>
<th class="axis-assi">Axis</th>
<th class="position-assi">Position</th>
<th class="velocity-assi">Velocity</th>
<th class="torque-assi">Torque</th>
<th class="status-assi">Status</th>
<th class="error-code-assi">Error Code</th>
<th class="fase-motion-assi">Fase Motion</th>
<th class="assi-axis">Axis</th>
<th class="position">Position</th>
<th class="velocity">Velocity</th>
<th>Torque</th>
<th>Status</th>
<th>Error Code</th>
<th class="fase-motion">Fase Motion</th>
<th class="assi-buttons"></th>
</tr>
</thead>
<tbody>
<div v-for="group of groupedData" :key="group.level">
<div v-for="(item, index) of group" :key="`${item.axis}_${index}`">
<tr
v-if="item.level === 0"
:class="[
index % 2 === 0
? 'tr-zero-level fill-under-grey-3-2'
: 'tr-zero-level fill-under-grey-1-2'
]"
>
<td data-toggle="toggle">
<span class="icon-toggle">
<span
v-if="groupVisible.includes(item.group)"
class="icon-closed"
@click="openCollapse(item.group)"
></span>
<span
v-else
class="icon-open"
@click="openCollapse(item.group)"
></span>
</span>
</td>
<template v-for="group of groupedData">
<template v-for="(item, index) of group">
<tr v-if="item.level === 0" :key="`${item.axis}_${index}`">
<td>
<span class="axis">
<span class="axis-container">
<i
v-if="groupVisible.includes(item.group)"
@click="openCollapse(item.group)"
class="fa fa-caret-down"
>
</i>
<i v-else @click="openCollapse(item.group)" class="fa fa-caret-right"> </i>
{{ item.axis }}
</span>
</td>
<td>{{ item.position }}</td>
<td>{{ item.velocity }}</td>
<td>{{ item.torque }}</td>
<td>{{ item.status }}</td>
<td>{{ item.errorCode }}</td>
<td>{{ item.faseMotion }}</td>
<td>
<span class="position">
{{ item.position }}
</span>
</td>
<td>
<span class="velocity">
{{ item.velocity }}
</span>
</td>
<td>
<span class="torque">
{{ item.torque }}
</span>
</td>
<td>
<span class="status">
{{ item.status }}
</span>
</td>
<td>
<span class="error-code">
{{ item.errorCode }}
</span>
</td>
<td>
<span class="fase-motion">
{{ item.faseMotion }}
</span>
</td>
<td class="">
<span class="button-align pointer">
<span class="button-align-label">Align</span>
</span>
<span class="button-slaves-position pointer">
<span class="button-slaves-position-label"
>Set Slaves Position</span
>
</span>
<span class="button-probe pointer">
<span class="button-probe-label">Probe</span>
<span class="buttons-container">
<button class="button-align-probe">
<label>Align</label>
</button>
<button class="button-slaves-position">
<label>Set slaves position</label>
</button>
<button class="button-align-probe">
<label>Probe</label>
</button>
</span>
</td>
</tr>
<tr
<tr
v-else-if="groupVisible.includes(item.group)"
:key="`${item.axis}_${index}`"
:ref="`${item.axis.charAt(0)}`"
:class="[
index % 2 === 0
? 'tr-n-level fill-under-grey-3-2'
: 'tr-n-level fill-under-grey-1-2'
]"
>
]">
<td>
<span class="axis">
<span>
{{ item.axis }}
</span>
</td>
<td>
<span class="position">
<span>
{{ item.position }}
</span>
</td>
<td>
<span class="velocity">
<span>
{{ item.velocity }}
</span>
</td>
<td>
<span class="torque">
<span>
{{ item.torque }}
</span>
</td>
<td>
<span class="status">
<span>
{{ item.status }}
</span>
</td>
<td>
<span class="error-code">
<span>
{{ item.errorCode }}
</span>
</td>
<td>
<span class="fase-motion">
<span>
{{ item.faseMotion }}
</span>
</td>
<td>
<div class="controlli-button-group-container">
<span class="controlli-button-group-n">
<span class="button-control-minus pointer">
<span class="controlli-button-minus-icon">
<span class="buttons-container">
<button class="pointer">
<span class="controlli-icon pointer">
<img
src="assets/icons/sotto-cofano/png/ico-bt-minus.png"
srcset="
assets/icons/sotto-cofano/png/ico-bt-minus@2x.png 2x,
assets/icons/sotto-cofano/png//ico-bt-minus@3x.png 3x
"
class="icobt-"
/>
</span>
</span>
<span class="controlli">
<span class="controlli-field">
<span class="label">00000</span>
</span>
</span>
<span class="button-control-plus pointer">
<span class="controlli-button-plus-icon">
</button>
<div class="assi-input-container">
<input>
</div>
<button class="pointer">
<span class="controlli-icon pointer">
<img
src="assets/icons/sotto-cofano/png/ico-bt-plus.png"
srcset="
assets/icons/sotto-cofano/png/ico-bt-plus@2x.png 2x,
assets/icons/sotto-cofano/png/ico-bt-plus@3x.png 3x
"
class="icobt-"
/>
</span>
</span>
</button>
</span>
</div>
</td>
</tr>
</div>
</div>
</template>
</template>
</tbody>
</table>
</div>
@@ -40,5 +40,13 @@ td {
}
.value-button-input-container-on {
width: 48px;
height: 25px;
margin: 20px 10px 19px 10px;
padding: 3px 0;
border-radius: 2px;
float: right;
display: flex;
background-color: @clear-blue;
}
@@ -15,11 +15,11 @@
@click="go('log-misurazioni')"
:class="{white: this.value == 'log-misurazioni'}"
>{{'log-misurazioni' | localize("Log misurazioni")}}</div>
<!-- <div
<div
class="rettangle"
@click="go('assi')"
:class="{white: this.value == 'assi'}"
>{{'log-assi' | localize('Log assi')}}</div>-->
>{{'Assi' | localize('Assi')}}</div>
<div
class="rettangle"
@click="go('riscaldi')"