diff --git a/HT.Cloud.Domain/Entity/ReportManage/HistoryReportPathEntity.cs b/HT.Cloud.Domain/Entity/ReportManage/HistoryReportPathEntity.cs new file mode 100644 index 0000000..ea12e16 --- /dev/null +++ b/HT.Cloud.Domain/Entity/ReportManage/HistoryReportPathEntity.cs @@ -0,0 +1,30 @@ +using System; +using System.ComponentModel.DataAnnotations; +using SqlSugar; + +namespace HT.Cloud.Domain.Entity.ReportManage +{ + /// + /// 创 建：cdl + /// 日 期：2023-03-30 14:52 + /// 描 述：实时报表SQL转换实体类 + /// + [SugarTable("HT_HISTORY_REPORTPATH")] + [Tenant("1")] + public class HistoryReportPathEntity + { + + + /// + /// + /// + [SugarColumn(ColumnName = "ID", ColumnDescription = "", ColumnDataType = "int(10)")] + public int Id { get; set; } + /// + /// 显示名称 + /// + [SugarColumn(ColumnName = "ReportPath", ColumnDescription = "", ColumnDataType = "nvarchar(256)", IsNullable = true)] + public string ReportPath { get; set; } + + } +} diff --git a/HT.Cloud.Service/ReportManage/HistoryReportService.cs b/HT.Cloud.Service/ReportManage/HistoryReportService.cs index a1a8b19..7588f1a 100644 --- a/HT.Cloud.Service/ReportManage/HistoryReportService.cs +++ b/HT.Cloud.Service/ReportManage/HistoryReportService.cs @@ -21,6 +21,8 @@ using System.Data; using iTextSharp.text; using Serenity.Data; using Quartz; +using static iTextSharp.text.pdf.XfaForm; +using HT.Cloud.Domain.Entity.ReportManage; namespace HT.Cloud.Service.ReportManage { @@ -227,16 +229,20 @@ namespace HT.Cloud.Service.ReportManage public async Task GetReportDownLoad(DateTime startTime, DateTime endTime ,int interval, string systemName) { var groupName = _context.AsTenant().QueryableWithAttr().Where(x => x.GroupDescription == systemName).First().GroupName; + var driverId = _context.AsTenant().QueryableWithAttr().Where(x => x.GroupDescription == systemName).First().DriverID; + var driverName = _context.AsTenant().QueryableWithAttr().Where(x => x.DriverID == driverId).First().DriverName; + var list = _context.AsTenant().GetConnection(dataDBNumber).Ado.SqlQuery($"SELECT * FROM HT_{driverName}_{groupName}_REPORTPATH"); + var f3dpath = list.First().ReportPath; - var listSub = TimeInOneDay(startTime, endTime); + var listSub = TimeInOneDay(startTime, endTime); var pathroot = Directory.GetCurrentDirectory(); string fileurl = "报表 " + startTime.ToString("yyyy年MM月dd日 HH.mm.ss") + "至" + endTime.ToString("yyyy年MM月dd日 HH.mm.ss") + "(" + "时间间隔" + interval.ToString() + "秒" + ")" + "_" + DateTime.Now.ToString("yyyy年MM月dd日 HH.mm.ss") + "导出" + ".xlsx"; //var fileurl = $"电子报表2023_01_03_11_19_53.xlsx"; var path = pathroot + "\\wwwroot\\report\\" + fileurl;//{StartTime}-{EndTime} - + var path3d = @f3dpath + fileurl; var sheets = new Dictionary(); - + var sheets3D = new Dictionary(); try { for (int i = 0; i < listSub.Count; i++) @@ -279,7 +285,7 @@ namespace HT.Cloud.Service.ReportManage //MiniExcel.SaveAs(path, reader, true, sheetName, ExcelType.XLSX, null, false); sheets.Add(sheetName, reader); - + sheets3D.Add(sheetName, reader); //sqlConnection.Close(); } } @@ -287,7 +293,21 @@ namespace HT.Cloud.Service.ReportManage { Console.WriteLine(ex.ToString()); } - MiniExcel.SaveAs(path, sheets); + try + { + //var sheets3d = new Dictionary(sheets.ToDictionary(pair => pair.Key, pair => pair.Value)); + + + //await Task.Delay(1000); + MiniExcel.SaveAs(path, sheets); + + File.Copy(path, path3d, true); + } + catch (Exception ex) + { + Console.WriteLine(ex.ToString()); + } + //await Task.WhenAll(taskCloud, task3D); //bool a = true; ////MiniExcel.SaveAs(path, reader); //while (a) diff --git a/HT.Cloud.Web/Areas/DataStatisticalManage/Controllers/StatisticalSettingController.cs b/HT.Cloud.Web/Areas/DataStatisticalManage/Controllers/StatisticalSettingController.cs new file mode 100644 index 0000000..9c3a2e8 --- /dev/null +++ b/HT.Cloud.Web/Areas/DataStatisticalManage/Controllers/StatisticalSettingController.cs @@ -0,0 +1,142 @@ +using System; +using System.Linq; +using System.Threading.Tasks; +using System.Collections.Generic; +using Microsoft.AspNetCore.Mvc; +using HT.Cloud.Code; +using HT.Cloud.Domain.ChartsManage; +using HT.Cloud.Service; +using Microsoft.AspNetCore.Authorization; +using HT.Cloud.Service.ChartsManage; +using HT.Cloud.Service.ReportManage; +using Serenity.Services; +using HT.Cloud.Domain.DevicesManage; + +namespace HT.Cloud.Web.Areas.ChartsManage.Controllers +{ + /// + /// 创 建：cdl + /// 日 期：2023-02-23 11:10 + /// 描 述：历史趋势控制器类 + /// + [Area("DataStatisticalManage")] + //[HandlerLogin(needLogin: false)] + //[HandlerAuthorize(needAuth: false)] + public class StatisticalSettingController : BaseController + { + public HistoryTechChartsService _historyTechChartsService { get;set;} + /// + /// 绑定数据仓库的数据库ID + /// + private string systemDescription = GlobalContext.SystemConfig.SystemDescription; + [HttpPost] + public async Task GetAllTagList(ChartTagType chartTagType) + { + + var data = await _historyTechChartsService.GetAllTagList(systemDescription, chartTagType.ChartTagTypeName); + return Content(data); + } + + [HttpGet] + public async Task GetDriverGroupList() + { + var data = await _historyTechChartsService.GetDriverGroupList(); + return Content(data); + } + [HttpPost] + public async Task GetGroupSubsystemTag(ChartGroupDescription chartGroupDescription) + { + + var data = await _historyTechChartsService.GetGroupSubsystemTag(chartGroupDescription.GroupDescription); + return Content(data); + } + [HttpGet] + public async Task GetAllSubsystemTag() + { + + var data = await _historyTechChartsService.GetAllSubsystemTag(); + return Content(data); + } + + [HttpPost] + public async Task GetSubsystemAllTag(ChartSubsysytemName chartSubsysytemName) + { + var data = await _historyTechChartsService.GetSubsystemAllTag(chartSubsysytemName.SubsysytemName, chartSubsysytemName.GroupDescription); + return Content(data); + } + + [HttpPost] + public async Task GetChartsTagValue(Charts_Params charts_Params) + { + var Table = charts_Params.Table; + var TagName = charts_Params.TagName; + var StartTime = Gettime(charts_Params.StartTime); + var EndTime = Gettime(charts_Params.EndTime); + var Interval =int.Parse(charts_Params.Interval); + + var data = await _historyTechChartsService.GetChartsTagValue(Table,TagName, StartTime, EndTime, Interval); + return Content(data); + } + + public string Gettime(string longtime) + { + long jsTimeStamp = long.Parse(longtime); + System.DateTime startTime = TimeZone.CurrentTimeZone.ToLocalTime(new System.DateTime(1970, 1, 1)); // 当地时区 + DateTime dt = startTime.AddMilliseconds(jsTimeStamp); + return (dt.ToString("yyyy/MM/dd HH:mm:ss")); + } + + public class ChartTagType + { + public string ChartTagTypeName { get;set; } + } + + + public class SubAllTagReturn + { + //x.TagID, x.Description, x.Units + public short TagID { get; set; } + public string Description { get; set; } + public string Units { get; set; } + } + + public class SubsysytemNameList + { + public string Lable { get; set; } + public string Value { get; set; } + } + + public class ChartSubsysytemName + { + public string GroupDescription { get; set; } + public string SubsysytemName { get; set; } + + } + public class ChartGroupDescription + { + public string GroupDescription { get; set; } + } + + + public class HDATETIMEVALUE + { + public String HDATETIME { get; set; } + public decimal VALUE { get; set; } + } + public class ChartData + { + public decimal value { get; set; } + public String name { get; set; } + } + + public class Charts_Params + { + public string Table { get; set; } + public string TagName { get; set; } + public string StartTime { get; set; } + public string EndTime { get; set; } + public string Interval { get; set; } + } + + } +} diff --git a/HT.Cloud.Web/Areas/DataStatisticalManage/Views/StatisticalSetting/Index.cshtml b/HT.Cloud.Web/Areas/DataStatisticalManage/Views/StatisticalSetting/Index.cshtml new file mode 100644 index 0000000..6403002 --- /dev/null +++ b/HT.Cloud.Web/Areas/DataStatisticalManage/Views/StatisticalSetting/Index.cshtml @@ -0,0 +1,165 @@ +@{ + ViewBag.Title = "Index"; + Layout = "~/Views/Shared/_Index.cshtml"; +} + + + + + + +
+
+
生产统计参数
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+ +
+
+ + +
+
+
+
+
+
+
峰谷电时段设置
+
+
+ +
+
+ +
+ +
+
+
+ +
+
+ +
+ +
+
+
+ +
+
+ +
+ +
+
+
+ +
+
+ +
+ +
+
+
+ +
+
+ + +
+
+
+
+
+
+
手自动参数设置
+
+
    +
  • Content list
    • +
  • Content list
    • +
+
+
+
+
折叠面板的标题
+
+

折叠面板的内容

+
+
+
+ + diff --git a/HT.Cloud.Web/Areas/PenMeiChartsManage/Views/PenMeiHistoryTechCharts/Index_blue.cshtml b/HT.Cloud.Web/Areas/PenMeiChartsManage/Views/PenMeiHistoryTechCharts/Index_blue.cshtml new file mode 100644 index 0000000..3ffe367 --- /dev/null +++ b/HT.Cloud.Web/Areas/PenMeiChartsManage/Views/PenMeiHistoryTechCharts/Index_blue.cshtml @@ -0,0 +1,1304 @@ +@{ + ViewBag.Title = "Index"; + Layout = "~/Views/Shared/_Index.cshtml"; +} + + + + + + + @* + *@ + + @*
    +
  • 重要数据趋势
    • +
  • 其他数据趋势
    • +
+
+
+
+
*@ +
+ @* *@ +
+
+
+ @*
    *@ +
    + @*
    *@ + + +
    +
    +
    +
    + @*
    *@ + +
    +
    +
    +
    + @*
    +
    +
    +
    +
    *@ + +
    +
    +
    +
    + +
    + +
    +
    +
    +
    +
    + +
    + +
    +
    +
    +
    +
    + +
    + + + +
    +
    +
    +
    +
    + +
    + +
    +
    +
    +
    +
    +
    + +
    + +
    +
    + +
    + +
    +
    +
    +
    +
    +
    +
    +
    +
    + + diff --git a/HT.Cloud.Web/Areas/PenMeiChartsManage/Views/PenMeiRtTechCharts/Index_blue.cshtml b/HT.Cloud.Web/Areas/PenMeiChartsManage/Views/PenMeiRtTechCharts/Index_blue.cshtml new file mode 100644 index 0000000..5968831 --- /dev/null +++ b/HT.Cloud.Web/Areas/PenMeiChartsManage/Views/PenMeiRtTechCharts/Index_blue.cshtml @@ -0,0 +1,1098 @@ +@{ + ViewBag.Title = "Index"; + Layout = "~/Views/Shared/_Index.cshtml"; +} + + + + + + + +
    +
    +
    +
    + @*
      *@ +
      + @*
      *@ + + +
      +
      +
      +
      + @*
      *@ + +
      +
      +
      +
      + +
      +
      + +
      +
      +
      + +
      + +
      +
      +
      +
      +
      + +
      + +
      +
      +
      + +
      +
      +
      +
      +
      +
      +
      +
      +
      + + diff --git a/HT.Cloud.Web/Areas/PenMeiReportManage/Controllers/PenMeiHistoryAlarmNewController.cs b/HT.Cloud.Web/Areas/PenMeiReportManage/Controllers/PenMeiHistoryAlarmNewController.cs index 097660d..ae6a586 100644 --- a/HT.Cloud.Web/Areas/PenMeiReportManage/Controllers/PenMeiHistoryAlarmNewController.cs +++ b/HT.Cloud.Web/Areas/PenMeiReportManage/Controllers/PenMeiHistoryAlarmNewController.cs @@ -19,6 +19,8 @@ namespace HT.Cloud.Web.Areas.ReportManage.Controllers /// 描 述：历史趋势控制器类 /// [Area("PenMeiReportManage")] + [HandlerLogin(needLogin: false)] + [HandlerAuthorize(needAuth: false)] public class PenMeiHistoryAlarmNewController : BaseController { public HistoryAlarmService _historyAlarmService { get;set;} diff --git a/HT.Cloud.Web/Areas/PenMeiReportManage/Controllers/PenMeiHistoryAlarmNewNewController.cs b/HT.Cloud.Web/Areas/PenMeiReportManage/Controllers/PenMeiHistoryAlarmNewNewController.cs index 88d82dd..c7a6b66 100644 --- a/HT.Cloud.Web/Areas/PenMeiReportManage/Controllers/PenMeiHistoryAlarmNewNewController.cs +++ b/HT.Cloud.Web/Areas/PenMeiReportManage/Controllers/PenMeiHistoryAlarmNewNewController.cs @@ -21,6 +21,8 @@ namespace HT.Cloud.Web.Areas.ReportManage.Controllers /// 描 述：历史趋势控制器类 /// [Area("PenMeiReportManage")] + [HandlerLogin(needLogin: false)] + [HandlerAuthorize(needAuth: false)] public class PenMeiHistoryAlarmNewNewController : BaseController { public HistoryAlarmService _historyAlarmService { get;set;} diff --git a/HT.Cloud.Web/Areas/PenMeiReportManage/Views/PenMeiHistoryReport/Index.cshtml b/HT.Cloud.Web/Areas/PenMeiReportManage/Views/PenMeiHistoryReport/Index.cshtml index 24c78c4..0f1ed22 100644 --- a/HT.Cloud.Web/Areas/PenMeiReportManage/Views/PenMeiHistoryReport/Index.cshtml +++ b/HT.Cloud.Web/Areas/PenMeiReportManage/Views/PenMeiHistoryReport/Index.cshtml @@ -1055,6 +1055,9 @@ //async: false, data: DownLaodPara, success:function (downRes) { + + notify.success("导出报表数据完成，请查看浏览器或下载目录查看报表文件", "vcenter"); + var ddfileName = JSON.parse(downRes); var fileNewDownloadUrl = "/report/" + ddfileName; diff --git a/HT.Cloud.Web/Areas/PenMeiReportManage/Views/PenMeiHistoryReport/Index_blue.cshtml b/HT.Cloud.Web/Areas/PenMeiReportManage/Views/PenMeiHistoryReport/Index_blue.cshtml new file mode 100644 index 0000000..aca319b --- /dev/null +++ b/HT.Cloud.Web/Areas/PenMeiReportManage/Views/PenMeiHistoryReport/Index_blue.cshtml @@ -0,0 +1,1580 @@ +@{ + ViewBag.Title = "Index"; + Layout = "~/Views/Shared/_Index.cshtml"; +} + + + + + + + + + 表单设计器代码 + + + + + + + + + + + +
      +
      +
      + @*
      +
      + +
      + +
      +
      +
      *@ +
      +
      + +
      + +
      +
      +
      +
      +
      + +
      + +
      +
      +
      +
      +
      + +
      + + + +
      +
      +
      +
      +
      + +
      + +
      +
      +
      +
      +
      +
      + +
      + +
      +
      +
      +
      + +
      + +
      +
      +
      +
      + +
      + @*
      *@ + @*
      +
      +
      *@ +
      +
      + @*
      *@ +
      + @**@ + +@* + *@ + + + + + + \ No newline at end of file diff --git a/HT.Cloud.Web/Areas/PenMeiReportManage/Views/PenMeiNetWorkStateNew/Index.cshtml b/HT.Cloud.Web/Areas/PenMeiReportManage/Views/PenMeiNetWorkStateNew/Index.cshtml index 3a9fb82..1089c19 100644 --- a/HT.Cloud.Web/Areas/PenMeiReportManage/Views/PenMeiNetWorkStateNew/Index.cshtml +++ b/HT.Cloud.Web/Areas/PenMeiReportManage/Views/PenMeiNetWorkStateNew/Index.cshtml @@ -691,8 +691,9 @@ // group.add(line13_name); - + var dev0att = devlist.filter(item => item.DeviceName === "dev0")[0]; const image_exchange = new LeaferUI.Image({ + id: "dev0", x: 800, y: 250 + 75, url: '/imagesnet/交换机.png', @@ -705,7 +706,7 @@ y: 250 + 75 + 160 + 10, width: 134, fill: fill_top_name, - text: '交换机', + text: dev0att.DeviceDESCRIPTION, textAlign: 'center', verticalAlign: 'middle', textWrap: 'none', @@ -718,7 +719,7 @@ y: 250 + 75 + 160 + 25, width: 134, fill: fill_top_name, - text: '192.168.100.1', + text: dev0att.DeviceIP, textAlign: 'center', verticalAlign: 'middle', textWrap: 'none', diff --git a/HT.Cloud.Web/Views/Home/Index.cshtml b/HT.Cloud.Web/Views/Home/Index.cshtml index 1655336..90094b4 100644 --- a/HT.Cloud.Web/Views/Home/Index.cshtml +++ b/HT.Cloud.Web/Views/Home/Index.cshtml @@ -20,6 +20,229 @@ + @*style="background: url(/images/bgs.jpg)"*@ diff --git a/HT.Cloud.Web/Views/Shared/_Index.cshtml b/HT.Cloud.Web/Views/Shared/_Index.cshtml index 49a5d11..2fe26f2 100644 --- a/HT.Cloud.Web/Views/Shared/_Index.cshtml +++ b/HT.Cloud.Web/Views/Shared/_Index.cshtml @@ -19,7 +19,10 @@ + + + @RenderBody() diff --git a/HT.Cloud.Web/WaterCloud.Web.xml b/HT.Cloud.Web/WaterCloud.Web.xml index 9109fbd..def84f9 100644 --- a/HT.Cloud.Web/WaterCloud.Web.xml +++ b/HT.Cloud.Web/WaterCloud.Web.xml @@ -28,6 +28,18 @@ 绑定数据仓库的数据库ID + + + 创 建：cdl + 日 期：2023-02-23 11:10 + 描 述：历史趋势控制器类 + + + + + 绑定数据仓库的数据库ID + + 创 建：cdl diff --git a/HT.Cloud.Web/appsettings.json b/HT.Cloud.Web/appsettings.json index 4035e00..545398f 100644 --- a/HT.Cloud.Web/appsettings.json +++ b/HT.Cloud.Web/appsettings.json @@ -13,7 +13,7 @@ "LoginMultiple": false, // 是否允许一个账户在多处登录 "AllowCorsSite": "http://localhost:8058", // 允许的其他站点访问Api "DBProvider": "SqlServer", //SqlServer //Oracle - "DBConnectionString": "Zk48ARnbLq1Lk+lzxvCij6YiQpV5DIw6JRzXXsYlzoJ+bUF4h97SyChJobnKFm1EOA4aBGj+/Aje1MD7G13GOXplGKNnRzOB6qvav/vGq4xLAOc1EyKCHAMDCgWSEpu5uXl7LYv8gGNRQzIjv6UkUBLzX1Jetj7Hf9iYws19sCoRXI/1Vm5bZIVwLQThEctF8imcaVDPhGNcPCH1kr+h5A==", + "DBConnectionString": "Zk48ARnbLq1Lk+lzxvCij1zzENjv04mu23Y8D8hdM3VxApXnvB2iA7xm5JfYWNkbDScUWuGK1+hd9AH5U4eo6l9A0lA/+WhXv9LiWTyuYMFt8OAffhgQu1MWiiwb1GDz8EurwhrLAsGpelKSfZmZGbVTRgW4/RUDv9wtBdQIA11dlm4eCG6zDm9rjJk4f+AM8Pdm1D5aIiWLuRZJXPSkSg==", "DBCommandTimeout": 180, // 数据库超时时间，单位秒 "CacheProvider": "Memory", // 缓存使用方式 Redis/Memory "RedisConnectionString": "127.0.0.1:6379", //docker部署 172.17.0.1 @@ -34,7 +34,7 @@ { "DBNumber": "1", "DBProvider": "SqlServer", //MySql //Oracle - "DBConnectionString": "Zk48ARnbLq1Lk+lzxvCij6YiQpV5DIw6JRzXXsYlzoJ+bUF4h97SyChJobnKFm1EOA4aBGj+/Aje1MD7G13GOXplGKNnRzOB6qvav/vGq4xLAOc1EyKCHAMDCgWSEpu5uXl7LYv8gGNRQzIjv6UkUBLzX1Jetj7Hf9iYws19sCoRXI/1Vm5bZIVwLQThEctF8imcaVDPhGNcPCH1kr+h5A==" + "DBConnectionString": "Zk48ARnbLq1Lk+lzxvCij1zzENjv04mu23Y8D8hdM3VxApXnvB2iA7xm5JfYWNkbDScUWuGK1+hd9AH5U4eo6l9A0lA/+WhXv9LiWTyuYMFt8OAffhgQu1MWiiwb1GDz8EurwhrLAsGpelKSfZmZGbVTRgW4/RUDv9wtBdQIA11dlm4eCG6zDm9rjJk4f+AM8Pdm1D5aIiWLuRZJXPSkSg==" } ], "RabbitMq": { diff --git a/HT.Cloud.Web/wwwroot/css/layuicustom.css b/HT.Cloud.Web/wwwroot/css/layuicustom.css new file mode 100644 index 0000000..4032cce --- /dev/null +++ b/HT.Cloud.Web/wwwroot/css/layuicustom.css @@ -0,0 +1,41 @@ + +.layui-bg-custom-1 { + background-color: #00eaff !important; + color: #fff !important; +} + +.layui-bg-custom-2 { + background-color: #013fa3 !important; + color: #fff !important; +} + +.layui-bg-custom-3 { + background-color: #04216a !important; + color: #fff !important; +} + +.layui-bg-custom-4 { + background-color: #060f23 !important; + color: #fff !important; +} + +.layui-bg-custom-5 { + background-color: #041544 !important; /*#041544*/ + color: #fff !important; +} + +.layui-bg-custom-6 { + background-color: #001756e6 !important; + color: #fff !important; +} + +.layui-bg-custom-7 { + background-color: #001655 !important; + color: #fff !important; +} + +.layui-bg-custom-8 { + background-color: #0c2e57 !important; + color: #fff !important; +} + diff --git a/HT.Cloud.Web/wwwroot/css/layuimini.css b/HT.Cloud.Web/wwwroot/css/layuimini.css index ea7596e..9378779 100644 --- a/HT.Cloud.Web/wwwroot/css/layuimini.css +++ b/HT.Cloud.Web/wwwroot/css/layuimini.css @@ -145,7 +145,7 @@ .layuimini-tab .layui-tab-title { border: none; border: 1px solid whitesmoke; - background-color: white; + background-color:#0083a1; } .layuimini-tab .layui-tab-title li { @@ -876,12 +876,14 @@ .layui-nav-tree .layui-nav-item > a .layui-nav-more { padding: 0px 0; } + .layui-table { width: 100%; margin: 10px 0; background-color: #fff; color: black; } + .layui-tab-control > ul > .layui-nav-item.layui-this { background-color: none; -} \ No newline at end of file +} diff --git a/HT.Cloud.Web/wwwroot/css/watercloud.css b/HT.Cloud.Web/wwwroot/css/watercloud.css index c42ef59..822a6fc 100644 --- a/HT.Cloud.Web/wwwroot/css/watercloud.css +++ b/HT.Cloud.Web/wwwroot/css/watercloud.css @@ -1,5 +1,5 @@ body { - margin: 5px 5px 5px 5px; + margin: 0px 0px 0px 0px; background: #f2f2f2; } .form-group-bottom { diff --git a/HT.Cloud.Web/wwwroot/js/lay-module/layuimini/miniTheme.js b/HT.Cloud.Web/wwwroot/js/lay-module/layuimini/miniTheme.js index e8b04fd..6fa7ad7 100644 --- a/HT.Cloud.Web/wwwroot/js/lay-module/layuimini/miniTheme.js +++ b/HT.Cloud.Web/wwwroot/js/lay-module/layuimini/miniTheme.js @@ -318,6 +318,8 @@ layui.define(["jquery", "layer"], function (exports) { '.layui-header .layui-nav .layui-nav-more {\n' + ' border-top-color: ' + bgcolorData.headerRightNavMore + ' !important;\n' + '}\n' + + '.layui-layout-admin .layui-header .layuimini-tool i {\n' + + ' color: ' + bgcolorData.headerRightToolColor + ';\n' + '\n' + '/*头部右侧更多下拉颜色 headerRightNavMore */\n' + '.layui-header .layui-nav .layui-nav-mored, .layui-header .layui-nav-itemed > a .layui-nav-more {\n' + @@ -331,8 +333,6 @@ layui.define(["jquery", "layer"], function (exports) { '}\n' + '\n' + '/*头部缩放按钮样式 headerRightToolColor */\n' + - '.layui-layout-admin .layui-header .layuimini-tool i {\n' + - ' color: ' + bgcolorData.headerRightToolColor + ';\n' + '}\n' + '\n' + '/*logo背景颜色 headerLogoBg */\n' + diff --git a/HT.Cloud.Web/wwwroot.rar b/HT.Cloud.Web/wwwroot240925.rar similarity index 99% rename from HT.Cloud.Web/wwwroot.rar rename to HT.Cloud.Web/wwwroot240925.rar index ecdef5f..65aac13 100644 Binary files a/HT.Cloud.Web/wwwroot.rar and b/HT.Cloud.Web/wwwroot240925.rar differ