Merge branch 'master' of https://e.coding.net/ctcdevteam/cma_search

server/apps/edu/views.py

@@ -42,11 +42,11 @@ class CertificateViewSet(CreateUpdateCustomMixin, ModelViewSet):
             titles = []
             if instance.是否内审员:
                 titles.append('内审员')
-            elif instance.是否授权签字人:
+            if instance.是否授权签字人:
                 titles.append('授权签字人')
-            elif instance.是否质量负责人:
+            if instance.是否质量负责人:
                 titles.append('质量负责人')
-            elif instance.是否最高管理者:
+            if instance.是否最高管理者:
                 titles.append('最高管理者')
             instance.证书地址 = make_img(instance.证书编号, instance.姓名, '、'.join(titles))
             instance.save()

server/server/settings.py

@@ -137,7 +137,7 @@ DEFAULT_AUTO_FIELD = 'django.db.models.AutoField'
 STATIC_URL = '/static/'
 STATIC_ROOT = os.path.join(BASE_DIR, 'static')
 STATICFILES_DIRS = (
-    os.path.join(BASE_DIR, 'vuedist/static'),
+    os.path.join(BASE_DIR, 'dist/static'),
 )
 
 MEDIA_URL = '/media/'