更新

dev-dist/sw.js

@@ -13,29 +13,31 @@
 
 // If the loader is already loaded, just stop.
 if (!self.define) {
-  const registry = {};
+  let registry = {};
 
   // Used for `eval` and `importScripts` where we can't get script URL by other means.
   // In both cases, it's safe to use a global var because those functions are synchronous.
   let nextDefineUri;
 
   const singleRequire = (uri, parentUri) => {
-    uri = new URL(uri + '.js', parentUri).href;
-    return (
-      registry[uri] ||
-      new Promise(resolve => {
-        if ('document' in self) {
-          const script = document.createElement('script');
-          script.src = uri;
-          script.onload = resolve;
-          document.head.appendChild(script);
-        } else {
-          nextDefineUri = uri;
-          importScripts(uri);
-          resolve();
-        }
-      }).then(() => {
-        const promise = registry[uri];
+    uri = new URL(uri + ".js", parentUri).href;
+    return registry[uri] || (
+      
+        new Promise(resolve => {
+          if ("document" in self) {
+            const script = document.createElement("script");
+            script.src = uri;
+            script.onload = resolve;
+            document.head.appendChild(script);
+          } else {
+            nextDefineUri = uri;
+            importScripts(uri);
+            resolve();
+          }
+        })
+      
+      .then(() => {
+        let promise = registry[uri];
         if (!promise) {
           throw new Error(`Module ${uri} didn’t register its module`);
         }
@@ -45,31 +47,27 @@ if (!self.define) {
   };
 
   self.define = (depsNames, factory) => {
-    const uri =
-      nextDefineUri ||
-      ('document' in self ? document.currentScript.src : '') ||
-      location.href;
+    const uri = nextDefineUri || ("document" in self ? document.currentScript.src : "") || location.href;
     if (registry[uri]) {
       // Module is already loading or loaded.
       return;
     }
-    const exports = {};
+    let exports = {};
     const require = depUri => singleRequire(depUri, uri);
     const specialDeps = {
       module: { uri },
       exports,
       require
     };
-    registry[uri] = Promise.all(
-      depsNames.map(depName => specialDeps[depName] || require(depName))
-    ).then(deps => {
+    registry[uri] = Promise.all(depsNames.map(
+      depName => specialDeps[depName] || require(depName)
+    )).then(deps => {
       factory(...deps);
       return exports;
     });
   };
 }
-define(['./workbox-5357ef54'], function (workbox) {
-  ('use strict');
+define(['./workbox-5357ef54'], (function (workbox) { 'use strict';
 
   self.skipWaiting();
   workbox.clientsClaim();
@@ -79,32 +77,16 @@ define(['./workbox-5357ef54'], function (workbox) {
    * requests for URLs in the manifest.
    * See https://goo.gl/S9QRab
    */
-  workbox.precacheAndRoute(
-    [
-      {
-        url: 'registerSW.js',
-        revision: '3ca0b8505b4bec776b69afdba2768812'
-      },
-      {
-        url: 'index.html',
-        revision: '0.qn2vbkuocb'
-      }
-    ],
-    {}
-  );
-  /**
-   * https://juejin.cn/post/6844903881189621767
-   * 缓存策略 有5种
-   */
+  workbox.precacheAndRoute([{
+    "url": "registerSW.js",
+    "revision": "3ca0b8505b4bec776b69afdba2768812"
+  }, {
+    "url": "index.html",
+    "revision": "0.gkfi3u3c598"
+  }], {});
   workbox.cleanupOutdatedCaches();
-  workbox.registerRoute(
-    new workbox.NavigationRoute(workbox.createHandlerBoundToURL('index.html'), {
-      allowlist: [/^\/$/]
-    }),
-    workbox.strategies.NetworkFirst()
-  );
-  workbox.routing.registerRoute(
-    new RegExp('.*.html|css|js|json'),
-    workbox.strategies.NetworkFirst()
-  );
-});
+  workbox.registerRoute(new workbox.NavigationRoute(workbox.createHandlerBoundToURL("index.html"), {
+    allowlist: [/^\/$/]
+  }));
+
+}));

public/version.json

@@ -1 +1 @@
-{"version":1706063306448}
+{"version":1706105602090}

src/components/card-preview/song-modal/index.tsx

@@ -149,13 +149,13 @@ export default defineComponent({
             }}
             onTimeupdate={() => {
               audioForms.currentTime = timeFormat(
-                Math.round(audio.value?.currentTime || 0)
+                Math.floor(audio.value?.currentTime || 0)
               );
               audioForms.currentTimeNum = audio.value.currentTime;
             }}
             onLoadedmetadata={() => {
               audioForms.duration = timeFormat(
-                Math.round(audio.value.duration)
+                Math.floor(audio.value.duration)
               );
               audioForms.durationNum = audio.value.duration;
             }}></audio>

src/components/layout/layoutTop.tsx

@@ -147,7 +147,8 @@ export default defineComponent({
               previewDisabled></NImage>
             <p>
               {/* {info.value.schoolInfos[0].tenantName} |{' '} */}
-              {info.value?.schoolInfos[0]?.name || ''}
+              {(info.value?.schoolInfos && info.value?.schoolInfos[0].name) ||
+                ''}
             </p>
           </div>
           <div class={styles.layoutRight}>

src/views/attend-class/index.tsx

@@ -1224,16 +1224,29 @@ export default defineComponent({
         case 2:
           // 学生人数必须大于0，才可以布置作业
           if (data.preStudentNum <= 0) return;
-          const res = await lessonPreTrainingPage({
-            coursewareKnowledgeDetailId: data.detailId,
-            subjectId: data.subjectId,
+          // const res = await lessonPreTrainingPage({
+          //   coursewareKnowledgeDetailId: data.detailId,
+          //   subjectId: data.subjectId,
+          //   page: 1,
+          //   rows: 99
+          // });
+          // if (res.data.rows && res.data.rows.length) {
+          //   data.modalAttendMessage = '本节课已设置课后作业，是否布置？';
+          // }
+          // data.modelAttendStatus = true;
+          const res = await getStudentAfterWork({
+            courseScheduleId: data.classId,
             page: 1,
             rows: 99
           });
           if (res.data.rows && res.data.rows.length) {
-            data.modalAttendMessage = '本节课已设置课后作业，是否布置？';
+            // data.modalAttendMessage = '请确认是否结束课程？';
+            data.modalAttendMessage = '本次课程已布置作业，是否继续？';
+            data.modelAttendStatus = true;
+          } else {
+            data.modelTrainStatus = true;
+            data.modelAttendStatus = false;
           }
-          data.modelAttendStatus = true;
           break;
         case 3:
           openStudyTool({
@@ -1669,20 +1682,19 @@ export default defineComponent({
                 type="default"
                 round
                 onClick={() => {
-                  data.modelAttendStatus = false;
-                  handleStop();
+                  data.modelTrainStatus = true;
                   data.modelAttendStatus = false;
                 }}>
-                暂不布置
+                布置作业
               </NButton>
               <NButton
                 type="primary"
                 round
                 onClick={() => {
-                  data.modelTrainStatus = true;
+                  handleStop();
                   data.modelAttendStatus = false;
                 }}>
-                布置
+                取消
               </NButton>
             </NSpace>
           </div>

src/views/studentList/components/baseInfo.tsx

@@ -55,22 +55,38 @@ export default defineComponent({
     });
     const formRef = ref();
     const showUpdate = ref(false);
+    const gradeNumList = ref(getgradeNumList());
+    const formatGradeNum = () => {
+      if (props.studentInfo.currentGradeNum) {
+        const index = gradeNumList.value.findIndex(
+          (item: any) => item.value === props.studentInfo.currentGradeNum
+        );
+        if (index === -1) {
+          return null;
+        } else {
+          return props.studentInfo.currentGradeNum;
+        }
+      } else {
+        return null;
+      }
+    };
     const studentForm = reactive({
       upgradeFlag: (route.query.upgradeFlag as any) == 0 ? 1 : 0, // 是否为历史班
       nickname: props.studentInfo.nickname as any,
       phone: props.studentInfo.phone,
       gender: props.studentInfo.gender,
       id: props.studentInfo.id,
-      currentGradeNum: props.studentInfo.currentGradeNum,
+      currentGradeNum: formatGradeNum(),
       currentClass: props.studentInfo.currentClass
     });
-    const gradeNumList = ref(getgradeNumList());
+
     const classArrayRef = ref([...classArray] as any);
     const data = reactive({
       disabled: true,
       openChangePwd: false,
       uploadShow: true
     });
+
     watch(
       () => props.studentInfo,
       val => {
@@ -78,7 +94,7 @@ export default defineComponent({
         studentForm.phone = val.phone;
         studentForm.gender = val.gender;
         studentForm.id = val.id;
-        studentForm.currentGradeNum = val.currentGradeNum;
+        studentForm.currentGradeNum = formatGradeNum();
         studentForm.currentClass = val.currentClass;
       }
     );
@@ -105,7 +121,7 @@ export default defineComponent({
       studentForm.nickname = props.studentInfo.nickname;
       studentForm.phone = props.studentInfo.phone;
       studentForm.gender = props.studentInfo.gender;
-      studentForm.currentGradeNum = props.studentInfo.currentGradeNum;
+      studentForm.currentGradeNum = formatGradeNum();
       studentForm.currentClass = props.studentInfo.currentClass;
       data.disabled = true;
     };

src/views/studentList/modals/update-student/index.tsx

@@ -36,7 +36,6 @@ export default defineComponent({
       nickname: null,
       gender: null,
       currentGradeNum: null,
-      //  expireDate: dayjs().add(7, 'day').format('YYYY-MM-DD') as any, // 默认7天
       currentClass: null as any
     });
 
@@ -76,6 +75,14 @@ export default defineComponent({
         forms.currentGradeNum = row.currentGradeNum;
         forms.currentClass = row.currentClass;
       }
+      if (forms.currentGradeNum) {
+        const index = gradeNumList.value.findIndex(
+          (item: any) => item.value === forms.currentGradeNum
+        );
+        if (index === -1) {
+          forms.currentGradeNum = null;
+        }
+      }
     });
 
     const onlyAllowNumber = (value: string) => !value || /^\d+$/.test(value);

vite.config.ts

@@ -24,8 +24,8 @@ function resolve(dir: string) {
 // https://vitejs.dev/config/
 // https://github.com/vitejs/vite/issues/1930 .env
 // const proxyUrl = 'https://dev.kt.colexiu.com/';
-// const proxyUrl = 'https://test.lexiaoya.cn';
-const proxyUrl = 'http://192.168.3.14:7989';
+const proxyUrl = 'https://test.lexiaoya.cn';
+// const proxyUrl = 'http://192.168.3.14:7989';
 const now = new Date().getTime();
 export default defineConfig(() => {
   return {