Skip to content

Z
zhichan
Commit adb4d4e0 by 黄静
Options

hj

parent 5cfeac7f
Showing with 3 additions and 6 deletions
calc_result/RiskComputer.py
...@@ -50,8 +50,7 @@ class RiskComputer: ...@@ -50,8 +50,7 @@ class RiskComputer:
ret = "—" ret = "—"
else: else:
if "率" in a: if "率" in a:
ret1 = float('%.2f' % ret) ret = str(float('%.2f' % (ret*100))) + '%'
ret = str(float('%.2f' % (ret1*100))) + '%'
else: else:
ret = format(ret, ',') # 指定逗号位数字的千分位分隔符 ret = format(ret, ',') # 指定逗号位数字的千分位分隔符
self.IndexRes1[a]={Curr_Date:ret} self.IndexRes1[a]={Curr_Date:ret}
...@@ -61,8 +60,7 @@ class RiskComputer: ...@@ -61,8 +60,7 @@ class RiskComputer:
ret = "—" ret = "—"
else: else:
if "率" in a: if "率" in a:
ret1 = float('%.2f' % ret) ret = str(float('%.2f' % (ret*100))) + '%'
ret = str(float('%.2f' % (ret1*100))) + '%'
else: else:
ret = format(ret, ',') # 指定逗号位数字的千分位分隔符 ret = format(ret, ',') # 指定逗号位数字的千分位分隔符
self.IndexRes1[a][Previous_Date]=ret self.IndexRes1[a][Previous_Date]=ret
...@@ -72,8 +70,7 @@ class RiskComputer: ...@@ -72,8 +70,7 @@ class RiskComputer:
elif ret == '—': elif ret == '—':
ret = '—' ret = '—'
else: else:
ret1 = float('%.2f' % ret) ret = str(float('%.2f' % (ret*100))) + '%'
ret = str(float('%.2f' % (ret1*100))) + '%'
self.IndexRes1[a]["change_rate"] = ret self.IndexRes1[a]["change_rate"] = ret
def Ret2Json(self):#把指标结果转化为樊辉需要的Json def Ret2Json(self):#把指标结果转化为樊辉需要的Json
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment