Commit 379dca98 authored by 姜春辉's avatar 姜春辉

整理结构目录

parent a34f807c
Pipeline #390 canceled with stages
......@@ -151,8 +151,7 @@
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
<PostBuildEvent>del /q "$(TargetDir)*.pdb"
md "$(SolutionDir)$(SolutionName)\bin\Debug\Addons\GS.Terminal.DashBoard.Logic\DashBoards"
xcopy /s /e /y "$(ProjectDir)bin\debug" "$(SolutionDir)$(SolutionName)\Addons\GS.Terminal.DashBoard.Logic\DashBoards"</PostBuildEvent>
<PostBuildEvent>
</PostBuildEvent>
</PropertyGroup>
</Project>
\ No newline at end of file
......@@ -130,8 +130,7 @@
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
<PostBuildEvent>del /q "$(TargetDir)*.pdb"
md "$(SolutionDir)$(SolutionName)\bin\Debug\Addons\GS.Terminal.LogicShell\Views"
xcopy /s /e /y "$(ProjectDir)bin\debug" "$(SolutionDir)$(SolutionName)\Addons\GS.Terminal.LogicShell\Views"</PostBuildEvent>
<PostBuildEvent>
</PostBuildEvent>
</PropertyGroup>
</Project>
\ No newline at end of file
......@@ -93,7 +93,7 @@
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
<PostBuildEvent>del /q "$(TargetDir)*.pdb"
xcopy /s /e /y "$(ProjectDir)bin\debug" "$(SolutionDir)$(SolutionName)\Addons\GS.Terminal.LogicShell\ViewModels"</PostBuildEvent>
<PostBuildEvent>
</PostBuildEvent>
</PropertyGroup>
</Project>
\ No newline at end of file
......@@ -120,7 +120,7 @@
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
<PostBuildEvent>del /q "$(TargetDir)*.pdb"
xcopy /s /e /y "$(ProjectDir)bin\debug" "$(SolutionDir)$(SolutionName)\Addons\$(TargetName)"</PostBuildEvent>
<PostBuildEvent>
</PostBuildEvent>
</PropertyGroup>
</Project>
\ No newline at end of file
......@@ -67,11 +67,11 @@ namespace GS.Terminal.DashBoard.Logic
locator.Main.EnableCancelFullScreen = false;
locator.Main.ShowItem();
}
MainShellService.RegistBackgroundCommand("dashboard", () =>
{
LogicShellService.Show(locator.Main, arg => { dbc?.StartRefresh(); });
ThemeService.SetTheme("dashboard");
});
//MainShellService.RegistBackgroundCommand("dashboard", () =>
//{
LogicShellService.Show(locator.Main, arg => { dbc?.StartRefresh(); });
//ThemeService.SetTheme("dashboard");
//});
}
public void Stop(IAddonContext Context)
......
GS.Terminal.Console
\ No newline at end of file
<?xml version="1.0" encoding="utf-8" ?>
<Settings xmlns="urn:Chinags-Configuration" AddonName="GS.Terminal.Visitor.Logic">
<Dictionaries>
<Dict Caption="业务逻辑基本配置" Name="LogicConfig">
<Key Caption="界面切换的时间间隔(秒)" Choice="" Name="SwitchViewSecond" Value="30"/>
<Key Caption="是否显示菜单" Choice="" Name="ShowMenu" Value="true"/>
</Dict>
</Dictionaries>
<Structures>
<Structure Caption="仪表板配置" Name="DashBoardConfig">
<Declare>
<Property Caption="名称" Name="Name"/>
<Property Caption="ID" Name="DashBoardID"/>
<Property Caption="数据源地址" Name="Source"/>
<Property Caption="是否启用" Name="Enable"/>
<Property Caption="排序序号" Name="OrderIndex"/>
</Declare>
<Datas>
<!--班级考勤-->
<Data Name="班级考勤" DashBoardID="2434f42b-b9bf-4369-997d-88349e61572a" Source="http://192.168.1.5/Services/ClassAttendance/CourseAttendanceStatistics/Json" Enable="true" OrderIndex="1" />
<!--以下是可视化内容-->
<Data Name="学生在校状态" DashBoardID="28ef0db7-558f-4cb7-a1d3-afb0b5dc0623" Source="http://192.168.1.5/Services/HZEZDataSummary/SchoolAllStudentState/json" Enable="true" OrderIndex="1" />
<Data Name="房间预约" DashBoardID="dc9537ab-0480-45f0-a309-eec97b9fb734" Source="http://192.168.1.5/Services/HZEZDataSummary/SpecialClassroomOrderInfo/json" Enable="true" OrderIndex="2" />
<Data Name="宿舍状态" DashBoardID="f0eccb42-801c-462d-a98a-3de216314d51" Source="http://192.168.1.5/Services/HZEZDataSummary/GetSuSheData/json" Enable="true" OrderIndex="3" />
<Data Name="教师请假" DashBoardID="ddd2027a-d1d4-42ac-9313-8ce50d4b197f" Source="http://192.168.1.5/Services/HZEZDataSummary/TeacherLeaveList/json" Enable="true" OrderIndex="4" />
<Data Name="环境信息" DashBoardID="8a27048a-00ec-4906-8eb8-0fcd1d110436" Source="http://ykt.hz2hs.net.cn/Visualization/ClassNowEn.ashx" Enable="true" OrderIndex="5" />
</Datas>
</Structure>
</Structures>
</Settings>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8" ?>
<Settings xmlns="urn:Chinags-Configuration" AddonName="GS.Terminal.Visitor.Logic">
<Dictionaries>
<Dict Caption="业务逻辑基本配置" Name="LogicConfig">
<Key Caption="界面切换的时间间隔(秒)" Choice="" Name="SwitchViewSecond" Value="30"/>
<Key Caption="是否显示菜单" Choice="" Name="ShowMenu" Value="true"/>
</Dict>
</Dictionaries>
<Structures>
<Structure Caption="仪表板配置" Name="DashBoardConfig">
<Declare>
<Property Caption="名称" Name="Name"/>
<Property Caption="ID" Name="DashBoardID"/>
<Property Caption="数据源地址" Name="Source"/>
<Property Caption="是否启用" Name="Enable"/>
<Property Caption="排序序号" Name="OrderIndex"/>
</Declare>
<Datas>
<!--班级考勤-->
<Data Name="班级考勤" DashBoardID="2434f42b-b9bf-4369-997d-88349e61572a" Source="http://192.168.1.5/Services/ClassAttendance/CourseAttendanceStatistics/Json" Enable="true" OrderIndex="1" />
<!--以下是可视化内容-->
<Data Name="学生在校状态" DashBoardID="28ef0db7-558f-4cb7-a1d3-afb0b5dc0623" Source="http://192.168.1.5/Services/HZEZDataSummary/SchoolAllStudentState/json" Enable="false" OrderIndex="1" />
<Data Name="房间预约" DashBoardID="dc9537ab-0480-45f0-a309-eec97b9fb734" Source="http://192.168.1.5/Services/HZEZDataSummary/SpecialClassroomOrderInfo/json" Enable="false" OrderIndex="2" />
<Data Name="宿舍状态" DashBoardID="f0eccb42-801c-462d-a98a-3de216314d51" Source="http://192.168.1.5/Services/HZEZDataSummary/GetSuSheData/json" Enable="false" OrderIndex="3" />
<Data Name="教师请假" DashBoardID="ddd2027a-d1d4-42ac-9313-8ce50d4b197f" Source="http://192.168.1.5/Services/HZEZDataSummary/TeacherLeaveList/json" Enable="false" OrderIndex="4" />
<Data Name="环境信息" DashBoardID="8a27048a-00ec-4906-8eb8-0fcd1d110436" Source="http://ykt.hz2hs.net.cn/Visualization/ClassNowEn.ashx" Enable="false" OrderIndex="5" />
</Datas>
</Structure>
</Structures>
</Settings>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8" ?>
<Extensibility xmlns="urn:Chinags-Extensibility-1.0" Name="数据仪表板业务逻辑插件" SymbolicName="GS.Terminal.Visitor.Logic" Version="1.0.0.0" StartLevel="999">
<License>dWQFG13hw6Mb8GfKDzviapq6qiVcsWqKwbjZxONSxhqjn/Z/3S6tn/QCEhZv50Faa4lwGY1/O5O35ZrNfRtcgD4+JU31wIQGfl3oDUZzoJ4R7l4Ivlim/rdPZqJ33WX8o9/qfUbbSCmJx3eFe87UMkXaLE+5Xpp7x+QNx3TRle0=</License>
<Activator Type="GS.Terminal.DashBoard.Logic.Program"/>
<Runtime>
<Assembly Path="GS.Terminal.DashBoard.Logic.dll" Share="true"/>
</Runtime>
<ObjectSpaces>
<!--<Channel ConnectionName="sqlite" ModelAssembly="GS.Terminal.Visitor.db" Name="localdb"/>-->
</ObjectSpaces>
</Extensibility>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="System.Windows.Interactivity" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8" ?>
<Extensibility xmlns="urn:Chinags-Extensibility-1.0" Name="数据仪表板业务逻辑插件" SymbolicName="GS.Terminal.Visitor.Logic" Version="1.0.0.0" StartLevel="999">
<License>dWQFG13hw6Mb8GfKDzviapq6qiVcsWqKwbjZxONSxhqjn/Z/3S6tn/QCEhZv50Faa4lwGY1/O5O35ZrNfRtcgD4+JU31wIQGfl3oDUZzoJ4R7l4Ivlim/rdPZqJ33WX8o9/qfUbbSCmJx3eFe87UMkXaLE+5Xpp7x+QNx3TRle0=</License>
<Activator Type="GS.Terminal.DashBoard.Logic.Program"/>
<Runtime>
<Assembly Path="GS.Terminal.DashBoard.Logic.dll" Share="true"/>
</Runtime>
<ObjectSpaces>
<!--<Channel ConnectionName="sqlite" ModelAssembly="GS.Terminal.Visitor.db" Name="localdb"/>-->
</ObjectSpaces>
</Extensibility>
\ No newline at end of file
......@@ -198,36 +198,40 @@
<Link>Addons\GS.Terminal.Theme\Mapper.xml</Link>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="Addons\GS.Terminal.DashBoard.Logic\Config.xml">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<SubType>Designer</SubType>
</Content>
<Content Include="Addons\GS.Terminal.DashBoard.Logic\DashBoards\ClassAttendanceStatistics.dll">
<Content Include="..\ClassAttendanceStatistics\bin\Debug\ClassAttendanceStatistics.dll">
<Link>Addons\GS.Terminal.DashBoard.Logic\DashBoards\ClassAttendanceStatistics.dll</Link>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="Addons\GS.Terminal.DashBoard.Logic\DashBoards\DashBoard.ServiceModel.dll">
<Content Include="..\DashBoardViewModel\bin\Debug\DashBoardViewModel.dll">
<Link>Addons\GS.Terminal.LogicShell\ViewModels\DashBoardViewModel.dll</Link>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="Addons\GS.Terminal.DashBoard.Logic\DashBoards\SchoolSituation.dll">
<Content Include="..\DashBoardView\bin\Debug\DashBoardView.dll">
<Link>Addons\GS.Terminal.LogicShell\Views\DashBoardView.dll</Link>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="Addons\GS.Terminal.DashBoard.Logic\DashBoardViewModel.dll" />
<Content Include="Addons\GS.Terminal.DashBoard.Logic\GS.Terminal.Common.dll">
<Content Include="..\GS.Terminal.DashBoard.Logic\bin\Debug\Config.xml">
<Link>Addons\GS.Terminal.DashBoard.Logic\Config.xml</Link>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="Addons\GS.Terminal.DashBoard.Logic\GS.Terminal.DashBoard.Interface.dll">
<Content Include="..\GS.Terminal.DashBoard.Logic\bin\Debug\GS.Terminal.DashBoard.Interface.dll">
<Link>Addons\GS.Terminal.DashBoard.Logic\GS.Terminal.DashBoard.Interface.dll</Link>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="Addons\GS.Terminal.DashBoard.Logic\GS.Terminal.DashBoard.Logic.dll">
<Content Include="..\GS.Terminal.DashBoard.Logic\bin\Debug\GS.Terminal.DashBoard.Logic.dll">
<Link>Addons\GS.Terminal.DashBoard.Logic\GS.Terminal.DashBoard.Logic.dll</Link>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="Addons\GS.Terminal.DashBoard.Logic\Mapper.xml">
<Content Include="..\GS.Terminal.DashBoard.Logic\bin\Debug\Mapper.xml">
<Link>Addons\GS.Terminal.DashBoard.Logic\Mapper.xml</Link>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="Addons\GS.Terminal.LogicShell\ViewModels\DashBoardViewModel.dll">
<Content Include="..\SchoolSituation\bin\Debug\DashBoard.ServiceModel.dll">
<Link>Addons\GS.Terminal.DashBoard.Logic\DashBoards\DashBoard.ServiceModel.dll</Link>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="Addons\GS.Terminal.LogicShell\Views\DashBoardView.dll">
<Content Include="..\SchoolSituation\bin\Debug\SchoolSituation.dll">
<Link>Addons\GS.Terminal.DashBoard.Logic\DashBoards\SchoolSituation.dll</Link>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="Addons\GS.Terminal.MainShell\Images\logo.png">
......
......@@ -239,8 +239,7 @@
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
<PostBuildEvent>del /q "$(TargetDir)*.pdb"
md "$(SolutionDir)$(SolutionName)\bin\Debug\Addons\GS.Terminal.DashBoard.Logic\DashBoards"
xcopy /s /e /y "$(ProjectDir)bin\debug" "$(SolutionDir)$(SolutionName)\Addons\GS.Terminal.DashBoard.Logic\DashBoards"</PostBuildEvent>
<PostBuildEvent>
</PostBuildEvent>
</PropertyGroup>
</Project>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment