''

src/common/menuconfig.js

@@ -73,8 +73,8 @@ export default {
         width: '20px',
         height: '20px',
       },
-      activeurl: `${__IMGCDN__}menu/teacheractive.png`,
-      notactiveurl: `${__IMGCDN__}menu/teacher.png`,
+      activeurl: `${__IMGCDN__}menu/courserecordactive.png`,
+      notactiveurl: `${__IMGCDN__}menu/courserecord.png`,
       path: '/sjd/record',
       relativePath: ['/sjd/record'],
     },

src/components/CallStudents.js

@@ -124,13 +124,13 @@ class CallStudentsForm extends React.Component {
       });
       return;
     }
-    if (callType == 1) {
+    if (callType == 1 || callType == 3) {
       dispatch({
         type: 'callstudents/studentCallPost',
         payload: {
-          callBack: () => {
+          callBack: (id) => {
             if (callBack && (typeof callBack == 'function')) {
-              callBack();
+              callBack(id);
             }
           },
         },
@@ -645,6 +645,41 @@ class CallStudentsForm extends React.Component {
                 </Col>
               </Row>
             </div>}
+          {callType == 3 &&
+            <div>
+              <Row gutter={16} className={pageStyle.detailrow}>
+                <Col xs={{ span: 24 }} sm={{ span: 12 }} md={{ span: 12 }} lg={{ span: 6 }} style={{ marginBottom: '20px' }}>
+                  <span className={pageStyle.detailtitle}>上课班级：</span>
+                  <span className={pageStyle.detaildesc}>{callStudentSchedule.class && callStudentSchedule.class.title}</span>
+                </Col>
+                <Col xs={{ span: 24 }} sm={{ span: 12 }} md={{ span: 12 }} lg={{ span: 6 }} style={{ marginBottom: '20px' }}>
+                  <span className={pageStyle.detailtitle}>上课课程：</span>
+                  <span className={pageStyle.detaildesc}>{callStudentSchedule.course && callStudentSchedule.course.title}</span>
+                </Col>
+                <Col xs={{ span: 24 }} sm={{ span: 12 }} md={{ span: 12 }} lg={{ span: 6 }} style={{ marginBottom: '20px' }}>
+                  <span className={pageStyle.detailtitle}>上课日期：</span>
+                  <span className={pageStyle.detaildesc}>{callStudentSchedule.start_date}</span>
+                </Col>
+                <Col xs={{ span: 24 }} sm={{ span: 12 }} md={{ span: 12 }} lg={{ span: 6 }} style={{ marginBottom: '20px' }}>
+                  <span className={pageStyle.detailtitle}>上课老师：</span>
+                  {callStudentSchedule.school_teacher && callStudentSchedule.school_teacher.nickname &&
+                    <span className={pageStyle.detaildesc}>{callStudentSchedule.school_teacher.nickname}</span>
+                  }
+                </Col>
+                <Col xs={{ span: 24 }} sm={{ span: 12 }} md={{ span: 12 }} lg={{ span: 6 }} style={{ marginBottom: '20px' }}>
+                  <span className={pageStyle.detailtitle}>上课教室：</span>
+                  <span className={pageStyle.detaildesc}>{(callStudentSchedule.class_room && callStudentSchedule.class_room.title) || '未设置'}</span>
+                </Col>
+                <Col xs={{ span: 24 }} sm={{ span: 12 }} md={{ span: 12 }} lg={{ span: 6 }}>
+                  <span className={pageStyle.detailtitle}>上课时间：</span>
+                  <span className={pageStyle.detaildesc}>{callStudentSchedule.start_date_format}-{callStudentSchedule.end_date_format}</span>
+                </Col>
+                <Col xs={{ span: 24 }} sm={{ span: 12 }} md={{ span: 12 }} lg={{ span: 6 }} >
+                  <span className={pageStyle.detailtitle}>授课课时：</span>
+                  <InputNumber value={expend} size="middle" className={pageStyle.hourInput} onChange={this.changeExpand} />
+                </Col>
+              </Row>
+            </div>}
           {callType == 2 &&
             <div>
               <Row gutter={16} className={pageStyle.detailrow}>

src/components/CourseChart.less

@@ -85,7 +85,7 @@
         align-items: center;
         justify-content: space-between;
         color: #FFFFFF;
-        padding: 0 15px 10px;
+        padding: 10px 15px 10px;
         line-height: 1;
         .left {
             display: flex;
@@ -107,28 +107,54 @@
         display: flex;
         align-items: center;
         padding: 0 15px;
-        color: rgba(255,255,255,0.5);
+        color: rgba(255,255,255,0.7);
         line-height: 1;
         padding-bottom: 10px;
         font-size: 12px;
+        word-break: break-all;
         .whitedot {
             width: 8px;
             height: 4px;
             border-radius: 2px;
             margin-right: 9px;
-            background-color: rgba(255,255,255,0.5);
+            background-color: #A9A9A9;
         }
         .name {
             margin-right: 5px;
         }
     }
     .classtitlebox {
-        text-align: center;
+        // text-align: center;
         color: #FFFFFF;
         font-size: 14px;
         word-break: break-all;
-        padding: 10px 15px;
-        text-align: center;
+        padding: 0 15px 11px;
+        // text-align: center;
+    }
+    .coursetitlebox {
+        color: rgba(255,255,255,0.7);
+        font-size: 14px;
+        padding: 0 15px 15px;
+    }
+    .divideline {
+        border-bottom: 1px solid rgba(255,255,255,0.1);
+    }
+    .btnbox {
+        display: flex;
+        align-items: center;
+        .btnitem {
+            flex-grow: 1;
+            text-align: center;
+            line-height: 50px;
+            color: #FFFFFF;
+            cursor: pointer;
+            &:hover {
+                background-color: rgba(0,0,0,1);
+            }
+            &:first-child {
+                border-right: 1px solid rgba(255,255,255,0.2);
+            }
+        }
     }
     :global {
         .ant-popover-content {
@@ -137,13 +163,13 @@
                 border-radius: 4px;
             }
             .ant-popover-inner-content {
-                background-color: rgba(0,0,0,0.7);
+                background-color: rgba(0,0,0,0.8);
                 border-radius: 4px;
                 padding: 15px 0 0;
             }
             .ant-popover-arrow {
-                border-top-color: rgba(0, 0, 0, 0.7);
-                border-left-color: rgba(0, 0, 0, 0.7);
+                border-top-color: rgba(0, 0, 0, 0.8);
+                border-left-color: rgba(0, 0, 0, 0.8);
             }
         }
     }

src/models/callstudents.js

@@ -194,7 +194,7 @@ export default {
       const { sid } = yield select(state => state.webapp);
       let newcallStudentTotal = callStudentTotal;
       let newqueryScheduleStudentListParams = {};
-      if (callType == 1) { // 正常点名
+      if (callType == 1 || callType == 3) { // 正常点名
         newqueryScheduleStudentListParams = Object.assign(queryCallStudentListParams, {
           school_id: sid,
           extra: 'time,recently_course',
@@ -322,6 +322,7 @@ export default {
         course_id: callStudentSchedule.course_id,
       });
       const callStudengListDate = yield call(schedulemgtAjax.getStudentCalls, newqueryScheduleStudentListParams);
+      console.log('ddddddddddddddddddddddd');
       yield put({
         type: 'updateState',
         payload: {
@@ -586,7 +587,7 @@ export default {
       });
       const loading = message.loading('点名处理中...', 0);
       const studentCallsDate = yield call(schedulemgtAjax.studentCalls, {
-        type: callType,
+        type: (callType == 1 || callType == 3) ? 1 : callType,
         school_id: sid,
         call_students: callStudent.join(';'),
         expend,
@@ -613,7 +614,7 @@ export default {
           },
         });
         if (callBack && (typeof callBack == 'function')) {
-          callBack();
+          callBack(callStudentSchedule.id);
         }
       } else {
         yield put({

src/models/indexstaic.js

@@ -482,12 +482,12 @@ export default {
           judgetodaycurrentTimestamp: (new Date(staticcenter.datetime.replace(/-/g, '/')).getTime()),
         },
       });
-      // yield put({
-      //   type: 'coursechart/queryInfo',
-      //   payload: {
-      //     dateTime: staticcenter.datetime,
-      //   },
-      // });
+      yield put({
+        type: 'coursechart/queryInfo',
+        payload: {
+          dateTime: staticcenter.datetime,
+        },
+      });
       if (staticcenter.code == 200) {
         yield put({
           type: 'updateState',