zcdsj
/
cma_search
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

导入校验能力bug

This commit is contained in:
caoqianming 2021-07-30 09:14:41 +08:00
parent 69429a360c
commit 9ff8d3106c
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/apps/ability/views.py
View File

@ -682,9 +682,9 @@ def import_correct(path):
data['lbmc'] = defaultv['lbmc'] data['lbmc'] = defaultv['lbmc']
if sheet['e'+str(i)].value: if sheet['e'+str(i)].value:
data['bclxh'] = sheet['e'+str(i)].value data['bclxh'] = sheet['e'+str(i)].value
defaultv['bclxh'] = data['bclxh'] defaultv['bclxh'] = data['bclxh']
else: else:
data['bclxh'] = defaultv['bclxh'] data['bclxh'] = defaultv['bclxh'] if 'bclxh' in defaultv else None
if sheet['f'+str(i)].value: if sheet['f'+str(i)].value:
data['bclmc'] = sheet['f'+str(i)].value data['bclmc'] = sheet['f'+str(i)].value
defaultv['bclmc'] = data['bclmc'] defaultv['bclmc'] = data['bclmc']

22
server/server/settings_dev.py
View File

@ -1,20 +1,20 @@
from .settings import * from .settings import *
DEBUG = True DEBUG = True
DATABASES = { DATABASES = {
# 'default': {
# 'ENGINE': 'django.db.backends.postgresql',
# 'NAME': 'cma',
# 'USER': 'postgres',
# 'PASSWORD': 'zctest1234',
# 'HOST': '47.95.0.242',
# 'PORT': '5432',
# }
'default': { 'default': {
'ENGINE': 'django.db.backends.postgresql', 'ENGINE': 'django.db.backends.postgresql',
'NAME': 'cma', 'NAME': 'cma',
'USER': 'cma', 'USER': 'postgres',
'PASSWORD': 'cma123', 'PASSWORD': 'zctest1234',
'HOST': '172.16.80.102', 'HOST': '47.95.0.242',
'PORT': '5432', 'PORT': '5432',
} }
# 'default': {
# 'ENGINE': 'django.db.backends.postgresql',
# 'NAME': 'cma',
# 'USER': 'cma',
# 'PASSWORD': 'cma123',
# 'HOST': '172.16.80.102',
# 'PORT': '5432',
# }
} }