Merge branch 'dev' of ssh://10.10.100.21/source/smartschool-platform

frontend/wechat-web/src/configs/router.config.js

@@ -133,7 +133,7 @@ export default class RouteConfig extends Component {
                     <Route path='/approvel' component={Approvel}/>{/*我的审批*/}
                     <Route path='/approvel-detail/:approveId/:isMyApply' component={ApprovelDetail}/> {/*审批详情*/}
                     <Route path='/meet-detail/:meetId?' component={MeetDetail}/> {/*会议签到详情 meetingSignIn*/}
-                    <Route path='/leavedetail/:lvId/:role' component={LeaveDetail}/> {/*学生请假详情*/}
+                    <Route path='/leavedetail/:role/:lvId' component={LeaveDetail}/> {/*学生请假详情*/}
                     <Route path="/changephonenumber" component={ChangePhoneNumber}/> {/*更换手机号码*/}
                     <Route path="/scorenotification/:stuId?" component={ScoreNotification}/> {/*成绩通知*/}
                     <Route path="/accessnoticedetail/:stuId/:anId?" component={AccessNoticeDetail}/>     {/*出入校通知详情*/}

frontend/wechat-web/src/modules/hiPages/access-notice/AccessNotice.js

@@ -67,6 +67,25 @@ class AccessNotice extends Component {
     }
 
     render() {
+        const  NoticeItems = []
+        if (this.state.out_inData){
+            this.state.out_inData.forEach((itemata, index) => {
+                let isFirst = false
+                let isLast = false
+                if (index === 0) {
+                    isFirst = true
+                    isLast = false
+                }
+                if (index === (this.state.out_inData.length - 1)) {
+                    isFirst = false
+                    isLast = true
+                }
+                NoticeItems.push(<ItemComp key={index} itemdata={itemata}
+                                           handelSItem={this.handelSItem}
+                                         isFirst={isFirst} isLast={isLast}/>)
+
+            })
+        }
         return (
             <div style={{fontFamily: "PingFangSC-Regular", letterSpacing: 2.5}}>
                 {/*<div className="header_sty1">*/}
@@ -99,9 +118,10 @@ class AccessNotice extends Component {
                         <div>出</div>
                         <div>行</div>
                     </div>
-                    <div style={{marginBottom: 50, marginLeft: 90}}>
-                        {this.state.out_inData.map((itemdata, index) => <ItemComp key={index} itemdata={itemdata}
-                                                                                  handelSItem={this.handelSItem}></ItemComp>)}
+                    <div style={{marginBottom: 50, marginLeft: 90,marginTop:20}}>
+                        {NoticeItems}
+                        {/*{this.state.out_inData.map((itemdata, index) => <ItemComp key={index} itemdata={itemdata}*/}
+                                                                                  {/*handelSItem={this.handelSItem}></ItemComp>)}*/}
                     </div>
                 </div>
             </div>

frontend/wechat-web/src/modules/hiPages/access-notice/ItemComp.js

@@ -21,11 +21,19 @@ export default class ItemComp extends Component{
      render(){
         return(
             <div>
-                <img className="lineimg_sty" src={line_img} alt=""/>
+                {!this.props.isFirst ?  <img className="lineimg_sty" src={line_img} alt=""/> : ''}
                 <div className="timeList_sty">
-                    {this.props.itemdata.inDate == null ? <img className="mg-circle out_in" src={exit_img} alt=""/> :
-                        <img className="mg-circle out_in" src={enter_img} alt=""/>
-                    }
+                    {}
+                    <div className='common-flex-column'
+                         style={{height: '100%', justifyContent: 'center', alignItems: 'center'}}>
+                        {this.props.isFirst ? <div style={{flex: 1}}></div>
+                            : <div style={{background: '#E9E9E9', flex: '1', width: '2px'}}></div>}
+                        {this.props.itemdata.inDate == null ? <img className="mg-circle out_in" src={exit_img} alt=""/> :
+                            <img className="mg-circle out_in" src={enter_img} alt=""/>
+                        }
+                        {this.props.isLast ? <div style={{flex: 1}}></div>
+                            : <div style={{background: '#E9E9E9', flex: '1', width: '2px'}}></div>}
+                    </div>
                     <div style={{marginLeft:30}}>
                         <div style={{color:"#666666",fontSize:12}}>{this.state.showTime1}</div>
                         <div style={{color:"#333333",fontSize:12,marginTop:5}}>{this.props.itemdata.recordName}</div>

frontend/wechat-web/src/modules/hiPages/meet-detail/MeetDetail.js

@@ -84,7 +84,6 @@ class MeetDetail extends Component {
                 <div style={{fontSize:14,color:'#252525',marginTop:10,marginLeft:20}}>未签到
                     <span style={{fontSize:12,color:'#666666',marginLeft:10}}>({this.state.unsignList.length}/{this.state.signList.length+this.state.unsignList.length}人)</span>
                 </div>
-                <div className="comhline_sty1"></div>
                 <div style={{marginTop: 10, marginLeft: 20, display: 'flex', flexDirection: 'row', flexWrap: 'wrap'}}>
                     {this.state.unsignList.map((itemdata, index) => <SignItem itemdata={itemdata}></SignItem>)}
                 </div>

frontend/wechat-web/src/modules/leave/LeaveItem.js

@@ -17,7 +17,7 @@ export default class LeaveItem extends Component{
         const {item}  = this.state;
         return(
             <div>
-                <Link to={'/leavedetail/' +item.lvId+'/'+this.props.role}>
+                <Link to={'/leavedetail/' +'/'+this.props.role +item.lvId}>
                     <div className="col-xs-12 " style={{backgroundColor:'#FFF',width:'53vh'}} >
                         <div className="row flex" >
                             <div id="global_page_title"  style={{fontSize:15,color:"#333333"}}>  {item.title}</div>

frontend/wechat-web/src/modules/leave/LeaveListPage.js

@@ -256,7 +256,7 @@ class LeaveListPage extends React.Component{
     }
     onItemOnClick=(index,item)=>{
         console.log("onItemOnClick()",JSON.stringify(item));
-        this.props.history.push('/leavedetail/' +item.lvId+'/'+this.state.role)
+        this.props.history.push('/leavedetail/' +'/'+this.state.role +item.lvId)
         return;
         this.setState({
             detailVisible: true,