Compare commits

..

No commits in common. "main" and "zouyf_tmp" have entirely different histories.

153 changed files with 3203 additions and 53638 deletions

View File

@ -1,8 +1,6 @@
# 页面标题
VITE_APP_TITLE = 文枢课堂
VITE_APP_ID = 'aix-win-ws'
# 生产环境配置
VITE_APP_ENV = 'production'

View File

@ -1,7 +1,5 @@
# 页面标题
VITE_APP_TITLE = 永川中小学AI教学系统
VITE_APP_ID = 'aix-win-ws-yc'
VITE_APP_TITLE = 文枢课堂
# 生产环境配置
VITE_APP_ENV = 'production'

View File

@ -1,8 +1,6 @@
# 页面标题
VITE_APP_TITLE = 实训教学
VITE_APP_ID = 'aix-win-ws-yc2'
# 生产环境配置
VITE_APP_ENV = 'production'

27
.env.yy
View File

@ -1,27 +0,0 @@
# 页面标题
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'

View File

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

View File

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

View File

@ -1,16 +1,11 @@
appId: com.electron.app.yc
productName: 永川中小学AI教学系统
productName: 文枢课堂
directories:
output: dist
buildResources: build
win:
executableName: 永川中小学AI教学系统
executableName: 文枢课堂
icon: resources/yc-logo.png
# target:
# - target: nsis
# arch:
# - x64
# - ia32
files:
- '!**/.vscode/*'
- '!src/*'
@ -22,7 +17,7 @@ asarUnpack:
nsis:
oneClick: false
allowToChangeInstallationDirectory: true
artifactName: ${name}-${version}-setup.${ext}
artifactName: ${name}-yc-${version}-setup.${ext}
shortcutName: ${productName}
uninstallDisplayName: ${productName}
createDesktopShortcut: always
@ -52,8 +47,8 @@ publish:
electronDownload:
mirror: https://npmmirror.com/mirrors/electron/
# 额外依赖打包到输出目录
#extraFiles:
# - from: ./node_modules/im_electron_sdk/lib/
# to: ./resources
# filter:
# - '**/*'
extraFiles:
- from: ./node_modules/im_electron_sdk/lib/
to: ./resources
filter:
- '**/*'

View File

@ -6,11 +6,6 @@ directories:
win:
executableName: 实训教学
icon: resources/yc-logo.png
# target:
# - target: nsis
# arch:
# - x64
# - ia32
files:
- '!**/.vscode/*'
- '!src/*'
@ -22,7 +17,7 @@ asarUnpack:
nsis:
oneClick: false
allowToChangeInstallationDirectory: true
artifactName: ${name}-${version}-setup.${ext}
artifactName: ${name}-ycsx-${version}-setup.${ext}
shortcutName: ${productName}
uninstallDisplayName: ${productName}
createDesktopShortcut: always
@ -52,8 +47,8 @@ publish:
electronDownload:
mirror: https://npmmirror.com/mirrors/electron/
# 额外依赖打包到输出目录
#extraFiles:
# - from: ./node_modules/im_electron_sdk/lib/
# to: ./resources
# filter:
# - '**/*'
extraFiles:
- from: ./node_modules/im_electron_sdk/lib/
to: ./resources
filter:
- '**/*'

View File

@ -1,59 +0,0 @@
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:
# - '**/*'

View File

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

View File

@ -35,7 +35,7 @@ export default defineConfig({
target: 'http://27.128.240.72:7865',
// target: 'https://prev.ysaix.com:7868/prod-api/',
// target: 'http://36.134.181.164:7863',
// target: 'http://192.168.2.237:7865',
// target: 'http://192.168.0.102:7865',
changeOrigin: true,
rewrite: (p) => p.replace(/^\/dev-api/, '')
},

View File

@ -1,6 +1,6 @@
{
"name": "aix-win-ws",
"version": "2.5.20",
"version": "2.5.8",
"description": "",
"main": "./out/main/index.js",
"author": "上海交大重庆人工智能研究院",
@ -10,15 +10,14 @@
"lint": "eslint . --ext .js,.jsx,.cjs,.mjs,.ts,.tsx,.cts,.mts --fix",
"start": "electron-vite preview",
"dev": "electron-vite dev",
"build": "electron-vite build",
"postinstall": "electron-builder install-app-deps",
"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: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:test": "electron-vite build --mode test && electron-builder --win --config ./electron-builder.yml",
"build:prod": "electron-vite build --mode production && electron-builder --win --config ./electron-builder-prod.yml",
"build:yc": "electron-vite build --mode yc && electron-builder --win --config ./electron-builder-yc.yml",
"build:yc2": "electron-vite build --mode yc2 && electron-builder --win --config ./electron-builder-yc2.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"
@ -37,14 +36,12 @@
"@electron/remote": "^2.1.2",
"@element-plus/icons-vue": "^2.3.1",
"@icon-park/vue-next": "^1.4.2",
"@kangc/v-md-editor": "^2.3.18",
"@tinymce/tinymce-vue": "5.1.1",
"@vitejs/plugin-vue-jsx": "^4.0.0",
"@vue-office/docx": "^1.6.2",
"@vue-office/excel": "^1.7.11",
"@vue-office/pdf": "^2.0.2",
"@vueuse/core": "^10.11.0",
"aix-plugins-aitools": "^1.1.24",
"animate.css": "^4.1.1",
"circular-json": "^0.5.9",
"clipboard": "^2.0.11",
@ -56,19 +53,20 @@
"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",
"less": "^4.2.0",
"less-loader": "^7.3.0",
"lodash": "^4.17.21",
"markmap-lib": "^0.18.8",
"mitt": "^3.0.1",
"nanoid": "^5.0.7",
"node-addon-api": "^8.1.0",
@ -103,7 +101,6 @@
"vue-cropper": "1.0.3",
"vue-qr": "^4.0.9",
"vue-router": "^4.4.0",
"vue3-mindmap": "^0.5.12",
"vuedraggable": "^4.1.0",
"whiteboard_lyc": "^0.1.3",
"xgplayer": "^3.0.19",

Binary file not shown.

Before

Width:  |  Height:  |  Size: 79 KiB

View File

@ -13,34 +13,6 @@ export default async function ({ app, shell, BrowserWindow, ipcMain }) {
const appTempFilePath = userDataPath + '\\tempFile\\'
let Spark = new SparkMD5.ArrayBuffer()
ipcMain.on('remove-local-file-list', (e, list) => {
let filePath = appRootFilePath
for (let i = 0; i < list.length; i++) {
let item = list[i];
if (!isAccess(filePath + item.fileNewName)) {
e.reply('remove-local-file-list-not', item)
continue
}
try {
fs.unlinkSync(filePath + item.fileNewName);
console.log(`${filePath} 已成功删除`);
} catch (err) {
console.error(`删除文件时出错:`, err);
e.reply('remove-local-file-list-error', item)
}
}
e.reply('remove-local-file-list-reply')
})
const isAccess = (filePath) => {
try {
fs.accessSync(filePath);
return true
} catch (err) {
return false
}
}
ipcMain.on('upload-file-change', (e, { id, fileNewName, cookie, fileType }) => {
let filePath = appRootFilePath + fileNewName
//执行更新,上传文件
@ -86,6 +58,7 @@ export default async function ({ app, shell, BrowserWindow, ipcMain }) {
}
//倒数十秒提交更改,十秒之内有继续修改则重置倒数
uploadId = setTimeout(() => {
console.log(223)
//执行更新,上传文件
let formData = new FormData()
formData.append('id', id)
@ -116,12 +89,8 @@ export default async function ({ app, shell, BrowserWindow, ipcMain }) {
function getFileMsg(path) {
return new Promise((resolve, reject) => {
try {
const stats = fs.statSync(path)
resolve(stats.mtime.getTime())
}catch (e) {
reject(e)
}
const stats = fs.statSync(path)
return resolve(stats.mtime.getTime())
})
}
@ -334,20 +303,17 @@ export default async function ({ app, shell, BrowserWindow, ipcMain }) {
},
onDownloadCancelled: async () => {
console.log("取消")
resolve({type:"取消了下载"})
reject({type:"取消了下载"})
},
onDownloadInterrupted: async () => {
console.log('中断')
resolve({type:"下载被中断"})
reject({type:"下载被中断"})
},
onError: (err, data) => {
console.log(err.toString())
resolve({type:"下载出错",err})
reject({type:"下载出错",err})
}
}
}).catch(err=>{
console.log(err)
resolve({type:"下载出错",err})
})
})
}
@ -359,11 +325,6 @@ export default async function ({ app, shell, BrowserWindow, ipcMain }) {
//下载文件
ipcMain.on('download-file-default', (e, { url, fileName }) => {
console.log(url, fileName)
if (!url) {
e.reply('download-file-default' + fileName, false)
return;
}
createFolder('selfFile')
.then(async () => {
const browserWindow = BrowserWindow.getFocusedWindow()
@ -399,7 +360,6 @@ export default async function ({ app, shell, BrowserWindow, ipcMain }) {
})
})
.catch((error) => {
console.log(error)
e.reply('download-file-default' + fileName, false)
})
})
@ -452,27 +412,6 @@ export default async function ({ app, shell, BrowserWindow, ipcMain }) {
})
})
ipcMain.on('export-img64-file', function (event, {base64, name}) {
name = name || '思维导图'
const parts = base64.split(';base64,');
const contentType = parts[0].split(':')[1];
const extension = contentType.split('/')[1];
const data = Buffer.from(parts[1], 'base64');
dialog.showSaveDialog({
title: '保存图片',
defaultPath: path.join(app.getPath('downloads'), `${name}.${extension}`),
filters: [
{ name: 'Image Files', extensions: [extension] }
]
}).then(result => {
if (!result.canceled) {
fs.writeFileSync(result.filePath, data);
event.reply('export-img64-file-reply')
}
});
})
/*导出文件*/
function exportFile(list, callback) {
let win = BrowserWindow.getFocusedWindow()

View File

@ -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,28 +42,12 @@ if(!gotTheLock){
}
})
}
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
}
let logoIco = import.meta.env.MODE==='yc'||import.meta.env.MODE==='yc2'?'../../resources/yc-logo.png':'../../resources/logo2.ico'
//登录窗口
function createLoginWindow() {
if (loginWindow) return
loginWindow = new BrowserWindow({
// width: import.meta.env.MODE==='yc'||import.meta.env.MODE==='yc2'?1060:888,
width: 1060,
width: import.meta.env.MODE==='yc'||import.meta.env.MODE==='yc2'?1060:888,
height: 520,
show: false,
frame: false,
@ -260,13 +244,6 @@ 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) => {
@ -293,14 +270,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()})`)
})
// 用于监听-状态管理变化-同步所有窗口

View File

@ -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

View File

@ -8,13 +8,12 @@
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'; 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:;" />
<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;" />
</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>

5430
src/renderer/public/aaa.pdf Normal file

File diff suppressed because it is too large Load Diff

View File

@ -1,3 +0,0 @@
<svg style="width: 1em;height: 1em;vertical-align: middle;fill: currentColor;overflow: hidden;" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="6511">
<path d="M512 34.133333c263.466667 0 477.866667 214.4 477.866667 477.866667S775.466667 989.866667 512 989.866667 34.133333 775.466667 34.133333 512 248.533333 34.133333 512 34.133333M512 0C229.333333 0 0 229.333333 0 512s229.333333 512 512 512 512-229.333333 512-512S794.666667 0 512 0z" fill="#87C1FF" p-id="6512"></path><path d="M505.173333 611.62666667c100.053333 0 181.333333-80.64 181.333334-180.053333 0-99.2-81.28-180.053333-181.333334-180.053334-100.053333 0-181.333333 80.64-181.333333 180.053334s81.28 180.053333 181.333333 180.053333zM579.84 661.54666667h-135.893333c-126.293333 0-229.12 102.4-229.12 228.053333v13.44c0 65.706667 101.12 65.706667 229.12 65.706667h135.893333c122.88 0 229.12 0 229.12-65.706667v-13.44c0-125.653333-102.826667-228.053333-229.12-228.053333z" fill="#87C1FF" p-id="6513"></path>
</svg>

Before

Width:  |  Height:  |  Size: 1006 B

View File

@ -1 +0,0 @@
<svg viewBox="0 0 58 44" fill="none" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><path id="path" d="M57.25 3.64C56.64 3.33 56.37 3.91 56.01 4.21C55.89 4.3 55.79 4.43 55.68 4.54C54.79 5.52 53.74 6.16 52.37 6.08C50.38 5.97 48.67 6.61 47.16 8.16C46.84 6.24 45.77 5.1 44.15 4.36C43.3 3.98 42.45 3.6 41.85 2.77C41.44 2.17 41.32 1.51 41.12 0.86C40.98 0.47 40.85 0.07 40.41 0C39.93 -0.07 39.74 0.34 39.55 0.68C38.8 2.09 38.5 3.64 38.53 5.2C38.6 8.73 40.06 11.54 42.96 13.54C43.29 13.76 43.38 13.99 43.27 14.33C43.08 15.02 42.84 15.68 42.63 16.37C42.5 16.81 42.3 16.91 41.84 16.72C40.25 16.04 38.87 15.04 37.65 13.82C35.59 11.79 33.72 9.54 31.39 7.78C30.85 7.37 30.3 6.99 29.73 6.63C27.36 4.28 30.05 2.35 30.67 2.12C31.32 1.88 30.89 1.06 28.79 1.06C26.69 1.07 24.77 1.79 22.31 2.75C21.96 2.89 21.58 3 21.19 3.08C18.97 2.65 16.66 2.56 14.24 2.83C9.7 3.35 6.07 5.54 3.4 9.27C0.19 13.76 -0.56 18.87 0.36 24.19C1.33 29.8 4.14 34.44 8.46 38.07C12.94 41.84 18.1 43.68 23.98 43.33C27.56 43.12 31.54 42.63 36.02 38.76C37.16 39.33 38.34 39.56 40.31 39.74C41.83 39.88 43.29 39.66 44.43 39.42C46.2 39.04 46.08 37.37 45.43 37.06C40.24 34.6 41.38 35.6 40.34 34.79C42.98 31.6 46.96 28.3 48.52 17.59C48.64 16.74 48.54 16.2 48.52 15.51C48.51 15.09 48.6 14.93 49.07 14.88C50.38 14.73 51.64 14.37 52.8 13.72C56.16 11.84 57.52 8.77 57.84 5.08C57.89 4.51 57.83 3.93 57.25 3.64ZM27.91 36.83C22.88 32.8 20.44 31.47 19.43 31.53C18.49 31.59 18.65 32.68 18.86 33.4C19.08 34.11 19.36 34.6 19.76 35.22C20.03 35.63 20.22 36.24 19.48 36.7C17.86 37.72 15.04 36.35 14.91 36.29C11.63 34.32 8.89 31.72 6.95 28.16C5.09 24.74 4 21.07 3.82 17.16C3.78 16.21 4.05 15.88 4.97 15.7C6.19 15.48 7.44 15.43 8.66 15.61C13.8 16.37 18.17 18.71 21.84 22.42C23.94 24.53 25.52 27.06 27.15 29.52C28.89 32.14 30.75 34.63 33.13 36.68C33.97 37.4 34.64 37.94 35.28 38.34C33.35 38.56 30.12 38.61 27.91 36.83ZM30.33 21.02C30.33 20.6 30.66 20.26 31.07 20.26C31.17 20.26 31.25 20.28 31.33 20.31C31.43 20.35 31.53 20.41 31.6 20.49C31.73 20.63 31.81 20.82 31.81 21.02C31.81 21.44 31.48 21.77 31.06 21.77C30.65 21.77 30.33 21.44 30.33 21.02ZM37.82 24.93C37.34 25.14 36.86 25.31 36.4 25.33C35.68 25.36 34.9 25.07 34.48 24.71C33.82 24.14 33.35 23.83 33.15 22.84C33.06 22.42 33.11 21.77 33.19 21.4C33.36 20.6 33.17 20.08 32.61 19.61C32.16 19.23 31.58 19.12 30.95 19.12C30.72 19.12 30.5 19.02 30.34 18.93C30.07 18.8 29.86 18.47 30.06 18.05C30.13 17.92 30.45 17.6 30.53 17.54C31.38 17.04 32.37 17.2 33.29 17.58C34.14 17.93 34.78 18.58 35.7 19.5C36.65 20.61 36.82 20.91 37.35 21.74C37.78 22.39 38.16 23.06 38.43 23.83C38.59 24.3 38.38 24.7 37.82 24.93Z" fill="#4D6BFE" fill-opacity="1.000000" fill-rule="nonzero"></path></svg>

Before

Width:  |  Height:  |  Size: 2.6 KiB

View File

@ -1,8 +0,0 @@
<?xml version="1.0" standalone="no"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" id="body_1" width="96" height="97">
<g transform="matrix(1.3333334 0 0 1.3333334 0 0)">
<image x="0" y="0" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGAAAABhCAYAAAApxKSdAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAT2SURBVHhe7Z0/stowEMYp04UuZahSZqjSZYYmXQqKpEtBn+IxSZcm3ABuQG7wuAFH4AgcgSMQfcp7xDYf9uKVZOt5d+bXyJYt76c/K9mIkdlwbOyYOKaOmWPuWBRYOlaJwL2K90ZZUCaAMqKs2RoKj4daOx4dR8fJcc4MlPngwDNANIgEcXppqNW/HXA2e5iXBERB5eqFGGiyewcr6BDAs8MHyQ3qD9nxVbaOZC3iwZFjn54CdMPRDIOr1fpmMGgHbw244BAG2FDAV8FEQIRjzr+fICJYzdeBsbK1COb8MLRuCeb8cGDydtfyBmZ67EJGe+BTkWEdh13A0COaNVvXEw/4trYrwkyOZTTCgZVVahb1pAGhKW0F1veng7YCq/3pQFhaMiw3sBONeJQiIrwjZScZ8YDPL2bLzOmBzy9mL1jSA597Q0jEThgm48k/2LHw+EU6DAbs4LD48HAe/TydR7/O//m2jy0GPnWx+H/0aV12fJEfTpS3M55PD3zvJwXsYGvm8/m5yXa7Hc3bluPx+HTlehuPx+W87xfc8UW+H8t5wuEnZH8KCUFYLBZPj3vb9nvXvEneNkjuB9tut9f5vz5yp1d5M73Oqwefs/i3+Oxga1ILIK39kwnpz9HPM4dXQUup5tXjBQg+B0gpgKr2A3QvzOFV4gjg5wJZC4DrSIzWfiDtgt7NeX4dXoDgi3CpBIBTJXaz9oOPK+7wKq+jhKPwfb4CwLESm81qwshXLiqqxv9VPtcIqCNfAaS1X3SfulaAQRoisXx68hVAWvtRFpb/Ama6xRaAQRl8cWNDnIG3iBeAHVCRQgBJ6IlzWN4S6NshQrxa3gRNVBFbAMn1YY21vx/QRBWxBQhW+/sBTVQRU4AXVvsBTVQRUwDka7KMaj+giSpiCSANPafTKAtnsaCJKmIJIAk9VysX05O8PYYmqoghgKT2bzYbmrfn0EQVMQSoq/2Hw8Hfk+XLAJqoQiLA6XTyIkjB+beMnQ/W63UO4wFNVCERIKWh9dxcju4emqiibwLAEJr2tDXQRBV9FACGbqyHLYEmquhagLqlCowNrMwdQhNVdCkAnI+5QJ3VvqBJD01U0aUAuHeTAD1rBTRRRVcCLJdLf/8mATAWVMvcITRRRUoB4EzMgIuDa5MAsB4NxjRRhUQAzF7RF7cFIeXVZ4ZPSATANVjeDqCJKiQCxOyHTQAT4B5oogoT4C5oogoT4C5oogoT4C5oooquBcB8oMlMgIgCSO5vApgAz+T5bWgdGQmQ78e5dZgAJoAUE6BjvABZ/0aMkZEA+f9Ij5GbANn/ULtKRgLsHCZAh/gfagffK8IEEOP3igi+W4oJIMbvloI9a9jB1pgAYvzGfdi1iR004nPZwNX2jEvPZc84WPC5gNGInwM8m+0bmp7SvqG2cV96sFtxybCfMTvRCI9fhKta8AmZcRMf/1cNIZFFQ/FB7b/5r0rWCuLjlx9uGVpB8Bc0xgXa91fNIqJ40L6f2cbBLmC0Bz4VG7oiC0vDIep6qmb/qhSG2qinyZDRQtP2qJz/bNYS2gGfXS03tDUT4T6C1Pyq4YLBd1p/gWCZ+fKiJYbZbJmDsbK0xBzT0BqCf86SMaj1wbsciWHWPOS3aXh2/2K9a4P6mOkNYfKGARbdcLAIJ7RBDHzqgkJi0IYoOc4lUGY4G8+AyoV1nMCD62j0F2POfFZ8DMaTAAAAAElFTkSuQmCC" preserveAspectRatio="none" width="72" height="72.75"/>
</g>
</svg>

Before

Width:  |  Height:  |  Size: 2.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.3 KiB

File diff suppressed because one or more lines are too long

Before

Width:  |  Height:  |  Size: 220 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 420 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 683 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 422 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 509 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 295 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 289 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 738 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 598 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 674 B

File diff suppressed because one or more lines are too long

View File

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

View File

@ -1,47 +0,0 @@
export default class gridPic {
private static Instance: gridPic | null = null;
private gridPicRef: any = null;
constructor(elRef?: any) {
if (elRef) {
this.gridPicRef = elRef;
}
if (!gridPic.Instance) {
gridPic.Instance = this;
}
return gridPic.Instance;
}
// 初始化
init(elRef) {
if (elRef) {
this.gridPicRef = elRef;
}
return this;
}
addPIc(data) {
if (this.gridPicRef && this.gridPicRef.value && typeof this.gridPicRef.value.addPic === 'function') {
this.gridPicRef.value.addPic(data);
}
return this;
}
// 静态方法 - 初始化
static init(elRef) {
if (!gridPic.Instance) {
gridPic.Instance = new gridPic(elRef);
} else {
gridPic.Instance.init(elRef);
}
return gridPic.Instance;
}
// 静态方法 - 打开推图上屏幕
static addPIc(data) {
if (gridPic.Instance) {
return gridPic.Instance.addPIc(data);
}
return null;
}
}

View File

@ -97,30 +97,14 @@ export class PPTApi {
})
}
/**
* @description slide
* @param slides
* @param slideAll
* @returns
*/
static async addSlideServer(slides: object[], slideAll: object[]) {
const resource = sessionStore.get('curr.resource')||{}
for(const slide of slides){
slide.id = resource.id // 覆盖默认随机id
await this.addSlide(slide)
}
await this.batchUpdateSlides(slideAll, true) // 批量更新-排序
return PPTApi.getSlideList(resource.id) // 更新幻灯片列表以及活动相关
}
// 新增幻灯片
static addSlide(data: object): Promise<Boolean> {
return new Promise(async (resolve, reject) => {
const enpt = sessionStore.get('curr.entp')||{}
// const resource = sessionStore.get('curr.resource')||{}
const resource = sessionStore.get('curr.resource')||{}
const {id, ...content} = data
const params = {
parentid: id,
parentid: resource.id,
entpid: userStore.user.deptId,
entpcourseid: enpt.id,
ppttype: 'file',
@ -142,7 +126,7 @@ export class PPTApi {
// msgUtils.msgSuccess('新增成功')
this.isUpdate = false // 新增后会触发监听,不再更新数据
resolve(true)
} else msgUtils.msgError('新增失败');reject(false)
} else msgUtils.msgError('新增失败');resolve(false)
})
}
/**
@ -163,17 +147,22 @@ export class PPTApi {
const currInd = toRaw(slidesStore.slideIndex) // 当前页索引-new
const oldInd = oldData.findIndex(o => o.id == currentSlide.id) // 当前页索引-old
const isBatch = oldVal && oldVal.length && currInd != oldInd // 是否批量更新-排序
if (isAdd) return // 新增-这里不处理 状态管理-处理
// 防抖-更新
if (!this.isUpdate) return this.isUpdate = true // 下次更新数据
if (isBatch) { // 批量更新-排序
this.batchUpdateSlides(newData, true)
} else { // 更新当前页幻灯片
const params = {
id: currentSlide.id,
datacontent: JSON.stringify(currentSlide),
if (isAdd) { // 新增的幻灯片(id 为非数字,说明是新增的幻灯片)
const bool = await this.addSlide(currentSlide)
bool && await this.batchUpdateSlides(newData, true) // 批量更新-排序
const resource = sessionStore.get('curr.resource')||{}
await PPTApi.getSlideList(resource.id)
} else { // 防抖-更新
if (!this.isUpdate) return this.isUpdate = true // 下次更新数据
if (isBatch) { // 批量更新-排序
this.batchUpdateSlides(newData, true)
} else { // 更新当前页幻灯片
const params = {
id: currentSlide.id,
datacontent: JSON.stringify(currentSlide),
}
Utils.mxThrottle(() => {this.updateSlide(params)}, 200, 2)
}
Utils.mxThrottle(() => {this.updateSlide(params)}, 200, 2)
}
}
// 更新幻灯片 isThum 是否更新缩略图
@ -285,7 +274,6 @@ export class PPTApi {
static toRousrceUrl =async (o:any) => {
const formData = new FormData()
formData.append('file', o)
formData.append('ral', true)
const res = await Api_server.Other.uploadFile(formData)
if (res && res.code == 200){
const url = res?.url

View File

@ -132,8 +132,6 @@ export class MsgEnum {
MSG_dz : 'dz',
/** @desc: 疑惑 */
MSG_yh : 'yh',
/** @desc: 推图片上屏 */
MSG_pushSreen_ImgList : 'pushSreen_ImgList',
// === 新定义-消息头 ===
/** @desc: 课程创建-待开课 */
MSG_0000: 0x0000,

View File

@ -2,7 +2,7 @@
* @description
*/
import { watch, render } from 'vue'
import { watch } from 'vue'
import { PPTApi } from './index'
import * as store from '../store'
import { sessionStore } from '@/utils/store' // electron-store 状态管理
@ -12,10 +12,9 @@ import Classcourse from './classcourse' // 课程相关
import msgUtils from '@/plugins/modal' // 消息工具
import * as dialogUtils from '@/utils/dialog' // 弹窗-函数
import { Homework } from './index' // api-作业相关
import emitter from '@/utils/mitt' //mitt 事件总线
// import emitter from '@/utils/mitt' //mitt 事件总线
import useExecPlay from '../views/Screen/hooks/useExecPlay' // 播放控制
import hooksUpvote from './upvote' // 点赞-工具
import gridPic from './gridPic' // 上屏-工具
/**
* @description
@ -99,8 +98,6 @@ export default () => {
}
break
case MsgEnum.HEADS.MSG_slideFlapping: // 幻灯片翻页
render(null, document.body) //移除弹窗
emitter.emit('closegridPic') //如果有推图片窗口 就关闭
const slideIndex = content?.current || 0
const type = content?.animation // 上下动作
const steps = content?.animationSteps // 动画步骤
@ -131,10 +128,6 @@ export default () => {
case MsgEnum.HEADS.MSG_yh: // 疑惑
hooksUpvote.trigger(2)
break
case MsgEnum.HEADS.MSG_pushSreen_ImgList: // 推图片上屏
const imgArray = content.ImgList.map((obj) => obj.url);
emitter.emit('opengridPic',{arr:imgArray}) // 打开推图片上屏窗口
break
case MsgEnum.HEADS.MSG_0010: // 备用
break
default:

File diff suppressed because it is too large Load Diff

View File

@ -148,8 +148,7 @@ export const useSlidesStore = defineStore('slides', {
this.workItem = list
},
async addSlide(slide: Slide | Slide[]) {
const { PPTApi } = await import('../api/index')
addSlide(slide: Slide | Slide[]) {
const slides = Array.isArray(slide) ? slide : [slide]
for (const slide of slides) {
if (slide.sectionTag) delete slide.sectionTag
@ -157,8 +156,6 @@ export const useSlidesStore = defineStore('slides', {
const addIndex = this.slideIndex + 1
this.slides.splice(addIndex, 0, ...slides)
this.slideIndex = addIndex
// 添加到服务器
PPTApi.addSlideServer(slides, this.slides)
},
updateSlide(props: Partial<Slide>, slideId?: string) {
const slideIndex = slideId ? this.slides.findIndex(item => item.id === slideId) : this.slideIndex

View File

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

View File

@ -5,21 +5,14 @@
</header>
<div class="flex material-list" v-loading="loading">
<div class="flex material-item" v-for="item in list" :key="item.id" >
<div class="flex material-item">
<el-image v-if="item.fileType.indexOf('image')!=-1" :src="fileUrl(item)" class="img" />
<svg v-if="item.fileType.indexOf('video')!=-1" class="icon file-icon" aria-hidden="true" :style="{ 'font-size': 100 + 'px' }">
<use :xlink:href="'#icon-video'"></use>
</svg>
<svg class="icon file-icon" v-if="item.fileType.indexOf('audio')!=-1" aria-hidden="true" :style="{ 'font-size': 100 + 'px' }">
<use :xlink:href="'#icon-mp'"></use>
</svg>
<div class="texts">{{ item.fileShowName }}</div>
<!-- <el-text truncated>{{ item.fileShowName }}</el-text> -->
<div class="flex">
<el-image :src="fileUrl(item)" class="img" />
<el-text truncated>{{ item.fileShowName }}</el-text>
</div>
<el-button style="margin-left: 10px;" type="primary" @click="onInsert(item)">插入</el-button>
<el-button type="primary" @click="onInsert(item)">插入</el-button>
</div>
<el-empty description="暂无素材" v-if="!list.length" />
</div>
</div>
</template>
<script setup>
@ -44,7 +37,7 @@ let params = {
pageSize: 500
}
const suffixAry = [ 'jpeg','jpg','png','gif','mp3','mp4','avi','mov',"wav"]
const suffixAry = [ 'jpeg','jpg','png','gif','mp3','mp4','avi','mov']
const videoSuffix = ['mp3','mp4','avi','mov']
const list = ref([])
const loading = ref(false)
@ -55,7 +48,6 @@ const init = () => {
if(res.rows && res.rows.length){
//
list.value = res.rows.filter( item => suffixAry.indexOf(getFileSuffix(item.fileShowName)) != -1)
console.log(list.value)
}
})
}
@ -72,19 +64,16 @@ const fileUrl = computed(() => (item) =>{
//
const onInsert = async (item) =>{
loading.value = true
// const res = await fetch(item.fileFullPath)
// const bolb = await res.blob()
// const file = commUtils.blobToFile(bolb, item.fileShowName)
const data=item.fileFullPath
const res = await fetch(item.fileFullPath)
const bolb = await res.blob()
const file = commUtils.blobToFile(bolb, item.fileShowName)
try {
console.log('item', item)
// const data = await PPTApi.toRousrceUrl(file)
const data = await PPTApi.toRousrceUrl(file)
if(videoSuffix.indexOf(getFileSuffix(item.fileShowName)) != -1){
emit('insertMaterial',{ type: 'video', data })
}else if(item.fileType.indexOf('audio') != -1){
emit('insertMaterial',{ type: 'audio', data })
}else{
emit('insertMaterial',{ type: 'video', data })
}
else{
emit('insertMaterial',{ type: 'img', data })
}
} finally {
@ -136,17 +125,11 @@ onMounted(() => {
align-items: center;
margin-bottom: 10px;
font-size: 14px;
justify-content: space-between;
.img{
width: 100px;
height: 100px;
margin-right: 20px;
}
}
.texts{
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
max-width: 600px;
}
</style>

View File

@ -94,7 +94,7 @@ const insertImageElementaudio = (files: FileList) => {
const imageFile = files[0]
if (!imageFile) return
PPTApi.toRousrceUrl(imageFile).then(data=>{
audioSrc.value=data
videoSrc.value=data
insertAudio()
})

View File

@ -287,8 +287,6 @@ const insertMaterial = async (item: MaterialParams) =>{
const { type, data } = item
if(type == 'video'){
createVideoElement(data)
}else if(type == 'audio'){
createAudioElement(data)
}
else{
createImageElement(data)

View File

@ -16,7 +16,7 @@
<PopoverMenuItem>导入 pptx 文件</PopoverMenuItem>
</FileInput>
<PopoverMenuItem @click="setDialogForExport('pptx')">导出文件</PopoverMenuItem> -->
<!-- <PopoverMenuItem @click="resetSlides(); mainMenuVisible = false">重置幻灯片</PopoverMenuItem> -->
<PopoverMenuItem @click="resetSlides(); mainMenuVisible = false">重置幻灯片</PopoverMenuItem>
<!-- <PopoverMenuItem @click="goLink('https://github.com/pipipi-pikachu/PPTist/issues')">意见反馈</PopoverMenuItem> -->
<!-- <PopoverMenuItem @click="goLink('https://github.com/pipipi-pikachu/PPTist/blob/master/doc/Q&A.md')">常见问题</PopoverMenuItem> -->
<PopoverMenuItem @click="mainMenuVisible = false; hotkeyDrawerVisible = true">快捷操作</PopoverMenuItem>

View File

@ -95,8 +95,8 @@
style="width: 65%;"
:options="[
{ label: '主动触发', value: 'click' },
// { label: '', value: 'meantime' },
// { label: '', value: 'auto' },
{ label: '与上一动画同时', value: 'meantime' },
{ label: '上一动画之后', value: 'auto' },
]"
/>
</div>

View File

@ -88,7 +88,7 @@ import Button from '../../../../components/Button.vue'
import ButtonGroup from '../../../../components/ButtonGroup.vue'
import Popover from '../../../../components/Popover.vue'
import NumberInput from '../../../../components/NumberInput.vue'
import { PPTApi } from '../../../../api'
const shapeClipPathOptions = CLIPPATHS
const ratioClipOptions = [
{
@ -221,14 +221,10 @@ const presetImageClip = (shape: string, ratio = 0) => {
const replaceImage = (files: FileList) => {
const imageFile = files[0]
if (!imageFile) return
PPTApi.toRousrceUrl(imageFile).then(data=>{
const props = { src: data }
updateImage(props)
getImageDataURL(imageFile).then(dataURL => {
const props = { src: dataURL }
updateImage(props)
})
// getImageDataURL(imageFile).then(dataURL => {
// const props = { src: dataURL }
// updateImage(props)
// })
}
//

View File

@ -46,12 +46,11 @@
:options="[
{ label: '线性渐变', value: 'linear' },
{ label: '径向渐变', value: 'radial' },
{ label: '背景图', value: 'image' },
]"
/>
</div>
<template v-if="fillType === 'gradient' && gradient.type !== 'image'">
<template v-if="fillType === 'gradient'">
<div class="row">
<GradientBar
:value="gradient.colors"
@ -207,13 +206,6 @@ 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) => {

View File

@ -47,10 +47,8 @@
<IconListView class="tool-btn" v-tooltip="'演讲者视图'" @click="changeViewMode('presenter')" />
<IconOffScreenOne class="tool-btn" v-tooltip="'退出全屏'" v-if="fullscreenState" @click="manualExitFullscreen()" />
<IconFullScreenOne class="tool-btn" v-tooltip="'进入全屏'" v-else @click="enterFullscreen()" />
<Hands class="tool-btn" v-if="classcourse" v-tooltip="'课堂点名'" @click="ToolHandle('named')" />
<Share class="tool-btn" v-if="classcourse" v-tooltip="'分享'" @click="ShareCode()" />
<IconPower class="tool-btn" v-if="!classcourse" v-tooltip="'结束放映'" @click="exitScreening()" />
<IconPower class="tool-btn" v-else v-tooltip="'结束课堂'" @click="exitCourse()" size="30" fill="#d0021b" strokeLinecap="butt" />
<IconPower class="tool-btn" v-tooltip="'结束放映'" @click="exitScreening()" />
<IconPower class="tool-btn close" v-if="chat.groupid" v-tooltip="'结束课堂'" @click="exitCourse()" />
</div>
<div :class="['tools-icon',{opacity:iconHide}]" @click.stop="toolTrigger('icon')">
<circle-double-down v-if="rightToolsVisible" theme="outline" size="30" fill="#409EFF"/>
@ -77,8 +75,7 @@ import WritingBoardTool from './WritingBoardTool.vue'
import CountdownTimer from './CountdownTimer.vue'
import emitter from '@/utils/mitt';
import Chat from '../../api/chat' //
import { CircleDoubleDown, CircleDoubleUp, Share, Hands } from '@icon-park/vue-next' // icon-park
import { ShareCode, ToolHandle } from '@/utils/ppt' // ppt
import { CircleDoubleDown, CircleDoubleUp } from '@icon-park/vue-next' // icon-park
const props = defineProps<{
changeViewMode: (mode: 'base' | 'presenter') => void
@ -105,7 +102,6 @@ const {
execPrev,
execNext,
animationIndex,
turning,
} = useExecPlay()
const { slideWidth, slideHeight } = useSlideSize()
const { exitScreening } = useScreening()
@ -202,7 +198,7 @@ const contextmenus = (): ContextmenuItem[] => {
},
]
}
//
const toolTrigger = (type:string) => {
const curT = Date.now()
if (curT - timer.value < 200) return

View File

@ -10,13 +10,9 @@
<IconOffScreenOne class="tool-icon" v-else />
<span>{{ fullscreenState ? '退出全屏' : '全屏' }}</span>
</div>
<template v-if="classcourse">
<div class="tool-btn" @click="ToolHandle('named')"><Hands class="tool-icon" /><span>课堂点名</span></div>
<div class="tool-btn" @click="ShareCode()"><Share class="tool-icon" /><span>分享</span></div>
</template>
<Divider class="divider" />
<div class="tool-btn" v-if="!classcourse" @click="exitScreening()"><IconPower class="tool-icon" /><span>结束放映</span></div>
<div class="tool-btn" v-else @click="exitCourse()" size="30" fill="#d0021b" strokeLinecap="butt"><IconPower class="tool-icon" /><span>结束课堂</span></div>
<div class="tool-btn" @click="exitScreening()"><IconPower class="tool-icon" /><span>结束放映</span></div>
<div class="tool-btn close" @click="exitCourse()" v-if="chat.groupid"><IconPower class="tool-icon" /><span>结束课堂</span></div>
</div>
<div class="content">
@ -82,7 +78,6 @@
</template>
<script lang="ts" setup>
import { Share, Hands } from '@icon-park/vue-next' // icon-park
import { computed, nextTick, onMounted, onUnmounted, ref, watch } from 'vue'
import { storeToRefs } from 'pinia'
import { useSlidesStore, useClasscourseStore } from '../../store'
@ -102,7 +97,6 @@ import CountdownTimer from './CountdownTimer.vue'
import Divider from '../../components/Divider.vue'
import emitter from '@/utils/mitt';
import Chat from '../../api/chat' //
import { ShareCode, ToolHandle } from '@/utils/ppt' // ppt
const props = defineProps<{
changeViewMode: (mode: 'base' | 'presenter') => void
@ -131,7 +125,7 @@ const { slideWidth, slideHeight } = useSlideSize(slideListWrapRef)
const { exitScreening } = useScreening()
const { slidesLoadLimit } = useLoadSlides()
const { fullscreenState, manualExitFullscreen } = useFullscreen()
const chatApi:any = Chat() //
const chat:any = Chat() //
const remarkFontSize = ref(16)
const currentSlideRemark = computed(() => {
@ -140,20 +134,15 @@ const currentSlideRemark = computed(() => {
//
const turnSlideTo = (index: number, e: PointerEvent) => {
const preInd = slideIndex.value
//
console.log('课堂信息', classcourse, index)
if (!!classcourse.value) return
turnSlideToIndex(index)
if (!!classcourse.value) {//
if (preInd == index) return
const animationSteps = 0
const animation = index > preInd?'Nextsteps':'Previoustep'
const msg = { current:index, animation, animationSteps}
chatApi.slideFlapping(msg)
}
}
//
const exitCourse = async () => {
// console.log('', chat)
await chatApi.exitCourse() //
await chat.exitCourse() //
exitScreening() //
}

View File

@ -80,7 +80,6 @@ provide(injectKeySlideScale, scale)
position: relative;
width: 100%;
height: 100%;
overflow: hidden;
}
.slide-item {
position: absolute;

View File

@ -28,56 +28,53 @@ export default (isLoader?: boolean = true) => {
// 执行元素动画 isAsync 为 true 时,异步执行,否则同步执行
const runAnimation = (isAsync: boolean) => {
return new Promise((resolve, reject) => {
// 正在执行动画时,禁止其他新的动画开始
if (inAnimation.value && !isAsync) return resolve()
// 正在执行动画时,禁止其他新的动画开始
if (inAnimation.value && !isAsync) return
const { animations, autoNext } = formatedAnimations.value[animationIndex.value]
animationIndex.value += 1
const { animations, autoNext } = formatedAnimations.value[animationIndex.value]
animationIndex.value += 1
// 标记开始执行动画
inAnimation.value = true
// 标记开始执行动画
inAnimation.value = true
let endAnimationCount = 0
let endAnimationCount = 0
// 依次执行该位置中的全部动画
for (const animation of animations) {
const elRef: HTMLElement | null = document.querySelector(`#screen-element-${animation.elId} [class^=base-element-]`)
if (!elRef) {
endAnimationCount += 1
continue
}
const animationName = `${ANIMATION_CLASS_PREFIX}${animation.effect}`
// 执行动画前先清除原有的动画状态(如果有)
elRef.style.removeProperty('--animate-duration')
for (const classname of elRef.classList) {
if (classname.indexOf(ANIMATION_CLASS_PREFIX) !== -1) elRef.classList.remove(classname, `${ANIMATION_CLASS_PREFIX}animated`)
}
// 执行动画
elRef.style.setProperty('--animate-duration', `${animation.duration}ms`)
elRef.classList.add(animationName, `${ANIMATION_CLASS_PREFIX}animated`)
// 执行动画结束,将“退场”以外的动画状态清除
const handleAnimationEnd = async() => {
if (animation.type !== 'out') {
elRef.style.removeProperty('--animate-duration')
elRef.classList.remove(animationName, `${ANIMATION_CLASS_PREFIX}animated`)
}
// 判断该位置上的全部动画都已经结束后,标记动画执行完成,并尝试继续向下执行(如果有需要)
endAnimationCount += 1
if (endAnimationCount === animations.length) {
inAnimation.value = false
if (autoNext) await runAnimation()
resolve() // 执行完成
}
}
elRef.addEventListener('animationend', handleAnimationEnd, { once: true })
// 依次执行该位置中的全部动画
for (const animation of animations) {
const elRef: HTMLElement | null = document.querySelector(`#screen-element-${animation.elId} [class^=base-element-]`)
if (!elRef) {
endAnimationCount += 1
continue
}
})
const animationName = `${ANIMATION_CLASS_PREFIX}${animation.effect}`
// 执行动画前先清除原有的动画状态(如果有)
elRef.style.removeProperty('--animate-duration')
for (const classname of elRef.classList) {
if (classname.indexOf(ANIMATION_CLASS_PREFIX) !== -1) elRef.classList.remove(classname, `${ANIMATION_CLASS_PREFIX}animated`)
}
// 执行动画
elRef.style.setProperty('--animate-duration', `${animation.duration}ms`)
elRef.classList.add(animationName, `${ANIMATION_CLASS_PREFIX}animated`)
// 执行动画结束,将“退场”以外的动画状态清除
const handleAnimationEnd = () => {
if (animation.type !== 'out') {
elRef.style.removeProperty('--animate-duration')
elRef.classList.remove(animationName, `${ANIMATION_CLASS_PREFIX}animated`)
}
// 判断该位置上的全部动画都已经结束后,标记动画执行完成,并尝试继续向下执行(如果有需要)
endAnimationCount += 1
if (endAnimationCount === animations.length) {
inAnimation.value = false
if (autoNext) runAnimation()
}
}
elRef.addEventListener('animationend', handleAnimationEnd, { once: true })
}
}
if (isLoader) { // 加载相关钩子
onMounted(() => {
@ -150,7 +147,7 @@ export default (isLoader?: boolean = true) => {
}
inAnimation.value = false
}
const execNext = async(isAsync: boolean) => {
const execNext = (isAsync: boolean) => {
if (formatedAnimations.value.length && animationIndex.value < formatedAnimations.value.length) {
runAnimation(isAsync)
}
@ -198,7 +195,7 @@ export default (isLoader?: boolean = true) => {
const touchInfo = ref<{ x: number; y: number; } | null>(null)
const touchStartListener = (e: TouchEvent) => {
// e.preventDefault() // 阻止默认事件
e.preventDefault() // 阻止默认事件
touchInfo.value = {
// x: e.changedTouches[0].pageX,
// y: e.changedTouches[0].pageY,
@ -208,7 +205,6 @@ export default (isLoader?: boolean = true) => {
}
const touchEndListener = (e: TouchEvent) => {
if (!touchInfo.value) return
// window.scrollTo(0, 0) // 滚动到顶部
const offsetX = Math.abs(touchInfo.value.x - e.changedTouches[0].clientX)
const offsetY = e.changedTouches[0].clientY - touchInfo.value.y
if ( Math.abs(offsetY) > offsetX && Math.abs(offsetY) > 50 ) {
@ -220,17 +216,9 @@ export default (isLoader?: boolean = true) => {
// 向上翻页/向下翻页
const turning = async (e, type) => {
e.preventDefault() // 阻止默认事件
window.scrollTo(0, 0) // 滚动到顶部
const isCourse = !!classcourseStore.classcourse
if (type === 'prev') {
if (!isCourse) execPrev() // 上一步
else { // 上课状态: 上一步 动作变成 上一页
const current = slideIndex.value
if (current <= 0) return throttleMassage('已经是第一页了')
turnSlideToIndex(current - 1) // 翻页: 上一页
}
} else if (type === 'next') execNext()
if (isCourse) { // 上课中
if (type === 'prev') execPrev()
else if (type === 'next') execNext()
if (classcourseStore.classcourse) { // 上课中
const current = slideIndex.value
const animationSteps = animationIndex.value
const animation = type == 'next'?'Nextsteps':'Previoustep'
@ -297,6 +285,5 @@ export default (isLoader?: boolean = true) => {
execPrev,
execNext,
animationIndex,
turning,
}
}

View File

@ -1,25 +1,16 @@
<template>
<div class="pptist-screen">
<BaseView :changeViewMode="changeViewMode" v-if="viewMode === 'base'" />
<PresenterView :changeViewMode="changeViewMode" v-else-if="viewMode === 'presenter'" />
<BaseView :changeViewMode="changeViewMode" v-if="viewMode === 'base'" />
<PresenterView :changeViewMode="changeViewMode" v-else-if="viewMode === 'presenter'" />
<!-- 点赞组件 -->
<upvote-vue ref="upvoteRef" type="2"></upvote-vue>
<!-- 推图上屏弹窗 -->
<el-dialog
v-model="dialogVisible"
:fullscreen="true"
class="gridPicRefdiv"
style="overflow: hidden;"
:show-close="false"
>
<grid-pic ref="gridPicRef" style="height:100%;" @clear="clearchidrenPic"></grid-pic>
</el-dialog>
<!-- <div style="z-index: 999;position: absolute;top:10px">
</div> -->
</div>
</template>
<script lang="ts" setup>
import { onMounted, onUnmounted, ref , nextTick} from 'vue'
import { onMounted, onUnmounted, ref } from 'vue'
import { KEYS } from '../../configs/hotkey'
import useScreening from '../../hooks/useScreening'
import hooksUpvote from '../../api/upvote' // -
@ -27,13 +18,9 @@ import hooksUpvote from '../../api/upvote' // 点赞-工具
import BaseView from './BaseView.vue'
import PresenterView from './PresenterView.vue'
import upvoteVue from '@/views/tool/components/upvote.vue' // -
import gridPic from '@/components/grid-pic/index.vue' //
import emitter from '@/utils/mitt' //mitt 线
const viewMode = ref<'base' | 'presenter'>('base')
const dialogVisible = ref(false)
const gridPicRef:any= ref(null)
const changeViewMode = (mode: 'base' | 'presenter') => {
viewMode.value = mode
}
@ -48,23 +35,6 @@ const keydownListener = (e: KeyboardEvent) => {
if (key === KEYS.ESC) exitScreening()
}
const clearchidrenPic= ()=> {
dialogVisible.value = false
}
//
emitter.on('opengridPic', async (data:object)=> {
if(gridPicRef.value) gridPicRef.value.clearPic()
dialogVisible.value = true
await nextTick();
gridPicRef.value.addPic(data.arr)
});
//
emitter.on('closegridPic', ()=> {
if(!gridPicRef.value) return
gridPicRef.value.clearPic()
dialogVisible.value = false
});
onMounted(() => document.addEventListener('keydown', keydownListener))
onUnmounted(() => document.removeEventListener('keydown', keydownListener))
</script>
@ -76,8 +46,4 @@ onUnmounted(() => document.removeEventListener('keydown', keydownListener))
width: 100%;
height: 100%;
}
:deep(.gridPicRefdiv .el-dialog__body){
height: 100% !important;
}
</style>

View File

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

View File

@ -1,25 +1,6 @@
<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-else-if="type === 'linear'"
v-if="type === 'linear'"
:id="id"
x1="0%"
y1="0%"
@ -29,35 +10,20 @@
>
<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, PPTShapeElement } from '../../../../types/slides'
interface ImageSvg {
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<{
import type { GradientColor, GradientType } from '../../../../types/slides'
withDefaults(defineProps<{
id: string
type: GradientType
colors?: GradientColor[]
rotate?: number,
image?: ImageSvg,
info?: PPTShapeElement
colors: GradientColor[]
rotate?: number
}>(), {
rotate: 0,
})

View File

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

View File

@ -15,7 +15,7 @@ const size = ref('default')
font-family: Avenir, Helvetica, Arial, sans-serif;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
/* text-align: center; */
text-align: center;
color: #2c3e50;
width: 100%;
}

View File

@ -1,10 +1,12 @@
import request from '@/utils/request'
// 创建对话
export const createChart = () => {
export const createChart = ({ headers, data }) => {
return request({
url: '/qf/createChart',
method: 'post',
headers,
data,
})
}
// 大模型对话

View File

@ -71,14 +71,6 @@ export function updateClassworkeval(data) {
})
}
export function updateClassworkevalList(data) {
return request({
url: '/education/classworkeval/updateList',
method: 'put',
data: data
})
}
// 修改classworkdata
export function updateClassworkdata(data) {
return request({

View File

@ -135,18 +135,4 @@ export function getJYPath(url,config) {
method: config.method||"get",
params: config.params
})
}
/**
* @desc: 百度识图转发
* @return: {*}
* @param {*} data
*/
export function getOcrContent(data) {
return request({
url: '/ocr/exam',
method: 'post',
data: data
})
}

View File

@ -1,6 +0,0 @@
declare module '@/api/file' {
// 定义 uploadFile 函数的类型
// export function uploadFile(file: File): Promise<any>;
export function sessionToken(): Promise<any>;
export function uploadSingleFileToEos(data: SingleUploadData): Promise<any>;
}

View File

@ -79,42 +79,3 @@ export const getModelInfo = (params) => {
params
})
}
// 上传tts语音
export const aitts = (data) => {
return request({
url: '/aitts/createTts',
method: 'post',
data
})
}
// 语音关联课
export const addFileToSC = (params) => {
return request({
url: '/smarttalk/file/addFileToSC',
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'
})
}
export const uploadSingleFileToEos = (params) => {
return request({
url: '/common/uploadSingleFileToEos',
method: 'post',
params
})
}

View File

@ -29,20 +29,6 @@ export function completion(data) {
})
}
// 大模型对话
export function modelChat(data) {
return axios({
url: '/mind/chat',
method: 'post',
headers: {
Authorization: 'Bearer ragflow-IwMDI1MGU2YTU3NjExZWZiNWEzMDI0Mm',
'Content-Type': 'application/json',
Accept: '*/*'
},
data: data
})
}
// 添加提示词 (系统预设)
export function addKeyWords(data) {
return request({
@ -132,44 +118,4 @@ export function docList(params) {
})
}
// 删除 doc ai文档
export function removeDoc(id) {
return request({
url: '/education/doc/' + id,
method: 'delete',
})
}
// 保存教学大纲
export function addSyllabus(data) {
return request({
url: '/education/generate',
method: 'post',
data
})
}
// 获取保存的大纲列表
export function syllabusList(params) {
return request({
url: '/education/generate/list',
method: 'get',
params
})
}
// 删除大纲
export function removeSyllabus(id) {
return request({
url: '/education/generate/' + id,
method: 'delete',
})
}
export function editSyllabus(data) {
return request({
url: '/education/generate',
method: 'put',
data
})
}

View File

@ -102,28 +102,4 @@ export function setPaging(data) {
data
})
}
/**
* 获取分享码(邀请码)
* @param {*} id 课堂id
* @returns
*/
export function getShareCode(id) {
return request({
url: '/education/classcourse/refresh/code',
method: 'post',
data: { id }
})
}
/**
* 课堂点名
* @param {*} timgroupid 群id
* @returns
*/
export function rollCall(timgroupid) {
return request({
url: '/education/classcourse/roll/call',
method: 'post',
data: { timgroupid }
})
}

View File

@ -1,8 +1,8 @@
@font-face {
font-family: "iconfont"; /* Project id 4723712 */
src: url('iconfont.woff2?t=1739948469020') format('woff2'),
url('iconfont.woff?t=1739948469020') format('woff'),
url('iconfont.ttf?t=1739948469020') format('truetype');
src: url('iconfont.woff2?t=1734337029245') format('woff2'),
url('iconfont.woff?t=1734337029245') format('woff'),
url('iconfont.ttf?t=1734337029245') format('truetype');
}
.iconfont {
@ -13,18 +13,6 @@
-moz-osx-font-smoothing: grayscale;
}
.icon-zhongxinshiyang:before {
content: "\e67b";
}
.icon-siweidaotu:before {
content: "\e606";
}
.icon-chuangzuo:before {
content: "\e6cc";
}
.icon-yinle:before {
content: "\e6c9";
}

File diff suppressed because one or more lines are too long

View File

@ -5,27 +5,6 @@
"css_prefix_text": "icon-",
"description": "",
"glyphs": [
{
"icon_id": "4320365",
"name": "重新试样",
"font_class": "zhongxinshiyang",
"unicode": "e67b",
"unicode_decimal": 59003
},
{
"icon_id": "11685410",
"name": "思维导图",
"font_class": "siweidaotu",
"unicode": "e606",
"unicode_decimal": 58886
},
{
"icon_id": "39170417",
"name": "创作",
"font_class": "chuangzuo",
"unicode": "e6cc",
"unicode_decimal": 59084
},
{
"icon_id": "11819186",
"name": "音乐",

Binary file not shown.

Before

Width:  |  Height:  |  Size: 21 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.5 MiB

View File

@ -1,61 +0,0 @@
<template>
<input type="file" name="file" @change="handleFileChange" style="width: 400px"/> <br/><br/>
<el-button @click="uploadFile">上传</el-button>
</template>
<script setup>
import {ref, onMounted} from "vue"
import {sessionToken} from "@/api/file";
import {uploadSingleToEos} from '@/utils/fileUpload'
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 callUploadSuccess = (e)=> {
console.log(e)
}
const callProgress = (e,p)=> {
console.log(e,p)
}
const uploadFile = ()=>{
if (selectedFile) {
let res = uploadSingleToEos(selectedFile, null,{callUploadSuccess,callProgress})
console.log(res)
}
}
onMounted(()=>{
sessionToken().then(res=>{
uploadMessage.value = 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>

View File

@ -1,240 +0,0 @@
<template>
<div>
<div style="height: auto; display: flex">
<div style="flex: 1">
<div class="audio-container">
<aiAudio
@saveClick="saveClick"
ref="audioRef"
:audioSrc="audioSrc"
@auditionClick="auditionClick"
></aiAudio>
</div>
</div>
<div style="background: #fff; height: 85vh; min-width: 364px; margin-left: 20px;overflow: hidden;">
<div style="padding: 0 20px; height: 100%;">
<el-tabs v-model="activeTab" class="prepare-tabs">
<el-tab-pane label="素材" name="素材">
<div class="prepare-body-header">
<div>
<label style="font-size: 15px"
>{{
currentFileList.filter(
(ite) => ite.fileFlag !== 'apt' && ite.fileFlag !== '课件'
).length
}}个文件</label
>&nbsp;
<!-- <el-popover placement="top-start" :width="250" trigger="hover">
<template #default>
<div>
<el-button
v-if="lastAsyncAllTime"
type="success"
size="small"
:icon="Check"
circle
/>
{{ lastAsyncAllTime ? toTimeText(lastAsyncAllTime) + '同步成功' : '' }}
</div>
</template>
<template #reference>
<el-button size="small" text @click="asyncAllFile">
<el-icon v-loading="asyncAllFileVisiable">
<Refresh />
</el-icon>
{{ asyncAllFileVisiable ? '同步中' : '云同步' }}
</el-button>
</template>
</el-popover> -->
<!-- <el-button size="small" @click="isDialogOpen = true">上传资料</el-button>
<el-button size="small" @click="reloadFiles">资源重载</el-button> -->
</div>
</div>
<el-checkbox-group
v-model="checkFileList"
class="prepare-body-main"
:style="{ 'margin-bottom': checkFileList.length > 0 ? '40px' : '0' }"
>
<file-list-item
v-for="(item, index) in currentSCFileList"
:key="index"
:item="item"
:index="index"
@on-delete="deleteSuccess"
>
</file-list-item>
</el-checkbox-group>
</el-tab-pane>
</el-tabs>
</div>
</div>
</div>
</div>
</template>
<script>
import { useRoute } from 'vue-router'
import { getSmarttalkPage, moveSmarttalk, creatAPT } from '@/api/file'
import FileListItem from '@/views/prepare/container/file-list-item.vue'
import { parseCataByNode, creatPPT, asyncLocalFile, removeLocalFiles } from '@/utils/talkFile'
import { uploadPicture } from '@/api/aiGeneratedImage/index.js'
import { aitts, addFileToSC } from '@/api/file/index.js'
export default {
components: {
FileListItem
},
props: {},
data() {
return {
activeTab: '素材',
currentFileList: [],
uploadData: {},
checkFileList: [],
isLoading: false,
lastAsyncAllTime: '',
audioSrc: null,
filedata: null
}
},
computed: {
isCheckAll() {
return (
this.checkFileList.length > 0 && this.checkFileList.length === this.currentSCFileList.length
)
},
currentSCFileList() {
// return this.currentFileList.filter((item) => item.fileFlag !== 'apt' && item.fileFlag !== '')
return this.currentFileList.filter((item) => !['apt', 'aippt'].includes(item.fileFlag))
}
},
methods: {
deleteSuccess(item) {
this.asyncAllFile() //
},
auditionClick(requestData) {
this.$refs.audioRef.startLoading = true
aitts(requestData)
.then((res) => {
console.log(res)
if (res.code == 200) {
this.audioSrc = res.data.fullUrl
this.filedata = res.data
this.$refs.audioRef.startLoading = false
} else {
this.$message.error(res.msg)
this.$refs.audioRef.startLoading = false
}
})
.catch((err) => {
this.$refs.audioRef.startLoading = false
})
},
saveClick(requestData) {
this.$refs.audioRef.saveLoading = true
aitts(requestData)
.then((res) => {
if (res.code == 200) {
this.filedata = res.data
const saveObj = {
textbookId: this.uploadData.textbookId,
levelFirstId: this.uploadData.levelFirstId,
levelSecondId: this.uploadData.levelSecondId,
fileSource: this.uploadData.fileSource,
fileRoot: this.uploadData.fileRoot,
fileShowName: this.filedata.uploadTime+'音频.' + this.filedata.fileSuffix,
fileFlag: '素材',
fileId: this.filedata.id
}
addFileToSC(saveObj)
.then((resone) => {
this.$message.success('上传成功')
this.asyncAllFile()
this.$refs.audioRef.saveLoading = false
})
.catch((err) => {
this.$refs.audioRef.saveLoading = false
})
} else {
this.$message.error(res.msg)
this.$refs.audioRef.saveLoading = false
}
})
.catch((err) => {
console.log(err)
this.$refs.audioRef.saveLoading = false
})
},
asyncAllFile() {
this.isLoading = true
return getSmarttalkPage({
...this.uploadData,
orderByColumn: 'createTime',
isAsc: 'desc',
pageSize: 500
})
.then(async (res) => {
this.currentFileList = [...res.rows].filter((item) => item.fileType === 'audio/wav')
this.isLoading = false
this.lastAsyncAllTime = new Date()
localStorage.setItem('lastAsyncAllTime', this.lastAsyncAllTime)
this.asyncAllFileVisiable = true
for (let i = 0; i < this.currentFileList.length; i++) {
let item = this.currentFileList[i]
if (item.fileFlag === 'apt') continue
if (item.fileFlag === 'aippt') continue
await asyncLocalFile(item)
}
this.asyncAllFileVisiable = false
return Promise.resolve()
})
.catch(() => {
this.isLoading = false
return Promise.resolve()
})
},
onMoveSingleFile(item) {
this.moveFile = [item]
this.isMoveDialogOpen = true
},
deleteTalk(item) {
let index = this.currentFileList.indexOf(item)
this.currentFileList.splice(index, 1)
},
//
openSet(row) {
// row list
this.rows = [row]
this.setDialog = true
}
},
mounted() {
const route = useRoute()
this.uploadData = route.query
// this.dataset_id = route.query.datasetId;
// this.courseName = route.query.coursetitle;
// this.levelFirstId = route.query.levelFirstId;
// this.levelSecondId = route.query.levelSecondId;
// this.textbookId = route.query.textbookId;
this.asyncAllFile() //
},
beforeDestroy() {}
}
</script>
<style scoped scss>
:deep(.prepare-item-info-title) {
line-height: 30px;
}
.prepare-body-main{
overflow-y: auto;
height: 74vh;
}
:deep(.audio-container .content-main){
height: 85vh !important ;
}
:deep(.audio-container .content-main div:nth-of-type(1)){
display: flex;
flex: 1;
}
</style>

View File

@ -10,24 +10,8 @@
<el-tree :data="treeData" accordion :props="defaultProps" node-key="id"
:default-expanded-keys="defaultExpandedKeys" :current-node-key="curNode.data.id" highlight-current
@node-click="handleNodeClick">
<template #default="{ node, data }">
<div v-if="props.isClassTask && (data.bookId == '' || data.bookId == '0')" class="tree-label-wrap">
<el-tooltip effect="light" placement="right" >
<!-- <template #content> {{ node.label }}<br /><span style="color: red;">-该单元章节无自主试题-</span> </template> -->
<template #content> {{ node.label }}</template>
<div class="tree-label" style="color: #A5B3CA" >
{{ node.label }}
</div>
</el-tooltip>
</div>
<div v-else class="tree-label-wrap">
<el-tooltip effect="light" placement="right" >
<template #content> {{ node.label }}</template>
<div class="tree-label">
{{ node.label }}
</div>
</el-tooltip>
</div>
<template #default="{ node }">
<span :title="node.label" class="tree-label">{{ node.label }}</span>
</template>
</el-tree>
</div>
@ -45,9 +29,8 @@
<div class="textbook-container">
<el-scrollbar height="450px">
<div
v-for="item in subjectList" :key="item.id" class="textbook-item flex"
:class="curBook.data.id == item.id ? 'active-item' : ''" @click="changeBook(item)">
<div class="textbook-item flex" v-for="item in subjectList" :class="curBook.data.id == item.id ? 'active-item' : ''"
:key="item.id" @click="changeBook(item)">
<img v-if="item.avartar" :src="item.avartar.indexOf('http') === 0 ? item.avartar : BaseUrl + item.avartar" class="textbook-img" alt="">
<div v-else class="textbook-img">
<i class="iconfont icon-jiaocaixuanze" style="font-size: 40px;"></i>
@ -68,13 +51,6 @@ import useUserStore from '@/store/modules/user'
const userStore = useUserStore()
const BaseUrl = import.meta.env.VITE_APP_BUILD_BASE_PATH
const props = defineProps({
// []使()
isClassTask: {
default: false
},
})
const isStadium = () => {
let roles = userStore.user.roles
return roles.some(item => item.roleKey === 'stadium')
@ -196,19 +172,12 @@ const handleNodeClick = (data) => {
},
node: nodeData
}
/**
*
* 章节数据里面的rootid 为bookId
* 因为部分数据源的rootid 有问题 这里需要重复赋值一下
*/
curData.node.rootid = curBook.data.id
// :electron-store
let defaultExpandedKeys = parentNode ? [parentNode.id] : [nodeData.id]
sessionStore.set('subject.defaultExpandedKeys', defaultExpandedKeys)
sessionStore.set('subject.curNode', nodeData)
emit('nodeClick', curData)
}
onMounted( async () => {
treeLoading.value = true
try{
@ -348,8 +317,7 @@ onMounted( async () => {
}
}
.tree-label-wrap, .tree-label {
max-width: 100%;
.tree-label {
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;

View File

@ -26,7 +26,6 @@ const getFileTypeIcon = () => {
doc: 'icon-word',
docx: 'icon-word',
mp4: 'icon-video',
wav: 'icon-mp',
mov: 'icon-mov',
avi: 'icon-avi',
jpeg: 'icon-jpeg',
@ -42,8 +41,7 @@ const getFileTypeIcon = () => {
airobot: 'icon-jiqirenfushi', //
aiimg: 'icon-xiangmuicon_maobishufa', //
aidraw: 'icon-meishu-F', //
aiyinyue: 'icon-yinle', //
aiswdt: 'icon-siweidaotu' //
aiyinyue: 'icon-yinle' //
}
if (iconObj[name]) {
return '#' + iconObj[name]

View File

@ -16,15 +16,15 @@
<draggable handle=".header-btn" :draggable="false" item-key="backgroundColor" v-model="gridPicList" class="grid-pic-wrap" :style="getGrid">
<template #item="{ element, index }">
<div class="grid-pic-item" :key="element.backgroundColor" :style="getWH(element,index)">
<div class="delete-btn" @click="()=>{gridPicList.splice(index,1);if(!gridPicList.length) emits('clear')} ">X</div>
<div class="header-btn"></div>
<div class="delete-btn" @click="gridPicList.splice(index,1)">X</div>
<div class="header-btn"></div>
<ViewerItem :gridPicList="gridPicList" :index="index" :images="element"></ViewerItem>
</div>
</template>
</draggable>
<div class="grid-pic-toolbar">
<el-input v-if="showToolbar" style="width: 500px" v-model="inputValue" type="text" />
<el-button v-if="showToolbar" class="add-btn" @click="pushPic">
<div v-if="showToolbar" class="grid-pic-toolbar">
<el-input style="width: 500px" v-model="inputValue" type="text" />
<el-button class="add-btn" @click="pushPic">
添加
</el-button>
<el-button class="add-btn" @click="clearPic">
@ -53,7 +53,7 @@
const props = defineProps({
showToolbar: {
type: Boolean,
default: false
default: true
}
})
//
@ -149,26 +149,20 @@
addPic(src)
}
//
const addPic = (data) => {
let list = Array.isArray(data)?data:[data]
if (gridPicList.value.length + list.length > 9) {
const addPic = (src) => {
if (gridPicList.value.length >= 9) {
console.log("超出九个图片")
emits('outIndex')
return
}
let listArr = [];
for (let i = 0; i < list.length; i++) {
let src = list[i]
if (!src) {
console.log("图片链接不能为空")
return;
}
listArr.push({
src: src,
backgroundColor: getRandomColor()
})
if (!src) {
console.log("图片链接不能为空")
return;
}
gridPicList.value.push(...listArr)
gridPicList.value.push({
src: src,
backgroundColor: getRandomColor()
})
inputValue.value = ''
}
//

View File

@ -140,8 +140,5 @@ watch(props.images, (newValue, oldValue) => {
.viewer-item-wrap{
width: 100%;
height: 100%;
:deep(.viewer-canvas img) {
display: block !important;
}
}
</style>

View File

@ -1,9 +1,9 @@
<template>
<el-dialog v-model="model" :show-close="false" width="800" append-to-body destroy-on-close>
<el-dialog v-model="isDialog" :show-close="false" width="800" append-to-body destroy-on-close>
<template #header>
<div class="custom-header flex">
<span>{{ item.name }}</span>
<i class="iconfont icon-guanbi" @click="model = false"></i>
<i class="iconfont icon-guanbi" @click="isDialog = false"></i>
</div>
</template>
<div class="dialog-content">
@ -15,9 +15,7 @@
</div>
<div class="flex-start flex" v-else>
<div class="flex" v-loading="!item.msg">
<div class="chart-item robot">
<v-md-editor v-model="item.msg" mode="preview" />
</div>
<div class="chart-item robot">{{ item.msg }}</div>
</div>
<div class="flex flex-end replace-item">
<span @click="saveAdjust(item)"><i class="iconfont icon-tihuan"></i>替换分析结果</span>
@ -56,7 +54,7 @@
</template>
<script setup>
import { ref, reactive, onMounted, watch, onUnmounted } from 'vue'
import { ref, reactive, onMounted, onUnmounted } from 'vue'
import { completion, docList } from '@/api/mode/index'
import { sessionStore } from '@/utils/store'
import { dataSetJson } from '@/utils/comm.js'
@ -68,7 +66,7 @@ const userInfo = useUserStore().user
const textarea = ref('')
const model = defineModel()
const isDialog = defineModel()
const props = defineProps({
item: {
@ -91,12 +89,6 @@ const props = defineProps({
}
})
watch(model, (newVal) =>{
if(newVal){
msgList.value.length = 0
}
})
const emit = defineEmits(['saveEdit'])
const loaded = ref(false)
@ -156,7 +148,7 @@ const getCompletion = async (val) => {
}
const saveAdjust = (item) =>{
model.value = false
isDialog.value = false
emitter.emit('onSaveAdjust', item.msg)
}
@ -166,17 +158,12 @@ const dataset_id = ref('')
const fileList = ref([])
const getList = () =>{
docList({
createUser: userInfo.userId,
datasetId: dataset_id.value,
edustage: curNode.edustage,
edusubject: curNode.edusubject
userId: userInfo.userId,
dataset_id: dataset_id.value
}).then( res =>{
if(res.rows.length){
fileList.value = res.rows
Object.assign(curFile, fileList.value[0])
params.document_ids = fileList.value[0].docId
}
fileList.value = res.rows
Object.assign(curFile, fileList.value[0])
params.document_ids = fileList.value[0].docId
})
}
emitter.on('changeCurFile', (item) =>{
@ -252,7 +239,6 @@ onUnmounted(() => {
.robot {
background: #409EFF;
color: #FFF;
width: 100%;
}
.replace-item{
font-size: 12px;
@ -346,13 +332,4 @@ onUnmounted(() => {
display: flex;
margin-bottom: 10px;
}
:deep(.v-md-editor){
background-color: #409EFF;
}
:deep(.github-markdown-body) {
font-size: 14px;
padding: 10px;
}
</style>

View File

@ -13,7 +13,7 @@
<el-input v-model="form.name" />
</el-form-item>
<el-form-item label="提示词" v-if="item.ex3 == '1' ? false : true">
<el-input v-model="form.prompt" type="textarea" autosize :rows="2" />
<el-input v-model="form.prompt" type="textarea" />
</el-form-item>
</el-form>
</div>

View File

@ -2,45 +2,34 @@
<el-dialog v-model="isDialog" :show-close="false" width="900" append-to-body destroy-on-close>
<template #header>
<div class="custom-header flex">
<span>选择</span>
<span>选择{{ title }}</span>
<i class="iconfont icon-guanbi" @click="isDialog = false"></i>
</div>
</template>
<div class="dialog-content" v-loading="loading">
<div class="dialog-content">
<div class="content-list">
<el-empty description="暂无数据" v-if="!fileList.length" />
<el-radio-group v-model="curFileId">
<el-row>
<el-col :span="12" v-for="item in fileList" :key="item.id">
<el-radio :value="item.id">
<el-text class="w-50" truncated>{{ item.fileName }}</el-text>
<div class="flex items-center">
<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>
<ul>
<li v-for="(item, index) in fileList" :class="activeIndex == index ? 'li-active' : ''"
@click="clickItem(index, item)">
<el-image class="img" :src="url" />
<el-button type="primary" class="prev-btn" @click.stop="onPrevItem(item)">预览</el-button>
<el-text truncated>{{ item.fileName }}</el-text>
</li>
</ul>
</div>
</div>
<template #footer>
<div class="dialog-footer">
<el-upload
class="upload-demo"
:action="uploadFileUrl"
:limit="1"
:show-file-list="false"
:headers="headers"
:on-success="onSuccess"
>
<el-upload 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="handleDialog"> 确定 </el-button>
<el-button type="primary" @click="isDialog = false">
确定
</el-button>
</div>
</div>
</template>
@ -52,18 +41,21 @@
<i class="iconfont icon-guanbi" @click="prevVisible = false"></i>
</div>
</template>
<div style="height: calc(100vh - 120px); text-align: center;">
<div style="height: calc(100vh - 120px);">
<template v-if="getFileSuffix(prevItem.fileUrl) == 'pdf'">
<iframe :src="prevItem.fileUrl" frameborder="0" width="100%" height="100%"></iframe>
<iframe :src="prevItem.fileUrl"
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>
<el-button type="primary" @click="prevVisible = false">
关闭
</el-button>
</div>
</template>
</el-dialog>
@ -71,19 +63,20 @@
<script setup>
import { ref, computed, onMounted, reactive } from 'vue'
import { completion, addDoc, docList, removeDoc } from '@/api/mode/index.js'
import { getToken } from '@/utils/auth'
import { completion, addDoc, docList } from '@/api/mode/index.js'
import { getToken } from "@/utils/auth";
import { sessionStore } from '@/utils/store'
import { dataSetJson } from '@/utils/comm.js'
import { ElMessage, ElMessageBox } from 'element-plus'
import { ElMessage } from 'element-plus'
import useUserStore from '@/store/modules/user'
import { getFileSuffix } from '@/utils/ruoyi.js'
import emitter from '@/utils/mitt'
import { cloneDeep } from 'lodash'
import emitter from '@/utils/mitt';
const userInfo = useUserStore().user
const uploadFileUrl = ref(import.meta.env.VITE_APP_BASE_API + '/common/upload')
const headers = ref({ Authorization: 'Bearer ' + getToken() })
const uploadFileUrl = ref(import.meta.env.VITE_APP_BASE_API + "/common/upload");
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)
@ -95,14 +88,36 @@ const props = defineProps({
}
})
const title = computed(() => {
if (props.modeType == 1) return '课标';
if (props.modeType == 2) return '教材';
if (props.modeType == 3) return '考试';
})
const isPrev = (item) => {
return computed(() => {
return ['pdf', 'png', 'jpg', 'jpeg', 'gif', 'webp'].includes(getFileSuffix(item.fileUrl))
})
const radio = ref(1)
const radioList = ref([
{ label: '浏览研读', value: 1 },
{ 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 curFileId = ref(0)
const activeIndex = ref(0)
const dataset_id = ref('')
@ -128,81 +143,43 @@ 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({
createUser: userInfo.userId,
datasetId: dataset_id.value,
edustage: curNode.edustage,
edusubject: curNode.edusubject
}).then((res) => {
userId: userInfo.userId,
dataset_id: dataset_id.value
}).then(res => {
fileList.value = [...res.rows]
if(res.rows.length){
Object.assign(curFile, fileList.value[0])
curFileId.value = fileList.value[0].id
}
Object.assign(curFile, fileList.value[0])
})
}
//
const loading = ref(false)
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 clickItem = (index, item) => {
activeIndex.value = index
Object.assign(curFile, item)
emitter.emit('changeCurFile', item)
}
//
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 {
@ -221,6 +198,45 @@ 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;
}
}
}
}
@ -230,7 +246,13 @@ onMounted(() => {
justify-content: space-between;
}
:deep(.el-radio__label) {
display: flex;
.prev-btn {
position: absolute;
top: 50%;
left: 50%;
transform: translate(-50%, -50%) translateY(-110px);
/* 按钮初始位置在容器外 */
transition: transform 0.3s ease-in-out;
/* 设置过渡效果 */
}
</style>
</style>

View File

@ -2,9 +2,8 @@
<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 v-if="type == 3" class="iconfont icon-xiangxia"></i>
{{ curNode.edustage }}{{ curNode.edusubject }}{{ type == 1 ? '课标研读' : type == 2 ? '教材分析' : '考试分析' }}<i
class="iconfont icon-xiangxia"></i>
</el-button>
</div>
<div class="container-left-pdf">
@ -21,7 +20,6 @@ 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'])
@ -31,12 +29,6 @@ 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({})
@ -44,15 +36,16 @@ 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>
@ -60,7 +53,6 @@ onMounted(async () => {
.container-left-page {
height: 100%;
flex-direction: column;
.container-left-header {
height: 45px;
background: #fff;
@ -78,4 +70,4 @@ onMounted(async () => {
flex: 1;
}
}
</style>
</style>

View File

@ -4,34 +4,34 @@
<div class="container-right-header flex">
<el-dropdown @command="changeTemplate" :hide-on-click="false">
<span class="el-dropdown-link">
{{ curTemplate.ex3 ? `${curTemplate.name}(平台)` : `${curTemplate.name}(个人)` }}
{{ curTemplate.name }}
<i class="iconfont icon-xiangxia"></i>
</span>
<template #dropdown>
<el-dropdown-menu>
<el-dropdown-item v-for="item in templateList" :command="item" :key="item.id">{{ item.ex3 ? `${item.name}(平台)` : `${item.name}(个人)`
<el-dropdown-item v-for="item in templateList" :command="item" :key="item.id">{{ item.name
}}</el-dropdown-item>
</el-dropdown-menu>
</template>
</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" :disabled="item.disabled" :label="item.label" :value="item.value" />
<el-option v-for="item in modeOptions" :key="item.value" :label="item.label" :value="item.value" />
</el-select>
<el-button type="danger" link :disabled="!(templateList.length)" @click="removeItem(curTemplate, false)" v-if="curTemplate.ex3 != 1">
<el-button type="danger" link :disabled="!(templateList.length)" @click="removeItem(curTemplate, false)">
删除
</el-button>
<el-button type="primary" link :disabled="!(templateList.length)" @click="onAdd">
<i class="iconfont icon-jiahao"></i>
{{ curTemplate.ex3 == 1 ? '复制并创建个人模板' : '添加提示词' }}
添加提示词
</el-button>
<el-button type="primary" :disabled="!(childTempList.length)" @click="getModelResult('')">一键研读</el-button>
<el-button type="primary" :disabled="!(childTempList.length)" @click="getCompletion">一键研读</el-button>
</div>
</div>
<!--List-->
<div class="container-right-list" ref="outerContainer">
<template v-for="(item, index) in childTempList" >
<div class="template-item" v-loading="item.loading" ref="messageElements">
<div class="container-right-list" ref="listRef">
<template v-for="(item, index) in childTempList">
<div class="template-item" v-loading="item.loading">
<div class="item-header">
<div>
<span class="blue">#</span>{{ item.name }}
@ -50,26 +50,18 @@
<div class="item-text">
{{ item.prompt }}
</div>
<div class="item-text text-answer">
<div class="item-text text-answer" v-if="item.answer">
<div class="item-icon">
<i class="iconfont icon-ai"></i>
</div>
<div class="item-answer">
<!-- <TypingEffect v-if="isStarted[index]" :text="item.answer" :delay="10" :aiShow="item.aiShow"
@complete="handleCompleteText($event, index)" @updateScroll="scrollToBottom($event, index)" /> -->
<TypingEffect
:text="item.answer"
:showTypewriter="item.showTypewriter"
:speed="30"
:charsPerFrame="15"
@scroll="handleScroll(index)"
@done="handleDone(index)"
/>
<TypingEffect v-if="isStarted[index]" :text="item.answer" :delay="10" :aiShow="item.aiShow"
@complete="handleCompleteText($event, index)" @updateScroll="scrollToBottom($event, index)" />
</div>
</div>
<div class="ai-btn" v-if="item.answer">
<el-button type="primary" link @click="getModelResult(index, item)">
<i class="iconfont icon-zhongxinshiyang"></i>
<el-button type="primary" link @click="againResult(index, item)">
<i class="iconfont icon-ai1"></i>
重新研读
</el-button>
<el-button type="primary" link @click="onAdjust(index, item)">
@ -107,16 +99,11 @@ import TypingEffect from '@/components/typing-effect/index.vue'
import useUserStore from '@/store/modules/user'
import emitter from '@/utils/mitt';
import { dataSetJson } from '@/utils/comm.js'
import { cloneDeep } from 'lodash'
const props = defineProps(['type'])
const { user } = useUserStore()
const params = reactive(
{
prompt: '',
dataset_id: ''
}
)
const curMode = ref(2)
const modeOptions = ref([
{
@ -125,12 +112,7 @@ const modeOptions = ref([
},
{
label: '知识库模型',
value: 2,
disabled: false
},
{
label: 'deepseek模型',
value: 3,
value: 2
}
])
@ -183,253 +165,61 @@ const getTemplateList = () => {
}
})
}
const getChildTemplate = (val) => {
const getChildTemplate = () => {
tempLoading.value = true
modelList({ model: props.type, type: 2, parentId: curTemplate.id, ex1: curNode.edustage, ex2: curNode.edusubject }).then(res => {
childTempList.value = res.rows
if (childTempList.value.length) {
childTempList.value.forEach(item => {
item.answer = '';
item.showTypewriter = false
})
childTempList.value.forEach(item => item.answer = '')
}
//
getTempResult(val)
getTempResult()
}).finally(() => {
tempLoading.value = false
})
}
const isStarted = ref([]);
const listRef = ref()
//
const getTempResult = (val) => {
tempResult({ mainModelId: curTemplate.id, pageNum: 1, pageSize: 10000, ex1: curNode.id }).then(async res => {
const getTempResult = () => {
tempResult({ mainModelId: curTemplate.id, pageNum: 1, pageSize: 10000, ex1: curNode.id }).then(res => {
let rows = res.rows
childTempList.value.forEach(item => {
rows.forEach(el => {
if (item.id == el.modelId) {
item.answer = el.content
item.answer = getResult(el.content)
item.resultId = el.id
}
})
})
// val : true
if(val){
// dom
await nextTick()
//
let lastIndex = childTempList.value.length - 1
getModelResult(lastIndex, childTempList.value[lastIndex], true)
if (rows.length > 0) {
isStarted.value = new Array(rows.length).fill(true)
}
})
}
const prompt = ref('')
const scrollToBottom = (height, index) => {
//
const isAgain = ref(false)
if (listRef.value) {
let sum = 0
let listDom = listRef.value.children
//
const getModelResult = async (index, item, isLast) => {
/**
*
* index: 当前项索引
* item: 当前项
* isLast: 是否最后一项 用于添加子模板后研读
*/
let str = prompt.value
//
if(index !== ''){
isAgain.value = true
//
childTempList.value[index].answer = ''
//
childTempList.value[index].showTypewriter = true
//
if (messageElements.value[index]) {
messageElements.value[index].scrollIntoView({
behavior: 'smooth',
block: 'start',
});
}
// prompt
str = str.replace('{模板标题}',item.name)
str = str.replace('{模板内容}',item.prompt)
params.prompt = str
params.template = item.prompt
//
try {
childTempList.value[index].loading = true
const data = await requestModelData()
childTempList.value[index].answer = data.answer;
if(isLast){
await onSaveTemp(childTempList.value[index])
}else{
//
onEditResult(data.answer, index)
}
} finally {
childTempList.value[index].loading = false
}
}
//
else{
//
childTempList.value.forEach(item => {
if (item.answer) {
item.answer = ''
}
})
//
messageElements.value[0].scrollIntoView({
behavior: 'smooth',
block: 'start',
})
processNext(0)
}
}
//
const processNext = async (index) =>{
let str = prompt.value
//
const item = childTempList.value[index]
item.loading = true
str = str.replace('{模板标题}',item.name)
str = str.replace('{模板内容}',item.prompt)
params.prompt = str
params.template = item.prompt
//
try {
const data = await requestModelData()
item.answer = data.answer
item.showTypewriter = true
//
await onSaveTemp(item)
} finally {
item.loading = false
}
}
//
const handleDone = (index) =>{
if(isAgain.value){
isAgain.value = false
return
}
else{
if(index == childTempList.value.length - 1) return
outerContainer.value.scrollTo({
top: outerContainer.value.scrollHeight,
behavior: 'smooth',
});
processNext(index + 1)
}
}
// ms:
const delay = (ms) => new Promise(resolve => setTimeout(resolve, ms));
// or
const requestModelData = async () =>{
//
let data = null
if (curMode.value == 1) {
const res = await sendChart({
content: params.prompt,
conversationId: conversation_id.value,
stream: false
})
// 1s
if(!isAdjust.value){
await delay(1000); // 1
}
data = res.data
}
//
else {
if (curMode.value == 3) {
params.llm = 'deepseek-r1:8b'
}
const res = await completion(params)
data = res.data
}
return data
}
const messageElements = ref([]); //
//
// const animationId = ref(null)
const animationIDs = ref([])
const outerContainer = ref()
let lastScrollTime = 0;
const scrollInterval = 200
const handleScroll = (index) => {
const now = Date.now();
if (now - lastScrollTime >= scrollInterval) {
const container = document.querySelector('.container-right-list');
if(isAgain.value){
scrollToTmp(index)
}
else{
if (container) {
if(index == 0){
const item = messageElements.value[index]
if(item.clientHeight > outerContainer.value.clientHeight ){
item.scrollIntoView({ behavior: 'smooth', block: 'end' })
}
}
else{
//
const id = requestAnimationFrame(() => {
container.scrollTo({
top: container.scrollHeight,
behavior: 'smooth',
});
});
animationIDs.value.push(id)
}
if (index == 0) {
// 220
let screenHeight = window.innerHeight - 220
if (height > screenHeight) {
listRef.value.scrollTop = (height - screenHeight + 50)
}
}
lastScrollTime = now;
}
}
//
const scrollToTmp = (index) =>{
//
if(index == childTempList.value.length - 1){
const id = requestAnimationFrame(() => {
outerContainer.value.scrollTo({
top: outerContainer.value.scrollHeight,
behavior: 'smooth',
});
});
animationIDs.value.push(id)
}
else{
const item = messageElements.value[index]
if(item.clientHeight > outerContainer.value.clientHeight ){
item.scrollIntoView({ behavior: 'smooth', block: 'end' })
else {
for (let i = 0; i < index; i++) {
sum += listDom[i].clientHeight
}
listRef.value.scrollTop = sum + height
}
}
}
}
//
const changeTemplate = (val) => {
ElMessageBox.confirm(
@ -497,10 +287,118 @@ const onEdit = (index, item) => {
isEdit.value = true
}
//
const onEditResult = async (answer, index) => {
//
const params = reactive(
{
prompt: '',
dataset_id: ''
}
)
const prompt = ref('')
await editTempResult({ id: childTempList.value[index].resultId, content: answer })
//
const isAgain = ref(false)
const againResult = async (index, item) => {
isAgain.value = true
isStarted.value[index] = false
childTempList.value[index].answer = ''
if (index == 0) {
listRef.value.scrollTop = 0
} else {
scrollToBottom(50, index)
}
try {
await nextTick()
childTempList.value[index].loading = true
item.aiShow = true
let str = cloneDeep(prompt.value)
str = str.replace('{模板标题}',item.name)
str = str.replace('{模板内容}',item.prompt)
params.prompt = str
params.template = item.prompt
let data = null;
//
if (curMode.value == 1) {
const res = await sendChart({
content: params.prompt,
conversationId: conversation_id.value,
stream: false
})
data = res.data
} else {
//
const res = await completion(params)
data = res.data
}
childTempList.value[index].answer = getResult(data.answer);
isStarted.value[index] = true
} finally {
childTempList.value[index].loading = false
}
}
//
const getCompletion = async () => {
isStarted.value = new Array(childTempList.length).fill(false)
isStarted.value[0] = true
childTempList.value.forEach(item => {
if (item.answer) {
item.answer = ''
}
})
for (let item of childTempList.value) {
try {
item.loading = true
item.aiShow = true
let str = cloneDeep(prompt.value)
str = str.replace('{模板标题}',item.name)
str = str.replace('{模板内容}',item.prompt)
params.prompt = str
params.template = item.prompt
//
let data = null
if (curMode.value == 1) {
const res = await sendChart({
content: params.prompt,
conversationId: conversation_id.value,
stream: false
})
data = res.data
}
//
else {
const res = await completion(params)
data = res.data
}
item.answer = getResult(data.answer)
onSaveTemp(item)
} finally {
item.loading = false
}
}
}
const handleCompleteText = async (answer, index) => {
if (index < childTempList.value.length - 1) {
isStarted.value[index + 1] = true; //
}
if (isAgain.value) {
try {
await editTempResult({ id: childTempList.value[index].resultId, content: answer })
} finally {
isAgain.value = false
}
}
}
//
@ -533,13 +431,18 @@ const onSaveTemp = async (item) => {
}
}
// ### **
let getResult = (str) => {
let newStr = str.replace(/#+|(\*\*)/g, '');
return newStr
}
//
//
emitter.on('onGetChild', () => {
getChildTemplate(true)
getChildTemplate()
})
//
emitter.on('onGetMain====》', () => {
emitter.on('onGetMain', () => {
getTemplateList()
})
@ -577,18 +480,7 @@ 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) {
@ -605,11 +497,7 @@ onUnmounted(() => {
emitter.off('onGetMain');
emitter.off('onGetChild');
emitter.off('onSaveAdjust');
//
animationIDs.value.forEach(id => cancelAnimationFrame(id))
})
</script>
<style lang="scss" scoped>
@ -701,15 +589,14 @@ onUnmounted(() => {
.iconfont {
margin-right: 3px;
font-size: 18px;
}
:deep(.el-button) {
font-size: 14px;
font-size: 13px;
}
.icon-zhongxinshiyang {
font-size: 20px;
.icon-ai1 {
font-size: 18px;
}
}
}

View File

@ -1,109 +1,72 @@
<template>
<div class="typing-effect" ref="typingEffectRef">
<!-- <span v-html="displayedText"></span> -->
<!-- <el-input
v-model="currentText"
:autosize="{ minRows: 2 }"
type="textarea"
readonly
resize="none"
style="width: 100%;"
input-style="border:none;outline: none;box-shadow:none;color:000;fontSize:14px"
/> -->
<v-md-editor v-model="currentText" mode="preview" />
<el-input
v-model="displayedText"
:autosize="{ minRows: 2 }"
type="textarea"
readonly
resize="none"
style="width: 100%;"
input-style="border:none;outline: none;box-shadow:none;color:000;fontSize:14px"
/>
</div>
</template>
<script setup>
import { ref, onMounted, watch, onUnmounted } from 'vue';
import { ref, onMounted, watch, nextTick } from 'vue';
const props = defineProps({
text: {
type: String,
required: true,
type: [String, Object],
required: true
},
speed: {
delay: {
type: Number,
default: 50, //
},
charsPerFrame: {
type: Number,
default: 1, //
},
showTypewriter: {
type: Boolean,
default: true, //
default: 100 //
},
aiShow: {
type: [Boolean] // true
}
});
const typingEffectRef = ref(null);
const emit = defineEmits(['complete', 'updateScroll']);
const displayedText = ref('');
const index = ref(0);
// emits
const emit = defineEmits(['scroll','done']);
//
const currentText = ref(''); //
const currentCharIndex = ref(0); //
const isTyping = ref(false); //
const animationFrameId = ref(null); // requestAnimationFrame ID
//
const typeText = () => {
if (currentCharIndex.value < props.text.length) {
// charsPerFrame
currentText.value += props.text.slice(
currentCharIndex.value,
currentCharIndex.value + props.charsPerFrame
);
currentCharIndex.value += props.charsPerFrame;
emit('scroll'); //
// 使 requestAnimationFrame
animationFrameId.value = requestAnimationFrame(() => {
setTimeout(() => {
typeText();
}, props.speed);
});
const type = async () => {
await nextTick()
if(!props.aiShow) {
displayedText.value = props.text
return
}
if (index.value <= props.text.length) {
displayedText.value += props.text.charAt(index.value);
index.value++;
setTimeout(() => {
type();
emit('updateScroll', typingEffectRef.value.clientHeight); //
}, props.delay);
} else {
isTyping.value = false;
emit('done')
// complete
emit('complete',displayedText.value);
}
};
//
const showFullText = () =>{
currentText.value = props.text
onMounted(() => {
resetAndType();
});
const resetAndType = () =>{
displayedText.value = '';
index.value = 0;
type();
}
//
const startTypeWriter = () => {
isTyping.value = true;
currentText.value = '';
currentCharIndex.value = 0;
typeText();
};
// props 便 text delay
watch([() => props.text, () => props.delay], resetAndType);
// text
watch(
() => props.text,
() => {
if(props.showTypewriter && props.text){
startTypeWriter();
} else {
showFullText();
}
}
);
//
onMounted(() => {
// startTypeWriter();
});
//
onUnmounted(() => {
if (animationFrameId.value) {
cancelAnimationFrame(animationFrameId.value);
}
});
</script>
@ -111,12 +74,4 @@ onUnmounted(() => {
:deep(.el-textarea__inner:hover){
box-shadow: none;
}
.typing-effect{
:deep(.github-markdown-body){
padding: 0;
font-size: 14px;
}
}
</style>
</style>

View File

@ -1,6 +1,6 @@
<template>
<div class="whiteboart-container" :style="{ height: height + 'px' }">
<div class="canvasBox" ref="box" @mouseenter.capture="handleMouseEnter" @mouseleave.capture="handleMouseLeave"></div>
<div class="canvasBox" ref="box"></div>
<div class="footerLeft" @click.stop
:style="type == 'design' ? ['top: 10px', 'justify-content: space-between'] : ['bottom: 10px', 'justify-content: center']">
@ -123,7 +123,7 @@
<!-- 边框样式 -->
<div class="blockBox">
<el-dropdown @command="updateStyle('lineDash', $event)" placement="top">
<el-button><el-image :src="borderStyleImg"
<el-button><el-image src="../../../src/assets/images/borderstyle.png"
style="width: 14px; height: 14px"></el-image></el-button>
<template #dropdown>
<el-dropdown-menu>
@ -278,7 +278,7 @@
</template>
<script setup>
import { onMounted, onBeforeUnmount, ref, getCurrentInstance, watch, toRaw, nextTick, computed, reactive, defineProps, defineEmits } from 'vue'
import { onMounted, ref, watch, toRaw, nextTick, computed, reactive, defineProps, defineEmits } from 'vue'
import TinyWhiteboard from 'whiteboard_lyc'
import ColorPicker from './components/ColorPicker.vue'
import {
@ -303,10 +303,8 @@ import {
import Contextmenu from './components/Contextmenu.vue'
import { fontFamilyList, fontSizeList } from './constants'
const borderStyleImg = new URL('../../../src/assets/images/borderstyle.png', import.meta.url).href
const borderImg = new URL('../../../src/assets/images/borderwidth.png', import.meta.url).href
const pointerImg = new URL('../../../src/assets/images/mouse-pointer.png', import.meta.url).href
const { proxy } = getCurrentInstance()
const props = defineProps({
modelValue: {
@ -509,7 +507,6 @@ const backToCenter = () => {
app.scrollToCenter()
}
//
const showFit = () => {
let elementList = app.elements.elementList
@ -703,6 +700,8 @@ const getCanvasBlob = async () =>{
})
}
watch(() => props.data, (newVal) => {
if (newVal) {
setCanvasData(newVal)
@ -714,15 +713,8 @@ watch(() => props.data, (newVal) => {
// dom
onMounted(() => {
init();
})
/**
* 初始化画布内容
*/
const init = () => {
//
app = new TinyWhiteboard({
//
app = new TinyWhiteboard({
container: box.value,
drawType: currentType.value,
state: {
@ -742,7 +734,6 @@ const init = () => {
})
//
app.on('activeElementChange', element => {
console.log('点击元素 监听 activeElementChange-----------')
if (activeElement.value) {
activeElement.value.off('elementRotateChange', onElementRotateChange)
}
@ -790,39 +781,7 @@ const init = () => {
app.resize()
}, 300)
})
}
const isMyCanvas = ref(false); //
const handleKeyDown=(event)=> {
// console.log(':', event.key);
// console.log(isMyCanvas.value,'??????????')
if(isMyCanvas.value == false){
event.stopPropagation();
// console.log(':', event.key);
}
}
/**
* 鼠标进入事件
*/
const handleMouseEnter = () => {
console.log('进入白板')
isMyCanvas.value = true;
document.addEventListener('keydown', handleKeyDown, true);
}
/**
* 课堂展示-鼠标离开白板监听事件该事件是避免选中状态在其他地方点击后退删除等事件会删除白板内选中的元素
*/
const handleMouseLeave = () => {
console.log('离开白板')
// --
app.cancelActiveElement()
//
isMyCanvas.value = false;
//
document.addEventListener('keydown', handleKeyDown, true);
};
})
//
defineExpose({
@ -832,7 +791,7 @@ defineExpose({
getCanvasJson,
getCanvasBase64,
setCanvasData,
getCanvasBlob,
getCanvasBlob
})
</script>

View File

@ -1,7 +1,5 @@
import { listEntpcoursework,getEvaluationclue } from '@/api/classTask';
import { processList } from '@/hooks/useProcessList';
import useClassTaskStore from '@/store/modules/classTask'
const useClassTaskStores = useClassTaskStore();
const isJson = (str) => {
if (typeof str == 'string') {
@ -116,14 +114,6 @@ export const editListItem = (row, courseObj) => {
}
else if (row.worktype == '科学实验') {
if(isJson(row.workcodes)){
// 同步更新实验内部的科目信息
if (row.worktag && row.worktag.indexOf('-') > -1){
const eduInfo = row.worktag.split('-');
useClassTaskStores.experimentObj.edustage = eduInfo[0];
useClassTaskStores.experimentObj.edusubject = eduInfo[1];
useClassTaskStores.experimentObj.updateEduInfo = row.worktag;
}
// 更新科学实验内容
classtaskObj.fileHomeworkList = JSON.parse(row.workcodes);
//
// console.log('科学实验', classtaskObj);

View File

@ -299,28 +299,21 @@ export const processList = (row, aloneOption=false) => {
if(!aloneOption && j%2== 0){
tmp += '</div>';
}
row[i].workdescFormat = tmp;
row[i].workdescFormat = tmp
// 处理[答案显示] - 转换ABCD
let arr2Char = workAnswerArr
.map((item) => {
return String.fromCharCode(65 + Number(item))
})
.join('');
row[i].workanswerFormat = arr2Char;
.join('')
row[i].workanswerFormat = arr2Char
} else if (row[i].worktype == '填空题') {
// 处理[选项显示] - 填空题中无选项, 故置空
row[i].workdescFormat = '';
row[i].workdescFormat = ''
// 处理[答案显示] - 逗号连接
// 当[答案显示]为 [<div] 开头时,不再需逗号连接(一般为自主上传, 当前答案每个自带div标签)
let linkChar = '、';
if (workAnswerArr.length != 0 && workAnswerArr[0].indexOf('<div') == 0) {
linkChar = '';
}
row[i].workanswerFormat = workAnswerArr.join(linkChar);
row[i].workanswerFormat = workAnswerArr.join('、')
} else if (row[i].worktype == '判断题') {
// 处理[选项显示] - 判断题中无选项, 故置空
row[i].workdescFormat = ''
@ -328,7 +321,7 @@ export const processList = (row, aloneOption=false) => {
// 处理[答案显示] - 1-正常 0-错误
const answer = workAnswerArr
.map((item) => {
return DICT_TRUE_OR_FALSE.TRUE.includes(item) ? '正确' : DICT_TRUE_OR_FALSE.FALSE.includes(item)?'错误':item;
return item === '1' ? '正确' : '错误'
})
.join('、')
row[i].workanswerFormat = answer
@ -341,8 +334,3 @@ export const processList = (row, aloneOption=false) => {
}
}
}
const DICT_TRUE_OR_FALSE = {
TRUE: ['正确', '对', '√', '1'],
FALSE: ['错误', '错', '×', '0'],
};

View File

@ -5,11 +5,7 @@
<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="img">
<template #error>
<img :src="route_path + userStore.user.avatar">
</template>
</el-image>
<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" />
<span>{{ userStore.user.nickName }}</span>
</div>
</template>
@ -23,7 +19,7 @@
</li>
<li v-if="computedregistertype!=4" :class="computedregistertype==1 || computedregistertype==2 ? '':'pointer-events'" @click="onUserTo('/joinSchool')">加入学校</li>
<li @click="onUserTo('/profile')">个人中心</li>
<li v-if="isStadium() !== true && checkRole(['admin','headmaster'])" @click="onUserTo('/schoolManagement')">学校管理</li>
<li v-if="isStadium() !== true" @click="onUserTo('/schoolManagement')">学校管理</li>
<li v-if="isStadium() !== true" @click="onUserTo('/class')">班级中心</li>
<li @click="logout">退出登录</li>
</ul>
@ -64,12 +60,10 @@ import useUserStore from '@/store/modules/user'
import pkc from "../../../../../package.json"
import defaultUserImg from '@/assets/images/img-avatar.png'
import { sessionStore } from '@/utils/store'
import {toLinkLeftWeb} from "@/utils/tool"
import { checkRole } from '@/utils/permission'
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('')
@ -80,13 +74,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 = () => {
// console.log('isStadium',userStore.roles )
let user = userStore.user
let roles = user.roles
return roles.some(item => item.roleKey === 'stadium')
@ -128,14 +118,6 @@ const headerMenus = isStadium() ?[{
icon: 'icon-kechengziyuan1',
path: '/resource/index'
},
{
name: '科学',
id: 4,
icon: 'icon-kechengziyuan1',
path: '/scientific/index',
// path: 'https://res.bakclass.com/resource/laboratoryIndex',
// type: 'webview', //
},
]
const sideBottomMenu = [
@ -176,17 +158,10 @@ const computedregistertype = computed(() => {
}
})
const clickMenu = (item) => {
const { id, disabled, path, type } = item
const clickMenu = ({ id, disabled, path }) => {
if (disabled) return
if (type == 'webview') { //
toLinkLeftWeb(item.path)
} else if (type == 'link') {
window.open(path)
} else {
activeId.value = id
router.push(path)
}
activeId.value = id
router.push(path)
}
const onUserTo = (path) =>{
@ -233,11 +208,6 @@ 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>
@ -359,7 +329,6 @@ onMounted(() => {
color: #fff;
font-size: 12px;
margin-top: 5px;
text-align: center;
}
.pointer-events{
pointer-events: none;

View File

@ -11,7 +11,7 @@
<span class="ml-5">{{ curNode.itemtitle }}</span>
</div>
<div class="header-center" v-else>
{{APP_TITLE}}{{ version }}
AI文枢{{ version }}
</div>
<div class="header-right">
<WindowTools />
@ -29,7 +29,6 @@ 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()

View File

@ -24,7 +24,7 @@
</el-main>
</el-container>
<Uploader v-if="uploaderStore.uploadList && uploaderStore.uploadList.length > 0" />
<!-- <AiChart/>-->
<AiChart/>
</el-container>
</div>
</template>
@ -114,8 +114,8 @@ const onBack = () =>{
margin-top: -3px;
margin-right: 3px;
}
}
}
</style>

View File

@ -10,14 +10,6 @@ import './assets/iconfont/iconfont'
import 'virtual:windi.css'
import request from "@/utils/request";
//v-md-editor
import VMdEditor from '@kangc/v-md-editor';
import '@kangc/v-md-editor/lib/style/base-editor.css';
import githubTheme from '@kangc/v-md-editor/lib/theme/github.js';
import '@kangc/v-md-editor/lib/theme/style/github.css';
// highlightjs
import hljs from 'highlight.js';
import { store } from '@/store'
import App from './App.vue'
import router from './router'
@ -25,9 +17,6 @@ import log from 'electron-log/renderer' // 渲染进程日志-文件记录
import customComponent from '@/components/common' // 自定义组件
import plugins from './plugins' // plugins插件
import useUserStore from '@/store/modules/user'
import aiTools from 'aix-plugins-aitools' // 文字转语音插件
import '../../../node_modules/aix-plugins-aitools/aitools.css'
if(process.env.NODE_ENV != 'development') { // 非开发环境,将日志打印到日志文件
Object.assign(console, log.functions) // 渲染进程日志-控制台替换
@ -50,40 +39,6 @@ app.config.globalProperties.$requestGetJYW = (url,config)=>{
import Icon from '@/AixPPTist/src/plugins/icon'
import Directive from '@/AixPPTist/src/plugins/directive'
VMdEditor.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 })
@ -91,8 +46,6 @@ app.use(router)
.use(plugins)
.use(Icon)
.use(Directive)
.use(aiTools)
.use(VMdEditor)
.mount('#app')
const isStadium = (user) => {

File diff suppressed because it is too large Load Diff

View File

@ -1,358 +0,0 @@
// 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

File diff suppressed because it is too large Load Diff

View File

@ -90,30 +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'),
name: 'aiKolors',
meta: { title: '文生图片', showBread: true }
},
{
path: 'aiVoice',
component: () => import('@/components/ai-voice/index.vue'),
name: 'aiVoice',
meta: { title: '语音生成', showBread: true }
},
{
path: 'mindmap',
component: () => import('@/views/mindMap/index.vue'),
name: 'mindmap',
meta: { title: 'AI思维导图' }
},
]
},
@ -233,18 +215,6 @@ const dynamicRoutes = [
}
]
},
{
path: '/scientific',
component: Layout,
children: [
{
path: 'index',
component: () => import('@/views/scientific/index.vue'),
name: 'scientific',
meta: { title: '科学' },
}
]
},
{
path: '/hashrate',
component: Layout,

View File

@ -2,16 +2,13 @@ import { defineStore } from 'pinia'
import { } from '@/api/classTask/index.js'
import { listClassmain } from '@/api/classManage/index'
import { JYApiListCT, JYApiListOriginYear, JYApiListSO} from "@/utils/examQuestion/jyeoo"
import { listEvaluation } from '@/api/subject'
import { getBindlist, listKnowlegepointFormat } from '@/api/education/knowledgePoint'
const useClassTaskStore = defineStore('classTask',{
state: () => ({
experimentObj:{
edustage: '小学', // 教育阶段
edusubject: '数学', // 学科
edusubject: '', // 学科
experimentList: [], // 实验科目列表
updateEduInfo: '小学-数学', //实际需上传的学段+学科信息(用于上传及回显实验内的学段学科)
},
isOpenQuestUploadView: false, // 是否打开习题上传的页面
classListIds: [],
@ -40,7 +37,6 @@ const useClassTaskStore = defineStore('classTask',{
{label: '2021', value: '2021'},
{label: '2020', value: '2020'},
], // 习题查询条件 - 年份
entpCourseWorkPointList: [], // 习题查询条件 - 知识点
}),
actions: {
listClassmain(params) {
@ -72,36 +68,6 @@ const useClassTaskStore = defineStore('classTask',{
console.error('更新第三方题源+题型err:', error);
});
},
// 根据学科和学段获取知识点
initJYPoint(params) {
/**
* 格式化知识点: 分两种情况
* 1. 语文/英语: 获取学科下的所有知识点(该学科对应无章节与知识点绑定, 故只获取全知识点)
* 2. 其他: 获取当前章节下的所有知识点
*/
this.entpCourseWorkPointList = [];
let id = params.levelSecondId!='' ? params.levelSecondId : params.levelFirstId;
if( params.edusubject == '语文' || params.edusubject == '英语'){
id = params.textbookId;
listEvaluation({ edusubject: params.edusubject, edustage: params.edustage, itemkey: "subject", pageSize: 10 }).then((res => {
id = res.rows[0]?.id;
if (id) {
listKnowlegepointFormat({evalId: id, pageNum: 1, pageSize: 5000,}).then(res => {
this.entpCourseWorkPointList = formatKnowledgePoint(res.rows);
console.log('1.entpCourseWorkPointList->', this.entpCourseWorkPointList);
});
}
}))
}else{
getBindlist({ eid: id }).then(res => {
if (res.data && res.data.length > 0) {
this.entpCourseWorkPointList = res.data;
console.log('2.entpCourseWorkPointList->', this.entpCourseWorkPointList);
}
})
}
},
},
persist: true
})
@ -141,21 +107,4 @@ const getJYCT = (params) => {
reject(error)
})
})
}
/**
* @desc: 遍历原知识点数据, 将title字段转为knowTitle以供knowledgePointProps进行tree的格式转换显示
* @return: {*}
* @param {*} list
*/
const formatKnowledgePoint = (list) => {
list.forEach(item => {
if (item.title && item.title != '') {
item.knowTitle = item.title;
}
if (item.children && Array.isArray(item.children)) {
formatKnowledgePoint(item.children);
}
});
return list;
};
}

View File

@ -395,11 +395,7 @@ export const dataSetJson = {
"课标-高中-英语": "e889fcac9fd011efb22a0242ac140006",
"课标-高中-数学": "e03aa4fe9fd011ef91270242ac140006",
"课标-高中-地理": "270516829fd111efb13c0242ac140006",
"课标-高中-物理": "3865b5afc68211ef90890242ac140002",
"课标-高中-化学": "013d0c52c68311ef84220242ac140002",
"课标-高中-政治": "a2f0b247b85d11ef84290242ac140005",
"教材-高中-物理": "3865b5afc68211ef90890242ac140002",
"教材-高中-化学": "013d0c52c68311ef84220242ac140002",
"教材-高中-语文": "cee3062a9fcf11efa6910242ac140006",
"教材-高中-生物": "fb5d01d59fd011ef9bb90242ac140006",
"教材-高中-历史": "f2f6c1fb9fd011ef98740242ac140006",
@ -407,54 +403,11 @@ export const dataSetJson = {
"教材-高中-数学": "e03aa4fe9fd011ef91270242ac140006",
"教材-高中-地理": "270516829fd111efb13c0242ac140006",
"教材-高中-政治": "a2f0b247b85d11ef84290242ac140005",
"考试-小学-语文": "570f7ed2cc9d11ef9e070242ac140002",
"考试-小学-数学": "983270b8cc9d11efbbd80242ac140002",
"考试-小学-英语": "d5f80e4ccc9d11ef96fa0242ac140002",
"课标-小学-信息科技": "2fe08c7ad18911efbeaa0242ac140002",
"课标-小学-科学": "935cfec8bf6a11ef98950242ac140006",
"课标-小学-数学": "3c4e298fbf7911ef8e8b0242ac140002",
"课标-小学-语文": "f76f1aa5bf7111ef90c80242ac140002",
"课标-小学-道德": "8da87869cbd711ef92280242ac140002",
"课标-小学-英语": "dc963316cbd811ef8d820242ac140002",
"课标-小学-劳动": "fc047d81cbdc11efa1740242ac140002",
"教材-小学-信息科技": "2fe08c7ad18911efbeaa0242ac140002",
"教材-小学-科学": "935cfec8bf6a11ef98950242ac140006",
"教材-小学-数学": "3c4e298fbf7911ef8e8b0242ac140002",
"教材-小学-语文": "f76f1aa5bf7111ef90c80242ac140002",
"教材-小学-道德": "8da87869cbd711ef92280242ac140002",
"教材-小学-英语": "dc963316cbd811ef8d820242ac140002",
"教材-小学-劳动": "fc047d81cbdc11efa1740242ac140002",
"教材-初中-道德与法治": "df9f3ccccbdd11ef9e550242ac140002",
"教材-初中-语文": "3770ad18cbde11efadaa0242ac140002",
"教材-初中-数学": "8cc0a799cbde11ef8b440242ac140002",
"教材-初中-英语": "07b58ca2cbdf11efaa180242ac140002",
"教材-初中-物理": "86f2c018cbf211ef9d6a0242ac140002",
"教材-初中-化学": "c7b34790cbf211ef92350242ac140002",
"教材-初中-生物": "083ac3edcbf311efaad30242ac140002",
"教材-初中-地理": "7ee584e1cbf311efbd270242ac140002",
"教材-初中-历史": "8ae07971cbf411ef81e70242ac140002",
"教材-初中-信息技术": "ca476233cbf411efa9860242ac140002",
"课标-初中-道德与法治": "df9f3ccccbdd11ef9e550242ac140002",
"课标-初中-语文": "3770ad18cbde11efadaa0242ac140002",
"课标-初中-数学": "8cc0a799cbde11ef8b440242ac140002",
"课标-初中-英语": "07b58ca2cbdf11efaa180242ac140002",
"课标-初中-物理": "86f2c018cbf211ef9d6a0242ac140002",
"课标-初中-化学": "c7b34790cbf211ef92350242ac140002",
"课标-初中-生物": "083ac3edcbf311efaad30242ac140002",
"课标-初中-地理": "7ee584e1cbf311efbd270242ac140002",
"课标-初中-历史": "8ae07971cbf411ef81e70242ac140002",
"课标-初中-信息技术": "ca476233cbf411efa9860242ac140002",
"考试-初中-语文": "6be6d201cc0111ef89100242ac140002",
"考试-初中-数学": "d764b539cc0111ef8f1b0242ac140002",
"考试-初中-英语": "3477cff7cc9911efbfa50242ac140002",
"考试-初中-政治": "7ac981d8cc9a11efa5dc0242ac140002",
"考试-初中-历史": "c058a33acc9a11efb7f00242ac140002",
"考试-初中-地理": "5548224ecc9b11efa76d0242ac140002",
"考试-初中-生物": "206c5fd3cc9c11ef990f0242ac140002",
"考试-初中-物理": "93039442cc9c11ef89b10242ac140002",
"考试-初中-化学": "f8d78002cc9c11efbbf60242ac140002",
"鉴权": "ragflow-IwMDI1MGU2YTU3NjExZWZiNWEzMDI0Mm"
}

View File

@ -1,160 +0,0 @@
import {sessionToken, uploadSingleFileToEos} from "@/api/file";
import CryptoJS from 'crypto-js'
import {ElMessageBox} from "element-plus";
/**
* @description
* @param {Function} callGetToken - token回调
* @param {Function} callUpload - EOS回调
* @param {Function} callProgress -
* @param {Function} callUploadSuccess -
*/
type CallBack = {
callGetToken?: (e:any)=>any;
callUploadFile?: (e:any)=>any;
callProgress?: (e:any,p:number)=>any;
callUploadSuccess?: (e:any)=>any;
}
/**
* @description
* @param {string} _bucket -
* @param {string} id - id
* @param {string} filePath -
* @param {string} fileMd5 - MD5
* @param {string} fileNewName -
* @param {string} fileName -
* @param {string} fileSize -
* @param {string} fileSuffix -
* @param {string} fileType -
*/
type SingleUploadData = {
_bucket?: string,
id?: string,
filePath?: string,
fileMd5?: string,
fileNewName?: string,
fileName?: string,
fileSize?: number,
fileSuffix?: string,
fileType?: string,
}
const S3Data = {
apiVersion: "2006-03-01",
accessKeyId: "", // 服务端获取到的 access key ID
secretAccessKey: "", // 服务端获取到的 secret access key
endpoint: "",
sessionToken: '',
signatureVersion: "v2",
sslEnabled: true // 是否启用 HTTPS 连接
}
/**
* @description
* @param file
* @param {SingleUploadData} uploadData
* @param {CallBack} callBack -
*/
const uploadSingleToEos = async (file:File, uploadData: SingleUploadData, callBack?: CallBack) => {
console.log(file)
//去服务端拿授权
let res = await sessionToken().catch((err:any)=>{
ElMessageBox.alert(err)
});
S3Data.accessKeyId = res.data.accessKeyId
S3Data.secretAccessKey = res.data.secretAccessKey
S3Data.endpoint = res.data.endPoint
S3Data.sessionToken = res.data.sessionToken
uploadData = uploadData?uploadData:{}
uploadData._bucket = res.data.bucket
//如果文件名不存在,则使用时间戳为名字
uploadData.id = crypto.randomUUID();
uploadData.fileMd5 = await getFileMD5(file);
uploadData.fileName = file.name?file.name:(new Date().getTime()+"");
if (uploadData.fileName.lastIndexOf(".") === -1) {
uploadData.fileSuffix = ""
uploadData.fileNewName = uploadData.id
}else {
uploadData.fileSuffix = uploadData.fileName.substring(uploadData.fileName.lastIndexOf(".")+1)
uploadData.fileNewName = uploadData.id + "." + uploadData.fileSuffix
}
uploadData.filePath = getEosFileKey(uploadData.id, uploadData.fileSuffix);
uploadData.fileSize = file.size
uploadData.fileType = file.type
console.log(uploadData)
//回调获取token
callBack?.callGetToken && callBack.callGetToken(res.data)
//将文件上传到EOS
let uploadRes = await uploadFile(file,uploadData,callBack).catch((err)=>{
ElMessageBox.alert(err)
});
if (!uploadRes) return
//回调成功上传EOS
callBack?.callGetToken && callBack.callGetToken(uploadRes)
//去服务端确认是否已经完成上传,并保存文件上传信息
let saveUploadRes = await uploadSingleFileToEos(uploadData)
//回调整个文件上传完成
callBack?.callUploadSuccess && callBack.callUploadSuccess(saveUploadRes)
return saveUploadRes
}
/**
* @description
* @param file
* @param uploadData
* @param callBack
*/
const uploadFile = (file:File, uploadData: SingleUploadData,callBack?:CallBack) =>{
return new Promise((resolve, reject) => {
const s3 = new AWS.S3(S3Data);
let params = {
Key: uploadData.filePath,
Bucket: uploadData._bucket,
ContentType: file.type,
Body: file
}
s3.putObject(params, function (err:any, data:any) {
if (err) {
reject(data)
}else {
resolve(data)
}
}).on('httpUploadProgress', function(evt:any) {
//回调上传进度
callBack?.callProgress && callBack.callProgress(evt,Math.round((evt.loaded / evt.total) * 100));
})
})
}
/**
* @description EOS文件key
* @param uuid id
* @param suffix
*/
const getEosFileKey = (uuid:string, suffix:string) => {
let date = new Date()
let year = date.getFullYear()
let month = date.getMonth() + 1
let day = date.getDate()
return year + "/" + month + "/" + day + "/" + uuid + "." + suffix;
}
/**
* @description MD5
* @param file
*/
const getFileMD5 = (file:File):Promise<string> => {
return new Promise((resolve, reject) => {
let reader = new FileReader();
reader.readAsArrayBuffer(file);
reader.onload = function () {
let buffer = reader.result as ArrayBuffer;
let md5 = CryptoJS.MD5(buffer).toString();
resolve(md5)
}
})
}
export {uploadSingleToEos}

Some files were not shown because too many files have changed in this diff Show More