diff --git a/.env.production b/.env.production index c3b1489..b6dfa01 100644 --- a/.env.production +++ b/.env.production @@ -1,6 +1,8 @@ # 页面标题 VITE_APP_TITLE = 文枢课堂 +VITE_APP_ID = 'aix-win-ws' + # 生产环境配置 VITE_APP_ENV = 'production' diff --git a/.env.yc b/.env.yc index c3b1489..d60ed5c 100644 --- a/.env.yc +++ b/.env.yc @@ -1,5 +1,7 @@ # 页面标题 -VITE_APP_TITLE = 文枢课堂 +VITE_APP_TITLE = 永川中小学AI教学系统 + +VITE_APP_ID = 'aix-win-ws-yc' # 生产环境配置 VITE_APP_ENV = 'production' diff --git a/.env.yc2 b/.env.yc2 index c4a88ef..1f76587 100644 --- a/.env.yc2 +++ b/.env.yc2 @@ -1,6 +1,8 @@ # 页面标题 VITE_APP_TITLE = 实训教学 +VITE_APP_ID = 'aix-win-ws-yc2' + # 生产环境配置 VITE_APP_ENV = 'production' diff --git a/electron-builder-yc.yml b/electron-builder-yc.yml index 385b578..89158a2 100644 --- a/electron-builder-yc.yml +++ b/electron-builder-yc.yml @@ -1,10 +1,10 @@ appId: com.electron.app.yc -productName: 文枢课堂 +productName: 永川中小学AI教学系统 directories: output: dist buildResources: build win: - executableName: 文枢课堂 + executableName: 永川中小学AI教学系统 icon: resources/yc-logo.png files: - '!**/.vscode/*' @@ -17,7 +17,7 @@ asarUnpack: nsis: oneClick: false allowToChangeInstallationDirectory: true - artifactName: ${name}-yc-${version}-setup.${ext} + artifactName: ${name}-${version}-setup.${ext} shortcutName: ${productName} uninstallDisplayName: ${productName} createDesktopShortcut: always diff --git a/electron-builder-yc2.yml b/electron-builder-yc2.yml index a7bfd2f..3f9322a 100644 --- a/electron-builder-yc2.yml +++ b/electron-builder-yc2.yml @@ -17,7 +17,7 @@ asarUnpack: nsis: oneClick: false allowToChangeInstallationDirectory: true - artifactName: ${name}-ycsx-${version}-setup.${ext} + artifactName: ${name}-${version}-setup.${ext} shortcutName: ${productName} uninstallDisplayName: ${productName} createDesktopShortcut: always diff --git a/package.json b/package.json index 362c56e..f88b47e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "aix-win-ws", - "version": "2.5.11", + "version": "2.5.14", "description": "", "main": "./out/main/index.js", "author": "上海交大重庆人工智能研究院", @@ -10,14 +10,13 @@ "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": "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:test": "node updatePackageJsonName.js && electron-vite build --mode test && electron-builder --win --config ./electron-builder.yml", + "build": "node updatePackageJsonName.js && electron-vite build --mode production && electron-builder --win --config ./electron-builder-prod.yml", + "build: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: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" @@ -36,6 +35,7 @@ "@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", diff --git a/src/renderer/public/icon/avatar.svg b/src/renderer/public/icon/avatar.svg new file mode 100644 index 0000000..386fffa --- /dev/null +++ b/src/renderer/public/icon/avatar.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/src/renderer/src/AixPPTist/src/views/Screen/BaseView.vue b/src/renderer/src/AixPPTist/src/views/Screen/BaseView.vue index 4b747bd..e2dba4a 100644 --- a/src/renderer/src/AixPPTist/src/views/Screen/BaseView.vue +++ b/src/renderer/src/AixPPTist/src/views/Screen/BaseView.vue @@ -47,9 +47,10 @@ + + -
@@ -76,8 +77,8 @@ import WritingBoardTool from './WritingBoardTool.vue' import CountdownTimer from './CountdownTimer.vue' import emitter from '@/utils/mitt'; import Chat from '../../api/chat' // 聊天 -import { CircleDoubleDown, CircleDoubleUp, Share } from '@icon-park/vue-next' // icon-park 图标库 -import { ShareCode } from '@/utils/ppt' // ppt相关 +import { CircleDoubleDown, CircleDoubleUp, Share, Hands } from '@icon-park/vue-next' // icon-park 图标库 +import { ShareCode, ToolHandle } from '@/utils/ppt' // ppt相关 const props = defineProps<{ changeViewMode: (mode: 'base' | 'presenter') => void diff --git a/src/renderer/src/AixPPTist/src/views/Screen/PresenterView.vue b/src/renderer/src/AixPPTist/src/views/Screen/PresenterView.vue index 5ece2f4..56e930b 100644 --- a/src/renderer/src/AixPPTist/src/views/Screen/PresenterView.vue +++ b/src/renderer/src/AixPPTist/src/views/Screen/PresenterView.vue @@ -10,7 +10,10 @@ {{ fullscreenState ? '退出全屏' : '全屏' }}
-
分享
+
结束放映
结束课堂
@@ -79,7 +82,7 @@ diff --git a/src/renderer/src/views/profile/components/selectClass.vue b/src/renderer/src/views/profile/components/selectClass.vue index 2dcc47e..963025f 100644 --- a/src/renderer/src/views/profile/components/selectClass.vue +++ b/src/renderer/src/views/profile/components/selectClass.vue @@ -1,90 +1,155 @@ \ No newline at end of file + diff --git a/src/renderer/src/views/teachingDesign/container/edit-dialog.vue b/src/renderer/src/views/teachingDesign/container/edit-dialog.vue index de61247..24c8528 100644 --- a/src/renderer/src/views/teachingDesign/container/edit-dialog.vue +++ b/src/renderer/src/views/teachingDesign/container/edit-dialog.vue @@ -2,16 +2,33 @@ -
- - - - - +
+ +
- - \ No newline at end of file diff --git a/src/renderer/src/views/teachingDesign/container/left.vue b/src/renderer/src/views/teachingDesign/container/left.vue index f0343b4..0ac347c 100644 --- a/src/renderer/src/views/teachingDesign/container/left.vue +++ b/src/renderer/src/views/teachingDesign/container/left.vue @@ -1,193 +1,394 @@ \ No newline at end of file + diff --git a/src/renderer/src/views/teachingDesign/container/left2.vue b/src/renderer/src/views/teachingDesign/container/left2.vue deleted file mode 100644 index 17668a0..0000000 --- a/src/renderer/src/views/teachingDesign/container/left2.vue +++ /dev/null @@ -1,386 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/renderer/src/views/teachingDesign/container/progress-dialog.vue b/src/renderer/src/views/teachingDesign/container/progress-dialog.vue index 5bfe036..7f01c73 100644 --- a/src/renderer/src/views/teachingDesign/container/progress-dialog.vue +++ b/src/renderer/src/views/teachingDesign/container/progress-dialog.vue @@ -1,6 +1,6 @@ @@ -29,5 +29,10 @@ const dAttrs = computed(() => { }) \ No newline at end of file + + diff --git a/src/renderer/src/views/teachingDesign/container/right.vue b/src/renderer/src/views/teachingDesign/container/right.vue index 3c91cb6..93b41fd 100644 --- a/src/renderer/src/views/teachingDesign/container/right.vue +++ b/src/renderer/src/views/teachingDesign/container/right.vue @@ -1,107 +1,49 @@ - - - diff --git a/src/renderer/src/views/teachingDesign/container/right2.vue b/src/renderer/src/views/teachingDesign/container/right2.vue deleted file mode 100644 index 03ce212..0000000 --- a/src/renderer/src/views/teachingDesign/container/right2.vue +++ /dev/null @@ -1,57 +0,0 @@ - - - \ No newline at end of file diff --git a/src/renderer/src/views/teachingDesign/index.vue b/src/renderer/src/views/teachingDesign/index.vue index d356986..eb9de23 100644 --- a/src/renderer/src/views/teachingDesign/index.vue +++ b/src/renderer/src/views/teachingDesign/index.vue @@ -1,54 +1,35 @@ \ No newline at end of file + diff --git a/updatePackageJsonName.js b/updatePackageJsonName.js new file mode 100644 index 0000000..de5811c --- /dev/null +++ b/updatePackageJsonName.js @@ -0,0 +1,14 @@ +const fs = require('fs'); +const path = require('path'); +const { env } = require('process'); + +// 读取当前的package.json文件 +const packageJsonPath = path.join(__dirname, 'package.json'); +const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, 'utf8')); +console.log(env) +let res = env.npm_lifecycle_event.replace("build", "").replace(":", ""); +res = res?"-" + res:""; +packageJson.name = "aix-win-ws" + res + +// 将修改后的内容写回package.json文件 +fs.writeFileSync(packageJsonPath, JSON.stringify(packageJson, null, 2));