Merge branch 'iteration-login' into dev

src/views/natural-resources/components/my-collect/index.tsx

@@ -41,7 +41,23 @@ export default defineComponent({
         });
         state.loading = false;
         state.pageTotal = Number(data.total);
-        state.tableList = data.rows || [];
+        const tempRows = data.rows || [];
+        const temp: any = [];
+        tempRows.forEach((row: any) => {
+          temp.push({
+            id: row.id,
+            coverImg: row.coverImg,
+            type: row.type,
+            title: row.name,
+            isCollect: !!row.favoriteFlag,
+            isSelected: row.sourceFrom === 'PLATFORM' ? true : false,
+            content: row.content,
+            subjectId: row.subjectIds,
+            enableFlag: row.enableFlag ? 1 : 0,
+            openFlag: row.openFlag
+          });
+        });
+        state.tableList = temp || [];
       } catch {
         state.loading = false;
       }
@@ -96,32 +112,20 @@ export default defineComponent({
 
         <NSpin v-model:show={state.loading} style={{ 'min-height': '50vh' }}>
           <div class={styles.list}>
-            {state.tableList.map((item: any) => {
-              const tmpItem = {
-                id: item.id,
-                coverImg: item.coverImg,
-                type: item.type,
-                title: item.name,
-                isCollect: !!item.favoriteFlag,
-                isSelected: item.sourceFrom === 'PLATFORM' ? true : false,
-                enableFlag: item.enableFlag ? 1 : 0,
-                openFlag: item.openFlag
-              };
-              return (
-                <CardType
-                  item={tmpItem}
-                  offShelf={item.enableFlag ? false : true}
-                  onOffShelf={() => onRemove(item)}
-                  disabledMouseHover={false}
-                  onClick={(val: any) => {
-                    if (val.type === 'IMG' || !item.enableFlag) return;
-                    state.show = true;
-                    state.item = val;
-                  }}
-                  onCollect={(item: any) => onCollect(item)}
-                />
-              );
-            })}
+            {state.tableList.map((item: any) => (
+              <CardType
+                item={item}
+                offShelf={item.enableFlag ? false : true}
+                onOffShelf={() => onRemove(item)}
+                disabledMouseHover={false}
+                onClick={(val: any) => {
+                  if (val.type === 'IMG' || !item.enableFlag) return;
+                  state.show = true;
+                  state.item = val;
+                }}
+                onCollect={(item: any) => onCollect(item)}
+              />
+            ))}
 
             {!state.loading && state.tableList.length <= 0 && (
               <TheEmpty description="暂无收藏资源" />

src/views/prepare-lessons/api.ts

@@ -142,3 +142,12 @@ export const bookVersionPage = (params?: any) => {
     data: params
   });
 };
+/**
+ * 备课 - 使用课件打标记
+ */
+export const tagUseCourseware = (params?: any) => {
+  return request.post('/edu-app/teacherKnowledgeMaterial/tagUseCourseware', {
+    requestType: 'form',
+    data: params
+  });
+};

src/views/prepare-lessons/components/directory-main/index.tsx

@@ -1,15 +1,21 @@
 import { defineComponent, onMounted, reactive, ref } from 'vue';
 import styles from './index.module.less';
 import { NIcon, NSpin, NScrollbar, NModal } from 'naive-ui';
-import { lessonCoursewareDetail, lessonCoursewarePage } from '../../api';
+import {
+  lessonCoursewareDetail,
+  lessonCoursewarePage,
+  tagUseCourseware
+} from '../../api';
 import SelectLessonware from './select-lessonware';
 import TheEmpty from '/src/components/TheEmpty';
 import { usePrepareStore } from '/src/store/modules/prepareLessons';
+import { useUserStore } from '/src/store/modules/users';
 
 export default defineComponent({
   name: 'directory-main',
   setup() {
     const prepareStore = usePrepareStore();
+    const userStore = useUserStore();
     const show = ref(true);
     const forms = reactive({
       showSelectBookStatus: false,
@@ -20,14 +26,29 @@ export default defineComponent({
       try {
         const { data } = await lessonCoursewarePage({
           page: 1,
-          rows: 1,
+          rows: 99,
           type: 'COURSEWARE',
           enableFlag: 1
         });
-
-        if (data.rows.length > 0) {
-          prepareStore.setBaseCourseware(data.rows[0]);
+        const result = data.rows || [];
+        if (result.length > 0) {
+          // 判断是否有默认数据
+          const selectItem = result.find(
+            (item: any) =>
+              item.id === userStore.getUserInfo?.lastUseCoursewareId
+          );
+          let id: any = null;
+          // console.log(userStore.getUserInfo?.lastUseCoursewareId, result);
+          if (selectItem) {
+            prepareStore.setBaseCourseware(selectItem);
+            id = selectItem.id;
+          } else {
+            prepareStore.setBaseCourseware(result[0]);
+            id = result[0]?.id;
+          }
+          setLastUseCoursewareId(id);
         }
+
         forms.showSelectBookStatus = true;
       } catch {
         //
@@ -42,6 +63,7 @@ export default defineComponent({
           id: baseCourseware.id
         });
         const tempList: any = data.lessonList || [];
+
         tempList.forEach((item: any, index: number) => {
           item.selected = false;
           if (index === 0) {
@@ -60,6 +82,15 @@ export default defineComponent({
       }
     };
 
+    const setLastUseCoursewareId = async (id: any) => {
+      try {
+        await tagUseCourseware({ coursewareId: id });
+        userStore.getInfo();
+      } catch {
+        //
+      }
+    };
+
     onMounted(async () => {
       show.value = true;
       await getLessonCourseware();
@@ -191,6 +222,7 @@ export default defineComponent({
             onConfirm={(item: any) => {
               prepareStore.setBaseCourseware(item);
               getLessonCoursewareDetail();
+              setLastUseCoursewareId(item.id);
             }}
           />
         </NModal>

src/views/prepare-lessons/components/directory-main/select-lessonware/index.tsx

@@ -75,6 +75,7 @@ export default defineComponent({
           try {
             await lessonCoursewareRemove({ id: item.id });
             message.success('删除成功');
+            getLessonCourseware();
           } catch {
             //
           }