From 277fc876995330b60661872399e53cac40ce6067 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Sat, 12 Oct 2019 17:56:36 +0800 Subject: [PATCH] tmdaoru --- safesite/daoru.py | 44 ++++++++++++++++++++++++- safesite/models.py | 2 +- safesite/static/safesite/muban/tm.xlsx | Bin 10763 -> 10684 bytes safesite/templates/question.html | 2 +- safesite/templates/report.html | 1 + 5 files changed, 46 insertions(+), 3 deletions(-) diff --git a/safesite/daoru.py b/safesite/daoru.py index b0ce039e..898337bb 100644 --- a/safesite/daoru.py +++ b/safesite/daoru.py @@ -2,7 +2,7 @@ from docxtpl import DocxTemplate, InlineImage from docx.shared import Mm, Inches, Pt from openpyxl import Workbook, load_workbook from openpyxl.drawing.image import Image -from .models import User,Trouble,Dickey,Partment,Dicclass,Train,Drill,TroubleAccess,Group,Yjyc,Equipment,Area,RiskAct,Risk +from .models import User,Trouble,Dickey,Partment,Dicclass,Train,Drill,TroubleAccess,Group,Yjyc,Equipment,Area,RiskAct,Risk,Question,Questioncat from datetime import datetime,date import base64 from django.conf import settings @@ -53,6 +53,48 @@ def makeqr_area(data): img.save(filepath) return filepath +def drquestions(companyid,path): + wb = load_workbook(path) + sheet = wb.worksheets[0] + i = 4 + while sheet['c'+str(i)].value!=None: + type = sheet['a'+str(i)].value.replace(' ', '') + cate = sheet['b'+str(i)].value.replace(' ', '') + title = sheet['c'+str(i)].value + answerA = sheet['d'+str(i)].value + answerB = sheet['e'+str(i)].value + answerC = sheet['f'+str(i)].value + answerD = sheet['g'+str(i)].value + answerE = sheet['h'+str(i)].value + answerF = sheet['i'+str(i)].value + right = sheet['j'+str(i)].value.replace(' ', '') + resolution = sheet['k'+str(i)].value + level = sheet['l'+str(i)].value + objs = Questioncat.objects.filter(usecomp__partid=1,name=cate) + if objs.exists(): + cateobj = objs[0] + else: + objs = Questioncat.objects.filter(usecomp__partid=companyid,name=cate) + if objs.exists(): + cateobj = objs[0] + else: + cateobj = Questioncat.objects.create(usecomp__partid=companyid,name=cate) + if type == '单选': + obj = Question() + obj.type = 1 + obj.cate = cateobj + obj.title = title + obj.answerA = answerA + obj.answerB = answerB + obj.answerC = answerC + obj.answerD = answerD + obj.answerE = answerE + obj.answerF = answerF + pass + + + + def drequipments(companyid,path): wb = load_workbook(path) sheet = wb.worksheets[0] diff --git a/safesite/models.py b/safesite/models.py index ca51d125..bf09e322 100644 --- a/safesite/models.py +++ b/safesite/models.py @@ -598,7 +598,7 @@ class ExamTestDetail(models.Model):#考试详情表 endtime = models.DateTimeField(null=True,blank=True) took = models.IntegerField(default=0) #耗时 rights = models.IntegerField(default=1) #正确数 - ison = models.IntegerField(default=0) #未参加/已参加/不计算 + ison = models.IntegerField(default=0) #未参加0/已参加1/ passcode = models.IntegerField(default=0) #是否通过 testdetail = JSONField(null=True,blank=True) score = models.FloatField(default=0)#得分 diff --git a/safesite/static/safesite/muban/tm.xlsx b/safesite/static/safesite/muban/tm.xlsx index 842959e555d9d89b9f962a8e1fc07806c3a787fd..1011ee741f0d733fed06496143c616e827476871 100644 GIT binary patch delta 5195 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 M`51?c?eES10&`2KdH?_b delta 5234 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 QLK;LVHz}?K`#<&n1tbB$egFUf diff --git a/safesite/templates/question.html b/safesite/templates/question.html index de9a0a2b..60ca4455 100644 --- a/safesite/templates/question.html +++ b/safesite/templates/question.html @@ -29,7 +29,7 @@
-
+

请按模板录入后导入

点击下载模板

录入完成后点击下方按钮上传文件

diff --git a/safesite/templates/report.html b/safesite/templates/report.html index df231901..4cc1017e 100644 --- a/safesite/templates/report.html +++ b/safesite/templates/report.html @@ -345,6 +345,7 @@ //data['map7v'] = myChart7.getDataURL({ pixelRatio: 2, }); data['nowyjz'] = nowyjz; //console.log(JSON.stringify(data));5 + console.log(data) $.ajax({ type: "POST", async: false, //异步请求(同步请求将会锁住浏览器,用户其他操作必须等待请求完成才可以执行)