'大萨达撒'

src/components/CallStudents.js

@@ -398,10 +398,10 @@ class CallStudentsForm extends React.Component {
       {
         title: '姓名',
         dataIndex: 'name',
-        key: '1',
+        key: 'name',
         render: (text, record, index) => {
           return (
-            <div className={`${pageStyle.classNamebox} ${record.hassearch ? pageStyle.hasSearch : ''}`}>
+            <div style={{ maxWidth: '80px' }} className={`${pageStyle.classNamebox} ${record.hassearch ? pageStyle.hasSearch : ''}`}>
               {record.name}
             </div>
           );
@@ -410,12 +410,12 @@ class CallStudentsForm extends React.Component {
       {
         title: '手机号',
         dataIndex: 'mobile',
-        key: '2',
+        key: 'mobile',
       },
       {
         title: '剩余课时',
         dataIndex: 'surplus',
-        key: '3',
+        key: 'surplus',
         render: (text, record, index) => {
           return (
             <div className={pageStyle.classNamebox}>
@@ -427,7 +427,7 @@ class CallStudentsForm extends React.Component {
       {
         title: '到课状态',
         dataIndex: 'course',
-        key: '4',
+        key: 'course',
         render: (text, record, index) => {
           return (
             <div className={pageStyle.classNamebox}>
@@ -443,8 +443,8 @@ class CallStudentsForm extends React.Component {
       },
       {
         title: '扣课时',
-        dataIndex: 'c',
-        key: 'c',
+        dataIndex: 'expend',
+        key: 'expend',
         render: (text, record, index) => {
           return (
             <div className={pageStyle.tableoperatebox}>
@@ -455,8 +455,8 @@ class CallStudentsForm extends React.Component {
       },
       {
         title: '备注',
-        dataIndex: 'd',
-        key: 'd',
+        dataIndex: 'remark',
+        key: 'remark',
         render: (text, record, index) => {
           return (
             <div className={pageStyle.tableoperatebox}>
@@ -470,7 +470,7 @@ class CallStudentsForm extends React.Component {
       {
         title: '姓名',
         dataIndex: 'name',
-        key: '5',
+        key: 'name',
         render: (text, record, index) => {
           return (
             <div className={pageStyle.classNamebox}>
@@ -482,7 +482,7 @@ class CallStudentsForm extends React.Component {
       {
         title: '性别',
         dataIndex: 'gender',
-        key: '6',
+        key: 'gender',
         render: (text, record, index) => {
           return (
             <div className={pageStyle.classNamebox}>
@@ -494,12 +494,12 @@ class CallStudentsForm extends React.Component {
       {
         title: '手机号',
         dataIndex: 'mobile',
-        key: '7',
+        key: 'mobile',
       },
       {
         title: '课程名',
         dataIndex: 'course',
-        key: '8',
+        key: 'course',
         render: (text, record, index) => {
           return (
             <div className={pageStyle.classNamebox}>
@@ -511,14 +511,14 @@ class CallStudentsForm extends React.Component {
       {
         title: '年级',
         dataIndex: 'grade',
-        key: '9',
+        key: 'grade',
       },
     ];
     const bukestudentColumns = [
       {
         title: '姓名',
         dataIndex: 'name',
-        key: '11',
+        key: 'name',
         render: (text, record, index) => {
           return (
             <div className={pageStyle.classNamebox}>
@@ -530,7 +530,7 @@ class CallStudentsForm extends React.Component {
       {
         title: '班级名称',
         dataIndex: 'gender',
-        key: '12',
+        key: 'gender',
         render: (text, record, index) => {
           return (
             <div className={pageStyle.classNamebox}>
@@ -542,7 +542,7 @@ class CallStudentsForm extends React.Component {
       {
         title: '上课时间',
         dataIndex: 'start_time',
-        key: '13',
+        key: 'start_time',
         render: (text, record, index) => {
           return (
             <div className={pageStyle.classNamebox}>
@@ -554,7 +554,7 @@ class CallStudentsForm extends React.Component {
       {
         title: '上课老师',
         dataIndex: 'course',
-        key: '14',
+        key: 'course',
         render: (text, record, index) => {
           return (
             <div className={pageStyle.classNamebox}>
@@ -568,7 +568,7 @@ class CallStudentsForm extends React.Component {
       {
         title: '缺课状态',
         dataIndex: 'grade',
-        key: '15',
+        key: 'grade',
         render: (text, record, index) => {
           return (
             <div className={pageStyle.classNamebox}>
@@ -581,7 +581,7 @@ class CallStudentsForm extends React.Component {
       {
         title: '剩余课时',
         dataIndex: 'surplus',
-        key: '16',
+        key: 'surplus',
         render: (text, record, index) => {
           return (
             <div className={pageStyle.classNamebox}>{(record.student_course && record.student_course.surplus) || 0}</div>
@@ -591,7 +591,7 @@ class CallStudentsForm extends React.Component {
       {
         title: '上课内容',
         dataIndex: 'content',
-        key: '17',
+        key: 'content',
         render: (text, record, index) => {
           return (
             <div className={pageStyle.classNamebox}>{record.schedule.content}</div>
@@ -711,13 +711,13 @@ class CallStudentsForm extends React.Component {
             </Col>
           </Row>
           <Table
-            rowKey="id"
             dataSource={callStudentOperateList}
             columns={studentcolumns}
             scroll={{ x: 'max-content' }}
             loading={callStudentListLoading}
             pagination={false}
             footer={() => <div className="tablefooterbox" style={fontSize14}>共有{callStudentTotal}个学生</div>}
+            rowKey="id"
           />
         </Modal>
         <Modal

src/pages/classdetail/index.js

@@ -1005,7 +1005,7 @@ class ClassDetailForm extends React.Component {
         render: (text, record, index) => {
           return (
             <div>
-              {record.times && record.times.map(ele => <div>{ele}</div>)}
+              {record.times && record.times.map(ele => <div key={ele}>{ele}</div>)}
             </div>
           );
         },
@@ -1055,11 +1055,11 @@ class ClassDetailForm extends React.Component {
             <div className={pageStyle.tableoperatebox}>
               { hasBtnPower('sjd/classdetail', 'editPlan') &&
                 <span>
-                  <a className={pageStyle.alink} href="javascript:;" onClick={() => this.toEditClassPlan(record)}>编辑</a>
+                  <span className="hreflink" onClick={() => this.toEditClassPlan(record)}>编辑</span>
                   <span className={pageStyle.divideline}>|</span>
                 </span>
               }
-              {hasBtnPower('sjd/classdetail', 'removePlan') && <a className={pageStyle.alink} href="javascript:;" onClick={() => this.delCoursePlan(record)}>删除</a>}
+              {hasBtnPower('sjd/classdetail', 'removePlan') && <span className="hreflink" onClick={() => this.delCoursePlan(record)}>删除</span>}
             </div>
           );
         },
@@ -1121,7 +1121,7 @@ class ClassDetailForm extends React.Component {
         render: (text, record, index) => {
           return (
             <div className={pageStyle.tableoperatebox}>
-              <a className={pageStyle.alink} href="javascript:;" onClick={() => this.sureToChangeClass(record)}>调班</a>
+              <span className="hreflink" onClick={() => this.sureToChangeClass(record)}>调班</span>
             </div>
           );
         },
@@ -1168,7 +1168,7 @@ class ClassDetailForm extends React.Component {
       {
         title: '上课内容',
         dataIndex: 'content',
-        key: 'j',
+        key: 'content',
         render: (text, record, index) => {
           return (
             <div>
@@ -1182,10 +1182,10 @@ class ClassDetailForm extends React.Component {
       {
         title: '操作',
         dataIndex: 'course',
-        key: 'ra',
+        key: 'course',
         render: (text, record, index) => {
           return (
-            <a href="javascript:;" onClick={() => this.sureChangeStudentSchedule(record)}>调课</a>
+            <span className="hreflink" onClick={() => this.sureChangeStudentSchedule(record)}>调课</span>
           );
         },
       },
@@ -1194,7 +1194,7 @@ class ClassDetailForm extends React.Component {
       {
         title: '姓名',
         dataIndex: 'name',
-        key: 'q',
+        key: 'name',
         render: (text, record, index) => {
           return (
             <div>
@@ -1220,7 +1220,7 @@ class ClassDetailForm extends React.Component {
       {
         title: '手机号',
         dataIndex: 'mobile',
-        key: 'e',
+        key: 'mobile',
       },
       {
         title: '课程名',
@@ -1237,14 +1237,14 @@ class ClassDetailForm extends React.Component {
       {
         title: '年级',
         dataIndex: 'grade',
-        key: 'f',
+        key: 'grade',
       },
     ];
     const coursecolumns = [
       {
         title: '序号',
         dataIndex: 'name',
-        key: 'g',
+        key: 'name',
         render: (text, record, index) => {
           return (
             <div>
@@ -1256,7 +1256,7 @@ class ClassDetailForm extends React.Component {
       {
         title: '上课时间',
         dataIndex: 'coursetime',
-        key: 'h',
+        key: 'coursetime',
         render: (text, record, index) => {
           return (
             <div>
@@ -1278,7 +1278,7 @@ class ClassDetailForm extends React.Component {
       {
         title: '上课老师',
         dataIndex: 'teacher',
-        key: 'ja',
+        key: 'teacher',
         render: (text, record, index) => {
           return (
             <div>
@@ -1290,7 +1290,7 @@ class ClassDetailForm extends React.Component {
       {
         title: '上课教室',
         dataIndex: 'class_room',
-        key: 'k',
+        key: 'class_room',
         render: (text, record, index) => {
           return (
             <div>
@@ -1302,7 +1302,7 @@ class ClassDetailForm extends React.Component {
       {
         title: '上课内容',
         dataIndex: 'content',
-        key: 'z',
+        key: 'content',
         render: (text, record, index) => {
           return (
             <div style={{ maxWidth: '200px' }}>
@@ -1316,7 +1316,7 @@ class ClassDetailForm extends React.Component {
       {
         title: '点名时间',
         dataIndex: 'call_time',
-        key: 'x',
+        key: 'call_time',
         render: (text, record, index) => {
           return (
             <div>
@@ -1332,18 +1332,18 @@ class ClassDetailForm extends React.Component {
         render: (text, record, index) => {
           return (
             <div>
-              {hasBtnPower('sjd/classdetail', 'callStudnet') && record.call_time && <a className={pageStyle.alink} href="javascript:;" onClick={() => this.toEditCallStudents(record)}>已点名</a>}
-              {hasBtnPower('sjd/classdetail', 'callStudnet') && !record.call_time && <a className={pageStyle.alink} href="javascript:;" onClick={() => this.toCallStudents(record)}>点名</a>}
+              {hasBtnPower('sjd/classdetail', 'callStudnet') && record.call_time && <span className="hreflink" onClick={() => this.toEditCallStudents(record)}>已点名</span>}
+              {hasBtnPower('sjd/classdetail', 'callStudnet') && !record.call_time && <span className="hreflink" onClick={() => this.toCallStudents(record)}>点名</span>}
               { hasBtnPower('sjd/classdetail', 'changeCourse') &&
                 <span>
                   <span className={pageStyle.divideline}>|</span>
-                  <a className={pageStyle.alink} href="javascript:;" onClick={() => this.changeSchedule(record)}>调课</a>
+                  <span className="hreflink" onClick={() => this.changeSchedule(record)}>调课</span>
                 </span>
               }
               { hasBtnPower('sjd/classdetail', 'removeSchedule') &&
                 <span>
                   <span className={pageStyle.divideline}>|</span>
-                  <a className={pageStyle.alink} href="javascript:;" onClick={() => this.scheduleDel(record)}>删除</a>
+                  <span className="hreflink" onClick={() => this.scheduleDel(record)}>删除</span>
                 </span>
               }
             </div>
@@ -1355,11 +1355,11 @@ class ClassDetailForm extends React.Component {
       {
         title: '姓名',
         dataIndex: 'name',
-        key: 'm',
+        key: 'name',
         render: (text, record) => {
           return (
             <div>
-              <a href="javascript:;" onClick={() => this.toDetail(record.id)}>{record.name}</a>
+              <span className="hreflink" onClick={() => this.toDetail(record.id)}>{record.name}</span>
             </div>
           );
         },
@@ -1367,7 +1367,7 @@ class ClassDetailForm extends React.Component {
       {
         title: '性别',
         dataIndex: 'gender',
-        key: 'n',
+        key: 'gender',
         render: (text, record, index) => {
           return (
             <div>
@@ -1381,12 +1381,12 @@ class ClassDetailForm extends React.Component {
       {
         title: '手机号',
         dataIndex: 'mobile',
-        key: 'o',
+        key: 'mobile',
       },
       {
         title: '课程名',
         dataIndex: 'course',
-        key: 'i',
+        key: 'course',
         render: (text, record, index) => {
           return (
             <div>
@@ -1398,17 +1398,17 @@ class ClassDetailForm extends React.Component {
       {
         title: '操作',
         dataIndex: 'd',
-        key: 'y',
+        key: 'd',
         render: (text, record, index) => {
           return (
             <div>
               { hasBtnPower('sjd/classdetail', 'changeClass') &&
                 <span>
-                  <a className={pageStyle.alink} href="javascript:;" onClick={() => this.changeClass(record)}>调班</a>
+                  <span className="hreflink" onClick={() => this.changeClass(record)}>调班</span>
                   <span className={pageStyle.divideline}>|</span>
                 </span>
               }
-              {hasBtnPower('sjd/classdetail', 'removeStudent') && <a className={pageStyle.alink} href="javascript:;" onClick={() => this.removeStudent(record)}>移除</a>}
+              {hasBtnPower('sjd/classdetail', 'removeStudent') && <span className="hreflink" onClick={() => this.removeStudent(record)}>移除</span>}
             </div>
           );
         },

src/pages/classmgt/classRoomMgt.js

@@ -106,7 +106,7 @@ class classRoomMgt extends React.Component {
               <div key={ele.id} className={pageStyle.classroomitem} style={{ lineHeight: '32px' }}>
                 <span className={pageStyle.classroom}>{ele.title}</span>
                 <span className={pageStyle.classroom}>&nbsp;&nbsp;&nbsp;&nbsp;</span>
-                <a className={pageStyle.aLink} href="javascript:;" onClick={() => delClassroom(ele)}>删除</a>
+                <span className="hreflink" onClick={() => delClassroom(ele)}>删除</span>
               </div>
             ))}
           </Col>

src/pages/classmgt/index.js

@@ -514,22 +514,22 @@ class ClassMgtForm extends React.Component {
         render: (text, record, index) => {
           return (
             <div className={pageStyle.tableoperatebox}>
-              <a className={pageStyle.alink} href="javascript:;" onClick={() => this.goClassInvite(record)}>班级报名</a>
+              <span className="hreflink" onClick={() => this.goClassInvite(record)}>班级报名</span>
               <span className={pageStyle.divideline}>|</span>
-              <a className={pageStyle.alink} href="javascript:;" onClick={() => this.goClassDetail(record, 2)}>学员管理</a>
+              <span className="hreflink" onClick={() => this.goClassDetail(record, 2)}>学员管理</span>
               <span className={pageStyle.divideline}>|</span>
               <span>
-                <a className={pageStyle.alink} href="javascript:;" onClick={() => this.goThemeMgt(record)}>主题管理</a>
+                <span className="hreflink" onClick={() => this.goThemeMgt(record)}>主题管理</span>
                 <span className={pageStyle.divideline}>|</span>
               </span>
               { hasBtnPower('sjd/classmgt', 'callStudent') &&
                 <span>
-                  <a className={pageStyle.alink} href="javascript:;" onClick={() => this.goClassDetail(record, 3)}>点名</a>
+                  <span className="hreflink" onClick={() => this.goClassDetail(record, 3)}>点名</span>
                   <span className={pageStyle.divideline}>|</span>
                 </span>
               }
-              {hasBtnPower('sjd/classmgt', 'singleWindingUp') && record.graduation_status == 2 && <a className={pageStyle.alink} onClick={() => this.singleResetClassStatusChange(record)} href="javascript:;">已结业</a>}
-              {hasBtnPower('sjd/classmgt', 'singleWindingUp') && record.graduation_status == 1 && <a className={pageStyle.alink} href="javascript:;" onClick={() => this.singleClassStatusChange(record)}>结业</a>}
+              {hasBtnPower('sjd/classmgt', 'singleWindingUp') && record.graduation_status == 2 && <span className="hreflink" onClick={() => this.singleResetClassStatusChange(record)}>已结业</span>}
+              {hasBtnPower('sjd/classmgt', 'singleWindingUp') && record.graduation_status == 1 && <span className="hreflink" onClick={() => this.singleClassStatusChange(record)}>结业</span>}
             </div>
           );
         },

src/pages/course/index.js

@@ -238,11 +238,11 @@ class ClassMgtForm extends React.Component {
             <div className={pageStyle.tableoperatebox}>
               { hasBtnPower('sjd/course', 'editCourse') &&
                 <span>
-                  <a className={pageStyle.alink} href="javascript:;" onClick={() => this.changecourse(record)}>修改</a>
+                  <span className="hreflink" onClick={() => this.changecourse(record)}>修改</span>
                   <span className={pageStyle.divideline}>|</span>
                 </span>
               }
-              {hasBtnPower('sjd/course', 'removeCourse') && <a className={pageStyle.alink} href="javascript:;" onClick={() => this.courseDelete(record.id, record)}>删除</a>}
+              {hasBtnPower('sjd/course', 'removeCourse') && <span className="hreflink" onClick={() => this.courseDelete(record.id, record)}>删除</span>}
             </div>
           );
         },

src/pages/student/RenewEdit.js

@@ -339,7 +339,7 @@ class RenewEdit extends React.Component {
                     })(
                       <span>{operator.nickname}</span>,
                     )}
-                  <a href="javascript:;" className={pageStyle.changeOperate} onClick={() => toChangeOperator(true)}>修改</a>
+                  <span className={`hreflink ${pageStyle.changeOperate}`} onClick={() => toChangeOperator(true)}>修改</span>
                 </Form.Item>
               </Col>
             </Row>

src/pages/student/SelfJoin.js

@@ -219,11 +219,11 @@ class SelfJoinForm extends React.Component {
         render: (text, record) => {
           return (
             <div>
-              <a href="javascript:;" onClick={() => seeCourseTmpQrcode(record)}>查看</a>
+              <span className="hreflink" onClick={() => seeCourseTmpQrcode(record)}>查看</span>
               <span className={pageStyle.divideline}>|</span>
-              <a href="javascript:;" onClick={() => this.editCourseModule(record)}>修改</a>
+              <span className="hreflink" onClick={() => this.editCourseModule(record)}>修改</span>
               <span className={pageStyle.divideline}>|</span>
-              <a href="javascript:;" onClick={() => delCourseModule(record)}>删除</a>
+              <span className="hreflink" onClick={() => delCourseModule(record)}>删除</span>
             </div>
           );
         },
@@ -475,7 +475,7 @@ class SelfJoinForm extends React.Component {
                         })(
                           <span>{operator.nickname}</span>,
                         )}
-                      <a href="javascript:;" className={pageStyle.changeOperate} onClick={() => toChangeOperator(true)}>修改</a>
+                      <span className={`hreflink ${pageStyle.changeOperate}`} onClick={() => toChangeOperator(true)}>修改</span>
                     </Form.Item>
                   </Col>
                 </Col>

src/pages/student/StudentAdd.js

@@ -206,7 +206,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/student/eliminateEdit.js

@@ -211,7 +211,7 @@ class eliminateEdit extends React.Component {
                   })(
                     <span>{operator.nickname}</span>,
                   )}
-                <a href="javascript:;" className={pageStyle.changeOperate} onClick={() => toChangeOperator(true)}>修改</a>
+                <span className={`hreflink ${pageStyle.changeOperate}`} onClick={() => toChangeOperator(true)}>修改</span>
               </Form.Item>
             </Row>
           </div>

src/pages/student/newRenewEdit.js

@@ -363,7 +363,7 @@ class NewRenewEdit extends React.Component {
                     })(
                       <span>{operator.nickname}</span>,
                     )}
-                  <a href="javascript:;" className={pageStyle.changeOperate} onClick={() => toChangeOperator(true)}>修改</a>
+                  <span className={`hreflink ${pageStyle.changeOperate}`} onClick={() => toChangeOperator(true)}>修改</span>
                 </Form.Item>
               </Col>
             </Row>