diff --git a/HT.Cloud.Code/HT.Cloud.Code.csproj b/HT.Cloud.Code/HT.Cloud.Code.csproj index b1ddb4b..b530757 100644 --- a/HT.Cloud.Code/HT.Cloud.Code.csproj +++ b/HT.Cloud.Code/HT.Cloud.Code.csproj @@ -35,8 +35,8 @@ - - + + @@ -45,9 +45,9 @@ - + - + diff --git a/HT.Cloud.CodeGenerator/HT.Cloud.CodeGenerator.csproj b/HT.Cloud.CodeGenerator/HT.Cloud.CodeGenerator.csproj index 40c607e..fc5cb9f 100644 --- a/HT.Cloud.CodeGenerator/HT.Cloud.CodeGenerator.csproj +++ b/HT.Cloud.CodeGenerator/HT.Cloud.CodeGenerator.csproj @@ -9,7 +9,7 @@ - + diff --git a/HT.Cloud.Data/HT.Cloud.DataBase.csproj b/HT.Cloud.Data/HT.Cloud.DataBase.csproj index b6552a8..666b91f 100644 --- a/HT.Cloud.Data/HT.Cloud.DataBase.csproj +++ b/HT.Cloud.Data/HT.Cloud.DataBase.csproj @@ -12,7 +12,7 @@ - + diff --git a/HT.Cloud.Domain/HT.Cloud.Domain.csproj b/HT.Cloud.Domain/HT.Cloud.Domain.csproj index dc89b2d..876c5c5 100644 --- a/HT.Cloud.Domain/HT.Cloud.Domain.csproj +++ b/HT.Cloud.Domain/HT.Cloud.Domain.csproj @@ -9,8 +9,8 @@ - - + + diff --git a/HT.Cloud.Web/Areas/PenMeiReportManage/Views/PenMeiHistoryOutPut/Index.cshtml b/HT.Cloud.Web/Areas/PenMeiReportManage/Views/PenMeiHistoryOutPut/Index.cshtml index a275def..4c8b275 100644 --- a/HT.Cloud.Web/Areas/PenMeiReportManage/Views/PenMeiHistoryOutPut/Index.cshtml +++ b/HT.Cloud.Web/Areas/PenMeiReportManage/Views/PenMeiHistoryOutPut/Index.cshtml @@ -119,7 +119,7 @@ -
+ @*
-
+ *@
@@ -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"); //标记该行的背景色 + } + + }); + } }); diff --git a/HT.Cloud.Web/Views/Home/Default.cshtml b/HT.Cloud.Web/Views/Home/Default.cshtml index 2c91caa..5121642 100644 --- a/HT.Cloud.Web/Views/Home/Default.cshtml +++ b/HT.Cloud.Web/Views/Home/Default.cshtml @@ -170,7 +170,7 @@
-
+
@@ -274,6 +274,102 @@
+
+
+
+
+
+
+
+

+
+
+
+
+
+
+
+
+
+
+
+

+
+
+
+
+
+
+
+
+
+
+
+

+
+
+
+
+
+
+
+
+
+
+
+

+
+
+
+
+
+
+
+
+
+
+
+

+
+
+
+
+
+
+
+
+
+
+
+

+
+
+
+
+
+
+
+
+
+
+
+

+
+
+
+
+
+
+
+
+
+
+
+

+
+
+
+
@@ -283,117 +379,38 @@
生产统计
-
+
-
+
-
运行状态
+
最近重点告警
-
+ @*
*@
-
-
-
-
-
-
-
-

-
-
-
-
-
-
-
-
-
-
-
-

-
-
-
-
-
-
-
-
-
-
-
-

-
-
-
-
-
-
-
-
-
-
-
-

-
-
-
-
-
-
-
-
-
-
-
-

-
-
-
-
-
-
-
-
-
-
-
-

-
-
-
-
-
-
-
-
-
-
-
-

-
-
-
-
-
-
-
-
-
-
-
-

-
-
-
-
+ + +
+ + @*
*@ +
+
+
+
近期重点告警
+
+ @*
*@ +
+ + +
+ + @*
*@
@@ -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"]; diff --git a/HT.Cloud.Web/wwwroot/file/PrintApp.zip b/HT.Cloud.Web/wwwroot/file/PrintApp.zip index 910c25d..d850c43 100644 Binary files a/HT.Cloud.Web/wwwroot/file/PrintApp.zip and b/HT.Cloud.Web/wwwroot/file/PrintApp.zip differ