新增功能:
1 尝试在数据列表中对于超过阈值的数据采用不同的颜色显示,编写相应转换类,并进行测试;
This commit is contained in:
parent
84e4f33fb9
commit
a63c18e22a
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -3,29 +3,21 @@
|
||||
"WorkspaceRootPath": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\",
|
||||
"Documents": [
|
||||
{
|
||||
"AbsoluteMoniker": "D:0:0:{51CD2C1B-B7CD-4AC0-8087-846E14D316AD}|JiangsuEarthquake\\JiangsuEarthquake.csproj|f:\\code\\jseq\\20240301_jseq_upperpc\\jiangsuearthquake\\jiangsuearthquake\\models\\lowercomputermodel.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
|
||||
"RelativeMoniker": "D:0:0:{51CD2C1B-B7CD-4AC0-8087-846E14D316AD}|JiangsuEarthquake\\JiangsuEarthquake.csproj|solutionrelative:jiangsuearthquake\\models\\lowercomputermodel.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
|
||||
"AbsoluteMoniker": "D:0:0:{51CD2C1B-B7CD-4AC0-8087-846E14D316AD}|JiangsuEarthquake\\JiangsuEarthquake.csproj|f:\\code\\jseq\\20240301_jseq_upperpc\\jiangsuearthquake\\jiangsuearthquake\\views\\systemenvirondataview.xaml||{F11ACC28-31D1-4C80-A34B-F4E09D3D753C}",
|
||||
"RelativeMoniker": "D:0:0:{51CD2C1B-B7CD-4AC0-8087-846E14D316AD}|JiangsuEarthquake\\JiangsuEarthquake.csproj|solutionrelative:jiangsuearthquake\\views\\systemenvirondataview.xaml||{F11ACC28-31D1-4C80-A34B-F4E09D3D753C}"
|
||||
},
|
||||
{
|
||||
"AbsoluteMoniker": "D:0:0:{51CD2C1B-B7CD-4AC0-8087-846E14D316AD}|JiangsuEarthquake\\JiangsuEarthquake.csproj|f:\\code\\jseq\\20240301_jseq_upperpc\\jiangsuearthquake\\jiangsuearthquake\\models\\seismographmodel.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
|
||||
"RelativeMoniker": "D:0:0:{51CD2C1B-B7CD-4AC0-8087-846E14D316AD}|JiangsuEarthquake\\JiangsuEarthquake.csproj|solutionrelative:jiangsuearthquake\\models\\seismographmodel.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
|
||||
"AbsoluteMoniker": "D:0:0:{51CD2C1B-B7CD-4AC0-8087-846E14D316AD}|JiangsuEarthquake\\JiangsuEarthquake.csproj|f:\\code\\jseq\\20240301_jseq_upperpc\\jiangsuearthquake\\jiangsuearthquake\\common\\valuetobrushconvert.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
|
||||
"RelativeMoniker": "D:0:0:{51CD2C1B-B7CD-4AC0-8087-846E14D316AD}|JiangsuEarthquake\\JiangsuEarthquake.csproj|solutionrelative:jiangsuearthquake\\common\\valuetobrushconvert.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
|
||||
},
|
||||
{
|
||||
"AbsoluteMoniker": "D:0:0:{51CD2C1B-B7CD-4AC0-8087-846E14D316AD}|JiangsuEarthquake\\JiangsuEarthquake.csproj|f:\\code\\jseq\\20240301_jseq_upperpc\\jiangsuearthquake\\jiangsuearthquake\\viewmodels\\mainviewmodel.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
|
||||
"AbsoluteMoniker": "D:0:0:{51CD2C1B-B7CD-4AC0-8087-846E14D316AD}|JiangsuEarthquake\\JiangsuEarthquake.csproj|f:\\code\\jseq\\20240301_jseq_upperpc\\jiangsuearthquake\\jiangsuearthquake\\app.xaml||{F11ACC28-31D1-4C80-A34B-F4E09D3D753C}",
|
||||
"RelativeMoniker": "D:0:0:{51CD2C1B-B7CD-4AC0-8087-846E14D316AD}|JiangsuEarthquake\\JiangsuEarthquake.csproj|solutionrelative:jiangsuearthquake\\app.xaml||{F11ACC28-31D1-4C80-A34B-F4E09D3D753C}"
|
||||
},
|
||||
{
|
||||
"AbsoluteMoniker": "D:0:0:{51CD2C1B-B7CD-4AC0-8087-846E14D316AD}|JiangsuEarthquake\\JiangsuEarthquake.csproj|F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\jiangsuearthquake\\viewmodels\\mainviewmodel.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
|
||||
"RelativeMoniker": "D:0:0:{51CD2C1B-B7CD-4AC0-8087-846E14D316AD}|JiangsuEarthquake\\JiangsuEarthquake.csproj|solutionrelative:jiangsuearthquake\\viewmodels\\mainviewmodel.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
|
||||
},
|
||||
{
|
||||
"AbsoluteMoniker": "D:0:0:{51CD2C1B-B7CD-4AC0-8087-846E14D316AD}|JiangsuEarthquake\\JiangsuEarthquake.csproj|f:\\code\\jseq\\20240301_jseq_upperpc\\jiangsuearthquake\\jiangsuearthquake\\viewmodels\\boosterstationstatedataviewmodel.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
|
||||
"RelativeMoniker": "D:0:0:{51CD2C1B-B7CD-4AC0-8087-846E14D316AD}|JiangsuEarthquake\\JiangsuEarthquake.csproj|solutionrelative:jiangsuearthquake\\viewmodels\\boosterstationstatedataviewmodel.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
|
||||
},
|
||||
{
|
||||
"AbsoluteMoniker": "D:0:0:{51CD2C1B-B7CD-4AC0-8087-846E14D316AD}|JiangsuEarthquake\\JiangsuEarthquake.csproj|f:\\code\\jseq\\20240301_jseq_upperpc\\jiangsuearthquake\\jiangsuearthquake\\models\\volcurcollectormodel.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
|
||||
"RelativeMoniker": "D:0:0:{51CD2C1B-B7CD-4AC0-8087-846E14D316AD}|JiangsuEarthquake\\JiangsuEarthquake.csproj|solutionrelative:jiangsuearthquake\\models\\volcurcollectormodel.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
|
||||
},
|
||||
{
|
||||
"AbsoluteMoniker": "D:0:0:{51CD2C1B-B7CD-4AC0-8087-846E14D316AD}|JiangsuEarthquake\\JiangsuEarthquake.csproj|f:\\code\\jseq\\20240301_jseq_upperpc\\jiangsuearthquake\\jiangsuearthquake\\views\\realtimedataview.xaml||{F11ACC28-31D1-4C80-A34B-F4E09D3D753C}",
|
||||
"RelativeMoniker": "D:0:0:{51CD2C1B-B7CD-4AC0-8087-846E14D316AD}|JiangsuEarthquake\\JiangsuEarthquake.csproj|solutionrelative:jiangsuearthquake\\views\\realtimedataview.xaml||{F11ACC28-31D1-4C80-A34B-F4E09D3D753C}"
|
||||
},
|
||||
{
|
||||
"AbsoluteMoniker": "D:0:0:{51CD2C1B-B7CD-4AC0-8087-846E14D316AD}|JiangsuEarthquake\\JiangsuEarthquake.csproj|F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\jiangsuearthquake\\app.config||{FA3CD31E-987B-443A-9B81-186104E8DAC1}",
|
||||
"RelativeMoniker": "D:0:0:{51CD2C1B-B7CD-4AC0-8087-846E14D316AD}|JiangsuEarthquake\\JiangsuEarthquake.csproj|solutionrelative:jiangsuearthquake\\app.config||{FA3CD31E-987B-443A-9B81-186104E8DAC1}"
|
||||
@ -38,11 +30,11 @@
|
||||
"DocumentGroups": [
|
||||
{
|
||||
"DockedWidth": 163,
|
||||
"SelectedChildIndex": 4,
|
||||
"SelectedChildIndex": 3,
|
||||
"Children": [
|
||||
{
|
||||
"$type": "Document",
|
||||
"DocumentIndex": 6,
|
||||
"DocumentIndex": 4,
|
||||
"Title": "App.config",
|
||||
"DocumentMoniker": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\App.config",
|
||||
"RelativeDocumentMoniker": "JiangsuEarthquake\\App.config",
|
||||
@ -56,77 +48,50 @@
|
||||
},
|
||||
{
|
||||
"$type": "Document",
|
||||
"DocumentIndex": 4,
|
||||
"Title": "VolCurCollectorModel.cs",
|
||||
"DocumentMoniker": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\Models\\VolCurCollectorModel.cs",
|
||||
"RelativeDocumentMoniker": "JiangsuEarthquake\\Models\\VolCurCollectorModel.cs",
|
||||
"ToolTip": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\Models\\VolCurCollectorModel.cs",
|
||||
"RelativeToolTip": "JiangsuEarthquake\\Models\\VolCurCollectorModel.cs",
|
||||
"ViewState": "AQIAAKwBAAAAAAAAAAAkwMIBAAA1AAAA",
|
||||
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
|
||||
"WhenOpened": "2024-06-28T01:42:56.109Z",
|
||||
"EditorCaption": ""
|
||||
},
|
||||
{
|
||||
"$type": "Document",
|
||||
"DocumentIndex": 5,
|
||||
"Title": "RealTimeDataView.xaml",
|
||||
"DocumentMoniker": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\Views\\RealTimeDataView.xaml",
|
||||
"RelativeDocumentMoniker": "JiangsuEarthquake\\Views\\RealTimeDataView.xaml",
|
||||
"ToolTip": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\Views\\RealTimeDataView.xaml",
|
||||
"RelativeToolTip": "JiangsuEarthquake\\Views\\RealTimeDataView.xaml",
|
||||
"DocumentIndex": 2,
|
||||
"Title": "App.xaml",
|
||||
"DocumentMoniker": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\App.xaml",
|
||||
"RelativeDocumentMoniker": "JiangsuEarthquake\\App.xaml",
|
||||
"ToolTip": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\App.xaml",
|
||||
"RelativeToolTip": "JiangsuEarthquake\\App.xaml",
|
||||
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003549|",
|
||||
"WhenOpened": "2024-06-27T09:38:54.977Z",
|
||||
"EditorCaption": ""
|
||||
},
|
||||
{
|
||||
"$type": "Document",
|
||||
"DocumentIndex": 3,
|
||||
"Title": "BoosterStationStateDataViewModel.cs",
|
||||
"DocumentMoniker": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\ViewModels\\BoosterStationStateDataViewModel.cs",
|
||||
"RelativeDocumentMoniker": "JiangsuEarthquake\\ViewModels\\BoosterStationStateDataViewModel.cs",
|
||||
"ToolTip": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\ViewModels\\BoosterStationStateDataViewModel.cs",
|
||||
"RelativeToolTip": "JiangsuEarthquake\\ViewModels\\BoosterStationStateDataViewModel.cs",
|
||||
"ViewState": "AQIAAFwBAAAAAAAAAAAuwNkFAAAIAAAA",
|
||||
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
|
||||
"WhenOpened": "2024-06-27T06:25:37.202Z",
|
||||
"EditorCaption": ""
|
||||
},
|
||||
{
|
||||
"$type": "Document",
|
||||
"DocumentIndex": 0,
|
||||
"Title": "LowerComputerModel.cs",
|
||||
"DocumentMoniker": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\Models\\LowerComputerModel.cs",
|
||||
"RelativeDocumentMoniker": "JiangsuEarthquake\\Models\\LowerComputerModel.cs",
|
||||
"ToolTip": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\Models\\LowerComputerModel.cs",
|
||||
"RelativeToolTip": "JiangsuEarthquake\\Models\\LowerComputerModel.cs",
|
||||
"ViewState": "AQIAAFoAAAAAAAAAAAAuwIQAAAAvAAAA",
|
||||
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
|
||||
"WhenOpened": "2024-06-27T05:54:59.023Z",
|
||||
"WhenOpened": "2024-07-01T06:30:26.069Z",
|
||||
"EditorCaption": ""
|
||||
},
|
||||
{
|
||||
"$type": "Document",
|
||||
"DocumentIndex": 1,
|
||||
"Title": "SeismographModel.cs",
|
||||
"DocumentMoniker": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\Models\\SeismographModel.cs",
|
||||
"RelativeDocumentMoniker": "JiangsuEarthquake\\Models\\SeismographModel.cs",
|
||||
"ToolTip": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\Models\\SeismographModel.cs",
|
||||
"RelativeToolTip": "JiangsuEarthquake\\Models\\SeismographModel.cs",
|
||||
"ViewState": "AQIAADUAAAAAAAAAAAAUwEoAAAAAAAAA",
|
||||
"Title": "ValueToBrushConvert.cs",
|
||||
"DocumentMoniker": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\Common\\ValueToBrushConvert.cs",
|
||||
"RelativeDocumentMoniker": "JiangsuEarthquake\\Common\\ValueToBrushConvert.cs",
|
||||
"ToolTip": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\Common\\ValueToBrushConvert.cs",
|
||||
"RelativeToolTip": "JiangsuEarthquake\\Common\\ValueToBrushConvert.cs",
|
||||
"ViewState": "AQIAAAMAAAAAAAAAAAAAAB8AAAAAAAAA",
|
||||
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
|
||||
"WhenOpened": "2024-06-28T01:41:37.637Z",
|
||||
"WhenOpened": "2024-07-01T05:48:58.03Z",
|
||||
"EditorCaption": ""
|
||||
},
|
||||
{
|
||||
"$type": "Document",
|
||||
"DocumentIndex": 2,
|
||||
"DocumentIndex": 0,
|
||||
"Title": "SystemEnvironDataView.xaml",
|
||||
"DocumentMoniker": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\Views\\SystemEnvironDataView.xaml",
|
||||
"RelativeDocumentMoniker": "JiangsuEarthquake\\Views\\SystemEnvironDataView.xaml",
|
||||
"ToolTip": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\Views\\SystemEnvironDataView.xaml*",
|
||||
"RelativeToolTip": "JiangsuEarthquake\\Views\\SystemEnvironDataView.xaml*",
|
||||
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003549|",
|
||||
"WhenOpened": "2024-07-01T01:00:30.386Z",
|
||||
"EditorCaption": ""
|
||||
},
|
||||
{
|
||||
"$type": "Document",
|
||||
"DocumentIndex": 3,
|
||||
"Title": "MainViewModel.cs",
|
||||
"DocumentMoniker": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\ViewModels\\MainViewModel.cs",
|
||||
"RelativeDocumentMoniker": "JiangsuEarthquake\\ViewModels\\MainViewModel.cs",
|
||||
"ToolTip": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\ViewModels\\MainViewModel.cs",
|
||||
"RelativeToolTip": "JiangsuEarthquake\\ViewModels\\MainViewModel.cs",
|
||||
"ViewState": "AQIAAKUPAAAAAAAAAAAAAAsIAAAIAAAA",
|
||||
"ViewState": "AQIAAF0BAAAAAAAAAAAwwAQCAAAAAAAA",
|
||||
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
|
||||
"WhenOpened": "2024-06-26T09:47:38.344Z",
|
||||
"EditorCaption": ""
|
||||
|
||||
Binary file not shown.
Binary file not shown.
@ -24,6 +24,8 @@
|
||||
<ResourceDictionary Source="/JiangsuEarthquake;component/ImageDictionary.xaml"/>
|
||||
</ResourceDictionary.MergedDictionaries>
|
||||
|
||||
|
||||
|
||||
<!--字体-->
|
||||
<FontFamily x:Key="DigitalDisplay">
|
||||
pack://application:,,,/JiangsuEarthquake;component/Assets/Fonts/#方正楷体简体</FontFamily>
|
||||
|
||||
@ -0,0 +1,41 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Globalization;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
using System.Windows.Data;
|
||||
using System.Windows.Media;
|
||||
|
||||
namespace JiangsuEarthquake.Common
|
||||
{
|
||||
public class ValueToBrushConvert : IValueConverter
|
||||
{
|
||||
public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
|
||||
{
|
||||
double number = ConvertToDouble(value);
|
||||
if (number > ConvertToDouble(parameter))
|
||||
{
|
||||
return new SolidColorBrush(Colors.Red); // 返回大于某个值的颜色
|
||||
}
|
||||
else
|
||||
{
|
||||
return new SolidColorBrush(Colors.White); // 返回默认颜色或背景色
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
|
||||
{
|
||||
return new SolidColorBrush(Colors.Green); // 返回默认颜色或背景色
|
||||
}
|
||||
|
||||
|
||||
private double ConvertToDouble(object value)
|
||||
{
|
||||
double d;
|
||||
double.TryParse(value.ToString(), out d);
|
||||
return d;
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -928,7 +928,6 @@ namespace JiangsuEarthquake.Models
|
||||
if (byteLength != 8) //长度校验失败
|
||||
{
|
||||
string content = "接驳盒请求读取上位机现在时间数据长度校验失败";
|
||||
|
||||
sql = $"insert into alarm_run_info(StationID,RecordTime,ParaName,ParaContent) values('{id}','{DateTime.Now}','接驳盒数据校验','{content}');";
|
||||
DBHelper.ExecuteNonQuery(sql, 1);
|
||||
|
||||
@ -949,7 +948,6 @@ namespace JiangsuEarthquake.Models
|
||||
catch (Exception ex)
|
||||
{
|
||||
content = "接驳盒读取上位机现在时间长度校验失败信息发送失败," + ex.Message;
|
||||
|
||||
sql = $"insert into alarm_run_info(StationID,RecordTime,ParaName,ParaContent) values('{id}','{DateTime.Now}','接驳盒数据发送','{content}');";
|
||||
DBHelper.ExecuteNonQuery(sql, 1);
|
||||
}
|
||||
@ -989,7 +987,6 @@ namespace JiangsuEarthquake.Models
|
||||
catch (Exception ex)
|
||||
{
|
||||
string content = "接驳盒读取上位机现在时间解析成功信息发送失败," + ex.Message;
|
||||
|
||||
sql = $"insert into alarm_run_info(StationID,RecordTime,ParaName,ParaContent) values('{id}','{DateTime.Now}','接驳盒数据发送','{content}');";
|
||||
DBHelper.ExecuteNonQuery(sql, 1);
|
||||
}
|
||||
@ -1003,7 +1000,6 @@ namespace JiangsuEarthquake.Models
|
||||
if (byteLength != 18) //长度校验失败
|
||||
{
|
||||
string content = "接驳盒告警数据长度校验失败";
|
||||
|
||||
sql = $"insert into alarm_run_info(StationID,RecordTime,ParaName,ParaContent) values('{id}','{DateTime.Now}','接驳盒数据校验','{content}');";
|
||||
DBHelper.ExecuteNonQuery(sql, 1);
|
||||
|
||||
@ -1024,7 +1020,6 @@ namespace JiangsuEarthquake.Models
|
||||
catch (Exception ex)
|
||||
{
|
||||
content = "接驳盒告警数据长度校验失败信息发送失败," + ex.Message;
|
||||
|
||||
sql = $"insert into alarm_run_info(StationID,RecordTime,ParaName,ParaContent) values('{id}','{DateTime.Now}','接驳盒数据发送','{content}');";
|
||||
DBHelper.ExecuteNonQuery(sql, 1);
|
||||
}
|
||||
@ -1067,7 +1062,6 @@ namespace JiangsuEarthquake.Models
|
||||
catch (Exception ex)
|
||||
{
|
||||
string content = "接驳盒告警数据解析成功信息发送失败," + ex.Message;
|
||||
|
||||
sql = $"insert into alarm_run_info(StationID,RecordTime,ParaName,ParaContent) values('{id}','{DateTime.Now}','接驳盒数据发送','{content}');";
|
||||
DBHelper.ExecuteNonQuery(sql, 1);
|
||||
}
|
||||
@ -1117,7 +1111,6 @@ namespace JiangsuEarthquake.Models
|
||||
catch (Exception ex)
|
||||
{
|
||||
string content = "接驳盒告警信息解析失败," + ex.Message;
|
||||
|
||||
sql = $"insert into alarm_run_info(StationID,RecordTime,ParaName,ParaContent) values('{id}','{DateTime.Now}','接驳盒数据解析','{content}');";
|
||||
DBHelper.ExecuteNonQuery(sql, 1);
|
||||
|
||||
|
||||
@ -6,6 +6,7 @@
|
||||
xmlns:local="clr-namespace:JiangsuEarthquake.Views"
|
||||
xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
|
||||
xmlns:hc="https://handyorg.github.io/handycontrol"
|
||||
xmlns:Common="clr-namespace:JiangsuEarthquake.Common"
|
||||
mc:Ignorable="d"
|
||||
FontFamily="{StaticResource DigitalDisplay}"
|
||||
Name="SystemStateDataPage"
|
||||
@ -118,6 +119,8 @@
|
||||
</Setter.Value>
|
||||
</Setter>
|
||||
</Style>
|
||||
|
||||
<Common:ValueToBrushConvert x:Key="ValueToBrushConvert"/>
|
||||
</UserControl.Resources>
|
||||
|
||||
<Grid>
|
||||
@ -189,15 +192,15 @@
|
||||
<RowDefinition/>
|
||||
</Grid.RowDefinitions>
|
||||
|
||||
<DataGrid x:Name="SystemStateDataGrid" ItemsSource="{Binding SystemStateDataList}"
|
||||
<DataGrid x:Name="SystemStateDataGrid" ItemsSource="{Binding SystemStateDataList,Mode=TwoWay}"
|
||||
AutoGenerateColumns="False" Margin="10,0,10,0" CanUserSortColumns="False"
|
||||
CanUserAddRows="False" CanUserDeleteRows="False" Background="Transparent"
|
||||
CanUserReorderColumns="False" CanUserResizeColumns="False" IsHitTestVisible="False"
|
||||
CanUserReorderColumns="False" CanUserResizeColumns="False"
|
||||
CanUserResizeRows="False" BorderThickness="0" Grid.RowSpan="2">
|
||||
<DataGrid.Resources>
|
||||
<Style TargetType="DataGridCell" x:Key="DataGridCellCenter">
|
||||
<Setter Property="Background" Value="#FF14273A"/>
|
||||
<Setter Property="Foreground" Value="White"/>
|
||||
<!--<Setter Property="Foreground" Value="White"/>-->
|
||||
<Setter Property="BorderBrush" Value="#A0A0A0"/>
|
||||
<Setter Property="FontSize" Value="16"/>
|
||||
<Setter Property="Template">
|
||||
@ -219,8 +222,16 @@
|
||||
CanUserSort="False" CellStyle="{StaticResource DataGridCellCenter}"/>
|
||||
<DataGridTextColumn Binding="{Binding RecordTime, StringFormat='yyyy/MM/dd HH:mm:ss'}" Width="1.8*" Header="记录时间"
|
||||
CanUserSort="False" CellStyle="{StaticResource DataGridCellCenter}"/>
|
||||
<DataGridTextColumn Binding="{Binding Temperature,StringFormat=F2}" Width="0.7*" Header="温度 ℃"
|
||||
CanUserSort="False" CellStyle="{StaticResource DataGridCellCenter}"/>
|
||||
<!--<DataGridTextColumn Binding="{Binding Temperature,StringFormat=F2}" Width="0.7*" Header="温度 ℃"
|
||||
CanUserSort="False" CellStyle="{StaticResource DataGridCellCenter}"/>-->
|
||||
<DataGridTemplateColumn Width="0.7*" Header="温度 ℃" CellStyle="{StaticResource DataGridCellCenter}">
|
||||
<DataGridTemplateColumn.CellTemplate>
|
||||
<DataTemplate>
|
||||
<TextBlock HorizontalAlignment="Center" Text="{Binding Temperature,StringFormat=F2}"
|
||||
Foreground="{Binding Path=Temperature, Converter={StaticResource ValueToBrushConvert},ConverterParameter=20}"/>
|
||||
</DataTemplate>
|
||||
</DataGridTemplateColumn.CellTemplate>
|
||||
</DataGridTemplateColumn>
|
||||
<DataGridTextColumn Binding="{Binding Humidity,StringFormat=F2}" Width="0.7*" Header="湿度 %"
|
||||
CanUserSort="False" CellStyle="{StaticResource DataGridCellCenter}"/>
|
||||
<DataGridTemplateColumn Header="舱门状态" Width="0.9*" CellStyle="{StaticResource DataGridCellCenter}">
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -1,4 +1,4 @@
|
||||
#pragma checksum "..\..\..\App.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "07A7638958A7EA2F0F59520DE652DD1A914A4EE7"
|
||||
#pragma checksum "..\..\..\App.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "E2BF1494F79121816B0AD6ABA68B5295386A4D32"
|
||||
//------------------------------------------------------------------------------
|
||||
// <auto-generated>
|
||||
// 此代码由工具生成。
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
#pragma checksum "..\..\..\App.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "07A7638958A7EA2F0F59520DE652DD1A914A4EE7"
|
||||
#pragma checksum "..\..\..\App.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "E2BF1494F79121816B0AD6ABA68B5295386A4D32"
|
||||
//------------------------------------------------------------------------------
|
||||
// <auto-generated>
|
||||
// 此代码由工具生成。
|
||||
|
||||
@ -14,7 +14,7 @@ using System.Reflection;
|
||||
[assembly: System.Reflection.AssemblyCompanyAttribute("JiangsuEarthquake")]
|
||||
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
|
||||
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
|
||||
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+ab358f336fb6e24a4dd3572088ff88260988bf4e")]
|
||||
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+84e4f33fb92f9b7b188935537dac455facf0d42e")]
|
||||
[assembly: System.Reflection.AssemblyProductAttribute("JiangsuEarthquake")]
|
||||
[assembly: System.Reflection.AssemblyTitleAttribute("JiangsuEarthquake")]
|
||||
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
|
||||
|
||||
@ -1 +1 @@
|
||||
fe0c0dfb027d166d8e51e7b680f7c129983aa72e9021847ec0a681ab20e3a696
|
||||
7bf5efeac69639c23ca08f4c4595a9e9bebc11ac630cc88303a67dad3f176a4a
|
||||
|
||||
Binary file not shown.
@ -1 +1 @@
|
||||
49ba0232c41fa1cdad72f727a2d12999b4877e368caa95736e5753726fd30c8c
|
||||
3cd7b80e311dd15b7ccd8cb1726d7fdfaa361e0f77a6cbd65d8c0136377baf0a
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -12,7 +12,7 @@ TRACE;DEBUG;NET;NET6_0;NETCOREAPP
|
||||
F:\Code\JSEQ\20240301_JSEQ_upperpc\JiangsuEarthquake\JiangsuEarthquake\App.xaml
|
||||
20-1982183921
|
||||
11052456543
|
||||
82-352914371
|
||||
831881365496
|
||||
227-921550327
|
||||
Assets\Styles\DefaultStyle.xaml;ImageDictionary.xaml;MainWindow.xaml;Views\AlarmRecordView.xaml;Views\BoosterStationStateDataView.xaml;Views\LogRecordView.xaml;Views\RealTimeDataView.xaml;Views\SeismometerParameterView.xaml;Views\SeismometerStateDataView.xaml;Views\SystemControlView.xaml;Views\SystemEnvironDataView.xaml;Views\SystemMonitorDataView.xaml;Views\UserControls\AlarmSettingView.xaml;Views\UserControls\BaseStationModel.xaml;Views\UserControls\FTPConnectSstView.xaml;Views\UserControls\FTPSettingView.xaml;Views\UserControls\InitialView.xaml;Views\UserControls\InitialView1.xaml;Views\UserControls\OtherSettingView.xaml;Views\UserControls\TextDialog.xaml;
|
||||
|
||||
|
||||
@ -12,7 +12,7 @@ TRACE;DEBUG;NET;NET6_0;NETCOREAPP
|
||||
F:\Code\JSEQ\20240301_JSEQ_upperpc\JiangsuEarthquake\JiangsuEarthquake\App.xaml
|
||||
20-1982183921
|
||||
11052456543
|
||||
84776288806
|
||||
85-1284398623
|
||||
227-921550327
|
||||
Assets\Styles\DefaultStyle.xaml;ImageDictionary.xaml;MainWindow.xaml;Views\AlarmRecordView.xaml;Views\BoosterStationStateDataView.xaml;Views\LogRecordView.xaml;Views\RealTimeDataView.xaml;Views\SeismometerParameterView.xaml;Views\SeismometerStateDataView.xaml;Views\SystemControlView.xaml;Views\SystemEnvironDataView.xaml;Views\SystemMonitorDataView.xaml;Views\UserControls\AlarmSettingView.xaml;Views\UserControls\BaseStationModel.xaml;Views\UserControls\FTPConnectSstView.xaml;Views\UserControls\FTPSettingView.xaml;Views\UserControls\InitialView.xaml;Views\UserControls\InitialView1.xaml;Views\UserControls\OtherSettingView.xaml;Views\UserControls\TextDialog.xaml;
|
||||
|
||||
|
||||
@ -9,6 +9,7 @@ FF:\Code\JSEQ\20240301_JSEQ_upperpc\JiangsuEarthquake\JiangsuEarthquake\Views\Se
|
||||
FF:\Code\JSEQ\20240301_JSEQ_upperpc\JiangsuEarthquake\JiangsuEarthquake\Views\SeismometerStateDataView.xaml;;
|
||||
FF:\Code\JSEQ\20240301_JSEQ_upperpc\JiangsuEarthquake\JiangsuEarthquake\Views\SystemControlView.xaml;;
|
||||
FF:\Code\JSEQ\20240301_JSEQ_upperpc\JiangsuEarthquake\JiangsuEarthquake\Views\SystemEnvironDataView.xaml;;
|
||||
FF:\Code\JSEQ\20240301_JSEQ_upperpc\JiangsuEarthquake\JiangsuEarthquake\Views\SystemMonitorDataView.xaml;;
|
||||
FF:\Code\JSEQ\20240301_JSEQ_upperpc\JiangsuEarthquake\JiangsuEarthquake\Views\UserControls\AlarmSettingView.xaml;;
|
||||
FF:\Code\JSEQ\20240301_JSEQ_upperpc\JiangsuEarthquake\JiangsuEarthquake\Views\UserControls\BaseStationModel.xaml;;
|
||||
FF:\Code\JSEQ\20240301_JSEQ_upperpc\JiangsuEarthquake\JiangsuEarthquake\Views\UserControls\FTPConnectSstView.xaml;;
|
||||
@ -17,5 +18,4 @@ FF:\Code\JSEQ\20240301_JSEQ_upperpc\JiangsuEarthquake\JiangsuEarthquake\Views\Us
|
||||
FF:\Code\JSEQ\20240301_JSEQ_upperpc\JiangsuEarthquake\JiangsuEarthquake\Views\UserControls\InitialView1.xaml;;
|
||||
FF:\Code\JSEQ\20240301_JSEQ_upperpc\JiangsuEarthquake\JiangsuEarthquake\Views\UserControls\OtherSettingView.xaml;;
|
||||
FF:\Code\JSEQ\20240301_JSEQ_upperpc\JiangsuEarthquake\JiangsuEarthquake\Views\UserControls\TextDialog.xaml;;
|
||||
FF:\Code\JSEQ\20240301_JSEQ_upperpc\JiangsuEarthquake\JiangsuEarthquake\Views\SystemMonitorDataView.xaml;;
|
||||
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -14,7 +14,7 @@ using System.Reflection;
|
||||
[assembly: System.Reflection.AssemblyCompanyAttribute("Models")]
|
||||
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
|
||||
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
|
||||
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+4acbaf20c3caf63229d963b2198c8bc40c684edf")]
|
||||
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+84e4f33fb92f9b7b188935537dac455facf0d42e")]
|
||||
[assembly: System.Reflection.AssemblyProductAttribute("Models")]
|
||||
[assembly: System.Reflection.AssemblyTitleAttribute("Models")]
|
||||
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
|
||||
|
||||
@ -1 +1 @@
|
||||
14ba97bade174060f9baeda76a46a80fa8a514d1b6dd817acb41b56926e4c472
|
||||
3ff762f67b08840642491b1010933790442ecfba24d82f7ada35259350440267
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading…
Reference in New Issue
Block a user