fix：修改pptlist添加活动的bug；

Reviewed-on: #117

.env.production

@@ -22,4 +22,4 @@ VITE_APP_BUILD_BASE_PATH = 'https://prev.ysaix.com:7868/'
 VITE_APP_WS_URL = 'wss://file.ysaix.com:7868'
 
 # 是否显示开发工具
-VITE_SHOW_DEV_TOOLS = 'false'
+VITE_SHOW_DEV_TOOLS = 'true'

package.json

@@ -1,6 +1,6 @@
 {
   "name": "aix-win-ws",
-  "version": "2.5.4",
+  "version": "2.5.5",
   "description": "",
   "main": "./out/main/index.js",
   "author": "上海交大重庆人工智能研究院",

src/renderer/src/AixPPTist/src/App.vue

@@ -39,8 +39,8 @@ const slidesStore = useSlidesStore()
 const { databaseId } = storeToRefs(mainStore)
 const { screening } = storeToRefs(useScreenStore())
 
-if (import.meta.env.MODE !== 'development') {
+if (import.meta.env.MODE === 'development') {
-  window.onbeforeunload = () => false
+  // window.onbeforeunload = () => false
 }
 
 onMounted(async () => {

src/renderer/src/AixPPTist/src/api/index.ts

@@ -110,6 +110,9 @@ export class PPTApi {
       const rid = await API_entpcoursefile.addEntpcoursefileReturnId(params)
       if (!!rid) {
         data.id = rid
+        params.id = rid
+        params.activityContent = null
+        slidesStore.addWorkItem(params)
         slidesStore.updateSlide(data)
         // msgUtils.msgSuccess('新增成功')
         this.isUpdate = false // 新增后会触发监听，不再更新数据
@@ -148,8 +151,6 @@ export class PPTApi {
   static updateSlide(data: object): Promise<Boolean> {
     return new Promise(async (resolve, reject) => {
       const res: Result = await API_entpcoursefile.updateEntpcoursefileNew(data)
-      console.log(data,'data');
-      console.log(res,'dresata');
       if (res.code === 200) {
         resolve(true)
       } else msgUtils.msgError(res.msg || '更新失败');resolve(false)

src/renderer/src/AixPPTist/src/store/slides.ts

@@ -146,45 +146,18 @@ export const useSlidesStore = defineStore('slides', {
       this.workItem = list
     },
     addWorkItem(data: any) {
-      const id = data?.parentid
+      const id = data?.id
       if (!id) return
-      this.workItem.splice(this.slideIndex, 0, data)
+      this.workItem.splice(this.slideIndex + 1, 0, data)
+      this.slideIndex += 1
     },
   
     addSlide(slide: Slide | Slide[]) {
-      const resource = sessionStore.get('curr.resource')||{}
-      const enpt = sessionStore.get('curr.entp')||{}
-      const {id, ...content} = slide
-      const params = {
-        parentid: resource.id,
-        activityContent:null,
-        entpid: userStore.user.deptId,
-        entpcourseid: enpt.id,
-        ppttype: 'file',
-        title: '',
-        fileurl: '',
-        filetype: 'slide',
-        datacontent: JSON.stringify(content),
-        filekey: '',
-        filetag: '',
-        fileidx: 0,
-        dflag: 0,
-        status: '',
-        edituserid: userStore.id,
-      }
       const slides = Array.isArray(slide) ? slide : [slide]
       for (const slide of slides) {
         if (slide.sectionTag) delete slide.sectionTag
       }
-      API_entpcoursefile.addEntpcoursefileReturnId(params).then((rid:number) => {
+      this.slides.splice(this.slideIndex, 0, ...slides)
-        if(!!rid){
-          params.id = rid
-          this.addWorkItem(params)
-          const addIndex = this.slideIndex + 1
-          this.slides.splice(addIndex, 0, ...slides)
-          this.slideIndex = addIndex
-        }
-      })
     },
   
     updateSlide(props: Partial<Slide>, slideId?: string) {

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

@@ -91,6 +91,7 @@ import { useGetHomework } from '@/hooks/useGetHomework'
 import { PPTApi } from '../../../../../api/index'
 import { storeToRefs } from 'pinia'
 import {useSlidesStore} from '../../../../../store' 
+import { updateEntpcoursefileNew } from '@/api/education/entpcoursefile'
 const slidesStore = useSlidesStore()
 const { slides, slideIndex, currentSlide, workItem } = storeToRefs(slidesStore)
 
@@ -277,7 +278,6 @@ const getCurrentPPtData = async () => {
     workList.value = []
     objItem.value = workItem.value[slideIndex.value]
     paramData.value.id =  objItem.value.id
-    console.log(paramData.value.id,'paramData.value.id');
     
     paramData.value.activityContent = objItem.value?.activityContent
     if (objItem.value?.activityContent) {
@@ -302,15 +302,16 @@ const getData = async (data: WorkItem) => {
     dialogVisible.value = false
 }
 const upDateData = async () => {
-    await PPTApi.updateSlide(paramData.value)
+    // await PPTApi.updateSlide(paramData.value)
     loadingActive.value = true
+    await updateEntpcoursefileNew(paramData.value)
     const res = await homeworklist({ ids: paramData.value.activityContent, pageSize: 100 })
     await formatClassWorkFile(res.rows)
     const resource = sessionStore.get('curr.resource')
     await PPTApi.getSlideList(resource.id)
 }
 // 判断是否做操作
-const objectsAreEqual = (obj1: any[], obj2: any[]) => {
+const objectsAreEqual = (obj1: Record<string, any>, obj2: Record<string, any>) => {
     const keys1 = Object.keys(obj1);
     const keys2 = Object.keys(obj2);
     if (keys1.length !== keys2.length) return false;

src/renderer/src/AixPPTist/src/views/Screen/BaseView.vue

@@ -36,7 +36,7 @@
     </div>
     <!-- 点赞组件 -->
     <div style="z-index: 999;position: absolute;top:10px">
-      <upvote-vue ref="upvoteRef" :test='true' type="2"></upvote-vue>
+      <upvote-vue ref="upvoteRef"  type="2"></upvote-vue>
     </div>
     <div 
       class="tools-right" :class="{ 'visible': rightToolsVisible }" 
@@ -73,6 +73,8 @@ import SlideThumbnails from './SlideThumbnails.vue'
 import WritingBoardTool from './WritingBoardTool.vue'
 import CountdownTimer from './CountdownTimer.vue'
 import upvoteVue from '@/views/tool/components/upvote.vue' // 点赞-子组件
+import emitter from '@/utils/mitt';
+
 const props = defineProps<{
   changeViewMode: (mode: 'base' | 'presenter') => void
 }>()
@@ -191,13 +193,11 @@ const contextmenus = (): ContextmenuItem[] => {
     },
   ]
 }
+// 打开点赞或者疑问 1点赞 2疑问
+emitter.on('upvoteTrigger', (type) => {
+  upvoteRef.value?.trigger(type)
+});
 
-watchEffect(() => {
-  const likeCont = screenStore.like // 点赞
-  const doubtCount = screenStore.doubt // 疑问
-  if (likeCont > 0) upvoteRef.value?.trigger?.(1)
-  if (doubtCount > 0) upvoteRef.value?.trigger?.(2)
-})
 
 </script>
 

src/renderer/src/components/choose-textbook/index.vue

@@ -1,7 +1,8 @@
 <template>
   <div class="book-wrap">
     <el-scrollbar height="100%">
-      <div class="book-name flex" @click="dialogVisible = true">
+      <div class="book-name flex" v-if="isStadium() === true"> {{userStore.user.deptName}}</div>
+      <div v-else class="book-name flex" @click="dialogVisible = true">
         <span>{{ curBook.data.itemtitle }}</span>
         <i class="iconfont icon-xiangyou"></i>
       </div>
@@ -46,8 +47,14 @@ import { onMounted, ref, nextTick, toRaw, reactive } from 'vue';
 import { cloneDeep } from 'lodash'
 import { sessionStore } from '@/utils/store'
 import { useGetSubject } from '@/hooks/useGetSubject'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 
 const BaseUrl = import.meta.env.VITE_APP_BUILD_BASE_PATH
+const isStadium = () => {
+  let roles = userStore.user.roles
+  return  roles.some(item => item.roleKey === 'stadium')
+}
 // 定义要发送的emit事件
 const emit = defineEmits(['nodeClick', 'changeBook'])
 let useSubject = null
@@ -181,7 +188,11 @@ onMounted( async () => {
       curBook.data = sessionStore.get('subject.curBook')
     }
     else{
+      if (subjectList.value) {
         curBook.data = subjectList.value[0]
+      }else {
+        curBook.data = {}
+      }
     }
 
     // 章节"树"

src/renderer/src/components/move-file/index.vue

@@ -204,7 +204,11 @@ onMounted(async () => {
     curBook.data = sessionStore.get('subject.curBook')
   }
   else{
+    if (subjectList.value) {
       curBook.data = subjectList.value[0]
+    }else {
+      curBook.data = {}
+    }
   }
 
   // 章节"树"

src/renderer/src/hooks/useGetSubject.js

@@ -17,6 +17,17 @@ export const useGetSubject = async () =>{
 
   // 根据学科 + 学段 获取所有单元章节
   const getSubjectUnit = async () =>{
+    if(isStadium(userStore.user)) {
+      //如果是基地人员，直接拿treeData
+      const unitParams = {
+        itemgroup: '基地课程',
+        orderby: 'orderidx asc',
+        entpid: userStore.user.deptId,
+        pageSize: 10000
+      }
+      const { rows } = await listEvaluation(unitParams)
+      unitList.value = rows
+    }else{
       if(sessionStore.get('subject.unitList')){
         unitList.value = sessionStore.get('subject.unitList')
       }
@@ -34,6 +45,11 @@ export const useGetSubject = async () =>{
       }
       await getSubject()
     }
+  }
+  const isStadium = (user) => {
+    let roles = user.roles
+    return  roles.some(item => item.roleKey === 'stadium')
+  }
 
   // 根据学科 + 学段 获取教材
   const getSubject = async () =>{
@@ -68,6 +84,9 @@ export const useGetSubject = async () =>{
 
   // 单元章节数据转为“树”结构
   const getTreeData = (bookId) =>{
+    if (!bookId) {
+      return unitList.value
+    }
     // 根据当前教材的id 查找出对应的章节
     let data = unitList.value.filter(item => item.rootid == bookId && item.level == 1)
     data.forEach( item => {

src/renderer/src/layout/components/Aside.vue

@@ -11,7 +11,7 @@
           </template>
           <div class="head-aside">
             <ul >
-              <li  :class="computedregistertype==1 || computedregistertype==3?'auth-li':'auth-li pointer-events'" @click="onUserTo('/schoolCertification')"  >
+              <li v-if="!isStadium" :class="computedregistertype==1 || computedregistertype==3?'auth-li':'auth-li pointer-events'" @click="onUserTo('/schoolCertification')"  >
                 <i class="iconfont icon-renzheng-" :style="computedregistertype==4?'color:green;':''"></i>
                 <span class="mlr-5"  v-if="computedregistertype!=4">学校认证</span>
                 <span class="mlr-5" v-else>{{ userStore.DeptInfo.register.schoolName }}</span>
@@ -19,8 +19,8 @@
               </li>
               <li v-if="computedregistertype!=4" :class="computedregistertype==1 || computedregistertype==2 ? '':'pointer-events'" @click="onUserTo('/joinSchool')">加入学校</li>
               <li @click="onUserTo('/profile')">个人中心</li>
-              <li @click="onUserTo('/schoolManagement')">学校管理</li>
+              <li v-if="!isStadium" @click="onUserTo('/schoolManagement')">学校管理</li>
-              <li @click="onUserTo('/class')">班级中心</li>
+              <li v-if="!isStadium" @click="onUserTo('/class')">班级中心</li>
               <li @click="logout">退出登录</li>
             </ul>
           </div>
@@ -53,7 +53,7 @@
 </template>
 
 <script setup>
-import { ref, watch , reactive, onMounted,computed} from 'vue'
+import { ref, watch , reactive, onMounted, onBeforeMount, computed} from 'vue'
 import { useRouter } from 'vue-router'
 import { ElMessageBox, ElMessage } from 'element-plus'
 import useUserStore from '@/store/modules/user'
@@ -64,6 +64,7 @@ import pkc from "../../../../../package.json"
 const { ipcRenderer } = window.electron || {}
 const dev_api = ref(import.meta.env.VITE_APP_BASE_API)
 const userStore = useUserStore()
+console.log(userStore)
 const router = useRouter()
 const currentRoute = ref('')
 const activeId = ref('/home')
@@ -74,7 +75,19 @@ const version = ref(pkc.version)
 
 const popoverRef = ref('')
 
-const headerMenus = [
+//是否是基地人员
+const isStadium = () => {
+  let user = userStore.user
+  let roles = user.roles
+  return  roles.some(item => item.roleKey === 'stadium')
+}
+
+const headerMenus = isStadium() ?[{
+    name: '教学实践',
+    id: 4,
+    icon: 'icon-jiaoxueshijian',
+    path: '/prepare'
+  },]:[
   {
     name: '教学大模型',
     id: 1,

src/renderer/src/main.js

@@ -16,6 +16,7 @@ import router from './router'
 import log from 'electron-log/renderer' // 渲染进程日志-文件记录
 import customComponent from '@/components/common' // 自定义组件
 import plugins from './plugins' // plugins插件
+import useUserStore from '@/store/modules/user'
 
 if(process.env.NODE_ENV != 'development') { // 非开发环境，将日志打印到日志文件
   Object.assign(console, log.functions) // 渲染进程日志-控制台替换
@@ -47,3 +48,16 @@ app.use(router)
     .use(Icon)
     .use(Directive)
     .mount('#app')
+
+const isStadium = (user) => {
+  let roles = user.roles
+  return  roles.some(item => item.roleKey === 'stadium')
+}
+
+router.beforeEach((to, from, next) => {
+  if (to.path === '/model/index') {
+    isStadium(useUserStore().user) === true ? next('/prepare') :next()
+  }else {
+    next()
+  }
+})

src/renderer/src/router/index.js

@@ -101,7 +101,7 @@ const dynamicRoutes = [
   {
     path: '/',
     component: Layout,
-    redirect: '/desktop',
+    redirect: '/model/index',
     meta: { title: '教学工作台' },
     children: [
       {

src/renderer/src/views/login/index.vue

@@ -231,7 +231,7 @@ const submitForm = async (formEl) => {
       try {
         await userStore.login(loginForm)
         await userStore.getInfo()
-        if (userStore.user.edustage || userStore.user.edusubject) {
+        if (userStore.user.edustage || userStore.user.edusubject || isStadium(userStore.user)) {
           ElMessage.success('登录成功')
           ipcRenderer && ipcRenderer.send('openMainWindow')
         } else {
@@ -244,6 +244,11 @@ const submitForm = async (formEl) => {
   })
 }
 
+const isStadium = (user) => {
+  let roles = user.roles
+  return  roles.some(item => item.roleKey === 'stadium')
+}
+
 const getCookie = async () => {
   const username = (await getCookieDetail('username'))[0]
   const password = (await getCookieDetail('password'))[0]

src/renderer/src/views/model/index.vue

@@ -18,7 +18,20 @@
         <div class="content-body-left">
           <div class="content-body-left-title">
             文枢课件
-            <el-button class="add-btn" size="small" type="primary" @click="createAIPPT">新建</el-button>
+<!--            <el-button class="add-btn" size="small" type="primary" @click="createAIPPT">新建</el-button>-->
+            <el-dropdown class="prepare-center-dropdown add-btn">
+              <el-button type="primary">
+                新建<el-icon class="el-icon--right"><arrow-down /></el-icon>
+              </el-button>
+              <template #dropdown>
+                <el-dropdown-menu>
+                  <el-dropdown-item @click="createAIPPT">新建文枢课件</el-dropdown-item>
+                  <el-dropdown-item @click="router.push({path: '/model/design'})">AI一键生成</el-dropdown-item>
+                  <el-dropdown-item @click="openFilePicker">导入PPT</el-dropdown-item>
+                  <input type="file" ref="fileInput" style="display: none;" @change="handleFileChange" accept="application/vnd.ms-powerpoint,application/vnd.openxmlformats-officedocument.presentationml.presentation">
+                </el-dropdown-menu>
+              </template>
+            </el-dropdown>
           </div>
           <div class="content-body-left-body">
             <kj-list-item
@@ -59,6 +72,7 @@
       </div>
     </div>
   </el-row>
+  <progress-dialog v-model:visible="pgDialog.visible" v-bind="pgDialog" />
 </template>
 
 <script setup>
@@ -70,14 +84,20 @@ import ChooseTextbook from '@/components/choose-textbook/index.vue'
 import KjListItem from '@/views/prepare/container/kj-list-item.vue'
 import FileImage from '@/components/file-image/index.vue'
 import {creatAPT, getSmarttalkPage} from '@/api/file'
-import {Flag, Position} from '@element-plus/icons-vue'
+import {ArrowDown, Flag, Position} from '@element-plus/icons-vue'
 import {asyncLocalFile, parseCataByNode} from "@/utils/talkFile";
 import { dataSetJson } from '@/utils/comm' // 数据集id文生图
 import { sessionStore } from '@/utils/store'
 import {listEntpcourse} from "@/api/teaching/classwork";
 import {addEntpcoursefileReturnId, getEntpcoursefile} from "@/api/education/entpcoursefile";
 import {createWindow, ipcMsgSend} from "@/utils/tool";
-import {ElMessage} from "element-plus"; // 学科名字文生图
+import {ElMessage} from "element-plus";
+import {PPTXFileToJson} from "@/AixPPTist/src/hooks/useImport";
+import * as API_entpcoursefile from "@/api/education/entpcoursefile";
+import progressDialog from '@/views/teachingDesign/container/progress-dialog.vue'
+import msgUtils from "@/plugins/modal";
+import * as commUtils from "@/utils/comm";
+import * as Api_server from "@/api/apiService"; // 学科名字文生图
 const router = useRouter()
 const userStore = useUserStore().user // 用户信息
 const currentNode = ref({})
@@ -212,6 +232,153 @@ const createAIPPT = () => {
   })
 }
 
+const pgDialog = ref({ // 弹窗-进度条
+  visible: false,
+  title: 'PPT解析中...',
+  width: 300,
+  showClose: false,
+  draggable: true,
+  beforeClose: done => {}, // 阻止-弹窗事件
+  pg: { // 进度条-参数
+    percentage: 0, // 百分比
+    color: [
+      { color: '#1989fa', percentage: 50 }, // 蓝色
+      { color: '#e6a23c', percentage: 80 }, // 橙色
+      { color: '#5cb87a', percentage: 100 }, // 绿色
+    ]
+  }
+})
+
+const fileInput = ref(null)
+
+const openFilePicker = () =>{
+  fileInput.value.click();
+}
+
+const handleFileChange = ()=> {
+  const file = event.target.files[0];
+  if (file) {
+    console.log(file);
+    createAIPPTByFile(file)
+  }
+}
+
+const createAIPPTByFile = async (file)=> {
+  pgDialog.value.visible = true
+  pgDialog.value.pg.percentage = 0
+  const resPptJson = await PPTXFileToJson(file)
+  const { def, slides, ...content } = resPptJson
+  // 转换图片|音频|视频 为线上地址
+  let completed = 0
+  const total = slides.length
+  for( let o of slides ) {
+    completed++
+    await toRousrceUrl(o)
+    // 设置进度条
+    pgDialog.value.pg.percentage = Math.floor(completed / total * 100)
+  }
+  pgDialog.value.pg.percentage = 0
+  pgDialog.value.visible = false
+  listEntpcourse({
+    evalid: currentNode.value.id,
+    edituserid: userStore.userId,
+    pageSize: 500
+  }).then((response) => {
+    if (response.rows.length <= 0) return
+    let resCourse = response.rows[0]
+    // 添加
+    let form = {
+      parentid: 0,
+      entpid: userStore.deptId,
+      entpcourseid: resCourse.id,
+      ppttype: 'file',
+      title: resCourse.coursetitle,
+      fileurl: '',
+      filetype: 'aippt',
+      datacontent: '',
+      parentContent: JSON.stringify(content),
+      filekey: '',
+      filetag: '',
+      fileidx: 0,
+      dflag: 0,
+      status: '',
+      edituserid: userStore.userId
+    }
+    addEntpcoursefileReturnId(form).then((slideid) => {
+      creatAPT({
+        ...uploadData.value,
+        fileId: slideid,
+        fileFlag: 'aippt',
+        fileShowName: currentNode.value.itemtitle + '.aippt'
+      }).then(async (res) => {
+
+        const resSlides = slides.map(({id, ...slide}) => JSON.stringify(slide))
+        let params = {
+          parentid: slideid,
+          entpid: resCourse.entpid,
+          entpcourseid: resCourse.id,
+          title: '',
+          filetype: 'slide',
+          slides: resSlides,
+          edituserid: userStore.userId
+        }
+        const res_3 = await API_entpcoursefile.batchAddNew(params)
+        if (res_3 && res_3.code == 200) {
+          msgUtils.msgSuccess('导入PPT课件成功')
+          currentFileList.value.unshift(res.resData)
+          await nextTick();
+          refs.value['kjItemRef'+res.resData.id].openFileWin(res.resData);
+        } else {
+          msgUtils.msgWarning('导入PPT课件失败')
+        }
+      })
+    })
+  })
+}
+
+const toRousrceUrl = async (o) => {
+  if (!!o.src) { // 如果有src就转换
+    const isBase64 = /^data:image\/(\w+);base64,/.test(o.src)
+    const isBlobUrl = /^blob:/.test(o.src)
+    // console.log('isBase64', o, isBase64)
+    if (isBase64) {
+      const bolb = commUtils.base64ToBlob(o.src)
+      const fileName = Date.now() + '.png'
+      const file = commUtils.blobToFile(bolb, fileName)
+      // o.src = fileName
+      // console.log('file', file)
+      const formData = new FormData()
+      formData.append('file', file)
+      const res = await Api_server.Other.uploadFile(formData)
+      if (res && res.code == 200){
+        const url = res?.url
+        url &&(o.src = url)
+      }
+    } else if (isBlobUrl) { // 视频和音频
+      const res = await fetch(o.src)
+      const blob = await res.blob()
+      const fileName = o.type=='video'? Date.now() + '.mp4':Date.now() + '.mp3'
+      const file = commUtils.blobToFile(blob, fileName)
+      // o.src = fileName
+      // console.log('file', file)
+      const formData = new FormData()
+      formData.append('file', file)
+      const ress = await Api_server.Other.uploadFile(formData)
+      if (ress && ress.code == 200){
+        const url = ress?.url
+        url &&(o.src = url)
+      }
+    }
+  }
+
+  if (o?.background?.image) await toRousrceUrl(o.background.image)
+  if(o?.elements){
+    for (let element of o.elements) {
+      await toRousrceUrl(element);
+    }
+  }
+}
+
 const deleteTalk = (item) => {
   let index = currentFileList.value.indexOf(item)
   currentFileList.value.splice(index, 1)
@@ -219,7 +386,6 @@ const deleteTalk = (item) => {
 
 // 教材选中
 const changeBook = async(data) => {
-  console.log(data)
   let cata = parseCataByNode(data.node)
   currentNode.value = data.node
   uploadData.value.levelFirstId = cata[0]

src/renderer/src/views/prepare/index.vue

@@ -1127,7 +1127,6 @@ export default {
     background-color: white;
     position: relative;
     .prepare-center-dropdown{
-      z-index: 9999;
       position: absolute;
       right: 10px;
       top: 4px;