diff --git a/SUBQHSE/FineUIPro.Web/common/mainnew.aspx b/SUBQHSE/FineUIPro.Web/common/mainnew.aspx index dda64e7..f7cb6e9 100644 --- a/SUBQHSE/FineUIPro.Web/common/mainnew.aspx +++ b/SUBQHSE/FineUIPro.Web/common/mainnew.aspx @@ -697,7 +697,7 @@ const that = this; $.ajax({ type: "POST", - url: "mainnew.aspx/GetHSSEData", // 调用后台WebMethod + url: "mainnew.aspx/GetHSSEData", //调用后台WebMethod contentType: "application/json; charset=utf-8", dataType: "json", success: function (response) { diff --git a/SUBQHSE/FineUIPro.Web/common/mainnew.aspx.cs b/SUBQHSE/FineUIPro.Web/common/mainnew.aspx.cs index 0d79440..698937a 100644 --- a/SUBQHSE/FineUIPro.Web/common/mainnew.aspx.cs +++ b/SUBQHSE/FineUIPro.Web/common/mainnew.aspx.cs @@ -107,17 +107,17 @@ namespace FineUIPro.Web.common shutdownProject = hSSEData.ShutdownNum ?? 0,//停工项目 participateInNum = hSSEData.JoinConstructionPersonNum ?? 0,//参建人数 dangerousProject = hSSEData.MajorProjectsUnderConstructionNum ?? 0,//在施危大工程 - chinaData = (from project in projects - join city in Funs.DB.RealName_City - on new { Province = project.Province, Country = project.Country } - equals new { Province = city.ProvinceCode, Country = city.CountryId } - group city by city.Cname into g - select new - { - name = g.Key, - value = g.Count() - }).ToList(),//项目地图数据 }, + chinaData = (from project in projects + join city in Funs.DB.RealName_City + on new { Province = project.Province, Country = project.Country } + equals new { Province = city.ProvinceCode, Country = city.CountryId } + group city by city.Cname into g + select new + { + name = g.Key, + value = g.Count() + }).ToList(),//项目地图数据 specialEquipmentSys = 0,//特种设备质保体系【暂无】 designBriefing = 0,//图纸会审、设计交底 education = new