.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 = 'true'
+VITE_SHOW_DEV_TOOLS = 'false'

package.json

@@ -1,6 +1,6 @@
 {
   "name": "aix-win-ws",
-  "version": "2.5.5",
+  "version": "2.5.4",
   "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/components/choose-textbook/index.vue

@@ -1,8 +1,7 @@
 <template>
   <div class="book-wrap">
     <el-scrollbar height="100%">
-      <div class="book-name flex" v-if="isStadium() === true"> {{userStore.user.deptName}}</div>
+      <div class="book-name flex" @click="dialogVisible = true">
-      <div v-else class="book-name flex" @click="dialogVisible = true">
         <span>{{ curBook.data.itemtitle }}</span>
         <i class="iconfont icon-xiangyou"></i>
       </div>
@@ -47,14 +46,8 @@ 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
@@ -188,11 +181,7 @@ 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,11 +204,7 @@ 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,17 +17,6 @@ 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')
     }
@@ -45,11 +34,6 @@ export const useGetSubject = async () =>{
     }
     await getSubject()
   }
-  }
-  const isStadium = (user) => {
-    let roles = user.roles
-    return  roles.some(item => item.roleKey === 'stadium')
-  }
 
   // 根据学科 + 学段 获取教材
   const getSubject = async () =>{
@@ -84,9 +68,6 @@ 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 v-if="!isStadium" :class="computedregistertype==1 || computedregistertype==3?'auth-li':'auth-li pointer-events'" @click="onUserTo('/schoolCertification')"  >
+              <li  :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 v-if="!isStadium" @click="onUserTo('/schoolManagement')">学校管理</li>
+              <li @click="onUserTo('/schoolManagement')">学校管理</li>
-              <li v-if="!isStadium" @click="onUserTo('/class')">班级中心</li>
+              <li @click="onUserTo('/class')">班级中心</li>
               <li @click="logout">退出登录</li>
             </ul>
           </div>
@@ -53,7 +53,7 @@
 </template>
 
 <script setup>
-import { ref, watch , reactive, onMounted, onBeforeMount, computed} from 'vue'
+import { ref, watch , reactive, onMounted,computed} from 'vue'
 import { useRouter } from 'vue-router'
 import { ElMessageBox, ElMessage } from 'element-plus'
 import useUserStore from '@/store/modules/user'
@@ -64,7 +64,6 @@ 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')
@@ -75,19 +74,7 @@ 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,7 +16,6 @@ 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) // 渲染进程日志-控制台替换
@@ -48,16 +47,3 @@ 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: '/model/index',
+    redirect: '/desktop',
     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 || isStadium(userStore.user)) {
+        if (userStore.user.edustage || userStore.user.edusubject) {
           ElMessage.success('登录成功')
           ipcRenderer && ipcRenderer.send('openMainWindow')
         } else {
@@ -244,11 +244,6 @@ 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,20 +18,7 @@
         <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
@@ -72,7 +59,6 @@
       </div>
     </div>
   </el-row>
-  <progress-dialog v-model:visible="pgDialog.visible" v-bind="pgDialog" />
 </template>
 
 <script setup>
@@ -84,20 +70,14 @@ 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 {ArrowDown, Flag, Position} from '@element-plus/icons-vue'
+import {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({})
@@ -232,153 +212,6 @@ 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)
@@ -386,6 +219,7 @@ 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,6 +1127,7 @@ export default {
     background-color: white;
     position: relative;
     .prepare-center-dropdown{
+      z-index: 9999;
       position: absolute;
       right: 10px;
       top: 4px;