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 2022-04-26 22:46:09 +08:00
parent 48643bc6f3 68552e958a
commit 2037cef538
4 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
safesite/export.py
View File

@ -619,7 +619,7 @@ def exportxlsx(a,objs,pic=1):
sheet.write(x,8,i['otherunsafe'])
sheet.write(x,9,i['safecontent'])
sheet.write(x,10,i['submittime'].strftime("%Y-%m-%d %H:%M:%S"))
i['lookimg']=i['lookimg'].split('?')
i['lookimg']=i['lookimg'].split('?') if i['lookimg'] else []
n = i['lookimg']
for m in n:
if m:

2
safesite/templates/index.html
View File

@ -5,7 +5,7 @@
<meta charset="UTF-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<title>ctc安全生产管理系统</title>
<link rel="icon" href="/media/favicon.ico" type="image/x-icon" />
<link rel="icon" href="/static/safesite/favicon.ico" type="image/x-icon" />
<link rel="stylesheet" type="text/css" href="/static/safesite/mystatic/css/loading.css">
<link rel="stylesheet" type="text/css" href="/static/safesite/easyui/themes/default/easyui.css">
<link rel="stylesheet" type="text/css" href="/static/safesite/easyui/themes/icon.css">

2
safesite/templates/login.html
View File

@ -5,7 +5,7 @@
<head>
<meta charset="utf-8">
<title>安全生产管理系统</title>
<link rel="icon" href="/media/favicon.ico" type="image/x-icon" />
<link rel="icon" href="/static/safesite/favicon.ico" type="image/x-icon" />
<meta name="description" content="particles.js is a lightweight JavaScript library for creating particles.">
<meta name="author" content="Vincent Garreau" />
<meta name="viewport"

19
safesite/views.py
View File

@ -1021,8 +1021,18 @@ def addyh(req):
fxsj = yhdata['fxsj']
yhdd = yhdata['yhdd']
yhms = yhdata['yhms']
yhtp = '?'.join(yhdata['yhtp']) if 'yhtp' in yhdata else []
zghtp = '?'.join(yhdata['zghtp']) if 'zghtp' in yhdata else []
yhtp_l = []
if 'yhtp' in yhdata:
for i in yhdata['yhtp']:
if i:
yhtp_l.append(i)
yhtp = '?'.join(yhtp_l)
zghtp_l = []
if 'zghtp' in yhdata:
for i in yhdata['zghtp']:
if i:
zghtp_l.append(i)
zghtp = '?'.join(zghtp_l)
yhdj = yhdata['yhdj']
yhpg = yhdata['yhpg'] if 'yhpg' in yhdata else ''
jclx = yhdata['jclx']
@ -1703,7 +1713,7 @@ def accessyh(req):
postdict['touser'] = a.todouser.openid
send_wechatmsg.delay(postdict)
return JsonResponse({"code": 1})
logger.info(a.troubleid + '-' + str(yhdata))
logger.info(str(a.troubleid) + '-' + str(yhdata))
def parttree2(req):
userid = req.session['userid']
companyid = getcompany(userid)
@ -6988,7 +6998,8 @@ def apiexamtestdetail(req):
answersdict['paperdetail' + str(i['id'])] = i['question__right']
for i in testdetail: # 判卷
iscore = 0
i['question__right'] = answersdict['paperdetail'+str(i['id'])]
# 默认一个不存在的正确答案
i['question__right'] = answersdict['paperdetail'+str(i['id'])] if 'paperdetail'+str(i['id']) in answersdict else ['G']
if i['question__type'] == 2:
if 'userchecked' in i:
if i['userchecked']: