cdl/HTCloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

备份修改

Browse Source
This commit is contained in:
dell
2024-11-13 09:52:59 +08:00
parent b684f2501e
commit 08a59bd2a3
7 changed files with 275 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
HT.Cloud.Code/HT.Cloud.Code.csproj
View File

@ -35,8 +35,8 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Autofac" Version="6.5.0" />
<PackageReference Include="AutoMapper" Version="12.0.0" />
<PackageReference Include="Autofac" Version="7.0.0" />
<PackageReference Include="AutoMapper" Version="12.0.1" />
<PackageReference Include="CSRedisCore" Version="3.8.670" />
<PackageReference Include="iTextSharp.LGPLv2.Core.Fix" Version="1.4.3" />
<PackageReference Include="Microsoft.AspNetCore.Html.Abstractions" Version="2.2.0" />
@ -45,9 +45,9 @@
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.DependencyModel" Version="7.0.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="Serenity.Web" Version="3.14.5" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.4.0" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
<PackageReference Include="System.Drawing.Common" Version="7.0.0" />
<PackageReference Include="ZKWeb.System.Drawing" Version="4.0.1" />
<PackageReference Include="RabbitMQ.Client" Version="6.4.0" />

2
HT.Cloud.CodeGenerator/HT.Cloud.CodeGenerator.csproj
View File

@ -9,7 +9,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="SqlSugarCoreNoDrive" Version="5.1.3.45" />
<PackageReference Include="SqlSugarCoreNoDrive" Version="5.1.4.59" />
</ItemGroup>
<ItemGroup>

2
HT.Cloud.Data/HT.Cloud.DataBase.csproj
View File

@ -12,7 +12,7 @@
<PackageReference Include="Microsoft.Data.SqlClient" Version="5.1.0" />
<PackageReference Include="MySqlConnector" Version="2.2.5" />
<PackageReference Include="Npgsql" Version="5.0.7" />
<PackageReference Include="SqlSugarCoreNoDrive" Version="5.1.3.45" />
<PackageReference Include="SqlSugarCoreNoDrive" Version="5.1.4.59" />
</ItemGroup>
<ItemGroup>

4
HT.Cloud.Domain/HT.Cloud.Domain.csproj
View File

@ -9,8 +9,8 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="MiniExcel" Version="1.30.0" />
<PackageReference Include="SqlSugarCoreNoDrive" Version="5.1.3.45" />
<PackageReference Include="MiniExcel" Version="1.30.2" />
<PackageReference Include="SqlSugarCoreNoDrive" Version="5.1.4.59" />
</ItemGroup>
<ItemGroup>

60
HT.Cloud.Web/Areas/PenMeiReportManage/Views/PenMeiHistoryOutPut/Index.cshtml
View File

@ -119,7 +119,7 @@
</div>
</div>
</div>
<div class="layui-col-md2 widget-col-list column2" data-index="3" data-parentindex="0">
@* <div class="layui-col-md2 widget-col-list column2" data-index="3" data-parentindex="0">
<div id="select_4" class="layui-form-item active" data-id="select_4" data-tag="select"
data-index="0">
<label class="layui-form-label layui-form-required" style="width: 110px;">
@ -154,7 +154,7 @@
</select>
</div>
</div>
</div>
</div> *@
<div class="layui-col-md1 widget-col-list column3" data-index="4" data-parentindex="0">
<div id="bottom_5" class="layui-form-item active" data-id="bottom_5" data-tag="bottom"
data-index="0">
@ -982,11 +982,65 @@
"OUT": "5.68",
"TimeZone": "峰电",
},],
// rowStyle: function (row, index) {
// var style = ''; // 初始化样式变量
// // 根据业务逻辑设置颜色
// if (row.data.TimeZone == '平电') { // 替换 yourCondition 为你的条件判断
// style = 'color: #fff; background-color: #ff5722;'; // 例如设置为橙色
// } else if (row.data.TimeZone == '谷电') {
// style = 'color: #fff; background-color: #ff5722;'; // 例如设置为橙色
// }
// return style;
// },
//skin: 'line', // 表格风格
//even: true,
height: 765,
scrollY: true,
page: false, // 是否显示分页
limits: [5, 10, 15],
limit: 24 // 每页默认显示的数量
limit: 24, // 每页默认显示的数量
done: function (res, curr, count, origin) {
// var style = ''; // 初始化样式变量
// // 根据业务逻辑设置颜色
// if (row.data.TimeZone == '平电') { // 替换 yourCondition 为你的条件判断
// style = 'color: #fff; background-color: #ff5722;'; // 例如设置为橙色
// } else if (row.data.TimeZone == '谷电') {
// style = 'color: #fff; background-color: #ff5722;'; // 例如设置为橙色
// }
// return style;
res.data.forEach(function (item, index) { //循环数据
if (item.TimeZone == '平电') { //当数据id为1时
var tr = $(".layui-table").find("tbody tr[data-index='" + index + "']"); //查找某一行的数据
tr.css("background-color", "#73C0DE"); //标记该行的背景色
// 给1-0-9列添加样式
// tr.find(".laytable-cell-1-0-9").css("color", "red"); //标记该行某一列的颜色
} else if(item.TimeZone == '尖电') {
var tr = $(".layui-table").find("tbody tr[data-index='" + index + "']"); //查找某一行的数据
tr.css("background-color", "#EE6666"); //标记该行的背景色
} else if (item.TimeZone == '峰电') {
var tr = $(".layui-table").find("tbody tr[data-index='" + index + "']"); //查找某一行的数据
tr.css("background-color", "#FAC858"); //标记该行的背景色
} else if (item.TimeZone == '平电') {
var tr = $(".layui-table").find("tbody tr[data-index='" + index + "']"); //查找某一行的数据
tr.css("background-color", "#73C0DE"); //标记该行的背景色
} else if (item.TimeZone == '谷电') {
var tr = $(".layui-table").find("tbody tr[data-index='" + index + "']"); //查找某一行的数据
tr.css("background-color", "#3FB17C"); //标记该行的背景色
}
});
}
});

312
HT.Cloud.Web/Views/Home/Default.cshtml
View File

@ -170,7 +170,7 @@
<div class="layuimini-container">
<div class="layuimini-main">
<div class="layui-row layui-col-space15">
<div class="layui-col-md10">
<div class="layui-col-md9">
<div class="layui-row layui-col-space15">
<div class="layui-col-md12">
<div class="layui-card">
@ -274,6 +274,102 @@
</div>
</div>
</div>
<div class="layui-col-xs3">
<div class="panel layui-bg-number">
<div class="panel-body">
<div class="panel-title">
<h5 id="S1_Title"></h5>
</div>
<div class="panel-content">
<h1 class="no-margins" id="S1"></h1>
</div>
</div>
</div>
</div>
<div class="layui-col-xs3">
<div class="panel layui-bg-number">
<div class="panel-body">
<div class="panel-title">
<h5 id="S2_Title"></h5>
</div>
<div class="panel-content">
<h1 class="no-margins" id="S2"></h1>
</div>
</div>
</div>
</div>
<div class="layui-col-xs3">
<div class="panel layui-bg-number">
<div class="panel-body">
<div class="panel-title">
<h5 id="S3_Title"></h5>
</div>
<div class="panel-content">
<h1 class="no-margins" id="S3"></h1>
</div>
</div>
</div>
</div>
<div class="layui-col-xs3">
<div class="panel layui-bg-number">
<div class="panel-body">
<div class="panel-title">
<h5 id="S4_Title"></h5>
</div>
<div class="panel-content">
<h1 class="no-margins" id="S4"></h1>
</div>
</div>
</div>
</div>
<div class="layui-col-xs3">
<div class="panel layui-bg-number">
<div class="panel-body">
<div class="panel-title">
<h5 id="S5_Title"></h5>
</div>
<div class="panel-content">
<h1 class="no-margins" id="S5"></h1>
</div>
</div>
</div>
</div>
<div class="layui-col-xs3">
<div class="panel layui-bg-number">
<div class="panel-body">
<div class="panel-title">
<h5 id="S6_Title"></h5>
</div>
<div class="panel-content">
<h1 class="no-margins" id="S6"></h1>
</div>
</div>
</div>
</div>
<div class="layui-col-xs3">
<div class="panel layui-bg-number">
<div class="panel-body">
<div class="panel-title">
<h5 id="S7_Title"></h5>
</div>
<div class="panel-content">
<h1 class="no-margins" id="S7"></h1>
</div>
</div>
</div>
</div>
<div class="layui-col-xs3">
<div class="panel layui-bg-number">
<div class="panel-body">
<div class="panel-title">
<h5 id="S8_Title"></h5>
</div>
<div class="panel-content">
<h1 class="no-margins" id="S8"></h1>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
@ -283,117 +379,38 @@
<div class="layui-card">
<div class="layui-card-header"><i class="fa fa-line-chart icon"></i>生产统计</div>
<div class="layui-card-body">
<div id="echarts-records" style="width: 100%;min-height:500px"></div>
<div id="echarts-records" style="width: 100%;min-height:400px"></div>
</div>
</div>
</div>
</div>
</div>
<div class="layui-col-md2">
<div class="layui-col-md3">
<div class="layui-col-md12">
<div class="layui-card">
<div class="layui-card-header"><i class="fa fa-warning icon"></i>运行状态</div>
<div class="layui-card-header"><i class="fa fa-warning icon"></i>最近重点告警</div>
<div class="layui-card-body">
<div class="welcome-module">
@* <div class="welcome-module"> *@
<div class="layui-row layui-col-space10">
<div class="layui-col-xs12">
<div class="panel layui-bg-number">
<div class="panel-body">
<div class="panel-title">
<h5 id="S1_Title"></h5>
</div>
<div class="panel-content">
<h1 class="no-margins" id="S1"></h1>
</div>
</div>
</div>
</div>
<div class="layui-col-xs12">
<div class="panel layui-bg-number">
<div class="panel-body">
<div class="panel-title">
<h5 id="S2_Title"></h5>
</div>
<div class="panel-content">
<h1 class="no-margins" id="S2"></h1>
</div>
</div>
</div>
</div>
<div class="layui-col-xs12">
<div class="panel layui-bg-number">
<div class="panel-body">
<div class="panel-title">
<h5 id="S3_Title"></h5>
</div>
<div class="panel-content">
<h1 class="no-margins" id="S3"></h1>
</div>
</div>
</div>
</div>
<div class="layui-col-xs12">
<div class="panel layui-bg-number">
<div class="panel-body">
<div class="panel-title">
<h5 id="S4_Title"></h5>
</div>
<div class="panel-content">
<h1 class="no-margins" id="S4"></h1>
</div>
</div>
</div>
</div>
<div class="layui-col-xs12">
<div class="panel layui-bg-number">
<div class="panel-body">
<div class="panel-title">
<h5 id="S5_Title"></h5>
</div>
<div class="panel-content">
<h1 class="no-margins" id="S5"></h1>
</div>
</div>
</div>
</div>
<div class="layui-col-xs12">
<div class="panel layui-bg-number">
<div class="panel-body">
<div class="panel-title">
<h5 id="S6_Title"></h5>
</div>
<div class="panel-content">
<h1 class="no-margins" id="S6"></h1>
</div>
</div>
</div>
</div>
<div class="layui-col-xs12">
<div class="panel layui-bg-number">
<div class="panel-body">
<div class="panel-title">
<h5 id="S7_Title"></h5>
</div>
<div class="panel-content">
<h1 class="no-margins" id="S7"></h1>
</div>
</div>
</div>
</div>
<div class="layui-col-xs12">
<div class="panel layui-bg-number">
<div class="panel-body">
<div class="panel-title">
<h5 id="S8_Title"></h5>
</div>
<div class="panel-content">
<h1 class="no-margins" id="S8"></h1>
</div>
</div>
</div>
</div>
<table class="layui-table" id="tabletoday">
</table>
</div>
@* </div> *@
</div>
</div>
<div class="layui-card">
<div class="layui-card-header"><i class="fa fa-warning icon"></i>近期重点告警</div>
<div class="layui-card-body">
@* <div class="welcome-module"> *@
<div class="layui-row layui-col-space10">
<table class="layui-table" id="tableweek">
</table>
</div>
@* </div> *@
</div>
</div>
</div>
@ -495,12 +512,103 @@
});
}
layui.use(['layer', 'miniTab', 'common'], function () {
layui.use(['layer', 'miniTab', 'common','table'], function () {
var $ = layui.jquery,
layer = layui.layer,
miniTab = layui.miniTab,
table = layui.table,
common = layui.common;
var inst = table.render({
elem: '#tabletoday',
cols: [[ //标题栏
{ field: 'AlmName', title: '报警名称', minwidth: 150 },
{ field: 'AlmSys', title: '系统', width: 80 },
{ field: 'Frequency', title: '次数', width: 80 },
]],
data: [
{
"AlmName": "煤气压力高高高三级报警",
"AlmSys": "烟气",
"Frequency": "8",
},
{
"AlmName": "磨机进口压力高高高三级报警",
"AlmSys": "磨机",
"Frequency": "6",
},
{
"AlmName": "磨机进口温度高高高三级报警",
"AlmSys": "磨机",
"Frequency": "5",
},
{
"AlmName": "收粉器压差高高高三级报警",
"AlmSys": "收粉",
"Frequency": "3",
},
{
"AlmName": "煤粉仓氧浓度高高高三级报警",
"AlmSys": "收粉",
"Frequency": "3",
}
],
//skin: 'line', // 表格风格
//even: true,
height:350,
page: false, // 是否显示分页
limits: [5, 10, 15],
limit: 10 // 每页默认显示的数量
});
var inst2 = table.render({
elem: '#tableweek',
cols: [[ //标题栏
{ field: 'AlmName', title: '报警名称', minwidth: 150 },
{ field: 'AlmSys', title: '系统', width: 80 },
{ field: 'Frequency', title: '次数', width: 80 },
]],
data: [
{
"AlmName": "煤气压力高高高三级报警",
"AlmSys": "烟气",
"Frequency": "21",
},
{
"AlmName": "磨机进口压力高高高三级报警",
"AlmSys": "磨机",
"Frequency": "19",
},
{
"AlmName": "磨机进口温度高高高三级报警",
"AlmSys": "磨机",
"Frequency": "16",
},
{
"AlmName": "收粉器压差高高高三级报警",
"AlmSys": "收粉",
"Frequency": "14",
},
{
"AlmName": "煤粉仓氧浓度高高高三级报警",
"AlmSys": "收粉",
"Frequency": "8",
},
{
"AlmName": "原煤仓料位低低低三级报警",
"AlmSys": "收粉",
"Frequency": "4",
}
],
//skin: 'line', // 表格风格
//even: true,
height: 350,
page: false, // 是否显示分页
limits: [5, 10, 15],
limit: 10 // 每页默认显示的数量
});
var StaticChartList = new Array();
const CHARTSRGB = ["#8B2252", "#C65911", "#0000EE", "#00F5FF", "#00E5EE", "#27408B", "#FFD700", "#7FFFD4", "#B22222", "#EE7621", "#00C5CD", "#A0522D", "#1E90FF", "#00868B", "#8B4513", "#8B3A3A", "#CD6600", "#CD853F", "#EE7942"
, "#D2691E", "#8B008B", "#FFEC8B", "#8B4513", "#CDC673", "#EEEE00", "#FFA500", "#FFD966"];

BIN
HT.Cloud.Web/wwwroot/file/PrintApp.zip
View File

Binary file not shown.