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

Merge https://e.coding.net/ctcdevteam/safesite

This commit is contained in:
caoqianming 2021-07-11 22:28:35 +08:00
parent 8d5b4546e6 81a92d362c
commit 89d29f0b7f
16 changed files with 64 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
doc/个人安全绩效等功能.txt Normal file
View File

@ -0,0 +1,3 @@
1.事故隐患界面增加无图片导出excel（支持一次性导出1000条）
2.增加应急预案的上传
3.安全绩效下的个人安全绩效统计数字可点击链接查看

41
safesite/export.py
View File

@ -256,7 +256,7 @@ def exportdoc(a,id):
import re
ILLEGAL_CHARACTERS_RE = re.compile(r'[\000-\010]|[\013-\014]|[\016-\037]')
def exportxlsx(a,objs):
def exportxlsx(a,objs,pic=1):
if a =='yh':
wb = load_workbook(dirname + 'safesite/exportemp/yhdc.xlsx')
sheet = wb.active
@ -265,7 +265,11 @@ def exportxlsx(a,objs):
row_height = 70
#查询数据
yhobjs = objs.order_by('-troubleid')
if yhobjs.count()>100:
if yhobjs.count()>1000:
res = HttpResponse()
res.write('数量超过1000,请查询后导出!')
return res
if pic==1 and yhobjs.count()>100:
res = HttpResponse()
res.write('数量超过100,请查询后导出!')
return res
@ -308,22 +312,23 @@ def exportxlsx(a,objs):
sheet['r'+str(i+4)] = ILLEGAL_CHARACTERS_RE.sub(r'', v['zgms'])
sheet['s'+str(i+4)] = v['shr__name']
sheet['t'+str(i+4)] = v['fcr__name']
if v['yhtp']:
try:
img = Image(dirname + v['yhtp'][0])
if img.format!='mpo':
img.width, img.height = (90, 90) #这两个属性分别是对应添加图片的宽高
sheet.add_image(img, 'u'+str(i+4))
except:
pass
if v['zghtp']:
try:
img = Image(dirname + v['zghtp'][0])
if img.format!='mpo':
img.width, img.height = (90, 90) #这两个属性分别是对应添加图片的宽高
sheet.add_image(img, 'w'+str(i+4))
except:
pass
if pic==1:
if v['yhtp']:
try:
img = Image(dirname + v['yhtp'][0])
if img.format!='mpo':
img.width, img.height = (90, 90) #这两个属性分别是对应添加图片的宽高
sheet.add_image(img, 'u'+str(i+4))
except:
pass
if v['zghtp']:
try:
img = Image(dirname + v['zghtp'][0])
if img.format!='mpo':
img.width, img.height = (90, 90) #这两个属性分别是对应添加图片的宽高
sheet.add_image(img, 'w'+str(i+4))
except:
pass
nowtime = datetime.now().strftime('%Y%m%d%H%M%S')
sheet['b1'] = nowtime
filename = 'YHS' + nowtime

1
safesite/templates/drill.html
View File

@ -67,6 +67,7 @@
if(searchStr){
var lls = JSON.parse(searchStr)
queryParams = Object.assign(queryParams, lls)
sessionStorage.removeItem("drill")
}
$('#yltable').datagrid({ url: 'ylhandle', queryParams: queryParams });
$("#searchylff").form('clear');

2
safesite/templates/examtest.html
View File

@ -45,6 +45,8 @@
if(searchStr){
var lls = JSON.parse(searchStr)
queryParams = Object.assign(queryParams, lls)
sessionStorage.removeItem("examtest")
}
$('#kstable').datagrid({url:'api/examtest',queryParams:queryParams});
})

18
safesite/templates/index.html
View File

@ -193,13 +193,18 @@
onSelect: function (title) {
var allTabs = $('#tt').tabs('tabs');
var selectTab = $('#tt').tabs('getSelected');
var ecludetitles = ['个人安全数据']
var stitle = selectTab.panel('options').title
// if(ecludetitles.indexOf(stitle)!=-1){
// }else{
// selectTab.panel('refresh')
// }
for (var i = 0; i < allTabs.length; i++) {
if (allTabs[i]) {
var ecludetitles = ['个人安全数据']
if(ecludetitles.indexOf(allTabs[i].panel('options').title)!=-1){
return
}
if (allTabs[i].panel('options').title != selectTab.panel('options').title) {
if(ecludetitles.indexOf(allTabs[i].panel('options').title)!=-1){
break
}
if (allTabs[i].panel('options').title != stitle) {
$('#tt').tabs('update', {
tab: allTabs[i],
options: {
@ -207,7 +212,6 @@
}
});
}
}
}
//selectTab.panel('refresh')

1
safesite/templates/inspect.html
View File

@ -71,6 +71,7 @@
if(searchStr){
var lls = JSON.parse(searchStr)
queryParams = Object.assign(queryParams, lls)
sessionStorage.removeItem("inspect")
}
$('#xjtable').datagrid({ url: 'api/inspect', queryParams: queryParams });
$("#searchxjff").form('clear');

1
safesite/templates/inspectitem.html
View File

@ -40,6 +40,7 @@
if(searchStr){
var lls = JSON.parse(searchStr)
queryParams = Object.assign(queryParams, lls)
sessionStorage.removeItem("inspectitem")
}
$('#ycitemtable').datagrid({url:'api/inspectitem',queryParams:queryParams});
$("#searchxjff").form('clear');

1
safesite/templates/miss.html
View File

@ -55,6 +55,7 @@
if(searchStr){
var lls = JSON.parse(searchStr)
queryParams = Object.assign(queryParams, lls)
sessionStorage.removeItem("miss")
}
$('#wstable').datagrid({url:'api/miss',queryParams:queryParams});
$("#searchwsff").form('clear');

1
safesite/templates/operation.html
View File

@ -53,6 +53,7 @@
if(searchStr){
var lls = JSON.parse(searchStr)
queryParams = Object.assign(queryParams, lls)
sessionStorage.removeItem("operation")
}
$('#zytable').datagrid({url:'api/operation',queryParams:queryParams});
$.get('getdickey?dicclass=33&a=combobox',function(data){

4
safesite/templates/personalp.html
View File

@ -283,8 +283,8 @@
if ($('#tt').tabs('exists', title)) {
sessionStorage.setItem(k1, JSON.stringify(myquerydata))
$('#tt').tabs('select', title);
var tab = $('#tt').tabs('getSelected');
tab.panel('refresh');
// var tab = $('#tt').tabs('getSelected');
// tab.panel('refresh');
} else {
$('#tt').tabs('add', {
title: title,

1
safesite/templates/safecert.html
View File

@ -34,6 +34,7 @@
if(searchStr){
var lls = JSON.parse(searchStr)
queryParams = Object.assign(queryParams, lls)
sessionStorage.removeItem("safecert")
}
$('#aqzstable').datagrid({url:'api/safecert',queryParams:queryParams});
})

1
safesite/templates/socert.html
View File

@ -46,6 +46,7 @@
if(searchStr){
var lls = JSON.parse(searchStr)
queryParams = Object.assign(queryParams, lls)
sessionStorage.removeItem("socert")
}
$('#tzzstable').datagrid({url:'api/socert',queryParams:queryParams});
})

1
safesite/templates/suggest.html
View File

@ -57,6 +57,7 @@
if(searchStr){
var lls = JSON.parse(searchStr)
queryParams = Object.assign(queryParams, lls)
sessionStorage.removeItem("suggest")
}
$('#jytable').datagrid({url:'api/suggest',queryParams:queryParams});
$("#searchjyff").form('clear');

1
safesite/templates/train.html
View File

@ -65,6 +65,7 @@
if(searchStr){
var lls = JSON.parse(searchStr)
queryParams = Object.assign(queryParams, lls)
sessionStorage.removeItem("train")
}
$('#pxtable').datagrid({ url: 'pxhandle', queryParams: queryParams });
$("#searchpxff").form('clear');

11
safesite/templates/trouble.html
View File

@ -31,6 +31,9 @@
{% if request|has_permission:'b_trouble_exportxls' %}
<a id="exportexcel" onclick="exportyhexcel()">导出Excel</a>
{% endif %}
{% if request|has_permission:'b_trouble_exportxls' %}
<a id="exportexcel" onclick="exportyhexcel2()" class='easyui-linkbutton' data-options="iconCls: 'fa-download',plain:true">导出无图Excel</a>
{% endif %}
</div>
<div id="sdg_yh" class="easyui-dialog" title="筛选条件" style="width:400px;height:420px;"
data-options="iconCls:'fa-search',resizable:true,modal:true,closed:true,border:false">
@ -83,11 +86,11 @@
$(function () {
// var option = $('#main').attr('value')
var searchStr = sessionStorage.getItem("trouble");
var queryParams = {'a':'listall'}
if(searchStr){
var lls = JSON.parse(searchStr)
queryParams = Object.assign(queryParams, lls)
sessionStorage.removeItem("trouble")
}
$('#yhtable').datagrid({ url: 'troublehandle', queryParams: queryParams });
$("#searchyhff").form('clear');
@ -329,6 +332,12 @@
window.open(url);
// $('<form method="post" action="' + url + '"></form>').appendTo('body').submit().remove();
}
function exportyhexcel2() {
var querydata = $('#searchyhff').serializeJSON();
let url = 'troublehandle?a=exportexcel&nopic=1&' + parseParams(querydata)
window.open(url);
// $('<form method="post" action="' + url + '"></form>').appendTo('body').submit().remove();
}
function delyh() {
var row = $('#yhtable').datagrid('getSelected');
if (row) {

5
safesite/views.py
View File

@ -2057,7 +2057,10 @@ def troublehandle(req):
a = a.filter(Q(zgbm__in=parts) | Q(fxbm__in=parts, zgbm=None))
if fxrname:
a = a.filter(fxr__name=fxrname)
res = exportxlsx('yh', a)
if req.GET.get('nopic', None):
res = exportxlsx('yh', a, 0)
else:
res = exportxlsx('yh', a)
return res
elif a == 'del':
userid = req.session['userid']