diff --git a/groups/templates/groups/base.html b/groups/templates/groups/base.html index c6be3ac5..4f4ede2f 100644 --- a/groups/templates/groups/base.html +++ b/groups/templates/groups/base.html @@ -9,6 +9,7 @@ scratch. This page gets rid of all links and provides the needed markup only. {% load static %} + 集团管理分析后台 @@ -23,7 +24,12 @@ scratch. This page gets rid of all links and provides the needed markup only. page. However, you can choose any other skin. Make sure you apply the skin class to the body tag so the changes take effect. --> - + + + + + + -
  • - -
    • @@ -136,7 +139,7 @@ desired effect -
    + @@ -307,12 +310,7 @@ desired effect - - - - - - + -
    -
    -
    - + +
    +
    + +
    +
    +

    {{troublenum}}

    -
    - CPU Traffic - 90% -
    - -
    - -
    - -
    -
    - - -
    - Likes - 41,410 -
    - -
    - -
    - - - -
    - -
    -
    - - -
    - Sales - 760 -
    - -
    - -
    - -
    -
    - - -
    - New Members - 2,000 -
    - -
    - -
    - +

    事故隐患

    - - -
    -
    -
    -
    -

    Monthly Recap Report

    - -
    - -
    - - -
    - -
    -
    - -
    -
    -
    -

    - Sales: 1 Jan, 2014 - 30 Jul, 2014 -

    - -
    - - -
    - -
    - -
    -

    - Goal Completion -

    - -
    - Add Products to Cart - 160/200 - -
    -
    -
    -
    - -
    - Complete Purchase - 310/400 - -
    -
    -
    -
    - -
    - Visit Premium Page - 480/800 - -
    -
    -
    -
    - -
    - Send Inquiries - 250/500 - -
    -
    -
    -
    - -
    - -
    - -
    - -
    -
    -
    -
    - 17% -
    $35,210.43
    - TOTAL REVENUE -
    - -
    - -
    -
    - 0% -
    $10,390.90
    - TOTAL COST -
    - -
    - -
    -
    - 20% -
    $24,813.53
    - TOTAL PROFIT -
    - -
    - -
    -
    - 18% -
    1200
    - GOAL COMPLETIONS -
    - -
    -
    - -
    - -
    - -
    - +
    +
    - + 更多分析 +
    +
    + +
    + +
    +
    +

    {{observenum}} + +

    - -
    - -
    - -
    -
    -

    Visitors Report

    - -
    - - -
    -
    - -
    -
    -
    -
    - -
    -
    -
    - -
    -
    -
    -
    90,70,90,70,75,80,70
    -
    8390
    - Visits -
    - -
    -
    90,50,90,70,61,83,63
    -
    30%
    - Referrals -
    - -
    -
    90,50,90,70,61,83,63
    -
    70%
    - Organic -
    - -
    -
    - -
    - -
    - -
    - - -
    -
    -

    Latest Orders

    - -
    - - -
    -
    - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    Order IDItemStatusPopularity
    OR9842Call of Duty IVShipped -
    90,80,90,-70,61,-83,63
    -
    OR1848Samsung Smart TVPending -
    90,80,-90,70,61,-83,68
    -
    OR7429iPhone 6 PlusDelivered -
    90,-80,90,70,-61,83,63
    -
    OR7429Samsung Smart TVProcessing -
    90,80,-90,70,-61,83,63
    -
    OR1848Samsung Smart TVPending -
    90,80,-90,70,61,-83,68
    -
    OR7429iPhone 6 PlusDelivered -
    90,-80,90,70,-61,83,63
    -
    OR9842Call of Duty IVShipped -
    90,80,90,-70,61,-83,63
    -
    -
    - -
    - -
    - Place New Order - View All Orders -
    - -
    - -
    - - -
    - -
    - - -
    - Inventory - 5,200 - -
    -
    -
    - - 50% Increase in 30 Days - -
    - -
    - -
    - - -
    - Mentions - 92,050 - -
    -
    -
    - - 20% Increase in 30 Days - -
    - -
    - -
    - - -
    - Downloads - 114,381 - -
    -
    -
    - - 70% Increase in 30 Days - -
    - -
    - -
    - - -
    - Direct Messages - 163,921 - -
    -
    -
    - - 40% Increase in 30 Days - -
    - -
    - - -
    -
    -

    Recently Added Products

    - -
    - - -
    -
    - -
    -
      -
    • -
      - Product Image -
      -
      - Samsung TV - $1800 - - Samsung 32" 1080p 60Hz LED Smart HDTV. - -
      -
      • - -
    • -
      - Product Image -
      -
      - Bicycle - $700 - - 26" Mongoose Dolomite Men's 7-speed, Navy Blue. - -
      -
      • - -
    • -
      - Product Image -
      -
      - Xbox One $350 - - Xbox One Console Bundle with Halo Master Chief Collection. - -
      -
      • - -
    • -
      - Product Image -
      -
      - PlayStation 4 - $399 - - PlayStation 4 500GB Console (PS4) - -
      -
      • - -
    -
    - -
    - View All Products -
    - -
    - -
    - +

    行为观察

    - +
    + +
    + 更多分析 +
    +
    + +
    + +
    +
    +

    {{missnum}}

    + +

    未遂事件

    +
    +
    + +
    + 更多分析 +
    +
    + +
    + +
    +
    +

    {{trainnum}}

    + +

    教育培训

    +
    +
    + +
    + 更多分析 +
    +
    + +
    + +
    +
    +

    {{companynum}}

    + +

    下属公司数

    +
    +
    + +
    + 更多分析 +
    +
    +
    + +
    +
    +

    {{usernum}}

    + +

    下属员工总数

    +
    +
    + +
    + 更多分析 +
    +
    +
    + + +
    + +
    +

    + {{group.groupname}} +

    +
    +
    +

    公司分布

    + +
    + + +
    +
    + +
    +
    +
    + + +
    + +
    + +
    +
    + +
    + +
    + +
    + +
    + + + {% endblock %} \ No newline at end of file diff --git a/groups/urls.py b/groups/urls.py index 22dd9232..6361e26a 100644 --- a/groups/urls.py +++ b/groups/urls.py @@ -16,6 +16,8 @@ urlpatterns = [ path('tain/', views.job, name='groups_train'),#教育培训统计图 path('test/', views.job, name='groups_test'),#在线考试统计图 path('refresh_captcha/', views.refresh_captcha), + path('updateposition/',views.updateposition), + path('api/positions',views.apipositions), path('api/troubleChart',views.troubleChart), path('api/observeChart',views.observeChart) - ] \ No newline at end of file + ] diff --git a/groups/views.py b/groups/views.py index c4c4a465..08192b88 100644 --- a/groups/views.py +++ b/groups/views.py @@ -1,19 +1,25 @@ -from django.http import HttpResponse +from django.http import HttpResponse,JsonResponse from django.shortcuts import render from django.shortcuts import redirect from .models import Group,GroupUser from .forms import GroupUserForm from safesite import models as s_models +from safesite.tasks import gettime +import requests +import json import time from datetime import datetime,date,timedelta -from safesite.tasks import send_wechatmsgs,send_wechatmsg,yjjs,gettime,yjjs_px,yjjs_yl,updateTzzs,updateAqzs,yjjs_gc,yjjs_ws -from django.db.models import Q from django.core.serializers.json import DjangoJSONEncoder -from django.db.models import F,Count,Sum -def index(request): - if not request.session.get('is_login', None): - return redirect('/groups/login/') - return render(request, 'groups/index.html') +from django.db.models import Q,F,Count,Sum + +def check_login(func): # 自定义登录验证装饰器 + def warpper(request,*args,**kwargs): + is_login = request.session.get('is_login', False) + if is_login: + return func(request,*args,**kwargs) + else: + return redirect('/groups/login') + return warpper def login(request): # 不允许重复登录 @@ -44,8 +50,8 @@ def login(request): return render(request, 'groups/login.html', locals()) def logout(request): - if not request.session.get('is_login', None): - return redirect('/groups/login') + # if not request.session.get('is_login', None): + # return redirect('/groups/login') request.session.flush() return redirect('/groups/login') @@ -57,7 +63,7 @@ def refresh_captcha(request): image_url = captcha_image_url(hashkey) return HttpResponse(json.dumps({'key': hashkey, 'image_url': image_url}), content_type='application/json') - +@check_login def company(request): companys = GroupUser.objects.get(id = request.session['user_id']).group.members.all() for i in companys: @@ -66,6 +72,48 @@ def company(request): def job(request): return render(request, 'groups/job.html', locals()) + +@check_login +def index(req): + first_day,first_day_of_next_month=gettime() + group = GroupUser.objects.get(id = req.session['user_id']).group + companys = group.members.all() + troublenum = s_models.Trouble.objects.filter(deletemark=1,usecomp__in=companys,fxsj__range=(first_day, first_day_of_next_month)).count() + observenum = s_models.Observe.objects.filter(deletemark=1,usecomp__in=companys,looktime__range=(first_day, first_day_of_next_month)).count() + missnum = s_models.Miss.objects.filter(deletemark=1,usecomp__in=companys,misstime__range=(first_day, first_day_of_next_month)).count() + trainnum = s_models.Train.objects.filter(deletemark=1,usecomp__in=companys,starttime__range=(first_day, first_day_of_next_month)).count() + companynum = len(companys) + usernum = s_models.User.objects.filter(deletemark=1,usecomp__in=companys).count() + return render(req, 'groups/index.html', locals()) + + +def updateposition(req): + allcompanys = s_models.Partment.objects.filter(deletemark=1,iscompany=1) + for i in allcompanys: + address = i.partname + data = getPosition(address) + if data['status'] == '1' and int(data['count'])>0: + i.position = data['geocodes'][0] + i.save() + else: + address = i.partname.replace('公司','').replace('责任','').replace('有限','') + data = getPosition(address) + if data['status'] == '1' and int(data['count'])>0: + i.position = data['geocodes'][0] + i.save() + return JsonResponse({"code":1}) + +def getPosition(address): + url = 'http://restapi.amap.com/v3/geocode/geo' + par = {'address': address, 'key': '86e0993305a427ac2d0b5371ad97f242'} + res = requests.get(url, par) + json_data = json.loads(res.text) + return json_data + +def apipositions(req): + companys = GroupUser.objects.get(id = req.session['user_id']).group.members.all() + positions = companys.values('position','partname') + return JsonResponse({"code":1,"data":list(positions)}) def trouble(request):#隐患排查 return render(request, 'groups/troublepic.html', locals()) def observe(request):#行为观察 @@ -95,6 +143,6 @@ def observeChart(request):#行为观察 hjzj=[]#环境整洁 first_day,first_day_of_next_month = gettime(datetime(year,month,1)) companys = GroupUser.objects.get(id = request.session['user_id']).group.members.all() - - - return HttpResponse(json.dumps({'code':companys}), content_type='application/json') \ No newline at end of file + + return HttpResponse(json.dumps({'code':1,'data':{'list':list(Observe)},'userfy':userfy,'userwz':userwz,'grfh':grfh,'gjhsb':gjhsb,'cxhbz':cxhbz,'rtgcx':rtgcx,'hjzj':hjzj,}), content_type='application/json') + diff --git a/safesite/daoru.py b/safesite/daoru.py index a51befa2..703c23fd 100644 --- a/safesite/daoru.py +++ b/safesite/daoru.py @@ -268,10 +268,14 @@ def drusers(companyid,path): wb = load_workbook(path) sheet = wb.worksheets[0] partdict = {} + groupdict = {} userdict = {} parts = Partment.objects.filter(partlink__contains=',' + companyid + ',')|Partment.objects.filter(partid=companyid) #获取所有部门 for i in parts: partdict[i.partname] = i.partid + # groups = Group.objects.filter(usecomp__partid=companyid) + # for i in groups: + # groupdict[i.groupname] = i.groupid i = 4 while sheet['C'+str(i)].value !=None: empid = sheet['A'+str(i)].value @@ -283,7 +287,7 @@ def drusers(companyid,path): username = sheet['C'+str(i)].value if isinstance(username,str): username = username.replace(' ', '') - partname = sheet['D'+str(i)].value + partname = sheet['D'+str(i)].value #部门 if partname != None: partname = partname.replace(' ', '') if partname not in partdict: @@ -293,6 +297,14 @@ def drusers(companyid,path): a.partlink = Partment.objects.get(partid=companyid).partlink + str(companyid) + ',' a.save() partdict[partname] = a.partid + # groupname = sheet['E'+str(i)].value + # groupname = groupname.replace(' ', '') if groupname else None + # if groupname and groupname not in groupdict: + # obj = Group() + # obj.groupname = groupname + # obj.usecomp = Partment.objects.get(partid=companyid) + # obj.save() + # groupdict[groupname] = obj.groupid if User.objects.filter(username = username).count() == 0: a = User() a.name = name @@ -303,6 +315,8 @@ def drusers(companyid,path): a.usecomp = Partment.objects.get(partid=companyid) a.save() Group.objects.get(usecomp__partid=companyid,grouptype=3).users.add(a) #赋权 + # if groupname: + # Group.objects.get(groupid=groupdict[groupname]).users.add(a) else: userdict[username]=i i = i + 1 diff --git a/safesite/migrations/0279_auto_20191022_1635.py b/safesite/migrations/0279_auto_20191022_1635.py new file mode 100644 index 00000000..cfd3bc4a --- /dev/null +++ b/safesite/migrations/0279_auto_20191022_1635.py @@ -0,0 +1,23 @@ +# Generated by Django 2.1.5 on 2019-10-22 16:35 + +import django.contrib.postgres.fields.jsonb +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('safesite', '0278_auto_20191018_1723'), + ] + + operations = [ + # migrations.RemoveField( + # model_name='companyinfo', + # name='liaison_fax', + # ), + migrations.AddField( + model_name='partment', + name='position', + field=django.contrib.postgres.fields.jsonb.JSONField(blank=True, null=True, verbose_name='坐标'), + ), + ] diff --git a/safesite/migrations/0280_auto_20191023_1711.py b/safesite/migrations/0280_auto_20191023_1711.py new file mode 100644 index 00000000..5af9ff40 --- /dev/null +++ b/safesite/migrations/0280_auto_20191023_1711.py @@ -0,0 +1,32 @@ +# Generated by Django 2.1.5 on 2019-10-23 17:11 + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('safesite', '0279_auto_20191022_1635'), + ] + + operations = [ + migrations.CreateModel( + name='Groupuser2', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('group', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='safesite.Group')), + ('part', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.Partment')), + ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='safesite.User')), + ], + ), + # migrations.RemoveField( + # model_name='companyinfo', + # name='liaison_fax', + # ), + migrations.AddField( + model_name='group', + name='users2', + field=models.ManyToManyField(related_name='userg2', through='safesite.Groupuser2', to='safesite.User'), + ), + ] diff --git a/safesite/models.py b/safesite/models.py index 51c28e6c..7885bff6 100644 --- a/safesite/models.py +++ b/safesite/models.py @@ -17,6 +17,7 @@ class Partment(models.Model): aqy = models.CharField(max_length=1000,default=',')#安全员 bmzg = models.CharField(max_length=1000,default=',')#主管 bsq = models.CharField(max_length=1000,default=',')#授权者 + position = JSONField('坐标',null=True,blank=True) def __str__(self): return self.partname @@ -281,9 +282,15 @@ class Group(models.Model):#用户组，岗位 groupname = models.CharField(max_length=30,blank=True,null=True) grouptype = models.IntegerField(default=4) users = models.ManyToManyField(User,related_name='userg') + users2 = models.ManyToManyField(User,related_name='userg2',through='Groupuser2') usecomp = models.ForeignKey(Partment, on_delete=models.CASCADE,related_name='usecompg',default=1) menulink = models.CharField(max_length=200,default='11') +class Groupuser2(models.Model): #比较好的方式 + group = models.ForeignKey(Group, on_delete=models.CASCADE) + user = models.ForeignKey(User, on_delete=models.CASCADE) + part = models.ForeignKey(Partment, on_delete=models.CASCADE,null=True,blank=True) + class Menu(models.Model):#菜单 menuid = models.AutoField(primary_key=True) menuname = models.CharField(max_length=30,blank=True,null=True) diff --git a/safesite/static/safesite/muban/userst.xlsx b/safesite/static/safesite/muban/userst.xlsx index 1618032d..fd4147db 100644 Binary files a/safesite/static/safesite/muban/userst.xlsx and b/safesite/static/safesite/muban/userst.xlsx differ diff --git a/safesite/templates/abuser.html b/safesite/templates/abuser.html index 249ad111..856f1a5d 100644 --- a/safesite/templates/abuser.html +++ b/safesite/templates/abuser.html @@ -36,6 +36,20 @@ $('#ubelongpart').treegrid('unselect'); } } --> +