diff --git a/SGGL/FineUIPro.Web/ErrLog.txt b/SGGL/FineUIPro.Web/ErrLog.txt index 9b323bae..90f9c747 100644 --- a/SGGL/FineUIPro.Web/ErrLog.txt +++ b/SGGL/FineUIPro.Web/ErrLog.txt @@ -590,3 +590,20 @@ IP地址:::1 出错时间:05/01/2023 20:59:45 出错时间:05/01/2023 20:59:45 + +错误信息开始=====> +错误类型:NullReferenceException +错误信息:未将对象引用设置到对象的实例。 +错误堆栈: + 在 FineUIPro.Web.PZHGL.SGCH.XmsgGlgdEdit.Page_Load(Object sender, EventArgs e) 位置 D:\project\vs\sggl_cd\SGGL\FineUIPro.Web\PZHGL\SGCH\XmsgGlgdEdit.aspx.cs:行号 19 + 在 System.Web.Util.CalliEventHandlerDelegateProxy.Callback(Object sender, EventArgs e) + 在 System.EventHandler.Invoke(Object sender, EventArgs e) + 在 System.Web.UI.Control.OnLoad(EventArgs e) + 在 System.Web.UI.Control.LoadRecursive() + 在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint) +出错时间:05/02/2023 11:34:40 +出错文件:http://localhost:1295/PZHGL/SGCH/XmsgGlgdEdit.aspx +IP地址:::1 + +出错时间:05/02/2023 11:34:40 + diff --git a/SGGL/FineUIPro.Web/HSSE/Hazard/HazardList.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Hazard/HazardList.aspx.cs index d18131b1..70d2b700 100644 --- a/SGGL/FineUIPro.Web/HSSE/Hazard/HazardList.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/Hazard/HazardList.aspx.cs @@ -387,7 +387,7 @@ namespace FineUIPro.Web.HSSE.Hazard LEFT JOIN Base_WorkStage AS WorkStage ON WorkStage.WorkStageId = SelectedItem.WorkStage LEFT JOIN Technique_HazardListType AS HazardListType ON HazardListType.HazardListTypeId=SelectedItem.HazardListTypeId LEFT JOIN Technique_HazardListType AS SuperHazardListType ON SuperHazardListType.HazardListTypeId = HazardListType.SupHazardListTypeId - where HazardList.ProjectId='"+CurrUser.UserId+"'"; + where HazardList.ProjectId='"+CurrUser.LoginProjectId+"'"; if (!string.IsNullOrEmpty(this.txtHazardListCode.Text.Trim())) { strSql += " AND HazardListCode LIKE '%"+this.txtHazardListCode.Text.Trim()+"%'"; diff --git a/SGGL/FineUIPro.Web/HSSE/HiddenInspection/RiskAnalysisChart.aspx b/SGGL/FineUIPro.Web/HSSE/HiddenInspection/RiskAnalysisChart.aspx index a2e4d1b6..c95a6a37 100644 --- a/SGGL/FineUIPro.Web/HSSE/HiddenInspection/RiskAnalysisChart.aspx +++ b/SGGL/FineUIPro.Web/HSSE/HiddenInspection/RiskAnalysisChart.aspx @@ -52,7 +52,7 @@ -
+
@@ -82,7 +82,7 @@ grid: { left: '3%', right: '4%', - bottom: '3%', + bottom: '10%', containLabel: true }, xAxis: [ @@ -100,6 +100,22 @@ series: series }; + if (xAxis.length > 5) { + option.dataZoom = [{ + type: 'slider', + show: true, + startValue: 0, + endValue: 4, + height: '10', + backgroundColor: '#aed0ea', + fillerColor: '#107f8b', + bottom: '0%', + zoomLock: true, + moveOnMouseWheel: true, + brushSelect: true, + showDetail: false, + }] + } var myChart = echarts.init(document.getElementById("divAccidentTime")); myChart.setOption(option);