From 277c52057f78464ca36b1055eef237f3af4db90e 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                 | 6 +++---
 safesite/templates/equipment.html | 6 +++---
 safesite/views.py                 | 7 ++-----
 3 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/safesite/daoru.py b/safesite/daoru.py
index 579168c4..b41f6ef1 100644
--- a/safesite/daoru.py
+++ b/safesite/daoru.py
@@ -364,7 +364,7 @@ def drequipments(companyid,path):
         return {'code':0,'msg':'责任人列错误!'}
     catedict = {}
     for i in Dickey.objects.filter(Q(dicparent__dicid=47),Q(usecomps__contains=','+str(companyid)+',')|Q(usecomps__contains=',1,')).exclude(usecomps__contains=','+str(companyid)+','):
-        catedict[i.dicname] = i.dicid
+        catedict[i.dickeyname] = i.dickeyid
     if '其他设备类' not in catedict:
         catedict['其它设备类'] = 361
     numdict = {}
@@ -458,9 +458,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 4f1e22dc..58f4ee05 100644
--- a/safesite/templates/equipment.html
+++ b/safesite/templates/equipment.html
@@ -121,7 +121,7 @@
         <p style="color:red;margin-left: 10px">请按模板录入后导入</p>
         <p style="margin-left: 10px"><a href="/static/safesite/muban/equipment.xlsx" target="_blank">点击下载模板</a></p>
         <p style="margin-left: 10px">录入完成后点击下方按钮上传文件</p>
-        <input type="file" id="drfile" name="" accept=".xls,.xlsx" style="margin-left: 10px" />
+        <input type="file" id="drfile" name="" accept=".xlsx" style="margin-left: 10px" />
     </div>
     <div id="bindjcbdg" class="easyui-dialog" title="绑定检查表" style="width:400px;height:200px;padding: 10px;"
         data-options="resizable:true,modal:true,closed:true,border:false,buttons:'#dlg-buttons'">
@@ -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 8fb62095..e2f542fb 100644
--- a/safesite/views.py
+++ b/safesite/views.py
@@ -4026,11 +4026,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)