From 0cb9153b95a3173707ee254723db1723ccccc1aa Mon Sep 17 00:00:00 2001
From: shilixia <2309368887@qq.com>
Date: Thu, 24 Oct 2019 15:30:49 +0800
Subject: [PATCH] phh
---
groups/templates/groups/troublepic.html | 83 +++++++++++--------------
groups/views.py | 15 +++--
2 files changed, 47 insertions(+), 51 deletions(-)
diff --git a/groups/templates/groups/troublepic.html b/groups/templates/groups/troublepic.html
index 6f3a5fd4..3fa06d89 100644
--- a/groups/templates/groups/troublepic.html
+++ b/groups/templates/groups/troublepic.html
@@ -8,27 +8,14 @@
-
-
年
-
-
-
月
-
-
+
+
+
@@ -36,6 +23,10 @@
+
+
+
+
@@ -44,35 +35,37 @@
$(function () {
-
- var currentYear = new Date().getFullYear();
- var select = document.getElementById("YearNum");
- for (var i = 0; i <= 3; i++) {
- var theOption = document.createElement("option");
- theOption.innerHTML = currentYear - i;
- theOption.value = currentYear - i;
- select.appendChild(theOption);
- }
- var date = new Date();
- var year = date.getFullYear();
- var month = date.getMonth() + 1;
- $("#YearNum").val(year);
- $("#banqType").val(month);
+
+ $('.datepicker').datepicker({
+ language: 'zh-CN',
+ format: 'yyyy-mm-dd hh:00:00',//日期格式。可以将日期格式,定成年月日时,分秒为0。
+ weekStart: 1,
+ todayBtn: 1,
+ autoclose: 1,
+ todayHighlight: 1,
+ startView: 2,
+ forceParse: 0,
+ showMeridian: 1
+ });
+ var times = $('#time').value;
+ alert(times)
troub();
});
+
+
function funTypeChange() {
+ var times = $('#time').value;
+ alert(times)
troub();
}
function troub() {
- var y = $("#YearNum").val();
- var m = $("#banqType").val();
$.ajax({
type: "get",
async: true, //异步请求(同步请求将会锁住浏览器,用户其他操作必须等待请求完成才可以执行)
- url: "/groups/api/troubleChart?code=tbpic&year=" + y + "&month=" + m, //请求发送
+ url: "/groups/api/troubleChart?code=tbpic&starttime=" + starttime + "&endtime=" + endtime, //请求发送
dataType: "json", //返回数据形式为json
success: function (data) {
console.log(data.data.troublelist);
@@ -83,14 +76,14 @@
var companyName = [];
if (data.data.troublelist != null) {
$.each(data.data.troublelist, function (i, item) {
-
-
+
+
yhnum.push(item.number);
-
+
companyName.push(item.usecomp__partname);
-
+
})
-
+
yhChart.setOption(
option = {
@@ -101,9 +94,9 @@
type: 'shadow' // 默认为直线,可选为:'line' | 'shadow'
}
},
-
+
title: {
- text: '本集团'+y+'年'+m+'月各公司隐患统计图'
+ text: '本集团' + y + '年' + m + '月各公司隐患统计图'
},
tooltip: {},
legend: {
@@ -119,7 +112,7 @@
data: yhnum,
type: 'bar'
}]
-
+
}
);
diff --git a/groups/views.py b/groups/views.py
index 08192b88..767ca28c 100644
--- a/groups/views.py
+++ b/groups/views.py
@@ -120,15 +120,18 @@ def observe(request):#行为观察
return render(request, 'groups/observe.html', locals())
def troubleChart(request):#隐患统计图
code = request.GET.get('code')
- year = int(request.GET.get('year'))
- month =int( request.GET.get('month'))
+
if code=='tbpic':
yhcompanys=[]
yhcompanyscount=[]
- first_day,first_day_of_next_month = gettime(datetime(year,month,1))
+
companys = GroupUser.objects.get(id = request.session['user_id']).group.members.all()
- troublelist = s_models.Trouble.objects.filter(deletemark=1,usecomp__in=companys,fxsj__range=(first_day, first_day_of_next_month)).values('usecomp__partid','usecomp__partname').annotate(number = Count('troubleid'))
- return HttpResponse(json.dumps({'code':1,'data':{'troublelist':list(troublelist)}}), content_type='application/json')
+ troublelist = s_models.Trouble.objects.filter(deletemark=1,usecomp__in=companys).values('usecomp__partid','usecomp__partname').annotate(number = Count('troubleid'))
+ if request.GET.get('starttime'):#开始时间
+ a = troublelist.filter(fxsj__gte=request.GET.get('qssj'))
+ if request.GET.get('endtime'):#结束时间
+ a = troublelist.filter(fxsj__lte=request.GET.get('jssj'))
+ return HttpResponse(json.dumps({'code':1,'data':{'troublelist':list(a)}}), content_type='application/json')
def observeChart(request):#行为观察
code = request.GET.get('code')
year = int(request.GET.get('year'))
@@ -142,7 +145,7 @@ def observeChart(request):#行为观察
rtgcx=[]#人体工程学
hjzj=[]#环境整洁
first_day,first_day_of_next_month = gettime(datetime(year,month,1))
- companys = GroupUser.objects.get(id = request.session['user_id']).group.members.all()
+ companys = GroupUser.objects.get(id = request.session['user_id']).group.members.all().values('partname')
return HttpResponse(json.dumps({'code':1,'data':{'list':list(Observe)},'userfy':userfy,'userwz':userwz,'grfh':grfh,'gjhsb':gjhsb,'cxhbz':cxhbz,'rtgcx':rtgcx,'hjzj':hjzj,}), content_type='application/json')