Merge branch 'develop' of http://bdgit.educoder.net/Hjqreturn/educoder into develop

public/react/src/modules/courses/signin/Signinstatistics/Signinstatistics.js

@@ -39,18 +39,24 @@ class Signinstatistics extends Component {
             response.data.history_attendances.map((item,key)=>{
               newlists.push({
                 month: item.index,
+                name: item.name+" "+item.attendance_date+" "+item.start_time+"-"+item.end_time,
+                // month:item.name,
                 city:"到课率",
-                temperature: (item.normal_rate).toFixed(0)
+                temperature: (item.normal_rate*100).toFixed(0)
               })
               newlists.push({
                 month: item.index,
+                name: item.name+" "+item.attendance_date+" "+item.start_time+"-"+item.end_time,
+                // month:item.name,
                 city: "旷课率",
-                temperature: (item.absence_rate).toFixed(0)
+                temperature: (item.absence_rate*100).toFixed(0)
               })
               newlists.push({
                 month: item.index,
+                name: item.name+" "+item.attendance_date+" "+item.start_time+"-"+item.end_time,
+                // month:item.name,
                 city: "请假率",
-                temperature: (item.leave_rate).toFixed(0)
+                temperature: (item.leave_rate*100).toFixed(0)
               })
             })
           }
@@ -102,7 +108,16 @@ class Signinstatistics extends Component {
 
     const cols = {
       month: {
-        range: [0, 1]
+        type: 'linear',
+        nice:[1,10],
+        min:1,
+        minLimit:1,
+        minTickInterval:2
+      },
+      temperature:{
+        type: 'linear',
+        nice:[0,100],
+        minTickInterval:2
       }
     };
 
@@ -190,7 +205,7 @@ class Signinstatistics extends Component {
 											<Col span={10}><Row type="flex" justify="end">
 												<Col span={8} className={"Signinstatisticsfont"}>显示最近十次签到</Col>
 												<Col span={10}>
-													<Select  defaultValue={"全部"} onChange={(e)=>this.handleChange(e)} style={{width:"130px"}}>
+													<Select  defaultValue={"全部"} onChange={(e)=>this.handleChange(e)} style={{width:"130px"}} className={"Signinstatisticsfontselect"}>
 														{course_groups&&course_groups.map((item,key)=>{
 															return(
 																<Option value={item.id} title={item.name} >{item.name}</Option>
@@ -224,6 +239,14 @@ class Signinstatistics extends Component {
 												// color={"city"}
 												shape={"smooth"}
 												color={["city", ["#26C7C9", "#FF835C","#EDBA6F"]]}
+                        tooltip={['name*temperature*city', (name, temperature,city) => {
+                          return {
+                            //自定义 tooltip 上显示的 title 显示内容等。
+                            name: city,
+                            title: name,
+                            value: temperature+"%"
+                          };
+                        }]}
 											/>
 											<Geom
 												type="point"
@@ -235,6 +258,14 @@ class Signinstatistics extends Component {
 													stroke: "#fff",
 													lineWidth: 1
 												}}
+                        // tooltip={['month*sold', (month, temperature) => {
+                        //   return {
+                        //     //自定义 tooltip 上显示的 title 显示内容等。
+                        //     name: 'sold1',
+                        //     title: 'dddd' + month,
+                        //     value: temperature
+                        //   };
+                        // }]}
 											/>
 										</Chart>
 									</div>

public/react/src/modules/courses/signin/css/Signinstatistics.css

@@ -102,8 +102,12 @@
     color: rgba(153,153,153,1);
     text-align: right;
     margin-right: 20px;
-    line-height: 32px;
-    height: 32px;
+    line-height: 32px  !important;
+    height: 32px  !important;
+}
+.Signinstatisticsfontselect .ant-select-selection--single .ant-select-selection__rendered{
+    line-height: 32px  !important;
+    height: 32px  !important;
 }
 
 #form_in_modal_group_ids .ant-select-selection{