Merge pull request 'fix：默认图片问题；' (#232) from yws_dev into main

Reviewed-on: #232

.env.yy

@@ -0,0 +1,27 @@
+# 页面标题
+VITE_APP_TITLE = 育人酉数平台
+
+VITE_APP_ID = 'aix-win-ws-yy'
+
+# 生产环境配置
+VITE_APP_ENV = 'production'
+
+# AIx融合数字管理系统/生产环境
+VITE_APP_BASE_API = 'https://prev.ysaix.com:7868/prod-api'
+
+VITE_APP_DOMAIN = 'prev.ysaix.com'
+
+VITE_APP_UPLOAD_API = 'https://prev.ysaix.com:7868/prod-api'
+
+# 是否在打包时开启压缩，支持 gzip 和 brotli
+VITE_BUILD_COMPRESS = gzip
+
+VITE_APP_RES_FILE_PATH = 'https://prev.ysaix.com:7868/src/assets/textbook/booktxt/'
+
+VITE_APP_BUILD_BASE_PATH = 'https://prev.ysaix.com:7868/'
+
+# websocket 地址
+VITE_APP_WS_URL = 'wss://prev.ysaix.com:7868'
+
+# 是否显示开发工具
+VITE_SHOW_DEV_TOOLS = 'false'

electron-builder-prod.yml

@@ -6,6 +6,11 @@ directories:
 win:
   executableName: 文枢课堂
   icon: resources/logo2.ico
+  target:
+    - target: nsis
+      arch:
+        - x64
+        - ia32
 files:
   - '!**/.vscode/*'
   - '!src/*'
@@ -47,8 +52,8 @@ publish:
 electronDownload:
   mirror: https://npmmirror.com/mirrors/electron/
 # 额外依赖打包到输出目录
-extraFiles:
+#extraFiles:
-  - from: ./node_modules/im_electron_sdk/lib/
+#  - from: ./node_modules/im_electron_sdk/lib/
-    to: ./resources
+#    to: ./resources
-    filter:
+#    filter:
-      - '**/*'
+#      - '**/*'

electron-builder-test.yml

@@ -13,6 +13,11 @@ asarUnpack:
 win:
   executableName: AIx
   icon: resources/logo2.ico
+  target:
+    - target: nsis
+      arch:
+        - x64
+        - ia32
 nsis:
   oneClick: false
   allowToChangeInstallationDirectory: true
@@ -46,8 +51,8 @@ publish:
 electronDownload:
   mirror: https://npmmirror.com/mirrors/electron/
 # 额外依赖打包到输出目录
-extraFiles:
+#extraFiles:
-  - from: ./node_modules/im_electron_sdk/lib/
+#  - from: ./node_modules/im_electron_sdk/lib/
-    to: ./resources
+#    to: ./resources
-    filter:
+#    filter:
-      - '**/*'
+#      - '**/*'

electron-builder-yc.yml

@@ -6,6 +6,11 @@ directories:
 win:
   executableName: 永川中小学AI教学系统
   icon: resources/yc-logo.png
+  target:
+    - target: nsis
+      arch:
+        - x64
+        - ia32
 files:
   - '!**/.vscode/*'
   - '!src/*'
@@ -47,8 +52,8 @@ publish:
 electronDownload:
   mirror: https://npmmirror.com/mirrors/electron/
 # 额外依赖打包到输出目录
-extraFiles:
+#extraFiles:
-  - from: ./node_modules/im_electron_sdk/lib/
+#  - from: ./node_modules/im_electron_sdk/lib/
-    to: ./resources
+#    to: ./resources
-    filter:
+#    filter:
-      - '**/*'
+#      - '**/*'

electron-builder-yc2.yml

@@ -6,6 +6,11 @@ directories:
 win:
   executableName: 实训教学
   icon: resources/yc-logo.png
+  target:
+    - target: nsis
+      arch:
+        - x64
+        - ia32
 files:
   - '!**/.vscode/*'
   - '!src/*'
@@ -47,8 +52,8 @@ publish:
 electronDownload:
   mirror: https://npmmirror.com/mirrors/electron/
 # 额外依赖打包到输出目录
-extraFiles:
+#extraFiles:
-  - from: ./node_modules/im_electron_sdk/lib/
+#  - from: ./node_modules/im_electron_sdk/lib/
-    to: ./resources
+#    to: ./resources
-    filter:
+#    filter:
-      - '**/*'
+#      - '**/*'

electron-builder-yy.yml

@@ -0,0 +1,59 @@
+appId: com.electron.app.yy
+productName: 育人酉数平台
+directories:
+  output: dist
+  buildResources: build
+win:
+  executableName: 育人酉数平台
+  icon: resources/yy-logo.png
+  target:
+    - target: nsis
+      arch:
+        - x64
+        - ia32
+files:
+  - '!**/.vscode/*'
+  - '!src/*'
+  - '!electron.vite.config.{js,ts,mjs,cjs}'
+  - '!{.eslintignore,.eslintrc.cjs,.prettierignore,.prettierrc.yaml,dev-app-update.yml,CHANGELOG.md,README.md}'
+  - '!{.env,.env.*,.npmrc,pnpm-lock.yaml}'
+asarUnpack:
+  - resources/**
+nsis:
+  oneClick: false
+  allowToChangeInstallationDirectory: true
+  artifactName: ${name}-${version}-setup.${ext}
+  shortcutName: ${productName}
+  uninstallDisplayName: ${productName}
+  createDesktopShortcut: always
+mac:
+  entitlementsInherit: build/entitlements.mac.plist
+  extendInfo:
+    - NSCameraUsageDescription: Application requests access to the device's camera.
+    - NSMicrophoneUsageDescription: Application requests access to the device's microphone.
+    - NSDocumentsFolderUsageDescription: Application requests access to the user's Documents folder.
+    - NSDownloadsFolderUsageDescription: Application requests access to the user's Downloads folder.
+  notarize: false
+dmg:
+  artifactName: ${name}-${version}.${ext}
+linux:
+  target:
+    - AppImage
+    - snap
+    - deb
+  maintainer: electronjs.org
+  category: Utility
+appImage:
+  artifactName: ${name}-${version}.${ext}
+npmRebuild: false
+publish:
+  provider: generic
+  url: https://prev.ysaix.com:7868/src/assets/smarttalkyy/
+electronDownload:
+  mirror: https://npmmirror.com/mirrors/electron/
+# 额外依赖打包到输出目录
+#extraFiles:
+#  - from: ./node_modules/im_electron_sdk/lib/
+#    to: ./resources
+#    filter:
+#      - '**/*'

electron-builder.yml

@@ -13,6 +13,11 @@ asarUnpack:
 win:
   executableName: AIx
   icon: resources/logo2.ico
+  target:
+    - target: nsis
+      arch:
+        - x64
+        - ia32
 nsis:
   oneClick: false
   allowToChangeInstallationDirectory: true
@@ -46,8 +51,8 @@ publish:
 electronDownload:
   mirror: https://npmmirror.com/mirrors/electron/
 # 额外依赖打包到输出目录
-extraFiles:
+#extraFiles:
-  - from: ./node_modules/im_electron_sdk/lib/
+#  - from: ./node_modules/im_electron_sdk/lib/
-    to: ./resources
+#    to: ./resources
-    filter:
+#    filter:
-      - '**/*'
+#      - '**/*'

package.json

@@ -1,6 +1,6 @@
 {
   "name": "aix-win-ws",
-  "version": "2.5.15",
+  "version": "2.5.16",
   "description": "",
   "main": "./out/main/index.js",
   "author": "上海交大重庆人工智能研究院",
@@ -14,9 +14,11 @@
     "build:unpack": "npm run build && electron-builder --dir",
     "build:dev": "npm run build && electron-builder --win --config ./electron-builder-test.yml",
     "build:test": "node updatePackageJsonName.js && electron-vite build --mode test && electron-builder --win --config ./electron-builder.yml",
-    "build": "node updatePackageJsonName.js && electron-vite build --mode production && electron-builder --win --config ./electron-builder-prod.yml",
+    "build:prod": "node updatePackageJsonName.js && electron-vite build --mode production && electron-builder --win --config ./electron-builder-prod.yml --win",
+    "build:prod32": "node updatePackageJsonName.js && electron-vite build --mode production && electron-builder --win --config ./electron-builder-prod.yml --win --ia32",
     "build:yc": "node updatePackageJsonName.js && electron-vite build --mode yc && electron-builder --win --config ./electron-builder-yc.yml",
     "build:yc2": "node updatePackageJsonName.js && electron-vite build --mode yc2 && electron-builder --win --config ./electron-builder-yc2.yml",
+    "build:yy": "node updatePackageJsonName.js && electron-vite build --mode yy && electron-builder --win --config ./electron-builder-yy.yml",
     "build:lt": "electron-vite build --mode lt && electron-builder --win --config ./electron-builder-lt.yml",
     "build:mac": "electron-vite build --mode production && electron-builder --mac --config ./electron-builder-prod.yml",
     "build:linux": "npm run build && electron-builder --linux"
@@ -42,7 +44,7 @@
     "@vue-office/excel": "^1.7.11",
     "@vue-office/pdf": "^2.0.2",
     "@vueuse/core": "^10.11.0",
-    "aix-plugins-aitools": "^1.1.0",
+    "aix-plugins-aitools": "^1.1.5",
     "animate.css": "^4.1.1",
     "circular-json": "^0.5.9",
     "clipboard": "^2.0.11",
@@ -54,14 +56,12 @@
     "electron-log": "^5.1.7",
     "electron-store": "8.0.0",
     "electron-updater": "^6.1.7",
-    "element-china-area-data": "^6.1.0",
     "element-plus": "^2.8.0",
     "fabric": "^5.3.0",
     "file-saver": "^2.0.5",
     "hfmath": "^0.0.2",
     "html-to-image": "^1.11.11",
     "html2canvas": "^1.4.1",
-    "im_electron_sdk": "^8.0.5904",
     "js-cookie": "^3.0.5",
     "jsencrypt": "^3.3.2",
     "jsondiffpatch": "0.6.0",
@@ -139,4 +139,4 @@
     "vue-tsc": "^1.8.25",
     "windicss": "^3.5.6"
   }
-}
+}

src/main/index.js

@@ -4,7 +4,7 @@ import { electronApp, optimizer, is } from '@electron-toolkit/utils'
 import icon from '../../resources/icon.png?asset'
 import File from './file'
 import Logger from './logger' // 日志封装
-import chat from './chat'     // chat封装
+// import chat from './chat'     // chat封装
 import Store from './store'   // Store封装
 import updateInit from './update'
 
@@ -42,12 +42,28 @@ if(!gotTheLock){
     }
   })
 }
-let logoIco = import.meta.env.MODE==='yc'||import.meta.env.MODE==='yc2'?'../../resources/yc-logo.png':'../../resources/logo2.ico'
+let logoIco = ""
+
+switch (import.meta.env.MODE) {
+  case 'yc':
+    logoIco = '../../resources/yc-logo.png'
+    break
+  case 'yc2':
+    logoIco = '../../resources/yc-logo.png'
+    break
+  case 'yy':
+    logoIco = '../../resources/yy-logo.png'
+    break
+  default:
+    logoIco = '../../resources/logo2.ico'
+    break
+}
 //登录窗口
 function createLoginWindow() {
   if (loginWindow) return
   loginWindow = new BrowserWindow({
-    width: import.meta.env.MODE==='yc'||import.meta.env.MODE==='yc2'?1060:888,
+    // width: import.meta.env.MODE==='yc'||import.meta.env.MODE==='yc2'?1060:888,
+    width: 1060,
     height: 520,
     show: false,
     frame: false,
@@ -244,6 +260,13 @@ app.on('ready', () => {
     loginWindow.show()
     loginWindow.focus()
   })
+  // 打印窗口
+  ipcMain.on('printPage', (event, printOptions) => {
+    //console.log("ipcMain-print-page")
+    mainWindow.webContents.print(printOptions, (success, failureReason) => {
+      if (!success) console.error(failureReason);
+    });
+  });
 
   //打开作业窗口
   ipcMain.on('openWindow', (e, data) => {
@@ -270,14 +293,14 @@ app.on('window-all-closed', () => {
 
 // 监听全局事件
 function handleAll() {
-  const chatInstance = chat.initialize() // im-chat 实例
+  // const chatInstance = chat.initialize() // im-chat 实例
   // 新窗口创建-监听
   ipcMain.handle('new-window', (e, data) => {
     const { id, type } = data
     const win = BrowserWindow.fromId(id)
     win.type = type // 绑定独立标识
     remote.enable(win.webContents)        // 开启远程服务
-    chatInstance.enable(win.webContents)  // 开启im-chat
+    // chatInstance.enable(win.webContents)  // 开启im-chat
     console.log(`主进程 [${type}]: 窗口注册-远程代理-完毕(${Date.now()})`)
   })
   // 用于监听-状态管理变化-同步所有窗口

src/preload/index.js

@@ -1,10 +1,10 @@
 import { contextBridge } from 'electron'
 import { electronAPI } from '@electron-toolkit/preload'
-import TimRender from 'im_electron_sdk/dist/renderer' // im渲染部分实例
+// import TimRender from 'im_electron_sdk/dist/renderer' // im渲染部分实例
 // Custom APIs for renderer
 const api = {
   preloadPath: __dirname,               // 当前preload地址
-  getTimRender: () => new TimRender(),  // im渲染部分实例
+  // getTimRender: () => new TimRender(),  // im渲染部分实例
 }
 // Use `contextBridge` APIs to expose Electron APIs to
 // renderer only if context isolation is enabled, otherwise

src/renderer/index.html

@@ -8,12 +8,13 @@
       http-equiv="Content-Security-Policy"
       content="default-src 'self'; script-src 'self'; style-src 'self' 'unsafe-inline'; img-src 'self' data:"
     /> -->
-    <meta http-equiv="Content-Security-Policy" content="connect-src * blob: data:; frame-src 'self' *; default-src 'self' https://wzyzoss.eos-chongqing-3.cmecloud.cn/; script-src 'self' 'unsafe-eval' http://www.wiris.net 'unsafe-inline'; style-src 'self' 'unsafe-inline' http://www.wiris.net; media-src * blob:;img-src * 'self' data: blob:;font-src 'self' http://www.wiris.net data:;" />
+    <meta http-equiv="Content-Security-Policy" content="connect-src * blob: data:; frame-src 'self' *; default-src 'self' https://wzyzoss.eos-chongqing-3.cmecloud.cn/; script-src 'self' 'unsafe-eval' http://www.wiris.net 'unsafe-inline'; script-src-elem 'self' https://sdk.amazonaws.com; style-src 'self' 'unsafe-inline' http://www.wiris.net; media-src * blob:;img-src * 'self' data: blob:;font-src 'self' http://www.wiris.net data:;" />
 
   </head>
 
   <body>
     <div id="app"></div>
+<!--    <script src="https://sdk.amazonaws.com/js/aws-sdk-2.100.0.min.js"></script>-->
     <script type="module" src="/src/main.js"></script>
   </body>
 </html>

src/renderer/src/AixPPTist/src/api/classcourse.ts

@@ -38,12 +38,12 @@ export class Classcourse {
     if (isCourse) {
       // 连接socket
       ChatWs.id = classcourse.timgroupid // 群组id
-      if (!ChatWs.ws) {
+      // if (!ChatWs.ws) {
-        ChatWs.init().then(_ => {
+      //   ChatWs.init().then(_ => {
-          isPublic && ChatWs.sendMsg('open', {id: classcourse.id})
+      //     isPublic && ChatWs.sendMsg('open', {id: classcourse.id})
-          // isPublic && console.log('socket-开课消息-已发送')
+      //     // isPublic && console.log('socket-开课消息-已发送')
-        })
+      //   })
-      }
+      // }
       this.classcourse = classcourse // 课堂信息
       this.id = classcourse.id // 课堂id
       // 如果课堂信息有paging，则更新当前页码

src/renderer/src/AixPPTist/src/types/slides.ts

@@ -41,7 +41,7 @@ export const enum ElementTypes {
  * 
  * rotate: 渐变角度（线性渐变）
  */
-export type GradientType = 'linear' | 'radial'
+export type GradientType = 'linear' | 'radial' | 'image'
 export type GradientColor = {
   pos: number
   color: string

src/renderer/src/AixPPTist/src/views/Editor/Toolbar/ElementStylePanel/ShapeStylePanel.vue

@@ -46,11 +46,12 @@
         :options="[
           { label: '线性渐变', value: 'linear' },
           { label: '径向渐变', value: 'radial' },
+          { label: '背景图', value: 'image' },
         ]"
       />
     </div>
     
-    <template v-if="fillType === 'gradient'">
+    <template v-if="fillType === 'gradient' && gradient.type !== 'image'">
       <div class="row">
         <GradientBar
           :value="gradient.colors"
@@ -206,6 +207,13 @@ const updateFillType = (type: 'gradient' | 'fill') => {
 const updateGradient = (gradientProps: Partial<Gradient>) => {
   if (!gradient.value) return
   const _gradient = { ...gradient.value, ...gradientProps }
+  if (!_gradient.colors) {
+    _gradient.colors = [
+      { pos: 0, color: '#fff' },
+      { pos: 100, color: '#fff' },
+    ]
+    _gradient.rotate = 0
+  }
   updateElement({ gradient: _gradient })
 }
 const updateGradientColors = (color: string) => {

src/renderer/src/AixPPTist/src/views/components/element/ShapeElement/BaseShapeElement.vue

@@ -33,6 +33,8 @@
               :type="elementInfo.gradient.type"
               :colors="elementInfo.gradient.colors"
               :rotate="elementInfo.gradient.rotate"
+              :image="elementInfo.gradient.image"
+              :info="elementInfo"
             />
           </defs>
           <g 

src/renderer/src/AixPPTist/src/views/components/element/ShapeElement/GradientDefs.vue

@@ -1,6 +1,25 @@
 <template>
+  <!-- auth:zdg 增加图片 -->
+  <pattern
+    v-if="type === 'image'"
+    :id="id"
+    :x="image?.stretch?.l || 0"
+    :y="image?.stretch?.t || 0"
+    :width="image?.path_W||'100%'"
+    :height="image?.path_h||'100%'"
+    :style="image.rotWithShape==0?'transform:rotate('+(-info.rotate)+'deg)' : ''"
+    patternUnits="userSpaceOnUse">
+    <image
+      :width="image?.path_W||200"
+      :height="image?.path_h||200"
+      :href="image.src"
+      :opacity="image.opacity"
+      preserveAspectRatio="none"
+    />
+  </pattern>
+  <!-- auth:zdg 默认 线性渐变 -->
   <linearGradient 
-    v-if="type === 'linear'"
+    v-else-if="type === 'linear'"
     :id="id" 
     x1="0%" 
     y1="0%" 
@@ -10,20 +29,35 @@
   >
     <stop v-for="(item, index) in colors" :key="index" :offset="`${item.pos}%`" :stop-color="item.color" />
   </linearGradient>
-
+  <!-- auth:zdg 默认 径向渐变 -->
   <radialGradient :id="id" v-else>
     <stop v-for="(item, index) in colors" :key="index" :offset="`${item.pos}%`" :stop-color="item.color" />
   </radialGradient>
 </template>
 
 <script lang="ts" setup>
-import type { GradientColor, GradientType } from '../../../../types/slides'
+import type { GradientColor, GradientType, PPTShapeElement } from '../../../../types/slides'
-
+interface ImageSvg {
-withDefaults(defineProps<{
+  src: string,
+  width: number,
+  height: number,
+  zipPath: string,
+  opacity: number,
+  rotWithShape: string,
+  stretch?: {
+    l?: number,
+    t?: number,
+    r?: number,
+    b?: number
+  }
+}
+const data = withDefaults(defineProps<{
   id: string
   type: GradientType
-  colors: GradientColor[]
+  colors?: GradientColor[]
-  rotate?: number
+  rotate?: number,
+  image?: ImageSvg,
+  info?: PPTShapeElement
 }>(), {
   rotate: 0,
 })

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

@@ -42,6 +42,8 @@
               :type="elementInfo.gradient.type"
               :colors="elementInfo.gradient.colors"
               :rotate="elementInfo.gradient.rotate"
+              :image="elementInfo.gradient.image"
+              :info="elementInfo"
             />
           </defs>
           <g 

src/renderer/src/api/file/index.js

@@ -94,4 +94,19 @@ export const addFileToSC = (params) => {
     method: 'post',
     params
   })
-}
+}
+//EOS生成表单上传的签名
+export const createSignature = (data) => {
+  return request({
+    url: '/eos/createSignature',
+    method: 'post',
+    data
+  })
+}
+//EOS生成本地上传的临时签名
+export const sessionToken = () => {
+  return request({
+    url: '/eos/sessionToken',
+    method: 'get'
+  })
+}

src/renderer/src/api/mode/index.js

@@ -118,6 +118,14 @@ export function docList(params) {
   })
 }
 
+// 删除 doc ai文档
+export function removeDoc(id) {
+  return request({
+    url: '/education/doc/' + id,
+    method: 'delete',
+  })
+}
+
 // 保存教学大纲
 export function addSyllabus(data) {
   return request({

src/renderer/src/components/FileUpload/Eos.vue

@@ -0,0 +1,135 @@
+<template>
+<!--  <form @submit.prevent="submitForm" enctype="multipart/form-data">-->
+  <form action="https://wzyzoss.eos-chongqing-3.cmecloud.cn" method="post" enctype="multipart/form-data">
+    <!-- action 是具体要上传的地址 -->
+<!--
+
+    上传后文件（Object）名:
+    <input type="input" name="key" :value="uploadData.key" placeholder="文件名" style="width: 400px"/><br/><br/>
+
+    ACL：
+    <input type="hidden" name="acl" :value="uploadData.acl" placeholder="文件 ACL" style="width: 400px"/><br/><br/>
+
+    Content-Type:
+    <input type="input" name="Content-Type" :value="uploadData['Content-Type']" placeholder="文件类型" style="width: 400px"/><br/><br/>
+
+    X-Amz-Credential：
+    <input type="text" name="X-Amz-Credential"  :value="uploadData['x-amz-credential']" placeholder="X-Amz-Credential，从后端程序返回中获取" style="width: 400px"/><br/><br/>
+
+    X-Amz-Algorithm：
+    <input type="text" name="X-Amz-Algorithm" :value="uploadData['x-amz-algorithm']" placeholder="X-Amz-Algorithm， 从后端程序返回中获取" style="width: 400px"/><br/><br/>
+
+    X-Amz-Date：
+    <input type="text" name="X-Amz-Date" :value="uploadData['x-amz-date']" placeholder="X-Amz-Date 从后端程序返回中获取" style="width: 400px"><br/><br/>
+
+    Policy：
+    <input type="text" name="Policy" :value="uploadData.policy" placeholder="Policy 从后端程序返回中获取" style="width: 400px"/><br/><br/>
+
+    X-Amz-Signature：
+    <input type="text" name="X-Amz-Signature" :value="uploadData['x-amz-signature']" placeholder="X-Amz-Signature 从后端程序返回中获取" style="width: 400px"/><br/><br/>
+-->
+
+    选择文件（Object）
+    <input type="file" name="file" @change="handleFileChange" style="width: 400px"/> <br/><br/>
+    <input type="submit" name="submit" value="上传到 EOS" style="width: 400px"/><br/><br/>
+   <el-button @click="uploadFile">上传</el-button>
+  </form>
+</template>
+
+<script setup>
+import {ref, onMounted} from "vue"
+import {createSignature, sessionToken} from "@/api/file";
+import axios from "axios"
+
+const url = "https://wzyzoss.eos-chongqing-3.cmecloud.cn"
+const uploadData = ref({
+  "bucket": "wzyzoss",
+  "x-amz-date": "20250113T061000Z",
+  "x-amz-signature": "2d6fba9f27544bfc7414d660e2e73aafdaf02fe3de45e68f59d580276239cd07",
+  "acl": "private",
+  "x-amz-algorithm": "AWS4-HMAC-SHA256",
+  "key": "wzyzossa",
+  "x-amz-credential": "07ICFAF4IWWZP6RH0WCG/20250113/us-east-1/s3/aws4_request",
+  "Content-Type": null,
+  "policy": "eyJleHBpcmF0aW9uIjoiMjAyNS0wMS0xM1QwNzoxMDowMC42NzVaIiwiY29uZGl0aW9ucyI6W3sieC1hbXotZGF0ZSI6IjIwMjUwMTEzVDA2MTAwMFoifSx7ImFjbCI6InByaXZhdGUifSx7ImJ1Y2tldCI6Ind6eXpvc3MifSxbInN0YXJ0cy13aXRoIiwiJGtleSIsInd6eXpvc3NhIl0sWyJzdGFydHMtd2l0aCIsIiRDb250ZW50LVR5cGUiLCJudWxsIl0seyJ4LWFtei1hbGdvcml0aG0iOiJBV1M0LUhNQUMtU0hBMjU2In0seyJ4LWFtei1jcmVkZW50aWFsIjoiMDdJQ0ZBRjRJV1daUDZSSDBXQ0cvMjAyNTAxMTMvdXMtZWFzdC0xL3MzL2F3czRfcmVxdWVzdCJ9LFsiY29udGVudC1sZW5ndGgtcmFuZ2UiLDEsMTAwMDAwXV19"
+})
+
+
+
+const submitForm = ()=> {
+  let formData = new FormData();
+  for (const formDataKey in formData) {
+    formData.append(formDataKey, formData[formDataKey]);
+  }
+  axios.post(url, formData, {
+    headers: {
+      'Content-Type': 'multipart/form-data'
+    }
+  })
+    .then(response => {
+      console.log('表单提交成功，服务器响应：', response.data);
+    })
+    .catch(error => {
+      console.log('表单提交失败：', error);
+    });
+}
+
+const S3Data = {
+  apiVersion: "2006-03-01",
+  accessKeyId: "2UYNH48SKS4O3WB4W4OI",  // 服务端获取到的 access key ID
+  secretAccessKey: "spwk4vcPbQUa3n7H8AwOFWqhK712XUX23CrUlwC8",   // 服务端获取到的 secret access key
+  endpoint: "eos-chongqing-3.cmecloud.cn",
+  signatureVersion: "v2",
+  sslEnabled: true // 是否启用 HTTPS 连接
+}
+
+let selectedFile = null
+
+const handleFileChange = (event)=> {
+  // 获取选中的文件
+  selectedFile = event.target.files[0];
+}
+
+const uploadMessage = ref(null)
+
+const uploadFile = ()=>{
+  if (selectedFile) {
+    console.log(S3Data)
+    // 创建一个 AWS.S3 实例
+    const s3 = new AWS.S3(S3Data);
+    let params = {
+      Key: selectedFile.name,
+      Bucket: "wzyzoss",
+      ContentType: selectedFile.type,
+      Body: selectedFile
+    }
+    console.log(params)
+    s3.putObject(params, function (err, data) {
+      console.log(err,data)
+    });
+  }
+}
+
+onMounted(()=>{
+  console.log(AWS)
+  /*createSignature({objectName:"123.jpg",contentType:"image/png"}).then(res=>{
+    uploadData.value = res.body
+  })*/
+  sessionToken().then(res=>{
+    uploadMessage.value = res.data
+    console.log(res.data)
+    S3Data.accessKeyId = res.data.accessKeyId
+    // S3Data.accessKeyId = "kzOm2cc7nT12ao907Tc"
+    S3Data.secretAccessKey = res.data.secretAccessKey
+    // S3Data.secretAccessKey = "MYXV8Z3UKZVQETFNKQKLJQA67II6E3YEY8RODCV"
+    S3Data.endpoint = res.data.endPoint
+    S3Data.sessionToken = res.data.sessionToken
+    // S3Data.sessionToken = "zPpRolsWE3n7fbmqdt/tzyoSeYULFedptLuKdnJBag5X9y73fitu93WPLMMqYQzYTR+mg86jxs3IQJjOpgFRShdiNB2/mWRvfyeEZ3xo6cRMYnFXSLASIxCyvAH48pH6Z1pI3NuqtaZzlx7zdeoHYCskOuzBXoLhxN1cCXTg3AEZqQ0K4v1RcPIi4cD/YE+XCa+V7DjYU2Bs9zxZ4I52wXOtdnTg9Gj+MwfT+CywOio="
+    S3Data.apiVersion = "2006-03-01"
+  })
+})
+</script>
+
+<style scoped lang="scss">
+
+</style>

src/renderer/src/components/template-study/container/left-dialog.vue

@@ -2,34 +2,45 @@
   <el-dialog v-model="isDialog" :show-close="false" width="900" append-to-body destroy-on-close>
     <template #header>
       <div class="custom-header flex">
-        <span>选择{{ title }}</span>
+        <span>选择</span>
         <i class="iconfont icon-guanbi" @click="isDialog = false"></i>
       </div>
     </template>
-    <div class="dialog-content">
+    <div class="dialog-content" v-loading="loading">
-
       <div class="content-list">
-        <ul>
+        <el-empty description="暂无数据" v-if="!fileList.length" />
-          <li v-for="(item, index) in fileList" :class="activeIndex == index ? 'li-active' : ''"
+        <el-radio-group v-model="curFileId">
-            @click="clickItem(index, item)">
+          <el-row>
-            <el-image class="img" :src="url" />
+            <el-col :span="12" v-for="item in fileList" :key="item.id">
-            <el-button type="primary" class="prev-btn" @click.stop="onPrevItem(item)">预览</el-button>
+              <el-radio :value="item.id">
-            <el-text truncated>{{ item.fileName }}</el-text>
+                <el-text class="w-50" truncated>{{ item.fileName }}</el-text>
-          </li>
+                <div class="flex items-center">
-        </ul>
+                  <el-button type="primary" link v-if="isPrev(item).value" @click="onPrevItem(item)"
+                    >预览</el-button
+                  >
+                  <el-button type="danger" link @click="removeItem(item)">删除</el-button>
+                </div>
+              </el-radio>
+            </el-col>
+          </el-row>
+        </el-radio-group>
       </div>
     </div>
     <template #footer>
       <div class="dialog-footer">
-        <el-upload class="upload-demo" :action="uploadFileUrl" :limit="1" :show-file-list="false" :headers="headers"
+        <el-upload
-          :on-success="onSuccess">
+          class="upload-demo"
+          :action="uploadFileUrl"
+          :limit="1"
+          :show-file-list="false"
+          :headers="headers"
+          :on-success="onSuccess"
+        >
           <el-button type="primary">上传</el-button>
         </el-upload>
         <div>
           <el-button @click="isDialog = false">取消</el-button>
-          <el-button type="primary" @click="isDialog = false">
+          <el-button type="primary" @click="handleDialog"> 确定 </el-button>
-            确定
-          </el-button>
         </div>
       </div>
     </template>
@@ -41,21 +52,18 @@
         <i class="iconfont icon-guanbi" @click="prevVisible = false"></i>
       </div>
     </template>
-    <div style="height: calc(100vh - 120px);">
+    <div style="height: calc(100vh - 120px); text-align: center;">
       <template v-if="getFileSuffix(prevItem.fileUrl) == 'pdf'">
-        <iframe :src="prevItem.fileUrl"
+        <iframe :src="prevItem.fileUrl" frameborder="0" width="100%" height="100%"></iframe>
-          frameborder="0" width="100%" height="100%"></iframe>
       </template>
       <template v-else>
-        <el-image :src="prevItem.fileUrl" style="height:100%"/>
+        <el-image :src="prevItem.fileUrl" style="height: 100%" />
       </template>
     </div>
     <template #footer>
       <div class="dialog-footer">
         <div></div>
-        <el-button type="primary" @click="prevVisible = false">
+        <el-button type="primary" @click="prevVisible = false"> 关闭 </el-button>
-          关闭
-        </el-button>
       </div>
     </template>
   </el-dialog>
@@ -63,20 +71,19 @@
 
 <script setup>
 import { ref, computed, onMounted, reactive } from 'vue'
-import { completion, addDoc, docList } from '@/api/mode/index.js'
+import { completion, addDoc, docList, removeDoc } from '@/api/mode/index.js'
-import { getToken } from "@/utils/auth";
+import { getToken } from '@/utils/auth'
 import { sessionStore } from '@/utils/store'
 import { dataSetJson } from '@/utils/comm.js'
-import { ElMessage } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
 import useUserStore from '@/store/modules/user'
 import { getFileSuffix } from '@/utils/ruoyi.js'
-import emitter from '@/utils/mitt';
+import emitter from '@/utils/mitt'
+import { cloneDeep } from 'lodash'
 
 const userInfo = useUserStore().user
-const uploadFileUrl = ref(import.meta.env.VITE_APP_BASE_API + "/common/upload");
+const uploadFileUrl = ref(import.meta.env.VITE_APP_BASE_API + '/common/upload')
-const headers = ref({ Authorization: "Bearer " + getToken() });
+const headers = ref({ Authorization: 'Bearer ' + getToken() })
-
-const url = 'https://gimg2.baidu.com/image_search/src=http%3A%2F%2Fsafe-img.xhscdn.com%2Fbw1%2F11044b08-04c1-41a0-a453-1fd20b58a614%3FimageView2%2F2%2Fw%2F1080%2Fformat%2Fjpg&refer=http%3A%2F%2Fsafe-img.xhscdn.com&app=2002&size=f9999,10000&q=a80&n=0&g=0n&fmt=auto?sec=1732953359&t=7ab1d1b3a903db85b1149914407aea35'
 
 const isDialog = defineModel()
 const prevVisible = ref(false)
@@ -88,36 +95,14 @@ const props = defineProps({
   }
 })
 
-const title = computed(() => {
-  if (props.modeType == 1) return '课标';
-  if (props.modeType == 2) return '教材';
-  if (props.modeType == 3) return '考试';
-})
 
-const radio = ref(1)
+const isPrev = (item) => {
-const radioList = ref([
+  return computed(() => {
-  { label: '浏览研读', value: 1 },
+    return ['pdf', 'png', 'jpg', 'jpeg', 'gif', 'webp'].includes(getFileSuffix(item.fileUrl))
-  { label: '跨学科研读', value: 2 },
+  })
-  { label: '跨学段研读', value: 3 },
-  { label: '课标修订研读', value: 4 },
-  { label: '自由研读', value: 5 },
-])
-const list = ref([
-  {
-    name: '高中语文课程标准',
-    url
-  }
-])
-const changeRadio = () => {
-  list.value = []
-  for (let i = 0; i < Math.floor(Math.random() * 5) + 1; i++) {
-    list.value.push({
-      name: '高中语文课程标准',
-      url
-    })
-  }
 }
-const activeIndex = ref(0)
+
+const curFileId = ref(0)
 
 const dataset_id = ref('')
 
@@ -143,43 +128,79 @@ const onSuccess = async (response) => {
   const { msg } = await addDoc(docData)
   ElMessage.success(msg)
   getList()
-
 }
 const curNode = reactive({})
 
+// 获取doc ai 文档列表
 const fileList = ref([])
 const curFile = reactive({})
 const getList = () => {
   docList({
-    userId: userInfo.userId,
+    createUser: userInfo.userId,
-    dataset_id: dataset_id.value
+    datasetId: dataset_id.value
-  }).then(res => {
+  }).then((res) => {
     fileList.value = [...res.rows]
-    Object.assign(curFile, fileList.value[0])
+   if(res.rows.length){
+      Object.assign(curFile, fileList.value[0])
+      curFileId.value = fileList.value[0].id
+    }
   })
 }
 
-const clickItem = (index, item) => {
+
-  activeIndex.value = index
+// 删除
-  Object.assign(curFile, item)
+const loading = ref(false)
-  emitter.emit('changeCurFile', item)
+const removeItem = (item) => {
+  ElMessageBox.confirm('确定要删除?', '温馨提示', {
+    confirmButtonText: '确定',
+    cancelButtonText: '取消',
+    type: 'warning'
+  })
+    .then(() => {
+      loading.value = true
+      removeDoc(item.id)
+        .then(() => {
+          ElMessage.success('操作成功')
+          getList()
+        })
+        .finally(() => {
+          loading.value = false
+        })
+    })
+    .catch(() => {})
 }
 
+// 预览
 const prevItem = reactive({})
 const onPrevItem = (item) => {
   Object.assign(prevItem, item)
   prevVisible.value = true
 }
 
+//确定选择
+const handleDialog = () => {
+  isDialog.value = false
+
+  const item = fileList.value.find((item) => item.id == curFileId.value)
+
+  Object.assign(curFile, item)
+  emitter.emit('changeCurFile', item)
+
+  // 改变左侧 pdf
+  if (getFileSuffix(curFile.fileUrl) == 'pdf') {
+    let data = cloneDeep(curFile)
+    emitter.emit('changePdfUrl', data)
+  }
+}
+
 onMounted(() => {
   let data = sessionStore.get('subject.curNode')
-  Object.assign(curNode, data);
+  Object.assign(curNode, data)
   // 暂时写死"考试-" 目前只有考试分析才会弹出来
   let jsonKey = `考试-${curNode.edustage}-${curNode.edusubject}`
   dataset_id.value = dataSetJson[jsonKey]
   getList()
 })
-
 </script>
 <style lang="scss" scoped>
 .custom-header {
@@ -198,45 +219,6 @@ onMounted(() => {
   .content-list {
     padding-top: 10px;
 
-    ul {
-      display: flex;
-      flex-wrap: wrap;
-
-      li {
-        width: 130px;
-        display: flex;
-        flex-direction: column;
-        font-size: 13px;
-        padding: 10px;
-        cursor: pointer;
-        border-radius: 5px;
-        overflow: hidden;
-        margin-right: 20px;
-        margin-bottom: 10px;
-        position: relative;
-        overflow: hidden;
-
-        .img {
-          width: 100%;
-          height: 130px;
-          border: solid #ccc 1px;
-          margin-bottom: 10px;
-        }
-
-        &:hover {
-          background: #E0EAFF;
-        }
-
-        &:hover .prev-btn {
-          transform: translate(-50%, -40px)
-        }
-      }
-
-      .li-active {
-        background: #E0EAFF;
-      }
-
-    }
   }
 }
 
@@ -246,13 +228,7 @@ onMounted(() => {
   justify-content: space-between;
 }
 
-.prev-btn {
+:deep(.el-radio__label) {
-  position: absolute;
+  display: flex;
-  top: 50%;
-  left: 50%;
-  transform: translate(-50%, -50%) translateY(-110px);
-  /* 按钮初始位置在容器外 */
-  transition: transform 0.3s ease-in-out;
-  /* 设置过渡效果 */
 }
-</style>
+</style>

src/renderer/src/components/template-study/container/left.vue

@@ -2,8 +2,9 @@
   <div class="container-left-page flex">
     <div class="container-left-header flex">
       <el-button link @click="onClick">
-        {{ curNode.edustage }}{{ curNode.edusubject }}{{ type == 1 ? '课标研读' : type == 2 ? '教材分析' : '考试分析' }}<i
+        {{ curNode.edustage }}{{ curNode.edusubject
-          class="iconfont icon-xiangxia"></i>
+        }}{{ type == 1 ? '课标研读' : type == 2 ? '教材分析' : '考试分析'
+        }}<i v-if="type == 3" class="iconfont icon-xiangxia"></i>
       </el-button>
     </div>
     <div class="container-left-pdf">
@@ -20,6 +21,7 @@ import { ref, onMounted, nextTick, reactive } from 'vue'
 import { sessionStore } from '@/utils/store'
 import PDF from '@/components/PdfJs/index.vue'
 import LeftDialog from './left-dialog.vue'
+import emitter from '@/utils/mitt'
 
 const props = defineProps(['type'])
 
@@ -29,6 +31,12 @@ const onClick = () => {
   showDialog.value = true
 }
 
+emitter.on('changePdfUrl', async (data) => {
+  pdfUrl.value = ''
+  await nextTick()
+  pdfUrl.value = data.fileUrl
+})
+
 // 加载PDF
 const pdfUrl = ref('')
 const curNode = reactive({})
@@ -36,16 +44,15 @@ onMounted(async () => {
   await nextTick()
   // 当前节点
   let nodeData = sessionStore.get('subject.curNode')
-  Object.assign(curNode, nodeData);
+  Object.assign(curNode, nodeData)
 
   let data = sessionStore.get('subject.curBook')
   let fileurl = data.fileurl
-  if(props.type == 1){
+  if (props.type == 1) {
     fileurl = `${data.edustage}-${data.edusubject}-课标.txt`
   }
-  if(fileurl == '') return
+  if (fileurl == '') return
   pdfUrl.value = import.meta.env.VITE_APP_RES_FILE_PATH + fileurl.replace('.txt', '.pdf')
-  
 })
 </script>
 
@@ -53,6 +60,7 @@ onMounted(async () => {
 .container-left-page {
   height: 100%;
   flex-direction: column;
+
   .container-left-header {
     height: 45px;
     background: #fff;
@@ -70,4 +78,4 @@ onMounted(async () => {
     flex: 1;
   }
 }
-</style>
+</style>

src/renderer/src/components/template-study/container/right.vue

@@ -16,7 +16,7 @@
       </el-dropdown>
       <div class="flex">
         <el-select v-model="curMode" placeholder="Select" class="mr-4 w-30">
-          <el-option v-for="item in modeOptions" :key="item.value" :label="item.label" :value="item.value" />
+          <el-option v-for="item in modeOptions" :key="item.value" :disabled="item.disabled" :label="item.label" :value="item.value" />
         </el-select>
         <el-button type="danger" link :disabled="!(templateList.length)" @click="removeItem(curTemplate, false)">
           删除
@@ -104,6 +104,12 @@ import { cloneDeep } from 'lodash'
 const props = defineProps(['type'])
 const { user } = useUserStore()
 
+const params = reactive(
+  {
+    prompt: '',
+    dataset_id: ''
+  }
+)
 const curMode = ref(2)
 const modeOptions = ref([
   {
@@ -112,7 +118,8 @@ const modeOptions = ref([
   },
   {
     label: '知识库模型',
-    value: 2
+    value: 2,
+    disabled: false
   }
 ])
 
@@ -288,12 +295,7 @@ const onEdit = (index, item) => {
 }
 
 // 重新研读
-const params = reactive(
+
-  {
-    prompt: '',
-    dataset_id: ''
-  }
-)
 const prompt = ref('')
 
 // 重新研读
@@ -483,7 +485,18 @@ onMounted(() => {
 
   getTemplateList()
   let jsonKey = `${modeType.value}-${data.edustage}-${data.edusubject}`
+ 
+ 
   params.dataset_id = dataSetJson[jsonKey]
+  if(!params.dataset_id){
+    curMode.value = 1
+    modeOptions.value.forEach(item => {
+      if(item.value == 2){
+        item.disabled = true
+      }
+    })
+  }
+
   // 获取百度千帆会话ID
   conversation_id.value = localStorage.getItem('conversation_id')
   if (!conversation_id.value) {

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

@@ -5,7 +5,11 @@
         <el-popover ref="popoverRef" placement="right" trigger="hover" popper-class="popoverStyle" :tabindex="999" >
           <template #reference>
             <div class="user-info">
-              <el-image class="user-img" :src="userStore.user.avatar ==='/img/avatar-default.jpg' || userStore.user.avatar ==='/images/img-avatar.png' ? defaultUserImg : dev_api + userStore.user.avatar"  />
+              <el-image class="user-img" :src="img">
+                <template #error>
+                  <img :src="route_path + userStore.user.avatar">
+                </template>
+              </el-image>
               <span>{{ userStore.user.nickName }}</span>
             </div>
           </template>
@@ -65,6 +69,7 @@ import {toLinkLeftWeb} from "@/utils/tool"
 
 const { ipcRenderer } = window.electron || {}
 const dev_api = ref(import.meta.env.VITE_APP_BASE_API)
+const route_path = ref(import.meta.env.VITE_APP_BUILD_BASE_PATH)
 const userStore = useUserStore()
 const router = useRouter()
 const currentRoute = ref('')
@@ -75,6 +80,9 @@ const activeId = ref('/home')
 const version = ref(pkc.version)
 
 const popoverRef = ref('')
+// 默认图片
+const img = ref('')
+const defaultImg = ['/img/avatar-default.jpg','/images/img-avatar.png','/src/assets/images/img-avatar.png']
 
 //是否是基地人员
 const isStadium = () => {
@@ -224,6 +232,11 @@ const logout = () => {
 onMounted(() => {
   userStore.getDeptInfo()
   // getregisterinfo()
+  if(defaultImg.includes(userStore.user.avatar)){
+    img.value = defaultUserImg
+  }else{
+    img.value = dev_api.value + userStore.user.avatar
+  }
 })
 </script>
 

src/renderer/src/layout/components/Header.vue

@@ -11,7 +11,7 @@
       <span class="ml-5">《{{ curNode.itemtitle }}》</span>
     </div>
     <div class="header-center" v-else>
-      AI文枢{{ version }}
+      {{APP_TITLE}}{{ version }}
     </div>
     <div class="header-right">
       <WindowTools />
@@ -29,6 +29,7 @@ import pkc from "../../../../../package.json"
 import { sessionStore } from '@/utils/store'
 
 const version = ref(pkc.version)
+const APP_TITLE = import.meta.env.VITE_APP_TITLE
 
 // 返回
 const router = useRouter()

src/renderer/src/main.js

@@ -27,8 +27,8 @@ import customComponent from '@/components/common' // 自定义组件
 import plugins from './plugins' // plugins插件
 import useUserStore from '@/store/modules/user'
 import aiAudio from 'aix-plugins-aitools' // 文字转语音插件
-import '../../../node_modules/aix-plugins-aitools/aitools.css' 
+import '../../../node_modules/aix-plugins-aitools/aitools.css'
- 
+
 
 if(process.env.NODE_ENV != 'development') { // 非开发环境，将日志打印到日志文件
   Object.assign(console, log.functions) // 渲染进程日志-控制台替换
@@ -55,6 +55,36 @@ VMdPreview.use(githubTheme, {
   Hljs: hljs,
 });
 
+(function () {
+  //!['development', 'mock'].includes(process.env.NODE_ENV)&&
+  if (import.meta.env.VITE_SHOW_DEV_TOOLS==='false') {
+    ['log', 'warn', 'error', 'info'].forEach((item) => {
+      console[item] = (function (func) {
+        const res = localStorage.getItem('debug');
+        if (res === 'GMV_desk') {
+          return func;
+        }
+        return function () {};
+      })(console[item]);
+    });
+  }
+})()
+
+
+let script = document.createElement('script');
+if (process.env.NODE_ENV !== 'development') {
+  const isNode = typeof require !== 'undefined'       // 是否支持node函数
+  const path = isNode?require('path'):{}
+// 设置 src 属性
+  script.src = path.join(__dirname, "/lib/build/aws-sdk-2.100.0.min.js");
+}else {
+  script.src = "https://sdk.amazonaws.com/js/aws-sdk-2.100.0.min.js";
+}
+// 设置 async 属性，让脚本异步加载
+script.async = false;
+// 将 script 元素添加到文档的 head 元素中
+document.head.appendChild(script);
+
 app.use(router)
     .use(store)
     .use(ElementPlus, { locale: zhLocale })

src/renderer/src/plugins/pptTojson/index.d.ts

@@ -0,0 +1,358 @@
+// import type { number } from "echarts"
+
+export interface Shadow {
+  h: number
+  v: number
+  blur: number
+  color: string
+}
+
+export interface Shape {
+  type: 'shape'
+  left: number
+  top: number
+  width: number
+  height: number
+  borderColor: string
+  borderWidth: number
+  borderType: 'solid' | 'dashed' | 'dotted'
+  borderStrokeDasharray: string
+  shadow?: Shadow
+  fillColor: string
+  content: string
+  isFlipV: boolean
+  isFlipH: boolean
+  rotate: number
+  shapType: string
+  vAlign: string
+  path?: string
+  name: string
+}
+
+export interface Text {
+  type: 'text'
+  left: number
+  top: number
+  width: number
+  height: number
+  borderColor: string
+  borderWidth: number
+  borderType: 'solid' | 'dashed' | 'dotted'
+  borderStrokeDasharray: string
+  shadow?: Shadow
+  fillColor: string
+  isFlipV: boolean
+  isFlipH: boolean
+  isVertical: boolean
+  rotate: number
+  content: string
+  vAlign: string
+  name: string
+}
+
+export interface Image {
+  type: 'image'
+  left: number
+  top: number
+  width: number
+  height: number
+  src: string
+  rotate: number
+  isFlipH: boolean
+  isFlipV: boolean
+}
+
+export interface TableCell {
+  text: string
+  rowSpan?: number
+  colSpan?: number
+  vMerge?: number
+  hMerge?: number
+  fillColor?: string
+  fontColor?: string
+  fontBold?: boolean
+}
+export interface Table {
+  type: 'table'
+  left: number
+  top: number
+  width: number
+  height: number
+  data: TableCell[][]
+  borderColor: string
+  borderWidth: number
+  borderType: 'solid' | 'dashed' | 'dotted'
+}
+
+export type ChartType = 'lineChart' |
+  'line3DChart' |
+  'barChart' |
+  'bar3DChart' |
+  'pieChart' |
+  'pie3DChart' |
+  'doughnutChart' |
+  'areaChart' |
+  'area3DChart' |
+  'scatterChart' |
+  'bubbleChart' |
+  'radarChart' |
+  'surfaceChart' |
+  'surface3DChart' |
+  'stockChart'
+
+export interface ChartValue {
+  x: string
+  y: number
+}
+export interface ChartXLabel {
+  [key: string]: string
+}
+export interface ChartItem {
+  key: string
+  values: ChartValue[]
+  xlabels: ChartXLabel
+}
+export type ScatterChartData = [number[], number[]]
+export interface CommonChart {
+  type: 'chart'
+  left: number
+  top: number
+  width: number
+  height: number
+  data: ChartItem[]
+  chartType: Exclude<ChartType, 'scatterChart' | 'bubbleChart'>
+  barDir?: 'bar' | 'col'
+  marker?: boolean
+  holeSize?: string
+  grouping?: string
+  style?: string
+}
+export interface ScatterChart {
+  type: 'chart'
+  left: number
+  top: number
+  width: number
+  height: number
+  data: ScatterChartData,
+  chartType: 'scatterChart' | 'bubbleChart'
+}
+export type Chart = CommonChart | ScatterChart
+
+export interface Video {
+  type: 'video'
+  left: number
+  top: number
+  width: number
+  height: number
+  blob?: string
+  src?: string
+}
+
+export interface Audio {
+  type: 'audio'
+  left: number
+  top: number
+  width: number
+  height: number
+  blob: string
+}
+
+export interface Diagram {
+  type: 'diagram'
+  left: number
+  top: number
+  width: number
+  height: number
+  elements: (Shape | Text)[]
+}
+
+export interface Math {
+  type: 'math'
+  left: number
+  top: number
+  width: number
+  height: number
+  latex: string
+}
+
+export type BaseElement = Shape | Text | Image | Table | Chart | Video | Audio | Diagram | Math
+
+export interface Group {
+  type: 'group'
+  left: number
+  top: number
+  width: number
+  height: number
+  rotate: number
+  elements: BaseElement[]
+}
+export type Element = BaseElement | Group
+
+export interface SlideColorFill {
+  type: 'color'
+  value: string
+}
+
+export interface SlideImageFill {
+  type: 'image'
+  value: {
+    picBase64: string
+    opacity: number
+  }
+}
+
+export interface SlideGradientFill {
+  type: 'gradient'
+  value: {
+    rot: number
+    colors: {
+      pos: string
+      color: string
+    }[]
+  }
+}
+
+export type SlideFill = SlideColorFill | SlideImageFill | SlideGradientFill
+
+export interface Slide {
+  fill: SlideFill
+  elements: Element[]
+  note: string
+}
+
+export interface Options {
+  slideFactor?: number
+  fontsizeFactor?: number
+}
+
+export const parse: (file: ArrayBuffer, options?: Options) => Promise<{
+  slides: Slide[]
+  size: {
+    width: number
+    height: number
+  }
+}>
+
+/** zdg: 新内容 */
+export const align = {
+  getHorizontalAlign?: (t,e,r,n) => string
+  getVerticalAlign?: (t,e,r,n) => string
+}
+export const border = {
+  getBorder?: (t,e,r) => string
+}
+export const chart = {
+  getChartInfo?: (t) => string
+}
+export const color = {
+  applyHueMod?: (t) => string
+  applyLumMod?: (t) => string
+  applyLumOff?: (t) => string
+  applySatMod?: (t) => string
+  applyShade?: (t) => string
+  applyTint?: (t) => string
+  getColorName2Hex?: (t) => string
+  hslToRgb?: (t) => string
+  hueToRgb?: (t) => string
+}
+export const fontStyle = {
+  getFontBold?: (t) => string
+  getFontColor?: (t) => string
+  getFontDecoration?: (t) => string
+  getFontDecorationLine?: (t) => string
+  getFontItalic?: (t) => string
+  getFontShadow?: (t) => string
+  getFontSize?: (t) => string
+  getFontSpace?: (t) => string
+  getFontSubscript?: (t) => string
+  getFontType?: (t) => string
+}
+export const fill = {
+  getBgGradientFill?: (bgPr, phClr, slideMasterContent, warpObj) => string|object|null
+  getBgPicFill?: (bgPr, sorce, warpObj) => object|null
+  getFillType?: (node) => string
+  getPicFill?: (type, node, warpObj) => string|null|undefined
+  getPicFillBase64?: (zipPath, zipObj) => string|null|undefined
+  getShapeFill?: (node, isSvgMode, warpObj) => object|null
+  getShapeFillBg?: (node, source, warpObj) => object<{zipPath:string,opacity:number}>|null
+  getSlideBackgroundFill?: (warpObj) => object<{type: string, value: string}>
+  getSolidFill?: (solidFill, clrMap, phClr, warpObj) => string
+}
+export const math = {
+  findOMath?: (t) => string
+  latexFormart?: (t) => string
+  parseAccent?: (t) => string
+  parseBar?: (t) => string
+  parseBox?: (t) => string
+  parseDelimiter?: (t) => string
+  parseEqArr?: (t) => string
+  parseFraction?: (t) => string
+  parseFunction?: (t) => string
+  parseGroupChr?: (t) => string
+  parseLimit?: (t) => string
+  parseMatrix?: (t) => string
+  parseNary?: (t) => string
+  parseOMath?: (t) => string
+  parseRadical?: (t) => string
+  parseSubscript?: (t) => string
+  parseSuperscript?: (t) => string
+}
+export const position = {
+  getPosition?: (t) => string
+  getPt?: (t) => string
+  getSize?: (t) => string
+}
+export const readXmlFile = {
+  readXmlFile?: (t) => string
+  simplifyLostLess?: (t) => string
+}
+export const schemeColor = {
+  getSchemeColorFromTheme?: (t) => string
+}
+export const shadow = {
+  getShadow?: (t) => string
+}
+export const shape = {
+  getCustomShapePath?: (t) => string
+  shapeArc?: (t) => string
+}
+export const table = {
+  getTableBorders?: (t) => string
+  getTableCellParams?: (t) => string
+  getTableRowParams?: (t) => string
+}
+export const text = {
+  genSpanElement?: (t) => string
+  genTextBody?: (t) => string
+  getListType?: (t) => string
+}
+export const utils = {
+  angleToDegrees?: (t) => string
+  base64ArrayBuffer?: (t) => string
+  eachElement?: (t) => string
+  escapeHtml?: (t) => string
+  extractFileExtension?: (t) => string
+  getMimeType?: (t) => string
+  getTextByPathList?: (t) => string
+  isVideoLink?: (t) => string
+  toHex?: (t) => string
+}
+
+export const genChart: (node, warpObj) => object
+export const genDiagram: (node, warpObj) => object
+export const genShape: (node, slideLayoutSpNode, slideMasterSpNode, name, type, warpObj) => object
+export const genTable: (node, warpObj) => object
+export const getContentTypes: (zip) => object
+export const getNote: (noteContent) => string
+export const getSlideInfo: (zip) => object
+export const getSlideLayoutEl: (warpObj, isPh) => Array
+export const indexNodes: (content) => object
+export const loadTheme: (zip) => object|null
+export const processCxnSpNode: (node, warpObj) => object
+export const processGraphicFrameNode: (node, warpObj, source) => string
+export const processGroupSpNode: (node, warpObj, source) => object|null
+export const processMathNode: (t) => string
+export const processNodesInSlide: (t) => string
+export const processPicNode: (t) => string
+export const processSingleSlide: (t) => string
+export const processSpNode: (t) => string

src/renderer/src/router/index.js

@@ -90,6 +90,12 @@ export const constantRoutes = [
         name: 'questionUpload',
         meta: { title: '习题上传', showBread: true  }
       },
+      {
+        path: 'groupTestPaper',
+        component: () => import('@/views/classTask/groupTestPaper/index.vue'),
+        name: 'groupTestPaper',
+        meta: { title: '自动组卷', showBread: true  }
+      },
       {
         path: 'aiKolors',
         component: () => import('@/components/ai-kolors/index.vue'),

src/renderer/src/utils/comm.js

@@ -411,12 +411,14 @@ export const dataSetJson = {
   "考试-小学-语文": "570f7ed2cc9d11ef9e070242ac140002",
   "考试-小学-数学": "983270b8cc9d11efbbd80242ac140002",
   "考试-小学-英语": "d5f80e4ccc9d11ef96fa0242ac140002",
+  "课标-小学-信息科技": "2fe08c7ad18911efbeaa0242ac140002",
   "课标-小学-科学": "935cfec8bf6a11ef98950242ac140006",
   "课标-小学-数学": "3c4e298fbf7911ef8e8b0242ac140002",
   "课标-小学-语文": "f76f1aa5bf7111ef90c80242ac140002",
   "课标-小学-道德": "8da87869cbd711ef92280242ac140002",
   "课标-小学-英语": "dc963316cbd811ef8d820242ac140002",
   "课标-小学-劳动": "fc047d81cbdc11efa1740242ac140002",
+  "教材-小学-信息科技": "2fe08c7ad18911efbeaa0242ac140002",
   "教材-小学-科学": "935cfec8bf6a11ef98950242ac140006",
   "教材-小学-数学": "3c4e298fbf7911ef8e8b0242ac140002",
   "教材-小学-语文": "f76f1aa5bf7111ef90c80242ac140002",

src/renderer/src/utils/ppt/svgUtils.js

@@ -0,0 +1,138 @@
+/**
+ * svg 相关工具类
+ * @module svgUtils
+ * import { svgUtils } from '@/utils/svgUtils'
+ * @author: zdg
+ */
+
+// zdg: 计算路径的边界
+export const calculatePathDimensions = (d)  => {
+  let minX = Infinity;
+  let maxX = -Infinity;
+  let minY = Infinity;
+  let maxY = -Infinity;
+  let currentX = 0;
+  let currentY = 0;
+  const commandRegex = /([A-Za-z])([^A-Za-z]+)/g;
+  let match;
+  while ((match = commandRegex.exec(d))!== null) {
+      const type = match[1];
+      const params = match[2].trim().split(/\s+|,/).map(Number);
+      switch (type) {
+          case 'M': // 移动到
+              currentX = params[0];
+              currentY = params[1];
+              break;
+          case 'L': // 直线到
+              currentX = params[0];
+              currentY = params[1];
+              break;
+          case 'H': // 水平直线
+              currentX = params[0];
+              break;
+          case 'V': // 垂直直线
+              currentY = params[0];
+              break;
+          case 'C': // 三次贝塞尔曲线
+              for (let i = 0; i < params.length; i += 6) {
+                  const control1X = params[i];
+                  const control1Y = params[i + 1];
+                  const control2X = params[i + 2];
+                  const control2Y = params[i + 3];
+                  const endX = params[i + 4];
+                  const endY = params[i + 5];
+                  // 更新边界
+                  if (control1X < minX) minX = control1X;
+                  if (control1X > maxX) maxX = control1X;
+                  if (control1Y < minY) minY = control1Y;
+                  if (control1Y > maxY) maxY = control1Y;
+                  if (control2X < minX) minX = control2X;
+                  if (control2X > maxX) maxX = control2X;
+                  if (control2Y < minY) minY = control2Y;
+                  if (control2Y > maxY) maxY = control2Y;
+                  if (endX < minX) minX = endX;
+                  if (endX > maxX) maxX = endX;
+                  if (endY < minY) minY = endY;
+                  if (endY > maxY) maxY = endY;
+                  currentX = endX;
+                  currentY = endY;
+              }
+              break;
+          case 'S': // 光滑三次贝塞尔曲线
+              for (let i = 0; i < params.length; i += 4) {
+                  const controlX = params[i];
+                  const controlY = params[i + 1];
+                  const endX = params[i + 2];
+                  const endY = params[i + 3];
+                  // 更新边界
+                  if (controlX < minX) minX = controlX;
+                  if (controlX > maxX) maxX = controlX;
+                  if (controlY < minY) minY = controlY;
+                  if (controlY > maxY) maxY = controlY;
+                  if (endX < minX) minX = endX;
+                  if (endX > maxX) maxX = endX;
+                  if (endY < minY) minY = endY;
+                  if (endY > maxY) maxY = endY;
+                  currentX = endX;
+                  currentY = endY;
+              }
+              break;
+          case 'Q': // 二次贝塞尔曲线
+              for (let i = 0; i < params.length; i += 4) {
+                  const controlX = params[i];
+                  const controlY = params[i + 1];
+                  const endX = params[i + 2];
+                  const endY = params[i + 3];
+                  // 更新边界
+                  if (controlX < minX) minX = controlX;
+                  if (controlX > maxX) maxX = controlX;
+                  if (controlY < minY) minY = controlY;
+                  if (controlY > maxY) maxY = controlY;
+                  if (endX < minX) minX = endX;
+                  if (endX > maxX) maxX = endX;
+                  if (endY < minY) minY = endY;
+                  if (endY > maxY) maxY = endY;
+                  currentX = endX;
+                  currentY = endY;
+              }
+              break;
+          case 'T': // 光滑二次贝塞尔曲线
+              for (let i = 0; i < params.length; i += 2) {
+                  const endX = params[i];
+                  const endY = params[i + 1];
+                  // 更新边界
+                  if (endX < minX) minX = endX;
+                  if (endX > maxX) maxX = endX;
+                  if (endY < minY) minY = endY;
+                  if (endY > maxY) maxY = endY;
+                  currentX = endX;
+                  currentY = endY;
+              }
+              break;
+          case 'A': // 椭圆弧
+              const endX = params[5];
+              const endY = params[6];
+              // 更新边界
+              if (endX < minX) minX = endX;
+              if (endX > maxX) maxX = endX;
+              if (endY < minY) minY = endY;
+              if (endY > maxY) maxY = endY;
+              currentX = endX;
+              currentY = endY;
+              break;
+          case 'Z': // 闭合路径
+              // 闭合路径不影响边界，这里不需要额外操作
+              break;
+          default:
+              console.error(`Unknown command: ${type}`);
+              break;
+      }
+      if (currentX < minX) minX = currentX;
+      if (currentX > maxX) maxX = currentX;
+      if (currentY < minY) minY = currentY;
+      if (currentY > maxY) maxY = currentY;
+  }
+  const width = maxX - minX;
+  const height = maxY - minY;
+  return { width, height };
+}

src/renderer/src/views/classManage/basicGroup.vue

@@ -9,11 +9,8 @@
       <div style="font-size: 16px;font-weight: bold;color: #000;text-align: left;margin-bottom: 5px">可用分组</div>
       <div class="groupList">
         <template v-for="(item,index) in groupList" :key="index">
-          <el-card style="width: 20%;
+          <el-card 
-          margin-right: 10px;
+          class="card_div"
-          margin-bottom: 10px;
-          cursor: pointer;
-          position: relative;"
            v-if="item.parentid === 0"
            @mouseenter="cardEnter(item,index)"
            @mouseleave="cardLeave(item,index)"
@@ -391,6 +388,7 @@ watch(()=> props.classId,()=> {
 .groupList{
   display: flex;
   flex-wrap: wrap;
+  gap:10px;
 }
 .card-row {
   font-size: 12px;
@@ -415,4 +413,10 @@ watch(()=> props.classId,()=> {
   display: flex;
   flex-direction: column;
 }
+.card_div{
+  width: calc(20% - 10px);
+  margin-bottom: 10px;
+  cursor: pointer;
+  position: relative;
+}
 </style>

src/renderer/src/views/classManage/classInfo.vue

@@ -1,14 +1,69 @@
 <template>
   <el-card style="width: 100%;height: 100%">
-    <el-descriptions :column="1">
+    <el-descriptions
-      <el-descriptions-item label="班级名称">{{ classInfo.caption }}</el-descriptions-item>
+      class="margin-top"
-      <el-descriptions-item label="教师">
+      :column="6"
+      :size="size"
+      border
+    >
+      <el-descriptions-item :span="2" :width="120">
+        <template #label>
+          <div class="cell-item">
+            <el-icon :style="iconStyle">
+              <user />
+            </el-icon>
+            班级名称
+          </div>
+        </template>
+        {{ classInfo.caption }}
+      </el-descriptions-item>
+      <el-descriptions-item :span="2" :width="120">
+        <template #label>
+          <div class="cell-item">
+            <el-icon :style="iconStyle">
+              <tickets />
+            </el-icon>
+            学段
+          </div>
+        </template>
+        {{ currentGrade }}
+      </el-descriptions-item>
+      <el-descriptions-item :span="2" :width="120">
+        <template #label>
+          <div class="cell-item">
+            <el-icon :style="iconStyle">
+              <location />
+            </el-icon>
+            年级
+          </div>
+        </template>
+        {{ currentGradeName }}
+      </el-descriptions-item>
+      <el-descriptions-item :span="2" :width="120">
+        <template #label>
+          <div class="cell-item">
+            <el-icon :style="iconStyle">
+              <iphone />
+            </el-icon>
+            学生人数
+          </div>
+        </template>
+        {{ classInfo.classstudentcount || 0 }}人
+      </el-descriptions-item>
+      <el-descriptions-item :span="4" :width="120">
+        <template #label>
+          <div class="cell-item">
+            <el-icon :style="iconStyle">
+              <office-building />
+            </el-icon>
+            教师
+          </div>
+        </template>
         <template v-if="classInfo.teacher.length > 0">
           <el-tag style="margin-right: 5px;margin-bottom: 5px;" type="primary" v-for="(item, index) in classInfo.teacher" :key="index">{{item.name}}</el-tag>
         </template>
         <template v-else>{{ classInfo.teachername }}</template>
       </el-descriptions-item>
-      <el-descriptions-item label="学生人数">{{ classInfo.classstudentcount || 0 }}人</el-descriptions-item>
     </el-descriptions>
   </el-card>
 </template>
@@ -17,7 +72,7 @@
   import {ElMessage, ElMessageBox} from "element-plus";
   import { getClassmain,listClassuser,leaveClass} from '@/api/classManage/index'
   import useUserStore from '@/store/modules/user'
-  import {reactive,onMounted,nextTick,watch} from 'vue'
+  import {reactive,onMounted,nextTick,watch,ref} from 'vue'
   import delClassDemo from '@/store/modules/delClass'
   const props = defineProps({
     classId: {
@@ -31,6 +86,36 @@
   })
   const isDelClass = delClassDemo()
   const userStore = useUserStore().user
+  // 当前年级
+  const currentGradeName = ref('')
+  // 当前学段
+  const currentGrade = ref('')
+  // 获取年级
+  const gradeDataList = reactive([
+    [
+      { label: '一年级', agekey: 1, checked: false, current: 1 },
+      { label: '二年级', agekey: 2, checked: false, current: 1 },
+      { label: '三年级', agekey: 3, checked: false, current: 1 },
+      { label: '四年级', agekey: 4, checked: false, current: 1 },
+      { label: '五年级', agekey: 5, checked: false, current: 1 },
+      { label: '六年级', agekey: 6, checked: false, current: 1 },
+    ],
+    [
+      { label: '初一', agekey: 7, checked: false, current: 2 },
+      { label: '初二', agekey: 8, checked: false, current: 2 },
+      { label: '初三', agekey: 9, checked: false, current: 2 },
+    ],
+    [
+      { label: '高一', agekey: 10, checked: false, current: 3 },
+      { label: '高二', agekey: 11, checked: false, current: 3 },
+      { label: '高三', agekey: 12, checked: false, current: 3 },
+    ],
+  ])
+  const gradeData = reactive([
+    {current:1, label:'小学',},
+    {current:2, label:'初中',},
+    {current:3, label:'高中',},
+  ])
   //删除教室
   const deleteClassRoom = () => {
     ElMessageBox.alert('确认删除该班级？', {
@@ -53,6 +138,14 @@
     if(props.classId){
       getClassmain(props.classId).then(response => {
         Object.assign(classInfo,response.data)
+        //先把二级数组转化为一级数组，用于筛选
+        const flatGradeDataList = gradeDataList.flat();
+        //学段和年级的回显处理
+        const currentIndex = flatGradeDataList.findIndex(item => item.agekey === Number(response.data.agekey));
+        currentGradeName.value = flatGradeDataList[currentIndex].label
+        const current = flatGradeDataList[currentIndex].current
+        currentGrade.value = gradeData.find(item => item.current === current).label
+        console.log(classInfo,'classInfo');
         listClassuser({classid:props.classId,pageSize:100}).then(res => {
           classInfo.teacher = res.rows.filter(item => item.inrole === 'teacher')
           classInfo.student = res.rows.filter(item => item.inrole === 'student')
@@ -71,5 +164,14 @@
 </script>
 
 <style scoped>
-
+.el-descriptions {
+  margin-top: 20px;
+}
+.cell-item {
+  display: flex;
+  align-items: center;
+}
+.margin-top {
+  margin-top: 20px;
+}
 </style>

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

@@ -0,0 +1,195 @@
+<template>
+  <div  class="page-testpaper">
+    <div class="page-center">
+      <el-tabs v-model="activeAptTab" style="height: 100%;">
+        <el-tab-pane label="自主搜题" name="自主搜题" class="prepare-center-zzst">
+          <SearchQuestion :bookobj="courseObj" @addQuizItem="handleClassWorkQuizItemAdd" />
+        </el-tab-pane>
+        <!-- <el-tab-pane label="校本题库" name="校本题库" class="prepare-center-xbtk">
+          <SchoolQuestion />
+        </el-tab-pane> -->
+        <el-tab-pane label="个人题库" name="个人题库" class="prepare-center-grst">
+          <MyQuestion :bookobj="courseObj" @addQuizItem="handleClassWorkQuizItemAdd"/>
+        </el-tab-pane>
+      </el-tabs>
+    </div>
+    <div class="page-right">
+      <p>总{{ classWorkForm.quizlist.length }}题 <span>进入组卷中心</span></p>
+      <div v-for="(item, index) in classWorkForm.worktypeList" :key="index" class="page-right-item"> 
+        <span>{{ item.key }}: {{ item.value }}题</span> <span @click="handleDeleteQuizItem(item)">删除</span>
+      </div>
+    </div>
+
+
+  </div>
+</template>
+<script setup>
+import { onMounted, ref, watch, reactive, getCurrentInstance, nextTick, defineEmits } from 'vue'
+import { ElMessage } from 'element-plus'
+import { cloneDeep } from 'lodash'
+import { processList } from '@/hooks/useProcessList'
+
+import MyQuestion from '@/views/classTask/newClassTaskAssign/myQuestion/index.vue'
+import SearchQuestion from '@/views/classTask/newClassTaskAssign/searchQuestion/index.vue'
+
+import { useGetHomework } from '@/hooks/useGetHomework'
+import { sessionStore } from '@/utils/store'
+import { useRouter, useRoute } from 'vue-router'
+import useUserStore from '@/store/modules/user'
+import useClassTaskStore from '@/store/modules/classTask'
+
+const userStore = useUserStore().user
+const route = useRoute();
+const router = useRouter()
+const { proxy } = getCurrentInstance()
+
+const emits = defineEmits(['getData'])
+const props = defineProps({
+  currentCourse: Object,
+})
+
+const propsQueryCourseObj = route.query.courseObj;//作业布置的内容对象
+const courseObj = reactive({
+  // 课程相关参数: 教材id,单元id,章节id,课程名称
+  textbookId: '',
+  levelFirstId: '',
+  levelSecondId: '',
+  coursetitle:'',
+  node: null, // 选择的课程节点
+  //
+})
+const activeAptTab =  ref("自主搜题");
+let classWorkForm =  reactive({
+  id: '',// ,
+  uniquekey: '',// , // 作业唯一标识 作业名称
+  worktype: '',//  '习题训练', //作业类型
+  worktypeList: [],//  '习题训练', //作业类型
+  title: '',// // 作业说明
+  quizlist: [],// // 作业习题列表内容
+}); // 需要提交 提交的作业内容
+
+
+
+onMounted(() => {
+  if(propsQueryCourseObj){
+    if(JSON.parse(propsQueryCourseObj)){
+      courseObj.textbookId = JSON.parse(propsQueryCourseObj).bookObj  // 版本
+      courseObj.levelFirstId = JSON.parse(propsQueryCourseObj).levelFirstId  // 单元
+      courseObj.levelSecondId = JSON.parse(propsQueryCourseObj).levelSecondId // 章节
+      courseObj.coursetitle = JSON.parse(propsQueryCourseObj).coursetitle  // (单元/章节) 名称
+      courseObj.node = JSON.parse(propsQueryCourseObj).node; // 保存当前节点
+    }
+  }
+})
+
+/**
+ * 添加作业
+ * @param entpcourseworkid
+ */
+ const handleClassWorkQuizItemAdd = (row) => {
+  var exist = false;
+  for (var i=0; i< classWorkForm.quizlist.length; i++) {
+    if (classWorkForm.quizlist[i].id == row.id) {
+      exist = true;
+      break;
+    }
+  }
+  if (exist == false) {
+    // getEntpcoursework(entpcourseworkid).then(res => {
+    //   //res.data.titletext = res.data.title.replace(/<[^>]+>/g, '');
+    //   // 暂时手动新增试题的分数
+    //   if(res.data.score == null){
+    //     res.data.score = 4;
+    //   }
+    //   classWorkForm.quizlist.push(res.data);
+    //   // 格式化试题
+    //   processList(classWorkForm.quizlist);
+    // })
+
+    // TODO 先写死
+    classWorkForm.quizlist.push(row);
+      // 格式化试题
+    processList(classWorkForm.quizlist);
+
+    console.log(classWorkForm.quizlist)
+    // 作业类型分类
+    classWorkForm.quizlist && classWorkForm.quizlist.forEach(item => {
+      if(!classWorkForm.worktypeList.some(i => i.key.includes(item.worktype))){
+        const num = classWorkForm.quizlist.filter(_item => _item.key == item.worktype).length
+        const obj = {
+          key: item.worktype,
+          value: num
+        }
+        classWorkForm.worktypeList.push(obj)
+      }
+    })
+    console.log(classWorkForm.worktypeList)
+
+  } else {
+    ElMessage('试题已经存在')
+  }
+}
+/**
+ * 删除作业类型试题
+ * @param row 
+ */
+const handleDeleteQuizItem = (row) => {
+  for (var i=0; i< classWorkForm.worktypeList.length; i++) {
+    if (classWorkForm.worktypeList[i].key == row.key) {
+      classWorkForm.worktypeList.splice(i, 1);
+      break;
+    }
+  }
+  for (var j=0; j< classWorkForm.quizlist.length; j++) {
+    if (classWorkForm.quizlist[j].worktype == row.key) {
+      classWorkForm.quizlist.splice(j, 1);
+      break;
+    }
+  }
+  
+}
+
+
+
+watch(() => props.currentCourse, (newVal, oldVal) => {
+ 
+},{deep:true})
+
+
+
+</script>
+<style scoped lang="scss">
+.page-testpaper {
+  height: 100%;
+  display: flex;
+  flex-direction: row;
+  .page-center{
+    flex: 1;
+    //min-width: calc(100% - 675px);
+    height: 100%;
+    padding: 0 5px;
+    margin: 0 5px;
+    overflow: hidden;
+    border-radius: 10px;
+    background-color: white;
+
+    .prepare-center-zzst{
+      height: 100%;
+      display: flex;
+      flex-direction: column;
+
+
+    }
+    .prepare-center-xbtk{
+      height: 100%;
+    }
+    .prepare-center-grst{
+      height: 100%;
+    }
+  }
+  .page-right{
+    flex: 1;
+  }
+}
+
+</style>

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

@@ -38,6 +38,7 @@ const items = shallowRef([
   // { title: 'AI设计作业', description: '通过AI助手，根据课标、教材、考试等分析结果，智能创建作业。', icon: '#icon-jiqiren_o',type:'danger' },
   { title: '习题上传', description: '自己上传个人题库。', icon: '#icon-shangchuan',type:'danger' },
   { title: '科学实验', description: '学生完成虚拟仿真实验，并提交实验结果。', icon: '#icon-shangchuan',type:'primary' },
+  // { title: '自主组卷', description: '老师自主选择试题组卷。', icon: '#icon-shangchuan',type:'primary' },
 ]);
 
 const handleClick = (item) => {

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

@@ -1,27 +1,25 @@
 <template>
-  <div  class="page">
+  <div class="page">
     <div class="page-top" v-if="!isShow">
-      <div class="page-top-left">
+      <div>
         <el-button type="danger" :icon="Delete" @click="handleDelete">删除</el-button>
         <el-button type="success" @click="handleTaskAssignToAllClass()">批量推送</el-button>
       </div>
-      <div v-if="currentRow.id > 0" class="page-top-right">
+      <div style="margin-left: 20px;">
-        <el-button type="primary"  @click="handleNewAllClass" :icon="Plus">设计新作业</el-button>
+        <div v-if="currentRow.id > 0">
+          <el-button type="primary" @click="handleNewAllClass"><i class="iconfont icon-fanhui"></i>返回 设计作业</el-button>
+        </div>
+        <div v-else>
+          <span style="font-size: 14px; color: red">温馨提示：选择下列作业类型可进行作业设计</span>
+        </div>
       </div>
     </div>
     <div class="page-resource">
       <div class="page-left" v-if="!isShow">
-        <el-table
+        <el-table ref="taskTable" v-loading="tasklist_loading" :data="taskList" :tree-props="{ checkStrictly: true }"
-          ref="taskTable"
+          row-key="id" style="width: 100%;height: 100%; border: 1px solid #dcdfe6;border-radius: 3px;flex:1"
-          v-loading="tasklist_loading"
+          highlight-current-row @current-change="handleCurrentChange">
-          :data="taskList"
+          <el-table-column type="selection" min-width="2%" align="center" :selectable="selectable" />
-          :tree-props="{checkStrictly: true}"
-          row-key="id"
-          style="width: 100%;height: 100%; border: 1px solid #dcdfe6;border-radius: 3px;flex:1"
-          highlight-current-row
-          @current-change="handleCurrentChange"
-        >
-          <el-table-column type="selection"  min-width="2%" align="center" :selectable="selectable"/>
           <el-table-column label="作业布置" min-width="15%" align="center">
             <template #default="scope">
               <div style="height: 100px;cursor: pointer">
@@ -31,11 +29,13 @@
                       <span>{{ scope.row.uniquekey }}</span>
                     </div>
                     <div class="pageleft-table-top" style="display: flex;justify-content: space-between">
-                      <el-tag style="padding:0 2px" :type="scope.row.workclass" size="default">{{ scope.row.worktype }}</el-tag>
+                      <el-tag style="padding:0 2px" :type="scope.row.workclass" size="default">{{ scope.row.worktype
+                        }}</el-tag>
                       <el-text size="small" style="color:#ccc;white-space:nowrap">{{ scope.row.timestamp }}</el-text>
                     </div>
                     <div class="pageleft-table-cont">
-                      <div :title="scope.row.worktag || scope.row.title" class="ellipsis "> {{ scope.row.worktype == "课堂展示" ? scope.row.worktag : scope.row.title }}</div>
+                      <div :title="scope.row.worktag || scope.row.title" class="ellipsis "> {{ scope.row.worktype ==
+                        "课堂展示" ? scope.row.worktag : scope.row.title }}</div>
                     </div>
                   </div>
                   <svg class="icon iconfont" aria-hidden="true">
@@ -53,7 +53,8 @@
         <Right @itemClick="handleItemClick" />
       </div>
 
-      <div v-if="(currentRow.worktype == '习题训练' || classWorkForm.worktype == '习题训练') && currentRow.id>0" class="page-center">
+      <div v-if="(currentRow.worktype == '习题训练' || classWorkForm.worktype == '习题训练') && currentRow.id > 0"
+        class="page-center">
         <el-tabs v-model="activeAptTab" style="height: 100%;">
           <el-tab-pane label="自主搜题" name="自主搜题" class="prepare-center-zzst">
             <SearchQuestion :bookobj="courseObj" @addQuiz="handleClassWorkQuizAdd" />
@@ -62,59 +63,65 @@
             <SchoolQuestion />
           </el-tab-pane> -->
           <el-tab-pane label="个人题库" name="个人题库" class="prepare-center-grst">
-            <MyQuestion :bookobj="courseObj" @addQuiz="handleClassWorkQuizAdd"/>
+            <MyQuestion :bookobj="courseObj" @addQuiz="handleClassWorkQuizAdd" />
           </el-tab-pane>
         </el-tabs>
       </div>
-      <div v-if="(currentRow.worktype == '课堂展示' || classWorkForm.worktype == '课堂展示') && currentRow.id>0" class="page-center">
+      <div v-if="(currentRow.worktype == '课堂展示' || classWorkForm.worktype == '课堂展示') && currentRow.id > 0"
+        class="page-center">
         <div v-loading="boardLoading" class="board-wrap" style="height: 100%; flex: 1; overflow: hidden;">
-          <whiteboard ref="boardref" height="100%" width="100%" :isShowSave="false" :data="classWorkForm.whiteboardObj" />
+          <whiteboard ref="boardref" height="100%" width="100%" :isShowSave="false"
+            :data="classWorkForm.whiteboardObj" />
         </div>
       </div>
-      <div v-if="(currentRow.worktype == '常规作业' || classWorkForm.worktype == '常规作业')&& currentRow.id>0" class="page-center">
+      <div v-if="(currentRow.worktype == '常规作业' || classWorkForm.worktype == '常规作业') && currentRow.id > 0"
+        class="page-center">
         <div v-loading="fileLoading" class="upload-homework">
-          <FileUpload v-model="classWorkForm.fileHomeworkList" :fileSize="800" :fileType="['mp3','mp4','doc','docx','xlsx','xls','pdf','ppt','pptx','jpg','jpeg','gif','png','txt']"/>
+          <FileUpload v-model="classWorkForm.fileHomeworkList" :fileSize="800"
+            :fileType="['mp3', 'mp4', 'doc', 'docx', 'xlsx', 'xls', 'pdf', 'ppt', 'pptx', 'jpg', 'jpeg', 'gif', 'png', 'txt']" />
         </div>
       </div>
-      <div v-if="(currentRow.worktype == '科学实验' || classWorkForm.worktype == '科学实验')&& currentRow.id>0" class="page-center">
+      <div v-if="(currentRow.worktype == '科学实验' || classWorkForm.worktype == '科学实验') && currentRow.id > 0"
+        class="page-center">
         <div class="experiment-homework">
-          <ExperimentQuestion :expObj="classWorkForm.fileHomeworkList&&classWorkForm.fileHomeworkList[0]" @clickExpObj="getExpObj" />  
+          <ExperimentQuestion :expObj="classWorkForm.fileHomeworkList&&classWorkForm.fileHomeworkList[0]" @clickExpObj="getExpObj" />
         </div>
       </div>
 
-      <div v-if="currentRow.id>0 " class="page-right">
+      <div v-if="currentRow.id > 0" class="page-right">
-        <div class="prepare-top" >
+        <div class="prepare-top">
-          <el-button v-if="currentRow.id != 1 " type="success" @click="openSet(currentRow,'item')">推 送</el-button>
+          <span>作业详情说明</span>
+          <el-button v-if="currentRow.id != 1" type="success" @click="openSet(currentRow, 'item')">推 送</el-button>
           <el-button type="primary" @click="handleClassWorkSave">保 存</el-button>
         </div>
-        <div class="prepare-con" >
+        <div class="prepare-con">
-          <el-form
+          <el-form ref="classWorkFormRef" :model="classWorkForm" label-width="90"
-            ref="classWorkFormRef"
+            style=" height: 100%; overflow: hidden;display: flex;flex-direction: column;">
-            :model="classWorkForm"
+            <div>
-            label-width="90"
-            style=" height: 100%; overflow: hidden;display: flex;flex-direction: column;"
-          >
-            <div >
               <el-form-item label="作业名称">
-                <el-input v-model="classWorkForm.uniquekey" type="text" placeholder="请输入作业名称"/>
+                <el-input v-model="classWorkForm.uniquekey" type="text" placeholder="请输入作业名称" />
               </el-form-item>
               <el-form-item label="作业说明" style="margin: 10px 0;">
-                <el-input v-if="classWorkForm.worktype != '课堂展示'" v-model="classWorkForm.title"  style="width: 400px"   placeholder="请输入作业说明"/>
+                <el-input v-if="classWorkForm.worktype != '课堂展示'" v-model="classWorkForm.title" style="width: 400px"
+                  placeholder="请输入作业说明" />
                 <!-- 课堂展示 这里字段不一样 -->
-                <el-input v-if="classWorkForm.worktype == '课堂展示'" v-model="classWorkForm.question" type="textarea"  placeholder="请输入作业说明" />
+                <el-input v-if="classWorkForm.worktype == '课堂展示'" v-model="classWorkForm.question" type="textarea"
+                  placeholder="请输入作业说明" />
               </el-form-item>
             </div>
 
             <div v-if="classWorkForm.worktype == '习题训练'" class="pageRight-list">
-              <div :style="{height: '100%', 'overflow': 'auto', 'border':'1px dotted blue','border-radius':'5px', 'background-color': '#f7f7f7'}">
+              <div
-                <template v-for="(item,index) in classWorkForm.quizlist" :key="item.id">
+                :style="{ height: '100%', 'overflow': 'auto', 'border': '1px dotted blue', 'border-radius': '5px', 'background-color': '#f7f7f7' }">
+                <template v-for="(item, index) in classWorkForm.quizlist" :key="item.id">
                   <div style="margin: 5px; background-color: white; text-align: left;">
                     <div v-html="item.titleFormat" style="padding: 15px 20px 5px 20px"></div>
                     <div style="display: flex;">
                       <el-form-item label="分值">
-                        <el-input-number v-model="item.score" :min="1" :max="100" size="small"></el-input-number >
+                        <el-input-number v-model="item.score" :min="1" :max="100" size="small"></el-input-number>
                       </el-form-item>
-                      <div style="margin-left: auto; padding: 0px 20px"><el-button size="small" type="danger" @click="handleClassWorkFormQuizRemove(index)">删除</el-button></div>
+                      <div style="margin-left: auto; padding: 0px 20px"><el-button size="small" type="danger"
+                          @click="handleClassWorkFormQuizRemove(index)">删除</el-button></div>
                     </div>
                   </div>
                 </template>
@@ -126,7 +133,8 @@
     </div>
 
     <!-- 推送作业的配置对话框 -->
-    <SetHomework v-model="setDialog" :entpcourseid="entpcourseid" :rows="rowsList" @on-close="closeHomework" @on-success="successHomework"/>
+    <SetHomework v-model="setDialog" :entpcourseid="entpcourseid" :rows="rowsList" @on-close="closeHomework"
+      @on-success="successHomework" />
   </div>
 </template>
 <script setup>
@@ -135,9 +143,9 @@ import { ElMessage } from 'element-plus'
 import { cloneDeep } from 'lodash'
 import { Plus, Delete } from '@element-plus/icons-vue'
 import { delClasswork } from '@/api/teaching/classwork'
-import {listEntpcoursework, listEntpcourseworkNew, getEntpcoursework} from '@/api/education/entpCourseWork'
+import { listEntpcoursework, listEntpcourseworkNew, getEntpcoursework } from '@/api/education/entpCourseWork'
 import { addClassworkReturnId } from '@/api/teaching/classwork'
-import { updateClasswork, listEvaluationclue, listClassworkeval,delClassworkeval,addClassworkeval,updateClassworkeval } from '@/api/classTask'
+import { updateClasswork, listEvaluationclue, listClassworkeval, delClassworkeval, addClassworkeval, updateClassworkeval } from '@/api/classTask'
 
 import { processList } from '@/hooks/useProcessList'
 import { editListItem } from '@/hooks/useClassTask'
@@ -161,6 +169,7 @@ const route = useRoute();
 const router = useRouter()
 const { proxy } = getCurrentInstance()
 const useClassTaskStores = useClassTaskStore();
+const { ipcRenderer } = require('electron')
 
 const props = defineProps({
   currentCourse: Object,
@@ -179,12 +188,12 @@ const courseObj = reactive({
   textbookId: '',
   levelFirstId: '',
   levelSecondId: '',
-  coursetitle:'',
+  coursetitle: '',
   node: null, // 选择的课程节点
   //
 })
 const taskTable = ref(null);
-const activeAptTab =  ref("自主搜题");
+const activeAptTab = ref("自主搜题");
 const taskList = ref([]); // 作业列表
 const tasklist_loading = ref(false); // 加载中
 const classWorkFormRef = ref(null);
@@ -194,7 +203,7 @@ const setDialog = ref(false); // 推送配置 弹窗
 const rowsList = ref([]) // 当前需要推送行的数据
 const entpcourseid = ref('') // 当前课程id
 
-const currentRow = ref({id:0}); // 当前选中的行--左侧作业布置模版列表
+const currentRow = ref({ id: 0 }); // 当前选中的行--左侧作业布置模版列表
 
 // 课堂展示-------
 const boardLoading = ref(false);
@@ -204,16 +213,16 @@ const fileLoading = ref(false); // 常规作业loading
 onMounted(() => {
   //console.log("----onMounted-------");
   currentRow.value.id = 0
-  if(propsQueryCourseObj){
+  if (propsQueryCourseObj) {
-    if(JSON.parse(propsQueryCourseObj)){
+    if (JSON.parse(propsQueryCourseObj)) {
       courseObj.textbookId = JSON.parse(propsQueryCourseObj).bookObj  // 版本
       courseObj.levelFirstId = JSON.parse(propsQueryCourseObj).levelFirstId  // 单元
       courseObj.levelSecondId = JSON.parse(propsQueryCourseObj).levelSecondId // 章节
       courseObj.coursetitle = JSON.parse(propsQueryCourseObj).coursetitle  // (单元/章节) 名称
       courseObj.node = JSON.parse(propsQueryCourseObj).node; // 保存当前节点
     }
-  }else{
+  } else {
-    if(props.currentCourse){
+    if (props.currentCourse) {
       courseObj.textbookId = props.currentCourse.textbookId  // 版本
       courseObj.levelFirstId = props.currentCourse.levelFirstId  // 单元
       courseObj.levelSecondId = props.currentCourse.levelSecondId // 章节
@@ -221,11 +230,11 @@ onMounted(() => {
       courseObj.node = props.currentCourse.node; // 保存当前节点
       classWorkForm.worktype = props.currentCourse.worktype
       currentRow.value = {
-        id:props.currentCourse.id,
+        id: props.currentCourse.id,
-        worktype:props.currentCourse.worktype
+        worktype: props.currentCourse.worktype
       }
       isShow.value = true;
-    }else{
+    } else {
       isShow.value = false;
     }
   }
@@ -234,8 +243,8 @@ onMounted(() => {
 })
 // 是否进入个人题库
 const isInToMyQuestion = () => {
-  console.log('isOpenQuestUploadView',useClassTaskStores.isOpenQuestUploadView);
+  console.log('isOpenQuestUploadView', useClassTaskStores.isOpenQuestUploadView);
-  if(useClassTaskStores.isOpenQuestUploadView){
+  if (useClassTaskStores.isOpenQuestUploadView) {
     useClassTaskStores.isOpenQuestUploadView = false;
 
     currentRow.value.id = 1; // 作业设计
@@ -253,23 +262,23 @@ const isInToMyQuestion = () => {
   }
 }
 watch(() => props.currentCourse, (newVal, oldVal) => {
-  if(newVal){
+  if (newVal) {
-      courseObj.textbookId = newVal.textbookId  // 版本
+    courseObj.textbookId = newVal.textbookId  // 版本
-      courseObj.levelFirstId = newVal.levelFirstId  // 单元
+    courseObj.levelFirstId = newVal.levelFirstId  // 单元
-      courseObj.levelSecondId = newVal.levelSecondId // 章节
+    courseObj.levelSecondId = newVal.levelSecondId // 章节
-      courseObj.coursetitle = newVal.coursetitle  // (单元/章节) 名称
+    courseObj.coursetitle = newVal.coursetitle  // (单元/章节) 名称
-      courseObj.node = newVal.node; // 保存当前节点
+    courseObj.node = newVal.node; // 保存当前节点
-      classWorkForm.worktype = newVal.worktype
+    classWorkForm.worktype = newVal.worktype
-      currentRow.value = {
+    currentRow.value = {
-        id:props.currentCourse.id,
+      id: props.currentCourse.id,
-        worktype:props.currentCourse.worktype
+      worktype: props.currentCourse.worktype
-      }
     }
-    console.log(newVal,'newval');
+  }
-},{deep:true})
+  console.log(newVal, 'newval');
+}, { deep: true })
 
 // ------------科学实验
-const getExpObj = (obj)=>{
+const getExpObj = (obj) => {
   // obj:{
   //   fileurl: "https://phet.colorado.edu/sims/html/number-compare/latest/number-compare_zh_CN.html"
   //   label: "数量比较"
@@ -280,10 +289,14 @@ const getExpObj = (obj)=>{
 //---------作业设计---
 const handleItemClick = (itemName) => {
   console.log('itemName', itemName);
-  if(itemName == '习题上传'){
+  if (itemName == '习题上传') {
     router.push({ path: '/model/questionUpload', query: { courseObj: JSON.stringify(courseObj) } });
     return;
   }
+  if (itemName == '自主组卷') {
+    router.push({ path: '/model/groupTestPaper', query: { courseObj: JSON.stringify(courseObj) } });
+    return;
+  }
 
   currentRow.value.id = 1; // 作业设计
   /**
@@ -292,7 +305,7 @@ const handleItemClick = (itemName) => {
    * 课堂展示
    * 常规作业
    */
-  const typeName = itemName == "自主搜题" || itemName == "校本题库"|| itemName == "个人题库" ? "习题训练" : itemName;
+  const typeName = itemName == "自主搜题" || itemName == "校本题库" || itemName == "个人题库" ? "习题训练" : itemName;
   activeAptTab.value = itemName;
   //提交内容清空 重置
   classWorkForm.id = 0;
@@ -309,13 +322,13 @@ const handleItemClick = (itemName) => {
 
 
 //---------作业布置列表相关--------------
-const selectable=(row, index)=>{
+const selectable = (row, index) => {
   return row.status == '10';
 };
 /**
  * 获取 entpcourseid 获取作业列表
  */
-const initHomeWork = async ()=> {
+const initHomeWork = async () => {
   tasklist_loading.value = true;
   // const { res, chapterId } = await useGetHomework(courseObj.node);
   const { res, chapterId } = await useGetHomework(sessionStore.get('subject.curNode'));
@@ -325,9 +338,9 @@ const initHomeWork = async ()=> {
   taskList.value = res;
   // 判断当前是否存在其他页面跳转编辑, 如果初次且存在id，则选中该任务
   const taskId = propsQueryTask?.id ?? 0;
-  if (!propsQueryTask.isInit && taskId!=0){
+  if (!propsQueryTask.isInit && taskId != 0) {
     const activeRow = taskList.value.find(o => o.id == taskId);
-    if (activeRow){
+    if (activeRow) {
       propsQueryTask.isInit = true;  // 清空避免重新保存后再次选中该任务
       taskTable.value.setCurrentRow(activeRow);
       handleCurrentChange(activeRow);
@@ -354,10 +367,10 @@ const handleNewAllClass = () => {
 /**
  * 删除按钮操作
  * */
-const handleDelete =() => {
+const handleDelete = () => {
   let rows = proxy.$refs.taskTable.getSelectionRows();
   if (rows.length > 0) {
-    proxy.$modal.confirm('是否确认选中的学习任务？').then(()=> {
+    proxy.$modal.confirm('是否确认选中的学习任务？').then(() => {
       let ids = [];
       for (let i = 0; i < rows.length; i++) {
         ids.push(rows[i].id);
@@ -373,8 +386,8 @@ const handleDelete =() => {
       }, 1500);
       proxy.$modal.msgSuccess("删除成功");
 
-    }).catch(() => {})
+    }).catch(() => { })
-  }else{
+  } else {
     proxy.$modal.alertWarning("请选择删除项")
   }
 };
@@ -385,12 +398,12 @@ const handleDelete =() => {
 const handleTaskAssignToAllClass = () => {
   let rows = proxy.$refs.taskTable.getSelectionRows();
   if (rows.length > 0) {
-    proxy.$modal.confirm('是否确认推送选中的学习任务？').then(()=> {
+    proxy.$modal.confirm('是否确认推送选中的学习任务？').then(() => {
     }).then(() => {
       // 弹出配置窗口 ，让用户配置推送策略
-      openSet(rows,'list');
+      openSet(rows, 'list');
-    }).catch(() => {})
+    }).catch(() => { })
-  }else{
+  } else {
     return proxy.$modal.alertWarning("请选择需要推送的任务!");
   }
 }
@@ -399,12 +412,12 @@ const handleTaskAssignToAllClass = () => {
  * //改为list形式，有地方需要批量布置推送
  */
 // 打开布置作业窗口
-const openSet=(row, type)=> {
+const openSet = (row, type) => {
-  if(type == 'list'){
+  if (type == 'list') {
     // 批量布置推送 row 是多个rows，直接赋值
     rowsList.value = row;
     setDialog.value = true;
-  }else{
+  } else {
     // 单个布置推送 row 是单个row,变成数组
     rowsList.value = [row];
     setDialog.value = true;
@@ -413,7 +426,7 @@ const openSet=(row, type)=> {
 /**
  * 关闭布置作业窗口
  */
- const closeHomework = () => {
+const closeHomework = () => {
   rowsList.value = [];
   setDialog.value = false;
 }
@@ -429,7 +442,7 @@ const successHomework = () => {
   })
 }
 // --------------------作业编辑
-let classWorkForm =  reactive({
+let classWorkForm = reactive({
   id: '',// cloneDeep(props.propsformobj.id),
   uniquekey: '',// props.propsformobj.uniquekey?cloneDeep(props.propsformobj.uniquekey):'', // 作业唯一标识 作业名称
   worktype: '',// props.propsformobj.worktype?cloneDeep(props.propsformobj.worktype): '习题训练', //作业类型
@@ -456,12 +469,14 @@ let propsformobj = reactive({
  */
 const handleCurrentChange = (val) => {
 
-  console.log(val,'???????????')
+  console.log(val, '选中的布置作业')
-  if(val && val.id >0  ) {
+  if (val && val.id > 0) {
     currentRow.value.id = 1;
+    const typeName = val.worktype == "习题训练" ? "自主搜题" : "";
+    activeAptTab.value = typeName;
     classWorkForm.worktype = val.worktype; //作业类型
     editListItem(val, courseObj).then((obj) => {
-      if(obj){
+      if (obj) {
         propsformobj = obj;
         // 新赋值的作业内容
         classWorkForm.id = obj.id;
@@ -483,7 +498,7 @@ const handleCurrentChange = (val) => {
  */
 const handleClassWorkQuizAdd = (entpcourseworkid) => {
   var exist = false;
-  for (var i=0; i< classWorkForm.quizlist.length; i++) {
+  for (var i = 0; i < classWorkForm.quizlist.length; i++) {
     if (classWorkForm.quizlist[i].id == entpcourseworkid) {
       exist = true;
       break;
@@ -493,7 +508,7 @@ const handleClassWorkQuizAdd = (entpcourseworkid) => {
     getEntpcoursework(entpcourseworkid).then(res => {
       //res.data.titletext = res.data.title.replace(/<[^>]+>/g, '');
       // 暂时手动新增试题的分数
-      if(res.data.score == null){
+      if (res.data.score == null) {
         res.data.score = 4;
       }
       classWorkForm.quizlist.push(res.data);
@@ -505,14 +520,14 @@ const handleClassWorkQuizAdd = (entpcourseworkid) => {
   }
 }
 /** 右侧资源删除按钮 习题list */
-const handleClassWorkFormQuizRemove = (index) =>{
+const handleClassWorkFormQuizRemove = (index) => {
   classWorkForm.quizlist.splice(index, 1);
 }
 
 /**
  * 作业设计-提交
  */
- const handleClassWorkSave = async () => {
+const handleClassWorkSave = async () => {
   await nextTick(); // 确保DOM更新完成
   proxy.$refs["classWorkFormRef"].validate(async valid => {
     if (valid) {
@@ -543,16 +558,16 @@ const handleClassWorkFormQuizRemove = (index) =>{
         entpcourseworklist: '', // 选择的 习题训练 list  需要转字符串
       };
 
-      if(cform.uniquekey.trim() == '') return ElMessage({ type: 'warning', message: '作业名称不能为空!'});
+      if (cform.uniquekey.trim() == '') return ElMessage({ type: 'warning', message: '作业名称不能为空!' });
 
       // 当前为[编辑]状态下点进来得处理  newWorkSpaceEdit true 为编辑状态
-      if(isShow.value === false){
+      if (isShow.value === false) {
-        if(classWorkForm.id != '' ) {// 编辑状态 有id
+        if (classWorkForm.id != '') {// 编辑状态 有id
           editWork(cform); // 编辑作业
           return;
         }
       }
-      
+
 
       if (classWorkForm.worktype === "课堂展示") {
         boardLoading.value = true
@@ -561,11 +576,11 @@ const handleClassWorkFormQuizRemove = (index) =>{
         // 课堂展示提交内容
         cform.worktag = classWorkForm.question;
         cform.title = classWorkForm.title;
-        cform.workcodes = JSON.stringify({json: canvasJson, base64: canvasBase64});
+        cform.workcodes = JSON.stringify({ json: canvasJson, base64: canvasBase64 });
-        cform.entpcourseworklist = JSON.stringify([{'id':-1, 'score': '10'}]);
+        cform.entpcourseworklist = JSON.stringify([{ 'id': -1, 'score': '10' }]);
         try {
           addClassworkReturnId(cform).then((res) => {
-            ElMessage({ type: 'success', message: '作业设计成功!'});
+            ElMessage({ type: 'success', message: '作业设计成功!' });
             // 重置提交表单
             classWorkForm.worktype = "课堂展示";
             classWorkForm.uniquekey = '';// classWorkForm.uniquekey, // 作业唯一标识 作业名称
@@ -573,67 +588,67 @@ const handleClassWorkFormQuizRemove = (index) =>{
             classWorkForm.question = "";
             classWorkForm.quizlist = [], // 作业习题列表内容
 
-            // 情况选择的资源缓存
+              // 情况选择的资源缓存
-            classWorkForm.chooseWorkLists = []; // 框架梳理list
+              classWorkForm.chooseWorkLists = []; // 框架梳理list
             classWorkForm.whiteboardObj = ''; // ? // 清空白板
             classWorkForm.id = res
-            emits('getData',classWorkForm)
+            emits('getData', classWorkForm)
             boardLoading.value = false
           })
         } finally {
           boardLoading.value = false
         }
       }
-      else if(classWorkForm.worktype === "常规作业"){
+      else if (classWorkForm.worktype === "常规作业") {
-        if (classWorkForm.fileHomeworkList.length == 0) return ElMessage({ type: 'warning', message: '请上传常规作业附件!'});
+        if (classWorkForm.fileHomeworkList.length == 0) return ElMessage({ type: 'warning', message: '请上传常规作业附件!' });
         fileLoading.value = true
         cform.workcodes = JSON.stringify(classWorkForm.fileHomeworkList);
-        cform.entpcourseworklist = JSON.stringify([{'id':-2, 'score': '10'}]);
+        cform.entpcourseworklist = JSON.stringify([{ 'id': -2, 'score': '10' }]);
         try {
           addClassworkReturnId(cform).then((res) => {
-            ElMessage({ type: 'success', message: '作业设计成功!'});
+            ElMessage({ type: 'success', message: '作业设计成功!' });
             // 重置提交表单
             classWorkForm.worktype = "常规作业";
             classWorkForm.uniquekey = ''; // props.propsformobj.uniquekey, // 作业唯一标识 作业名称
             classWorkForm.title = "";
             classWorkForm.quizlist = [], // 作业习题列表内容
 
-            // 情况选择的资源缓存
+              // 情况选择的资源缓存
-            classWorkForm.chooseWorkLists = []; // 框架梳理list
+              classWorkForm.chooseWorkLists = []; // 框架梳理list
             classWorkForm.whiteboardObj = ''; // ? // 清空白板
             classWorkForm.fileHomeworkList = []; // 常规作业list
             classWorkForm.id = res
-            emits('getData',classWorkForm)
+            emits('getData', classWorkForm)
             fileLoading.value = false
           })
         } finally {
           fileLoading.value = false
         }
       }
-      else if(classWorkForm.worktype === "科学实验"){
+      else if (classWorkForm.worktype === "科学实验") {
-        if (classWorkForm.fileHomeworkList.length == 0) return ElMessage({ type: 'warning', message: '请选择科学实验的课程!'});
+        if (classWorkForm.fileHomeworkList.length == 0) return ElMessage({ type: 'warning', message: '请选择科学实验的课程!' });
         cform.worktag = useClassTaskStores.experimentObj.updateEduInfo;           // 当前实验的学段学科, 格式为[小学-数学]
         cform.workcodes = JSON.stringify(classWorkForm.fileHomeworkList);         // 实验信息  
-        cform.entpcourseworklist = JSON.stringify([{'id':-3, 'score': '10'}]);
+        cform.entpcourseworklist = JSON.stringify([{ 'id': -3, 'score': '10' }]);
         try {
-          console.log(cform,'科学实验')
+          console.log(cform, '科学实验')
           addClassworkReturnId(cform).then((res) => {
-            ElMessage({ type: 'success', message: '作业设计成功!'});
+            ElMessage({ type: 'success', message: '作业设计成功!' });
             // 重置提交表单
             classWorkForm.worktype = "科学实验";
             classWorkForm.uniquekey = ''; // props.propsformobj.uniquekey, // 作业唯一标识 作业名称
             classWorkForm.title = "";
             classWorkForm.quizlist = [], // 作业习题列表内容
 
-            // 情况选择的资源缓存
+              // 情况选择的资源缓存
-            classWorkForm.chooseWorkLists = []; // 框架梳理list
+              classWorkForm.chooseWorkLists = []; // 框架梳理list
             classWorkForm.whiteboardObj = ''; // ? // 清空白板
             classWorkForm.fileHomeworkList = []; // 常规作业list
             classWorkForm.id = res
-            emits('getData',classWorkForm)
+            emits('getData', classWorkForm)
             // TODO 科学实验 待完善
           })
-        } finally{
+        } finally {
           // 
         }
       }
@@ -641,14 +656,14 @@ const handleClassWorkFormQuizRemove = (index) =>{
         // 正常新任务
         var ll = [];
         if (classWorkForm.worktype === "习题训练") {
-          for (var i=0; i< classWorkForm.quizlist.length; i++) {
+          for (var i = 0; i < classWorkForm.quizlist.length; i++) {
             // 更新 题目分值
-            ll.push({'id': classWorkForm.quizlist[i].id, 'score': classWorkForm.quizlist[i].score});
+            ll.push({ 'id': classWorkForm.quizlist[i].id, 'score': classWorkForm.quizlist[i].score });
           }
-        }else if( classWorkForm.worktype === "框架梳理") {
+        } else if (classWorkForm.worktype === "框架梳理") {
           classWorkForm.chooseWorkLists.filter((item) => {
             if (item.worktype === classWorkForm.worktype) {
-              ll.push({'id':item.id, 'score': item.score});
+              ll.push({ 'id': item.id, 'score': item.score });
             }
           })
         }
@@ -658,22 +673,22 @@ const handleClassWorkFormQuizRemove = (index) =>{
         } else {
           cform.entpcourseworklist = '';
         }
-        console.log(cform,'提交的数据');
+        console.log(cform, '提交的数据');
-        if(cform.entpcourseworklist == '') return ElMessage({ type: 'warning', message: '请先添加作业资源!'});
+        if (cform.entpcourseworklist == '') return ElMessage({ type: 'warning', message: '请先添加作业资源!' });
 
         addClassworkReturnId(cform).then(res => {
-          ElMessage({ type: 'success', message: '作业设计成功!'});
+          ElMessage({ type: 'success', message: '作业设计成功!' });
           // 重置提交表单
           classWorkForm.worktype = "习题训练";
           classWorkForm.uniquekey = '',// props.propsformobj.uniquekey, // 作业唯一标识 作业名称
-          classWorkForm.title = "";
+            classWorkForm.title = "";
           classWorkForm.quizlist = [], // 作业习题列表内容
 
-          // 情况选择的资源缓存
+            // 情况选择的资源缓存
-          classWorkForm.chooseWorkLists = [];
+            classWorkForm.chooseWorkLists = [];
           classWorkForm.whiteboardObj = ''; // ? // 清空白板
           classWorkForm.id = res
-          emits('getData',classWorkForm)
+          emits('getData', classWorkForm)
           // refresh the list
           //这里分离了，所以不需要更新表单数据了
           // this.getClassWorkAllList();
@@ -682,9 +697,9 @@ const handleClassWorkFormQuizRemove = (index) =>{
       }
       console.log('该清空左侧列表数据了');
       // 清空左侧 选中的布置列表 并刷新列表
-      if(isShow.value){
+      if (isShow.value) {
         currentRow.value.id = 1;
-      }else{
+      } else {
         currentRow.value.id = 0;
       }
       initHomeWork();
@@ -705,9 +720,9 @@ const handleClassWorkFormQuizRemove = (index) =>{
  * 编辑作业内容
  * @param cform 表单数据
  */
-const editWork = async (cform) =>{
+const editWork = async (cform) => {
   // 基础参数
-  cform.id= classWorkForm.id;
+  cform.id = classWorkForm.id;
 
   // 0.右侧作业资源添加检测
   if (classWorkForm.worktype == '习题训练') {
@@ -715,15 +730,15 @@ const editWork = async (cform) =>{
       ElMessage.error('请先添加作业资源!');
       return;
     }
-  }else if (classWorkForm.worktype == '课堂展示' || classWorkForm.worktype == '常规作业') {
+  } else if (classWorkForm.worktype == '课堂展示' || classWorkForm.worktype == '常规作业') {
     // 不做校验
-    if(classWorkForm.worktype == '课堂展示'){
+    if (classWorkForm.worktype == '课堂展示') {
       // 
-    }else{
+    } else {
-      if (classWorkForm.fileHomeworkList.length == 0) return ElMessage({ type: 'warning', message: '请上传常规作业附件!'});
+      if (classWorkForm.fileHomeworkList.length == 0) return ElMessage({ type: 'warning', message: '请上传常规作业附件!' });
     }
-  }else if( classWorkForm.worktype == '科学实验') {
+  } else if (classWorkForm.worktype == '科学实验') {
-    if (classWorkForm.fileHomeworkList.length == 0) return ElMessage({ type: 'warning', message: '请选择科学实验科目!'});
+    if (classWorkForm.fileHomeworkList.length == 0) return ElMessage({ type: 'warning', message: '请选择科学实验科目!' });
   }
   else {
     if (classWorkForm.chooseWorkLists.length == 0) {
@@ -735,13 +750,13 @@ const editWork = async (cform) =>{
 
 
   // 根据作业类型分类处理
-  if (classWorkForm.worktype=='习题训练'){
+  if (classWorkForm.worktype == '习题训练') {
 
     // 1.判断当前添加的作业是否与原来不同（跟父组件传来的值对比）
     let needUplEval = false;
     if (classWorkForm.quizlist.length != propsformobj.quizlist.length) {
       needUplEval = true;
-    }else {
+    } else {
       // 只要有一个不一致则说明需要更新
       needUplEval = classWorkForm.quizlist.some(cur =>
         !propsformobj.quizlist.some(last =>
@@ -755,7 +770,7 @@ const editWork = async (cform) =>{
       // 说明: 因试题分值也需修改, 故无法通过按钮的增长删除来处理, 故将原作业全部删除后再重新添加
       // 2.1.先查询该workid下所有的id
       let arrEvalids = [];
-      const wevalres = await listClassworkeval({'workid': classWorkForm.id});
+      const wevalres = await listClassworkeval({ 'workid': classWorkForm.id });
       wevalres.rows.forEach(element => {
         arrEvalids.push(element.id);
       });
@@ -765,21 +780,22 @@ const editWork = async (cform) =>{
       const delRes = await delClassworkeval(ids);
 
       // 2.3.重新添加新作业
-      for(let i=0; i< classWorkForm.quizlist.length; i++){
+      for (let i = 0; i < classWorkForm.quizlist.length; i++) {
         const addRes = await addClassworkeval({
           'workid': classWorkForm.id,
           'entpcourseworkid': classWorkForm.quizlist[i].id,
           'workdataid': 0,
-          'score': classWorkForm.quizlist[i].score}
+          'score': classWorkForm.quizlist[i].score
+        }
         );
       }
     }
 
     // 3.更新作业任务信息-判断最后更新了
   }
-  else if (classWorkForm.worktype=='框架梳理') {
+  else if (classWorkForm.worktype == '框架梳理') {
     // 1.先查询该workid下所有的id
-    const wevalres = await listClassworkeval({'workid': classWorkForm.id});
+    const wevalres = await listClassworkeval({ 'workid': classWorkForm.id });
     if (wevalres.rows.length == 0) {
       ElMessage.error('未找到原框架梳理任务，请或退出重试');
       return;
@@ -789,7 +805,7 @@ const editWork = async (cform) =>{
     let needUplEval = false;
     if (classWorkForm.chooseWorkLists.length !== propsformobj.chooseWorkLists.length) {
       needUplEval = true;
-    }else {
+    } else {
       // 只要有一个不一致则说明需要更新
       needUplEval = classWorkForm.chooseWorkLists.some(cur =>
         !propsformobj.chooseWorkLists.some(last =>
@@ -807,17 +823,17 @@ const editWork = async (cform) =>{
       let res = await updateClassworkeval(uplParams);
     }
   }
-  else if (classWorkForm.worktype=='课堂展示') {
+  else if (classWorkForm.worktype == '课堂展示') {
     let canvasJson = proxy.$refs.boardref.getCanvasJson()
     let canvasBase64 = await proxy.$refs.boardref.getCanvasBase64()
-    cform.workcodes = JSON.stringify({json: canvasJson, base64: canvasBase64});
+    cform.workcodes = JSON.stringify({ json: canvasJson, base64: canvasBase64 });
     cform.worktag = classWorkForm.question;
   }
-  else if (classWorkForm.worktype=='常规作业') {
+  else if (classWorkForm.worktype == '常规作业') {
     // 1.更新作业任务下的课堂展示内容 (这里未做校验, 直接将当前文件对象更新过去)
     cform.workcodes = JSON.stringify(classWorkForm.fileHomeworkList);
   }
-  else if (classWorkForm.worktype=='科学实验') { //TODO 注意，fileHomeworkList字段与常规作业共用
+  else if (classWorkForm.worktype == '科学实验') { //TODO 注意，fileHomeworkList字段与常规作业共用
     // 1.更新作业任务下的课堂展示内容 (这里未做校验, 直接将当前文件对象更新过去)
     cform.workcodes = JSON.stringify(classWorkForm.fileHomeworkList);
     cform.worktag = useClassTaskStores.experimentObj.updateEduInfo;
@@ -829,9 +845,9 @@ const editWork = async (cform) =>{
     ElMessage.success('更新成功');
     taskList.value = [];
     // 清空左侧 选中的布置列表 并刷新列表
-    if(isShow.value){
+    if (isShow.value) {
       currentRow.value.id = 1;
-    }else{
+    } else {
       handleNewAllClass();
       currentRow.value.id = 0;
     }
@@ -841,6 +857,22 @@ const editWork = async (cform) =>{
   }
 
 }
+
+// 测试, 未实装
+const handlePrint = () => {
+  const printOptions = {
+    silent: false, // 是否静默打印
+    printBackground: true, // 是否打印背景颜色和图像
+    color: false, // 是否打印为黑白
+    marginsType: 0, // 边距类型，0: 默认边距，1: 无边距，2: 最小边距
+    pageSize: 'A4', // 纸张大小
+    // 其他选项可以根据需要配置
+  };
+
+  console.log("print-page-click");
+  ipcRenderer.send('printPage', printOptions);
+};
+
 //----
 
 
@@ -848,29 +880,33 @@ const editWork = async (cform) =>{
 <style scoped lang="scss">
 .page {
   height: 100%;
+
   .page-top {
     height: 50px;
     margin-bottom: 5px;
     padding: 0 10px;
     display: flex;
-    justify-content: space-between;
+    flex-direction: row;
     background-color: white;
     border-radius: 10px;
     box-shadow: 0px 0px 20px 0px rgba(99, 99, 99, 0.06);
     align-items: center;
   }
+
   .page-resource {
     user-select: none;
     height: calc(100% - 55px);
     display: flex;
     flex-direction: row;
     flex-wrap: nowrap;
+
     :deep(.el-tabs__nav) {
-      .el-tabs__item{
+      .el-tabs__item {
         font-weight: bold;
         font-size: 18px;
       }
     }
+
     .page-left {
       width: 240px;
       background-color: white;
@@ -883,6 +919,7 @@ const editWork = async (cform) =>{
         justify-content: space-between;
         align-items: center;
       }
+
       .pageleft-table-cont {
         height: 35px;
         // width: 100%;
@@ -891,21 +928,30 @@ const editWork = async (cform) =>{
         // overflow: hidden;
         // flex-direction: row;
         // text-overflow: ellipsis;
-        width: 100%; /* 设置容器的宽度 */
+        width: 100%;
-        overflow: hidden; /* 隐藏超出容器的部分 */
+        /* 设置容器的宽度 */
-        white-space: nowrap; /* 防止文本换行 */
+        overflow: hidden;
-        text-overflow: ellipsis; /* 超出部分显示省略号 */
+        /* 隐藏超出容器的部分 */
+        white-space: nowrap;
+        /* 防止文本换行 */
+        text-overflow: ellipsis;
+
+        /* 超出部分显示省略号 */
         .ellipsis {
           width: 100%;
           text-align: left;
-          overflow: hidden; /* 隐藏超出容器的部分 */
+          overflow: hidden;
-          white-space: nowrap; /* 防止文本换行 */
+          /* 隐藏超出容器的部分 */
-          text-overflow: ellipsis; /* 超出部分显示省略号 */
+          white-space: nowrap;
+          /* 防止文本换行 */
+          text-overflow: ellipsis;
+          /* 超出部分显示省略号 */
         }
       }
 
     }
-    .page-center{
+
+    .page-center {
       flex: 1;
       //min-width: calc(100% - 675px);
       height: 100%;
@@ -915,31 +961,34 @@ const editWork = async (cform) =>{
       border-radius: 10px;
       background-color: white;
 
-      .prepare-center-zzst{
+      .prepare-center-zzst {
         height: 100%;
         display: flex;
         flex-direction: column;
 
 
       }
-      .prepare-center-xbtk{
+
+      .prepare-center-xbtk {
         height: 100%;
       }
-      .prepare-center-grst{
+
+      .prepare-center-grst {
         height: 100%;
       }
 
 
-      .upload-homework{
+      .upload-homework {
         padding: 20px;
         box-sizing: border-box;
       }
 
-      .experiment-homework{
+      .experiment-homework {
         padding: 15px;
         height: 100%;
       }
     }
+
     .page-right {
       overflow: hidden;
       position: relative;
@@ -951,15 +1000,17 @@ const editWork = async (cform) =>{
       box-shadow: 0px 0px 20px 0px rgba(99, 99, 99, 0.06);
       display: flex;
       flex-direction: column;
+
       .prepare-top {
         display: flex;
         height: 40px;
         margin: 0 10px;
         border-bottom: 2px solid #e5e7eb;
         align-items: center;
-        justify-content: flex-end;
+        justify-content: space-between;
       }
-      .prepare-con{
+
+      .prepare-con {
         height: 100%;
         padding: 5px 10px;
         overflow: hidden;
@@ -977,5 +1028,8 @@ const editWork = async (cform) =>{
     }
   }
 }
+::v-deep img {
+  display: inline-block !important;
+}
 
 </style>

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

@@ -85,7 +85,7 @@
         <el-table-column align="left" width="100">
           <template #default="scope">
             <el-button v-if="props.isHtml2canvas" type="primary" @click="captureScreenshot(scope.row.id)">选取该题</el-button>
-            <el-button v-else type="primary" @click="handleClassWorkQuizAdd('entpcourseworklist', scope.row.id)">添加</el-button>
+            <el-button v-else type="primary" @click="handleClassWorkQuizAdd(scope.row, scope.row.id)">添加</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -126,7 +126,7 @@ import useUserStore from '@/store/modules/user'
 import useClassTaskStore from '@/store/modules/classTask'
 
 // 定义要发送的emit事件
-let emit = defineEmits(['addQuiz', 'addQuizImgBs64'])
+let emit = defineEmits(['addQuiz', 'addQuizImgBs64', "addQuizItem"])
 const { proxy } = getCurrentInstance()
 const userStore = useUserStore().user
 const {
@@ -420,11 +420,13 @@ const getPaginationList = async ( page, limit ) => {
 
 /**
  * 添加资源
- * @param fromsrc - 试题来源
+ * @param rw - 试题itemINFO
  * @param entpcourseworkid
  */
- const handleClassWorkQuizAdd = (fromsrc, entpcourseworkid) => {
+ const handleClassWorkQuizAdd = (row, entpcourseworkid) => {
   emit('addQuiz', entpcourseworkid);
+  emit('addQuizItem', row); // TODO 暂时使用，后面修改逻辑---添加到  自主组卷 
+  
   // var exist = false;
   // for (var i=0; i< classWorkForm.quizlist.length; i++) {
   //   if (classWorkForm.quizlist[i].id == entpcourseworkid) {

src/renderer/src/views/joinSchool/index.vue

@@ -6,14 +6,14 @@
             <img style="margin: 0 auto;height:85px" src="@/assets/images/shenhe.png" alt="">
               <p style="color:#F59A23;font-size:22px">申请审核中</p>
               <p style="color:#000;font-size:16px;font-weight:600">申请信息已提交，请耐心等待审核通过即可完成申请。</p>
-          </div> 
+          </div>
         <div style="border:1px solid #000;margin-bottom:20px;background:#DFF0D8" v-if="userregister.value.auditStatus==1">
               <div style="display: flex;align-items: center;justify-content: center;">
                   <el-result style="padding: 17px 35px;" icon="success"></el-result>
                   <p style="font-size:30px;color:#67C23A">审核通过</p>
               </div>
               <p style="margin-bottom:10px;color:#439FFE; cursor: pointer" @click='chongxin'>重新认证</p>
-        </div> 
+        </div>
         <div style="border:1px solid #000;margin-bottom:20px;background:#F2DEDE" v-if="userregister.value.auditStatus==2">
               <div style="display: flex;align-items: center;justify-content: center;">
                   <el-result style="padding: 17px 35px;" icon="error"></el-result>
@@ -41,7 +41,7 @@
                     <el-form-item label="申请人电话"  >
                         {{ state.user.phonenumber }}
                     </el-form-item>
-                    
+
                     <el-form-item >
                         <div style="width:100%;text-align: right;padding-right:100px">
                             <el-button style="width:150px" type="default" @click="closed">关闭</el-button>
@@ -55,7 +55,7 @@
 
 <script setup >
 import { ref, reactive, onMounted ,watch} from 'vue'
-import { regionData, codeToText } from 'element-china-area-data'
+import { regionData, codeToText } from '@/plugins/china-area-data-json'
 import { getUserProfile } from '@/api/system/user'
 import {getDept} from '@/api/login'
 import {school} from '@/api/apiService'
@@ -101,7 +101,7 @@ async function getUser() {
     // response.data.avatar = import.meta.env.VITE_APP_BASE_API + response.data.avatar
     Object.assign(state.user,response.data)
   })
-  
+
 }
 const getSchoolList = () => {
   school.deptTree().then(res=>{
@@ -142,7 +142,7 @@ const submitForm = async (formEl) => {
         if(res.code==200){
           ElMessage.success('提交成功')
          await userStore.getDeptInfo()
-         
+
         }
      })
       console.log('submit!')
@@ -165,7 +165,7 @@ const getregisterinfo=()=>{
         isshwoBtn.value=false
       }
     }
-    
+
 }
 // 关闭
 const closed=()=>{
@@ -192,4 +192,4 @@ onMounted(async () => {
         margin-bottom: 30px;
     }
 }
-</style>
+</style>

src/renderer/src/views/login/components/Register.vue

@@ -114,7 +114,7 @@ import { ref, defineExpose, reactive ,onMounted} from 'vue'
 import {captchaImg,sendCode,deptTree,getDept,listClassmain,listEvaluation,signIn, retrievePwd} from '@/api/login'
 import { ElMessage } from 'element-plus'
 import {setToken, removeToken } from '@/utils/auth'
-import { regionData, codeToText } from 'element-china-area-data'
+import { regionData, codeToText } from '@/plugins/china-area-data-json'
 const ruleFormRef = ref(null)
 const activeIndex=ref(1)
 const ruleForm = reactive({
@@ -352,7 +352,7 @@ const submitForm = async (formEl) => {
             schoolSubject.value=[]
             gradeTree.value=[]
             Object.assign(ruleForm, restValue);
-            dialogVisible.value=false 
+            dialogVisible.value=false
             activeIndex.value=1
           }else{
             ElMessage.error(res.msg)

src/renderer/src/views/login/defult-login.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="login-container">
-    <div class="box-item desc">
+    <div class="box-item desc" style="flex: 1">
       <div class="welcome">
         <p>欢迎登录 {{ homeTitle }}</p>
       </div>

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

@@ -1,11 +1,14 @@
 <template>
   <ycLogin v-if="buildMode === 'yc'||buildMode === 'yc2'">
   </ycLogin>
+  <yyLogin v-else-if="buildMode === 'yy'">
+  </yyLogin>
   <defultLogin v-else>
   </defultLogin>
 </template>
 <script setup>
 import ycLogin from './yc-login.vue'
+import yyLogin from './yy-login.vue'
 import defultLogin from './defult-login.vue'
 const buildMode = import.meta.env.MODE
 </script>

src/renderer/src/views/login/yy-login.vue

@@ -0,0 +1,458 @@
+<template>
+  <div class="login-container">
+    <div class="login-yc">
+      <img class="welcome-img" :src="leftBg1" />
+    </div>
+    <div class="box-item login" v-if="isRegister">
+      <WindowTools :is-has-max="false" />
+      <div style="display: flex;justify-content: center;"><img class="title-logo" :src="yylogo" /></div>
+      <div class="login-title">育人酉数平台</div>
+      <el-form ref="formRef" class="login-form" :model="loginForm" :rules="rules" size="large">
+        <el-form-item prop="username">
+          <el-input v-model.trim="loginForm.username" placeholder="请输入用户名" />
+        </el-form-item>
+        <el-form-item prop="password" style="margin-bottom: 15px">
+          <el-input v-model="loginForm.password" autocomplete="on" type="password" placeholder="请输入密码" />
+        </el-form-item>
+        <div class="flex mb-5">
+          <el-checkbox v-model="loginForm.rememberMe">记住密码</el-checkbox>
+          <!-- <el-checkbox >阅读并同意《xxx》</el-checkbox> -->
+        </div>
+
+        <el-form-item style="margin-bottom: 20px">
+          <el-button :loading="btnLoading" class="btn" type="primary" @click="submitForm(formRef)">登录</el-button>
+        </el-form-item>
+        <div class="flex mb-4" style="display: flex;justify-content: center;color: #ccc;cursor: pointer;">
+          <a class="hover:text-sky-500" style="margin-right: 10px;" @click="gotoreRegister">注册账号</a>
+        </div>
+      </el-form>
+    </div>
+
+    <div class="box-item login" v-else>
+      <WindowTools :is-has-max="false" />
+      <div class="login-title">账号注册</div>
+      <el-form  ref="ruleFormRef" class="login-form"   :model="ruleForm" label-width="auto"  :rules="rules" size="large">
+        <el-form-item label="手机号" prop="username">
+          <el-input  v-model="ruleForm.username" placeholder="请输入手机号" />
+        </el-form-item>
+        <el-form-item label="验证码"  prop="smsCode" style="display: flex">
+          <el-input style="width:185px"  v-model="ruleForm.smsCode" placeholder="请输入验证码" /><el-button style="margin-left:10px;width:100px" :disabled="codeName=='发送验证码'?false:true"  type="primary" @click="sendyzm">{{ codeName }}</el-button>
+        </el-form-item>
+        <el-form-item label="密码" prop="password" >
+          <el-input  autocomplete="on" type="password" v-model="ruleForm.password" placeholder="请输入密码" />
+        </el-form-item>
+
+        <el-form-item>
+          <el-button  class="btn" type="primary"  @click="RegisterForm(ruleFormRef)">立即注册</el-button>
+        </el-form-item>
+        <div class="flex mb-4" style="display: flex;justify-content: center;color: #ccc;cursor: pointer;">
+          <a class="hover:text-sky-500" style="margin-right: 10px;" @click="gotoLogin"> 《 返回登录 </a>
+        </div>
+      </el-form>
+    </div>
+  </div>
+  <el-dialog v-model="showDownLoading" width="500" :show-close="false" :close-on-click-modal="false"
+    :close-on-press-escape="false" align-center>
+    <el-progress :text-inside="true" :stroke-width="22" :percentage="downloadProp" :show-text="false"
+      status="success" />
+  </el-dialog>
+  <el-dialog
+        v-model="isImg"
+        title="人机验证"
+        width="500"
+        style=" -webkit-app-region: no-drag;"
+      >
+        <span>根据图片回答相关问题1</span>
+        <div style="display: flex;align-items: center;;margin-top:30px">
+          <img :src="isPeopleImg" style="width:200px;height:60px;cursor: pointer;" alt="" srcset="" @click="refreshImg">
+          <el-input v-model="ruleForm.imgCode"  style="width: 250px;height:40px;margin-left:20px" placeholder="请根据图片填入答案" />
+        </div>
+        <div style="display: flex;justify-content: center;margin-top:30px">
+          <el-button  type="primary" @click="sbmitImg">确定</el-button>
+        </div>
+      </el-dialog>
+  <!--选择学科-->
+  <SelectSubject v-model="isSubject" :login-data="loginForm" />
+  <!--注册弹框-->
+  <Register ref="RegModel"></Register>
+
+
+</template>
+<script setup>
+import { onMounted, reactive, ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import { encrypt, decrypt } from '@/utils/jsencrypt'
+import useUserStore from '@/store/modules/user'
+import WindowTools from '@/components/window-tools/index.vue'
+import SelectSubject from '@/components/select-subject/index.vue'
+import Register from './components/Register.vue'
+import { sessionStore } from '@/utils/store'
+import {sendcode,instructorregister,getCodeImg} from '@/api/login'
+import yylogo from '@/assets/images/login/yy-logo.png'
+import leftBg1 from '@/assets/images/login/yy_bacg.jpg'
+const { session } = require('@electron/remote')
+const buildMode = import.meta.env.MODE
+const downloadProp = ref(0)
+const showDownLoading = ref(false)
+const { ipcRenderer } = window.electron || {}
+const formRef = ref()
+const userStore = useUserStore()
+const btnLoading = ref(false)
+const isSubject = ref(false)
+const RegModel = ref(false)
+const isRegister = ref(true)
+const ruleFormRef = ref(null)
+const codeName=ref('发送验证码')
+const timer=ref(null)
+const isImg=ref(false)
+const isPeopleImg=ref(null)
+const type=ref(1) // 1注册 2找回密码
+const resImg = reactive({ imgData: {} });
+
+//表单
+const loginForm = reactive({
+  username: '',
+  password: '',
+  rememberMe: false
+})
+// 注册表单
+const ruleForm = reactive({
+
+})
+//表单规则
+const rules = reactive({
+  username: [{ required: true, trigger: 'blur', message: '请输入您的账号' }],
+  password: [{ required: true, trigger: 'blur', message: '请输入您的密码' }],
+  smsCode: [{ required: true, trigger: 'blur', message: '请输入您的验证码' }],
+})
+
+let curWinUrl = import.meta.env.VITE_APP_BUILD_BASE_PATH
+let homeTitle = ref(import.meta.env.VITE_APP_TITLE)
+ipcRenderer.on('update-app-progress', (e, prop) => {
+  downloadProp.value = prop
+  showDownLoading.value = prop !== 100
+})
+const gotoreRegister=()=>{
+  codeName.value='发送验证码'
+  if(timer.value){
+    clearInterval(timer.value);
+  }
+  isRegister.value=false
+}
+// 刷新
+const refreshImg=()=>{
+  getCodeImg().then(res=>{
+    isPeopleImg.value='data:image/jpg;base64,'+res.img
+    resImg.imgData=res
+  })
+}
+// 提交人机验证
+const sbmitImg=()=>{
+   if(ruleForm.imgCode){
+    // {mobile:ruleForm.phoneNumber,code:ruleForm.imgCode,uuid:resImg.imgData.uuid}
+    const { username:username,imgCode:code } = ruleForm
+    const params = {
+      username, code,
+      uuid: resImg.imgData.uuid,
+      source:4
+    }
+    sendcode(params).then(res=>{
+      if(res.code==200){
+        ElMessage.success('短信发送成功')
+        ruleForm.Code=res.data
+        isImg.value=false
+        codeName.value=60
+            timer.value=setInterval(()=>{
+              codeName.value--
+              if(codeName.value==0){
+                codeName.value='发送验证码'
+                clearInterval(timer.value);
+              }
+            },1000)
+      }
+
+    })
+   }else{
+    ElMessage.error('请根据图片输入验证码')
+   }
+  //
+}
+// 发送验证码
+const sendyzm=()=>{
+  if(ruleForm.username){
+    const pattern = /^1[3-9]\d{9}$/;
+    if( pattern.test(ruleForm.username) ){
+
+      getCodeImg().then(res=>{
+          if(res.code==200){
+            ruleForm.imgCode=null
+            isPeopleImg.value='data:image/jpg;base64,'+res.img
+            isImg.value=true
+            resImg.imgData=res
+            // codeName.value=60
+            // timer.value=setInterval(()=>{
+            //   codeName.value--
+            //   if(codeName.value==0){
+            //     codeName.value='发送验证码'
+            //     clearInterval(timer.value);
+            //   }
+            // },1000)
+          }else{
+            ElMessage.error(res.msg)
+          }
+      })
+    }else{
+      ElMessage.error('请输入正确的手机号码')
+    }
+    // captchaImg({mobile:ruleForm.phoneNumber}).then(res=>{
+    //   console.log('res->', res)
+    // })
+  }else{
+    ElMessage.error('请输入手机号码')
+  }
+}
+// 打开弹窗
+const RegisterModel = type => {
+  RegModel.value.OpenModel(type)
+}
+//登录
+const submitForm = async (formEl) => {
+  if (!formEl) return
+  await formEl.validate(async (valid) => {
+    if (valid) {
+      btnLoading.value = true
+
+      // 勾选了需要记住密码设置在 cookie 中设置记住用户名和密码
+      if (loginForm.rememberMe) {
+        await setCookie('username', loginForm.username)
+        await setCookie('password', encrypt(loginForm.password))
+        await setCookie('rememberMe', loginForm.rememberMe.toString())
+      } else {
+        // 否则移除
+        await session.defaultSession.clearStorageData({
+          origin: curWinUrl,
+          storages: ['cookies']
+        })
+      }
+
+      try {
+        await userStore.login(loginForm)
+        await userStore.getInfo()
+        if (userStore.user.edustage || userStore.user.edusubject || isStadium(userStore.user)) {
+          ElMessage.success('登录成功')
+          ipcRenderer && ipcRenderer.send('openMainWindow')
+        } else {
+          isSubject.value = true
+        }
+      } finally {
+        btnLoading.value = false
+      }
+    }
+  })
+}
+
+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]
+  const rememberMe = (await getCookieDetail('rememberMe'))[0]
+  loginForm.username = username ? username.value : loginForm.username
+  loginForm.password = password ? decrypt(password.value) : loginForm.password
+  loginForm.rememberMe = rememberMe ? Boolean(rememberMe.value) : false
+}
+
+// 获取cookie
+const getCookieDetail = (name) => {
+  return session.defaultSession.cookies.get({ url: curWinUrl, name })
+}
+
+// 设置cookie
+const setCookie = (name, value) => {
+  // 30天过期
+  let Days = 30
+  let times = Math.round(Date.now() / 1000) + Days * 24 * 60 * 60
+  const cookie = {
+    url: curWinUrl,
+    name,
+    value,
+    expirationDate: times
+  }
+  return session.defaultSession.cookies.set(cookie)
+}
+const gotoLogin = () => {
+  codeName.value='发送验证码'
+  if (timer.value){
+    clearInterval(timer.value);
+  }
+  if (ruleFormRef.value) ruleFormRef.value.resetFields()
+  isRegister.value = true
+}
+// 注册
+const RegisterForm = async (formEl) => {
+  if (!formEl) return
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      instructorregister(ruleForm).then(res=>{
+          if(res.code==200){
+            ElMessage.success('您已注册成功')
+            if (ruleFormRef.value) ruleFormRef.value.resetFields()
+             gotoLogin()
+          }else{
+            ElMessage.error(res.msg)
+          }
+      })
+      console.log('submit!')
+    } else {
+      console.log('error submit!', fields)
+    }
+  })
+}
+onMounted(() => {
+  localStorage.clear()
+  sessionStore.set('subject', {
+    bookList: null,
+    curBook: null,
+    curNode: null,
+    defaultExpandedKeys: [],
+    subjectTree: []
+  })
+  getCookie()
+})
+</script>
+<style lang="scss" scoped>
+.login-container {
+  width: 100%;
+  height: 100%;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  -webkit-app-region: drag;
+
+  .login-yc{
+    width: 100%;
+    height: 100%;
+    img{
+      width: 100%;
+      height: 100%;
+    }
+  }
+
+  .box-item {
+    width: 370px;
+    height: 520px;
+
+    &.desc {
+      background: #ffffff;
+      border-radius: 12px 0px 0px 12px;
+      box-shadow: 0px 16px 73px 8px rgba(203, 203, 203, 0.2);
+      padding: 23px 25px;
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+      justify-content: flex-start;
+      background-color: #003b94;
+    }
+
+    &.login {
+      background: #ffffff;
+      border-radius: 0px 12px 12px 0px;
+      padding: 34px 42px;
+      position: relative;
+      .title-logo{
+        width: 100px;
+      }
+    }
+
+    .welcome {
+      padding-top: 35px;
+
+      p {
+        color: #ffffff;
+        line-height: 25px;
+        letter-spacing: 0.26px;
+        text-align: center;
+        font-weight: 700;
+        font-size: 26px;
+      }
+    }
+
+    .welcome-img {
+      margin-top: 20px;
+      width: 350px;
+      height: 350px;
+    }
+
+    .login-title {
+      font-size: 20px;
+      text-align: center;
+      color: #1e1e1e;
+      margin-bottom: 35px;
+      margin-top: 50px;
+    }
+
+    .login-title {
+      font-size: 20px;
+      text-align: center;
+      color: #1e1e1e;
+      margin-bottom: 10px;
+      margin-top: 5px;
+      font-width: bold;
+    }
+
+    .login-title2 {
+      margin-bottom: 20px;
+    }
+
+    .login-form {
+      -webkit-app-region: no-drag;
+
+      .captcha-input {
+        width: 60%;
+      }
+
+      .captcha-img {
+        cursor: pointer;
+      }
+
+      .title-bottom{
+        text-align: center;
+        width: 100%;
+        font-size: 14px;
+        color: rgba(0, 0, 0, 0.45);
+      }
+    }
+
+    .btn {
+      width: 350px;
+      height: 50px;
+      border-radius: 4px;
+      font-size: 16px;
+      font-weight: 700;
+      text-align: center;
+      color: #ffffff;
+      line-height: 50px;
+      cursor: pointer;
+    }
+  }
+}
+
+.header-tool {
+  position: absolute;
+  right: 0;
+  top: 0;
+  -webkit-app-region: no-drag;
+
+  span {
+    padding: 5px 10px;
+    cursor: pointer;
+  }
+}
+
+.el-form-item {
+  margin-bottom: 40px;
+}
+</style>

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

@@ -69,6 +69,7 @@
               <div class="content-body-right-item-text">{{item.name}}</div>
             </div>
           </div>
+<!--          <Eos></Eos>-->
         </div>
       </div>
     </div>
@@ -94,7 +95,7 @@ import { sessionStore } from '@/utils/store'
 import {listEntpcourse} from "@/api/teaching/classwork";
 import {addEntpcoursefileReturnId, getEntpcoursefile} from "@/api/education/entpcoursefile";
 import {createWindow, toLinkLeftWeb, getStaticUrl} from "@/utils/tool";
-import {ElMessage} from "element-plus";
+import {ElMessage, ElMessageBox} from "element-plus";
 import {PPTXFileToJson} from "@/AixPPTist/src/hooks/useImport";
 import * as API_entpcoursefile from "@/api/education/entpcoursefile";
 import msgUtils from "@/plugins/modal";
@@ -102,6 +103,7 @@ import * as commUtils from "@/utils/comm";
 import * as Api_server from "@/api/apiService"; // 学科名字文生图
 import useClassTaskStore from '@/store/modules/classTask'
 import { slidesToImg } from '@/utils/ppt' // ppt相关工具
+import Eos from "@/components/FileUpload/Eos.vue"
 
 const router = useRouter()
 const userStore = useUserStore().user // 用户信息
@@ -302,6 +304,8 @@ const pgDialog = ref({ // 弹窗-进度条
 
 const fileInput = ref(null)
 
+let pptMedia = {} // ppt媒体数据
+
 const openFilePicker = () =>{
   fileInput.value.click();
 }
@@ -315,9 +319,13 @@ const handleFileChange = ()=> {
 }
 // ppt文件转PPT线上数据
 const createAIPPTByFile = async (file)=> {
-  // pgDialog.value.visible = true
+  pgDialog.value.visible = true
-  // pgDialog.value.pg.percentage = 0
+  pgDialog.value.pg.percentage = 0
-  const resPptJson = await PPTXFileToJson(file)
+  pptMedia = {} // 清空媒体数据
+  const resPptJson = await PPTXFileToJson(file).catch(() => {
+    ElMessageBox.alert('PPT文件转换失败！请点击素材右侧...下载文件后打开另存为PPTX文件格式再进行导入！')
+    pgDialog.value.visible = false
+  })
   const { def, slides, ...content } = resPptJson
   // 生成缩略图
   const thumbnails = await slidesToImg(slides, content.width)
@@ -389,42 +397,66 @@ const createAIPPTByFile = async (file)=> {
     })
   })
 }
-
+// 将图片|音频|视频 转换为线上地址
+const getOnlineFileUrl = (data, name) => {
+  return new Promise(async (resolve, reject) => {
+    let file
+    if (data instanceof Blob) { // blob类型判断
+      const fileName = Date.now() + `.${name||'png'}`
+      file = commUtils.blobToFile(data, fileName)
+    } else if (data instanceof File) { // file类型判断
+      file = data
+    } else { // 其他类型 base64
+      const blob = commUtils.base64ToBlob(data)
+      const fileName = Date.now() + `.${name||'png'}`
+      file = commUtils.blobToFile(blob, fileName)
+    }
+    const formData = new FormData()
+    formData.append('file', file)
+    const res = await Api_server.Other.uploadFile(formData)
+    if (res && res.code == 200){
+      resolve(res?.url)
+    } else { // 失败
+      reject(res?.msg||'上传失败')
+    }
+  })
+}
 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)
+    let onLineUrl = '' // 线上地址
-    if (isBase64) {
+    if (!!o.zipPath) onLineUrl = pptMedia[o.zipPath] || '' // 是否已上传过
-      const bolb = commUtils.base64ToBlob(o.src)
+    if (onLineUrl) o.src = onLineUrl // 已存在线上地址直接赋值
-      const fileName = Date.now() + '.png'
+    else { // 不存在重新上传
-      const file = commUtils.blobToFile(bolb, fileName)
+      if (isBase64) { // 相同资源处理
-      // o.src = fileName
+        const url = await getOnlineFileUrl(o.src)
-      // console.log('file', file)
+        url && o.zipPath && (pptMedia[o.zipPath] = url) // 缓存
-      const formData = new FormData()
+      } else if (isBlobUrl) { // 视频和音频
-      formData.append('file', file)
+        const res = await fetch(o.src)
-      const res = await Api_server.Other.uploadFile(formData)
+        const blob = await res.blob()
-      if (res && res.code == 200){
+        const url = await getOnlineFileUrl(blob, o.type=='video'?'mp4':'mp3')
-        const url = res?.url
+        URL.revokeObjectURL(o.src) // 释放内存
-        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)
+        url && o.zipPath && (pptMedia[o.zipPath] = url) // 缓存
       }
     }
   }
 
+  // 处理元素为shape 可能存在背景图等
+  const isBg = o?.gradient?.type == 'image' && !!o?.gradient?.image
+  if (isBg) {
+    const {src, zipPath} = o.gradient.image || {}
+    let onLineUrl = '' // 线上地址
+    if (!!zipPath) onLineUrl = pptMedia[zipPath] || '' // 是否已上传过
+    if (onLineUrl) o.gradient.image.src = onLineUrl // 已存在线上地址直接赋值
+    else { // 重新上传
+      const url = await getOnlineFileUrl(src)
+      o.gradient.image.src = url
+      url && zipPath && (pptMedia[zipPath] = url) // 缓存
+    }
+  }
+
   if (o?.background?.image) await toRousrceUrl(o.background.image)
   if(o?.elements){
     for (let element of o.elements) {

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

@@ -18,7 +18,9 @@
           {{ item.fileShowName.substring(0, item.fileShowName.lastIndexOf('.')) }}
           <el-tag type="danger" effect="dark">{{item.fileShowName.substring(item.fileShowName.lastIndexOf('.')+1)}}</el-tag>
           <template v-if="item.fileTag">
-            <el-tag v-for="(item1, index1) in item.fileTag.split(',')" :key="index1" type="success" effect="dark" style="margin-left: 5px">{{item1}}</el-tag>
+            <el-tag v-for="(item1, index1) in item.fileTag.split(',')"
+                    @close="deleteTag(item, item1, index1)" closable :key="index1"
+                    @click.stop="editTag(item, item1, index1)" type="success" effect="dark" style="margin-left: 5px">{{item1}}</el-tag>
           </template>
         </div>
       </div>
@@ -282,6 +284,71 @@ export default {
       })
       // this.$emit('on-start-class', item)
     },
+    editTagMsg(type, item, value, index) {
+      let fileTagList = []
+      if (!item.fileTag) {
+        item.fileTag="";
+        fileTagList = [];
+      }else {
+        fileTagList = item.fileTag.split(',');
+      }
+      let message = '';
+      switch (type) {
+        case 'add':
+          fileTagList.push(value);
+          message = '添加成功！';
+          break;
+        case 'delete':
+          fileTagList.splice(index, 1);
+          message = '删除成功！';
+          break;
+        case 'edit':
+          fileTagList[index] = value;
+          message = '修改成功！';
+          break;
+        default:
+          break;
+      }
+      item.fileTagList = fileTagList;
+      item.fileTag = fileTagList.join(",")
+      updateSmarttalk({ id: item.id, fileTag: item.fileTag, fileShowName: item.fileShowName }).then((res) => {
+        if (res.data === true) {
+          ElMessage({
+            type: 'success',
+            message: message
+          })
+        }
+      })
+    },
+    deleteTag(item, item1, index) {
+      ElMessageBox.confirm(
+        '是否确认删除这个标签？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        }
+      )
+        .then(() => {
+          this.editTagMsg('delete', item, "", index)
+        })
+        .catch(() => {
+        })
+    },
+    editTag(item, item1, index) {
+      console.log(item, item1, index)
+      ElMessageBox.prompt('请输入新的标签', '修改标签', {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        inputValue: item1,
+        inputPattern: /^[a-zA-Z0-9\u4e00-\u9fa5]{1,5}$/,
+        inputErrorMessage: '请输入最多五个字的标签,不能携带标点符号'
+      })
+        .then(({ value }) => {
+          this.editTagMsg('edit', item, value, index)
+        }).catch(() => {})
+    },
     editTalk(item) {
       ElMessageBox.prompt('请输入新的标签', '添加标签', {
         confirmButtonText: '确认',
@@ -291,24 +358,7 @@ export default {
         inputErrorMessage: '请输入最多五个字的标签,不能携带标点符号'
       })
         .then(({ value }) => {
-          let fileTagList = []
+          this.editTagMsg('add', item, value, 0)
-          if (!item.fileTag) {
-            item.fileTag="";
-            fileTagList = [];
-          }else {
-            fileTagList = item.fileTag.split(',');
-          }
-          fileTagList.push(value);
-          item.fileTagList = fileTagList;
-          item.fileTag = fileTagList.join(",")
-          updateSmarttalk({ id: item.id, fileTag: item.fileTag, fileShowName: item.fileShowName }).then((res) => {
-            if (res.data === true) {
-              ElMessage({
-                type: 'success',
-                message: `添加成功！`
-              })
-            }
-          })
         })
         .catch(() => {})
     },

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

@@ -289,7 +289,8 @@ export default {
             { color: '#5cb87a', percentage: 100 }, // 绿色
           ]
         }
-      }
+      },
+      pptMedia: {} // ppt媒体数据
     }
   },
   computed: {
@@ -561,6 +562,7 @@ export default {
     },
     importPPT(item) {
       let _this = this;
+      // item.fileFullPath = "https://wzyzoss.eos-chongqing-3.cmecloud.cn/2025/1/14/c4d8ae796fc74417aefe017a49388962.ppt"
       fetch(item.fileFullPath)
         .then(res => res.arrayBuffer())
         .then(buffer => {
@@ -590,53 +592,81 @@ export default {
         this.createAIPPTByFile(file, this.currentNode.itemtitle + '.aippt')
       }
     },
+    // 将图片|音频|视频 转换为线上地址
+    getOnlineFileUrl(data, name){
+      return new Promise(async (resolve, reject) => {
+        let file
+        if (data instanceof Blob) { // blob类型判断
+          const fileName = Date.now() + `.${name||'png'}`
+          file = commUtils.blobToFile(data, fileName)
+        } else if (data instanceof File) { // file类型判断
+          file = data
+        } else { // 其他类型 base64
+          const blob = commUtils.base64ToBlob(data)
+          const fileName = Date.now() + `.${name||'png'}`
+          file = commUtils.blobToFile(blob, fileName)
+        }
+        const formData = new FormData()
+        formData.append('file', file)
+        const res = await Api_server.Other.uploadFile(formData)
+        if (res && res.code == 200){
+          resolve(res?.url)
+        } else { // 失败
+          reject(res?.msg||'上传失败')
+        }
+      })
+    },
     async toRousrceUrl(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)
+        let onLineUrl = '' // 线上地址
-        if (isBase64) {
+        if (!!o.zipPath) onLineUrl = this.pptMedia[o.zipPath] || '' // 是否已上传过
-          const bolb = commUtils.base64ToBlob(o.src)
+        if (onLineUrl) o.src = onLineUrl // 已存在线上地址直接赋值
-          const fileName = Date.now() + '.png'
+        else { // 不存在重新上传
-          const file = commUtils.blobToFile(bolb, fileName)
+          if (isBase64) { // 相同资源处理
-          // o.src = fileName
+            const url = await this.getOnlineFileUrl(o.src)
-          // console.log('file', file)
+            url && o.zipPath && (this.pptMedia[o.zipPath] = url) // 缓存
-          const formData = new FormData()
+          } else if (isBlobUrl) { // 视频和音频
-          formData.append('file', file)
+            const res = await fetch(o.src)
-          const res = await Api_server.Other.uploadFile(formData)
+            const blob = await res.blob()
-          if (res && res.code == 200){
+            const url = await this.getOnlineFileUrl(blob, o.type=='video'?'mp4':'mp3')
-            const url = res?.url
+            URL.revokeObjectURL(o.src) // 释放内存
-            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)
+            url && o.zipPath && (this.pptMedia[o.zipPath] = url) // 缓存
           }
         }
       }
-
+      // 处理元素为shape 可能存在背景图等
+      const isBg = o?.gradient?.type == 'image' && !!o?.gradient?.image
+      if (isBg) {
+        const {src, zipPath} = o.gradient.image || {}
+        let onLineUrl = '' // 线上地址
+        if (!!zipPath) onLineUrl = this.pptMedia[zipPath] || '' // 是否已上传过
+        if (onLineUrl) o.gradient.image.src = onLineUrl // 已存在线上地址直接赋值
+        else { // 重新上传
+          const url = await this.getOnlineFileUrl(src)
+          o.gradient.image.src = url
+          url && zipPath && (this.pptMedia[zipPath] = url) // 缓存
+        }
+      }
+      
       if (o?.background?.image) await this.toRousrceUrl(o.background.image)
-      // if (o?.elements) o.elements.forEach(async o => {await this.toRousrceUrl(o)})
+      if(o?.elements){
-       if(o?.elements){
+        for (let element of o.elements) {
-          for (let element of o.elements) {
+            await this.toRousrceUrl(element);
-              await this.toRousrceUrl(element);
+        }
-          }
+      }
-       }
     },
     async createAIPPTByFile(file,fileShowName) {
       this.pgDialog.visible = true
       this.pgDialog.pg.percentage = 0
-      const resPptJson = await PPTXFileToJson(file)
+      this.pptMedia = {} // 清空媒体数据
+      const resPptJson = await PPTXFileToJson(file).catch(() => {
+        ElMessageBox.alert('PPT文件转换失败！请点击素材右侧...下载文件后打开另存为PPTX文件格式再进行导入！')
+        this.pgDialog.visible = false
+      })
+      if (!resPptJson) return
       const { def, slides, ...content } = resPptJson
       // 生成缩略图
       const thumbnails = await slidesToImg(slides, content.width)

src/renderer/src/views/profile/cropperImage.vue

@@ -22,13 +22,11 @@
 
           <!--  裁剪按钮-->
           <div class="btn">
-            <el-button style="margin-right: 20px">选择</el-button>
+            <label for="submit">
-            <input
+              <div class="lBut"><span>选择</span></div>
-              class="upload"
+            </label>
-              type="file"
+            <input class="upload" id="submit" accept=".png, .jpg, .jpeg" type="file" style="display: none;" @change="uploadImg" />
-              accept=".png, .jpg, .jpeg"
+            <!-- <el-button style="margin-right: 20px;cursor:pointer">选择</el-button> -->
-              @change="uploadImg"
-            />
 
             <el-button @click="cancle">取消</el-button>
             <el-button @click="sureSava">提交</el-button>
@@ -216,6 +214,7 @@ export default {
     position: relative;
     display: flex;
     margin-top: 30px;
+    cursor: pointer;
     > .upload {
       display: block;
       width: 60px;
@@ -224,6 +223,7 @@ export default {
       top: 0;
       left: 0;
       opacity: 0;
+      cursor: pointer;
     }
   }
 }
@@ -265,4 +265,22 @@ export default {
     background-color: rgba(43, 43, 43, 0.7215686275);
   }
 }
+.lBut{
+	width: 87px;
+	height: 32px;
+	font-size: 14px;
+	line-height: 1.15;
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	border-radius: 4px;
+	padding: 8px 10px;
+	margin-right: 10px;
+	transition: all 0.5s;
+	white-space: nowrap;
+	background-color: #409eff;
+	color: white;
+	border: 1px solid #409eff;
+  cursor: pointer;
+}
 </style>

src/renderer/src/views/profile/userAvatar.vue

@@ -1,6 +1,11 @@
 <template>
   <div class="user-info-head" @click="editCropper()">
-    <img :src="options.img" title="点击上传头像" class="img-circle img-lg" />
+    <!-- <img :src="options.img" title="点击上传头像" class="img-circle img-lg" /> -->
+    <el-image class="user-img" :src="options.img" style="width: 120px;">
+      <template #error>
+        <img :src="route_path + userStore.user.avatar">
+      </template>
+    </el-image>
     <el-dialog
       v-model="open"
       append-to-body
@@ -19,7 +24,7 @@
 </template>
 
   <script setup>
-import {ref, reactive} from 'vue'
+import {ref, reactive, onMounted} from 'vue'
 import { uploadAvatar } from '@/api/system/user'
 import useUserStore from '@/store/modules/user'
 import { ElMessage } from 'element-plus'
@@ -31,10 +36,12 @@ const userStore = useUserStore()
 const open = ref(false)
 const visible = ref(false)
 const dev_api = ref(import.meta.env.VITE_APP_BASE_API)
+const route_path = ref(import.meta.env.VITE_APP_BUILD_BASE_PATH)
+const defaultImg = ['/img/avatar-default.jpg','/images/img-avatar.png','/src/assets/images/img-avatar.png']
 
 //图片裁剪数据
 const options = reactive({
-  img: userStore.user.avatar ==='/img/avatar-default.jpg' || userStore.user.avatar ==='/images/img-avatar.png' ? defaultUserImg : dev_api.value + userStore.user.avatar, // 裁剪图片的地址
+  img: '', // 裁剪图片的地址
   autoCrop: true, // 是否默认生成截图框
   autoCropWidth: 400, // 默认生成截图框宽度
   autoCropHeight: 400, // 默认生成截图框高度
@@ -70,12 +77,19 @@ function uploadImg(data) {
 
 /** 关闭窗口 */
 function closeDialog() {
-  options.img = userStore.user.avatar ==='/img/avatar-default.jpg' || userStore.user.avatar ==='/images/img-avatar.png' ? defaultUserImg : dev_api.value + userStore.user.avatar
+  // options.img = userStore.user.avatar ==='/img/avatar-default.jpg' || userStore.user.avatar ==='/images/img-avatar.png' ? defaultUserImg : dev_api.value + userStore.user.avatar
   options.visible = false
 }
 const cancle = () => {
   open.value = false
 }
+onMounted(() => {
+  if(defaultImg.includes(userStore.user.avatar)){
+    options.img = defaultUserImg
+  }else{
+    options.img = dev_api.value + userStore.user.avatar
+  }
+})
 </script>
 
   <style lang='scss' scoped>

src/renderer/src/views/schoolCertification/index.vue

@@ -22,7 +22,7 @@
             <p style="margin-bottom:10px;font-size:18px;font-weight:600">申请信息已驳回，请重新提交申请信息。</p>
        </div>
           </div>
-        
+
           <div class="box-item" :style="userregister.value?'':'margin-top:30px'" >
                 <el-form  ref="ruleFormRef" label-width="auto" :rules="rules"  :model="ruleForm" size="large"  >
                     <el-form-item label="学校名称" prop="schoolName" >
@@ -46,7 +46,7 @@
                     <el-form-item label="经办人电话"  >
                         {{ state.user.phonenumber }}
                     </el-form-item>
-                    
+
                     <el-form-item >
                         <div style="display:flex;align-items:center;justify-content: space-between;padding-right:100px; width: 100%;">
                             <div  style="display:flex;align-items:center;">
@@ -57,7 +57,7 @@
                                 <el-button style="width:150px" type="primary"  @click="submitForm(ruleFormRef)" v-if="isshwoBtn">确定</el-button>
                             </div>
                         </div>
-                       
+
                    </el-form-item>
                 </el-form>
             </div>
@@ -66,7 +66,7 @@
 
 <script setup >
 import { ref, reactive, onMounted,watch } from 'vue'
-import { regionData, codeToText } from 'element-china-area-data'
+import { regionData, codeToText } from '@/plugins/china-area-data-json'
 import { getUserProfile } from '@/api/system/user'
 import {getDept} from '@/api/login'
 import {school} from '@/api/apiService'
@@ -158,7 +158,7 @@ const submitForm = async (formEl) => {
       if(!ruleForm.istrue) {
         ElMessage.error('请勾选以上信息真实有效的复选框')
         return
-      } 
+      }
       const araname = codeToText[ruleForm.address[0]] + '-' + codeToText[ruleForm.address[1]] + '-' + codeToText[ruleForm.address[2]];
       const form={
         schoolName:ruleForm.schoolName,
@@ -170,7 +170,7 @@ const submitForm = async (formEl) => {
         if(res.code==200){
           ElMessage.success('提交成功')
           await userStore.getDeptInfo()
-          
+
 
         }
      })
@@ -190,7 +190,7 @@ onMounted(() => {
   getregisterinfo()
   getSchoolList()
 
-    
+
 })
 </script>
 
@@ -203,7 +203,7 @@ onMounted(() => {
         display: flex;
         align-items: center;
         font-size: 30px;
-        
+
     }
 }
-</style>
+</style>

src/renderer/src/views/schoolManagement/index.vue

@@ -40,7 +40,7 @@
         </el-table>
         <el-pagination style="margin-top:10px;float: right;" background layout="prev, pager, next"  @size-change="handleSizeChange"
         @current-change="handleCurrentChange" :default-page-size="searchValue.pageSize" v-model:current-page="searchValue.pageNum" :total="total" />
-   
+
         <el-dialog
             v-model="dialogVisible"
             title="加入学校审核"
@@ -80,7 +80,7 @@
 <script setup>
 import { school } from '@/api/apiService';
 import { ref, reactive, onMounted ,computed} from 'vue'
-import { regionData, codeToText } from 'element-china-area-data'
+import { regionData, codeToText } from '@/plugins/china-area-data-json'
 import { ElMessage } from 'element-plus'
 import useUserStore from '@/store/modules/user'
 const userStore = useUserStore()
@@ -150,7 +150,7 @@ const getList = () =>{
     const area=formattedAddress()
     searchValue.area=area
    let obj= filterNullProperties(searchValue)
-   
+
     school.auditlist(obj).then(res=>{
         tableData.value=res.rows
         total.value=res.total
@@ -194,4 +194,4 @@ onMounted(()=>{
     display: flex;
     align-items: center;
 }
-</style>
+</style>

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

@@ -22,24 +22,22 @@
       <el-empty v-else description="请选择符合您需要的教学模式，生成教学大纲" />
     </div>
   </div>
-  <!-- <EditDialog v-model="isEdit" :item="editItem" :index="editIndex" /> -->
+
 </template>
 
 <script setup>
 import { ref, reactive, onMounted, onUnmounted } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { sessionStore } from '@/utils/store'
-import EditDialog from './edit-dialog.vue'
 import emitter from '@/utils/mitt'
 import * as commUtils from '@/utils/comm.js'
 import { createChart, sendChart } from '@/api/ai/index'
-import { completion, addSyllabus, removeSyllabus, editSyllabus, modelList } from '@/api/mode/index.js'
+import { completion, addSyllabus, removeSyllabus, modelList } from '@/api/mode/index.js'
 import { createOutlineV2 } from '@/utils/ppt-request.js'
 import useUserStore from '@/store/modules/user'
 import { cloneDeep } from 'lodash'
 
 const curMode = ref(2)
-const isEdit = ref(false)
 
 const { user } = useUserStore()
 
@@ -50,7 +48,8 @@ const modeOptions = ref([
   },
   {
     label: '知识库模型',
-    value: 2
+    value: 2,
+    disabled: false
   }
 ])
 
@@ -114,14 +113,17 @@ const createAi = async () => {
 
       data = res.data
     }
-    markeDownAnswer.value = data.answer
+    
+
     const res = await createOutlineV2({ query: data.answer })
 
+    markeDownAnswer.value = data.answer
     let outline = JSON.stringify({
       json: res.outline,
       markdown: data.answer
     })
    
+    
     Object.assign(curItem, {...curItem, outline})
 
     emitter.emit('onResult', curItem)
@@ -131,47 +133,6 @@ const createAi = async () => {
   }
 }
 
-// 编辑大纲
-// const editItem = reactive({})
-// const editIndex = ref(0)
-// const onEdit = (item, index)=>{
-
-//   let obj = null
-//   if(index == -1){
-//     obj = {
-//       title: answer.title,
-//       subTitle: answer.subTitle
-//     }
-//   }
-//   else{
-//     obj = cloneDeep(item)
-//   }
-//   editIndex.value = index
-//   isEdit.value = true
-//   Object.assign(editItem, obj)
-// }
-
-// emitter.on('editItem', (item) =>{
-//   if(editIndex.value == -1){
-//     answer.title = item.title
-//     answer.subTitle = item.subTitle
-//   }else{
-//     answer.chapters[editIndex.value] = item
-//   }
-//   let data = cloneDeep(curItem)
- 
-//   data.outline = JSON.stringify(cloneDeep(answer))
-//   loading.value = true
-
-//   editSyllabus(data).then( res =>{
-//     curItem.outline = answer
-//     emitter.emit('onResult', curItem)
-//     ElMessage.success('操作成功')
-//   }).finally( ()=>{
-//     loading.value = false
-//   })
-// })
-
 // 保存模板
 const onSaveTemp = async (outline) => {
   let modelIds = selectedData.value.map(item => item.id).join(',')
@@ -206,8 +167,6 @@ const delAnswer = () => {
       markeDownAnswer.value = ''
       
       emitter.emit('resetSelect')
-      
-      // window.location.reload();
     })
     .catch(() => {})
 
@@ -249,6 +208,14 @@ onMounted(() => {
   // 框架设计 用课标的dataset_id
   let jsonKey = `课标-${data.edustage}-${data.edusubject}`
   params.dataset_id = commUtils.dataSetJson[jsonKey]
+  if(!params.dataset_id){
+    curMode.value = 1
+    modeOptions.value.forEach(item => {
+      if(item.value == 2){
+        item.disabled = true
+      }
+    })
+  }
 
   // 获取百度千帆会话ID
   conversation_id.value = localStorage.getItem('conversation_id')

updatePackageJsonName.js

@@ -7,7 +7,7 @@ const packageJsonPath = path.join(__dirname, 'package.json');
 const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, 'utf8'));
 console.log(env)
 let res = env.npm_lifecycle_event.replace("build", "").replace(":", "");
-res = res?"-" + res:"";
+res = res&&res!=='prod'?"-" + res:"";
 packageJson.name = "aix-win-ws" + res
 
 // 将修改后的内容写回package.json文件