最新代码提交

src/components/SjdHeader.js

@@ -108,7 +108,7 @@ class SjdMenu extends React.Component {
         {breadcrumbList.length > 1 &&
           <div className={SjdHeaderStyle.breadbox}>
             {breadcrumbList.map((ele, index) => (
-              <div className={`${(index + 1) == breadcrumbList.length ? SjdHeaderStyle.breaditembold : ''} ${SjdHeaderStyle.breaditem}`} onClick={() => { this.routeChange(ele.path); }}>
+              <div key={ele.path} className={`${(index + 1) == breadcrumbList.length ? SjdHeaderStyle.breaditembold : ''} ${SjdHeaderStyle.breaditem}`} onClick={() => { this.routeChange(ele.path); }}>
                 {ele.name}&nbsp;&nbsp;{index < breadcrumbList.length - 1 ? '/' : ''}&nbsp;&nbsp;
               </div>
             ))}

src/components/SjdMenu.js

@@ -108,6 +108,7 @@ class SjdMenu extends React.Component {
                   !ele.isFather ?
                     <Menu.Item key={ele.id} style={menuItemStyle} onClick={() => this.selectedMenu(ele.id, null)}>
                       <div className={SjdMenuStyle.menuicon} style={defaultMenu == ele.id ? { width: ele.style.width, height: ele.style.height, backgroundImage: `url(${ele.activeurl})` } : { width: ele.style.width, height: ele.style.height, backgroundImage: `url(${ele.notactiveurl})` }} />
+                      <Icon type="right" style={{ width: 0, minWidth: 'initial', visibility: 'hidden' }} />
                       <span>{ele.name}</span>
                     </Menu.Item> :
                     <SubMenu
@@ -115,6 +116,7 @@ class SjdMenu extends React.Component {
                       title={
                         <span style={padding}>
                           <div className={SjdMenuStyle.menuicon} style={defaultMenu == ele.id ? { width: ele.style.width, height: ele.style.height, backgroundImage: `url(${ele.activeurl})` } : { width: ele.style.width, height: ele.style.height, backgroundImage: `url(${ele.notactiveurl})` }} />
+                          <Icon type="right" style={{ width: 0, minWidth: 'initial', visibility: 'hidden' }} />
                           <span style={fontSize}>{ele.name}</span>
                         </span>
                       }
@@ -122,6 +124,7 @@ class SjdMenu extends React.Component {
                       {ele.subMenues.map(submenu => (
                         <Menu.Item key={submenu.id} style={menuItemStyle} onClick={() => this.selectedMenu(submenu.id, submenu.fatherId)}>
                           <div className={SjdMenuStyle.menuicon} style={defaultMenu == submenu.id ? { width: submenu.style.width, height: submenu.style.height, backgroundImage: `url(${submenu.activeurl})` } : { width: submenu.style.width, height: submenu.style.height, backgroundImage: `url(${submenu.notactiveurl})` }} />
+                          <Icon type="right" style={{ width: 0, minWidth: 'initial', visibility: 'hidden' }} />
                           <span>{submenu.name}</span>
                         </Menu.Item>
                       ))}

src/components/SjdMenu.less

@@ -37,7 +37,7 @@
     vertical-align: sub;
     text-align: center;
     line-height: 1;
-    margin-right: 10px;
+    // margin-right: 10px;
     // background: url('@{images}spriteicon.png') no-repeat;
     background-size: 100% 100%;
 }

src/models/studentsinfo.js

@@ -231,7 +231,7 @@ export default {
         },
       });
       yield put({
-        type: 'studentsinfo/queryStudentsCurrentCourses',
+        type: 'queryStudentsCurrentCourses',
         payload: {
           params: {
             page: 1,
@@ -239,10 +239,10 @@ export default {
         },
       });
       yield put({
-        type: 'studentsinfo/studentsDetail',
+        type: 'studentsDetail',
       });
       yield put({
-        type: 'studentsinfo/studentsModelClassRecords',
+        type: 'studentsModelClassRecords',
         payload: {
           params: {
             page: 1,
@@ -250,13 +250,13 @@ export default {
         },
       });
       yield put({
-        type: 'studentsinfo/queryStudentsClassList',
+        type: 'queryStudentsClassList',
       });
       yield put({
         type: 'queryTeacherList',
       });
       // yield put({
-      //   type: 'studentsinfo/studentsModelLogs',
+      //   type: 'studentsModelLogs',
       // });
     },
     * searchCourseRelateClass({ payload }, { call, put, select }) {
@@ -362,7 +362,7 @@ export default {
           },
         });
         yield put({
-          type: 'studentsinfo/studentsDetail',
+          type: 'studentsDetail',
         });
         message.success('保存成功', 1);
       } else {
@@ -554,7 +554,7 @@ export default {
             clearInterval(setTimer);
           }
           payload.dispatch({
-            type: 'studentsinfo/updateState',
+            type: 'updateState',
             payload: {
               erpCountdown: newCountdowm,
               erpCounting: newCounting,

src/pages/student/index.js

@@ -807,7 +807,6 @@ class StudentMgt extends React.Component {
           <div className={pageStyle.title}>学员管理</div>
           <div className={pageStyle.tablebox}>
             <Table
-              rowKey={studentsinfo => studentsinfo.id}
               dataSource={studentsinfo}
               columns={columns}
               pagination={false}

src/pages/studentinfo/StudentEdit.js

@@ -148,7 +148,7 @@ class StudentAddForm extends React.Component {
                             message: '姓名最多20个字符',
                           },
                         ],
-                      })(<Input style={{ width: 200 }} maxlength="20" placeholder="输入姓名" />)}
+                      })(<Input style={{ width: 200 }} maxLength={20} placeholder="输入姓名" />)}
                     </Form.Item>
                   </Col>
                   <Col span={24} className={pageStyle.name} >

src/pages/studentinfo/index.js

@@ -502,8 +502,8 @@ class StudentMgt extends React.Component {
       },
       {
         title: '上课时间',
-        dataIndex: 'age',
-        key: 'age',
+        dataIndex: 'scheduletime',
+        key: 'scheduletime',
         render: (text, record, index) => {
           return (
             <div>
@@ -514,8 +514,8 @@ class StudentMgt extends React.Component {
       },
       {
         title: '点名状态',
-        dataIndex: 'age',
-        key: 'age',
+        dataIndex: 'callstatus',
+        key: 'callstatus',
         render: (text, record, index) => {
           return (
             <div>
@@ -555,8 +555,8 @@ class StudentMgt extends React.Component {
       },
       {
         title: '是否补课',
-        dataIndex: 'age',
-        key: 'age',
+        dataIndex: 'supplement_call_id',
+        key: 'supplement_call_id',
         render: (text, record, index) => {
           return (
             <div>
@@ -797,6 +797,7 @@ class StudentMgt extends React.Component {
                   <Table
                     pagination={false}
                     scroll={{ x: 'max-content' }}
+                    rowKey="id"
                     footer={() => (
                       <div className="tablefooterbox">
                         <span className="tablefooterstatic">共{classRecordsTotal}条数据</span>
@@ -832,7 +833,7 @@ class StudentMgt extends React.Component {
                     {studentslogs.length > 0 &&
                       <Row>
                         {studentslogs.map(item => (
-                          <Col span={24}>
+                          <Col span={24} key={item.id}>
                             {(() => {
                               let dom = null;
                               switch (item.source_type) {