Commit b22feb76 by dong

fix20230112

parent 1e573f9b
...@@ -1294,7 +1294,7 @@ def get_data(): ...@@ -1294,7 +1294,7 @@ def get_data():
data.update({"value": round(sign_money, 2)}) data.update({"value": round(sign_money, 2)})
# 签约完成率 # 签约完成率
rate = round(sign_money / target, 2) if target and target != 0 else 0 rate = round(sign_money / target * 100, 2) if target and target != 0 else 0
data.update({"rate": rate}) data.update({"rate": rate})
target_data_li.append(data) target_data_li.append(data)
return jsonify(code=RET.OK, data=target_data_li, msg='数据查询成功。') return jsonify(code=RET.OK, data=target_data_li, msg='数据查询成功。')
...@@ -1325,7 +1325,7 @@ def get_data(): ...@@ -1325,7 +1325,7 @@ def get_data():
data.update({"target": target}) data.update({"target": target})
# 开工率进度(40 %) # 开工率进度(40 %)
rate = round(target / sign_num, 2) if sign_num and sign_num != 0 else 0 rate = round(target / sign_num * 100, 2) if sign_num and sign_num != 0 else 0
data.update({"rate": rate}) data.update({"rate": rate})
target_data_li.append(data) target_data_li.append(data)
return jsonify(code=RET.OK, data=target_data_li, msg='数据查询成功。') return jsonify(code=RET.OK, data=target_data_li, msg='数据查询成功。')
...@@ -1364,8 +1364,7 @@ def get_data(): ...@@ -1364,8 +1364,7 @@ def get_data():
data.update({"target": target}) data.update({"target": target})
# 新开工完成率 # 新开工完成率
rate = round(new_start_money / target, rate = round(new_start_money / target * 100, 2) if target and target != 0 else 0
2) if target and target != 0 else 0
data.update({"rate": rate}) data.update({"rate": rate})
target_data_li.append(data) target_data_li.append(data)
return jsonify(code=RET.OK, data=target_data_li, msg='数据查询成功。') return jsonify(code=RET.OK, data=target_data_li, msg='数据查询成功。')
...@@ -1408,7 +1407,7 @@ def get_data(): ...@@ -1408,7 +1407,7 @@ def get_data():
data.update({"target": gutou1_target}) data.update({"target": gutou1_target})
# 完成率 # 完成率
gutou1_rate = round(gutou1_money / gutou1_target, 2) if gutou1_target and gutou1_target != 0 else 0 gutou1_rate = round(gutou1_money / gutou1_target * 100, 2) if gutou1_target and gutou1_target != 0 else 0
data.update({"rate": gutou1_rate}) data.update({"rate": gutou1_rate})
target_data_li.append(data) target_data_li.append(data)
return jsonify(code=RET.OK, data=target_data_li, msg='数据查询成功。') return jsonify(code=RET.OK, data=target_data_li, msg='数据查询成功。')
...@@ -1448,7 +1447,7 @@ def get_data(): ...@@ -1448,7 +1447,7 @@ def get_data():
data.update({"target": gutou0_target}) data.update({"target": gutou0_target})
# 完成率 # 完成率
gutou0_rate = round(gutou0_money / gutou0_target, 2) if gutou0_target and gutou0_target != 0 else 0 gutou0_rate = round(gutou0_money / gutou0_target * 100, 2) if gutou0_target and gutou0_target != 0 else 0
data.update({"rate": gutou0_rate}) data.update({"rate": gutou0_rate})
target_data_li.append(data) target_data_li.append(data)
return jsonify(code=RET.OK, data=target_data_li, msg='数据查询成功。') return jsonify(code=RET.OK, data=target_data_li, msg='数据查询成功。')
......
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