Skip to content

Commit bbe06c3

Browse files
ritaccritacc
committed
2012-10-27上传
Signed-off-by: ritacc <[email protected]>
1 parent 0b1e2e2 commit bbe06c3

23 files changed

Lines changed: 4196 additions & 28 deletions

‎MonitorSystem.Web/Moldes/Monitor.Designer.cs‎

Lines changed: 581 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎MonitorSystem.Web/Moldes/Monitor.edmx‎

Lines changed: 82 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
</EntitySet>
1919
<EntitySet Name="t_Element" EntityType="MonitorDemo2Model.Store.t_Element" store:Type="Tables" Schema="dbo" />
2020
<EntitySet Name="t_Element_Library" EntityType="MonitorDemo2Model.Store.t_Element_Library" store:Type="Tables" Schema="dbo" />
21+
<EntitySet Name="t_Element_RealTimeLine" EntityType="MonitorDemo2Model.Store.t_Element_RealTimeLine" store:Type="Tables" Schema="dbo" />
2122
<EntitySet Name="t_ElementProperty" EntityType="MonitorDemo2Model.Store.t_ElementProperty" store:Type="Tables" Schema="dbo" />
2223
<EntitySet Name="t_ElementProperty_Library" EntityType="MonitorDemo2Model.Store.t_ElementProperty_Library" store:Type="Tables" Schema="dbo" />
2324
<EntitySet Name="t_GalleryClassification" EntityType="MonitorDemo2Model.Store.t_GalleryClassification" store:Type="Tables" Schema="dbo" />
@@ -124,6 +125,32 @@
124125
<Property Name="SerialNum" Type="int" />
125126
<Property Name="TotalLength" Type="float" />
126127
</EntityType>
128+
<EntityType Name="t_Element_RealTimeLine">
129+
<Key>
130+
<PropertyRef Name="ID" />
131+
</Key>
132+
<Property Name="ID" Type="char" Nullable="false" MaxLength="36" />
133+
<Property Name="ScreenID" Type="int" Nullable="false" />
134+
<Property Name="ElementID" Type="int" Nullable="false" />
135+
<Property Name="LineType" Type="int" Nullable="false" />
136+
<Property Name="LineName" Type="varchar" MaxLength="10" />
137+
<Property Name="LineCZ" Type="int" />
138+
<Property Name="LineShowType" Type="int" />
139+
<Property Name="LineStyle" Type="int" />
140+
<Property Name="LinePointBJ" Type="int" />
141+
<Property Name="LineColor" Type="varchar" Nullable="false" MaxLength="10" />
142+
<Property Name="MinValue" Type="varchar" Nullable="false" MaxLength="10" />
143+
<Property Name="MaxValue" Type="varchar" Nullable="false" MaxLength="10" />
144+
<Property Name="ValueDecimal" Type="int" Nullable="false" />
145+
<Property Name="ShowFormat" Type="varchar" MaxLength="20" />
146+
<Property Name="TimeLen" Type="int" Nullable="false" />
147+
<Property Name="TimeLenType" Type="varchar" Nullable="false" MaxLength="2" />
148+
<Property Name="LineCYZQLent" Type="varchar" Nullable="false" MaxLength="2" />
149+
<Property Name="LineCYZQType" Type="varchar" Nullable="false" MaxLength="2" />
150+
<Property Name="DeviceID" Type="int" />
151+
<Property Name="ChannelNo" Type="int" />
152+
<Property Name="ComputeStr" Type="varchar" MaxLength="100" />
153+
</EntityType>
127154
<EntityType Name="t_ElementProperty">
128155
<Key>
129156
<PropertyRef Name="ElementID" />
@@ -248,6 +275,7 @@
248275
<Parameter Name="oldScreenID" Mode="In" Type="Int32" />
249276
</FunctionImport>
250277
<EntitySet Name="GalleryClassification" EntityType="MonitorDemo2Model.t_GalleryClassification" />
278+
<EntitySet Name="t_Element_RealTimeLine" EntityType="MonitorDemo2Model.t_Element_RealTimeLine" />
251279
</EntityContainer>
252280
<EntityType Name="t_Control">
253281
<Key>
@@ -431,6 +459,32 @@
431459
<Property Type="String" Name="Description" MaxLength="100" FixedLength="false" Unicode="true" />
432460
<Property Type="Int32" Name="Sort" Nullable="false" />
433461
</EntityType>
462+
<EntityType Name="t_Element_RealTimeLine">
463+
<Key>
464+
<PropertyRef Name="ID" />
465+
</Key>
466+
<Property Type="String" Name="ID" Nullable="false" MaxLength="36" FixedLength="true" Unicode="false" />
467+
<Property Type="Int32" Name="ScreenID" Nullable="false" />
468+
<Property Type="Int32" Name="ElementID" Nullable="false" />
469+
<Property Type="Int32" Name="LineType" Nullable="false" />
470+
<Property Type="String" Name="LineName" MaxLength="10" FixedLength="false" Unicode="false" />
471+
<Property Type="Int32" Name="LineCZ" />
472+
<Property Type="Int32" Name="LineShowType" />
473+
<Property Type="Int32" Name="LineStyle" />
474+
<Property Type="Int32" Name="LinePointBJ" />
475+
<Property Type="String" Name="LineColor" Nullable="false" MaxLength="10" FixedLength="false" Unicode="false" />
476+
<Property Type="String" Name="MinValue" Nullable="false" MaxLength="10" FixedLength="false" Unicode="false" />
477+
<Property Type="String" Name="MaxValue" Nullable="false" MaxLength="10" FixedLength="false" Unicode="false" />
478+
<Property Type="Int32" Name="ValueDecimal" Nullable="false" />
479+
<Property Type="String" Name="ShowFormat" MaxLength="20" FixedLength="false" Unicode="false" />
480+
<Property Type="Int32" Name="TimeLen" Nullable="false" />
481+
<Property Type="String" Name="TimeLenType" Nullable="false" MaxLength="2" FixedLength="false" Unicode="false" />
482+
<Property Type="String" Name="LineCYZQLent" Nullable="false" MaxLength="2" FixedLength="false" Unicode="false" />
483+
<Property Type="String" Name="LineCYZQType" Nullable="false" MaxLength="2" FixedLength="false" Unicode="false" />
484+
<Property Type="Int32" Name="DeviceID" />
485+
<Property Type="Int32" Name="ChannelNo" />
486+
<Property Type="String" Name="ComputeStr" MaxLength="100" FixedLength="false" Unicode="false" />
487+
</EntityType>
434488
</Schema>
435489
</edmx:ConceptualModels>
436490
<!-- C-S mapping content -->
@@ -624,6 +678,33 @@
624678
</MappingFragment>
625679
</EntityTypeMapping>
626680
</EntitySetMapping>
681+
<EntitySetMapping Name="t_Element_RealTimeLine">
682+
<EntityTypeMapping TypeName="MonitorDemo2Model.t_Element_RealTimeLine">
683+
<MappingFragment StoreEntitySet="t_Element_RealTimeLine">
684+
<ScalarProperty Name="ComputeStr" ColumnName="ComputeStr" />
685+
<ScalarProperty Name="ChannelNo" ColumnName="ChannelNo" />
686+
<ScalarProperty Name="DeviceID" ColumnName="DeviceID" />
687+
<ScalarProperty Name="LineCYZQType" ColumnName="LineCYZQType" />
688+
<ScalarProperty Name="LineCYZQLent" ColumnName="LineCYZQLent" />
689+
<ScalarProperty Name="TimeLenType" ColumnName="TimeLenType" />
690+
<ScalarProperty Name="TimeLen" ColumnName="TimeLen" />
691+
<ScalarProperty Name="ShowFormat" ColumnName="ShowFormat" />
692+
<ScalarProperty Name="ValueDecimal" ColumnName="ValueDecimal" />
693+
<ScalarProperty Name="MaxValue" ColumnName="MaxValue" />
694+
<ScalarProperty Name="MinValue" ColumnName="MinValue" />
695+
<ScalarProperty Name="LineColor" ColumnName="LineColor" />
696+
<ScalarProperty Name="LinePointBJ" ColumnName="LinePointBJ" />
697+
<ScalarProperty Name="LineStyle" ColumnName="LineStyle" />
698+
<ScalarProperty Name="LineShowType" ColumnName="LineShowType" />
699+
<ScalarProperty Name="LineCZ" ColumnName="LineCZ" />
700+
<ScalarProperty Name="LineName" ColumnName="LineName" />
701+
<ScalarProperty Name="LineType" ColumnName="LineType" />
702+
<ScalarProperty Name="ElementID" ColumnName="ElementID" />
703+
<ScalarProperty Name="ScreenID" ColumnName="ScreenID" />
704+
<ScalarProperty Name="ID" ColumnName="ID" />
705+
</MappingFragment>
706+
</EntityTypeMapping>
707+
</EntitySetMapping>
627708
</EntityContainerMapping>
628709
</Mapping>
629710
</edmx:Mappings>
@@ -657,6 +738,7 @@
657738
<EntityTypeShape EntityType="MonitorDemo2Model.t_Sys_MainRealTimeSet" Width="2" PointX="5.125" PointY="8.25" Height="2.6339322916666674" />
658739
<EntityTypeShape EntityType="MonitorDemo2Model.V_ScreenMonitorValue" Width="1.5" PointX="0.5" PointY="0.5" Height="2.4653124999999996" />
659740
<EntityTypeShape EntityType="MonitorDemo2Model.t_GalleryClassification" Width="1.5" PointX="7" PointY="1.625" Height="1.7790128580729174" />
741+
<EntityTypeShape EntityType="MonitorDemo2Model.t_Element_RealTimeLine" Width="1.5" PointX="8.375" PointY="4.75" Height="4.48875" />
660742
</Diagram>
661743
</Diagrams>
662744
</Designer>

‎MonitorSystem.Web/MonitorSystem.Web.Publish.xml‎

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,18 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<publishData>
3-
<publishProfile publishUrl="C:\inetpub\wwwroot\demo" deleteExistingFiles="True" ftpAnonymousLogin="False" ftpPassiveMode="True" msdeploySite="" msdeploySiteID="" msdeployRemoteSitePhysicalPath="" msdeployAllowUntrustedCertificate="False" msdeploySkipExtraFilesOnServer="True" msdeployMarkAsApp="False" profileName="配置文件1" publishMethod="FileSystem" replaceMatchingFiles="False" userName="" savePWD="False" userPWD="" SelectedForPublish="True">
4-
<file relUrl="bin/MonitorSystem.Web.pdb" publishTime="05/19/2012 00:32:36" />
5-
<file relUrl="MonitorSystemTestPage.html" publishTime="05/06/2012 17:01:03" />
6-
<file relUrl="GetData/GetData.svc" publishTime="05/05/2012 13:14:15" />
7-
<file relUrl="Web.config" publishTime="05/19/2012 00:24:54" />
8-
<file relUrl="Silverlight.js" publishTime="04/12/2012 01:38:22" />
9-
<file relUrl="bin/MonitorSystem.Web.dll" publishTime="05/19/2012 00:32:36" />
10-
<file relUrl="MonitorSystemTestPage.aspx" publishTime="05/06/2012 17:01:03" />
11-
<file relUrl="ClientBin/MonitorSystem.xap" publishTime="05/19/2012 00:32:40" />
12-
<file relUrl="test1.aspx" publishTime="05/13/2012 12:01:19" />
3+
<publishProfile publishUrl="F:\WebSite\Monitor" deleteExistingFiles="True" ftpAnonymousLogin="False" ftpPassiveMode="True" msdeploySite="" msdeploySiteID="" msdeployRemoteSitePhysicalPath="" msdeployAllowUntrustedCertificate="False" msdeploySkipExtraFilesOnServer="True" msdeployMarkAsApp="False" profileName="配置文件1" publishMethod="FileSystem" replaceMatchingFiles="False" userName="" savePWD="False" userPWD="" SelectedForPublish="True">
4+
<file relUrl="bin/MonitorSystem.Web.pdb" publishTime="10/20/2012 15:57:11" />
5+
<file relUrl="MonitorSystemTestPage.aspx" publishTime="10/15/2012 21:55:00" />
6+
<file relUrl="Upload/PIC/bg1.jpg" publishTime="10/15/2012 21:55:00" />
7+
<file relUrl="test1.aspx" publishTime="10/15/2012 21:55:00" />
8+
<file relUrl="GetData/GetData.svc" publishTime="10/15/2012 21:55:00" />
9+
<file relUrl="Web.config" publishTime="10/20/2012 15:56:42" />
10+
<file relUrl="fullScreen.js" publishTime="10/15/2012 21:55:00" />
11+
<file relUrl="MonitorSystemTestPage.html" publishTime="10/15/2012 21:55:00" />
12+
<file relUrl="ClientBin/MonitorSystem.xap" publishTime="10/20/2012 15:54:00" />
13+
<file relUrl="bin/MonitorSystem.Web.dll" publishTime="10/20/2012 15:57:11" />
14+
<file relUrl="Upload/PIC/Near2.jpg" publishTime="10/15/2012 21:55:00" />
15+
<file relUrl="Silverlight.js" publishTime="10/15/2012 21:55:00" />
16+
<file relUrl="Upload/PIC/jump.jpg" publishTime="10/15/2012 21:55:00" />
1317
</publishProfile>
1418
</publishData>

‎MonitorSystem.Web/MonitorSystem.Web.csproj‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
<AssemblyName>MonitorSystem.Web</AssemblyName>
1515
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
1616
<SilverlightApplicationList>{5CF1D735-70BA-41C6-88DF-A23361DB575D}|..\MonitorSystem\MonitorSystem.csproj|ClientBin|False</SilverlightApplicationList>
17+
<UseIISExpress>false</UseIISExpress>
1718
</PropertyGroup>
1819
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1920
<DebugSymbols>true</DebugSymbols>
@@ -67,8 +68,6 @@
6768
<Content Include="MonitorSystemTestPage.html" />
6869
<Content Include="Silverlight.js" />
6970
<Content Include="test1.aspx" />
70-
<Content Include="Upload\ImageMap\11.jpg" />
71-
<Content Include="Upload\ImageMap\22.jpg" />
7271
<Content Include="Upload\PIC\bg1.jpg" />
7372
<Content Include="Upload\PIC\jump.jpg" />
7473
<Content Include="Upload\PIC\Near2.jpg" />
@@ -131,6 +130,9 @@
131130
<LastGenOutput>ControlValue.Designer.cs</LastGenOutput>
132131
</EntityDeploy>
133132
</ItemGroup>
133+
<ItemGroup>
134+
<Folder Include="Upload\ImageMap\" />
135+
</ItemGroup>
134136
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
135137
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" />
136138
<ProjectExtensions>

‎MonitorSystem/LoadScreen.xaml.cs‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1238,6 +1238,9 @@ private void SubmitCompleted(SubmitOperation result)
12381238
if (v is t_Element)
12391239
{
12401240
t_Element vobj = (t_Element)v;
1241+
1242+
1243+
12411244
foreach (t_ElementProperty ep in listMonitorAddElement[AddElementNumber].ListElementProp)
12421245
{
12431246
ep.ElementID = vobj.ElementID;

‎MonitorSystem/MainPage.xaml.cs‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using System;
1+
//using System;
22
using System.Collections.Generic;
33
using System.Linq;
44
using System.Net;
@@ -10,6 +10,7 @@
1010
using System.Windows.Media.Animation;
1111
using System.Windows.Shapes;
1212
using System.Windows.Browser;
13+
using MonitorSystem.Other;
1314

1415
namespace MonitorSystem
1516
{
@@ -22,6 +23,8 @@ public MainPage()
2223
if (HtmlPage.Document.QueryString.Count > 0)
2324
strWhere = HtmlPage.Document.QueryString["toWhere"];
2425

26+
//this.Content = new SilverlightControl1();
27+
//return;
2528
//this.Content = new SilverlightControl1();
2629
//return; toWhere=RealtimeCurve
2730
if (strWhere == "RealtimeCurve")

‎MonitorSystem/MonitorSystem.csproj‎

Lines changed: 31 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@
204204
<Compile Include="Gallery\Meter\Meter6.cs" />
205205
<Compile Include="Gallery\Meter\Meter7.cs" />
206206
<Compile Include="Gallery\Meter\Meter8.cs" />
207-
<Compile Include="Gallery\Meter\Meter9.cs" />
207+
<Compile Include="Gallery\Meter\Meter9.cs" />
208208
<Compile Include="Gallery\Meter\Meter10.cs" />
209209
<Compile Include="Gallery\Meter\Meter11.cs" />
210210
<Compile Include="Gallery\Meter\Meter12.cs" />
@@ -224,6 +224,20 @@
224224
<Compile Include="MonitorSystemGlobal\MonitorGrid.cs" />
225225
<Compile Include="MonitorSystemGlobal\MonitorRectangle.cs" />
226226
<Compile Include="Controls\PropertyGrid\ColorValueEditor.cs" />
227+
<Compile Include="Other\InputDilog.xaml.cs">
228+
<DependentUpon>InputDilog.xaml</DependentUpon>
229+
</Compile>
230+
<Compile Include="Other\InputObj.xaml.cs">
231+
<DependentUpon>InputObj.xaml</DependentUpon>
232+
</Compile>
233+
<Compile Include="Other\RealLineShow.cs" />
234+
<Compile Include="Other\RealtimeProperty.xaml.cs">
235+
<DependentUpon>RealtimeProperty.xaml</DependentUpon>
236+
</Compile>
237+
<Compile Include="Other\RealTimeT.xaml.cs">
238+
<DependentUpon>RealTimeT.xaml</DependentUpon>
239+
</Compile>
240+
<Compile Include="Other\RealTimeLineOR.cs" />
227241
<Compile Include="Property\ScreenCopy.xaml.cs">
228242
<DependentUpon>ScreenCopy.xaml</DependentUpon>
229243
</Compile>
@@ -376,6 +390,22 @@
376390
<SubType>Designer</SubType>
377391
<Generator>MSBuild:Compile</Generator>
378392
</Page>
393+
<Page Include="Other\InputDilog.xaml">
394+
<SubType>Designer</SubType>
395+
<Generator>MSBuild:Compile</Generator>
396+
</Page>
397+
<Page Include="Other\InputObj.xaml">
398+
<SubType>Designer</SubType>
399+
<Generator>MSBuild:Compile</Generator>
400+
</Page>
401+
<Page Include="Other\RealtimeProperty.xaml">
402+
<SubType>Designer</SubType>
403+
<Generator>MSBuild:Compile</Generator>
404+
</Page>
405+
<Page Include="Other\RealTimeT.xaml">
406+
<Generator>MSBuild:Compile</Generator>
407+
<SubType>Designer</SubType>
408+
</Page>
379409
<Page Include="Property\ScreenCopy.xaml">
380410
<SubType>Designer</SubType>
381411
<Generator>MSBuild:Compile</Generator>

‎MonitorSystem/Other/InputDilog.xaml‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<controls:ChildWindow x:Class="MonitorSystem.Other.InputDilog"
2+
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
3+
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
4+
xmlns:controls="clr-namespace:System.Windows.Controls;assembly=System.Windows.Controls"
5+
Width="402" Height="132"
6+
Title="数值输入" xmlns:sdk="http://schemas.microsoft.com/winfx/2006/xaml/presentation/sdk" Loaded="ChildWindow_Loaded">
7+
<Grid x:Name="LayoutRoot" Margin="2">
8+
<Grid.RowDefinitions>
9+
<RowDefinition />
10+
<RowDefinition Height="Auto" />
11+
</Grid.RowDefinitions>
12+
<TextBlock Text="请输入：" Margin="12,24,300,11"></TextBlock>
13+
<Button x:Name="CancelButton" Content="取消" Click="CancelButton_Click" Width="75" Height="23" HorizontalAlignment="Right" Margin="0,12,0,0" Grid.Row="1" />
14+
<Button x:Name="OKButton" Content="确定" Click="OKButton_Click" Width="75" Height="23" HorizontalAlignment="Right" Margin="0,12,79,0" Grid.Row="1" />
15+
<TextBox Height="23" HorizontalAlignment="Left" Margin="61,24,0,0" Name="txtValue" VerticalAlignment="Top" Width="307" />
16+
</Grid>
17+
</controls:ChildWindow>

0 commit comments

Comments
 (0)