From 5892c28916659822d2751b553862a9a778b9204e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Tue, 8 Oct 2019 09:43:11 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../EcCompletionCalculation.js                | 138 ++++++++++--------
 1 file changed, 76 insertions(+), 62 deletions(-)

diff --git a/public/react/src/modules/ecs/subroute/ecCompletion_calculation/EcCompletionCalculation.js b/public/react/src/modules/ecs/subroute/ecCompletion_calculation/EcCompletionCalculation.js
index bc559d6ea..82912f406 100644
--- a/public/react/src/modules/ecs/subroute/ecCompletion_calculation/EcCompletionCalculation.js
+++ b/public/react/src/modules/ecs/subroute/ecCompletion_calculation/EcCompletionCalculation.js
@@ -184,7 +184,7 @@ class EcCompletionCalculation extends Component {
 										// 	console.log("正在循环");
 										// 	console.log(val);
 										// });
-									console.log(response.data.course_targets.score_levels);
+									// console.log(response.data.course_targets.score_levels);
 
                     // ec_course_targets:response.data.ec_course_targets,
                     this.targetsget_navigation_data(response.data.ec_year_id,ec_course_id)
@@ -816,79 +816,93 @@ class EcCompletionCalculation extends Component {
 													}
                         </p>
 
-                        {/*{*/}
-                        {/*    Spintype===false?target_list.map((i,k)=>{*/}
-
-                        {/*        return(*/}
-                        {/*            <li className={"clearfix newtarget_scoreclass lipadding10im"} key={k}>*/}
-                        {/*                <span className="column-1 color-05101A">{k+1}</span>*/}
-                        {/*                <span className="column-1 color-05101A">{i.standard_grade}</span>*/}
-                        {/*                <span className="column-1 colorFF6800">{i.maximum_score}</span>*/}
-                        {/*                <span className="column-1 color-green">{i.minimum_score}</span>*/}
-                        {/*                <span className="column-1 color-05101A">*/}
-                        {/*                      <div>{i.from90[0]}人</div>*/}
-                        {/*                      <div className="color999">{(i.from90[1]).toFixed(2)}%</div>*/}
-                        {/*                </span>*/}
-                        {/*                <span className="column-1 color-05101A">*/}
-                        {/*                      <div>{i.from80[0]}人</div>*/}
-                        {/*                      <div className="color999">{(i.from80[1]).toFixed(2)}%</div>*/}
-                        {/*                </span>*/}
-                        {/*                <span className="column-1 color-05101A">*/}
-                        {/*                      <div>{i.from70[0]}人</div>*/}
-                        {/*                      <div className="color999">{(i.from70[1]).toFixed(2)}%</div>*/}
-                        {/*                </span>*/}
-                        {/*                <span className="column-1 color-05101A">*/}
-                        {/*                      <div>{i.from60[0]}人</div>*/}
-                        {/*                      <div className="color999">{(i.from60[1]).toFixed(2)}%</div>*/}
-                        {/*                </span>*/}
-                        {/*                <span className="column-1 color-05101A">*/}
-                        {/*                      <div>{i.from50[0]}人</div>*/}
-                        {/*                      <div className="color999">{(i.from50[1]).toFixed(2)}%</div>*/}
-                        {/*                </span>*/}
-                        {/*                <span className="column-1 color-05101A">*/}
-                        {/*                      <div>{i.from_down[0]}人</div>*/}
-                        {/*                      <div className="color999">{(i.from_down[1]).toFixed(2)}%</div>*/}
-                        {/*                </span>*/}
-
-                        {/*            </li>*/}
-                        {/*        )*/}
-
-                        {/*    }):""*/}
-                        {/*}*/}
-
-                            {/*{ Spintype===true?<Spin className="Spinlarge"  indicator={<Icon type="loading" style={{ fontSize: 30 }} spin />}/>:"" }*/}
-
-                            {/*{target_list.length===0&&Spintype===false?*/}
-                                    {/*<li className={"clearfix newtarget_scoreclass lipadding10im"}>*/}
-                                        {/*<span className="column-1 color-05101A">--</span>*/}
-                                        {/*<span className="column-1 color-05101A">--</span>*/}
-                                        {/*<span className="column-1 colorFF6800">--</span>*/}
-                                        {/*<span className="column-1 color-green">--</span>*/}
+                        {
+                            Spintype===false?target_list.map((i,k)=>{
+
+                                return(
+                                    <li className={"clearfix newtarget_scoreclass lipadding10im"} key={k}>
+                                        <span className="column-1 color-05101A">{k+1}</span>
+                                        <span className="column-1 color-05101A">{i.standard_grade}</span>
+                                        <span className="column-1 colorFF6800">{i.maximum_score===null || i.maximum_score===undefined ||i.maximum_score===""?"--":i.maximum_score}</span>
+                                        <span className="column-1 color-green">{i.minimum_score===null || i.minimum_score===undefined || i.minimum_score===""?"--":i.minimum_score}</span>
+                                        {
+                                            i.score_levels.map((j,l)=>{
+
+                                                return(
+                                                  <span key={l} className="column-1 color-05101A">
+                                                        <div>{j.count}人</div>
+                                                        <div className="color999">{j.rate===null||j.rate===undefined||j.rate===""||j.rate===0?0.00:j.rate}%</div>
+                                                  </span>
+                                                )
+                                            }
+                                            )
+                                        }
+
+                                        {/*}*/}
                                         {/*<span className="column-1 color-05101A">*/}
-                                              {/*<div>--人</div>*/}
-                                              {/*<div className="color999">--%</div>*/}
+                                        {/*      <div>{i.from90[0]}人</div>*/}
+                                        {/*      <div className="color999">{(i.from90[1]).toFixed(2)}%</div>*/}
                                         {/*</span>*/}
                                         {/*<span className="column-1 color-05101A">*/}
-                                              {/*<div>--人</div>*/}
-                                              {/*<div className="color999">--%</div>*/}
+                                        {/*      <div>{i.from80[0]}人</div>*/}
+                                        {/*      <div className="color999">{(i.from80[1]).toFixed(2)}%</div>*/}
                                         {/*</span>*/}
                                         {/*<span className="column-1 color-05101A">*/}
-                                              {/*<div>--人</div>*/}
-                                              {/*<div className="color999">--%</div>*/}
+                                        {/*      <div>{i.from70[0]}人</div>*/}
+                                        {/*      <div className="color999">{(i.from70[1]).toFixed(2)}%</div>*/}
                                         {/*</span>*/}
                                         {/*<span className="column-1 color-05101A">*/}
-                                              {/*<div>--人</div>*/}
-                                              {/*<div className="color999">--%</div>*/}
+                                        {/*      <div>{i.from60[0]}人</div>*/}
+                                        {/*      <div className="color999">{(i.from60[1]).toFixed(2)}%</div>*/}
                                         {/*</span>*/}
                                         {/*<span className="column-1 color-05101A">*/}
-                                              {/*<div>--人</div>*/}
-                                              {/*<div className="color999">--%</div>*/}
+                                        {/*      <div>{i.from50[0]}人</div>*/}
+                                        {/*      <div className="color999">{(i.from50[1]).toFixed(2)}%</div>*/}
                                         {/*</span>*/}
                                         {/*<span className="column-1 color-05101A">*/}
-                                              {/*<div>--人</div>*/}
-                                              {/*<div className="color999">--%</div>*/}
+                                        {/*      <div>{i.from_down[0]}人</div>*/}
+                                        {/*      <div className="color999">{(i.from_down[1]).toFixed(2)}%</div>*/}
                                         {/*</span>*/}
-                                    {/*</li>:""}*/}
+
+                                    </li>
+                                )
+
+                            }):""
+                        }
+
+                            { Spintype===true?<Spin className="Spinlarge"  indicator={<Icon type="loading" style={{ fontSize: 30 }} spin />}/>:"" }
+
+                            {target_list.length===0&&Spintype===false?
+                                    <li className={"clearfix newtarget_scoreclass lipadding10im"}>
+                                        <span className="column-1 color-05101A">--</span>
+                                        <span className="column-1 color-05101A">--</span>
+                                        <span className="column-1 colorFF6800">--</span>
+                                        <span className="column-1 color-green">--</span>
+                                        <span className="column-1 color-05101A">
+                                              <div>--人</div>
+                                              <div className="color999">--%</div>
+                                        </span>
+                                        <span className="column-1 color-05101A">
+                                              <div>--人</div>
+                                              <div className="color999">--%</div>
+                                        </span>
+                                        <span className="column-1 color-05101A">
+                                              <div>--人</div>
+                                              <div className="color999">--%</div>
+                                        </span>
+                                        <span className="column-1 color-05101A">
+                                              <div>--人</div>
+                                              <div className="color999">--%</div>
+                                        </span>
+                                        <span className="column-1 color-05101A">
+                                              <div>--人</div>
+                                              <div className="color999">--%</div>
+                                        </span>
+                                        <span className="column-1 color-05101A">
+                                              <div>--人</div>
+                                              <div className="color999">--%</div>
+                                        </span>
+                                    </li>:""}
                
                     </div>