Merge remote-tracking branch 'origin/master'

apps/api/admin/exam/views.py

@@ -56,7 +56,7 @@ class ExamViewSet(CustomModelViewSet):
                 raise CustomError(u'考试已经开始，禁止修改！')
             exam.change_examinee(user_ids)
             exam.save()
-            SysLog.objects.addnew(self.request.user, SysLog.UPDATE, u'添加考生，id=%d' % exam.id, request.POST.get('user_ids'))
+            SysLog.objects.addnew(self.request.user, SysLog.UPDATE, u'添加参考人员，id=%d' % exam.id, request.POST.get('user_ids'))
         return response_ok()
 
     @action(methods=['post'], detail=True)
@@ -124,4 +124,4 @@ class ExamLogViewSet(ReadOnlyModelViewSet):
     @action(methods=['get'], detail=True)
     def answer_log(self, request, pk):
         rows = ExamAnswerLog.objects.filter(main_id=pk).order_by('detail__order').values_list('status', flat=True)
-        return response_ok(list(rows))
+        return response_ok(list(rows))

apps/api/staff/urls.py

@@ -9,6 +9,7 @@ urlpatterns = [
     url(r'^token/obtain/$', StaffUserLoginView.as_view()),
     url(r'^token_refresh/$', StaffUserRefreshTokenView.as_view()),
     url(r'^token_verify/$', StaffUserVerifyTokenView.as_view()),
+    url(r'^change_password/$', ChangePasswordView.as_view()),
 
     url(r'^practise/', include('apps.api.staff.practise.urls')),
     url(r'^mock/', include('apps.api.staff.mock.urls')),

apps/api/staff/views.py

@@ -1,9 +1,13 @@
 # coding=utf-8
-
+import json
+from django.db import transaction
 from django.contrib.auth import get_user_model
 from rest_framework_jwt.views import ObtainJSONWebToken, VerifyJSONWebToken, RefreshJSONWebToken
 from rest_framework.serializers import ValidationError
 from utils import response_error, response_ok
+from rest_framework.views import APIView
+from utils.permission import IsStaff
+from apps.system.models import SysLog
 from apps.staff.serializers import StaffUserJWTSerializer
 
 User = get_user_model()
@@ -39,3 +43,19 @@ class StaffUserRefreshTokenView(RefreshJSONWebToken):
                 return response_ok({'token': ser.validated_data['token']})
         except ValidationError as e:
             return response_error(u'登录状态失效，请重新登录[' + e.detail['error'][0] + ']')
+
+class ChangePasswordView(APIView):
+    permission_classes = [IsStaff, ]
+
+    def post(self, request):
+        data = request.data
+
+        new_password = data['new_password'].strip(' ')
+        confirm_password = data['confirm_password'].strip(u' ')
+        old_password = data['old_password'].strip(u' ')
+
+        with transaction.atomic():
+            request.user.change_password(new_password, confirm_password, old_password)
+            request.user.save()
+            SysLog.objects.addnew(self.request.user, SysLog.UPDATE, u'修改账户密码')
+        return response_ok()

uis/admin/dashboard/home.html

@@ -13,7 +13,7 @@
 
 <div class="layui-card" style="height: 100%;display:flex;">
   <div style="margin:auto;font-weight:bold;font-size: 32px;font-style: normal;color:#868686;">
-    欢迎使用人员能力评估后台管理系统
+    欢迎使用人员能力评估管理系统
   </div>
 </div>
 

uis/admin/exam/examinee_edit.html

@@ -179,7 +179,7 @@
       form.on('submit(component-form-element)', function(data){
           var users = table.cache[layTableId];
           if (users.length === 0){
-              layer.msg('请添加考生！', {icon: 2});
+              layer.msg('请添加参考人员！', {icon: 2});
                 return false
           }
           if (!exam_id){

uis/admin/exam/index.html

@@ -102,7 +102,7 @@
                         </div>
                         <div class="layui-btn-group">
                             <a class="layui-btn layui-btn-xs" lay-event="examinee_add"
-                            >添加考生</a>
+                            >添加参考人员</a>
                         </div>
                         <div class="layui-btn-group">
                             <a class="layui-btn layui-btn-xs" lay-event="exam_detail"
@@ -164,7 +164,7 @@
                 , {field: 'passline', title: '及格线', width: 80}
                 , {field: 'create_user_text', title: '添加人', width: 100}
                 , {field: 'create_time', title: '添加时间', width: 180}
-                , {title: '操作', width: 310, align: 'center', fixed: 'right', toolbar: '#exam_question-operate-bar'}
+                , {title: '操作', width: 330, align: 'center', fixed: 'right', toolbar: '#exam_question-operate-bar'}
             ]]
             , page: true
             , height: 'full-108'
@@ -228,10 +228,10 @@
                 });
             }
             else if(obj.event === 'examinee_add'){
-                //添加考生
+                //添加参考人员
                 layer.open({
                     type: 2,
-                    title: '添加考生',
+                    title: '添加参考人员',
                     shadeClose: false,
                     area: ['80%', '85%'],
                     btn: ['保存', '取消'],

uis/admin/index.html

@@ -2,7 +2,7 @@
 <html>
 <head>
   <meta charset="utf-8">
-  <title>人员能力评估后台管理系统</title>
+  <title>人员能力评估管理系统</title>
   <meta name="renderer" content="webkit">
   <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
   <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
@@ -60,7 +60,7 @@
       <div class="layui-side layui-side-menu">
         <div class="layui-side-scroll">
           <div class="layui-logo">
-            <span>人员能力评估后台管理系统</span>
+            <span>人员能力评估管理系统</span>
           </div>
 
           <ul class="layui-nav layui-nav-tree" lay-shrink="all" id="LAY-system-side-muen" lay-filter="layadmin-system-side-menu">
@@ -122,7 +122,7 @@
                   <a lay-href="department/index.html">部门管理</a>
                 </dd>
                 <dd data-name="nav">
-                  <a lay-href="user/index.html">账户管理</a>
+                  <a lay-href="user/index.html">用户管理</a>
                 </dd>
                 <!--<dd data-name="nav">
                   <a lay-href="applet/index.html">权限管理</a>

uis/admin/login/login.html

@@ -2,7 +2,7 @@
 <html>
 <head>
     <meta charset="utf-8">
-    <title>人员能力评估后台管理系统</title>
+    <title>人员能力评估管理系统</title>
     <meta name="renderer" content="webkit">
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
     <meta name="viewport"
@@ -17,7 +17,7 @@
 
     <div class="layadmin-user-login-main">
         <div class="layadmin-user-login-box layadmin-user-login-header">
-            <font style="font-size: 25px">人员能力评估后台管理系统</font>
+            <font style="font-size: 25px">人员能力评估管理系统</font>
         </div>
         <form class="layui-form" action="" lay-filter="component-form-element">
             <div class="layadmin-user-login-box layadmin-user-login-body layui-form">

uis/admin/user/edit.html

@@ -2,7 +2,7 @@
 <html>
 <head>
   <meta charset="utf-8">
-  <title>账户管理</title>
+  <title>用户管理</title>
   <meta name="renderer" content="webkit">
   <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
   <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
@@ -163,4 +163,4 @@
   });
   </script>
 </body>
-</html>
+</html>

uis/dist/css/chunk-03126ade.c7c001c1.css

@@ -0,0 +1 @@
+#basic{min-height:100vh}#basic .el-container .el-header{background-color:#3867b7;position:relative}#basic .el-container .el-header .left{display:flex;align-items:center}#basic .el-container .el-header .left span{font-family:Arial Negreta,Arial Normal,Arial;font-weight:700;font-style:normal;font-size:20px;color:#fff;line-height:60px}#basic .el-container .el-header .right{position:absolute;right:0;top:0;display:flex;align-items:center}#basic .el-container .el-header .right .btns{line-height:60px;color:#ccc;padding:0 20px}#basic .el-container .el-header .right .btns:hover{color:#fff;background-color:#1abc9c}#basic .el-container .el-main{width:1200px;margin:auto}