From 7213a29c4e6c28a870fbe5d2df318a0c72657fd3 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Tue, 4 Aug 2020 21:28:49 +0800 Subject: [PATCH] export trouble bug --- safesite/export.py | 78 ++++++++++++++++++++++++---------------------- 1 file changed, 40 insertions(+), 38 deletions(-) diff --git a/safesite/export.py b/safesite/export.py index 496aa887..7352543f 100644 --- a/safesite/export.py +++ b/safesite/export.py @@ -268,54 +268,56 @@ def exportxlsx(a,objs): vl = yhobjs.values('yhnum','fxr__name','yhms','yhzt','fxsj','tbsj','yhlb__dickeyname','yhpg__dickeyname','yhdd','fxbm__partname','yhdj__dickeyname','yhpg__dickeyname', 'jclx__dickeyname','yhlx__dicname','yyfx','zgcs','yhtp','zghtp','zgms','zgbm__partname','zgr__name','zgqx','shr__name','fcr__name') vl=list(vl) - for i in range(len(yhobjs)): - vl[i]['yhzt']=yhobjs[i].get_yhzt_display() - if vl[i]['yhtp']!='': - vl[i]['yhtp']=vl[i]['yhtp'].split('?') - if vl[i]['zghtp']!='': - vl[i]['zghtp']=vl[i]['zghtp'].split('?') - for key in vl[i]: - if vl[i][key] == None: - vl[i][key] = '' + for i ,v in enumerate(vl): + v['yhzt']=yhobjs[i].get_yhzt_display() + if v['yhtp']: + v['yhtp']=v['yhtp'].split('?') + if v['zghtp']: + v['zghtp']=v['zghtp'].split('?') + # for key in vl[i]: + # if vl[i][key] == None: + # vl[i][key] = '' #print(vl[i]['yhzt'],vl[i]['yhtp']) #修改图片区列表宽度 sheet.column_dimensions['u'].width = column_width #修改列宽 sheet.column_dimensions['w'].width = column_width #写入数据 - for i in range(len(vl)): + for i ,v in enumerate(vl): sheet.row_dimensions[i+4].height = row_height #修改行高 - sheet['a'+str(i+4)] = vl[i]['yhzt'] - sheet['b'+str(i+4)] = vl[i]['yhnum'] - sheet['c'+str(i+4)] = vl[i]['yhdj__dickeyname'] - sheet['d'+str(i+4)] = vl[i]['yhlx__dicname'] - sheet['e'+str(i+4)] = vl[i]['yhlb__dickeyname'] - sheet['f'+str(i+4)] = vl[i]['jclx__dickeyname'] - sheet['g'+str(i+4)] = vl[i]['fxsj'] - sheet['h'+str(i+4)] = ILLEGAL_CHARACTERS_RE.sub(r'', vl[i]['yhdd']) - sheet['i'+str(i+4)] = vl[i]['fxbm__partname'] - sheet['j'+str(i+4)] = vl[i]['fxr__name'] - sheet['k'+str(i+4)] = vl[i]['yhpg__dickeyname'] - sheet['l'+str(i+4)] = ILLEGAL_CHARACTERS_RE.sub(r'', vl[i]['yhms']) - sheet['m'+str(i+4)] = vl[i]['zgbm__partname'] - sheet['n'+str(i+4)] = vl[i]['zgr__name'] - sheet['o'+str(i+4)] = vl[i]['zgqx'] - sheet['p'+str(i+4)] = ILLEGAL_CHARACTERS_RE.sub(r'', vl[i]['yyfx']) - sheet['q'+str(i+4)] = ILLEGAL_CHARACTERS_RE.sub(r'', vl[i]['zgcs']) - sheet['r'+str(i+4)] = ILLEGAL_CHARACTERS_RE.sub(r'', vl[i]['zgms']) - sheet['s'+str(i+4)] = vl[i]['shr__name'] - sheet['t'+str(i+4)] = vl[i]['fcr__name'] - if vl[i]['yhtp']!='': + sheet['a'+str(i+4)] = v['yhzt'] + sheet['b'+str(i+4)] = v['yhnum'] + sheet['c'+str(i+4)] = v['yhdj__dickeyname'] + sheet['d'+str(i+4)] = v['yhlx__dicname'] + sheet['e'+str(i+4)] = v['yhlb__dickeyname'] + sheet['f'+str(i+4)] = v['jclx__dickeyname'] + sheet['g'+str(i+4)] = v['fxsj'] + sheet['h'+str(i+4)] = ILLEGAL_CHARACTERS_RE.sub(r'', v['yhdd']) + sheet['i'+str(i+4)] = v['fxbm__partname'] + sheet['j'+str(i+4)] = v['fxr__name'] + sheet['k'+str(i+4)] = v['yhpg__dickeyname'] + sheet['l'+str(i+4)] = ILLEGAL_CHARACTERS_RE.sub(r'', v['yhms']) + sheet['m'+str(i+4)] = v['zgbm__partname'] + sheet['n'+str(i+4)] = v['zgr__name'] + sheet['o'+str(i+4)] = v['zgqx'] + sheet['p'+str(i+4)] = ILLEGAL_CHARACTERS_RE.sub(r'', v['yyfx']) + sheet['q'+str(i+4)] = ILLEGAL_CHARACTERS_RE.sub(r'', v['zgcs']) + sheet['r'+str(i+4)] = ILLEGAL_CHARACTERS_RE.sub(r'', v['zgms']) + sheet['s'+str(i+4)] = v['shr__name'] + sheet['t'+str(i+4)] = v['fcr__name'] + if v['yhtp']: try: - img = Image(dirname + vl[i]['yhtp'][0]) - img.width, img.height = (90, 90) #这两个属性分别是对应添加图片的宽高 - sheet.add_image(img, 'u'+str(i+4)) + img = Image(dirname + v['yhtp'][0]) + if str(img.format)!='MPO': + img.width, img.height = (90, 90) #这两个属性分别是对应添加图片的宽高 + sheet.add_image(img, 'u'+str(i+4)) except: pass - if vl[i]['zghtp']!='': + if v['zghtp']: try: - img = Image(dirname + vl[i]['zghtp'][0]) - img.width, img.height = (90, 90) #这两个属性分别是对应添加图片的宽高 - sheet.add_image(img, 'w'+str(i+4)) + img = Image(dirname + v['zghtp'][0]) + if str(img.format)!='MPO': + img.width, img.height = (90, 90) #这两个属性分别是对应添加图片的宽高 + sheet.add_image(img, 'w'+str(i+4)) except: pass nowtime = datetime.now().strftime('%Y%m%d%H%M%S')