From 7e6288b5aa7bd7714ef418ebd3ccce5ec6e6f836 Mon Sep 17 00:00:00 2001
From: shilixia <2309368887@qq.com>
Date: Thu, 10 Oct 2019 17:10:02 +0800
Subject: [PATCH 1/2] jiexi

---
 safesite/mgt/views.py               | 7 +++++--
 safesite/templates/examhistory.html | 4 +++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/safesite/mgt/views.py b/safesite/mgt/views.py
index c23beb33..723245fd 100644
--- a/safesite/mgt/views.py
+++ b/safesite/mgt/views.py
@@ -50,8 +50,11 @@ def transstr(obj,str1,str2):
     return keystr
 
 def getdickey(req):
+    userid = req.session['userid']
+    companyid = getcompany(userid)
     dicclass=req.GET.get('dicclass')
-    a = Dickey.objects.filter(dicparent=req.GET.get('dicclass'),deletemark=1)
+    a = Dickey.objects.filter(dicparent=dicclass,deletemark=1)
+    a = (a.filter(usecomps__contains=',1,')|a.filter(usecomps__contains=','+companyid+',')).exclude(nousecomps__contains=','+companyid+',')
     a = a.values('dickeyid','dicparent__dicname','dickeyname','dicparent__dicid','detail').order_by('dickeyid')
     return HttpResponse(transstr(a,'dickeyid','dickeyname'),content_type="application/json")
 
@@ -74,7 +77,7 @@ def api(req):
 
     elif a=='listall':
         startnum,endnum=fenye(req)
-        a = Mgtsystem.objects.filter(usecomp=Partment.objects.get(partid=companyid) ,deletemark=1).order_by('id')
+        a = Mgtsystem.objects.filter(usecomp__partid__in= [1,Partment.objects.get(partid=companyid).partid] ,deletemark=1).order_by('id')
         total = a.count()
         startnum,endnum=fenye(req)
         a = a[startnum:endnum].values('id','mgtname','mgtpath','type__dickeyname','publisdate','createuser__name')
diff --git a/safesite/templates/examhistory.html b/safesite/templates/examhistory.html
index 7bf21fd7..b3ea40ea 100644
--- a/safesite/templates/examhistory.html
+++ b/safesite/templates/examhistory.html
@@ -26,7 +26,6 @@
 
     var id = {{id }};
     var html;
-    alert(id);
     $.ajax({
         type: "get",
         url: "/api/examtestdetail?a=detail",
@@ -60,6 +59,7 @@
                     else {
                         divHtml += '<div style="color:green;">您的答案正确：' + data.testdetail[i].userchecked + '</div>';
                     }
+                    divHtml += '<div style="margin-top: 10px;color: #4f3b08;font-size:13px;">' + (data.testdetail[i].question_resolution == undefined ? '本题无解析！' : data.testdetail[i].question_resolution) +'</div>';
                 }
                 else if (data.testdetail[i].question__type == 2) {
                     var divHtml = "";
@@ -82,6 +82,7 @@
                     else {
                         divHtml += '<div style="color:yellow;">您没有选全答案：' + data.testdetail[i].userchecked + '</div>';
                     }
+                    divHtml += '<div style="margin-top: 10px;color: #4f3b08;font-size:13px;">' + (data.testdetail[i].question_resolution == undefined ? '本题无解析！' : data.testdetail[i].question_resolution) + '</div>';
                 }
                 else {
                     var divHtml = "";
@@ -100,6 +101,7 @@
                     else {
                         divHtml += '<div style="color:green;">您的答案正确：' + data.testdetail[i].userchecked + '</div>';
                     }
+                    divHtml += '<div style="margin-top: 10px;color: #4f3b08;font-size:13px;">' + (data.testdetail[i].question_resolution == undefined ? '本题无解析！' : data.testdetail[i].question_resolution) + '</div>';
                 }
                 $("#examtype1").append(divHtml);
 

From 1b0b31bae6a9fdffd7f18c8313bb3bb7e6083d7a Mon Sep 17 00:00:00 2001
From: shilixia <2309368887@qq.com>
Date: Sat, 12 Oct 2019 08:54:46 +0800
Subject: [PATCH 2/2] shouye

---
 .../static/safesite/easyui/themes/default/easyui.css   | 10 +++-------
 safesite/templates/main.html                           |  2 +-
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/safesite/static/safesite/easyui/themes/default/easyui.css b/safesite/static/safesite/easyui/themes/default/easyui.css
index 579bac75..64ed3ae7 100644
--- a/safesite/static/safesite/easyui/themes/default/easyui.css
+++ b/safesite/static/safesite/easyui/themes/default/easyui.css
@@ -1,5 +1,5 @@
 .panel {
-  overflow: hidden;
+  /*overflow: hidden;*/
   text-align: left;
   margin: 0;
   border: 0;
@@ -37,11 +37,7 @@
   border-bottom-width: 0;
 }
 .panel-with-icon {
-<<<<<<< HEAD
-  padding-left: 20px;
-=======
-  padding-left: 10px;
->>>>>>> 0ed848ff177ad9c427f58c714cb22f8012e2c913
+ padding-left: 20px;
 }
 .panel-icon,
 .panel-tool {
@@ -3411,7 +3407,7 @@
     height: 40px;
     line-height: 30px;
     color: #313030;
-    margin-left: 25px;
+    margin-left: 10px;
 }
 .sidemenu .accordion-header:hover {
     background: #0066cc;
diff --git a/safesite/templates/main.html b/safesite/templates/main.html
index 680a4ab7..ae1a3390 100644
--- a/safesite/templates/main.html
+++ b/safesite/templates/main.html
@@ -326,7 +326,7 @@ float: left;">
 
 </div>
 
-<div style="width:100%;height:800px">
+<div style="width:98%;margin-left:1%;margin-right:1%;height:800px">
 <div id="panelx" class="easyui-panel"  data-options="iconCls:'fa-bar-chart'" >
     
 </div>