fix：添加活动；

src/renderer/src/AixPPTist/src/views/Editor/Thumbnails/index.vue

@@ -67,8 +67,6 @@
 
     <div class="page-number">幻灯片 {{slideIndex + 1}} / {{slides.length}}</div>
 
-    <!-- 引入活动的列表页面 -->
-    <Active ref="activeRef" v-show="false"/>
   </div>
 </template>
 
@@ -88,7 +86,6 @@ import ThumbnailSlide from '../../../views/components/ThumbnailSlide/index.vue'
 import LayoutPool from './LayoutPool.vue'
 import Popover from '../../../components/Popover.vue'
 import Draggable from 'vuedraggable'
-import Active from '../Toolbar/ElementStylePanel/Active/index.vue'
 
 const mainStore = useMainStore()
 const slidesStore = useSlidesStore()
@@ -127,7 +124,6 @@ const {
   updateSectionTitle,
 } = useSectionHandler()
 
-const activeRef = ref()
 
 // 页面被切换时
 const thumbnailsRef = ref<InstanceType<typeof Draggable>>()
@@ -151,8 +147,6 @@ watch(() => slideIndex.value, () => {
 
 // 切换页面
 const changeSlideIndex = (index: number) => {
-  console.log(workItem.value[index],'hasSection');
-  activeRef.value.clickPPTList(workItem.value[index])
   
   mainStore.setActiveElementIdList([])
 

src/renderer/src/AixPPTist/src/views/Editor/Toolbar/ElementStylePanel/Active/index.vue

@@ -37,13 +37,12 @@
                     <div class="item-title">
                         <el-tag :type="getTagType(item.worktype) || 'primary'">{{item.worktype}}</el-tag>
                         <el-tooltip :content="item.evaltitle" placement="top">
-                        <div class="tt">{{item.evaltitle}}</div>
+                            <div class="tt">{{item.evaltitle}}</div>
                         </el-tooltip>
                         <el-button class="btn-del" type="danger" link @click="handleRemoveDemoActivityClassWork(item)">删除</el-button>
                     </div>
                 </div>
             </template>
-            {{workList.length}}
         </div>
         <!-- // 推送作业 -->
         <el-dialog v-model="dialogVisible" append-to-body :show-close="false" width="80%" height="500">
@@ -58,8 +57,8 @@
             append-to-body
             :show-close="false"
             width="40%"
-            >
+        >
-            <el-table :data="taskList" style="width: 100%" height="500"  @selection-change="handleSelectionChange">
+            <el-table :data="taskList" style="width: 100%" height="500" @selection-change="handleSelectionChange">
                 <el-table-column type="selection" width="55" :selectable="selectable"/>
                 <el-table-column prop="evaltitle" label="活动名称" width="150" />
                 <el-table-column prop="worktype" label="活动类型" width="120" sortable>
@@ -71,183 +70,246 @@
             </el-table>
             <template #footer>
                 <el-button @click="activeVisible = false">取 消</el-button>
-                <el-button type="primary" @click="save">确 定</el-button>
+                <el-button type="primary" @click="savePPtData">确 定</el-button>
             </template>
         </el-dialog>
     </div>
 </template>
-<script setup>
+<script setup lang="ts">
-import { ref, reactive, onMounted, onBeforeMount, defineExpose,nextTick } from 'vue'
+import { ref, reactive, onMounted, nextTick, watch } from 'vue'
 import Divider from '../../../../../components/Divider.vue'
-import {listEntpcoursefile} from '@/api/education/entpcoursefile'
+import { listEntpcoursefile } from '@/api/education/entpcoursefile'
-import {homeworklist} from '@/api/teaching/classwork'
+import { homeworklist } from '@/api/teaching/classwork'
 import { processList } from "@/hooks/useProcessList";
 import { listEntpcoursework } from "@/api/classTask/index";
-import { ElMessageBox } from 'element-plus'
+import { ElMessageBox,ElMessage } from 'element-plus'
 import NewClassTsakAssign from '@/views/classTask/newClassTaskAssign/index.vue'
 import { sessionStore } from '@/utils/store'
 import { useGetHomework } from '@/hooks/useGetHomework'
-import { updateSlide } from '@/AixPPTist/src/api/index'
+import { PPTApi } from '../../../../../api/index'
-const currentCourse = reactive({
+import { storeToRefs } from 'pinia'
-    textbookId:0,
+import {useSlidesStore} from '../../../../../store'
-    levelFirstId:0,
+const slidesStore = useSlidesStore()
-    levelSecondId:0,
+const { slides, slideIndex, currentSlide, workItem } = storeToRefs(slidesStore)
-    coursetitle:'',
+
-    node:{},
+interface CourseNode {
-    id:1,
+    rootid: number;
-    worktype:'',
+    parentNode: { id: number };
+    id: number;
+    itemtitle: string;
+}
+
+interface CurrentCourse {
+    textbookId: number;
+    levelFirstId: number;
+    levelSecondId: number;
+    coursetitle: string;
+    node: CourseNode;
+    id: number;
+    worktype: string;
+}
+
+interface Params {
+    parentid: number;
+    pageSize: number;
+    orderby: string;
+}
+
+interface WorkType {
+    label: string;
+    value: string;
+}
+
+interface WorkItem {
+    status: string;
+    activityContent?: string;
+    worktype: string;
+    quizlist?: { id: number }[];
+    workcodes: string;
+    base64?: string;
+    prevData?: any;
+    id: number;
+    evaltitle?: string; // 添加 evaltitle 属性
+}
+
+const currentCourse = reactive<CurrentCourse>({
+    textbookId: 0,
+    levelFirstId: 0,
+    levelSecondId: 0,
+    coursetitle: '',
+    node: {} as CourseNode,
+    id: 1,
+    worktype: '',
 })
-const dataList = ref([])
+
-const dialogVisible = ref(false)
+const dataList = ref<WorkItem[]>([])
-const tasklist_loading = ref(false)
+const dialogVisible = ref<boolean>(false)
+const tasklist_loading = ref<boolean>(false)
+
 // 活动列表
-const taskList = ref([])
+const taskList = ref<WorkItem[]>([])
+
 // 活动引用的弹窗
-const activeVisible = ref(false)
+const activeVisible = ref<boolean>(false)
-const params = reactive({
+
-    parentid:14766,
+const params = reactive<Params>({
-    pageSize:500,
+    parentid: 14766,
-    orderby:'fileidx'
+    pageSize: 500,
+    orderby: 'fileidx'
 })
-const type = ref([
+
+const type = ref<WorkType[]>([
     {
-        label:'习题训练',
+        label: '习题训练',
-        value:'danger'
+        value: 'danger'
     },
     {
-        label:'课堂展示',
+        label: '课堂展示',
-        value:'success'
+        value: 'success'
     },
     {
-        label:'常规作业',
+        label: '常规作业',
-        value:'primary'
+        value: 'primary'
     },
 ])
+
+const objItem = ref<any>({})
 // 作业列表
-const workList = ref([])
+const workList = ref<WorkItem[]>([])
+
 // 获取所选择的作业列表
-const selectedWorkList = ref([])
+const selectedWorkList = ref<WorkItem[]>([])
-// 获取当前的活动ppt页面
+
-const currentPPT = ref({})
+
-const selectable=(row, index)=>{
+const paramData = ref<{ id: number, activityContent: string }>({} as { id: number, activityContent: string })
-    return row.status == '10';
+
+const selectable = (row: WorkItem, index: number): boolean => {
+    return row.status === '10';
 };
-const clickPPTList = (item) => {
+
-    console.log(item,'点击了')
+
-    console.log(item.id,'item');
+const formatClassWorkFile = async (postData: WorkItem[]): Promise<void> => {
-    return
+    for (let i = 0; i < postData.length; i++) {
-    workList.value = []
+        let item = postData[i];
-    let datacontent = item.datacontent;
+        switch (item.worktype) {
-    let pptJson = "";
+            case '框架梳理': {
-    if(typeof datacontent === 'string') pptJson = JSON.parse(datacontent)
+            }
-    if(pptJson&&pptJson.activityContent) {
+                break;
-        homeworklist({ids:pptJson.activityContent, pageSize: 100}).then( async res => {
+            case '习题训练': {
-            // await formatClassWorkFile(res.rows)
+                console.log(item,'item');
-            await nextTick();
+                // let workIds = item.quizlist!.map(items => items.id).join(',');
-            workList.value = [...res.rows]
+                // let ress = await listEntpcoursework({ ids: workIds });
-            console.log(workList.value,'workList.value');
+                // const arr = ress.rows.map((item:{id:number}) => {
-        })
+                //     return item.id
-    }
+                // })
-}
+                
-const formatClassWorkFile = async (postData) => {
+                // processList(ress.rows);
-    return new Promise(async (resolve, reject) => {
+            }
-        for (let i = 0; i < postData.length; i++) {
+                break;
-            let item = postData[i];
+            case '课堂展示': {
-            console.log("当前处理的元素:", item); // 新增这行，查看元素结构
+                // item.base64 = JSON.parse(item.workcodes).base64;
-            switch (item.worktype) {
+            }
-                case '框架梳理': {
+                break;
-                }
+            case '常规作业': {
-                    break;
+                // item.prevData = JSON.parse(item.workcodes);
-                case '习题训练': {
-                    let workIds = item.quizlist.map(items => items.id).join(',');
-                    let ress = await listEntpcoursework({ ids: workIds });
-                    processList(ress.rows);
-                }
-                    break;
-                case '课堂展示': {
-                    item.base64 = JSON.parse(item.workcodes).base64;
-                }
-                    break;
-                case '常规作业': {
-                    item.prevData = JSON.parse(item.workcodes);
-                }
             }
-            // console.log(workList.value, 'workList.value');
         }
-        await nextTick();
+        const arr = paramData.value.activityContent.split(',')
-        resolve();
+        arr.push(item.id.toString()) 
-    });
+        await PPTApi.updateSlide(paramData.value)
+        addWorkList(item)
+    }
+    await nextTick();
+}
+// 添加的活动回显到页面上面去
+const addWorkList = (item: WorkItem) => {
+    workList.value.push(item)
 }
 // 删除作业
-const handleRemoveDemoActivityClassWork = (item) => {
+const handleRemoveDemoActivityClassWork = (item: WorkItem) => {
     ElMessageBox.confirm('是否确认删除？')
-    .then(function () {
+        .then(() => {
-        workList.value.splice(workList.value.indexOf(item), 1);
+            workList.value.splice(workList.value.indexOf(item), 1);
-    })
+        })
-    .catch(() => {});
+        .catch(() => { });
 }
+
 // 获取tag的样式
-const getTagType = (worktype) => {
+const getTagType = (worktype: string): string => {
-    return type.value.find(item => item.label == worktype).value
+    return type.value.find(item => item.label === worktype)!.value
 }
+
 // 获取活动引用的列表数据
-const initHomeWork = async()=> {
+const initHomeWork = async () => {
-  tasklist_loading.value = true;
+    tasklist_loading.value = true;
-  const { res, chapterId } = await useGetHomework(sessionStore.get('subject.curNode'));
+    const { res, chapterId } = await useGetHomework(sessionStore.get('subject.curNode'));
-  console.log(res,'res');
+    taskList.value = res;
-  
+    tasklist_loading.value = false;
-  taskList.value = res;
-  tasklist_loading.value = false;
 }
+
 // 多选活动引用
-const handleSelectionChange = (val) => {
+const handleSelectionChange = (val: WorkItem[]) => {
-    console.log(val,'多选')
     selectedWorkList.value = [...val]
 }
+
 // 打开添加作业活动
-const showDialog = (item) => {
+const showDialog = (item: string) => {
     currentCourse.worktype = item
     dialogVisible.value = true
 }
+
 const openList = () => {
     activeVisible.value = true
     initHomeWork()
 }
+
 // 添加活动引用列表作业
-const save = async () => {
+const savePPtData = async () => {
-    console.log('添加了')
+    if (selectedWorkList.value.length === 0) {
-    if(!currentPPT.classWorkList){
+        ElMessage.warning('请选择活动')
-        currentPPT.classWorkList = [];
+        return
     }
-    const arr = selectedWorkList.value.map(item=>item.id)
+    const arr = selectedWorkList.value.map(item => item.id)
-    const classworkList = arr.join(',')
+    // 应该是新加而不是覆盖
-    // await formatClassWorkFile(selectedWorkList.value)
+    paramData.value.activityContent = arr.join(',')
-    updateSlide({activityContent:classworkList})
+    await PPTApi.updateSlide(paramData.value)
     activeVisible.value = false
 }
+
 onMounted(() => {
-    // console.log(sessionStore.get('subject.curBook'),'curBook');
+    const curNode = sessionStore.get('subject.curNode') as CourseNode
-    // console.log(sessionStore.get('subject.subjectTree'),'subjectTree');
-    // console.log(sessionStore.get('subject.bookList'),'bookList');
-    console.log(sessionStore.get('subject.curNode'),'curNode');
-    const curNode = sessionStore.get('subject.curNode')
     currentCourse.textbookId = curNode.rootid
     currentCourse.levelFirstId = curNode.parentNode.id
     currentCourse.levelSecondId = curNode.id
-    currentCourse.coursetitle = curNode.itemtitle,
+    currentCourse.coursetitle = curNode.itemtitle
     currentCourse.node = curNode
-    listEntpcoursefile(params).then((res) => {
+    listEntpcoursefile(params).then((res: { rows: WorkItem[] }) => {
         dataList.value = [...res.rows]
     })
+    objItem.value = workItem.value[slideIndex.value]
+    getCurrentPPtData()
 })
+watch(() => slideIndex.value, () => {
+    getCurrentPPtData()
+})
+// 获取当前ppt页的数据
+const getCurrentPPtData = async () => {
+    workList.value = []
+    objItem.value = workItem.value[slideIndex.value]
+    paramData.value.id =  objItem.value.id
+    if (objItem.value?.activityContent) {
+        paramData.value.activityContent = objItem.value?.activityContent
+        const res = await homeworklist({ ids: objItem.value?.activityContent, pageSize: 100 })
+        await formatClassWorkFile(res.rows)
+    }
+}
+
 // 接收习题训练的值
-const getData = async (data) => {
+const getData = async (data: WorkItem) => {
-    console.log(data,'data')
+    console.log(data, 'data')
     await formatClassWorkFile([data])
 }
-defineExpose({
+
-    clickPPTList
-})
 </script>
 <style scoped lang="scss">
 .buttonDiv{

src/renderer/src/views/classTask/newClassTaskAssign/index.vue

@@ -461,11 +461,8 @@ const handleClassWorkFormQuizRemove = (index) =>{
   await nextTick(); // 确保DOM更新完成
   proxy.$refs["classWorkFormRef"].validate(async valid => {
     if (valid) {
-      if(!isShow.value){
-//
       // const { chapterId } = await useGetHomework(courseObj.node)
       // this.entpcourseid = chapterId
-      debugger
       const cform = {
         id: 0,
         workdate: classWorkForm.workdate, // //作业类型？web端这里貌似没有这个时间
@@ -509,7 +506,7 @@ const handleClassWorkFormQuizRemove = (index) =>{
         cform.workcodes = JSON.stringify({json: canvasJson, base64: canvasBase64});
         cform.entpcourseworklist = JSON.stringify([{'id':-1, 'score': '10'}]);
         try {
-          addClassworkReturnId(cform).then(() => {
+          addClassworkReturnId(cform).then((res) => {
             ElMessage({ type: 'success', message: '作业设计成功!'});
             // 重置提交表单
             classWorkForm.worktype = "课堂展示";
@@ -521,7 +518,8 @@ const handleClassWorkFormQuizRemove = (index) =>{
             // 情况选择的资源缓存
             classWorkForm.chooseWorkLists = []; // 框架梳理list
             classWorkForm.whiteboardObj = ''; // ? // 清空白板
-
+            classWorkForm.id = res
+            emits('getData',classWorkForm)
             boardLoading.value = false
           })
         } finally {
@@ -533,7 +531,7 @@ const handleClassWorkFormQuizRemove = (index) =>{
         cform.workcodes = JSON.stringify(classWorkForm.fileHomeworkList);
         cform.entpcourseworklist = JSON.stringify([{'id':-2, 'score': '10'}]);
         try {
-          addClassworkReturnId(cform).then(() => {
+          addClassworkReturnId(cform).then((res) => {
             ElMessage({ type: 'success', message: '作业设计成功!'});
             // 重置提交表单
             classWorkForm.worktype = "常规作业";
@@ -545,7 +543,8 @@ const handleClassWorkFormQuizRemove = (index) =>{
             classWorkForm.chooseWorkLists = []; // 框架梳理list
             classWorkForm.whiteboardObj = ''; // ? // 清空白板
             classWorkForm.fileHomeworkList = []; // 常规作业list
-
+            classWorkForm.id = res
+            emits('getData',classWorkForm)
             fileLoading.value = false
           })
         } finally {
@@ -576,7 +575,7 @@ const handleClassWorkFormQuizRemove = (index) =>{
         console.log(cform,'提交的数据');
         if(cform.entpcourseworklist == '') return ElMessage({ type: 'warning', message: '请先添加作业资源!'});
 
-        addClassworkReturnId(cform).then(workres => {
+        addClassworkReturnId(cform).then(res => {
           ElMessage({ type: 'success', message: '作业设计成功!'});
           // 重置提交表单
           classWorkForm.worktype = "习题训练";
@@ -587,6 +586,8 @@ const handleClassWorkFormQuizRemove = (index) =>{
           // 情况选择的资源缓存
           classWorkForm.chooseWorkLists = [];
           classWorkForm.whiteboardObj = ''; // ? // 清空白板
+          classWorkForm.id = res
+          emits('getData',classWorkForm)
           // refresh the list
           //这里分离了，所以不需要更新表单数据了
           // this.getClassWorkAllList();
@@ -606,10 +607,7 @@ const handleClassWorkFormQuizRemove = (index) =>{
       //   // 首页进入的，跳转到作业布置页面
       //   router.push({ path: '/classTaskAssign' });
       // }
-      }else{
+
-        console.log(11111);
-        emits('getData',classWorkForm)
-      }
     }
   });
 };