diff --git a/HT.Cloud.Web/Areas/DevicesManage/Views/MetaTag/Index.cshtml b/HT.Cloud.Web/Areas/DevicesManage/Views/MetaTag/Index.cshtml index d2fd91f..8857620 100644 --- a/HT.Cloud.Web/Areas/DevicesManage/Views/MetaTag/Index.cshtml +++ b/HT.Cloud.Web/Areas/DevicesManage/Views/MetaTag/Index.cshtml @@ -99,6 +99,7 @@ document.getElementById('Rack_Siemens').value = redata.Rack; document.getElementById('Slot_Siemens').value = redata.Slot; document.getElementById('TimeOut_Siemens').value = redata.TimeOut; + document.getElementById('Alias_Siemens').value = redata.Alias; //document.getElementById('PLCType_Siemens').value = redata.PLCType; select_value("PLCType_Siemens", redata.PLCType); } @@ -278,6 +279,12 @@ +
+ +
+ +
+
diff --git a/HT.Cloud.Web/Areas/ReportManage/Views/HistoryReport/Index.cshtml b/HT.Cloud.Web/Areas/ReportManage/Views/HistoryReport/Index.cshtml index 201955b..c4606d6 100644 --- a/HT.Cloud.Web/Areas/ReportManage/Views/HistoryReport/Index.cshtml +++ b/HT.Cloud.Web/Areas/ReportManage/Views/HistoryReport/Index.cshtml @@ -14,6 +14,10 @@ 表单设计器代码 + @@ -22,10 +26,10 @@ -
-
+
+
+ data-tag="grid" data-index="0" style="height:100%">
@@ -106,11 +110,13 @@
-
-
-
-
-
+ @*
*@ + @*
+
+
*@ +
+
+ @*
*@
@@ -355,17 +361,70 @@ ); // 合并单元格 - handler.mergeTable(workbook, true); + //handler.mergeTable(workbook, true); staticToLayTable(); completeLoading(); }, // csv 数据转换为 table csv2table(csv, showTab = false) { - var html = ""; + var html = "
";// class=\"layui-table\" lay-data=\"{报表数据}\" var rows = csv.split("\n"); debugger; rows.pop(); // 最后一行没用的 + + var oneheadarray = rows[0].split(","); + var onehead = new Array(); + var oneheadlength = new Array(); + var marge = 0; + oneheadarray.forEach(function (onestring,oneid){ + if(onestring!=""){ + if(oneid == 0){ + onehead.push(onestring); + }else{ + oneheadlength.push(marge+1); + marge = 0; + onehead.push(onestring); + } + + }else{ + marge++; + if(oneid == (oneheadarray.length-1)){ + oneheadlength.push(marge + 1); + } + } + }); + + var twoheadarray = rows[1].split(","); + + html +=""; + html+=""; + onehead.forEach(function(head,hid){ + let colspan = oneheadlength[hid]; + if(colspan == 1){ + html += ""; + }else{ + html += ""; + } + + }); + html+=""; + + html += "";// + twoheadarray.forEach(function (dhead, did) { + if(did == 0){ + html += "";// + }else{ + html += "";// + } + + }); + html += ""; + html+=""; + + rows.shift(); + rows.shift(); + html += ""; rows.forEach(function (row, idx) { var columns = row.split(","); @@ -449,9 +508,41 @@ //转换静态表格 table.init('tdemo', { + page:true, + limit:17, //height: 315 //设置高度 - //, limit: 10 //注意：请务必确保 limit 参数（默认：10）是与你服务端限定的数据条数一致 + //limit: 10 //注意：请务必确保 limit 参数（默认：10）是与你服务端限定的数据条数一致 //支持所有基础参数 + + done:function(res,curr,count){ + // console.log(res) + //解决操作栏因为内容过多换行问题 + $(".layui-table-main tr").each(function (index, val) { + $($(".layui-table-fixed-l .layui-table-body tbody tr")[index]).height($(val).height()); + $($(".layui-table-fixed-r .layui-table-body tbody tr")[index]).height($(val).height()); + }); + //解决fixed固定，而导致的th高度不一致 + $(".layui-table-header tr").each(function (index, val) { + $(".layui-table-fixed").each(function () { + $($(this).find(".layui-table-header thead th")[index]).height($(val).height()); + }); + }); + $(".layui-table-header tr").each(function (index, val) { + $(".layui-table-fixed").each(function () { + $($(this).find(".layui-table-header thead tr")[index]).height($(val).height()); + }); + }); + $(".layui-table-main tr").each(function (index, val) { + $(".layui-table-fixed").each(function () { + $($(this).find(".layui-table-body tbody tr")[index]).height($(val).height()); + }); + }); + $(".layui-table-main tr").each(function (index, val) { + $(".layui-table-fixed").each(function () { + $($(this).find(".layui-table-body tbody th")[index]).height($(val).height()); + }); + }); + } }); } diff --git a/HT.Cloud.Web/wwwroot/report/Report20230224112051.xlsx b/HT.Cloud.Web/wwwroot/report/Report20230224112051.xlsx deleted file mode 100644 index cece1e5..0000000 Binary files a/HT.Cloud.Web/wwwroot/report/Report20230224112051.xlsx and /dev/null differ diff --git a/HT.Cloud.Web/wwwroot/report/Report20230224112321.xlsx b/HT.Cloud.Web/wwwroot/report/Report20230224112321.xlsx deleted file mode 100644 index 39515da..0000000 Binary files a/HT.Cloud.Web/wwwroot/report/Report20230224112321.xlsx and /dev/null differ diff --git a/HT.Cloud.Web/wwwroot/report/Report20230224112419.xlsx b/HT.Cloud.Web/wwwroot/report/Report20230224112419.xlsx deleted file mode 100644 index 75d8889..0000000 Binary files a/HT.Cloud.Web/wwwroot/report/Report20230224112419.xlsx and /dev/null differ diff --git a/HT.Cloud.Web/wwwroot/report/Report20230224112611.xlsx b/HT.Cloud.Web/wwwroot/report/Report20230224112611.xlsx deleted file mode 100644 index e8fedc2..0000000 Binary files a/HT.Cloud.Web/wwwroot/report/Report20230224112611.xlsx and /dev/null differ diff --git a/HT.Cloud.Web/wwwroot/report/Report20230224112739.xlsx b/HT.Cloud.Web/wwwroot/report/Report20230224112739.xlsx deleted file mode 100644 index d7f7b43..0000000 Binary files a/HT.Cloud.Web/wwwroot/report/Report20230224112739.xlsx and /dev/null differ diff --git a/HT.Cloud.Web/wwwroot/report/Report20230227100716.xlsx b/HT.Cloud.Web/wwwroot/report/Report20230227100716.xlsx deleted file mode 100644 index aff6e83..0000000 Binary files a/HT.Cloud.Web/wwwroot/report/Report20230227100716.xlsx and /dev/null differ diff --git a/HT.Cloud.Web/wwwroot/report/Report20230228100321.xlsx b/HT.Cloud.Web/wwwroot/report/Report20230228100321.xlsx deleted file mode 100644 index ab08c1d..0000000 Binary files a/HT.Cloud.Web/wwwroot/report/Report20230228100321.xlsx and /dev/null differ diff --git a/HT.Cloud.Web/wwwroot/report/Report20230228100756.xlsx b/HT.Cloud.Web/wwwroot/report/Report20230228100756.xlsx deleted file mode 100644 index 7c0720f..0000000 Binary files a/HT.Cloud.Web/wwwroot/report/Report20230228100756.xlsx and /dev/null differ diff --git a/HT.Cloud.Web/wwwroot/report/Report20230228144435.xlsx b/HT.Cloud.Web/wwwroot/report/Report20230228144435.xlsx deleted file mode 100644 index aea804a..0000000 Binary files a/HT.Cloud.Web/wwwroot/report/Report20230228144435.xlsx and /dev/null differ diff --git a/HT.Cloud.Web/wwwroot/report/Report20230303111710.xlsx b/HT.Cloud.Web/wwwroot/report/Report20230303111710.xlsx deleted file mode 100644 index b759ad6..0000000 Binary files a/HT.Cloud.Web/wwwroot/report/Report20230303111710.xlsx and /dev/null differ diff --git a/HT.Cloud.Web/wwwroot/report/Report20230320150308.xlsx b/HT.Cloud.Web/wwwroot/report/Report20230320150308.xlsx deleted file mode 100644 index e394305..0000000 Binary files a/HT.Cloud.Web/wwwroot/report/Report20230320150308.xlsx and /dev/null differ diff --git a/HT.Cloud.Web/wwwroot/report/Report20230320153457.xlsx b/HT.Cloud.Web/wwwroot/report/Report20230320153457.xlsx deleted file mode 100644 index 229a0c9..0000000 Binary files a/HT.Cloud.Web/wwwroot/report/Report20230320153457.xlsx and /dev/null differ diff --git a/HT.Cloud.Web/wwwroot/report/Report20230320153752.xlsx b/HT.Cloud.Web/wwwroot/report/Report20230320153752.xlsx deleted file mode 100644 index 8d1a6c7..0000000 Binary files a/HT.Cloud.Web/wwwroot/report/Report20230320153752.xlsx and /dev/null differ diff --git a/HT.Cloud.Web/wwwroot/report/Report20230320153820.xlsx b/HT.Cloud.Web/wwwroot/report/Report20230320153820.xlsx deleted file mode 100644 index e7e7d56..0000000 Binary files a/HT.Cloud.Web/wwwroot/report/Report20230320153820.xlsx and /dev/null differ diff --git a/HT.Cloud.Web/wwwroot/report/Report20230320153843.xlsx b/HT.Cloud.Web/wwwroot/report/Report20230320153843.xlsx deleted file mode 100644 index f6708a0..0000000 Binary files a/HT.Cloud.Web/wwwroot/report/Report20230320153843.xlsx and /dev/null differ diff --git a/HT.Cloud.Web/wwwroot/report/Report20230320154653.xlsx b/HT.Cloud.Web/wwwroot/report/Report20230320154653.xlsx deleted file mode 100644 index 820c6c2..0000000 Binary files a/HT.Cloud.Web/wwwroot/report/Report20230320154653.xlsx and /dev/null differ diff --git a/HT.Cloud.Web/wwwroot/report/Report20230320154836.xlsx b/HT.Cloud.Web/wwwroot/report/Report20230320154836.xlsx deleted file mode 100644 index 00c2ab9..0000000 Binary files a/HT.Cloud.Web/wwwroot/report/Report20230320154836.xlsx and /dev/null differ diff --git a/HT.Cloud.Web/wwwroot/report/Report20230322154508.xlsx b/HT.Cloud.Web/wwwroot/report/Report20230322154508.xlsx deleted file mode 100644 index e4943d3..0000000 Binary files a/HT.Cloud.Web/wwwroot/report/Report20230322154508.xlsx and /dev/null differ diff --git a/HT.Cloud.Web/wwwroot/report/Report20230322154541.xlsx b/HT.Cloud.Web/wwwroot/report/Report20230322154541.xlsx deleted file mode 100644 index 6e53714..0000000 Binary files a/HT.Cloud.Web/wwwroot/report/Report20230322154541.xlsx and /dev/null differ diff --git a/HT.Cloud.Web/wwwroot/report/Report20230322154920.xlsx b/HT.Cloud.Web/wwwroot/report/Report20230322154920.xlsx deleted file mode 100644 index 0b055d8..0000000 Binary files a/HT.Cloud.Web/wwwroot/report/Report20230322154920.xlsx and /dev/null differ diff --git a/HT.Cloud.Web/wwwroot/report/Report20230322155021.xlsx b/HT.Cloud.Web/wwwroot/report/Report20230322155021.xlsx deleted file mode 100644 index c46e106..0000000 Binary files a/HT.Cloud.Web/wwwroot/report/Report20230322155021.xlsx and /dev/null differ diff --git a/HT.Cloud.Web/wwwroot/report/Report20230323104713.xlsx b/HT.Cloud.Web/wwwroot/report/Report20230323104713.xlsx deleted file mode 100644 index db033c7..0000000 Binary files a/HT.Cloud.Web/wwwroot/report/Report20230323104713.xlsx and /dev/null differ diff --git a/HT.Cloud.Web/wwwroot/report/Report20230323104757.xlsx b/HT.Cloud.Web/wwwroot/report/Report20230323104757.xlsx deleted file mode 100644 index 20a7403..0000000 Binary files a/HT.Cloud.Web/wwwroot/report/Report20230323104757.xlsx and /dev/null differ diff --git a/HT.Cloud.Web/wwwroot/report/Report20230323105032.xlsx b/HT.Cloud.Web/wwwroot/report/Report20230323105032.xlsx deleted file mode 100644 index 25fbae9..0000000 Binary files a/HT.Cloud.Web/wwwroot/report/Report20230323105032.xlsx and /dev/null differ diff --git a/HT.Cloud.Web/wwwroot/report/Report20230323105506.xlsx b/HT.Cloud.Web/wwwroot/report/Report20230323105506.xlsx deleted file mode 100644 index 7c3a053..0000000 Binary files a/HT.Cloud.Web/wwwroot/report/Report20230323105506.xlsx and /dev/null differ diff --git a/HT.Cloud.Web/wwwroot/report/Report20230323105527.xlsx b/HT.Cloud.Web/wwwroot/report/Report20230323105527.xlsx deleted file mode 100644 index 7f3ba1d..0000000 Binary files a/HT.Cloud.Web/wwwroot/report/Report20230323105527.xlsx and /dev/null differ diff --git a/HT.Cloud.Web/wwwroot/report/Report20230323105608.xlsx b/HT.Cloud.Web/wwwroot/report/Report20230323105608.xlsx deleted file mode 100644 index 52ee78a..0000000 Binary files a/HT.Cloud.Web/wwwroot/report/Report20230323105608.xlsx and /dev/null differ diff --git a/HT.Cloud.Web/wwwroot/report/Report20230323110004.xlsx b/HT.Cloud.Web/wwwroot/report/Report20230323110004.xlsx deleted file mode 100644 index c44be56..0000000 Binary files a/HT.Cloud.Web/wwwroot/report/Report20230323110004.xlsx and /dev/null differ diff --git a/HT.Cloud.Web/wwwroot/report/Report20230323110439.xlsx b/HT.Cloud.Web/wwwroot/report/Report20230323110439.xlsx deleted file mode 100644 index 88428f8..0000000 Binary files a/HT.Cloud.Web/wwwroot/report/Report20230323110439.xlsx and /dev/null differ diff --git a/HT.Cloud.Web/wwwroot/report/Report20230323111301.xlsx b/HT.Cloud.Web/wwwroot/report/Report20230323111301.xlsx deleted file mode 100644 index 1847ce3..0000000 Binary files a/HT.Cloud.Web/wwwroot/report/Report20230323111301.xlsx and /dev/null differ diff --git a/HT.Cloud.Web/wwwroot/report/Report20230323111342.xlsx b/HT.Cloud.Web/wwwroot/report/Report20230323111342.xlsx deleted file mode 100644 index 0a40238..0000000 Binary files a/HT.Cloud.Web/wwwroot/report/Report20230323111342.xlsx and /dev/null differ diff --git a/HT.Cloud.Web/wwwroot/report/Report20230323111754.xlsx b/HT.Cloud.Web/wwwroot/report/Report20230323111754.xlsx deleted file mode 100644 index 9f8570e..0000000 Binary files a/HT.Cloud.Web/wwwroot/report/Report20230323111754.xlsx and /dev/null differ diff --git a/HT.Cloud.Web/wwwroot/report/Report20230323111814.xlsx b/HT.Cloud.Web/wwwroot/report/Report20230323111814.xlsx deleted file mode 100644 index 2ebcae1..0000000 Binary files a/HT.Cloud.Web/wwwroot/report/Report20230323111814.xlsx and /dev/null differ diff --git a/HT.Cloud.Web/wwwroot/report/Report20230323112519.xlsx b/HT.Cloud.Web/wwwroot/report/Report20230323112519.xlsx deleted file mode 100644 index 286bbc6..0000000 Binary files a/HT.Cloud.Web/wwwroot/report/Report20230323112519.xlsx and /dev/null differ diff --git a/HT.Cloud.Web/wwwroot/report/Report20230323112610.xlsx b/HT.Cloud.Web/wwwroot/report/Report20230323112610.xlsx deleted file mode 100644 index 491003d..0000000 Binary files a/HT.Cloud.Web/wwwroot/report/Report20230323112610.xlsx and /dev/null differ diff --git a/HT.Cloud.Web/wwwroot/report/Report20230323134220.xlsx b/HT.Cloud.Web/wwwroot/report/Report20230323134220.xlsx deleted file mode 100644 index 3fde3fc..0000000 Binary files a/HT.Cloud.Web/wwwroot/report/Report20230323134220.xlsx and /dev/null differ diff --git a/HT.Cloud.Web/wwwroot/report/Report20230323134313.xlsx b/HT.Cloud.Web/wwwroot/report/Report20230323134313.xlsx deleted file mode 100644 index bacd802..0000000 Binary files a/HT.Cloud.Web/wwwroot/report/Report20230323134313.xlsx and /dev/null differ diff --git a/HT.Cloud.Web/wwwroot/report/Report20230323134359.xlsx b/HT.Cloud.Web/wwwroot/report/Report20230323134359.xlsx deleted file mode 100644 index fd5e70b..0000000 Binary files a/HT.Cloud.Web/wwwroot/report/Report20230323134359.xlsx and /dev/null differ diff --git a/HT.Cloud.Web/wwwroot/report/Report20230323135035.xlsx b/HT.Cloud.Web/wwwroot/report/Report20230323135035.xlsx deleted file mode 100644 index 0536ef5..0000000 Binary files a/HT.Cloud.Web/wwwroot/report/Report20230323135035.xlsx and /dev/null differ diff --git a/HT.Cloud.Web/wwwroot/report/Report20230323231401.xlsx b/HT.Cloud.Web/wwwroot/report/Report20230323231401.xlsx new file mode 100644 index 0000000..c527120 Binary files /dev/null and b/HT.Cloud.Web/wwwroot/report/Report20230323231401.xlsx differ diff --git a/HT.Cloud.Web/wwwroot/report/Report20230323232125.xlsx b/HT.Cloud.Web/wwwroot/report/Report20230323232125.xlsx new file mode 100644 index 0000000..a9b8409 Binary files /dev/null and b/HT.Cloud.Web/wwwroot/report/Report20230323232125.xlsx differ
" + head + ""+head+"
" + dhead + "" + dhead + "