lpf/xinjiang
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

数据大屏优化

Browse Source
This commit is contained in:
夏菊
2026-09-23 17:55:18 +08:00
parent 147121cdb2
commit 4bb579d661
39 changed files with 2012 additions and 320 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/common/PageBase.cs
+79 -76
View File
@@ -28,13 +28,16 @@ namespace FineUIPro.Web
{
string account = string.Empty;
string password = string.Empty;
if (Request.Cookies["u"] != null)
if (HttpContext.Current != null && HttpContext.Current.Request != null)
{
account = HttpUtility.UrlDecode(Request.Cookies["u"].Value);
}
if (Request.Cookies["p"] != null)
{
password = Request.Cookies["p"].Value;
if (Request.Cookies["u"] != null)
{
account = HttpUtility.UrlDecode(Request.Cookies["u"].Value);
}
if (Request.Cookies["p"] != null)
{
password = Request.Cookies["p"].Value;
}
}
Session["CurrUser"] = BLL.Funs.DB.Sys_User.FirstOrDefault(x => x.Account == account && x.Password == Funs.EncryptionPassword(password));
}
@@ -58,66 +61,66 @@ namespace FineUIPro.Web
#region OnInit
protected override void OnInit(EventArgs e)
{
if (Session["CurrUser"] == null && !Request.Path.Contains("/Login.aspx") && !Request.Path.Contains("DataShow"))
{
//string ticket = Request.Params["ticket"];
//if (!string.IsNullOrEmpty(ticket))
//{
// string jsonCameras = APIGetHttpService.Http("https://=" + ticket);
{
if (Session["CurrUser"] == null && !Request.Path.Contains("/Login.aspx") && !Request.Path.Contains("DataShow"))
{
//string ticket = Request.Params["ticket"];
//if (!string.IsNullOrEmpty(ticket))
//{
// string jsonCameras = APIGetHttpService.Http("https://=" + ticket);
// XmlDocument xml = new XmlDocument();
// xml.LoadXml(jsonCameras);
// XmlElement root = xml.DocumentElement;
// XmlNode node = root.ChildNodes[0];//遍历输出.
// if (node.LocalName == "authenticationSuccess")
// {
// string user = node.ChildNodes[0].InnerText;//InnerText节点包合的所有文本内容
// //if ("zyk" == user)
// //{
// // user = "hfnbd";
// //}
// Model.Sys_User sysUser = (from y in Funs.DB.Sys_User
// where (y.DomainAccount == user || y.Account ==user) && y.IsPost == true
// select y).FirstOrDefault();
// if (user != null)
// {
// string accValue = HttpUtility.UrlEncode(user);
// FormsAuthentication.SetAuthCookie(accValue, false);
// Page.Session[SessionName.CurrUser] = sysUser;
// string url = "";
// this.CurrUser.RoleType = RoleService.GetRoleTypeByRoleId(this.CurrUser.RoleId);
// if (!this.CurrUser.LastIsOffice.HasValue)
// {
// this.CurrUser.LastIsOffice = this.CurrUser.IsOffice;
// }
// if (this.CurrUser.LastIsOffice == true)
// {
// this.CurrUser.LoginProjectId = null;
// ////本部菜单
// url = "index.aspx";
// }
// else
// {
// this.CurrUser.LoginProjectId = this.CurrUser.LastProjectId;
// //// 项目菜单
// url = "indexProject.aspx?projectId=" + this.CurrUser.LastProjectId;
// }
// this.SysType = "GONGCHENG";
// Response.Redirect(url);
// }
// else
// {
// Response.Redirect("Login.aspx");
// }
// }
//}
//else
//{
// Response.Redirect("https://sggl/indexProject.aspx");
//}
}
var pm = PageManager.Instance;
// XmlDocument xml = new XmlDocument();
// xml.LoadXml(jsonCameras);
// XmlElement root = xml.DocumentElement;
// XmlNode node = root.ChildNodes[0];//遍历输出.
// if (node.LocalName == "authenticationSuccess")
// {
// string user = node.ChildNodes[0].InnerText;//InnerText节点包合的所有文本内容
// //if ("zyk" == user)
// //{
// // user = "hfnbd";
// //}
// Model.Sys_User sysUser = (from y in Funs.DB.Sys_User
// where (y.DomainAccount == user || y.Account ==user) && y.IsPost == true
// select y).FirstOrDefault();
// if (user != null)
// {
// string accValue = HttpUtility.UrlEncode(user);
// FormsAuthentication.SetAuthCookie(accValue, false);
// Page.Session[SessionName.CurrUser] = sysUser;
// string url = "";
// this.CurrUser.RoleType = RoleService.GetRoleTypeByRoleId(this.CurrUser.RoleId);
// if (!this.CurrUser.LastIsOffice.HasValue)
// {
// this.CurrUser.LastIsOffice = this.CurrUser.IsOffice;
// }
// if (this.CurrUser.LastIsOffice == true)
// {
// this.CurrUser.LoginProjectId = null;
// ////本部菜单
// url = "index.aspx";
// }
// else
// {
// this.CurrUser.LoginProjectId = this.CurrUser.LastProjectId;
// //// 项目菜单
// url = "indexProject.aspx?projectId=" + this.CurrUser.LastProjectId;
// }
// this.SysType = "GONGCHENG";
// Response.Redirect(url);
// }
// else
// {
// Response.Redirect("Login.aspx");
// }
// }
//}
//else
//{
// Response.Redirect("https://sggl/indexProject.aspx");
//}
}
var pm = PageManager.Instance;
if (pm != null)
{
HttpCookie themeCookie = Request.Cookies["Theme"];
@@ -248,15 +251,15 @@ namespace FineUIPro.Web
/// <param name="e"></param>
protected void PageBase_Load(object sender, EventArgs e)
{
//这是后置式的权限管理策略.
//页面装载完成以后才检查是否有权限打开此页....
//anyway,its ok.
//这是后置式的权限管理策略.
//页面装载完成以后才检查是否有权限打开此页....
//anyway,its ok.
this.Title = BLL.Funs.SystemName;
this.Title = BLL.Funs.SystemName;
//if (CurrUser == null)
//{
// if (this.Page.Request.AppRelativeCurrentExecutionFilePath != "~/Login.aspx")
@@ -557,12 +560,12 @@ namespace FineUIPro.Web
/// <returns>数据表</returns>
protected DataTable GetPagedDataTable(FineUIPro.Grid Grid1, DataTable tb)
{
int pageIndex = Grid1.PageIndex;
int pageIndex = Grid1.PageIndex;
int pageSize = Grid1.PageSize;
string sortField = Grid1.SortField;
string sortDirection = Grid1.SortDirection;
//DataTable table2 = DataSourceUtil.GetDataTable2();
DataView view = tb.DefaultView;
// view.Sort = String.Format("{0} {1}", sortField, sortDirection);
@@ -957,7 +960,7 @@ namespace FineUIPro.Web
sb.Append("<meta http-equiv=\"content-type\" content=\"application/excel; charset=UTF-8\"/>");
sb.Append("<table cellspacing=\"0\" rules=\"all\" border=\"1\" style=\"border-collapse:collapse;\">");
sb.Append("<tr>");
foreach (GridColumn column in grid.Columns)
{
sb.AppendFormat("<td x:str>{0}</td>", column.HeaderText);
@@ -968,8 +971,8 @@ namespace FineUIPro.Web
sb.Append("<tr>");
foreach (GridColumn column in grid.Columns)
{
string html = row.Values[column.ColumnIndex].ToString();
string html = row.Values[column.ColumnIndex].ToString();
if (column.ColumnID == "tfNumber" && (row.FindControl("lblNumber") as AspNet.Label) != null)
{
html = (row.FindControl("lblNumber") as AspNet.Label).Text;
@@ -995,7 +998,7 @@ namespace FineUIPro.Web
}
}
sb.AppendFormat("<td style='vnd.ms-excel.numberformat:@;width:140px;'>{0}</td>", html);
// sb.AppendFormat("<td>{0}</td>", html);
// sb.AppendFormat("<td>{0}</td>", html);
}
sb.Append("</tr>");
SGGL/FineUIPro.Web/common/main.aspx
+88 -77
View File
@@ -10,7 +10,7 @@
<script src="../res/lib/flex.js"></script>
<link rel="stylesheet" href="../res/homecss/common.css?v=202603" />
<link rel="stylesheet" href="../res/homecss/layout.css?v=202603" />
<link rel="stylesheet" href="../res/homecss/index.css?v=202604" />
<link rel="stylesheet" href="../res/homecss/index.css?v=202609" />
<%--<link rel="stylesheet" href="../res/homecss/safe.css?v=202603" />--%>
</head>
<body style="background-color: #001B35;">
@@ -170,7 +170,6 @@
</div>
</div>
</div>
<%--<div id="map"></div>--%>
<div class="map">
<div id="map"></div>
<div class="change-map" @click="handleChangeMap">{{mapType ? '中国地图' : '世界地图'}}</div>
@@ -186,10 +185,10 @@
</ul>
</div>
</div>
</div>
<div class="site_500" style="height: 3.05rem; margin-bottom: 0.25rem">
<h2><span class="gradient_white_blue">风险分级管控</span></h2>
<div id="risk" class="site_content">
</div>
<div class="site_500 jshover" style="height: 3.05rem; margin-bottom: 0.25rem" data-type="HazardFactor">
<h2><span class="gradient_white_blue">安全危害因素</span></h2>
<div id="risk" class="site_content risk">
<div class="flex_row_center_center">
<i></i>
<div class="flex_column_between_start">
@@ -220,27 +219,36 @@
</div>
</div>
</div>
<div class="site_500" style="height: 2.275rem; margin-bottom: 0.25rem">
<h2><span class="gradient_white_blue">高风险作业许可</span></h2>
<div id="job" class="site_content">
<div class="flex_row_end_center">
<div class="site_500 jshover" style="height: 3.05rem; margin-bottom: 0.25rem" data-type="HazardFactorOccHealth">
<h2><span class="gradient_white_blue">职业健康危害因素</span></h2>
<div id="riskHazard" class="site_content risk">
<div class="flex_row_center_center">
<i></i>
<div class="flex_column_between_start">
<h6>许可</h6>
<p>
<span class="gradient_white_yellow">0</span><span>项</span>
</p>
<h6>重大风险</h6>
<p><span>{{form?.hazardFactorOcc?.majorRiskNum}}</span></p>
</div>
</div>
<i></i>
<div class="flex_row_start_center">
<div class="flex_column_between_start">
<h6>关闭</h6>
<p>
<span class="gradient_white_blue">0</span><span>项</span>
</p>
</div>
<div class="flex_row_center_center">
<i></i>
<div class="flex_column_between_start">
<h6>较大风险</h6>
<p><span>{{form?.hazardFactorOcc?.largerRiskNum}}</span></p>
</div>
</div>
<div class="flex_row_center_center">
<i></i>
<div class="flex_column_between_start">
<h6>一般风险</h6>
<p><span>{{form?.hazardFactorOcc?.generalRiskNum}}</span></p>
</div>
</div>
<div class="flex_row_center_center">
<i></i>
<div class="flex_column_between_start">
<h6>低风险</h6>
<p><span>{{form?.hazardFactorOcc?.lowRiskNum}}</span></p>
</div>
</div>
</div>
</div>
@@ -311,11 +319,11 @@
}
},
mounted() {
// 组件挂载后执行的操作
this.show = true; // 显示内容
hoverEvent();
//组件挂载后执行的操作
this.show = true; //显示内容
this.createChinaMap();
this.loadData(); // 加载数据
this.loadData(); //加载数据
hoverEvent();//模块数据穿透
// this.startTimer(); //启动时间定时器
},
methods: {
@@ -328,6 +336,9 @@
url: "main.aspx/GetMainData", //调用后台WebMethod
contentType: "application/json; charset=utf-8",
dataType: "json",
<%--data: JSON.stringify({
unitId: '<%=UnitId%>'
}),--%>
success: function (response) {
//console.log("请求结果：", response.d)
if (response.d.success) {
@@ -383,7 +394,7 @@
this.createChinaMap(this.chinaData)
}
},
// 创建中国地图
//创建中国地图
createChinaMap(data) {
let list = data || [];
//console.log("地图数据", data);
@@ -470,8 +481,10 @@
borderColor: '#fff',
borderWidth: 1,
padding: 10,
formatter: function (params) {
console.log("地图数据明细", params)
formatter: function(params) {
// debugger
// console.log("地图数据明细", params)
// console.log("地图数据明细", params)
// 自定义 tooltip 内容
if (params.seriesType === 'effectScatter') {
return `<div style="color: white;">
@@ -541,12 +554,47 @@
this.chainaMap.setOption(chinaOption);
this.chainaMap.on('click', function (params) {
// 控制台打印点击的地区名称
//if (params.seriesType == 'effectScatter') {
// alert('点击了' + params.name);
//}
if (params.seriesType == 'effectScatter') {
// alert('点击了' + params.name + ';' + params.data.id);
// debugger;
$.ajax({
type: "POST",
url: "main.aspx/ViewProject", //调用后台WebMethod
contentType: "application/json; charset=utf-8",
dataType: "json",
data: JSON.stringify({
projectId: params.data.id
}),
success: function (response) {
//console.log("请求结果：", response.d)
if (response.d.success) {
var url = response.d.data;
var msg = response.d.msg;
if (url != "") {
// 当前页面跳转
top.window.location.href = url;
} else {
alert("跳转失败：" + msg);
}
} else {
// 更新数据失败
alert("跳转失败：" + response.d.msg);
}
// $(".loading").hide()
},
error: function(xhr, status, error) {
// AJAX请求错误处理
// $(".loading").hide()
alert("请求失败：" + error);
}
});
}
// 你可以在这里添加你的逻辑代码
});
},
//创建世界地图
createWorldMap(data) {
//let data = list || [
// { value: [116.407394, 39.904211], name: "北京" }, // 北京
@@ -713,14 +761,13 @@
//}
//// 你可以在这里添加你的逻辑代码
})
},
}
}
})
function hoverEvent() {
$(".jshover").click(function (e) {
e.stopPropagation()
if ($(".popu").css("display") == "block") {
$(".popu").hide()
return
@@ -728,57 +775,21 @@
let type = this.getAttribute("data-type")
let iframe = $('iframe')
switch (type) {
case "1":
// 组织人员
// iframe.attr('src', '../DataShow/CompanyPerson.aspx')
window.open('../DataShow/CompanyPerson.aspx')
case "HazardFactor"://安全危害因素
window.open('../DataShow/HazardFactor.aspx')
break
case "2":
// 教育培训/安全工时
// iframe.attr('src', '../DataShow/EduTrain.aspx')
window.open('../DataShow/EduTrain.aspx')
break
case "3":
// 安全隐患排查治理
// iframe.attr('src', '../DataShow/HiddenRectification.aspx')//一般隐患
window.open('../DataShow/HiddenRectification.aspx')
break
case "4":
// 费用及机具
// iframe.attr('src', '../DataShow/SecurityCost.aspx')
window.open('../DataShow/SecurityCost.aspx')
break
case "5":
// 危大工程管控数据
// iframe.attr('src', '../DataShow/LargeEngineering.aspx')
window.open('../DataShow/LargeEngineering.aspx')
break
case "6":
// 风险分级管控
// iframe.attr('src', '../DataShow/SecurityRisk.aspx')
window.open('../DataShow/SecurityRisk.aspx')
break
case "7":
// 高风险作业许可
// iframe.attr('src', '../DataShow/License.aspx')
window.open('../DataShow/License.aspx')
break
case "8":
// 应急管理数据
// iframe.attr('src', '../DataShow/Emergency.aspx')
window.open('../DataShow/Emergency.aspx')
case "HazardFactorOccHealth"://职业健康危害因素
window.open('../DataShow/HazardFactorOccHealth.aspx')
break
}
// $("#hover").hide()
$(".popu").show()
})
$(".container").css({
position: "relative",
})
$(".container")
.click(function (e) {
$(".popu").hide()
})
$(".container").click(function (e) {
$(".popu").hide()
})
}
</script>
SGGL/FineUIPro.Web/common/main.aspx.cs
+88 -12
View File
@@ -1,14 +1,11 @@
using BLL;
using FineUIPro.Web.DataShow;
using FineUIPro.Web.SysManage;
using FineUIPro.Web.ZHGL.DataSync;
using Model;
using NPOI.SS.Formula.Functions;
using NPOI.POIFS.Crypt.Dsig;
using System;
using System.Collections.Generic;
using System.Data;
using System.Linq;
using System.Runtime.Remoting.Metadata.W3cXsd2001;
using System.Threading.Tasks;
using System.Web.Services;
using System.Web.UI.WebControls;
@@ -17,11 +14,40 @@ namespace FineUIPro.Web.common
{
public partial class main : PageBase
{
///// <summary>
///// 单位id
///// </summary>
//public string UnitId
//{
// get
// {
// return (string)ViewState["UnitId"];
// }
// set
// {
// ViewState["UnitId"] = value;
// }
//}
protected void Page_Load(object sender, EventArgs e)
{
if (!IsPostBack)
{
//var ssss = Request;
//string unitId = string.Empty;
//unitId = this.CurrUser.LastUnitId;
//string unitIdw = string.Empty;
//string urlReferrer = Request.UrlReferrer.ToString();
//if (!string.IsNullOrWhiteSpace(urlReferrer))
//{
// unitId = urlReferrer.Split('=')[1];
// this.UnitId = unitId;
//}
//var sss = this.CurrUser;
//if (!string.IsNullOrEmpty(Request.QueryString["unitId"]))
//{
// this.UnitId = Request.QueryString["unitId"];
//}
}
}
@@ -37,12 +63,19 @@ namespace FineUIPro.Web.common
var page = new main();
MainSevice mainSevice = new MainSevice(page.CurrUser.UserId);
string unitId = page.CurrUser.UnitId;
if (CommonService.IsSuperAdminManage(page.CurrUser.UserId) || (!string.IsNullOrWhiteSpace(unitId) && unitId == Const.UnitId_XJYJ))
{
unitId = !string.IsNullOrWhiteSpace(page.CurrUser.LastUnitId) ? page.CurrUser.LastUnitId : Const.UnitId_XJYJ;
}
//获取数据
var hsseData = Task.Run(() => mainSevice.GetHsseData()).Result;
//var hiddenDangerList = mainSevice.GetDataHiddenDangerDetailItems();
//获取项目数据
int unitType = CommonService.GetUnitTypeByUserId(page.CurrUser.UserId);
//int unitType = CommonService.GetUnitTypeByUserId(page.CurrUser.UserId);
int unitType = CommonService.GetUnitTypeByUnitId(unitId);
var projects = new List<Base_Project>();
if (unitType == 0)
@@ -51,7 +84,8 @@ namespace FineUIPro.Web.common
}
else if (unitType == 1)
{
projects = Funs.DB.Base_Project.Where(x => x.UnitId == page.CurrUser.UnitId && x.MapCoordinates != null && (x.IsDelete == null || x.IsDelete == false)).ToList();
projects = Funs.DB.Base_Project.Where(x => x.UnitId == unitId && x.MapCoordinates != null && (x.IsDelete == null || x.IsDelete == false)).ToList();
//projects = Funs.DB.Base_Project.Where(x => x.UnitId == page.CurrUser.UnitId && x.MapCoordinates != null && (x.IsDelete == null || x.IsDelete == false)).ToList();
}
//获取安全生产开始日期
@@ -62,14 +96,20 @@ namespace FineUIPro.Web.common
//事故事件
var list = AccidentWarningService.GetYearsTodayList();
var dateNow = DateTime.Now.ToString("yyyy-MM");
//风险
var getHazardFactorList = Funs.DB.Sp_HazardFactor_Statistics(dateNow.Split('-')[0], dateNow.Split('-')[1], "").ToList();
string hfUnitId = !string.IsNullOrWhiteSpace(unitId) && unitId == Const.UnitId_XJYJ ? string.Empty : unitId;
//安全危害因素
var getHazardFactorList = Funs.DB.Sp_HazardFactor_Statistics(dateNow.Split('-')[0], dateNow.Split('-')[1], hfUnitId, string.Empty).ToList();
var lowRisk = getHazardFactorList.Where(x => x.Title == "低风险").FirstOrDefault();
var generalRisk = getHazardFactorList.Where(x => x.Title == "一般风险").FirstOrDefault();
var largerRisk = getHazardFactorList.Where(x => x.Title == "较大风险").FirstOrDefault();
var majorRisk = getHazardFactorList.Where(x => x.Title == "重大风险").FirstOrDefault();
//职业健康危害因素
var getHazardFactorOccHealthList = Funs.DB.Sp_HazardFactorOccHealth_Statistics(dateNow.Split('-')[0], dateNow.Split('-')[1], hfUnitId, string.Empty).ToList();
var lowRiskOcc = getHazardFactorOccHealthList.Where(x => x.Title == "低风险").FirstOrDefault();
var generalRiskOcc = getHazardFactorOccHealthList.Where(x => x.Title == "一般风险").FirstOrDefault();
var largerRiskOcc = getHazardFactorOccHealthList.Where(x => x.Title == "较大风险").FirstOrDefault();
var majorRiskOcc = getHazardFactorOccHealthList.Where(x => x.Title == "重大风险").FirstOrDefault();
//构造返回数据
return new
@@ -96,7 +136,7 @@ namespace FineUIPro.Web.common
},
projectInfo = new
{
workSafetyStartDateTip= $"安全生产开始日期：{workSafetyStartDate}",
workSafetyStartDateTip = $"安全生产开始日期：{workSafetyStartDate}",
workSafetyDay1 = (workSafetyDays % 10),
workSafetyDay10 = ((workSafetyDays % 100) / 10),
workSafetyDay100 = ((workSafetyDays % 1000) / 100),
@@ -118,11 +158,18 @@ namespace FineUIPro.Web.common
value = p.MapCoordinates.Split(','),
}).ToList(),
hazardFactor = new
{
{//安全危害因素
lowRiskNum = lowRisk != null ? lowRisk.Num : 0,
generalRiskNum = generalRisk != null ? generalRisk.Num : 0,
largerRiskNum = largerRisk != null ? largerRisk.Num : 0,
majorRiskNum = majorRisk != null ? majorRisk.Num : 0,
},
hazardFactorOcc = new
{//职业健康危害因素
lowRiskNum = lowRiskOcc != null ? lowRiskOcc.Num : 0,
generalRiskNum = generalRiskOcc != null ? generalRiskOcc.Num : 0,
largerRiskNum = largerRiskOcc != null ? largerRiskOcc.Num : 0,
majorRiskNum = majorRiskOcc != null ? majorRiskOcc.Num : 0,
}
}
};
@@ -132,5 +179,34 @@ namespace FineUIPro.Web.common
return new { success = false, msg = ex.Message };
}
}
/// <summary>
/// 获取项目跳转地址
/// </summary>
/// <param name="projectId"></param>
/// <returns></returns>
[WebMethod]
public static object ViewProject(string projectId)
{
try
{
var page = new main();
string url = string.Empty;
string msg = string.Empty;
if ((page.CurrUser.IsOffice == true && !string.IsNullOrEmpty(page.CurrUser.RoleId)) || (page.CurrUser.IsOffice == false || !page.CurrUser.IsOffice.HasValue))
{
url = "../indexProject.aspx?projectId=" + projectId;
}
else
{
msg = "您没有权限进入项目管理模块！";
}
return new { success = true, data = url, msg = msg };
}
catch (Exception ex)
{
return new { success = false, msg = ex.Message };
}
}
}
}
SGGL/FineUIPro.Web/common/mainProject.aspx
+28 -19
View File
@@ -200,8 +200,8 @@
</div>
<div class="site_500" style="height: 3.05rem; margin-bottom: 0.25rem">
<h2><span class="gradient_white_blue">风险分级管控</span></h2>
<div id="risk" class="site_content">
<h2><span class="gradient_white_blue">安全危害因素</span></h2>
<div id="risk" class="site_content risk">
<div class="flex_row_center_center">
<i></i>
<div class="flex_column_between_start">
@@ -232,28 +232,37 @@
</div>
</div>
</div>
<div class="site_500" style="height: 2.275rem; margin-bottom: 0.25rem">
<h2><span class="gradient_white_blue">高风险作业许可</span></h2>
<div id="job" class="site_content">
<div class="flex_row_end_center">
<div class="site_500 jshover" style="height: 3.05rem; margin-bottom: 0.25rem" >
<h2><span class="gradient_white_blue">职业健康危害因素</span></h2>
<div id="riskHazard" class="site_content risk">
<div class="flex_row_center_center">
<i></i>
<div class="flex_column_between_start">
<h6>许可</h6>
<p>
<span class="gradient_white_yellow">0</span><span>项</span>
</p>
<h6>重大风险</h6>
<p><span>{{form?.hazardFactorOcc?.majorRiskNum}}</span></p>
</div>
</div>
<i></i>
<div class="flex_row_start_center">
<div class="flex_column_between_start">
<h6>关闭</h6>
<p>
<span class="gradient_white_blue">0</span><span>项</span>
</p>
</div>
<div class="flex_row_center_center">
<i></i>
<div class="flex_column_between_start">
<h6>较大风险</h6>
<p><span>{{form?.hazardFactorOcc?.largerRiskNum}}</span></p>
</div>
</div>
<div class="flex_row_center_center">
<i></i>
<div class="flex_column_between_start">
<h6>一般风险</h6>
<p><span>{{form?.hazardFactorOcc?.generalRiskNum}}</span></p>
</div>
</div>
<div class="flex_row_center_center">
<i></i>
<div class="flex_column_between_start">
<h6>低风险</h6>
<p><span>{{form?.hazardFactorOcc?.lowRiskNum}}</span></p>
</div>
</div>
</div>
</div>
SGGL/FineUIPro.Web/common/mainProject.aspx.cs
+17 -5
View File
@@ -38,11 +38,10 @@ namespace FineUIPro.Web.common
// 获取项目数据
var project = ProjectService.GetProjectByProjectId(projectId);
//项目总工期
int projectDays = 0;
int endDays = 0;
if (project.StartDate.HasValue && project.EndDate.HasValue)
if (project != null && project.StartDate.HasValue && project.EndDate.HasValue)
{
int pdays = (project.EndDate.Value - project.StartDate.Value).Days;
if (pdays >= 0)
@@ -70,12 +69,18 @@ namespace FineUIPro.Web.common
var list = AccidentWarningService.GetYearsTodayList();
var dateNow = DateTime.Now.ToString("yyyy-MM");
//风险
var getHazardFactorList = Funs.DB.Sp_HazardFactor_Statistics(dateNow.Split('-')[0], dateNow.Split('-')[1], projectId).ToList();
//安全危害因素
var getHazardFactorList = Funs.DB.Sp_HazardFactor_Statistics(dateNow.Split('-')[0], dateNow.Split('-')[1], string.Empty, projectId).ToList();
var lowRisk = getHazardFactorList.Where(x => x.Title == "低风险").FirstOrDefault();
var generalRisk = getHazardFactorList.Where(x => x.Title == "一般风险").FirstOrDefault();
var largerRisk = getHazardFactorList.Where(x => x.Title == "较大风险").FirstOrDefault();
var majorRisk = getHazardFactorList.Where(x => x.Title == "重大风险").FirstOrDefault();
//职业健康危害因素
var getHazardFactorOccHealthList = Funs.DB.Sp_HazardFactorOccHealth_Statistics(dateNow.Split('-')[0], dateNow.Split('-')[1], string.Empty, projectId).ToList();
var lowRiskOcc = getHazardFactorOccHealthList.Where(x => x.Title == "低风险").FirstOrDefault();
var generalRiskOcc = getHazardFactorOccHealthList.Where(x => x.Title == "一般风险").FirstOrDefault();
var largerRiskOcc = getHazardFactorOccHealthList.Where(x => x.Title == "较大风险").FirstOrDefault();
var majorRiskOcc = getHazardFactorOccHealthList.Where(x => x.Title == "重大风险").FirstOrDefault();
// 构造返回数据
return new
@@ -90,7 +95,7 @@ namespace FineUIPro.Web.common
participateInNum = hsseData != null ? hsseData.JoinConstructionPersonNum ?? 0 : 0,
dangerousProject = hsseData != null ? hsseData.MajorProjectsUnderConstructionNum ?? 0 : 0,
projectDays = projectDays,//项目总工期
projectEndDate = project.EndDate != null ? string.Format("{0:yyyy-MM-dd}", project.EndDate) : string.Empty,//项目到期时间
projectEndDate = project != null && project.EndDate != null ? string.Format("{0:yyyy-MM-dd}", project.EndDate) : string.Empty,//项目到期时间
projectEndDays = endDays > 0 ? endDays : 0,//合同倒计时
},
hazardFactor = new
@@ -99,6 +104,13 @@ namespace FineUIPro.Web.common
generalRiskNum = generalRisk != null ? generalRisk.Num : 0,
largerRiskNum = largerRisk != null ? largerRisk.Num : 0,
majorRiskNum = majorRisk != null ? majorRisk.Num : 0,
},
hazardFactorOcc = new
{//职业健康危害因素
lowRiskNum = lowRiskOcc != null ? lowRiskOcc.Num : 0,
generalRiskNum = generalRiskOcc != null ? generalRiskOcc.Num : 0,
largerRiskNum = largerRiskOcc != null ? largerRiskOcc.Num : 0,
majorRiskNum = majorRiskOcc != null ? majorRiskOcc.Num : 0,
}
//meetAnEmergency = new
//{