gaofei/SGGL_HBAZ
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

大屏安全数据统计

Browse Source
This commit is contained in:
zonse
2025-04-17 15:01:42 +08:00
parent 7dafb37963
commit 00b7fe2e6d
8 changed files with 38 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/FineUIPro.Web.csproj
+5 -4
View File
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -12,7 +12,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>FineUIPro.Web</RootNamespace>
<AssemblyName>FineUIPro.Web</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
<UseIISExpress>true</UseIISExpress>
<SccProjectName>
</SccProjectName>
@@ -33,7 +33,7 @@
</FileUpgradeFlags>
<UpgradeBackupLocation>
</UpgradeBackupLocation>
<OldToolsVersion>12.0</OldToolsVersion>
<OldToolsVersion>Current</OldToolsVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -45,6 +45,7 @@
<WarningLevel>4</WarningLevel>
<PlatformTarget>AnyCPU</PlatformTarget>
<Prefer32Bit>false</Prefer32Bit>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
@@ -54,6 +55,7 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<PropertyGroup>
<SignAssembly>false</SignAssembly>
@@ -19736,7 +19738,6 @@
</FlavorProperties>
</VisualStudio>
</ProjectExtensions>
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v15.0\WebApplications\Microsoft.WebApplication.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
SGGL/FineUIPro.Web/common/main3.aspx
+1 -5
View File
@@ -481,18 +481,14 @@
var option = {
grid: {
containLabel: true,
top: 30,
left: 0,
height: 180,
},
xAxis: {
type: 'category',
data: tit,
/* axisTick: { alignWithLabel: true },*/
axisLabel: {
rotate: -25,
rotate: -30,
interval: 0,
textStyle: {
fontSize: 12,
SGGL/FineUIPro.Web/common/mainProject.aspx
+1 -4
View File
@@ -710,17 +710,14 @@
var option = {
grid: {
containLabel: true,
top: 30,
left: 0,
height: 220,
},
xAxis: {
type: 'category',
data: tit,
/* axisTick: { alignWithLabel: true },*/
axisLabel: {
rotate: -25,
rotate: -30,
interval: 0,
textStyle: {
fontSize: 12,
SGGL/FineUIPro.Web/common/mainProject.aspx.cs
+1 -6
View File
@@ -134,12 +134,7 @@ namespace FineUIPro.Web.common
join itm in Funs.DB.Inspect_InspectionItem on i.InspectionId equals itm.InspectionId
where i.ProblemTypeName != null && i.ProjectId == ProjectId && i.CreateTime > startd && i.CreateTime < endd && i.InspectType == "1"
group i by i.ProblemTypeName into g2
select new { type = g2.Key, count = g2.Count() })
.Union(from ins in Funs.DB.Inspect_Inspection
join itm in Funs.DB.Inspect_InspectionItem on ins.InspectionId equals itm.InspectionId
where ins.Place != null && ins.ProjectId == ProjectId && ins.CreateTime > startd && ins.CreateTime < endd && ins.InspectType == "1"
group ins by ins.Place into g3
select new { type = g3.Key, count = g3.Count() })).ToList();
select new { type = g2.Key, count = g2.Count() })).ToList();
return new