From 15ff36c244464debad7aff33a69116cc0d7b29e1 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Wed, 4 Dec 2019 20:52:25 +0800
Subject: [PATCH] equipment daoru

---
 safesite/daoru.py                 |  5 ++++-
 safesite/templates/equipment.html | 12 +++---------
 safesite/views.py                 |  7 +------
 3 files changed, 8 insertions(+), 16 deletions(-)

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/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/views.py b/safesite/views.py
index f1d8ff77..0a2667bc 100644
--- a/safesite/views.py
+++ b/safesite/views.py
@@ -3271,12 +3271,7 @@ def drapi(req):
         filepath = filepath.replace('\\','/')
         with open( filepath, 'wb') as f:
             f.write(req.FILES['upfile'].read())
-        # try:
-        equipmentdict = drequipments(companyid,filepath)
-        if equipmentdict:
-            return JsonResponse({"code":2,"equipmentdict":equipmentdict})
-        else:
-            return JsonResponse({"code":1})
+        return JsonResponse(drequipments(companyid,filepath))
     elif a == 'risk':
         userid = req.session['userid']
         companyid = getcompany(userid)