Merge remote-tracking branch 'origin/develop' into develop

src/App.vue

@@ -33,7 +33,7 @@ import {USER_PERMISSION} from "@/api/ThirdApi";
 
 const store = useStore();
 const isLogin = ref(false);
-console.log("版本2.3.1------------");
+console.log("版本2.3.2------------");
 
 // 监听关闭浏览器
 let time1 = ref(0);

src/components/drawers/ActiveAttendance.vue

@@ -745,7 +745,7 @@ export default {
           title: "签到时间",
           dataIndex: "signTime",
           key: "signTime",
-          width: 110,
+          width: 100,
           align: "center",
           className: "h",
           customRender: (text) => {
@@ -812,7 +812,7 @@ export default {
           className: "h",
           dataIndex: "opacation",
           key: "opacation",
-          width: 130,
+          width: 100,
           align: "center",
           customRender: (value) => {
             return (
@@ -1079,6 +1079,11 @@ export default {
 </script>
 
 <style lang="scss">
+.largeDrawerStyle > .ant-drawer-content-wrapper {
+  width: 1400px !important;
+  min-width: 1400px !important;
+}
+
 .me {
   .ant-modal-body {
     padding: 0px;

src/components/drawers/AddOpenCourse.vue

@@ -617,9 +617,9 @@ const changevalue = (e) => {
 defineExpose({ openDrawer });
 </script>
 <style lang="scss">
-.ant-drawer-content-wrapper {
-  width: 1500px !important;
-  min-width: 1500px !important;
+.addonlineDrawer > .ant-drawer-content-wrapper {
+  width: 1300px !important;
+  min-width: 1300px !important;
 }
 
 .ant-table-striped :deep(.table-striped) td {

src/components/drawers/project/ProjectExamManage.vue

@@ -259,8 +259,8 @@ export default {
         },
         {
           title: "考试次数",
-          dataIndex: "num",
-          key: "num",
+          dataIndex: "testNumber",
+          key: "testNumber",
           width: 60,
           align: "center",
           ellipsis: true,
@@ -268,15 +268,15 @@ export default {
           customRender: (text) => {
             return (
               <div class="racona">
-                <span> {text.record.num?text.record.num:"-"}</span>
+                <span> {text.record.testNumber?text.record.testNumber:"-"}</span>
               </div>
             );
           },
         },
         {
           title: "成绩",
-          dataIndex: "examinationScore",
-          key: "examinationScore",
+          dataIndex: "score",
+          key: "score",
           width: 60,
           align: "center",
           ellipsis: true,
@@ -284,7 +284,7 @@ export default {
           customRender: (text) => {
             return (
               <div class="racona">
-                <span> {text.record.examinationScore?text.record.examinationScore:"-"}</span>
+                <span> {text.record.score?text.record.score:"-"}</span>
               </div>
             );
           },
@@ -292,8 +292,8 @@ export default {
 
         {
           title: "完成时间",
-          dataIndex: "examinationSubmitTime",
-          key: "examinationSubmitTime",
+          dataIndex: "finishedTime",
+          key: "finishedTime",
           width: 60,
           align: "center",
           ellipsis: true,
@@ -301,7 +301,7 @@ export default {
           customRender: (text) => {
             return (
               <div class="racona">
-                <span> {text.record.examinationSubmitTime?text.record.examinationSubmitTime:"-"}</span>
+                <span> {text.record.finishedTime?text.record.finishedTime:"-"}</span>
               </div>
             );
           },

src/components/drawers/router/RouterExaminationManage.vue

@@ -240,8 +240,8 @@ export default {
         },
         {
           title: "考试次数",
-          dataIndex: "num",
-          key: "num",
+          dataIndex: "testNumber",
+          key: "testNumber",
           width: 60,
           align: "center",
           ellipsis: true,
@@ -249,7 +249,7 @@ export default {
           customRender: (text) => {
             return (
               <div class="racona">
-                <span> {text.record.num ? text.record.num : "-"}</span>
+                <span> {text.record.testNumber ? text.record.testNumber : "-"}</span>
               </div>
             );
           },
@@ -265,7 +265,7 @@ export default {
           customRender: (text) => {
             return (
               <div class="racona">
-                <span> {text.record.examinationScore ? text.record.examinationScore : "-"}</span>
+                <span> {text.record.score ? text.record.score : "-"}</span>
               </div>
             );
           },
@@ -273,8 +273,8 @@ export default {
 
         {
           title: "完成时间",
-          dataIndex: "examinationSubmitTime",
-          key: "examinationSubmitTime",
+          dataIndex: "finishedTime",
+          key: "finishedTime",
           width: 60,
           align: "center",
           ellipsis: true,
@@ -282,7 +282,7 @@ export default {
           customRender: (text) => {
             return (
               <div class="racona">
-                <span> {text.record.examinationSubmitTime ? text.record.examinationSubmitTime : "-"}</span>
+                <span> {text.record.finishedTime ? text.record.finishedTime : "-"}</span>
               </div>
             );
           },

src/components/drawers/router/RouterFaceStu.vue

@@ -300,7 +300,10 @@ watch(() => data.value, () => {
   tableRef.value.fetch();
 });
 
+// 开课签到二维码名字
+const openCourseName = ref("");
 const ChoiceCourse = (n) => {
+  openCourseName.value = data.value[n].name;
   coursePlanIndex.value = n;
   params.value.pid = data.value[n].id;
   tableRef.value.fetch();
@@ -378,7 +381,7 @@ function resetStudentPage() {
 const qrcodeVisible = () => {
   qrCode({
     title: "【开课】二维码",
-    name: props.datasource?.name,
+    name: openCourseName.value?openCourseName.value:data.value[0]?.name,
     // url: `${location.protocol}//${location.host}${process.env.VUE_APP_BASE_API}/admin/student/studentSign?taskId=${props.datasource.id}&taskType=${props.datasource.type}&type=${props.type}`,
     url: `${location.protocol}//${location.host}${process.env.VUE_APP_BASE_API}/stu/project/redirectDetail?courseId=${data.value[coursePlanIndex.value]?.id}`,
   });
@@ -387,7 +390,7 @@ const qrcodeVisible = () => {
 const qrcodeVisibleSign = () => {
   qrCode({
     title: "【签到】二维码",
-    name: props.datasource?.name,
+    name: openCourseName.value?openCourseName.value:data.value[0]?.name,
     // url: `${location.protocol}//${location.host}${process.env.VUE_APP_BASE_API}/admin/student/studentSign?taskId=${props.datasource.id}&taskType=${props.datasource.type}&type=${props.type}`,
     url: `${location.protocol}//${location.host}${process.env.VUE_APP_BASE_API}/admin/student/studentSign?taskId=${data.value[coursePlanIndex.value]?.id}&taskType=${2}&type=${3}`,
   });