zcdsj
/
safesite
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

phh

This commit is contained in:
shilixia 2019-10-24 15:30:49 +08:00
parent 4388be95db
commit 0cb9153b95
2 changed files with 47 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
groups/templates/groups/troublepic.html
View File

@ -8,27 +8,14 @@
<h3>隐患统计</h3> <h3>隐患统计</h3>
</div> </div>
<div style="height:600px;width:100%;background-color:aquamarine"> <div style="height:600px;width:100%;background-color:aquamarine">
<div style="width:100%;height:100px;"> <div class="input-group date" data-provide="datepicker">
<select id="YearNum" style="margin-left:5px;height:30px;width:70px;font-size:large"> </select> <span style="font-size:large">年</span> <input type="text" class="form-control" id="time">
<div class="input-group-addon">
<select id="banqType" style="height:30px;width:70px;font-size:large"> <span class="glyphicon glyphicon-th"></span>
<option value="1">1</option>
<option value="2">2</option>
<option value="3">3</option>
<option value="4">4</option>
<option value="5">5</option>
<option value="6">6</option>
<option value="7">7</option>
<option value="8">8</option>
<option value="9">9</option>
<option value="10">10</option>
<option value="11">11</option>
<option value="12">12</option>
</select>
<span style="font-size:large">月</span>
<button class="btn btn-info" onclick="funTypeChange()">&nbsp;查询</button>
</div> </div>
</div>
<button class="btn btn-info" onclick="funTypeChange()">&nbsp;查询</button>
<div id="troubchart" style="width:60%;height:400px;margin:auto"></div> <div id="troubchart" style="width:60%;height:400px;margin:auto"></div>
</div> </div>
@ -36,6 +23,10 @@
<script src="{% static 'groups/bower_components/jquery/dist/jquery.min.js' %}"></script> <script src="{% static 'groups/bower_components/jquery/dist/jquery.min.js' %}"></script>
<!-- Bootstrap 3.3.7 --> <!-- Bootstrap 3.3.7 -->
<script src="{% static 'groups/bower_components/bootstrap/dist/js/bootstrap.min.js' %}"></script> <script src="{% static 'groups/bower_components/bootstrap/dist/js/bootstrap.min.js' %}"></script>
<script src="{% static 'groups/bower_components/bootstrap-datepicker/dist/js/bootstrap-datepicker.min.js' %}"></script>
<script src="{% static 'groups/bower_components/bootstrap-datepicker/dist/locales/bootstrap-datepicker.zh-CN.min.js' %}"></script>
<link rel="stylesheet" href="{% static 'groups/bower_components/bootstrap-datepicker/dist/css/bootstrap-datepicker.min.css' %}">
<!-- iCheck --> <!-- iCheck -->
<script src="{% static 'groups/plugins/iCheck/icheck.min.js' %}"></script> <script src="{% static 'groups/plugins/iCheck/icheck.min.js' %}"></script>
<script src="{% static 'groups/bower_components/echarts.min.js' %}"></script> <script src="{% static 'groups/bower_components/echarts.min.js' %}"></script>
@ -45,34 +36,36 @@
$(function () { $(function () {
var currentYear = new Date().getFullYear(); $('.datepicker').datepicker({
var select = document.getElementById("YearNum"); language: 'zh-CN',
for (var i = 0; i <= 3; i++) { format: 'yyyy-mm-dd hh:00:00',//日期格式。可以将日期格式，定成年月日时，分秒为0。
var theOption = document.createElement("option"); weekStart: 1,
theOption.innerHTML = currentYear - i; todayBtn: 1,
theOption.value = currentYear - i; autoclose: 1,
select.appendChild(theOption); todayHighlight: 1,
} startView: 2,
var date = new Date(); forceParse: 0,
var year = date.getFullYear(); showMeridian: 1
var month = date.getMonth() + 1; });
$("#YearNum").val(year); var times = $('#time').value;
$("#banqType").val(month); alert(times)
troub(); troub();
}); });
function funTypeChange() { function funTypeChange() {
var times = $('#time').value;
alert(times)
troub(); troub();
} }
function troub() { function troub() {
var y = $("#YearNum").val();
var m = $("#banqType").val();
$.ajax({ $.ajax({
type: "get", type: "get",
async: true, //异步请求（同步请求将会锁住浏览器，用户其他操作必须等待请求完成才可以执行） 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 dataType: "json", //返回数据形式为json
success: function (data) { success: function (data) {
console.log(data.data.troublelist); console.log(data.data.troublelist);
@ -103,7 +96,7 @@
}, },
title: { title: {
text: '本集团'+y+'年'+m+'月各公司隐患统计图' text: '本集团' + y + '年' + m + '月各公司隐患统计图'
}, },
tooltip: {}, tooltip: {},
legend: { legend: {

15
groups/views.py
View File

@ -120,15 +120,18 @@ def observe(request):#行为观察
return render(request, 'groups/observe.html', locals()) return render(request, 'groups/observe.html', locals())
def troubleChart(request):#隐患统计图 def troubleChart(request):#隐患统计图
code = request.GET.get('code') code = request.GET.get('code')
year = int(request.GET.get('year'))
month =int( request.GET.get('month'))
if code=='tbpic': if code=='tbpic':
yhcompanys=[] yhcompanys=[]
yhcompanyscount=[] 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() 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')) troublelist = s_models.Trouble.objects.filter(deletemark=1,usecomp__in=companys).values('usecomp__partid','usecomp__partname').annotate(number = Count('troubleid'))
return HttpResponse(json.dumps({'code':1,'data':{'troublelist':list(troublelist)}}), content_type='application/json') 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):#行为观察 def observeChart(request):#行为观察
code = request.GET.get('code') code = request.GET.get('code')
year = int(request.GET.get('year')) year = int(request.GET.get('year'))
@ -142,7 +145,7 @@ def observeChart(request):#行为观察
rtgcx=[]#人体工程学 rtgcx=[]#人体工程学
hjzj=[]#环境整洁 hjzj=[]#环境整洁
first_day,first_day_of_next_month = gettime(datetime(year,month,1)) 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') 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')