diff --git a/safesite/daoru.py b/safesite/daoru.py
index 695a1138..f8c8f0ab 100644
--- a/safesite/daoru.py
+++ b/safesite/daoru.py
@@ -292,7 +292,10 @@ def drequipments(companyid,path):
else:
numsdict[num]=name
i = i+1
- return numsdict
+ if numsdict:
+ return {'code':1,'msg':'全部导入成功!'}
+ else:
+ return {'code':2,'msg':'部分未导入成功!','info':numsdict}
diff --git a/safesite/templates/abdrill.html b/safesite/templates/abdrill.html
index ede12494..3b5de8ac 100644
--- a/safesite/templates/abdrill.html
+++ b/safesite/templates/abdrill.html
@@ -90,7 +90,7 @@
required=true>
-
+
diff --git a/safesite/templates/equipment.html b/safesite/templates/equipment.html
index 95ef4534..ca770a8f 100644
--- a/safesite/templates/equipment.html
+++ b/safesite/templates/equipment.html
@@ -311,23 +311,17 @@
var data = JSON.parse(evt.target.responseText);
removeLoading();
if (data.code == 1) {
- $.messager.alert('提示', '上传成功！', 'info', function () {
+ $.messager.alert('提示', data.msg, 'info', function () {
$("#main").panel({ href: 'html/equipment', title: '设备设施' });
});
}
else if (data.code == 2) {
- msg = ''
- equipmentdict = data.equipmentdict
- // for (var key in equipmentdict) {
- // msg += key + ','
- // }
- msg += '部分因编号重复未成功上传！'
- $.messager.alert('提示', msg, 'info', function () {
+ $.messager.alert('提示', data.msg+data.info, 'info', function () {
$("#main").panel({ href: 'html/equipment', title: '用户' });
});
}
else {
- $.messager.alert('提示', '失败！文件内容有误');
+ $.messager.alert('提示', data.msg);
}
document.getElementById('drfile').value = '';
diff --git a/safesite/templates/examtestdetail.html b/safesite/templates/examtestdetail.html
index a9c2a111..18efccb1 100644
--- a/safesite/templates/examtestdetail.html
+++ b/safesite/templates/examtestdetail.html
@@ -60,16 +60,16 @@
- |
+ |
序号
|
-
+ |
姓名
|
-
+ |
部门
|
-
+ |
状态
|
@@ -81,6 +81,9 @@
|
答题详情
|
+
+ 重新考试
+ |
{{each cjrydetail}}
@@ -95,7 +98,13 @@
{{/if}}
{{$value.score}} |
{{$value.took}} |
- 点击查看 |
+ {{$value.id}} |
+ 点击查看 |
+ {{if $value.passcode==0&&$value.ison==1&&state==1}}
+ |
+ {{else}}
+ |
+ {{/if}}
{{/each}}
@@ -187,6 +196,19 @@
}
});
}
-
+ function updateIson() {
+ var examdlid = document.getElementById("examdlid").innerHTML;
+ $.ajax({
+ type: "get",
+ url: "api/examtestdetail?a=updateison",
+ contentType: 'application/json; charset=utf-8',
+ data: { id: ksid, examdlid: examdlid},
+ success: function (data) {
+
+ alert(data.message);
+
+ }
+ });
+ }
\ No newline at end of file
diff --git a/safesite/templates/noticeadd.html b/safesite/templates/noticeadd.html
index 38e67f2c..284fc728 100644
--- a/safesite/templates/noticeadd.html
+++ b/safesite/templates/noticeadd.html
@@ -29,7 +29,7 @@
-
+
diff --git a/safesite/views.py b/safesite/views.py
index 07138ecd..cc304e51 100644
--- a/safesite/views.py
+++ b/safesite/views.py
@@ -5373,7 +5373,19 @@ def apiexamtestdetail(req):
obj = ExamTestDetail.objects.filter(id=id)
data = obj.values('id','starttime','took','score','passcode','testdetail','examtest__name','user__headimgurl','user__name')[0]
return JsonResponse(data)
-
+ elif a=='updateison':
+ id = req.GET.get('id')
+ examdlid = req.GET.get('examdlid')
+ user = User.objects.get(userid=userid)
+ a = ExamTest.objects.get(id=id)
+ if a.createuser==user:
+ objss = ExamTestDetail.objects.get(id=examdlid)
+ objss.ison=0
+ objss.testnum=objss.testnum+1
+ objss.save()
+ return JsonResponse({"code":1,"message":"发布成功!"})
+ else:
+ return JsonResponse({"code":2,"message":"您没有发布权限!"})
def apitrain(req):
if req.GET.get('a')=='listjoin':
userid = req.session['userid']