diff --git a/.vs/LonglslandExhibitionCenterAPI/FileContentIndex/1e0d793a-ea38-4f81-b159-e0634822069f.vsidx b/.vs/LonglslandExhibitionCenterAPI/FileContentIndex/1e0d793a-ea38-4f81-b159-e0634822069f.vsidx
deleted file mode 100644
index 336c18a..0000000
Binary files a/.vs/LonglslandExhibitionCenterAPI/FileContentIndex/1e0d793a-ea38-4f81-b159-e0634822069f.vsidx and /dev/null differ
diff --git a/.vs/LonglslandExhibitionCenterAPI/FileContentIndex/21068f43-bbc5-41bd-a65b-b91ba71e36b3.vsidx b/.vs/LonglslandExhibitionCenterAPI/FileContentIndex/21068f43-bbc5-41bd-a65b-b91ba71e36b3.vsidx
new file mode 100644
index 0000000..be2ce3a
Binary files /dev/null and b/.vs/LonglslandExhibitionCenterAPI/FileContentIndex/21068f43-bbc5-41bd-a65b-b91ba71e36b3.vsidx differ
diff --git a/.vs/LonglslandExhibitionCenterAPI/FileContentIndex/600ecd04-49cc-48f9-986b-697dad1df939.vsidx b/.vs/LonglslandExhibitionCenterAPI/FileContentIndex/600ecd04-49cc-48f9-986b-697dad1df939.vsidx
new file mode 100644
index 0000000..1e197a3
Binary files /dev/null and b/.vs/LonglslandExhibitionCenterAPI/FileContentIndex/600ecd04-49cc-48f9-986b-697dad1df939.vsidx differ
diff --git a/.vs/LonglslandExhibitionCenterAPI/FileContentIndex/568e026b-5244-4f8e-a3a7-5243abf6d971.vsidx b/.vs/LonglslandExhibitionCenterAPI/FileContentIndex/86b7b8e7-fe71-4dad-89d7-368eaaab63bd.vsidx
similarity index 99%
rename from .vs/LonglslandExhibitionCenterAPI/FileContentIndex/568e026b-5244-4f8e-a3a7-5243abf6d971.vsidx
rename to .vs/LonglslandExhibitionCenterAPI/FileContentIndex/86b7b8e7-fe71-4dad-89d7-368eaaab63bd.vsidx
index 5e90bcc..f84c75b 100644
Binary files a/.vs/LonglslandExhibitionCenterAPI/FileContentIndex/568e026b-5244-4f8e-a3a7-5243abf6d971.vsidx and b/.vs/LonglslandExhibitionCenterAPI/FileContentIndex/86b7b8e7-fe71-4dad-89d7-368eaaab63bd.vsidx differ
diff --git a/.vs/LonglslandExhibitionCenterAPI/FileContentIndex/a5d893dc-d49b-4308-8bb2-34441496440a.vsidx b/.vs/LonglslandExhibitionCenterAPI/FileContentIndex/a5d893dc-d49b-4308-8bb2-34441496440a.vsidx
new file mode 100644
index 0000000..71650af
Binary files /dev/null and b/.vs/LonglslandExhibitionCenterAPI/FileContentIndex/a5d893dc-d49b-4308-8bb2-34441496440a.vsidx differ
diff --git a/.vs/LonglslandExhibitionCenterAPI/FileContentIndex/beb20321-0163-44e0-8f1d-2e3b3c70a243.vsidx b/.vs/LonglslandExhibitionCenterAPI/FileContentIndex/beb20321-0163-44e0-8f1d-2e3b3c70a243.vsidx
deleted file mode 100644
index 70e6b52..0000000
Binary files a/.vs/LonglslandExhibitionCenterAPI/FileContentIndex/beb20321-0163-44e0-8f1d-2e3b3c70a243.vsidx and /dev/null differ
diff --git a/.vs/LonglslandExhibitionCenterAPI/FileContentIndex/c8506c44-a92f-4782-a0a2-99d0df31aa64.vsidx b/.vs/LonglslandExhibitionCenterAPI/FileContentIndex/c8506c44-a92f-4782-a0a2-99d0df31aa64.vsidx
deleted file mode 100644
index d7532e0..0000000
Binary files a/.vs/LonglslandExhibitionCenterAPI/FileContentIndex/c8506c44-a92f-4782-a0a2-99d0df31aa64.vsidx and /dev/null differ
diff --git a/.vs/LonglslandExhibitionCenterAPI/v17/.suo b/.vs/LonglslandExhibitionCenterAPI/v17/.suo
index cdf000a..ce9ae6f 100644
Binary files a/.vs/LonglslandExhibitionCenterAPI/v17/.suo and b/.vs/LonglslandExhibitionCenterAPI/v17/.suo differ
diff --git a/.vs/LonglslandExhibitionCenterAPI/v17/HierarchyCache.v1.txt b/.vs/LonglslandExhibitionCenterAPI/v17/HierarchyCache.v1.txt
index b80a1ce..d67fcb5 100644
Binary files a/.vs/LonglslandExhibitionCenterAPI/v17/HierarchyCache.v1.txt and b/.vs/LonglslandExhibitionCenterAPI/v17/HierarchyCache.v1.txt differ
diff --git a/LonglslandExhibitionCenter/Controllers/api/GetDailyElectricityController.cs b/LonglslandExhibitionCenter/Controllers/api/GetDailyElectricityController.cs
index 1d6f862..5ffcde8 100644
--- a/LonglslandExhibitionCenter/Controllers/api/GetDailyElectricityController.cs
+++ b/LonglslandExhibitionCenter/Controllers/api/GetDailyElectricityController.cs
@@ -48,7 +48,7 @@ namespace LonglslandExhibitionCenter.Controllers.api
                     var model = new daily_electricityData
                     {
                         time = DateTime.Now.AddHours(-i).ToString("HH:00"),
-                        EH = num1 - num2
+                        EH =Convert.ToDecimal(Math.Round(Convert.ToDouble(num1 - num2),3))
                     };
                     if (model.EH < 0)
                     {
diff --git a/LonglslandExhibitionCenter/Controllers/api/GetElctricityConsumptionController.cs b/LonglslandExhibitionCenter/Controllers/api/GetElctricityConsumptionController.cs
index 651c2e2..7684dfb 100644
--- a/LonglslandExhibitionCenter/Controllers/api/GetElctricityConsumptionController.cs
+++ b/LonglslandExhibitionCenter/Controllers/api/GetElctricityConsumptionController.cs
@@ -64,7 +64,7 @@ namespace LonglslandExhibitionCenter.Controllers.api
                             var model = new electricity_consumptionData()
                             {
                                 time = DateTime.Now.AddMonths(-i).ToString("MM月"),
-                                EH = num1 - num2
+                                EH = Convert.ToDecimal(Math.Round(Convert.ToDouble(num1 - num2), 3))
                             };
                             if (model.EH < 0)
                             {
@@ -107,7 +107,7 @@ namespace LonglslandExhibitionCenter.Controllers.api
                             var model = new electricity_consumptionData()
                             {
                                 time = DateTime.Now.AddYears(-i).ToString("yyyy年"),
-                                EH = num1 - num2
+                                EH = Convert.ToDecimal(Math.Round(Convert.ToDouble(num1 - num2),3))
                             };
                             if (model.EH < 0)
                             {
diff --git a/LonglslandExhibitionCenter/Controllers/api/GetElectricalConditionController.cs b/LonglslandExhibitionCenter/Controllers/api/GetElectricalConditionController.cs
index d036c18..69c128b 100644
--- a/LonglslandExhibitionCenter/Controllers/api/GetElectricalConditionController.cs
+++ b/LonglslandExhibitionCenter/Controllers/api/GetElectricalConditionController.cs
@@ -43,7 +43,7 @@ namespace LonglslandExhibitionCenter.Controllers.api
                 var amodel = new electrical_conditionData()
                 {
                     EH = jlist1.Sum(x => x.EH) - slist1.Sum(x => x.EH),
-                    Electricity =Convert.ToDecimal(Convert.ToDouble(jlist1.Sum(x => x.EH) - slist1.Sum(x => x.EH))*1.80)
+                    Electricity =Convert.ToDecimal(Math.Round( Convert.ToDouble(jlist1.Sum(x => x.EH) - slist1.Sum(x => x.EH))*1.80,3))
                 };
                 data.Add(amodel);
                 #endregion
@@ -55,7 +55,7 @@ namespace LonglslandExhibitionCenter.Controllers.api
                 var bmodel = new electrical_conditionData()
                 {
                     EH = jlist2.Sum(x => x.EH) - slist2.Sum(x => x.EH),
-                    Electricity = Convert.ToDecimal(Convert.ToDouble(jlist2.Sum(x => x.EH) - slist2.Sum(x => x.EH)) * 1.80)
+                    Electricity = Convert.ToDecimal(Math.Round(Convert.ToDouble(jlist2.Sum(x => x.EH) - slist2.Sum(x => x.EH)) * 1.80,3))
                 };
                 data.Add(bmodel);
                 #endregion
@@ -73,7 +73,7 @@ namespace LonglslandExhibitionCenter.Controllers.api
                 var cmodel = new electrical_conditionData()
                 {
                     EH = jlist3.Sum(x => x.EH) - slist3.Sum(x => x.EH),
-                    Electricity = Convert.ToDecimal(Convert.ToDouble(jlist3.Sum(x => x.EH) - slist3.Sum(x => x.EH)) * 1.80)
+                    Electricity = Convert.ToDecimal(Math.Round(Convert.ToDouble(jlist3.Sum(x => x.EH) - slist3.Sum(x => x.EH)) * 1.80,3))
                 };
                 data.Add(cmodel);
                 #endregion
diff --git a/LonglslandExhibitionCenter/Controllers/api/GetEnergyCalendarController.cs b/LonglslandExhibitionCenter/Controllers/api/GetEnergyCalendarController.cs
index e520ac3..9a6ee93 100644
--- a/LonglslandExhibitionCenter/Controllers/api/GetEnergyCalendarController.cs
+++ b/LonglslandExhibitionCenter/Controllers/api/GetEnergyCalendarController.cs
@@ -70,7 +70,7 @@ namespace LonglslandExhibitionCenter.Controllers.api
                         var model = new electricity_consumptionData()
                         {
                             time = stime.AddDays(-i).ToString("dd"),
-                            EH = anum - bnum
+                            EH =Convert.ToDecimal(Math.Round(Convert.ToDouble(anum - bnum),3))
                         };
                         data.Add(model);
                     }
diff --git a/LonglslandExhibitionCenter/Controllers/api/GetEnergyFlowController.cs b/LonglslandExhibitionCenter/Controllers/api/GetEnergyFlowController.cs
index a908b5d..1627f52 100644
--- a/LonglslandExhibitionCenter/Controllers/api/GetEnergyFlowController.cs
+++ b/LonglslandExhibitionCenter/Controllers/api/GetEnergyFlowController.cs
@@ -83,7 +83,7 @@ namespace LonglslandExhibitionCenter.Controllers.api
                     }
                     var model = new energy_flowData()
                     {
-                        Amont = anum + bnum
+                        Amont = Convert.ToDecimal(Math.Round(Convert.ToDouble(anum + bnum),3))
                     };
                     #endregion
                     var adata = new List<energy_flow>();
@@ -114,7 +114,7 @@ namespace LonglslandExhibitionCenter.Controllers.api
                         var blist = bll.GetModelListDate(" EntireTime='" + eedate1 + "' && Reserve2 like '%空调%'", etime);
                         bnum += alist.Sum(x => x.EH) - blist.Sum(x => x.EH);
                     }
-                    amodel.AirConditioner = anum + bnum;
+                    amodel.AirConditioner =Convert.ToDecimal(Math.Round(Convert.ToDouble(anum + bnum),3));
                     #endregion
                     #region 照明
                     anum = 0;
@@ -142,7 +142,7 @@ namespace LonglslandExhibitionCenter.Controllers.api
                         var blist = bll.GetModelListDate(" EntireTime='" + eedate1 + "' && Reserve2 like '%照明%'", etime);
                         bnum += alist.Sum(x => x.EH) - blist.Sum(x => x.EH);
                     }
-                    amodel.Illumination = anum + bnum;
+                    amodel.Illumination =Convert.ToDecimal(Math.Round(Convert.ToDouble(anum + bnum),3));
                     #endregion
                     #region 电梯
                     anum = 0;
@@ -170,7 +170,7 @@ namespace LonglslandExhibitionCenter.Controllers.api
                         var blist = bll.GetModelListDate(" EntireTime='" + eedate1 + "' && Reserve2 like '%电梯%'", etime);
                         bnum += alist.Sum(x => x.EH) - blist.Sum(x => x.EH);
                     }
-                    amodel.Elevator = anum + bnum;
+                    amodel.Elevator =Convert.ToDecimal(Math.Round(Convert.ToDouble(anum + bnum),3));
                     #endregion
                     adata.Add(amodel);
                     model.data = adata;
diff --git a/LonglslandExhibitionCenter/Controllers/api/GetEnergyIndexingController.cs b/LonglslandExhibitionCenter/Controllers/api/GetEnergyIndexingController.cs
index 500f995..cc12729 100644
--- a/LonglslandExhibitionCenter/Controllers/api/GetEnergyIndexingController.cs
+++ b/LonglslandExhibitionCenter/Controllers/api/GetEnergyIndexingController.cs
@@ -71,7 +71,7 @@ namespace LonglslandExhibitionCenter.Controllers.api
                             var model = new energy_indexingData()
                             {
                                 time = now.AddMonths(-i).ToString("MM月"),
-                                EnergyIndexing=num
+                                EnergyIndexing =Convert.ToDecimal(Math.Round(Convert.ToDouble( num / 26010),3))
                             };
                             data.Add(model);
                         }
@@ -109,7 +109,7 @@ namespace LonglslandExhibitionCenter.Controllers.api
                             var model = new energy_indexingData()
                             {
                                 time = now.AddYears(-i).ToString("yyyy"),
-                                EnergyIndexing = num
+                                EnergyIndexing = Convert.ToDecimal(Math.Round(Convert.ToDouble(num/26010),3))
                             };
                             data.Add(model);
 
diff --git a/LonglslandExhibitionCenter/Controllers/api/GetGeneralSituationController.cs b/LonglslandExhibitionCenter/Controllers/api/GetGeneralSituationController.cs
index ffd9738..3b5d593 100644
--- a/LonglslandExhibitionCenter/Controllers/api/GetGeneralSituationController.cs
+++ b/LonglslandExhibitionCenter/Controllers/api/GetGeneralSituationController.cs
@@ -27,7 +27,7 @@ namespace LonglslandExhibitionCenter.Controllers.api
                     {
                         Operation = 83,
                         Stop = 0,
-                        Area = 830000,
+                        Area = Convert.ToDecimal(2.601),
                         Amount = 83
                     };
                     data.Add(model);                
diff --git a/LonglslandExhibitionCenter/Controllers/api/GetLoopRankingController.cs b/LonglslandExhibitionCenter/Controllers/api/GetLoopRankingController.cs
index c012af0..bbeb15d 100644
--- a/LonglslandExhibitionCenter/Controllers/api/GetLoopRankingController.cs
+++ b/LonglslandExhibitionCenter/Controllers/api/GetLoopRankingController.cs
@@ -67,7 +67,6 @@ namespace LonglslandExhibitionCenter.Controllers.api
                     }
                    
                 }
-
                 res.code = 200;
                 res.msg = "成功";
                 res.data = bdata;
diff --git a/LonglslandExhibitionCenter/Controllers/api/GetSystemRankingController.cs b/LonglslandExhibitionCenter/Controllers/api/GetSystemRankingController.cs
index 9625dc4..e61796c 100644
--- a/LonglslandExhibitionCenter/Controllers/api/GetSystemRankingController.cs
+++ b/LonglslandExhibitionCenter/Controllers/api/GetSystemRankingController.cs
@@ -49,7 +49,7 @@ namespace LonglslandExhibitionCenter.Controllers.api
                 var eflist = list.Where(x => x.Reserve2.Contains("展陈") && x.EntireTime == edate).ToList();
                 var model1=new system_rankingData();
                 model1.name = "空调系统";
-                model1.EH = salist.Sum(x => x.EH)-ealist.Sum(x=>x.EH);
+                model1.EH =Convert.ToDecimal(Math.Round(Convert.ToDouble(salist.Sum(x => x.EH)-ealist.Sum(x=>x.EH)),3));
                 if (model1.EH < 0)
                 {
                     model1.EH = 0;  
@@ -57,7 +57,7 @@ namespace LonglslandExhibitionCenter.Controllers.api
                 data.Add(model1);
                 var model2=new system_rankingData();
                 model2.name = "照明系统";
-                model2.EH=sblist.Sum(x=>x.EH)-eblist.Sum(x=>x.EH);
+                model2.EH=Convert.ToDecimal(Math.Round(Convert.ToDouble(sblist.Sum(x=>x.EH)-eblist.Sum(x=>x.EH)),3));
                 if(model2.EH < 0)
                 {
                     model2.EH = 0;
@@ -65,14 +65,14 @@ namespace LonglslandExhibitionCenter.Controllers.api
                 data.Add(model2);
                 var model3=new system_rankingData();
                 model3.name = "消防系统";
-                model3.EH=sclist.Sum(x=>x.EH)-eclist.Sum(x=>x.EH);
+                model3.EH=Convert.ToDecimal(Math.Round(Convert.ToDouble(sclist.Sum(x=>x.EH)-eclist.Sum(x=>x.EH)),3));
                 if (model3.EH < 0)
                 {
                     model3.EH = 0;
                 }
                 var model4=new system_rankingData();
                 model4.name = "电梯系统";
-                model4.EH=selist.Sum(x=>x.EH)-eelist.Sum(x=>x.EH);
+                model4.EH=Convert.ToDecimal(Math.Round(Convert.ToDouble(selist.Sum(x=>x.EH)-eelist.Sum(x=>x.EH)),3));
                 if (model4.EH < 0)
                 {
                     model4.EH = 0;
@@ -80,7 +80,7 @@ namespace LonglslandExhibitionCenter.Controllers.api
                 data.Add(model4);
                 var model5=new system_rankingData();
                 model5.name = "展陈系统";
-                model5.EH=sflist.Sum(x=>x.EH)-eflist.Sum(x=>x.EH);
+                model5.EH=Convert.ToDecimal(Math.Round(Convert.ToDouble(sflist.Sum(x=>x.EH)-eflist.Sum(x=>x.EH)),3));
                 if (model5.EH < 0)
                 {
                     model5.EH = 0;
diff --git a/LonglslandExhibitionCenter/Controllers/api/GetTotalEnergyController.cs b/LonglslandExhibitionCenter/Controllers/api/GetTotalEnergyController.cs
index ae2e853..eef8115 100644
--- a/LonglslandExhibitionCenter/Controllers/api/GetTotalEnergyController.cs
+++ b/LonglslandExhibitionCenter/Controllers/api/GetTotalEnergyController.cs
@@ -56,11 +56,11 @@ namespace LonglslandExhibitionCenter.Controllers.api
                             var edate = now.AddDays(-i).ToString("yyyy-MM-dd 00:00:00");
                             var alist = list.Where(x => x.EntireTime == Convert.ToDateTime(sdate)).ToList();
                             var blist=list.Where(x=>x.EntireTime==Convert.ToDateTime(edate)).ToList();
-                            var num=alist.Sum(x=>x.EH)-blist.Sum(x=>x.EH);
+                            var num= alist.Sum(x=>x.EH)-blist.Sum(x=>x.EH);
                             var model = new total_energyData()
                             {
                                 time = DateTime.Now.AddDays(-i).ToString("MM-dd"),
-                                EH = num
+                                EH = num* Convert.ToDecimal(1.229)
                             };
                             data.Add(model);
                         }
@@ -98,7 +98,7 @@ namespace LonglslandExhibitionCenter.Controllers.api
                             var model = new total_energyData()
                             {
                                 time = Convert.ToDateTime(now).AddMonths(-i).ToString("MM月"),
-                                EH = num
+                                EH = num*Convert.ToDecimal(1.229)
                             };
                             data.Add(model);
                         }
diff --git a/LonglslandExhibitionCenter/bin/LonglslandExhibitionCenter.dll b/LonglslandExhibitionCenter/bin/LonglslandExhibitionCenter.dll
index 36aa112..47fd97b 100644
Binary files a/LonglslandExhibitionCenter/bin/LonglslandExhibitionCenter.dll and b/LonglslandExhibitionCenter/bin/LonglslandExhibitionCenter.dll differ
diff --git a/LonglslandExhibitionCenter/bin/LonglslandExhibitionCenter.pdb b/LonglslandExhibitionCenter/bin/LonglslandExhibitionCenter.pdb
index 8d427a3..f27891f 100644
Binary files a/LonglslandExhibitionCenter/bin/LonglslandExhibitionCenter.pdb and b/LonglslandExhibitionCenter/bin/LonglslandExhibitionCenter.pdb differ
diff --git a/LonglslandExhibitionCenter/obj/Debug/LonglslandExhibitionCenter.dll b/LonglslandExhibitionCenter/obj/Debug/LonglslandExhibitionCenter.dll
index 36aa112..47fd97b 100644
Binary files a/LonglslandExhibitionCenter/obj/Debug/LonglslandExhibitionCenter.dll and b/LonglslandExhibitionCenter/obj/Debug/LonglslandExhibitionCenter.dll differ
diff --git a/LonglslandExhibitionCenter/obj/Debug/LonglslandExhibitionCenter.pdb b/LonglslandExhibitionCenter/obj/Debug/LonglslandExhibitionCenter.pdb
index 8d427a3..f27891f 100644
Binary files a/LonglslandExhibitionCenter/obj/Debug/LonglslandExhibitionCenter.pdb and b/LonglslandExhibitionCenter/obj/Debug/LonglslandExhibitionCenter.pdb differ