From 06d358c5687718b34c82dc40a03fa7b513187720 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Wed, 10 Nov 2021 09:49:57 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E5=AF=BC=E5=85=A5bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 safesite/daoru.py                 | 4 ++--
 safesite/templates/equipment.html | 4 ++--
 safesite/views.py                 | 7 ++-----
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/safesite/daoru.py b/safesite/daoru.py
index acf3028d..45975c82 100644
--- a/safesite/daoru.py
+++ b/safesite/daoru.py
@@ -457,9 +457,9 @@ def drequipments(companyid,path):
                 numsdict[num]=name
         i = i+1
     if numsdict:
-        return {'code':1,'msg':'全部导入成功!'}
-    else:
         return {'code':2,'msg':'部分未导入成功!','info':numsdict}
+    else:
+        return {'code':1,'msg':'全部导入成功!'}
 
 
 def drusers(companyid,path):
diff --git a/safesite/templates/equipment.html b/safesite/templates/equipment.html
index fdf8f432..9df3961a 100644
--- a/safesite/templates/equipment.html
+++ b/safesite/templates/equipment.html
@@ -382,12 +382,12 @@
             removeLoading();
             if (data.code == 1) {
                 $.messager.alert('提示', data.msg, 'info', function () {
-                    $("#main").panel({ href: 'html/equipment', title: '设备设施' });
+                    $("#sbtable").datagrid('reload');
                 });
             }
             else if (data.code == 2) {
                 $.messager.alert('提示', data.msg + data.info, 'info', function () {
-                    $("#main").panel({ href: 'html/equipment', title: '用户' });
+                    $("#sbtable").datagrid('reload');
                 });
             }
             else {
diff --git a/safesite/views.py b/safesite/views.py
index b2993633..fe02a44a 100644
--- a/safesite/views.py
+++ b/safesite/views.py
@@ -4027,11 +4027,8 @@ def drapi(req):
         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})
+        ret = drequipments(companyid, filepath)
+        return JsonResponse(ret)
     elif a == 'risk':
         userid = req.session['userid']
         companyid = getcompany(userid)