'修改合并'

src/components/CallStudents.js

@@ -455,8 +455,8 @@ class CallStudentsForm extends React.Component {
       },
       {
         title: '备注',
-        dataIndex: 'c',
-        key: 'c',
+        dataIndex: 'd',
+        key: 'd',
         render: (text, record, index) => {
           return (
             <div className={pageStyle.tableoperatebox}>
@@ -687,7 +687,6 @@ class CallStudentsForm extends React.Component {
                   <Form>
                     <Form.Item>
                       {getFieldDecorator('start_time', {
-                        initialValue: '',
                         rules: [{ required: true, message: '请选择点名时间' }],
                       })(<DatePicker placeholder="请选择点名时间" />)}
                     </Form.Item>
@@ -712,6 +711,7 @@ class CallStudentsForm extends React.Component {
             </Col>
           </Row>
           <Table
+            rowKey={callStudentOperateList => callStudentOperateList.id}
             dataSource={callStudentOperateList}
             columns={studentcolumns}
             scroll={{ x: 'max-content' }}
@@ -746,6 +746,7 @@ class CallStudentsForm extends React.Component {
           </Row>
           <Row>
             <Table
+              rowKey={linshiStudentList => linshiStudentList.id}
               dataSource={linshiStudentList}
               columns={addstudentColumns}
               scroll={{ x: 'max-content' }}
@@ -796,6 +797,7 @@ class CallStudentsForm extends React.Component {
           </Row>
           <Row>
             <Table
+              rowKey={bukeStudentList => bukeStudentList.id}
               dataSource={bukeStudentList}
               columns={bukestudentColumns}
               scroll={{ x: 'max-content' }}

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>
           );
         },
@@ -1496,7 +1496,7 @@ class ClassDetailForm extends React.Component {
                       selectedRowKeys: selectedToDelPlansKey,
                       onChange: this.onDelPLanSelectChange,
                     }}
-                    rowKey={coursePlansList => coursePlansList.name}
+                    rowKey={coursePlansList => coursePlansList.id}
                     dataSource={coursePlansList}
                     columns={courseplancolumns}
                     scroll={{ x: 'max-content' }}
@@ -1542,7 +1542,7 @@ class ClassDetailForm extends React.Component {
                       selectedRowKeys: selectedToDelStudentsKey,
                       onChange: this.onDelStudentsSelectChange,
                     }}
-                    rowKey={classStudentList => classStudentList.name}
+                    rowKey={classStudentList => classStudentList.id}
                     dataSource={classStudentList}
                     columns={studentcolumns}
                     scroll={{ x: 700 }}
@@ -1582,7 +1582,7 @@ class ClassDetailForm extends React.Component {
                 </Row>
                 <div className={pageStyle.studenttablebox}>
                   <Table
-                    rowKey={scheduleList => scheduleList.call_time}
+                    rowKey={scheduleList => scheduleList.id}
                     dataSource={scheduleList}
                     columns={coursecolumns}
                     scroll={{ x: 'max-content' }}
@@ -1624,7 +1624,7 @@ class ClassDetailForm extends React.Component {
         >
           <Row>
             <Table
-              rowKey={classList => classList.title}
+              rowKey={classList => classList.id}
               dataSource={classList}
               columns={exchangeClassColumns}
               scroll={{ x: 'max-content' }}
@@ -1665,7 +1665,7 @@ class ClassDetailForm extends React.Component {
           </Row>
           <Row>
             <Table
-              rowKey={toAddStudentList => toAddStudentList.name}
+              rowKey={toAddStudentList => toAddStudentList.id}
               dataSource={toAddStudentList}
               columns={addstudentColumns}
               scroll={{ x: 'max-content' }}
@@ -1706,7 +1706,7 @@ class ClassDetailForm extends React.Component {
         >
           <Row>
             <Table
-              rowKey={studentChangeScheduleList => studentChangeScheduleList.coursetime}
+              rowKey={studentChangeScheduleList => studentChangeScheduleList.id}
               dataSource={studentChangeScheduleList}
               columns={studentChangeScheduleColumns}
               loading={studentChangeScheduleListLoading}

src/pages/clockmgt/commenteditorbox.js

@@ -106,7 +106,7 @@ class CommentEditorBox extends React.Component {
             </div>
           </div>
           <div className={pageStyle.textareabox}>
-            <TextArea autoSize={() => true} maxlength={500} className={pageStyle.textareabox} value={commentParams.common.content} onChange={contentChange} style={{ minHeight: '100px' }} />
+            <TextArea autoSize maxlength={500} className={pageStyle.textareabox} value={commentParams.common.content} onChange={contentChange} style={{ minHeight: '100px' }} />
             <div className={pageStyle.wordcount}>{commentParams.common.content.length}/500</div>
           </div>
           <div className={pageStyle.shortwordbox}>
@@ -183,7 +183,7 @@ class CommentEditorBox extends React.Component {
           {privitecommentOpen &&
             <div>
               <div className={pageStyle.textareabox}>
-                <TextArea maxlength={500} autoSize={() => true} value={commentParams.privite.content} className={pageStyle.textareabox} onChange={priviteContentChange} style={{ minHeight: '100px' }} />
+                <TextArea maxlength={500} autoSize value={commentParams.privite.content} className={pageStyle.textareabox} onChange={priviteContentChange} style={{ minHeight: '100px' }} />
                 <div className={pageStyle.wordcount}>{commentParams.privite.content.length}/500</div>
               </div>
               {((commentParams.privite.audio && commentParams.privite.audio.length > 0) || commentParams.privite.audio.src) &&

src/pages/newtheme/ThemeEditor.js

@@ -54,7 +54,7 @@ class ThemeEditor extends React.Component {
               switch (item.type) {
                 case 'text':
                   return (
-                    <div className={pageStyle.textWrap}>
+                    <div key={item.type} className={pageStyle.textWrap}>
                       <TextArea autoSize={{ minRows: 4, maxRows: 10 }} value={item.value} onChange={e => editorChange(e, index)} placeholder="请输入内容" style={{ width: 560 }} maxLength={500} />
                       <div className={pageStyle.sizeNumber}>{item.value.length}/500</div>
                       <div className={pageStyle.toolList}>
@@ -68,7 +68,7 @@ class ThemeEditor extends React.Component {
                   );
                 case 'img':
                   return (
-                    <div className={pageStyle.uploadimgbox}>
+                    <div key={item.type} className={pageStyle.uploadimgbox}>
                       <div className={pageStyle.imgwrap}>
                         <div className={pageStyle.uploadimgwrap}> <img alt={item.type} className={pageStyle.teacheruploadimg} src={imagify(item.value)} /></div>
                         <div className={pageStyle.imghide}>
@@ -86,7 +86,7 @@ class ThemeEditor extends React.Component {
                   );
                 case 'video':
                   return (
-                    <div className={pageStyle.videowrap}>
+                    <div key={item.type} className={pageStyle.videowrap}>
                       <video controls="controls" className={pageStyle.videoPoster} src={ossVideofy(item.value)} />
                       <div className={pageStyle.toolList}>
                         { index === 0 && <div aria-disabled="true" className={pageStyle.noup}><img src={upImg} alt="" /> </div> }

src/pages/thememgt/index.js

 import React from 'react';
 import { connect } from 'dva';
+import moment from 'moment';
 import { Table, Row, Col, Form, Select, DatePicker, Button, Pagination, Divider, message, Modal, Icon } from 'antd';
 import pageStyle from './index.less';
 import { pageIn } from '../../utils/index';
@@ -234,7 +235,7 @@ class ThemeMgt extends React.Component {
         title: '打卡人数',
         dataIndex: 'clock_count',
         align: 'center',
-        key: 'clock_count',
+        key: 'student_total',
         render: (text, record, index) => (
           <div className={pageStyle.tablecell}>
             {record.subject_type == 1 && record.student_total}
@@ -245,9 +246,9 @@ class ThemeMgt extends React.Component {
       },
       {
         title: '打卡数',
-        dataIndex: 'clock_count',
+        dataIndex: 'clock_record_count',
         align: 'center',
-        key: 'clock_count',
+        key: 'clock_record_count',
         render: (text, record, index) => (
           <div className={pageStyle.tablecell}>
             {record.subject_type == 1 && record.clock_record_count}
@@ -275,7 +276,7 @@ class ThemeMgt extends React.Component {
         title: '未点评',
         dataIndex: 'clock_count',
         align: 'center',
-        key: 'clock_count',
+        key: 'no_review',
         render: (text, record, index) => (
           <div className={pageStyle.tablecell}>
             {record.subject_type == 1 && record.no_review}
@@ -346,9 +347,8 @@ class ThemeMgt extends React.Component {
                 >
                   <Form.Item style={{ display: 'inline-block' }}>
                     <DatePicker
-                      format="YYYY-MM-DD"
                       disabledDate={this.disabledStartDate}
-                      value={startTime}
+                      format="YYYY-MM-DD"
                       onChange={this.onStartChange}
                       onOpenChange={this.handleStartOpenChange}
                     />
@@ -360,7 +360,6 @@ class ThemeMgt extends React.Component {
                       disabledDate={this.disabledEndDate}
                       onChange={this.onEndChange}
                       onOpenChange={this.handleEndOpenChange}
-                      value={endTime}
                     />
                   </Form.Item>
                 </Form.Item>