diff --git a/safesite/datashowview.py b/safesite/datashowview.py
index ad133865..5e1ee4f2 100644
--- a/safesite/datashowview.py
+++ b/safesite/datashowview.py
@@ -22,6 +22,7 @@ from django.core.serializers.json import DjangoJSONEncoder
 from io import StringIO
 import operator
 import jwt
+
 def area(req):
     userid = req.session['userid']
     companyid = getcompany(userid)
diff --git a/safesite/edu/views.py b/safesite/edu/views.py
index 45b269f5..bb435930 100644
--- a/safesite/edu/views.py
+++ b/safesite/edu/views.py
@@ -22,7 +22,7 @@ from django.core.serializers.json import DjangoJSONEncoder
 from io import StringIO
 import operator
 import jwt
-from ..views import getcompany,fenye,transjson,upfile
+from ..views import apicheck_login, getcompany,fenye,transjson,upfile
 
 def index(req):
     return render(req,'edulessonindex.html')
@@ -63,6 +63,8 @@ def selectDate(req):
     startnum,endnum=fenye(req)
     a = a.order_by('-submittime')[startnum:endnum].values('id','num','title','user__name','desciption','submittime','type','cate__name','url','downnum')
     return HttpResponse(transjson(total,a),content_type="application/json")
+
+@apicheck_login
 def api(req):
     a = req.GET.get('a')
     #首页列表
@@ -165,8 +167,12 @@ def api(req):
          obj.save()
          return JsonResponse({"code":1,"url": a.url})
      #观看详情
-    elif a=='detail':
-        id=req.GET.get('zrid')
-        a = EdulessonWatch.objects.filter(edulesson=id).values('id','user__name','submittime')
-        total = a.count()
-        return HttpResponse(transjson(total,a),content_type="application/json")
\ No newline at end of file
+    elif a=='watch_detail':
+        id=req.GET.get('eduid')
+        userid = req.session['userid']
+        companyid = getcompany(userid)#公司ID
+        objs = EdulessonWatch.objects.filter(edulesson=id, user__usecomp=companyid)
+        total = objs.count()
+        startnum, endnum = fenye(req)
+        objs_data = objs.order_by('-submittime')[startnum:endnum].values('id','user__name','submittime')
+        return HttpResponse(transjson(total, objs_data), content_type="application/json")
\ No newline at end of file
diff --git a/safesite/export.py b/safesite/export.py
index d562c156..0a109152 100644
--- a/safesite/export.py
+++ b/safesite/export.py
@@ -619,7 +619,7 @@ def exportxlsx(a,objs,pic=1):
             sheet.write(x,8,i['otherunsafe'])
             sheet.write(x,9,i['safecontent'])
             sheet.write(x,10,i['submittime'].strftime("%Y-%m-%d %H:%M:%S"))
-            i['lookimg']=i['lookimg'].split('?')
+            i['lookimg']=i['lookimg'].split('?') if i['lookimg'] else []
             n =  i['lookimg']
             for m in n:
                 if m:
diff --git a/safesite/mgt/views.py b/safesite/mgt/views.py
index e80a9a7e..321a1ea2 100644
--- a/safesite/mgt/views.py
+++ b/safesite/mgt/views.py
@@ -63,18 +63,19 @@ def api(req):
     userid = req.session['userid']
     companyid = getcompany(userid)
     if a == 'add':
-         obj = Mgtsystem()
-         data = json.loads(req.body.decode('utf-8'))
-         obj.mgtname = data['mgtname']
-         obj.mgtpath = data['filepath']
-         obj.type= Dickey.objects.get(dickeyid=data['type'])
-         obj.publisdate=data['publisdate']
-         obj.usecomp=Partment.objects.get(partid=companyid)
-         obj.createuser=User.objects.get(userid=userid)
-         obj.qrcode = makeqr_(
-                'https://safeyun.ctcshe.com/miniprogram/mgt?id='+str(obj.id))
-         obj.save()
-         return JsonResponse({"code":1})
+        obj = Mgtsystem()
+        data = json.loads(req.body.decode('utf-8'))
+        obj.mgtname = data['mgtname']
+        obj.mgtpath = data['filepath']
+        obj.type= Dickey.objects.get(dickeyid=data['type'])
+        obj.publisdate=data['publisdate']
+        obj.usecomp=Partment.objects.get(partid=companyid)
+        obj.createuser=User.objects.get(userid=userid)
+        obj.save()
+        obj.qrcode = makeqr_(
+            'https://safeyun.ctcshe.com/miniprogram/mgt?id='+str(obj.id))
+        obj.save()
+        return JsonResponse({"code":1})
 
     elif a=='listall':
         startnum,endnum=fenye(req)
diff --git a/safesite/templates/edulessonadd.html b/safesite/templates/edulessonadd.html
index 1ea4a5c3..3071bc3b 100644
--- a/safesite/templates/edulessonadd.html
+++ b/safesite/templates/edulessonadd.html
@@ -251,8 +251,8 @@
 
 
             var imagSize = fileObj.size;
-            if (imagSize > 1024 * 1024 * 10) {
-                alert("视频大小为：" + (imagSize / (1024 * 1024)).toFixed(2) + "M，超出了上传大小，" + "请选择10M以内的视频！");
+            if (imagSize > 1024 * 1024 * 100) {
+                alert("视频大小为：" + (imagSize / (1024 * 1024)).toFixed(2) + "M，超出了上传大小，" + "请选择100M以内的视频！");
                 $("#videoName").text('文件太大了超出范围！');
                 return false;
             }
diff --git a/safesite/templates/edulessondetail.html b/safesite/templates/edulessondetail.html
index 9a2382d5..bd01cfa1 100644
--- a/safesite/templates/edulessondetail.html
+++ b/safesite/templates/edulessondetail.html
@@ -1,6 +1,6 @@
 
-    <div title="作业" style="height:100%;">
-        <table id="zytable" style="width:100%;height:100%"></table>
+    <div title="观看历史" style="height:100%;">
+        <table id="eduwatchtable" style="width:100%;height:100%"></table>
     </div>
  
 
@@ -9,15 +9,16 @@
     var eduid = {{ jyid }};
     var html;
 
-    $('#zytable').datagrid({
-        url: 'edu/api?a=detail&eduid=' + eduid,
+    $('#eduwatchtable').datagrid({
+        url: 'edu/api?a=watch_detail&eduid=' + eduid,
         rownumbers: true,
         singleSelect: true,
         striped: true,
         fitColumns: true,
         method: 'get',
         pageSize: 20,
-        toolbar: '#zytablebar',
+        pagination: 'true',
+        toolbar: '#eduwatchtablebar',
         columns: [[
             { field: 'id', title: 'ID', hidden: true },
             { field: 'user__name', title: '观看人', width: 80 },
diff --git a/safesite/templates/edulessonindex.html b/safesite/templates/edulessonindex.html
index ec8e37d7..d4a174a0 100644
--- a/safesite/templates/edulessonindex.html
+++ b/safesite/templates/edulessonindex.html
@@ -30,9 +30,9 @@
             {% if request|has_permission:'b_edu_study' %}
             <a id="tzdetail" onclick="tzdetail()" class="easyui-linkbutton" data-options="iconCls: 'fa-info-circle',plain:true">下载/查看</a>
             {% endif %}
-            <!-- {% if request|has_permission:'b_edu_detail' %}
-            <a id="edulook" class="easyui-linkbutton" onclick="jydetail()" data-options="iconCls: 'fa-plus',plain:true">观看历史</a>
-            {% endif %} -->
+            {% if request|has_permission:'b_edu_addfile' %}
+            <a id="edulook" class="easyui-linkbutton" onclick="edudetail()" data-options="iconCls: 'fa-info',plain:true">观看历史</a>
+            {% endif %}
        
 
         </div>
@@ -159,7 +159,7 @@
             $.messager.alert('提示', '请选择一行数据!');
         }
     }
-    function jydetail() {
+    function edudetail() {
         var row = $('#edutab').datagrid('getSelected');
         if (row) {
             var url = 'edu/html/edulessondetail/detail/' + row.id
diff --git a/safesite/templates/index.html b/safesite/templates/index.html
index 30d35ed2..a6d2c4ca 100644
--- a/safesite/templates/index.html
+++ b/safesite/templates/index.html
@@ -5,7 +5,7 @@
     <meta charset="UTF-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
     <title>ctc安全生产管理系统</title>
-    <link rel="icon" href="/media/favicon.ico" type="image/x-icon" />
+    <link rel="icon" href="/static/safesite/favicon.ico" type="image/x-icon" />
     <link rel="stylesheet" type="text/css" href="/static/safesite/mystatic/css/loading.css">
     <link rel="stylesheet" type="text/css" href="/static/safesite/easyui/themes/default/easyui.css">
     <link rel="stylesheet" type="text/css" href="/static/safesite/easyui/themes/icon.css">
diff --git a/safesite/templates/observe.html b/safesite/templates/observe.html
index 70930dcf..458e5483 100644
--- a/safesite/templates/observe.html
+++ b/safesite/templates/observe.html
@@ -57,8 +57,15 @@
 </div>
 <script>
     $(function () {
+        var searchStr = sessionStorage.getItem("observe");
         var option = $('#main').attr('value')
-        $('#gctable').datagrid({ url: 'gchandle', queryParams: { a: option } });
+        var queryParams = {'a': option}
+        if(searchStr){
+            var lls = JSON.parse(searchStr)
+            queryParams = Object.assign(queryParams, lls)
+            sessionStorage.removeItem("observe")
+        }
+        $('#gctable').datagrid({ url: 'gchandle', queryParams: queryParams });
         $("#searchgcff").form('clear');
     })
     $("#sgcbm").combotree({
diff --git a/safesite/templates/personalp.html b/safesite/templates/personalp.html
index 71304ef9..9ecac7bc 100644
--- a/safesite/templates/personalp.html
+++ b/safesite/templates/personalp.html
@@ -42,6 +42,12 @@
                         <a href="javascript:void(0);" onclick="goDetail('trouble', 'zgr', 'qssj', 'jssj')" id="troublediv2">0</a>
                     </th>
                 </tr>
+                <tr>
+                    <th>上报观察</th>
+                    <th>
+                        <a href="javascript:void(0);" onclick="goDetail('observe', 'gcr', 'qssj', 'jssj')" id="observediv1">0</a>
+                    </th>
+                </tr>
                 <tr>
                     <th>参加培训</th>
                     <th>
@@ -163,7 +169,7 @@
 
 </div>
 <script type="text/javascript">
-    var arrs = new Array("trouble", "train", "operation", "miss", "suggest", "test", "drill", "inspect", "cert")
+    var arrs = new Array("trouble", "train", "operation", "miss", "suggest", "test", "drill", "inspect", "cert", "observe")
     var useridx = '{{ user.userid }}';
     var namex = '{{user.name}}'
     $('#pname').html(namex)
@@ -247,6 +253,9 @@
                         $('#certdiv1').html(res.aq_count)
                         $('#certdiv2').html(res.tz_count)
                     }
+                    else if (data.type == 'observe') {
+                        $('#observediv1').html(res.ob_count)
+                    }
 
 
                 }
@@ -269,7 +278,8 @@
             'inspect': ['巡检记录', '/html/inspect'],
             'inspectitem': ['异常处理', '/html/inspectitem'],
             'safecert':['安全资格证书', '/html/safecert'],
-            'socert':['特种作业证书', '/socerthtml']
+            'socert':['特种作业证书', '/socerthtml'],
+            'observe':['行为观察', '/observehtml']
         }
         var myquerydata={}
         if(querydatax.startdate){
diff --git a/safesite/templates/trouble.html b/safesite/templates/trouble.html
index 86d15f3a..d6fd83d4 100644
--- a/safesite/templates/trouble.html
+++ b/safesite/templates/trouble.html
@@ -34,6 +34,9 @@
         {% if request|has_permission:'b_trouble_exportxls' %}
         <a id="exportexcel" onclick="exportyhexcel2()" class='easyui-linkbutton' data-options="iconCls: 'fa-download',plain:true">导出无图Excel</a>
         {% endif %}
+        {% if request|has_permission:'b_trouble_exportxls' %}
+        <a id="exportexcel" onclick="exportyhexcel3()" class='easyui-linkbutton' data-options="iconCls: 'fa-download',plain:true">导出选中</a>
+        {% endif %}
     </div>
     <div id="sdg_yh" class="easyui-dialog" title="筛选条件" style="width:400px;height:420px;"
          data-options="iconCls:'fa-search',resizable:true,modal:true,closed:true,border:false">
@@ -98,7 +101,6 @@
 
     $('#yhtable').datagrid({
         rownumbers: true,
-        singleSelect: true,
         striped: true,
         method: 'get',
         url: '',
@@ -109,9 +111,10 @@
         border: false,
         columns: [[
             { field: 'troubleid', hidden: true },
+            { field: 'ck', checkbox: true , width: 20},
             { field: 'yhnum', title: '编号', width: 100 },
             {
-                field: 'yhzt', title: '流程状态', width: 100, styler: function (value, row, index) {
+                field: 'yhzt', title: '流程状态', width: 60, styler: function (value, row, index) {
                     switch (value) {
                         case 0: return 'background-color:yellow;'; break;
                         case 1: return 'background-color:yellow;'; break;
@@ -147,7 +150,7 @@
             { field: 'todouser__userid', hidden: true },
             { field: 'sybzt', hidden: true },
             {
-                field: 'shresult', title: '隐患状态', width: 100, styler: function (value, row, index) {
+                field: 'shresult', title: '隐患状态', width: 80, styler: function (value, row, index) {
                     switch (value) {
                         case 1: return ''; break;
                         case 2: return 'color:red;font-weight:bold'; break;
@@ -338,6 +341,21 @@
         window.open(url);
         // $('<form method="post" action="' + url + '"></form>').appendTo('body').submit().remove();
     }
+    function exportyhexcel3() {
+        var rows = $('#yhtable').datagrid('getSelections');
+        if(rows.length>0){
+            var data = {'ids':[]}
+            for(var i=0;i<rows.length;i++){
+                data.ids.push(rows[i].troubleid)
+            }
+            let url = 'troublehandle?a=exportexcel2&' + parseParams(data)
+            window.open(url);
+
+        }
+        else {
+            $.messager.alert('提示', '未选择数据!');
+        }
+    }
     function delyh() {
         var row = $('#yhtable').datagrid('getSelected');
         if (row) {
diff --git a/safesite/urls.py b/safesite/urls.py
index e77940ef..c5fd2e9c 100644
--- a/safesite/urls.py
+++ b/safesite/urls.py
@@ -182,12 +182,14 @@ urlpatterns = [
     path('gchandle',views.gchandle),
     path('menutree',views.menutree),
     path('setup',views.setup),
+    path('api/login', views.apilogin),
     path('api/company',views.apicompany),
     path('drapi',views.drapi),
     path('api/miss',views.apimiss),
     path('api/rights',views.apirights),
     path('api/socert',views.apisocert),
     path('api/user',views.apiuser),
+    path('api/get_user_from_username', views.get_user_from_username),
     path('api/partuser',views.apipartuser),
     path('api/duibiao',views.apiduibiao),
     path('api/suggest',views.apisuggest),
@@ -263,4 +265,6 @@ urlpatterns = [
     path('companyinfo/', views.companyinfo),
     path('rlt/',include('safesite.rlt.urls')),
     path('mgt/',include('safesite.mgt.urls')),
+
+    path('miniprogram/<str:module>', views.miniprogram),
 ]
diff --git a/safesite/views.py b/safesite/views.py
index e730f742..76c15c8c 100644
--- a/safesite/views.py
+++ b/safesite/views.py
@@ -34,7 +34,7 @@ from groups import models as g_models
 
 from . import forms
 from .daoru import (cal_area_risk_level, cal_riskact_level, drequipments,
-                    drquestions, drrisks, drtodotroubles, drusers, makeqr, drsafelist,
+                    drquestions, drrisks, drtodotroubles, drusers, makeqr, drsafelist, makeqr_,
                     makeqr_area, makeqr_examtest, makeqr_riskact, makeqr_train, makeqr_safelist)
 from .export import (exportdoc, exportdoc2, exportsimplexlsx, exportxlsx,
                      exportyjdoc)
@@ -144,22 +144,29 @@ def check_session(req):
 
 # 存储文件
 
-
+@apicheck_login
 def upfile(req):
     username = User.objects.get(userid=req.session['userid']).username
+    try:
+        upfile = req.FILES['upfile']
+    except KeyError:
+        return JsonResponse({"code": 0, "msg": "未获取到文件"})
     file_name = (time.strftime('%Y%m%d%H%M%S') + '_' +
-                 req.FILES['upfile'].name).replace('#', '号')
+                 upfile.name).replace('#', '号')
     user_upload_folder = os.path.join('media', username)
     if not os.path.exists(user_upload_folder):
         os.mkdir(user_upload_folder)
     filepath = os.path.join(user_upload_folder, file_name)
     filepath = filepath.replace('\\', '/')
     with open(filepath, 'wb') as f:
-        f.write(req.FILES['upfile'].read())
+        f.write(upfile.read())
     return JsonResponse({"code": 1, "filename": file_name, "filepath": filepath})
 
 # html页面
 
+def miniprogram(req, module):
+    return HttpResponse('请您使用微信扫码打开')
+
 def safelist(req):
     return render(req, 'safelist.html')
 
@@ -663,8 +670,27 @@ def init_permission(user,req):
                                         })
     req.session['permissions'] = permission_dict
 
-
-
+def apilogin(req):
+    """
+    json登录
+    """
+    data = json.loads(req.body.decode('utf-8'))
+    username = data['username']
+    password = data['password']
+    user = User.objects.filter(username=username, deletemark=1, usecomp__enabled=True)
+    if user.exists():
+        if check_password(password, user[0].epassword):
+            req.session['userid'] = user[0].userid
+            req.session.set_expiry(60*40)
+            init_permission(user[0],req)
+            return JsonResponse({'code':1})
+        else:
+            msg = '密码错误'
+            return JsonResponse({'code':0, 'msg':msg})
+    else:
+        msg = '用户不存在或被禁用'
+        return JsonResponse({'code':0, 'msg':msg})
+        
 def login(req):
     if req.session.get('userid', None):
         return redirect('index')
@@ -714,8 +740,8 @@ def index(req):
 
 def logout(req):
     if req.session.get('userid', None):
-        logger.info('method: %s user: %s 登出' %
-                    (req.method, req.session['userid']))
+        # logger.info('method: %s user: %s 登出' %
+        #             (req.method, req.session['userid']))
         req.session.flush()
     return redirect('login')
 
@@ -995,8 +1021,18 @@ def addyh(req):
     fxsj = yhdata['fxsj']
     yhdd = yhdata['yhdd']
     yhms = yhdata['yhms']
-    yhtp = '?'.join(yhdata['yhtp']) if 'yhtp' in yhdata else []
-    zghtp = '?'.join(yhdata['zghtp']) if 'zghtp' in yhdata else []
+    yhtp_l = []
+    if 'yhtp' in yhdata:
+        for i in yhdata['yhtp']:
+            if i:
+                yhtp_l.append(i)
+    yhtp = '?'.join(yhtp_l)
+    zghtp_l = []
+    if 'zghtp' in yhdata:
+        for i in yhdata['zghtp']:
+            if i:
+                zghtp_l.append(i)
+    zghtp = '?'.join(zghtp_l)
     yhdj = yhdata['yhdj']
     yhpg = yhdata['yhpg'] if 'yhpg' in yhdata else ''
     jclx = yhdata['jclx']
@@ -1677,7 +1713,7 @@ def accessyh(req):
         postdict['touser'] = a.todouser.openid
         send_wechatmsg.delay(postdict)
         return JsonResponse({"code": 1})
-
+    logger.info(str(a.troubleid) + '-' + str(yhdata))
 def parttree2(req):
     userid = req.session['userid']
     companyid = getcompany(userid)
@@ -1988,7 +2024,7 @@ def grouphandle(req):
         else:
             return JsonResponse({"code": 0})
 
-
+@apicheck_login
 def troublehandle(req):
     a = req.GET.get('a')
     if a == 'detail':
@@ -2070,6 +2106,14 @@ def troublehandle(req):
         else:
             res = exportxlsx('yh', a)
         return res
+    elif a == 'exportexcel2':
+        userid = req.session['userid']
+        companyid = getcompany(userid)
+        ids_l = req.GET.get('ids').split(',')
+        objs = Trouble.objects.filter(
+            usecomp=Partment.objects.get(partid=companyid), deletemark=1, troubleid__in=ids_l)
+        res = exportxlsx('yh', objs)
+        return res
     elif a == 'del':
         userid = req.session['userid']
         if User.objects.get(userid=userid).issuper == 1:
@@ -2759,7 +2803,7 @@ def fxhandle(req):
 def takeSecond(elem):
     return elem['number']
 
-
+@apicheck_login
 def userhandle(req):
     if req.GET.get('a') == 'adduserh':
         return render(req, 'abuser.html')
@@ -2917,7 +2961,7 @@ def parthandle(req):
         if Partment.objects.filter(partlink__contains=','+a+',').exists() or User.objects.filter(ubelongpart=a).exists():
             return JsonResponse({"code": 0})
         else:
-            Partment.objects.get(partid=a).delete()
+            Partment.objects.filter(partid=a).delete()
             return JsonResponse({"code": 1})
     elif req.GET.get('a') == 'addpart':
         if req.POST.get('partid') != '':
@@ -3279,8 +3323,10 @@ def pxhandle(req):
         # 对many字段单独处理
         str1 = []
         for i in a.values('trainpart__partname'):
-            str1.append(i['trainpart__partname'])
-        x['trainpart'] = ','.join(str1)
+            if i:
+                str1.append(i['trainpart__partname'])
+
+        x['trainpart'] = ','.join(str1) if str1 else ''
         str2 = []
         objs = Trainuser.objects.filter(train=a[0])
         detailobjs = objs.order_by('checked').values(
@@ -3499,14 +3545,22 @@ def gchandle(req):
             obj.safecontent = gcdata['safecontent']
         obj.looknum = 'GC'+time.strftime('%Y%m%d%H%M%S')
         obj.usecomp = Partment.objects.get(partid=companyid)
+        gc_l = []
         if 'lookimg' in gcdata:
-            obj.lookimg = '?'.join(gcdata['lookimg'])
+            for i in gcdata['lookimg']:
+                if i:
+                    gc_l.append(i)
+        if gc_l:
+            obj.lookimg = '?'.join(gc_l)
         obj.save()
         if 'lookers' in gcdata:
             ulist = gcdata['lookers'].split(',')
             for i in ulist:
-                x = User.objects.get(userid=i)
-                obj.lookers.add(x)
+                try:
+                    x = User.objects.get(userid=i)
+                    obj.lookers.add(x)
+                except:
+                    pass
         if 'unsafe' in gcdata:
             olist = gcdata['unsafe']
             for i in olist:
@@ -3518,9 +3572,20 @@ def gchandle(req):
         yjjs_gc.delay(companyid)
         return JsonResponse({"code": 1})
     elif a == 'listall':
-        startnum, endnum = fenye(req)
         a = Observe.objects.filter(usecomp=Partment.objects.get(
             partid=companyid), deletemark=1).order_by('-looktime')
+        if req.GET.get('gcr'):
+            a = a.filter(looker__userid=req.GET.get('gcr'))
+        if req.GET.get('gcbm'):
+            parts = Partment.objects.filter(partlink__contains=','+req.GET.get(
+                'gcbm')+',') | Partment.objects.filter(partid=req.GET.get('gcbm'))
+            a = a.filter(lookpart__in=parts)
+        if req.GET.get('qssj'):
+            a = a.filter(looktime__gte=req.GET.get('qssj'))
+        if req.GET.get('jssj'):
+            a = a.filter(looktime__lte=req.GET.get('jssj'))
+        total = a.count()
+        startnum, endnum = fenye(req)
         total = a.count()
         a = a[startnum:endnum].values('lookid', 'looknum', 'lookplace',
                                       'actname', 'looktime', 'looker__name', 'lookeder', 'otherunsafe')
@@ -3840,7 +3905,7 @@ def unbindwechat(req):#解绑公众号全部置空
     user.save()
     return JsonResponse({"code": 1})
 
-
+@apicheck_login
 def unbindmp(req): #解绑小程序仅仅置空mpopenid
     userid = req.session['userid']
     user = User.objects.get(userid=userid)
@@ -4110,8 +4175,12 @@ def apimiss(req):
             obj.lesson = data['lesson']
         obj.missnum = 'WS'+time.strftime('%Y%m%d%H%M%S')
         obj.usecomp = Partment.objects.get(partid=companyid)
-        if 'missimg' in data:
-            obj.missimg = '?'.join(data['missimg'])
+        missimg_l = []
+        if 'missimg' in data and data['missimg']:
+            for i in data['missimg']:
+                if i:
+                    missimg_l.append(i)
+        obj.missimg = '?'.join(missimg_l) if missimg_l else ''
         obj.save()
         yjjs_ws.delay(companyid)
         return JsonResponse({"code": 1})
@@ -4448,9 +4517,9 @@ def apisafecert(req):
         return HttpResponse(transjson(total, a), content_type="application/json")
     elif a == 'listself':
         userid = req.session['userid']
-        cardnum = Userprofile.objects.get(user__userid=userid).cardnum
+        # cardnum = Userprofile.objects.get(user__userid=userid).cardnum
         a = Safecert.objects.filter(
-            cardnum=cardnum).order_by('id')  # 无deletemark
+            user__userid=userid).order_by('id')  # 无deletemark
         total = a.count()
         if req.GET.get('sort'):
             a = a.order_by(req.GET.get('sort'))
@@ -4642,6 +4711,16 @@ def apipartuser(req):
                             'checked': False, 'isPeople': True, 'children': []})
             return JsonResponse({"code": 1, "data": lst})
 
+def get_user_from_username(req):
+    username = req.GET.get('username')
+    if username:
+        objs = User.objects.filter(username=username)
+        if objs.exists():
+            userdata = objs.values('name','username','ubelongpart__partname','usecomp__partname')
+            return JsonResponse({"code": 1, "data": list(userdata)[0]})
+    return JsonResponse({"code":0})
+
+@apicheck_login
 def apiuser(req):
     a = req.GET.get('a')
     if a == 'detail':
@@ -5260,6 +5339,20 @@ def apitool(req):
         # Questioncat.objects.filter(usecomp__partname='广安厂').update(parent=None, link=',', deletemark=1)
         # print(Questioncat.objects.filter(name='冬季四防安全生产知识').values('usecomp__partname'))
         return JsonResponse({"code":1})
+    elif a == 'check_part':
+        objs = []
+        for i in Partment.objects.exclude(parentid=None, deletemark=1).values('partid', 'parentid', 'partlink'):
+            if str(i['parentid']) not in i['partlink']:
+                print(i)
+                parent = Partment.objects.get(partid=i['parentid'])
+                partlink = parent.partlink + str(parent.partid) + ','
+                obj = Partment.objects.get(partid=i['partid'])
+                obj.partlink = partlink
+                obj.save()
+                print("调整后")
+                print(partlink)
+
+        return JsonResponse({"code":1})
             
                     
 
@@ -5488,6 +5581,7 @@ def apinotice(req):
 @transaction.atomic
 def apioperation(req):
     a = req.GET.get('a')
+    # logger.info(req.get_full_path())
     userid = req.session['userid']
     if a == 'add':
         userid = req.session['userid']
@@ -5518,8 +5612,13 @@ def apioperation(req):
                 for i in data['zyry']:
                     Operzyry.objects.create(oper=obj, operzyry=User.objects.get(userid=i), checked=1)
                 return JsonResponse({"code": 1})
+        zyimg_l = []
         if 'zyimg' in data:
-            obj.zyimg = '?'.join(data['zyimg'])
+            for i in data['zyimg']:
+                if i:
+                    zyimg_l.append(i)
+        if zyimg_l:
+            obj.zyimg = '?'.join(zyimg_l)
         obj.fxcs = '?'.join(map(str, data['fxcs']))
         obj.zyzt = {'zyzt': '确认中', 'index': 0}
         splc = []
@@ -5898,7 +5997,7 @@ def apioperation(req):
             tolist = list(User.objects.filter(
                 userid__in=sprs).values_list('openid', flat=True))
             send_wechatmsgs.delay(postdict, tolist)
-            return JsonResponse({"code": 1})
+        return JsonResponse({"code": 1})
     elif a == 'spzy':
         data = json.loads(req.body.decode('utf-8'))
         zyid = data['zyid']
@@ -5945,8 +6044,11 @@ def apioperation(req):
                 obj.zyzt['splc'][1]['sprs'] = [spr1]  # 作业部门审批人
             if spr2:
                 obj.zyzt['splc'][2]['sprs'] = [spr2]  # 属地部门审批人
-        Operspxq.objects.create(
-            oper=obj, jdmc=obj.zyzt['splc'][oldindex]['jdmc'], spr=spruser, checked=1, spbm=spruser.ubelongpart)  # 审批该步
+        try:
+            Operspxq.objects.create(
+                oper=obj, jdmc=obj.zyzt['splc'][oldindex]['jdmc'], spr=spruser, checked=1, spbm=spruser.ubelongpart)  # 审批该步
+        except:
+            pass
         while nextindex < len(obj.zyzt['splc']):
             nextsplc = obj.zyzt['splc'][nextindex]
             if userid in nextsplc['sprs']:  # 本人可审批直接跳过下一步
@@ -6896,7 +6998,8 @@ def apiexamtestdetail(req):
             answersdict['paperdetail' + str(i['id'])] = i['question__right']
         for i in testdetail:  # 判卷
             iscore = 0
-            i['question__right'] = answersdict['paperdetail'+str(i['id'])]
+            # 默认一个不存在的正确答案
+            i['question__right'] = answersdict['paperdetail'+str(i['id'])] if 'paperdetail'+str(i['id']) in answersdict else ['G']
             if i['question__type'] == 2:
                 if 'userchecked' in i:
                     if i['userchecked']:
@@ -8606,6 +8709,7 @@ def equipmentfig(req):
 
 
 #责任制
+@apicheck_login
 def getresbilitydata(req):
     a = req.GET.get('a')
     userid = req.session['userid']
@@ -8656,6 +8760,9 @@ def getresbilitydata(req):
          if 'jobpart' in data and data['jobpart']:
              obj.department=Partment.objects.get(partid=data['jobpart'])
         
+         obj.save()
+         obj.qrcode = makeqr_(
+        'https://safeyun.ctcshe.com/miniprogram/resbility?id='+str(obj.id))
          obj.save()
          return JsonResponse({"code":1})
     elif a=='listall':#责任列表
@@ -8702,6 +8809,7 @@ def getresbilitydata(req):
 
 
 #操作规程
+@apicheck_login
 def getprodata(req):
     a = req.GET.get('a')
     userid = req.session['userid']
@@ -8732,25 +8840,27 @@ def getprodata(req):
             f.write(req.FILES['mf'].read())
         return JsonResponse({"code":1,"filename":file_name,"filepath":filepath})
     elif a=='add':#新增责任制
-         obj = Operproce()
-         data = json.loads(req.body.decode('utf-8'))
-         obj.title = data['title']
-         if 'group' in data and data['group']:
-             obj.jobs =Group.objects.get(groupid= data['group'])
-         if 'type' in data and data['type']:
-             obj.homeworktype= Dickey.objects.get(dickeyid=data['type'])
-         if 'jobpart' in data and data['jobpart']:
-             obj.department=Partment.objects.get(partid=data['jobpart'])
-         if data['filepath']:
-             obj.operprocepath=data['filepath']
-         obj.createuser=User.objects.get(userid=userid)
-         if 'publisdate' in data and data['publisdate']:
-             obj.createdate=data['publisdate']
-         obj.usecomp=Partment.objects.get(partid=companyid)
-         if data['filepath']:
-             obj.filepath=data['filepath']
-         obj.save()
-         return JsonResponse({"code":1})
+        obj = Operproce()
+        data = json.loads(req.body.decode('utf-8'))
+        obj.title = data['title']
+        if 'group' in data and data['group']:
+            obj.jobs =Group.objects.get(groupid= data['group'])
+        if 'type' in data and data['type']:
+            obj.homeworktype= Dickey.objects.get(dickeyid=data['type'])
+        if 'jobpart' in data and data['jobpart']:
+            obj.department=Partment.objects.get(partid=data['jobpart'])
+        if data['filepath']:
+            obj.operprocepath=data['filepath']
+        obj.createuser=User.objects.get(userid=userid)
+        if 'publisdate' in data and data['publisdate']:
+            obj.createdate=data['publisdate']
+        obj.usecomp=Partment.objects.get(partid=companyid)
+        if data['filepath']:
+            obj.filepath=data['filepath']
+        obj.save()
+        obj.qrcode = makeqr_(
+        'https://safeyun.ctcshe.com/miniprogram/proce?id='+str(obj.id))
+        return JsonResponse({"code":1})
     elif a=='listall':#责任列表
          startnum,endnum=fenye(req)
          #groups = Group.objects.filter(users__userid=userid)
@@ -8792,6 +8902,8 @@ def getprodata(req):
          a = ReaderOperproce.objects.filter(readid=id).values('id','readeruser__name','readertime')
          total = a.count()
          return HttpResponse(transjson(total,a),content_type="application/json")
+
+@apicheck_login
 def checkprojects(req):
     a = req.GET.get('a')
     userid = req.session['userid']
diff --git a/safesite/viewsn.py b/safesite/viewsn.py
index fcec403b..7760a696 100644
--- a/safesite/viewsn.py
+++ b/safesite/viewsn.py
@@ -123,4 +123,15 @@ def apicountsafe(req):
             ret['tzcq_count'] = objs1.filter(user__userid=userid, zszt=3).count()
             ret['aq_count'] = objs2.filter(user__userid=userid).count()
             ret['aqcq_count'] = objs2.filter(user__userid=userid, zszt=3).count()
+        return JsonResponse(ret)
+    elif type == 'observe':
+        objs = Observe.objects.all()
+        if startdate:
+            objs = objs.filter(looktime__gte=startdate)
+        if enddate:
+            objs = objs.filter(looktime__lte=enddate)
+        if dept:
+            pass
+        else:
+            ret['ob_count'] = objs.filter(looker__userid=userid).count()
         return JsonResponse(ret)
\ No newline at end of file