Merge branch 'master' of http://gitlab.oytour.com/luochao/confucius

src/api/course/class.js

@@ -113,3 +113,27 @@ export function GetClassPlanLogPageList(data) {
   });
 }
 
+/**
+ * 获取某一天计划
+ */
+export function GetDayClassPlan(data) {
+  return request({
+    url: '/class/GetDayClassPlan',
+    method: 'post',
+    data
+  });
+}
+
+/**
+ * 点击签到
+ */
+export function addClassCheck(data) {
+  return request({
+    url: '/class/AddClassCheck',
+    method: 'post',
+    data
+  });
+}
+
+
+

src/components/course/classinfo-form.vue

@@ -98,7 +98,7 @@
                 <q-input square filled v-model="dropMsg.DropOutRemark" borderless label="退课原因" ref="reason" type="textarea" counter 
                   :rules="[val => !!val || '请填写退课原因']" maxlength="200" />
                 <div class="drop_NameDown">
-                    <q-chip v-for="item in selectedStudent">
+                    <q-chip v-for="(item,index) in selectedStudent" :key="index">
                       <q-avatar rounded size="sm" v-if="item.UserIcon">
                         <img :src="item.UserIcon" />
                       </q-avatar>

src/components/course/lesson-form.vue

@@ -89,9 +89,11 @@
   }
   .StudentInfo_List{
     display: flex;
-    width:80%;
-    margin:auto;
+    width:100%;
+    margin:0 20px;
+    padding:0 40px 0 20px;
     justify-content: space-between;
+    border-bottom:1px solid #d1d1d1;
   }
   .Show_SignBack{
     margin:20px;
@@ -103,6 +105,32 @@
   .Less_Close:hover{
     color:red;
   }
+  .lessStudentList{
+    margin-top:10px;
+  }
+  .lessStuTitle{
+    margin:20px;
+    padding-left:20px;
+    font-size:12px;
+  }
+  .lessStuInnerList{
+    display:flex;
+    margin:0 40px;
+    min-height: 300px;
+  }
+  .lessList{
+    width:90px;
+    height:110px;
+    border:1px solid #d1d1d1;
+    border-radius: 5px;
+    text-align: center;
+    margin-right:10px;
+    cursor: pointer;
+  }
+  .less_Isout{
+    font-size:12px;
+    color:#2961FE;
+  }
 </style>
 <template>
   <div v-if="!isShowSign">
@@ -268,16 +296,43 @@
       <div class="StudentInfo_List">
         <div>
           <div>授课老师</div>
-          <div>李琴</div>
+          <div>{{dayObj.TeacherName}}</div>
         </div>
         <div>
           <div>授课时间</div>
-          <div>2020年11月10日</div>
+          <div>{{dayObj.ClassDate}}</div>
         </div>
         <div>
           <div>教室</div>
-          <div>财务二教</div>
+          <div>{{dayObj.RoomName}}</div>
+        </div>
+        <div>
+          <div>授课时长</div>
+          <div>{{dayObj.TotalHour}}小时 ({{dayObj.ClassNum}}课时)</div>
+        </div>
+      </div>
+      <div class="lessStudentList">
+        <div class="lessStuTitle">学生签到情况</div>
+        <div class="lessStuInnerList">
+          <div class="lessList" v-for="(item,index) in dayObj.GuestList" :key="index">
+            <q-avatar style="margin:10px 0 5px 0">
+              <img :src="item.UserIcon">
+            </q-avatar>
+            <div>{{item.GuestName}}</div>
+            <div class="less_Isout">
+              <span v-if="item.IsCheck==0">正常</span>
+              <span v-if="item.IsCheck==1">缺勤</span>
+              <span v-if="item.IsCheck==-1">未签到</span>
+            </div>
+          </div>
         </div>
+        <q-card-actions align="right" class="bg-white">
+          <q-btn label="取消" flat color="grey-10"
+            style="font-weight:400 !important" @click="isShowSign=false" />
+          <q-btn label="确认" color="accent q-px-md" style="font-weight:400 !important"
+            @click="saveSign()" />
+        </q-card-actions>
+
       </div>  
     </div>
   </div>
@@ -287,7 +342,9 @@
   import {
     quertClassPlan,
     setClassPlan,
-    RemoveClassPlan
+    RemoveClassPlan,
+    GetDayClassPlan,
+    addClassCheck
   } from '../../api/course/class';
   import {
     getTeacherDropDownList,
@@ -331,7 +388,13 @@
         isShowEdit: false, //是否显示修改弹出
         isShowCanlder: false, //是否显示日历修改日期
 
-        isShowSign:false
+        isShowSign:false,
+        dayMsg:{  //获取某一天的计划信息请求
+          ClassPlanId:0,
+          School_Id:0,
+          ClassId:0
+        },
+        dayObj:{},
       }
     },
     created() {
@@ -369,6 +432,7 @@
       this.getClassRoomList();
       this.addMsg.TeacherId = this.setingObj.Teacher_Id;
       this.addMsg.ClassDate = this.setingObj.OpenTime;
+
       console.log(this.setingObj, 'setingObj');
     },
     methods: {
@@ -482,7 +546,30 @@
         console.log(item,'rili');
         if(item.IsEndDate){
           this.isShowSign=true;
+          this.dayMsg.ClassPlanId = item.ClassPlanId;
+          this.dayMsg.School_Id = this.setingObj.School_Id;
+          this.dayMsg.ClassId = this.setingObj.ClassId;
+          this.getDayClassPlan();
         }
+      },
+      //获取某一天的计划信息
+      getDayClassPlan(){
+        GetDayClassPlan(this.dayMsg).then(res => {
+          console.log(res,'数据来了');
+          if (res.Code == 1) {
+             this.dayObj = res.Data;
+          }
+        })
+      },
+      //点击签到
+      saveSign(){
+        let signMsg = [];
+        addClassCheck(signMsg).then(res => {
+          console.log(res,'数据来了');
+          if (res.Code == 1) {
+            
+          }
+        })
       }
     },
   }