diff --git a/server/apps/exam/views.py b/server/apps/exam/views.py index adffe58..bfe0b81 100644 --- a/server/apps/exam/views.py +++ b/server/apps/exam/views.py @@ -291,7 +291,6 @@ class PaperViewSet(ModelViewSet): # 将excel 入库并返回 queston_id wb = load_workbook(excel_save_path) sheet = wb.worksheets[0] - qlist = ['A', 'B', 'C', 'D', 'E', 'F'] leveldict = {'低': '低', '中': '中', '高': '高'} # 验证文件内容 if sheet['a2'].value != '题目类型': @@ -366,6 +365,8 @@ class PaperViewSet(ModelViewSet): ids.append(obj.id) elif type == '多选': obj = Question() + rights = list(right.strip()) + right = [x for x in rights if x != ','] obj.type = '多选' obj.questioncat = cateobj obj.name = name diff --git a/server/server/settings_dev.py b/server/server/settings_dev.py index c0f21b5..3065e84 100644 --- a/server/server/settings_dev.py +++ b/server/server/settings_dev.py @@ -1,14 +1,14 @@ from .settings import * DEBUG = True DATABASES = { - 'default': { - 'ENGINE': 'django.db.backends.postgresql', - 'NAME': 'cma', - 'USER': 'postgres', - 'PASSWORD': 'zcDsj2021', - 'HOST': '49.232.14.174', - 'PORT': '5432', - }, + # 'default': { + # 'ENGINE': 'django.db.backends.postgresql', + # 'NAME': 'cma', + # 'USER': 'postgres', + # 'PASSWORD': 'zcDsj2021', + # 'HOST': '49.232.14.174', + # 'PORT': '5432', + # }, # 'default': { # 'ENGINE': 'django.db.backends.postgresql', # 'NAME': 'cma', @@ -18,15 +18,16 @@ DATABASES = { # # 'HOST': '1.203.161.102', # 'PORT': '5432', # } - # 'default': { - # 'ENGINE': 'django.db.backends.postgresql', - # 'NAME': 'cma', - # 'USER': 'cma', - # 'PASSWORD': 'cma123', - # 'HOST': '172.16.80.102', - # # 'HOST': '127.0.0.1', - # 'PORT': '5432', - # } + 'default': { + 'ENGINE': 'django.db.backends.postgresql', + 'NAME': 'cma', + 'USER': 'cma', + 'PASSWORD': 'cma123', + 'HOST': '172.16.80.102', + # 'HOST': '127.0.0.1', + # 'HOST':'1.203.161.101', + 'PORT': '5432', + } }