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

Fix alarm tables

Browse Source 
Added qsMonitor
This commit is contained in:
Lucio Maranta
2019-05-24 13:08:07 +02:00
parent 86a8531004
commit bc090e1ceb
7 changed files with 37 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Step.Utils/Step.Utils.csproj
+1 -3
View File
@@ -91,12 +91,10 @@
<Content Include="languages\en.xml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="languages\fr.xml" />
<Content Include="languages\IT.xml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="languages\zh.xml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="NLog.config">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
Step/SetupActive.iss
+4 -6
View File
@@ -53,8 +53,6 @@ VersionInfoCompany={#MyAppPublisher}
VersionInfoTextVersion={#MyAppVersion}
VersionInfoCopyright={#MyAppPublisher}
DefaultDirName = C:\CMS\{#FolderName}\{#FolderName}
;WizardImageFile=C:\Programmi\Inno Setup 5\WizModernImage-IS.bmp
;WizardSmallImageFile=C:\Programmi\Inno Setup 5\CMS.bmp
WindowVisible=false
PrivilegesRequired=admin
@@ -139,12 +137,12 @@ Source: {#DotNetInstallerPath}\{#DotNetInstallerName}; DestDir: {tmp}; Flags: de
Source: {#MariaDBInstallerPath}\{#MariaDBInstallerName}; DestDir: {tmp}; Flags: deleteafterinstall;
; --- UTILS
; Fanuc scripts
Source: "{#ProjectPath}\Utility\*"; DestDir: "{app}\..\Utility\"; Flags: recursesubdirs ignoreversion; Components: Fanuc
; Fanuc scripts - TEAMVIEWER
Source: "{#ProjectPath}\Utility\*"; DestDir: "{app}\..\Utility\"; Flags: recursesubdirs ignoreversion; Components: Fanuc Osai Siemens
; Inverter Dialog
Source: "{#InvDialPath}\*"; DestDir: "{app}\..\Utility\Cms_Inverter_Diagnosis\"; Flags: recursesubdirs ignoreversion; Components: Fanuc
Source: "{#InvDialPath}\*"; DestDir: "{app}\..\Utility\Cms_Inverter_Diagnosis\"; Flags: recursesubdirs ignoreversion; Components: Fanuc Osai Siemens
[Icons]
; Default icons
Name: {group}\{#AppName}; Filename: {app}\{#MyAppExeName}; Comment: {#AppName}; Components: Demo Fanuc Osai; Check: NOT GetStyleOption;
Step/Utility/teamviewerqs.exe
BIN
View File
Binary file not shown.
Step/wwwroot/assets/styles/base/alarms.less
+14 -14
View File
@@ -444,6 +444,7 @@
margin-left: 132px;
&.my {
margin-top: 5px;
margin-left: 15px;
}
@@ -934,30 +935,30 @@
th:nth-child(2),
td:nth-child(2) {
width: 550px;
max-width: 550px;
width: 500px;
max-width: 500px;
text-align: left;
}
th:nth-child(3),
td:nth-child(3) {
width: 150px;
max-width: 150px;
width: 130px;
max-width: 130px;
text-align: left;
}
th:nth-child(4),
td:nth-child(4) {
width: 100px;
max-width: 100px;
min-width: 50px;
width: 150px;
max-width: 150px;
min-width: 100px;
text-align: left;
}
th:nth-child(5),
td:nth-child(5) {
width: 100px;
max-width: 100px;
width: 150px;
min-width: 150px;
}
th,
@@ -972,11 +973,10 @@
tbody {
display: block;
height: 552px;
width: 1200px;
overflow-y: scroll;
height: 559px;
width: 1241px;
overflow-y: hidden;
overflow-x: hidden;
padding-right: 20px;
&.without-footer {
height: 620px
@@ -1003,7 +1003,7 @@
tr {
cursor: pointer;
height: 64px;
height: 62px;
padding: 10px;
td {
Step/wwwroot/assets/styles/base/job-editor.less
+1
View File
@@ -313,6 +313,7 @@
height: 14px;
margin-left: 132px;
&.my{
margin-top: 5px;
margin-left: 15px;
}
.text-date{
Step/wwwroot/assets/styles/base/maintenance-card.less
+1
View File
@@ -299,6 +299,7 @@
height: 14px;
margin-left: 132px;
&.my{
margin-top: 5px;
margin-left: 15px;
}
.text-date{
Step/wwwroot/assets/styles/style.css
+16 -14
View File
@@ -4663,6 +4663,7 @@ footer .container button.big:before {
margin-left: 132px;
}
.accordion section .dropdown .all-message-box .message-box .message-box-body.my {
margin-top: 5px;
margin-left: 15px;
}
.accordion section .dropdown .all-message-box .message-box .message-box-body .text-date {
@@ -5091,27 +5092,27 @@ footer .container button.big:before {
}
.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;
width: 500px;
max-width: 500px;
text-align: left;
}
.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;
width: 130px;
max-width: 130px;
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) {
width: 100px;
max-width: 100px;
min-width: 50px;
width: 150px;
max-width: 150px;
min-width: 100px;
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) {
width: 100px;
max-width: 100px;
width: 150px;
min-width: 150px;
}
.alarm-history-container .alarm-history-body .alarm-history-body-left .alarm-history-table th,
.alarm-history-container .alarm-history-body .alarm-history-body-left .alarm-history-table td {
@@ -5124,11 +5125,10 @@ footer .container button.big:before {
}
.alarm-history-container .alarm-history-body .alarm-history-body-left .alarm-history-table tbody {
display: block;
height: 552px;
width: 1200px;
overflow-y: scroll;
height: 559px;
width: 1241px;
overflow-y: hidden;
overflow-x: hidden;
padding-right: 20px;
}
.alarm-history-container .alarm-history-body .alarm-history-body-left .alarm-history-table tbody.without-footer {
height: 620px;
@@ -5150,7 +5150,7 @@ footer .container button.big:before {
}
.alarm-history-container .alarm-history-body .alarm-history-body-left .alarm-history-table tbody tr {
cursor: pointer;
height: 64px;
height: 62px;
padding: 10px;
}
.alarm-history-container .alarm-history-body .alarm-history-body-left .alarm-history-table tbody tr td {
@@ -17373,6 +17373,7 @@ footer .container button.big:before {
margin-left: 132px;
}
.accordion-maintenance section .dropdown .all-message-box .message-box .message-box-body.my {
margin-top: 5px;
margin-left: 15px;
}
.accordion-maintenance section .dropdown .all-message-box .message-box .message-box-body .text-date {
@@ -19202,6 +19203,7 @@ footer .container button.big:before {
margin-left: 132px;
}
.job-editor-container .job-editor-box .job-editor-body .job-editor-body-box .job-editor-body-box-right .box-right-body .box-right-body-container .all-message-box .message-box .message-box-body.my {
margin-top: 5px;
margin-left: 15px;
}
.job-editor-container .job-editor-box .job-editor-body .job-editor-body-box .job-editor-body-box-right .box-right-body .box-right-body-container .all-message-box .message-box .message-box-body .text-date {