Skip to content

Commit 5e93832

Browse files
committed
报表修改
1 parent fe062b5 commit 5e93832

File tree

4 files changed

+71
-19
lines changed

4 files changed

+71
-19
lines changed

App/Controllers/VZHENGSHULEIBEITONGJIFENXIController.cs

+21-8
Original file line numberDiff line numberDiff line change
@@ -46,18 +46,31 @@ public JsonResult GetData(string id, int page, int rows, string order, string so
4646

4747
int total = 0;
4848
List<VZHENGSHULEIBEITONGJIFENXI> queryData = m_BLL.GetByParam(id, page, rows, order, sort, search, ref total);
49+
List<VZHENGSHULEIBEITONGJIFENXI> queryData2 = new List<VZHENGSHULEIBEITONGJIFENXI>();
50+
var date = queryData.GroupBy(m => (new { ZHEGNSHUBAOGAOLEIBIE = m.ZHEGNSHUBAOGAOLEIBIE, SHOUQUANZIZHI = m.SHOUQUANZIZHI })).Select(g => (new
51+
{
52+
ZHEGNSHUBAOGAOLEIBIE = g.Key.ZHEGNSHUBAOGAOLEIBIE,
53+
SHOUQUANZIZHI = g.Key.SHOUQUANZIZHI,
54+
BAOGAOSHULIANG = g.Key.ZHEGNSHUBAOGAOLEIBIE.Count()
55+
}));
56+
int w = date.Count();
4957
return Json(new datagrid
5058
{
5159
total = total,
52-
rows = queryData.Select(s => new
60+
rows = date.Select(s => new
5361
{
54-
ID = s.ID
55-
,SUOSHUDANWEI = s.SUOSHUDANWEI
56-
,ZHENGSHUDANWEI = s.ZHENGSHUDANWEI
57-
,SHOULIDANWEI = s.SHOULIDANWEI
58-
,PIZHUNJIELUN = s.PIZHUNJIELUN
59-
,PIZHUNSHIJIAN = s.PIZHUNSHIJIAN
60-
,SHOUQUANZIZHI = s.SHOUQUANZIZHI
62+
ID = ""
63+
,SUOSHUDANWEI = ""
64+
,
65+
ZHENGSHUDANWEI = ""
66+
,
67+
SHOULIDANWEI = ""
68+
,
69+
PIZHUNJIELUN = ""
70+
,
71+
PIZHUNSHIJIAN = ""
72+
,
73+
SHOUQUANZIZHI = s.SHOUQUANZIZHI
6174
,
6275
ZHEGNSHUBAOGAOLEIBIE = s.ZHEGNSHUBAOGAOLEIBIE
6376
,

App/Views/Account/Index.cshtml

+1-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
</div>
6666
<div class="col-lg-12 login-foot">
6767
<p class="text-center"> 国网冀北电力公司版权所有 </p>
68-
<p class="text-center"> SYS17.02.22 </p>
68+
<p class="text-center"> SYS17.02.23 </p>
6969
</div>
7070
<div id="div_fail" class="reveal-modal1 text-center">
7171

App/Views/VZHENGSHULEIBEITONGJIFENXI/Index.cshtml

+40-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
@model Langben.DAL.VZHENGSHULEIBEITONGJIFENXI
2-
@{ Layout = "~/Views/Shared/Index.cshtml"; }
2+
@{ Layout = "~/Views/Shared/Echart.cshtml"; }
33
@using Common
44
@using Models
55
<div id="divQuery">
@@ -68,10 +68,49 @@
6868
onLoadSuccess: function (data) {
6969
var rows = $('#flexigridData').datagrid('getRows');
7070
var total = 0;
71+
var data2 = [];
72+
var data3 = [];
7173
for (var i = 0; i < rows.length; i++) {
7274
total += parseFloat(rows[i].BAOGAOSHULIANG);
75+
data2.push(rows[i].ZHEGNSHUBAOGAOLEIBIE);
76+
data3.push({ value: rows[i].SHOUQUANZIZHI, name: rows[i].ZHEGNSHUBAOGAOLEIBIE });
7377
}
7478
$('#flexigridData').datagrid('appendRow', { ZHEGNSHUBAOGAOLEIBIE: '<b>统计:</b>', BAOGAOSHULIANG: total });
79+
//图表
80+
var myChart = echarts.init(document.getElementById('main'));
81+
var option = {
82+
title: {
83+
text: '证书类别统计分析图表',
84+
//subtext: '纯属虚构',
85+
x: 'center'
86+
},
87+
tooltip: {
88+
trigger: 'item',
89+
formatter: "{a} <br/>{b} : {c} ({d}%)"
90+
},
91+
legend: {
92+
orient: 'vertical',
93+
left: 'left',
94+
data: data2
95+
},
96+
series: [
97+
{
98+
name: '访问来源',
99+
type: 'pie',
100+
radius: '55%',
101+
center: ['50%', '60%'],
102+
data:data3,
103+
itemStyle: {
104+
emphasis: {
105+
shadowBlur: 10,
106+
shadowOffsetX: 0,
107+
shadowColor: 'rgba(0, 0, 0, 0.5)'
108+
}
109+
}
110+
}
111+
]
112+
};
113+
myChart.setOption(option);
75114
},
76115
showFooter: true,
77116
toolbar: [

DAL/VZHENGSHULEIBEITONGJIFENXIRepository.cs

+9-9
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public IQueryable<VZHENGSHULEIBEITONGJIFENXI> GetData(SysEntities db, string ord
4747
}
4848
flagWhere++;
4949

50-
50+
5151
if (!string.IsNullOrWhiteSpace(item.Key) && !string.IsNullOrWhiteSpace(item.Value) && item.Key.Contains(Start_Int)) //开始数值
5252
{
5353
where += "it.[" + item.Key.Remove(item.Key.IndexOf(Start_Int)) + "] >= " + item.Value.GetInt();
@@ -58,7 +58,7 @@ public IQueryable<VZHENGSHULEIBEITONGJIFENXI> GetData(SysEntities db, string ord
5858
where += "it.[" + item.Key.Remove(item.Key.IndexOf(End_Int)) + "] <= " + item.Value.GetInt();
5959
continue;
6060
}
61-
61+
6262
if (!string.IsNullOrWhiteSpace(item.Key) && !string.IsNullOrWhiteSpace(item.Value) && item.Key.Contains(DDL_Int)) //精确查询数值
6363
{
6464
where += "it.[" + item.Key.Remove(item.Key.IndexOf(DDL_Int)) + "] =" + item.Value;
@@ -72,7 +72,7 @@ public IQueryable<VZHENGSHULEIBEITONGJIFENXI> GetData(SysEntities db, string ord
7272
where += "it.[" + item.Key + "] like '%" + item.Value + "%'";//模糊查询
7373
}
7474
}
75-
var data =((System.Data.Entity.Infrastructure.IObjectContextAdapter)db).ObjectContext
75+
var data = ((System.Data.Entity.Infrastructure.IObjectContextAdapter)db).ObjectContext
7676
.CreateObjectSet<VZHENGSHULEIBEITONGJIFENXI>().Where(string.IsNullOrEmpty(where) ? "true" : where)
7777
.OrderBy("it.[" + sort.GetString() + "] " + order.GetString())
7878
.AsQueryable();
@@ -83,7 +83,7 @@ public IQueryable<VZHENGSHULEIBEITONGJIFENXI> GetData(SysEntities db, string ord
8383
if (null != endTime)
8484
{
8585
data = data.Where(m => endTime > m.PIZHUNSHIJIAN);
86-
}
86+
}
8787
return data;
8888
}
8989
/// <summary>
@@ -96,20 +96,20 @@ public VZHENGSHULEIBEITONGJIFENXI GetById(string id)
9696
using (SysEntities db = new SysEntities())
9797
{
9898
return GetById(db, id);
99-
}
99+
}
100100
}
101101
/// <summary>
102102
/// 通过主键id,获取证书类别统计分析---查看详细,首次编辑
103103
/// </summary>
104104
/// <param name="id">主键</param>
105105
/// <returns>证书类别统计分析</returns>
106106
public VZHENGSHULEIBEITONGJIFENXI GetById(SysEntities db, string id)
107-
{
108-
return db.VZHENGSHULEIBEITONGJIFENXI.SingleOrDefault(s => s.ID == id);
107+
{
108+
return db.VZHENGSHULEIBEITONGJIFENXI.SingleOrDefault(s => s.ID == id);
109109
}
110-
110+
111111
public void Dispose()
112-
{
112+
{
113113
}
114114
}
115115
}

0 commit comments

Comments
 (0)