lex 1 рік тому
батько
коміт
b37f51ff25

+ 4 - 2
src/main.ts

@@ -8,7 +8,7 @@ import 'dayjs/locale/zh-cn';
 import './styles/index.less';
 import './utils/rem';
 import { storage } from './utils/storage';
-import { ACCESS_TOKEN } from './store/mutation-types';
+import { ACCESS_TOKEN_ADMIN } from './store/mutation-types';
 
 async function setupApp() {
   // 处理token
@@ -19,9 +19,11 @@ async function setupApp() {
     const result = parseQuery(parse);
     if (result.Authorization) {
       const ex = 7 * 24 * 60 * 60 * 1000;
-      storage.set(ACCESS_TOKEN, result.Authorization, ex);
+      storage.set(ACCESS_TOKEN_ADMIN, result.Authorization, ex);
       sessionStorage.setItem('authLoadNum', '1');
+      sessionStorage.setItem('authSource', result.source?.toString() || '');
     }
+    console.log(result, 'result');
   } else {
     sessionStorage.removeItem('authLoadNum');
   }

+ 1 - 0
src/store/mutation-types.ts

@@ -1,4 +1,5 @@
 export const ACCESS_TOKEN = 'ACCESS-TOKEN-TEACHER'; // 用户token
+export const ACCESS_TOKEN_ADMIN = 'ACCESS-TOKEN-TEACHER--ADMIN'; // 用户token
 export const IM_TOKEN = 'IM-TOKEN'; //
 export const CURRENT_USER = 'CURRENT-USER'; // 当前用户信息
 export const TABS_ROUTES = 'TABS-ROUTES'; // 标签页

+ 8 - 1
src/utils/request.ts

@@ -3,6 +3,7 @@ import cleanDeep from 'clean-deep';
 import { useUserStore } from '../store/modules/users';
 import router from '@/router';
 import { eventGlobal } from '.';
+import { storage } from './storage';
 
 export interface SearchInitParams {
   rows?: string | number;
@@ -26,7 +27,13 @@ request.interceptors.request.use(
     }
 
     const userStore = useUserStore();
-    const Authorization = userStore.getToken || '';
+
+    let Authorization = userStore.getToken || '';
+    // 为了处理课堂乐器后台预览课件的功能
+    const authSource = sessionStorage.getItem('authSource');
+    if (authSource === 'admin' && storage.get('authorization')) {
+      Authorization = storage.get('authorization');
+    }
     const authHeaders: any = {};
     // if (
     //   userStore.getUserInfo &&

+ 6 - 2
src/views/attend-class/index.tsx

@@ -88,6 +88,8 @@ import ListenModal from '/src/components/card-preview/listen-modal';
 import Train from '../prepare-lessons/components/lesson-main/train';
 import ResourceMain from '../prepare-lessons/components/resource-main';
 import { useResizeObserver } from '@vueuse/core';
+import { storage } from '/src/utils/storage';
+import { ACCESS_TOKEN_ADMIN } from '/src/store/mutation-types';
 
 export type ToolType = 'init' | 'pen' | 'whiteboard' | 'call';
 export type ToolItem = {
@@ -1921,7 +1923,9 @@ export default defineComponent({
               <Train
                 cardType="homeworkRecord"
                 lessonPreTraining={{
-                  title: '',
+                  title: data.lessonPreTrainingId
+                    ? ''
+                    : data.teacherChapterName + '-课后作业',
                   chapterId: data.courseId, // 课件编号
                   id: data.lessonPreTrainingId // 作业编号
                 }}
@@ -2043,7 +2047,7 @@ export default defineComponent({
                       window.close();
 
                       if (route.query.source === 'admin') {
-                        users.logout();
+                        storage.remove(ACCESS_TOKEN_ADMIN);
                         window.parent.postMessage(
                           {
                             api: 'iframe_exit'

+ 4 - 4
src/views/attend-class/model/train-type/index.module.less

@@ -259,10 +259,10 @@
     padding: 0;
     border-radius: 50%;
 
-    // img {
-    //   height: 34px;
-    //   width: 34px;
-    // }
+    img {
+      height: 36px;
+      width: 36px;
+    }
 
     .iconEdit {
       display: inline-block;

+ 1 - 1
src/views/prepare-lessons/components/lesson-main/courseware-presets/index.module.less

@@ -149,7 +149,7 @@
 
   &:hover {
     // &::after {
-    background: linear-gradient(135deg, #76CEFF 0%, #5FA2FA 100%) !important;
+    background: linear-gradient(135deg, #62C7FF 0%, #4995FA 100%) !important;
     // }
   }
 }

+ 1 - 1
src/views/prepare-lessons/components/lesson-main/courseware-presets/index.tsx

@@ -715,7 +715,7 @@ export default defineComponent({
               <Train
                 cardType="prepare"
                 lessonPreTraining={{
-                  title: forms.selectItem.name + '课后作业',
+                  title: forms.selectItem.name + '-课后作业',
                   chapterId: forms.selectItem.id, // 课件编号
                   id: forms.selectItem.lessonPreTrainingId // 作业编号
                 }}

+ 5 - 0
src/views/prepare-lessons/components/lesson-main/courseware-presets/select-related/index.module.less

@@ -130,6 +130,11 @@
       font-size: 12Px;
       color: #000000;
       line-height: 17px;
+
+      &:hover {
+        color: #1677FF;
+        cursor: pointer;
+      }
     }
 
     .itemSubject {

+ 1 - 1
src/views/prepare-lessons/components/lesson-main/courseware-presets/select-related/item.tsx

@@ -39,7 +39,7 @@ export default defineComponent({
         </div>
 
         <div class={styles.itemContent}>
-          <p class={styles.itemTitle}>
+          <p class={styles.itemTitle} onClick={() => emit('look')}>
             <TheNoticeBar text={props.item.name} />
           </p>
 

+ 1 - 1
src/views/prepare-lessons/components/lesson-main/courseware/addCourseware.tsx

@@ -122,7 +122,7 @@ export default defineComponent({
       addOtherSource: false,
       addOtherIndex: 0 // 添加其它的索引
     });
-    const showModalMask = ref(false);
+    const showModalMask = ref(true);
 
     // 获取列表
     const getList = async () => {

+ 7 - 6
src/views/prepare-lessons/model/add-courseware-protocol/index.module.less

@@ -13,19 +13,19 @@
 }
 
 .downMove {
-  width: 413px;
+  width: 533px;
   // height: 309px;
   background: #FFFFFF;
   border-radius: 16px;
   position: relative;
-  padding: 0 30px 35px;
+  padding: 0 40px 35px;
   overflow: hidden;
 
   .downMoveBg {
     position: absolute;
     top: 0;
     left: 0;
-    width: 413px;
+    width: 533px;
     height: 101px;
   }
 
@@ -57,6 +57,7 @@
     font-weight: 400;
     color: #777777;
     line-height: 30px;
+    text-align: justify;
   }
 
   .submitAppBtn,
@@ -75,9 +76,9 @@
 
 .protocolGroup {
   padding-top: 17px;
+  // padding-bottom: 4px;
   display: flex;
-  align-items: flex-start;
-
+  align-items: center;
   cursor: pointer;
 
   p {
@@ -87,7 +88,7 @@
   }
 
   .checkbox {
-    margin-top: 5px;
+    // margin-top: 5px;
     margin-right: 5px;
     width: 15Px;
     height: 15Px;

+ 1 - 0
src/views/prepare-lessons/model/courseware-type/index.tsx

@@ -86,6 +86,7 @@ export default defineComponent({
 
           {/* 是否布置作业 */}
           {props.item.isNotWork && <i class={styles.iconNoWork}></i>}
+          <i class={styles.iconNoWork}></i>
           {/* 是否有添加逻辑 */}
           {props.isShowAdd && (
             <div class={styles.function}>