Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zdg_dev

# Conflicts:
#	src/renderer/src/views/prepare/container/class-start.vue

env.d.ts

@@ -0,0 +1,5 @@
+declare module '*.vue' {
+  import { ComponentOptions } from 'vue'
+  const componentOptions: ComponentOptions
+  export default componentOptions
+}

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

@@ -82,5 +82,8 @@ const initLoad: Function = () => {
 <style lang="scss">
 #app {
   height: 100%;
+  svg, canvas, img, audio, video, iframe {
+    display: unset;
+  }
 }
-</style>
+</style>

src/renderer/src/AixPPTist/src/plugins/icon.ts

@@ -125,7 +125,8 @@ import {
   User,
   Switch,
   More,
-  Material
+  Material,
+  AddPicture
 } from '@icon-park/vue-next'
 
 export interface Icons {
@@ -256,7 +257,8 @@ export const icons: Icons = {
   IconUser: User,
   IconSwitch: Switch,
   IconMore: More,
-  IconMaterial: Material
+  IconMaterial: Material,
+  IconAddPicture: AddPicture
 }
 
 export default {

src/renderer/src/AixPPTist/src/views/Editor/CanvasTool/MaterialDialog.vue

@@ -11,6 +11,7 @@
       </div>
       <el-button type="primary" @click="onInsert(item)">插入</el-button>
     </div>
+    <el-empty description="暂无素材" v-if="!list.length" />
   </div>
 </template>
 
@@ -93,11 +94,9 @@ const GetUrlParameters = (parameters) => {
       }
     }
   }
-
   return resData;
 }
 
-
 const proxyToBase64 = (url)=> {
   const dourl = GetUrlParameters(url)
   console.log(dourl,'dourl')

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

@@ -83,6 +83,7 @@
       </Popover>
       <IconPreviewOpen class="handler-item" v-tooltip="'插入试题'" @click="classWorkTaskVisible = true" />
       <IconMaterial class="handler-item" v-tooltip="'插入素材'" @click="materiaVisible = true"/>
+      <IconAddPicture class="handler-item" v-tooltip="'文生图'" @click="imgVisible = true" />
     </div>
 
     <div class="right-handler">
@@ -121,14 +122,18 @@
         @update="data => { onhtml2canvas(data); classWorkTaskVisible = false }"
       />
     </el-dialog>
-
+    <!--插入素材-->
     <Modal
     v-model:visible="materiaVisible" 
     :width="880">
       <MaterialDialog  @close="materiaVisible = false" @insertMaterial="insertMaterial"/>
     </Modal>
- 
+    <!--文生图-->
-
+    <Modal
+    v-model:visible="imgVisible" 
+    :width="1300">
+      <TextCreateImg hasPPt @insertImg="(url: string) => { createImageElement(url); imgVisible = false }" />
+    </Modal>
   </div>
 </template>
 
@@ -156,6 +161,7 @@ import Popover from '../../../components/Popover.vue'
 import PopoverMenuItem from '../../../components/PopoverMenuItem.vue'
 import QuestToPPTist from '@/views/classTask/newClassTaskAssign/questToPPTist/index.vue'
 import MaterialDialog from './MaterialDialog.vue'
+import TextCreateImg from '@/components/ai-kolors/index.vue'
 
 const mainStore = useMainStore()
 const { creatingElement, creatingCustomShape, showSelectPanel, showSearchPanel, showNotesPanel } = storeToRefs(mainStore)
@@ -269,8 +275,10 @@ const insertMaterial = (item: MaterialParams) =>{
     createImageElement(data)
   }
   materiaVisible.value = false
-
 }
+
+// 文生图
+const imgVisible = ref(false)
 </script>
 
 <style lang="scss" scoped>

src/renderer/src/AixPPTist/src/views/components/element/ImageElement/ImageClipHandler.vue

@@ -154,15 +154,13 @@ const topImgWrapperPositionStyle = computed(() => {
 const topImgPositionStyle = computed(() => {
   const bottomWidth = imgPosition.value.width
   const bottomHeight = imgPosition.value.height
-  console.log("底层图片位置大小（遮罩区域图片）", imgPosition.value)
   
   const { top, left, width, height } = topImgWrapperPosition.value
-  console.log("width", ((bottomWidth / width * 100) - (left * (100 / width))) + '%')
+  
-  console.log("height", bottomHeight / height * 100 + '%')
   return {
     left: -left * (100 / width) + '%',
     top: -top * (100 / height) + '%',
-    width: ((bottomWidth / width * 100) - (left * (100 / width))) + '%' ,
+    width: bottomWidth / width * 100 + '%' ,
     height: bottomHeight / height * 100 + '%',
   }
 })
@@ -540,6 +538,7 @@ const edgePoints = [
 
     img {
       position: absolute;
+      max-width: none !important;
     }
   }
 }

src/renderer/src/AixPPTist/src/views/components/element/ImageElement/index.vue

@@ -183,6 +183,7 @@ const handleClip = (data: ImageClipedEmitData | null) => {
   }
   img {
     position: absolute;
+    max-width: none !important; // 防止图片被压缩
   }
 }
 .color-mask {

src/renderer/src/components/ai-kolors/index.vue

@@ -144,8 +144,14 @@ import { convertTextToPicture, getQueue, getPromptId, getPicture, chattoprompt,
 import CryptoJS from 'crypto-js'
 import { useRoute } from 'vue-router'
 export default {
-
+  props: {
+    hasPPt: {
+      type: Boolean,
+      default: false
+    }
+  },
   data() {
+  
     return {
       form: {
         ratio: "512",
@@ -384,7 +390,7 @@ export default {
           urls.push(url0)
           buttonState.push({
           disabled: false,
-          text: "插入本课素材资源库",
+          text: this.hasPPt ? '插入' : "插入本课素材资源库",
         })
         }
         this.skeletonNumber = 0
@@ -476,6 +482,10 @@ export default {
 
     //保存图片到素材库
     async saveImage(resultIndex, index, url, resultItem) {
+      if(this.hasPPt){
+        this.$emit('insertImg', url)
+        return
+      }
       this.buttonStates[resultIndex][index].disabled = true;
       this.buttonStates[resultIndex][index].text = "正在保存...";
       const numberIndex = url.indexOf('filename=');

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

@@ -35,7 +35,7 @@ const getFileTypeIcon = () => {
     txt: 'icon-txt',
     rar: 'icon-rar',
     apt: 'icon-A',
-    aptist: 'icon-A',
+    aippt: 'icon-A',
   }
   if (iconObj[name]) {
     return '#' + iconObj[name]

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

@@ -48,7 +48,7 @@
       </div>
       <div class="verson">V{{ version }}</div>
     </div>
-    
+
   </div>
 </template>
 
@@ -87,6 +87,12 @@ const headerMenus = [
     icon: 'icon-gongzuotai',
     path: '/desktop'
   },
+  {
+    name: '教学实践',
+    id: 4,
+    icon: 'icon-jiaoxueshijian',
+    path: '/prepare'
+  },
   {
     name: '资源中心',
     id: 3,
@@ -126,12 +132,12 @@ const computedregistertype = computed(() => {
     if(type==3 && userStore.DeptInfo.register.auditStatus==0){
       return 2
     }
-   
+
      // 创建学校 待审核
      if(type==4 && userStore.DeptInfo.register.auditStatus==0){
       return 3
     }
-     
+
 })
 const clickMenu = ({ id, disabled, path }) => {
   if (disabled) return
@@ -193,7 +199,7 @@ onMounted(() => {
 }
 .popoverStyle .head-aside{
   width: 100%;
-  display: flex; 
+  display: flex;
   justify-content: center;
   flex-direction: column;
   align-items: center;
@@ -246,7 +252,7 @@ onMounted(() => {
     align-items: center;
     font-size: 12px;
     .user-img{
-      width: 56px; 
+      width: 56px;
       height: 56px;
       border-radius: 50%;
       cursor: pointer;
@@ -312,4 +318,4 @@ onMounted(() => {
   font-size: 18px;
   font-weight: 800;
 }
-</style>
+</style>

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

@@ -10,7 +10,7 @@
         <el-button type="primary" @click="onchange('/model/newClassTaskAssign')">作业管理</el-button>
         <el-button type="success" @click="onchange('/model/teaching')">教材研读</el-button>
         <el-button type="info" @click="onchange('/model/design')">教学框架设计</el-button>
-        <el-button type="success" @click="openPPTist">打开PPTist</el-button>
+<!--        <el-button type="success" @click="openPPTist">打开PPTist</el-button>-->
         <el-button type="info" @click="onchange('/model/examination')">考试分析</el-button>
         <el-button type="primary" v-menus="dt.menus">测试</el-button>
         <el-button type="success" @click="onchange('/model/aiKolors')">文生图片</el-button>
@@ -245,7 +245,7 @@ const HTTP_SERVER_API = (type, params = {}) => {
         ppttype: 'file',
         title: enpt.coursetitle,
         fileurl: '',
-        filetype: 'aptist',
+        filetype: 'aippt',
         datacontent: '',
         filekey: '',
         filetag: '',
@@ -304,7 +304,7 @@ const handleAll = async(type, row) =>{
       break;
     }
     case 'open': {    // 打开资源-pptist
-      if (row.filetype != 'aptist') return msgUtils.msgWarning('暂不支持该类型文件操作!')
+      if (row.filetype != 'aippt') return msgUtils.msgWarning('暂不支持该类型文件操作!')
       sessionStore.set('curr.resource', row) // 缓存当前资源信息
       createWindow('open-win', {
         url: '/pptist', // 窗口关闭时，清除缓存
@@ -329,7 +329,7 @@ const handleAll = async(type, row) =>{
 // icons 处理 type 代表传递svg
 const getIcon = (o, type) => {
   let icon = typeof o == 'string' ? o : o?.filetype
-  if (['aptist'].includes(o?.filetype)) icon = 'pptx'
+  if (['aippt'].includes(o?.filetype)) icon = 'pptx'
   if (!!type) { // 其他格式icon
     switch(type) {
       case 'svg': // 返回svg格式

src/renderer/src/views/prepare/container/ai-pptistV2.vue

@@ -158,7 +158,7 @@ const outlineCreatePPT = () => {
 
     const checkProgress = () => {
       getProgressV2(res.sid).then(response => {
-        percentage.value = Math.round(response?.donePages/response?.totalPages)*100;
+        percentage.value = Math.round(response?.donePages*100/response?.totalPages);
         if (response.pptStatus === "done") {
           emit('addSuccess',{...res,url:response.pptUrl})
           ElMessage.success("生成成功");
@@ -267,7 +267,6 @@ function webSocketSend(ws, data) {
 
 function result1(resultData) {
   let jsonData = JSON.parse(resultData);
-  console.log(jsonData)
   outputText.value += jsonData.payload.choices.text[0].content;
   const div = document.querySelector('.paragraphs');
   if (div) {

src/renderer/src/views/prepare/container/class-start.vue

@@ -263,7 +263,7 @@ const createClasscourse = async () => {
   // getClasscourseList('update') // 更新列表
   let msgEl = ElMessage.success('创建课程-成功')
   // 新版-pptList 打开公屏
-  if (myClassActive.value.filetype == 'aptist') {
+  if (myClassActive.value.filetype == 'aippt') {
     setTimeout(() => {
       msgEl.close()
       msgEl = ElMessage.warning({message:'正在打开公屏，请稍后...',duration: 0})

src/renderer/src/views/prepare/container/kj-list-item.vue

@@ -341,7 +341,7 @@ export default {
           cookieData: { ...configObj.data }
         })
         return
-      } else if(items.fileFlag === 'aptist') { // aptist 被点击 打开PPT-List 课件
+      } else if(items.fileFlag === 'aippt') { // aippt 被点击 打开PPT-List 课件
         return this.$emit('change', 'click', items)
       }
       if (!items||!items.fileSuffix) return;

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

@@ -2,8 +2,20 @@
   <div v-loading="isLoading" class="page-resource flex">
     <ChooseTextbook @node-click="nodeClick" />
     <div class="page-center-wrap">
+      <el-dropdown class="prepare-center-dropdown">
+        <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="createAptFile">新建文枢课件</el-dropdown-item>
+            <el-dropdown-item>AI一键生成</el-dropdown-item>
+            <el-dropdown-item>导入PPT</el-dropdown-item>
+          </el-dropdown-menu>
+        </template>
+      </el-dropdown>
       <el-tabs v-model="activeAptTab" style="height: 100%;">
-        <el-tab-pane label="教学课件" name="教学课件" class="prepare-center-jxkj">
+        <el-tab-pane label="文枢课件" name="教学课件" class="prepare-center-jxkj">
           <div class="prepare-center-header">
             <div class="center-create-btn" style="background-color: rgb(64,158,255)" @click="createAptFile">
               <div class="create-btn-title"><el-icon><Plus /></el-icon><label>创建APT</label></div>
@@ -145,7 +157,7 @@
   <!-- <button @click="test">test</button> -->
 </template>
 <script setup>
-import { Check,Plus } from '@element-plus/icons-vue'
+import {Check, Plus, Position} from '@element-plus/icons-vue'
 import Reserv from '@/views/prepare/container/reserv.vue'
 import { ArrowDown } from '@element-plus/icons-vue'
 import PptDialog from '@/views/prepare/container/ppt-dialog.vue'
@@ -256,11 +268,11 @@ export default {
     },
     currentKJFileList() {
       // return this.currentFileList.filter((item) => item.fileFlag === 'apt' || item.fileFlag === '课件')
-      return this.currentFileList.filter((item) => ['apt','aptist','课件'].includes(item.fileFlag))
+      return this.currentFileList.filter((item) => ['apt','aippt','课件'].includes(item.fileFlag))
     },
     currentSCFileList() {
       // return this.currentFileList.filter((item) => item.fileFlag !== 'apt' && item.fileFlag !== '课件')
-      return this.currentFileList.filter((item) => !['apt','aptist','课件'].includes(item.fileFlag))
+      return this.currentFileList.filter((item) => !['apt','aippt','课件'].includes(item.fileFlag))
     }
   },
 
@@ -324,7 +336,7 @@ export default {
       if(item.fileFlag === 'apt') {
         this.$refs.calssRef.open(item.fileId, classObj)
       }
-      if(item.fileFlag === 'aptist') {
+      if(item.fileFlag === 'aippt') {
         this.$refs.calssRef.open(item.fileId, classObj)
       }
     },
@@ -381,8 +393,8 @@ export default {
           }, 1000)
           break
         }
-        case 'click': { // 点击-打开课件-aptist
+        case 'click': { // 点击-打开课件-aippt
-          if (row.fileFlag === 'aptist' && !!row.fileId) {
+          if (row.fileFlag === 'aippt' && !!row.fileId) {
             const res = await getEntpcoursefile(row.fileId)
             if (res && res.code === 200) {
               sessionStore.set('curr.resource', res.data) // 缓存当前资源信息
@@ -464,6 +476,93 @@ export default {
         },500)
       })
     },
+    createAIPPT() {
+      listEntpcourse({
+        evalid: this.currentNode.id,
+        edituserid: this.userStore.userId,
+        pageSize: 500
+      }).then((response) => {
+        if (response.rows.length <= 0) return
+        let resCourse = response.rows[0]
+        // 添加
+        let form = {
+          parentid: 0,
+          entpid: this.userStore.deptId,
+          entpcourseid: resCourse.id,
+          ppttype: 'file',
+          title: resCourse.coursetitle,
+          fileurl: '',
+          filetype: 'aippt',
+          datacontent: '',
+          filekey: '',
+          filetag: '',
+          fileidx: 0,
+          dflag: 0,
+          status: '',
+          edituserid: this.userStore.userId
+        }
+        addEntpcoursefileReturnId(form).then((slideid) => {
+          let pagearray = []
+          // 公屏
+          pagearray.push({
+            key: '公屏',
+            title: '公屏页',
+            slidedata: {
+              attrs: { width: 1333, height: 749.8125 },
+              className: 'Stage',
+              children: [
+                {
+                  attrs: {},
+                  className: 'Layer',
+                  children: [
+                    {
+                      attrs: {
+                        width: 1333,
+                        height: 749.8125,
+                        fill: 'white',
+                        name: 'fixedbackground',
+                        listening: true
+                      },
+                      className: 'Rect'
+                    }
+                  ]
+                }
+              ]
+            }
+          })
+
+          // 添加
+          var form = {
+            parentid: slideid,
+            entpid: resCourse.entpid,
+            entpcourseid: resCourse.id,
+            ppttype: 'file',
+            title: '第一页',
+            fileurl: '',
+            filetype: 'slide',
+            datacontent: JSON.stringify(pagearray),
+            filekey: '',
+            filetag: '',
+            fileidx: 0,
+            dflag: 0,
+            status: '',
+            edituserid: this.userStore.userId
+          }
+          addEntpcoursefileReturnId(form).then((res) => {
+            creatAPT({
+              ...this.uploadData,
+              fileId: slideid,
+              fileShowName: this.currentNode.itemtitle + '.apt'
+            }).then((res) => {
+              this.currentFileList.unshift(res.resData)
+              setTimeout(()=>{
+                this.$refs['kjItemRef'+res.resData.id][0].openFileWin(res.resData);
+              },500)
+            })
+          })
+        })
+      })
+    },
     createAptFile() {
       listEntpcourse({
         evalid: this.currentNode.id,
@@ -656,7 +755,7 @@ export default {
           for (let i = 0; i < this.currentFileList.length; i++) {
             let item = this.currentFileList[i]
             if (item.fileFlag === 'apt') continue;
-            if (item.fileFlag === 'aptist') continue;
+            if (item.fileFlag === 'aippt') continue;
             await asyncLocalFile(item)
           }
           this.asyncAllFileVisiable = false
@@ -875,6 +974,13 @@ export default {
     margin: 0 5px;
     border-radius: 10px;
     background-color: white;
+    position: relative;
+    .prepare-center-dropdown{
+      z-index: 9999;
+      position: absolute;
+      right: 10px;
+      top: 4px;
+    }
     .prepare-center-jxkj{
       height: 100%;
       display: flex;

src/renderer/src/views/teachingDesign/container/right.vue

@@ -131,6 +131,7 @@ const params = reactive(
 
 const addAiPPT = async(res) => {
   let node = courseObj.node
+  pptDialog.value = false;
   if (!node) return msgUtils.msgWarning('请选择章节?')
   pgDialog.visible = true
   pgDialog.pg.percentage = 0
@@ -238,8 +239,8 @@ const HTTP_SERVER_API = (type, params = {}) => {
       const node = courseObj.node || {}
       const def = {
         fileId: '', // 文件id - Entpcoursefile 对应id
-        fileFlag: 'aptist',
+        fileFlag: 'aippt',
-        fileShowName: node.itemtitle + '.aptist',
+        fileShowName: node.itemtitle + '.aippt',
         textbookId: node.rootid,
         levelFirstId: node.parentid||node.id,
         levelSecondId: node.parentid && node.id,
@@ -298,7 +299,7 @@ const getDefParams = (params) => {
     ppttype: 'file',
     title: enpt.coursetitle,
     fileurl: '',
-    filetype: 'aptist',
+    filetype: 'aippt',
     datacontent: '',
     filekey: '',
     filetag: '',