-
+
-
-
- 导入分子公司能力
-
-
- 导入能力列表压缩包.
-
-
- 上传导入
-
-
-
- 导入能力列表压缩包.
+
+
+ 上传导入
+
+
+
+
- 取消
+
+ 取消
确认
+ 
+
+
+
+
+
+ Vue
+
+
+ JavaScript
+
+
+ Css
+
+
+ ESLint
+
+
+
+
+
+
+
+ 访问用户
+
+
+
+
+
+
+
+ 缴费用户
+
+
+
+
+
+
+
+ 模考次数
+
+
+
+
+
+
+
+ 题目总数
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
@@ -15,6 +54,11 @@ export default {
'name',
'perms'
])
+ },
+ methods:{
+ toPath(val) {
+ this.$router.push({path:val})
+ }
}
}
@@ -29,4 +73,116 @@ export default {
line-height: 46px;
}
}
+.panel-group {
+ margin-top: 18px;
+
+ .card-panel-col {
+ margin-bottom: 32px;
+ }
+
+ .card-panel {
+ height: 108px;
+ cursor: pointer;
+ font-size: 12px;
+ position: relative;
+ overflow: hidden;
+ color: #666;
+ background: #fff;
+ box-shadow: 4px 4px 40px rgba(0, 0, 0, .05);
+ border-color: rgba(0, 0, 0, .05);
+
+ &:hover {
+ .card-panel-icon-wrapper {
+ color: #fff;
+ }
+
+ .icon-people {
+ background: #40c9c6;
+ }
+
+ .icon-message {
+ background: #36a3f7;
+ }
+
+ .icon-money {
+ background: #f4516c;
+ }
+
+ .icon-shopping {
+ background: #34bfa3
+ }
+ }
+
+ .icon-people {
+ color: #40c9c6;
+ }
+
+ .icon-message {
+ color: #36a3f7;
+ }
+
+ .icon-money {
+ color: #f4516c;
+ }
+
+ .icon-shopping {
+ color: #34bfa3
+ }
+
+ .card-panel-icon-wrapper {
+ float: left;
+ margin: 14px 0 0 14px;
+ padding: 16px;
+ transition: all 0.38s ease-out;
+ border-radius: 6px;
+ }
+
+ .card-panel-icon {
+ float: left;
+ font-size: 48px;
+ }
+
+ .card-panel-description {
+ float: right;
+ font-weight: bold;
+ margin: 26px;
+ margin-left: 0px;
+
+ .card-panel-text {
+ line-height: 18px;
+ color: rgba(0, 0, 0, 0.45);
+ font-size: 16px;
+ margin-bottom: 12px;
+ }
+
+ .card-panel-num {
+ font-size: 20px;
+ }
+ }
+ }
+}
+
+@media (max-width:550px) {
+ .card-panel-icon-wrapper {
+ float: none !important;
+ width: 100%;
+ height: 50%;
+ margin: 0 !important;
+
+ .svg-icon {
+ display: block;
+ margin: 0px auto !important;
+ float: none !important;
+ }
+ }
+ .card-panel-description {
+ margin:0px !important;
+ float: none !important;
+ font-weight: bold;
+ /* margin: 26px; */
+ margin-top: 20px !important;
+ text-align: center;
+ /* margin-left: 0px; */
+}
+}
diff --git a/client/src/views/login/index.vue b/client/src/views/login/index.vue
index a6132da..d14c0cf 100644
--- a/client/src/views/login/index.vue
+++ b/client/src/views/login/index.vue
@@ -2,7 +2,7 @@
name: {{ name }}
- perms: {{ perm }}
+
+
+
+
+
+
+ 检测能力(总部)
+
+
+
+
+
+
+
+
+ 检测能力(分子公司)
+
+
+
+
+
+
+
+
+ 资质查询
+
+
+
-
ctc能力检索
+国检集团检测能力查询平台
+
+
+
+
+
+
+
+
+ 提交
+ 重置
+
+
+
+
+
\ No newline at end of file
diff --git a/client/src/views/system/user.vue b/client/src/views/system/user.vue
index 4d32479..16afd8b 100644
--- a/client/src/views/system/user.vue
+++ b/client/src/views/system/user.vue
@@ -1,142 +1,169 @@
- 部门
-
-
- 用户
-
-
-
- 用户
+
+
+
+
+ 搜索
- 刷新重置
-
-
- 新增
-
-
+ 新增
+
+
- 取消
+
+ 取消
确认
@@ -204,21 +241,27 @@
}
diff --git a/server/apps/ability/views.py b/server/apps/ability/views.py
index cdd5961..c616e51 100644
--- a/server/apps/ability/views.py
+++ b/server/apps/ability/views.py
@@ -19,7 +19,7 @@ class CMAViewSet(ModelViewSet):
'put': 'cma_update', 'delete': 'cma_delete'}
queryset = CMA.objects.all()
serializer_class = CMASerializer
- search_fields = ['bzbh', 'bzmc', 'sszx', 'xmmc', 'glzz']
+ search_fields = ['bzbh', 'bzmc', 'sszx', 'xmmc', 'glzz', 'dlmc']
filterset_fields = ['sszx', 'type', 'glzz']
ordering_fields = ['xmxh']
ordering = 'sszx'
diff --git a/server/apps/system/serializers.py b/server/apps/system/serializers.py
index 4feb35a..ee6cdf5 100644
--- a/server/apps/system/serializers.py
+++ b/server/apps/system/serializers.py
@@ -83,7 +83,7 @@ class UserListSerializer(serializers.ModelSerializer):
class Meta:
model = User
fields = ('id', 'name', 'phone', 'email', 'position',
- 'username', 'is_active', 'date_joined', 'dept_name', 'dept', 'roles', 'avatar','roles_')
+ 'username', 'is_active', 'date_joined', 'dept_name', 'dept', 'roles', 'avatar','roles_', 'is_superuser')
@staticmethod
def setup_eager_loading(queryset):
diff --git a/server/apps/system/views.py b/server/apps/system/views.py
index 040692b..406121c 100644
--- a/server/apps/system/views.py
+++ b/server/apps/system/views.py
@@ -88,11 +88,11 @@ class sendMsg(APIView):
return Response('该账户不存在', status=status.HTTP_400_BAD_REQUEST)
try:
# 邮件内容
- msg=MIMEText('ctc能力检索本次验证码为' + str(code),'plain','utf-8')
+ msg=MIMEText('您好,能力查询本次登陆验证码为' + str(code),'plain','utf-8')
# 括号里的对应发件人邮箱昵称、发件人邮箱账号
- msg['From']=formataddr(["国检集团能力检索",my_sender])
+ msg['From']=formataddr(["国检集团检测能力查询平台",my_sender])
# 括号里的对应收件人邮箱昵称、收件人邮箱账号
- msg['To']=formataddr(["国检集团",my_user])
+ msg['To']=formataddr(["",my_user])
# 邮件的主题
msg['Subject'] = Header(str(code), 'utf-8').encode()
@@ -244,13 +244,13 @@ class UserViewSet(ModelViewSet):
serializer.save(password=password)
return Response(serializer.data)
- @action(methods=['put'], detail=True, permission_classes=[IsAuthenticated],
+ @action(methods=['put'], detail=False, permission_classes=[IsAuthenticated],
url_name='change_password')
def password(self, request, pk=None):
"""
- 修改密码
+ 用户修改密码
"""
- user = User.objects.get(id=pk)
+ user = request.user
old_password = request.data['old_password']
if check_password(old_password, user.password):
new_password1 = request.data['new_password1']
@@ -283,6 +283,18 @@ class UserViewSet(ModelViewSet):
}
return Response(data)
+ @action(methods=['put'], detail=True, url_name='userpw_reset', perms_map={'put':'userpw_reset'})
+ def resetpw(self, request, pk=None):
+ """
+ 重置密码
+ """
+ if request.user.is_superuser:
+ user = self.get_object()
+ user.set_password('0000')
+ user.save()
+ return Response('密码已重置为0000', status=status.HTTP_200_OK)
+ return Response('权限不足', status=status.HTTP_400_BAD_REQUEST)
+
from django.conf import settings
from rest_framework.parsers import (FileUploadParser, JSONParser,
MultiPartParser)