diff --git a/.env.test b/.env.test index 3d671e1..ea57966 100644 --- a/.env.test +++ b/.env.test @@ -17,3 +17,5 @@ VITE_BUILD_COMPRESS = gzip VITE_APP_RES_FILE_PATH = 'https://file.ysaix.com:7868/src/assets/textbook/booktxt/' VITE_APP_BUILD_BASE_PATH = 'https://file.ysaix.com:7868/' + +VITE_SHOW_DEV_TOOLS = 'true' diff --git a/.env.old b/.env.yc similarity index 89% rename from .env.old rename to .env.yc index 8640aa3..e103054 100644 --- a/.env.old +++ b/.env.yc @@ -1,5 +1,5 @@ # 页面标题 -VITE_APP_TITLE = AIX智慧课堂 +VITE_APP_TITLE = 文枢课堂 # 生产环境配置 VITE_APP_ENV = 'production' @@ -17,3 +17,5 @@ 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/' + +VITE_SHOW_DEV_TOOLS = 'false' diff --git a/electron-builder-old.yml b/electron-builder-yc.yml similarity index 84% rename from electron-builder-old.yml rename to electron-builder-yc.yml index 9dfb51e..c3fddbc 100644 --- a/electron-builder-old.yml +++ b/electron-builder-yc.yml @@ -1,10 +1,10 @@ appId: com.electron.app -productName: AIx +productName: 文枢课堂 directories: output: dist buildResources: build win: - executableName: AIx + executableName: 文枢课堂 icon: resources/logo2.ico files: - '!**/.vscode/*' @@ -17,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 @@ -30,7 +30,7 @@ mac: - NSDownloadsFolderUsageDescription: Application requests access to the user's Downloads folder. notarize: false dmg: - artifactName: ${name}-${version}.${ext} + artifactName: ${name}-yc-${version}.${ext} linux: target: - AppImage @@ -39,11 +39,11 @@ linux: maintainer: electronjs.org category: Utility appImage: - artifactName: ${name}-${version}.${ext} + artifactName: ${name}-yc-${version}.${ext} npmRebuild: false publish: provider: generic - url: https://prev.ysaix.com:7868/src/assets/smarttalk/ + url: https://prev.ysaix.com:7868/src/assets/smarttalkyc/ electronDownload: mirror: https://npmmirror.com/mirrors/electron/ # 额外依赖打包到输出目录 diff --git a/package.json b/package.json index c06e41c..57803ba 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "aix-win", - "version": "2.1.33", + "version": "2.1.36", "description": "", "main": "./out/main/index.js", "author": "上海交大重庆人工智能研究院", @@ -16,7 +16,7 @@ "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:lt": "electron-vite build --mode lt && electron-builder --win --config ./electron-builder-lt.yml", + "build:yc": "electron-vite build --mode yc && electron-builder --win --config ./electron-builder-yc.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/main/index.js b/src/main/index.js index c28c144..22f49a2 100644 --- a/src/main/index.js +++ b/src/main/index.js @@ -46,7 +46,7 @@ if(!gotTheLock){ function createLoginWindow() { if (loginWindow) return loginWindow = new BrowserWindow({ - width: 888, + width: import.meta.env.MODE==='yc'?1160:888, height: 520, show: false, frame: false, diff --git a/src/renderer/src/assets/images/login/yc-logo.png b/src/renderer/src/assets/images/login/yc-logo.png new file mode 100644 index 0000000..59db44e Binary files /dev/null and b/src/renderer/src/assets/images/login/yc-logo.png differ diff --git a/src/renderer/src/assets/images/login/ycpeitu.png b/src/renderer/src/assets/images/login/ycpeitu.png new file mode 100644 index 0000000..433a296 Binary files /dev/null and b/src/renderer/src/assets/images/login/ycpeitu.png differ diff --git a/src/renderer/src/components/window-tools/index.vue b/src/renderer/src/components/window-tools/index.vue index da66f80..e915261 100644 --- a/src/renderer/src/components/window-tools/index.vue +++ b/src/renderer/src/components/window-tools/index.vue @@ -37,6 +37,7 @@ const closeWindow = () => { ElMessageBox.confirm('确认退出系统吗?', '提示', { confirmButtonText: '确定', cancelButtonText: '取消', + customClass: 'login-close-tool', type: 'warning' }).then(() => { userStore.logOut().then(() => { @@ -48,7 +49,11 @@ const closeWindow = () => { }).catch(() => { }); } - + \ No newline at end of file + diff --git a/src/renderer/src/views/login/defult-login.vue b/src/renderer/src/views/login/defult-login.vue new file mode 100644 index 0000000..b883d6d --- /dev/null +++ b/src/renderer/src/views/login/defult-login.vue @@ -0,0 +1,264 @@ + + + diff --git a/src/renderer/src/views/login/index.vue b/src/renderer/src/views/login/index.vue index b883d6d..7a346e8 100644 --- a/src/renderer/src/views/login/index.vue +++ b/src/renderer/src/views/login/index.vue @@ -1,264 +1,13 @@ diff --git a/src/renderer/src/views/login/yc-login.vue b/src/renderer/src/views/login/yc-login.vue new file mode 100644 index 0000000..5350d7e --- /dev/null +++ b/src/renderer/src/views/login/yc-login.vue @@ -0,0 +1,279 @@ + + +