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

Fix Osai unit of measure

Browse Source 
FIx tool table
This commit is contained in:
Lucio Maranta
2019-02-18 17:17:07 +01:00
parent 3914104362
commit 0625c0d2bf
5 changed files with 26 additions and 26 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/info-equipment.less
+1 -1
View File
@@ -29,7 +29,7 @@
margin-right: 16px;
}
}
.info-equipment-body{
.info-equipment-body{
height: calc(~'100% - 52px');
width: 100%;
display: flex;
Step/wwwroot/assets/styles/style.css
+18 -21
View File
@@ -4558,6 +4558,9 @@ footer .container button.big:before {
align-items: center;
margin-left: auto;
}
.alarm-history-container .alarm-history-body .alarm-history-body-left .alarm-history-left-filter .group-button .btn:last-child {
margin-right: 0;
}
.alarm-history-container .alarm-history-body .alarm-history-body-left .alarm-history-left-filter .multiselect {
z-index: 100;
}
@@ -4659,36 +4662,29 @@ footer .container button.big:before {
}
.alarm-history-container .alarm-history-body .alarm-history-body-left .alarm-history-table th:nth-child(1),
.alarm-history-container .alarm-history-body .alarm-history-body-left .alarm-history-table td:nth-child(1) {
width: 50px;
max-width: 50px;
text-align: right;
padding-left: 5px;
}
.alarm-history-container .alarm-history-body .alarm-history-body-left .alarm-history-table th:nth-child(2),
.alarm-history-container .alarm-history-body .alarm-history-body-left .alarm-history-table td:nth-child(2) {
width: 100px;
max-width: 100px;
}
.alarm-history-container .alarm-history-body .alarm-history-body-left .alarm-history-table th:nth-child(3),
.alarm-history-container .alarm-history-body .alarm-history-body-left .alarm-history-table td:nth-child(3) {
width: 450px;
max-width: 450px;
.alarm-history-container .alarm-history-body .alarm-history-body-left .alarm-history-table th:nth-child(2),
.alarm-history-container .alarm-history-body .alarm-history-body-left .alarm-history-table td:nth-child(2) {
width: 550px;
max-width: 550px;
text-align: left;
}
.alarm-history-container .alarm-history-body .alarm-history-body-left .alarm-history-table th:nth-child(4),
.alarm-history-container .alarm-history-body .alarm-history-body-left .alarm-history-table td:nth-child(4) {
.alarm-history-container .alarm-history-body .alarm-history-body-left .alarm-history-table th:nth-child(3),
.alarm-history-container .alarm-history-body .alarm-history-body-left .alarm-history-table td:nth-child(3) {
width: 150px;
max-width: 150px;
text-align: left;
}
.alarm-history-container .alarm-history-body .alarm-history-body-left .alarm-history-table th:nth-child(5),
.alarm-history-container .alarm-history-body .alarm-history-body-left .alarm-history-table td:nth-child(5) {
.alarm-history-container .alarm-history-body .alarm-history-body-left .alarm-history-table th:nth-child(4),
.alarm-history-container .alarm-history-body .alarm-history-body-left .alarm-history-table td:nth-child(4) {
width: 100px;
max-width: 100px;
text-align: left;
}
.alarm-history-container .alarm-history-body .alarm-history-body-left .alarm-history-table th:nth-child(6),
.alarm-history-container .alarm-history-body .alarm-history-body-left .alarm-history-table td:nth-child(6) {
.alarm-history-container .alarm-history-body .alarm-history-body-left .alarm-history-table th:nth-child(5),
.alarm-history-container .alarm-history-body .alarm-history-body-left .alarm-history-table td:nth-child(5) {
width: 100px;
max-width: 100px;
}
@@ -4814,19 +4810,20 @@ footer .container button.big:before {
font-size: 18px;
font-weight: bold;
color: #d0021b;
margin-bottom: 2px;
margin-bottom: 6px;
}
.alarm-history-container .alarm-history-body .alarm-history-body-right .box-right .box-right-info .box-right-info-header .subtitle {
margin-bottom: 3px;
margin-bottom: 15px;
}
.alarm-history-container .alarm-history-body .alarm-history-body-right .box-right .box-right-info .box-right-info-header .subtitle label {
width: 64px;
.alarm-history-container .alarm-history-body .alarm-history-body-right .box-right .box-right-info .box-right-info-header .subtitle span {
height: 21px;
border: solid 1px #9b9b9b;
font-size: 14px;
font-weight: 600;
line-height: 1.29;
color: #4b4b4b;
padding: 0 5px;
margin: 0 3px 0 0px;
}
.alarm-history-container .alarm-history-body .alarm-history-body-right .box-right .box-right-info .box-right-info-header .date {
margin-bottom: 8px;
Step/wwwroot/src/app_modules/alarms/components/alarm-history.ts
+2
View File
@@ -148,6 +148,8 @@ export default class AlarmHistory extends Vue {
async mounted() {
var $this = this;
ModalHelper.HideModal("modal-internal");
this.users = await awaiter(loginService.getAllUsers());
this.users.unshift({ id: -1, username: this.$options.filters.localize("alarm_history_users_not_user", "Nessun utente") });
this.paginationData = await awaiter(alarmsService.getAlarmsData());
Step/wwwroot/src/app_modules/tooling/components/tooling-depot.ts
+5 -4
View File
@@ -512,7 +512,7 @@ export default class depot extends Vue {
public dataForOpenInfoNcShank(id) {
let shank = (this.$store.state as AppModel).tooling.ncShanks.find(s => s.id == id);
ModalHelper.infoEquipmentModal.enableModalShank = true;
ModalHelper.infoEquipmentModal.enableModalTool = false;
ModalHelper.infoEquipmentModal.currentShank = shank;
@@ -550,11 +550,12 @@ export default class depot extends Vue {
}
public dataForOpenInfoNcEquipment(id) {
let tool = (this.$store.state as AppModel).tooling.ncTools.find(t => t.id == id);
if (tool) {
let shank = (this.$store.state as AppModel).tooling.ncShanks.find(t => t.id == id);
if (shank.childsTools.length == 1) {
ModalHelper.infoEquipmentModal.enableModalShank = false;
ModalHelper.infoEquipmentModal.enableModalTool = true;
ModalHelper.infoEquipmentModal.currentEquipment = tool;
ModalHelper.infoEquipmentModal.currentEquipment = shank.childsTools[0];
ModalHelper.infoEquipmentModal.editEnabled = !this.editable;
ModalHelper.ShowModal(InfoEquipment);
}