0929 md 01

src/api/invigilation.js

@@ -57,8 +57,8 @@ export function invigilateVideoList(datas) {
     {}
   );
 }
-export function monitorCallCount(examId) {
-  const data = pickBy({ examId }, paramFilter);
+export function monitorCallCount({ examId, callStatus }) {
+  const data = pickBy({ examId, callStatus }, paramFilter);
   return httpApp.post(
     "/api/admin/monitor/call/count?" + object2QueryString(data),
     {}
@@ -141,10 +141,10 @@ export function communicationList(datas) {
   );
 }
 
-export function communicationOver(recordId) {
+export function communicationOver({ recordId, source }) {
   return httpApp.post(
     "/api/admin/monitor/call/cancel",
-    { recordId },
+    { recordId, source },
     {
       noErrorMessage: true,
     }

src/features/invigilation/OnlinePatrol/PatrolWarningDetail.vue

@@ -46,9 +46,9 @@
         <div class="student-views">
           <div class="student-avatar">
             <img
-              :src="detailInfo.examStudentAvatar"
-              alt=""
-              v-if="detailInfo.examStudentAvatar"
+              :src="detailInfo.basePhotoPath"
+              :alt="detailInfo.examStudentName"
+              v-if="detailInfo.basePhotoPath"
             />
             <div class="avatar-default" v-else>
               <i class="el-icon-user-solid"></i>

src/features/invigilation/RealtimeMonitoring/RealtimeMonitoring.vue

@@ -472,7 +472,10 @@ export default {
     },
     async getMonitorCallCount() {
       if (!this.filter.examId) return;
-      const res = await monitorCallCount(this.filter.examId);
+      const res = await monitorCallCount({
+        examId: this.filter.examId,
+        callStatus: "START",
+      });
       this.communicationCount = res.data.data.count || 0;
     },
     async fetchWarningNotice() {

src/features/invigilation/RealtimeMonitoring/VideoCommunication.vue

@@ -153,7 +153,10 @@ export default {
     async answer(student, isVideo) {
       await this.initClient(student.examRecordId);
       // 结束学生的通话申请
-      await communicationOver(student.examRecordId);
+      await communicationOver({
+        recordId: student.examRecordId,
+        source: student.source,
+      });
 
       this.dialogVisible = true;
       // 添加远程用户视频发布监听

src/features/invigilation/RealtimeMonitoring/WarningDetail.vue

@@ -60,9 +60,9 @@
         <div class="student-views">
           <div class="student-avatar">
             <img
-              :src="detailInfo.examStudentAvatar"
-              alt=""
-              v-if="detailInfo.examStudentAvatar"
+              :src="detailInfo.basePhotoPath"
+              :alt="detailInfo.examStudentName"
+              v-if="detailInfo.basePhotoPath"
             />
             <div class="avatar-default" v-else>
               <i class="el-icon-user-solid"></i>
@@ -261,7 +261,10 @@
       <div class="communication-wait" v-show="isWaiting">
         <p class="communication-wait-tips">等待接听…</p>
         <div class="communication-wait-avatar">
-          <img :src="detailInfo.stdAvatar" :alt="detailInfo.examStudentName" />
+          <img
+            :src="detailInfo.basePhotoPath"
+            :alt="detailInfo.examStudentName"
+          />
         </div>
         <p class="communication-wait-username">
           {{ detailInfo.examStudentName }}

src/styles/base.scss

@@ -727,10 +727,10 @@ body {
 
       > span {
         display: block;
-        float: right;
+        float: left;
 
-        &:first-child {
-          float: left;
+        &:last-child {
+          float: right;
         }
       }
     }