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:
Alessandro Francia
2018-07-11 17:12:16 +02:00
parent 6394075390 4889b2b892
commit d042317720
3 changed files with 50 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Client/View/MainForm.cs
+46 -9
View File
@@ -515,8 +515,16 @@ namespace CMS_Client.View
{
this.Owner = null;
this.NcFrm.Owner = this;
this.NcFrm.TopMost = true;
this.NcFrm.TopMost = false;
if(Config.VendorHmiConfig.Type == 2)
{
this.NcFrm.TopMost = false;
this.TopMost = true;
}
else
{
this.NcFrm.TopMost = true;
this.NcFrm.TopMost = false;
}
}
});
@@ -525,9 +533,17 @@ namespace CMS_Client.View
if (this.NcFrm.Owner == null)
{
this.Owner = null;
this.NcFrm.Owner = this;
this.NcFrm.TopMost = true;
this.NcFrm.TopMost = false;
this.NcFrm.Owner = this;
if (Config.VendorHmiConfig.Type == 2)
{
this.NcFrm.TopMost = false;
this.TopMost = true;
}
else
{
this.NcFrm.TopMost = true;
this.NcFrm.TopMost = false;
}
}
}
}
@@ -550,9 +566,19 @@ namespace CMS_Client.View
{
if (this.NcFrm.Owner != null)
{
this.NcFrm.Owner = null;
this.TopMost = true;
this.TopMost = false;
this.NcFrm.Owner = null;
if (Config.VendorHmiConfig.Type == 2)
{
this.NcFrm.TopMost = true;
this.TopMost = false;
}
else
{
this.TopMost = true;
this.TopMost = false;
}
}
});
@@ -562,7 +588,18 @@ namespace CMS_Client.View
{
this.NcFrm.Owner = null;
this.TopMost = true;
this.TopMost = false;
this.TopMost = false;
if (Config.VendorHmiConfig.Type == 2)
{
this.NcFrm.TopMost = false;
this.TopMost = true;
}
else
{
this.TopMost = true;
this.TopMost = false;
}
}
}
}
Client/View/NcForm.Designer.cs
Generated
+1 -1
View File
@@ -36,7 +36,7 @@
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(101)))), ((int)(((byte)(113)))), ((int)(((byte)(120)))));
this.ClientSize = new System.Drawing.Size(1920, 1280);
this.Cursor = System.Windows.Forms.Cursors.WaitCursor;
this.Cursor = System.Windows.Forms.Cursors.Default;
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
this.Name = "NcForm";
this.ShowIcon = false;
Step/wwwroot/src/modules/alarms-list.ts
+3 -4
View File
@@ -2,7 +2,7 @@ import Vue from "vue";
import Component from "vue-class-component";
import { Watch } from "vue-property-decorator";
import { ModalHelper } from "./base-components";
import { store, AppModel, AlarmModel, alarmsModelActions } from "src/store";
import { store, AppModel, AlarmModel, alarmsModelActions,appModelActions } from "src/store";
import { alarmItem, alarmDetail } from "./alarms";
import moment from "moment";
import { Hub } from "src/services/hub";
@@ -124,10 +124,9 @@ export default class alarmsList extends Vue {
public selectMaintenance(m){
console.log(m);
console.log(this.$route.path);
appModelActions.MainViewLiftDown(this.$store);
this.$router.push({ name: 'maintenance', params: {id: m.id }});
console.log(this.$route.path);
alarmsModelActions.toggleServiceClosed(store,false);
}