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

Merge remote-tracking branch 'origin/feature/scada-ui' into feature/scada-ui

Browse Source
This commit is contained in:
Alessandro
2019-01-21 11:19:05 +01:00
parent 73115f802d 7b2367e1e8
commit 33b3ea3914
15 changed files with 91 additions and 187 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Step.Config/Config/serverConfig.xml
-1
View File
@@ -12,7 +12,6 @@
<serverConfig>
<serverPort>9000</serverPort>
<serverAddress>*</serverAddress>
<networkCardId>1</networkCardId>
<language>en</language>
<enableDirectoryBrowsing>true</enableDirectoryBrowsing>
<databaseAddress>localhost</databaseAddress>
Step.Config/Config/serverConfigValidator.xsd
-1
View File
@@ -22,7 +22,6 @@
<xs:all>
<xs:element name="serverAddress" type="xs:string" minOccurs="1" maxOccurs="1"/>
<xs:element name="serverPort" type="xs:int" minOccurs='1' maxOccurs='1'/>
<xs:element name="networkCardId" type="xs:int" minOccurs='1' maxOccurs='1'/>
<xs:element name="language" type="xs:language" minOccurs='1' maxOccurs='1' default="en"/>
<xs:element name="enableDirectoryBrowsing" type="xs:boolean" default="false"/>
<xs:element name="databaseAddress" type="xs:string" minOccurs="1" maxOccurs="1"/>
Step.Config/ServerConfigController.cs
+1 -1
View File
@@ -192,6 +192,7 @@ namespace Step.Config
Id = i++,
Buttons = x.Buttons.Select(y => { y.Id = i++; return y; }).ToArray(),
Images = x.Images.Select(y => { y.Id = i++; return y; }).ToArray(),
Labels = x.Labels.Select(y => { y.Id = i++; return y; }).ToArray(),
ProgressBars = x.ProgressBars.Select(y => { y.Id = i++; return y; }).ToArray(),
Inputs = x.Inputs.Select(y => { y.Id = i++; return y; }).ToArray()
})
@@ -237,7 +238,6 @@ namespace Step.Config
Language = CultureInfo.CreateSpecificCulture(x.Element("language").Value),
ServerAddress = x.Element("serverAddress").Value,
ServerPort = Convert.ToInt32(x.Element("serverPort").Value),
NetworkCardId = Convert.ToInt32(x.Element("networkCardId").Value),
EnableDirectoryBrowsing = Convert.ToBoolean(x.Element("enableDirectoryBrowsing").Value),
DatabaseAddress = x.Element("databaseAddress").Value,
AutoOpenCmsClient = Convert.ToBoolean(x.Element("autoOpenCmsClient").Value)
Step.Core/ThreadsFunctions.cs
+52 -52
View File
@@ -720,57 +720,6 @@ public static class ThreadsFunctions
}
}
public static void MonitorPanelPCResources()
{
float sumRec, sumSen;
Stopwatch sw = new Stopwatch();
DTONetworkMonitorModel Monitor = new DTONetworkMonitorModel();
int cardId = ServerConfig.ServerStartupConfig.NetworkCardId - 1;
PerformanceCounterCategory performanceCounterCategory = new PerformanceCounterCategory("Network Interface");
if (cardId < 0 || cardId > performanceCounterCategory.GetInstanceNames().Length)
{
Monitor.Name = "No card to monitor";
MessageServices.Current.Publish(NETWORK_USAGE, null, Monitor);
return;
}
Monitor.Name = performanceCounterCategory.GetInstanceNames()[cardId];
PerformanceCounter PC_Bandwith = new PerformanceCounter("Network Interface", "Current Bandwidth", Monitor.Name);
PerformanceCounter PC_RecievedBytes = new PerformanceCounter("Network Interface", "Bytes Received/sec", Monitor.Name);
PerformanceCounter PC_SentBytes = new PerformanceCounter("Network Interface", "Bytes Sent/sec", Monitor.Name);
Monitor.Bandwidth = PC_Bandwith.NextValue();
try
{
while (true)
{
sw.Restart();
sumRec = 0;
sumSen = 0;
for (int index = 0; index < 50; index++)
{
sumRec += PC_RecievedBytes.NextValue();
sumSen += PC_SentBytes.NextValue();
}
Monitor.Value = Math.Round(((8 * (sumSen + sumRec)) / (Monitor.Bandwidth * 50) * 100), 2);
MessageServices.Current.Publish(NETWORK_USAGE, null, Monitor);
sw.Stop();
// Wait
Thread.Sleep(CalcSleepTime(2000, (int)sw.ElapsedMilliseconds));
}
}
catch (ThreadAbortException)
{
ExceptionManager.Manage(ERROR_LEVEL.FATAL, "Fatal error in Network Performance monitor Thread");
}
}
public static void ReadScadaData()
{
NcHandler ncHandler = new NcHandler();
@@ -1004,4 +953,55 @@ public static class ThreadsFunctions
}
#endregion SupportFunctions
}
}
//public static void MonitorPanelPCResources()
//{
// float sumRec, sumSen;
// Stopwatch sw = new Stopwatch();
// DTONetworkMonitorModel Monitor = new DTONetworkMonitorModel();
// int cardId = ServerConfig.ServerStartupConfig.NetworkCardId - 1;
// PerformanceCounterCategory performanceCounterCategory = new PerformanceCounterCategory("Network Interface");
// if (cardId < 0 || cardId > performanceCounterCategory.GetInstanceNames().Length)
// {
// Monitor.Name = "No card to monitor";
// MessageServices.Current.Publish(NETWORK_USAGE, null, Monitor);
// return;
// }
// Monitor.Name = performanceCounterCategory.GetInstanceNames()[cardId];
// PerformanceCounter PC_Bandwith = new PerformanceCounter("Network Interface", "Current Bandwidth", Monitor.Name);
// PerformanceCounter PC_RecievedBytes = new PerformanceCounter("Network Interface", "Bytes Received/sec", Monitor.Name);
// PerformanceCounter PC_SentBytes = new PerformanceCounter("Network Interface", "Bytes Sent/sec", Monitor.Name);
// Monitor.Bandwidth = PC_Bandwith.NextValue();
// try
// {
// while (true)
// {
// sw.Restart();
// sumRec = 0;
// sumSen = 0;
// for (int index = 0; index < 50; index++)
// {
// sumRec += PC_RecievedBytes.NextValue();
// sumSen += PC_SentBytes.NextValue();
// }
// Monitor.Value = Math.Round(((8 * (sumSen + sumRec)) / (Monitor.Bandwidth * 50) * 100), 2);
// MessageServices.Current.Publish(NETWORK_USAGE, null, Monitor);
// sw.Stop();
// // Wait
// Thread.Sleep(CalcSleepTime(2000, (int)sw.ElapsedMilliseconds));
// }
// }
// catch (ThreadAbortException)
// {
// ExceptionManager.Manage(ERROR_LEVEL.FATAL, "Fatal error in Network Performance monitor Thread");
// }
//}
Step.Core/ThreadsHandler.cs
-9
View File
@@ -32,16 +32,9 @@ namespace Step.Core
private volatile static List<Thread> RunningThreadsList = new List<Thread>();
internal volatile static Dictionary<string, string> RunningThreadStatus = new Dictionary<string, string>();
private static Thread MonitorNetworkResources;
public static void Start()
{
ThreadsFunctions.RestoreConnection();
// Start Thread Network monitor
Action Monitor = new Action(ThreadsFunctions.MonitorPanelPCResources);
MonitorNetworkResources = new Thread(() => Monitor());
MonitorNetworkResources.Start();
}
public static void StartWorkers()
@@ -85,8 +78,6 @@ namespace Step.Core
RunningThreadStatus.Clear();
RunningThreadStatus.Add("TryNcConnection", "---");
}
// Close network monitor
MonitorNetworkResources.Abort();
MessageServices.Current.Publish(SEND_THREADS_STATUS, null, RunningThreadStatus);
}
Step.Model/ConfigModels/ServerConfigModel.cs
+1 -2
View File
@@ -11,8 +11,7 @@ namespace Step.Model.ConfigModels
{
public CultureInfo Language { get; set; }
public int ServerPort { get; set; }
public string ServerAddress { get; set; }
public int NetworkCardId { get; set; }
public string ServerAddress { get; set; }
public bool EnableDirectoryBrowsing { get; set; }
public string DatabaseAddress { get; set; }
public bool AutoOpenCmsClient { get; set; }
Step.Model/Constants.cs
-1
View File
@@ -196,7 +196,6 @@ namespace Step.Model
public const string NC_MAGAZINE_IS_ACTIVE = "UPDATE_NC_MAGAZINE_STATUS";
public const string SEND_QUEUE_DATA = "SEND_QUEUE_DATA";
public const string SEND_M155_DATA = "SEND_M155_DATA";
public const string NETWORK_USAGE = "NETWORK_USAGE";
public const string SEND_SCADA_DATA = "SEND_SCADA_DATA";
public const string BROADCAST_DATA = "BROADCAST_DATA";
Step.Model/DTOModels/Scada/ScadaSchemaModel.cs
+3
View File
@@ -32,6 +32,9 @@ namespace Step.Model.DTOModels.Scada
[XmlArrayItem("image", typeof(ScadaSchemaImageModel))]
public ScadaSchemaImageModel[] Images { get; set; }
[XmlArray("labels")]
[XmlArrayItem("label", typeof(ScadaSchemaLabelModel))]
public ScadaSchemaLabelModel[] Labels { get; set; }
[XmlArray("progressBars")]
[XmlArrayItem("progressBar", typeof(ScadaSchemaProgressBarModel))]
Step.UI/ServerControlWindow.Designer.cs
Generated
+4 -99
View File
@@ -46,17 +46,9 @@ namespace Step.UI
this.TXTType = new System.Windows.Forms.Label();
this.CHNcConnected = new MetroFramework.Controls.MetroCheckBox();
this.label1 = new System.Windows.Forms.Label();
this.labelNetworkName = new System.Windows.Forms.Label();
this.metroPanel1 = new MetroFramework.Controls.MetroPanel();
this.label3 = new System.Windows.Forms.Label();
this.labelNetworkSpeed = new System.Windows.Forms.Label();
this.label2 = new System.Windows.Forms.Label();
this.label4 = new System.Windows.Forms.Label();
this.labelNetworkBand = new System.Windows.Forms.Label();
this.NotifyIconMenu.SuspendLayout();
this.metroTabControl1.SuspendLayout();
this.ThreadsInfo.SuspendLayout();
this.metroPanel1.SuspendLayout();
this.SuspendLayout();
//
// StepNotifyIcon
@@ -86,7 +78,7 @@ namespace Step.UI
// openUiButton
//
this.openUiButton.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
this.openUiButton.Location = new System.Drawing.Point(11, 477);
this.openUiButton.Location = new System.Drawing.Point(11, 371);
this.openUiButton.Name = "openUiButton";
this.openUiButton.Size = new System.Drawing.Size(151, 42);
this.openUiButton.TabIndex = 1;
@@ -159,7 +151,7 @@ namespace Step.UI
// stopServerButton
//
this.stopServerButton.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
this.stopServerButton.Location = new System.Drawing.Point(188, 477);
this.stopServerButton.Location = new System.Drawing.Point(188, 371);
this.stopServerButton.Name = "stopServerButton";
this.stopServerButton.Size = new System.Drawing.Size(151, 42);
this.stopServerButton.TabIndex = 3;
@@ -187,7 +179,7 @@ namespace Step.UI
this.TXTstatus.Enabled = false;
this.TXTstatus.Lines = new string[] {
"..."};
this.TXTstatus.Location = new System.Drawing.Point(-1, 535);
this.TXTstatus.Location = new System.Drawing.Point(-1, 419);
this.TXTstatus.MaxLength = 32767;
this.TXTstatus.Name = "TXTstatus";
this.TXTstatus.PasswordChar = '\0';
@@ -234,90 +226,11 @@ namespace Step.UI
this.label1.TabIndex = 54;
this.label1.Text = "Vendor:";
//
// labelNetworkName
//
this.labelNetworkName.Location = new System.Drawing.Point(82, 12);
this.labelNetworkName.Name = "labelNetworkName";
this.labelNetworkName.Size = new System.Drawing.Size(242, 22);
this.labelNetworkName.TabIndex = 55;
this.labelNetworkName.Text = "---";
this.labelNetworkName.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
//
// metroPanel1
//
this.metroPanel1.AccessibleName = "";
this.metroPanel1.Controls.Add(this.label4);
this.metroPanel1.Controls.Add(this.labelNetworkBand);
this.metroPanel1.Controls.Add(this.label3);
this.metroPanel1.Controls.Add(this.labelNetworkSpeed);
this.metroPanel1.Controls.Add(this.label2);
this.metroPanel1.Controls.Add(this.labelNetworkName);
this.metroPanel1.HorizontalScrollbarBarColor = true;
this.metroPanel1.HorizontalScrollbarHighlightOnWheel = false;
this.metroPanel1.HorizontalScrollbarSize = 10;
this.metroPanel1.Location = new System.Drawing.Point(8, 371);
this.metroPanel1.Name = "metroPanel1";
this.metroPanel1.Size = new System.Drawing.Size(331, 100);
this.metroPanel1.TabIndex = 56;
this.metroPanel1.Tag = "";
this.metroPanel1.VerticalScrollbarBarColor = true;
this.metroPanel1.VerticalScrollbarHighlightOnWheel = false;
this.metroPanel1.VerticalScrollbarSize = 10;
//
// label3
//
this.label3.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label3.Location = new System.Drawing.Point(3, 34);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(73, 22);
this.label3.TabIndex = 58;
this.label3.Text = "Load: ";
this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// labelNetworkSpeed
//
this.labelNetworkSpeed.Location = new System.Drawing.Point(82, 34);
this.labelNetworkSpeed.Name = "labelNetworkSpeed";
this.labelNetworkSpeed.Size = new System.Drawing.Size(242, 22);
this.labelNetworkSpeed.TabIndex = 57;
this.labelNetworkSpeed.Text = "0.0%";
this.labelNetworkSpeed.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
//
// label2
//
this.label2.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label2.Location = new System.Drawing.Point(3, 12);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(73, 22);
this.label2.TabIndex = 56;
this.label2.Text = "NIC Name: ";
this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// label4
//
this.label4.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label4.Location = new System.Drawing.Point(3, 56);
this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(73, 22);
this.label4.TabIndex = 60;
this.label4.Text = "Bandwidth: ";
this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// labelNetworkBand
//
this.labelNetworkBand.Location = new System.Drawing.Point(82, 56);
this.labelNetworkBand.Name = "labelNetworkBand";
this.labelNetworkBand.Size = new System.Drawing.Size(242, 22);
this.labelNetworkBand.TabIndex = 59;
this.labelNetworkBand.Text = "0 Mb/s";
this.labelNetworkBand.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
//
// ServerControlWindow
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(350, 565);
this.Controls.Add(this.metroPanel1);
this.ClientSize = new System.Drawing.Size(350, 449);
this.Controls.Add(this.label1);
this.Controls.Add(this.TXTType);
this.Controls.Add(this.CHNcConnected);
@@ -338,7 +251,6 @@ namespace Step.UI
this.NotifyIconMenu.ResumeLayout(false);
this.metroTabControl1.ResumeLayout(false);
this.ThreadsInfo.ResumeLayout(false);
this.metroPanel1.ResumeLayout(false);
this.ResumeLayout(false);
this.PerformLayout();
@@ -359,12 +271,5 @@ namespace Step.UI
private Label TXTType;
private MetroFramework.Controls.MetroCheckBox CHNcConnected;
private Label label1;
private Label labelNetworkName;
private MetroFramework.Controls.MetroPanel metroPanel1;
private Label label3;
private Label labelNetworkSpeed;
private Label label2;
private Label label4;
private Label labelNetworkBand;
}
}
Step.UI/ServerControlWindow.cs
-18
View File
@@ -151,24 +151,6 @@ namespace Step.UI
//ShowMessage on UI
TXTstatus.Text = "[" + DateTime.Now.ToString("T") + "] " + message.Message;
});
}),
MessageServices.Current.Subscribe(NETWORK_USAGE, (a, b) =>
{
DTONetworkMonitorModel NICMonitor = (DTONetworkMonitorModel)a;
if (!IsDisposed)
Invoke((MethodInvoker)delegate ()
{
labelNetworkSpeed.Text = NICMonitor.Value + " %";
labelNetworkName.Text = NICMonitor.Name;
if(NICMonitor.Bandwidth >= Math.Pow(10,9))
labelNetworkBand.Text = (NICMonitor.Bandwidth * Math.Pow(10,-9)).ToString() + " Gb/s";
else
labelNetworkBand.Text = (NICMonitor.Bandwidth * Math.Pow(10,-6)).ToString() + " Mb/s";
if(NICMonitor.Value > 95.0)
StepNotifyIcon.ShowBalloonTip(30000, "Network Card Warning", "Network Card - Bandwith Overload", ToolTipIcon.Error);
});
}),
// NC status handler
MessageServices.Current.Subscribe(SEND_NC_STATUS, (a, b) =>
Step/wwwroot/assets/styles/base/report.less
+10
View File
@@ -142,6 +142,7 @@
font-size: 18px;
line-height: 1.11;
color: @color-silver;
border: none;
}
input[type="time"]:first-child{
margin-right: 16px;
@@ -149,6 +150,7 @@
input[type="time"]::-webkit-inner-spin-button {
-webkit-appearance: none;
display: none;
border:none;
}
}
input.program{
@@ -160,6 +162,7 @@
line-height: 1.11;
color: @color-silver;
padding-left: 16px;
border: none;
}
.reports-select-operator{
width: 192px;
@@ -228,6 +231,7 @@
font-size: 18px;
line-height: 1.11;
color: @color-silver;
border: none;
}
input[type="time"]:first-child{
margin-right: 16px;
@@ -235,6 +239,7 @@
input[type="time"]::-webkit-inner-spin-button {
-webkit-appearance: none;
display: none;
border:none;
}
}
input.program{
@@ -246,6 +251,7 @@
line-height: 1.11;
color: @color-silver;
padding-left: 16px;
border: none;
}
.reports-select-operator{
width: 192px;
@@ -625,6 +631,7 @@
border-radius: 2px;
box-shadow: 0 1px 2px 0 @color-black-40;
background-image: linear-gradient(to bottom,@color-white2, @color-silver);
border: none;
}
button.active{
width: 48px;
@@ -633,6 +640,7 @@
box-shadow: inset 0 1px 3px 0 @color-black-40;
background-image: linear-gradient(to bottom, @color-silver, @color-white2 );
color: @color-clear-blue;
border: none;
}
}
.body-right-header-right {
@@ -647,6 +655,7 @@
border-radius: 2px;
box-shadow: 0 1px 2px 0 @color-black-40;
background-image: linear-gradient(to bottom,@color-white2, @color-silver);
border:none;
}
button:first-child{
margin-right: 16px;
@@ -657,6 +666,7 @@
border-radius: 2px;
box-shadow: inset 0 1px 3px 0 @color-black-40;
background-image: linear-gradient(to bottom, @color-silver, @color-white2 );
border: none;
}
}
}
Step/wwwroot/assets/styles/style.css
+10
View File
@@ -14920,6 +14920,7 @@ footer .container button.big:before {
font-size: 18px;
line-height: 1.11;
color: #bbbcbc;
border: none;
}
.reports-container .reports-box .reports-box-body .reports-box-body-left .body-left-header > div div.interval-time input[type="time"]:first-child,
.reports-container .reports-box .reports-box-body .reports-box-body-left .body-left-header-machinestatus > div div.interval-time input[type="time"]:first-child {
@@ -14929,6 +14930,7 @@ footer .container button.big:before {
.reports-container .reports-box .reports-box-body .reports-box-body-left .body-left-header-machinestatus > div div.interval-time input[type="time"]::-webkit-inner-spin-button {
-webkit-appearance: none;
display: none;
border: none;
}
.reports-container .reports-box .reports-box-body .reports-box-body-left .body-left-header > div input.program,
.reports-container .reports-box .reports-box-body .reports-box-body-left .body-left-header-machinestatus > div input.program {
@@ -14940,6 +14942,7 @@ footer .container button.big:before {
line-height: 1.11;
color: #bbbcbc;
padding-left: 16px;
border: none;
}
.reports-container .reports-box .reports-box-body .reports-box-body-left .body-left-header > div .reports-select-operator,
.reports-container .reports-box .reports-box-body .reports-box-body-left .body-left-header-machinestatus > div .reports-select-operator {
@@ -15020,6 +15023,7 @@ footer .container button.big:before {
font-size: 18px;
line-height: 1.11;
color: #bbbcbc;
border: none;
}
.reports-container .reports-box .reports-box-body .reports-box-body-left .body-left-header div.advanced-filters > div div.interval-time input[type="time"]:first-child,
.reports-container .reports-box .reports-box-body .reports-box-body-left .body-left-header-machinestatus div.advanced-filters > div div.interval-time input[type="time"]:first-child {
@@ -15029,6 +15033,7 @@ footer .container button.big:before {
.reports-container .reports-box .reports-box-body .reports-box-body-left .body-left-header-machinestatus div.advanced-filters > div div.interval-time input[type="time"]::-webkit-inner-spin-button {
-webkit-appearance: none;
display: none;
border: none;
}
.reports-container .reports-box .reports-box-body .reports-box-body-left .body-left-header div.advanced-filters > div input.program,
.reports-container .reports-box .reports-box-body .reports-box-body-left .body-left-header-machinestatus div.advanced-filters > div input.program {
@@ -15040,6 +15045,7 @@ footer .container button.big:before {
line-height: 1.11;
color: #bbbcbc;
padding-left: 16px;
border: none;
}
.reports-container .reports-box .reports-box-body .reports-box-body-left .body-left-header div.advanced-filters > div .reports-select-operator,
.reports-container .reports-box .reports-box-body .reports-box-body-left .body-left-header-machinestatus div.advanced-filters > div .reports-select-operator {
@@ -15429,6 +15435,7 @@ footer .container button.big:before {
border-radius: 2px;
box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.4);
background-image: linear-gradient(to bottom, #f1f1f1, #bbbcbc);
border: none;
}
.reports-container .reports-box .reports-box-body .reports-box-body-right .body-right-header .body-right-header-left button.active {
width: 48px;
@@ -15437,6 +15444,7 @@ footer .container button.big:before {
box-shadow: inset 0 1px 3px 0 rgba(0, 0, 0, 0.4);
background-image: linear-gradient(to bottom, #bbbcbc, #f1f1f1);
color: #1791ff;
border: none;
}
.reports-container .reports-box .reports-box-body .reports-box-body-right .body-right-header .body-right-header-right {
width: calc(100% - 158px);
@@ -15451,6 +15459,7 @@ footer .container button.big:before {
border-radius: 2px;
box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.4);
background-image: linear-gradient(to bottom, #f1f1f1, #bbbcbc);
border: none;
}
.reports-container .reports-box .reports-box-body .reports-box-body-right .body-right-header .body-right-header-right button:first-child {
margin-right: 16px;
@@ -15461,6 +15470,7 @@ footer .container button.big:before {
border-radius: 2px;
box-shadow: inset 0 1px 3px 0 rgba(0, 0, 0, 0.4);
background-image: linear-gradient(to bottom, #bbbcbc, #f1f1f1);
border: none;
}
.reports-container .reports-box .reports-box-body .reports-box-body-right .body-right-card {
width: 100%;
Step/wwwroot/src/app_modules/reports/components/reports.ts
+3 -1
View File
@@ -2,9 +2,11 @@ import Vue from "vue";
import Component from "vue-class-component";
import {cardReport} from "../../../modules/base-components/cards/index";
import accordionDropdown from "../../../modules/base-components/accordion-dropdown.vue";
import modalReportSelectColumn from "../../../modules/base-components/modal-report-select-column.vue";
import { Accordion } from "src/modules/base-components";
import DatePicker from "vue2-datepicker";
import moment from "moment";
import { ModalHelper } from "src/components/modals";
declare let $: any;
@Component({ components: { datePicker: DatePicker, cardReport: cardReport, accordionDropdown: accordionDropdown, accordion: Accordion } })
@@ -66,7 +68,7 @@ export default class Reports extends Vue {
}
openModalSelectField(){
console.log("Modal");
ModalHelper.ShowModal(modalReportSelectColumn);
}
public openSelectState() {
if (!$('.checkboxes').hasClass('checkboxesView'))
Step/wwwroot/src/app_modules/reports/components/reports.vue
+2 -2
View File
@@ -372,8 +372,8 @@
<div class="reports-box-body-right">
<div class="body-right-header">
<div class="body-right-header-left">
<button :class="{'active': selectTable}"><i class="fa fa-bars fa-2x" @click="viewTable()"></i></button>
<button :class="{'active': selectDiagram}"><i class="fa fa-signal fa-2x" @click="viewDiagram()"></i></button>
<button :class="{'active': selectTable}" @click="viewTable()"><i class="fa fa-bars fa-2x"></i></button>
<button :class="{'active': selectDiagram}" @click="viewDiagram()"><i class="fa fa-signal fa-2x"></i></button>
</div>
<div class="body-right-header-right">
<button><i class="fa fa-print fa-2x"></i></button>
Step/wwwroot/src/modules/base-components/modal-report-select-column.ts
+5
View File
@@ -1,6 +1,7 @@
import Vue from "vue";
import Component from "vue-class-component";
import { ModalHelper,Modal } from "src/components/modals";
import { Factory, MessageService } from "src/_base";
declare var cmsClient: any;
@@ -12,5 +13,9 @@ declare var cmsClient: any;
export default class ModalReportSelectColumn extends Vue {
close() {
Factory.Get(MessageService).deleteChannel("esc_pressed");
ModalHelper.HideModal();
}
}