From e63749c8edc85e653680e1be95224f58afb94467 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Mon, 18 Nov 2019 19:32:59 +0800
Subject: [PATCH] password encrpt

---
 .gitignore                        |   1 +
 safesite/export.py                |  13 ++++---
 safesite/exportemp/equipment.xlsx | Bin 9289 -> 9296 bytes
 safesite/templates/index.html     |  59 ++++++++++++++++++------------
 safesite/views.py                 |   8 ++--
 5 files changed, 48 insertions(+), 33 deletions(-)

diff --git a/.gitignore b/.gitignore
index 45a41aea..13f19990 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,6 +10,7 @@ mysite/__pycache__/
 media/
 aspnet_client/
 static/
+mysite/settings.py
 
 # Byte-compiled / optimized / DLL files
 __pycache__/
diff --git a/safesite/export.py b/safesite/export.py
index 9cd9e0d6..634c1843 100644
--- a/safesite/export.py
+++ b/safesite/export.py
@@ -643,12 +643,13 @@ def exportxlsx(a,objs):
         sheet = wb.active
         for i, x in enumerate(objs):
             num = str(i+3)
-            sheet['a'+num] = x.name
-            sheet['b'+num] = x.catename
-            sheet['c'+num] = x.type
-            sheet['d'+num] = x.area.name
-            sheet['e'+num] = '正常' if x.state==1 else '异常'
-            sheet['f'+num] = 'https://safeyun.ctcshe.com/miniprogram/equipment?id='+str(x.id)
+            sheet['a'+num] = x.num
+            sheet['b'+num] = x.name
+            sheet['c'+num] = x.cate.dickeyname
+            sheet['d'+num] = x.type
+            sheet['e'+num] = x.area.name
+            sheet['f'+num] = '正常' if x.state==1 else '异常'
+            sheet['g'+num] = 'https://safeyun.ctcshe.com/miniprogram/equipment?id='+str(x.id)
         nowtime = datetime.now().strftime('%Y%m%d%H%M%S') 
         sheet['b1'] = nowtime
         filename = 'SBS' + nowtime
diff --git a/safesite/exportemp/equipment.xlsx b/safesite/exportemp/equipment.xlsx
index 04eab477560924959a7fe600d00544769048b6c6..a7d5b212ddd7a3e2682dd5ae0eb24a6a50312049 100644
GIT binary patch
delta 4797
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

delta 4807
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

diff --git a/safesite/templates/index.html b/safesite/templates/index.html
index e31d8781..e90f8a2c 100644
--- a/safesite/templates/index.html
+++ b/safesite/templates/index.html
@@ -28,12 +28,11 @@
     <script src="https://cdn.bootcss.com/jquery-cookie/1.4.1/jquery.cookie.js"></script>
     <script type="text/javascript" src="/static/safesite/mystatic/js/util.js"></script>
     <style type="text/css">
-        .easyui-linkbutton:hover
-
-        {
+        .easyui-linkbutton:hover {
             background: #1148a0;
             color: #0E2D5F;
         }
+
         .loading {
             position: absolute;
             z-index: 1000;
@@ -45,14 +44,16 @@
             text-align: left;
             padding: 5px 10px
         }
+
         .northDiv {
             overflow: hidden;
             height: 80px;
             background-color: #013162;
             background-image: url("/static/safesite/mystatic/images/indexbj1.png");
             background-repeat: no-repeat;
-            font-family: Verdana, 微软雅黑,黑体
+            font-family: Verdana, 微软雅黑, 黑体
         }
+
         .divMune {
             height: 35px;
             background-color: #f9f9f9;
@@ -62,7 +63,7 @@
             font-weight: bold;
             line-height: 35px;
             cursor: pointer;
-        
+
         }
     </style>
 </head>
@@ -76,8 +77,9 @@
     </div>
     <div region="north" class="northDiv">
         <div style="float:right;width:7%;margin-left:10px">
-            <img src="/static/safesite/mystatic/images/head.png" style="float: right;width:50px;height:50px;text-align: center;margin-top: 10px;margin-right: 10px;"
-                 id="headimg" />
+            <img src="/static/safesite/mystatic/images/head.png"
+                style="float: right;width:50px;height:50px;text-align: center;margin-top: 10px;margin-right: 10px;"
+                id="headimg" />
         </div>
         <div style="width:30%;float:right">
             <div style="margin-top: 10px;text-align: center;position: fixed;width: 500px;height: 70px;right: 20px;">
@@ -87,30 +89,35 @@
             </div>
             <div style="text-align: center;position: fixed;width: 500px;height: 70px;top: 40px;right: 60px;">
                 <a style="color: #eee5e7;cursor: pointer;" class="easyui-linkbutton" iconCls="fa-sign-out" plain=true
-                   onclick="logout()">安全退出</a>
-                <a style="color: #eee5e7;cursor: pointer;" id="bindwx" class="easyui-linkbutton" iconCls="fa-weixin" plain=true
-                   onclick="bindwx()">绑定微信</a>
+                    onclick="logout()">安全退出</a>
+                <a style="color: #eee5e7;cursor: pointer;" id="bindwx" class="easyui-linkbutton" iconCls="fa-weixin"
+                    plain=true onclick="bindwx()">绑定微信</a>
                 <a style="color: #eee5e7;cursor: pointer;" class="easyui-linkbutton" iconCls="fa-key" plain=true
-                   onclick="javascript:$('#pwdg').dialog({border:false})">修改密码</a>
-                <a id='setupb' class="easyui-linkbutton" iconCls="fa-cogs" plain=true style="display:none;color: #eee5e7;cursor: pointer;"
-                   onclick="setup()">预警设置</a>
-                <a style="color: #eee5e7;cursor: pointer;" href="datashow" target="_blank" class="easyui-linkbutton" iconCls="fa-desktop" plain=true>数据大屏</a>
+                    onclick="javascript:$('#pwdg').dialog({border:false})">修改密码</a>
+                <a id='setupb' class="easyui-linkbutton" iconCls="fa-cogs" plain=true
+                    style="display:none;color: #eee5e7;cursor: pointer;" onclick="setup()">预警设置</a>
+                <a style="color: #eee5e7;cursor: pointer;" href="datashow" target="_blank" class="easyui-linkbutton"
+                    iconCls="fa-desktop" plain=true>数据大屏</a>
             </div>
         </div>
 
         <div style="width:50%;height:100%">
             <input id="userindex" userid="{{userid}}" openid="{{openid}}" nickname="{{nickname}}"
-                   headimgurl="{{headimgurl}}" menus="{{menus}}" style="display:none;" />
+                headimgurl="{{headimgurl}}" menus="{{menus}}" style="display:none;" />
 
-           <button style="margin: 15px;background-color: transparent;border: 0;color: white;cursor: pointer;" onclick="javascript:$('#main').panel({href:'mainhtml',title:'主页'})"><span style="font-size:24px">{{companyname}}</span><br/><span style="font-size:20px">安全生产管理系统</span></button>
+            <button style="margin: 15px;background-color: transparent;border: 0;color: white;cursor: pointer;"
+                onclick="javascript:$('#main').panel({href:'mainhtml',title:'主页'})"><span
+                    style="font-size:24px">{{companyname}}</span><br /><span
+                    style="font-size:20px">安全生产管理系统</span></button>
         </div>
     </div>
-   
-   
+
+
     <div id="menuTreediv" data-options="region:'west'" style="width: 150px; background-color: #ffffff;">
         <div class="divMune">
-            <img src="/static/safesite/mystatic/images/fanhuiBut.png" style="float: right;width:20px;height:20px;text-align: center;margin-top: 10px;margin-right: 10px;"
-                 id="headimg" />
+            <img src="/static/safesite/mystatic/images/fanhuiBut.png"
+                style="float: right;width:20px;height:20px;text-align: center;margin-top: 10px;margin-right: 10px;"
+                id="headimg" />
             <a onclick="javascript:$('#main').panel({href:'mainhtml',title:'主页'})">返回主页</a>
         </div>
         <div id="menuTree" style="width:100%;text-align: right; background-color: rgb(25, 53, 58);"></div>
@@ -198,7 +205,11 @@
             var v = $("#oldpwd").val();
             var v1 = $("#newpwd").val();
             var v2 = $("#newpwd2").val();
-            if (v1 == v2) {
+            var regex = new RegExp('(?=.*[0-9])(?=.*[a-zA-Z]).{8,30}');
+            if (!regex.test(v1)||!regex.test(v2)) {
+                $.messager.alert("提示信息", "您的密码复杂度太低（密码中必须包含字母、数字）", "error");
+            }
+            else if (v1 == v2) {
                 $.post(
                     "changepwd",
                     { "oldpassword": v, "newpassword": v1 },
@@ -221,7 +232,7 @@
         }
 
         function setup() {
-            opendg('预警相关设置','setup?a=setuph')
+            opendg('预警相关设置', 'setup?a=setuph')
         }
         /*
         * 关闭遮罩层
@@ -252,8 +263,8 @@
                 },
             });
         })
-        $.get('api/rights?a=have',function(res){
-            localStorage.setItem('data',JSON.stringify(res));
+        $.get('api/rights?a=have', function (res) {
+            localStorage.setItem('data', JSON.stringify(res));
         })
     </script>
 
diff --git a/safesite/views.py b/safesite/views.py
index 228654dc..ccb54563 100644
--- a/safesite/views.py
+++ b/safesite/views.py
@@ -2219,8 +2219,10 @@ def getuser(req):
         if req.GET.get('a')=='datagrid':
             a = User.objects.filter(ubelongpart__in=parts,deletemark=1).exclude(issuper=1)
             total = a.count()
-            startnum,endnum = fenye(req)
-            a = a[startnum:endnum].values('userid','empid','name','ubelongpart__partname','ubelongpart__partid','username','openid')
+            if req.GET.get('page',None):
+                startnum,endnum = fenye(req)
+                a = a[startnum:endnum]
+            a = a.values('userid','empid','name','ubelongpart__partname','ubelongpart__partid','username','openid')
             return HttpResponse(transjson(total,a),content_type="application/json")
         else:
             a = User.objects.filter(ubelongpart__in=parts,deletemark=1).exclude(issuper=1).values('userid','name')
@@ -3149,7 +3151,7 @@ def apicompany(req):
             x = User()
             x.username = admin
             x.name = '超级管理员'
-            x.password = '0000'
+            x.password = 'Aq123456'
             x.issuper = 1
             x.ubelongpart = y
             x.usecomp = y