diff --git a/.vs/SGGL_SeDin_New/v17/.wsuo b/.vs/SGGL_SeDin_New/v17/.wsuo index f619c8e5..c277452a 100644 Binary files a/.vs/SGGL_SeDin_New/v17/.wsuo and b/.vs/SGGL_SeDin_New/v17/.wsuo differ diff --git a/.vs/SGGL_SeDin_New/v17/DocumentLayout.json b/.vs/SGGL_SeDin_New/v17/DocumentLayout.json index 2bf4a7d0..8157d0f2 100644 --- a/.vs/SGGL_SeDin_New/v17/DocumentLayout.json +++ b/.vs/SGGL_SeDin_New/v17/DocumentLayout.json @@ -66,6 +66,10 @@ { "$type": "Bookmark", "Name": "ST:0:0:{aa2115a1-9712-457b-9047-dbb71ca2cdd2}" + }, + { + "$type": "Bookmark", + "Name": "ST:0:0:{5726b0e3-1012-5233-81f9-d1fad48e7a56}" } ] } diff --git a/SGGL/WebAPI/Controllers/DataSync/CNCECServerController.cs b/SGGL/WebAPI/Controllers/DataSync/CNCECServerController.cs index 4be7dfcb..324f3f5d 100644 --- a/SGGL/WebAPI/Controllers/DataSync/CNCECServerController.cs +++ b/SGGL/WebAPI/Controllers/DataSync/CNCECServerController.cs @@ -3,6 +3,7 @@ using Model; using System; using System.Collections.Generic; using System.Linq; +using System.Threading.Tasks; using System.Web; using System.Web.Http; using System.Web.Mvc; @@ -119,7 +120,7 @@ namespace WebAPI.Controllers /// 获取安全统计数据 /// /// - public Model.ReturnData PostGetHSSEData() + public async Task PostGetHSSEData() { var returnData = new Model.ReturnData(); returnData.type = "HSSE"; @@ -131,7 +132,7 @@ namespace WebAPI.Controllers { try { - returnData.data = HSSEData_HSSEService.GetTodayHSSEData_HSSE().Result; + returnData.data = await HSSEData_HSSEService.GetTodayHSSEData_HSSE(); } catch (Exception ex)