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

ziduan

This commit is contained in:
shilixia 2019-12-02 09:00:43 +08:00
parent 67d1e36e3b
commit dcff299c75
5 changed files with 9 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
safesite/templates/behavior.html
View File

@ -297,9 +297,9 @@
<tr>
<th data-options="field:'looker__userid',hidden:true">用户ID</th>
<th data-options="field:'looker__name',align:'right'" width="30%">观察记录人姓名</th>
<th data-options="field:'lookpart__partname',align:'right'" width="35%">观察部门</th>
<th data-options="field:'number',align:'right'" width="35%">行为观察数</th>
<th data-options="field:'looker__name',align:'center'" width="30%">观察记录人姓名</th>
<th data-options="field:'lookpart__partname',align:'center'" width="35%">观察部门</th>
<th data-options="field:'number',align:'center'" width="35%">行为观察数</th>
</tr>
</thead>
</table>

2
safesite/templates/edulessonadd.html
View File

@ -133,7 +133,7 @@
<span>选择视频： </span>
<!--文件选择按钮-->
<a class="list" href="javascript:;">
<input id="file" type="file" name="myfile" onchange="UpladFile();" /><span>选择视频</span>
<input id="file" type="file" name="myfile" accept=".mp4" onchange="UpladFile();" /><span>选择视频</span>
</a>
<!--<button class="btn" type="button" onclick="sub();">上传</button>-->

25
safesite/templates/equipmentfigure.html
View File

@ -250,30 +250,7 @@
</div>
</div>
<div style="width: 80%; margin:auto;margin-bottom:100px; ">
<table name="" id="fxrpmtable" class='easyui-datagrid' title="培训次数" data-options="rownumbers:true,singleSelect:true,striped: true,method:'get',url: 'api/trainfg?a=trainuser',toolbar:'#fxrpmbar'" style="height:400px">
<thead>
<tr>
<th data-options="field:'participant__name',align:'right'" width="35%">姓名</th>
<th data-options="field:'participant__username',align:'right'" width="30%">用户名</th>
<th data-options="field:'count',align:'right'" width="35%">培训次数</th>
</tr>
</thead>
</table>
<div id='fxrpmbar'>
<form id="fxrpms">
<div>
<label>发现部门</label><input id="sfxbm2" name="fxbm" style="width:180px;height:22px" />
<label>起始时间</label><input id="sqssj" name="qssj" class="easyui-datebox" style="width:180px;height:22px" />
<label>结束时间</label><input id="sjssj" name="jssj" class="easyui-datebox" style="width:180px;height:22px" />
<a onclick="fxrpmsearch()" class='easyui-linkbutton' iconCls='fa-search' plain=true>查询</a>
<a onclick="fxrpmexport()" class='easyui-linkbutton' iconCls='fa-upload' plain=true>导出</a>
</div>
</form>
</div>
</div>
</div>
</div>

6
safesite/templates/trainfigure.html
View File

@ -299,9 +299,9 @@
<table name="" id="fxrpmtable" class='easyui-datagrid' title="培训次数" data-options="rownumbers:true,singleSelect:true,striped: true,method:'get',url: 'api/trainfg?a=trainuser',toolbar:'#fxrpmbar'" style="height:400px">
<thead>
<tr>
<th data-options="field:'participant__name',align:'right'" width="35%">姓名</th>
<th data-options="field:'participant__username',align:'right'" width="30%">用户名</th>
<th data-options="field:'count',align:'right'" width="35%">培训次数</th>
<th data-options="field:'participant__name',align:'center'" width="35%">姓名</th>
<th data-options="field:'participant__username',align:'center'" width="30%">用户名</th>
<th data-options="field:'count',align:'center'" width="35%">培训次数</th>
</tr>
</thead>
</table>

2
safesite/views.py
View File

@ -2204,7 +2204,7 @@ def fxhandle(req):
objs = objs.filter(fxsj__gte=req.GET.get('qssj'))
if req.GET.get('jssj'):
objs = objs.filter(fxsj__lte=req.GET.get('jssj'))
objs = objs.values('zgr__userid','zgr__name','zgbm__partname').annotate(number = Count('zgr')).order_by('-number')
objs = objs.values('zgr__userid','zgr__name','zgbm__partname').annotate(number = Count('zgr')).order_by('-zgsj')
total = objs.count()
return HttpResponse(transjson(total,objs),content_type="application/json")
# elif a == 'exportexcel':