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 fd34471..89158a2 100644 --- a/electron-builder-yc.yml +++ b/electron-builder-yc.yml @@ -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 ea23159..1e951ca 100644 --- a/package.json +++ b/package.json @@ -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" 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 @@ + +.sidebar { + width: 100%; + padding: 5px; + display: flex; + justify-content: space-between; +} - \ No newline at end of file +.nav-level-one,.nav-level-two { + margin-bottom: 20px; + width: 120px; +} +.nav-level-two .nav-item{ + text-align: center; +} + +.nav-item { + display: flex; + align-items: center; + margin-bottom: 10px; + padding: 8px 10px; + border-radius: 5px; + cursor: pointer; + transition: background-color 0.3s ease; +} + +.nav-item:hover { + background-color: rgb(245, 247, 250); +} + +.nav-text { + flex: 1; + font-size: 14px; + color: #333; +} + +.nav-arrow { + font-size: 12px; + margin-left: auto; +} + +.nav-level-one.nav-item:first-child.nav-text { + color: blue; +} +.active .nav-text{ + font-weight: bold; + color:rgb(64, 158, 255) +} +.active .icon{ + font-weight: bold; + color:rgb(64, 158, 255) +} + \ No newline at end of file diff --git a/src/renderer/src/views/profile/index.vue b/src/renderer/src/views/profile/index.vue index 9b7fff4..07a731f 100644 --- a/src/renderer/src/views/profile/index.vue +++ b/src/renderer/src/views/profile/index.vue @@ -5,7 +5,7 @@
{{ state.user.nickName }}
- +
@@ -34,7 +34,7 @@ import resetPwd from './resetPwd.vue' import { getUserProfile } from '@/api/system/user' import pkc from "../../../../../package.json" //选择学校和班级 -import selectClass from './components/selectClass.vue' +import SelectClass from './components/selectClass.vue' import useUserStore from '@/store/modules/user' const version = ref(pkc.version) diff --git a/src/renderer/src/views/teachingDesign/container/right.vue b/src/renderer/src/views/teachingDesign/container/right.vue index 300399f..0a00bbb 100644 --- a/src/renderer/src/views/teachingDesign/container/right.vue +++ b/src/renderer/src/views/teachingDesign/container/right.vue @@ -3,7 +3,7 @@
课件预览
- 一键生成 + 一键生成 编辑课件
@@ -64,6 +64,7 @@ const pgDialog = reactive({ // 弹窗-进度条 const pptSlides = ref([]) emitter.on('onResult', (data)=>{ + console.log(data) result.value = data if (!!result.value.parentId) { listEntpcoursefileNew({parentid: result.value.parentId}).then(res=>{ 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));