zhuhao
/
AIx_Smarttalk
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 26 Wiki Activity

Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg

This commit is contained in:
zdg 2024-09-23 10:14:31 +08:00
parent 6935bec1e4 a5ad6c2250
commit a05cf19e74
18 changed files with 260 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
.env.lt Normal file
View File

@ -0,0 +1,19 @@
# 页面标题
VITE_APP_TITLE = 文枢课堂
# 生产环境配置
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/'

2
.env.production
View File

@ -1,5 +1,5 @@
# 页面标题
VITE_APP_TITLE = AIx数字平台
VITE_APP_TITLE = AIX智慧课堂
# 生产环境配置
VITE_APP_ENV = 'production'

54
electron-builder-lt.yml Normal file
View File

@ -0,0 +1,54 @@
appId: com.electron.app
productName: 文枢课堂
directories:
output: dist
buildResources: build
win:
executableName: 文枢课堂
icon: resources/logo2.ico
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/smarttalk/
electronDownload:
mirror: https://npmmirror.com/mirrors/electron/
# 额外依赖打包到输出目录
extraFiles:
- from: ./node_modules/im_electron_sdk/lib/
to: ./resources
filter:
- '**/*'

9
electron.vite.config.mjs
View File

@ -3,7 +3,14 @@ import path from 'path'
import { defineConfig, externalizeDepsPlugin } from 'electron-vite'
import vue from '@vitejs/plugin-vue'
import WindiCSS from "vite-plugin-windicss"
/*import electron from 'vite-plugin-electron'
plugins: [electron({
main: {
builderOptions: {
asar: false
}
}
})],*/
export default defineConfig({
main: {
plugins: [externalizeDepsPlugin()]

7
package.json
View File

@ -1,7 +1,7 @@
{
"name": "aix-win",
"version": "2.0.2",
"description": "An Electron application with Vue",
"version": "2.0.6",
"description": "",
"main": "./out/main/index.js",
"author": "example.com",
"homepage": "https://electron-vite.org",
@ -16,6 +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:mac": "npm run build && electron-builder --mac",
"build:linux": "npm run build && electron-builder --linux"
},
@ -45,10 +46,12 @@
"jsencrypt": "^3.3.2",
"jsondiffpatch": "0.6.0",
"lodash": "^4.17.21",
"node-addon-api": "^8.1.0",
"pdfjs-dist": "4.4.168",
"pinia": "^2.1.7",
"pinia-plugin-persistedstate": "^3.2.1",
"spark-md5": "^3.0.2",
"vite-plugin-electron": "^0.28.8",
"vue-qr": "^4.0.9",
"vue-router": "^4.4.0",
"xgplayer": "^3.0.19",

25
src/main/index.js
View File

@ -21,6 +21,27 @@ File({ app, shell, BrowserWindow, ipcMain })
process.env['ELECTRON_DISABLE_SECURITY_WARNINGS'] = 'true'
let mainWindow, loginWindow
const additionalData = {myKey:'ys_axi_smarttalk'}
const gotTheLock = app.requestSingleInstanceLock(additionalData)
if(!gotTheLock){
app.quit()
}else{
app.on('second-instance',(event,commandLine,workingDirectory,additionalData)=>{
//输入从第二个实例中接收到的数据
console.log(additionalData)
//有人试图运行第二个实例，我们应该关注我们的窗口
if(mainWindow){
if(mainWindow.isMinimized()) mainWindow.restore()
mainWindow.focus()
}
if(loginWindow){
if(loginWindow.isMinimized()) loginWindow.restore()
loginWindow.focus()
}
})
}
//登录窗口
function createLoginWindow() {
if (loginWindow) return
@ -53,7 +74,7 @@ function createLoginWindow() {
updateInit(loginWindow)
}
loginWindow.webContents.openDevTools()
// loginWindow.webContents.openDevTools()
loginWindow.once('ready-to-show', () => {
loginWindow.show()
})
@ -101,7 +122,7 @@ function createMainWindow() {
shell.openExternal(details.url)
return { action: 'deny' }
})
mainWindow.webContents.openDevTools()
// mainWindow.webContents.openDevTools()
if (is.dev && process.env['ELECTRON_RENDERER_URL']) {
mainWindow.loadURL(process.env['ELECTRON_RENDERER_URL'])

31
src/renderer/src/components/choose-textbook/index.vue
View File

@ -109,6 +109,20 @@ const emitChangeBook = async () => {
},
node: curData
}
/**
* 临时用 后续删除 unitId
*/
let levelFirstId = null
let levelSecondId = null
let bookeId = curBook.data.id
if (curData.parentNode) {
levelFirstId = curData.parentNode.id
levelSecondId = curData.id
} else {
levelFirstId = curData.id
levelSecondId = ''
}
localStorage.setItem('unitId', JSON.stringify({ levelFirstId, levelSecondId, bookeId}))
emit('changeBook', data)
}
@ -187,6 +201,22 @@ const handleNodeClick = (data, node) => {
}
localStorage.setItem('defaultExpandedKeys', parentNode ? JSON.stringify([parentNode.id]) : JSON.stringify([data.id]))
localStorage.setItem('curNode', JSON.stringify(nodeData))
/**
* 临时用 后续删除 unitId
*/
let levelFirstId = null
let levelSecondId = null
let bookeId = curBook.data.id
if (nodeData.parentNode) {
levelFirstId = nodeData.parentNode.id
levelSecondId = nodeData.id
} else {
levelFirstId = nodeData.id
levelSecondId = ''
}
localStorage.setItem('unitId', JSON.stringify({ levelFirstId, levelSecondId, bookeId}))
emit('nodeClick', curData)
}
@ -205,6 +235,7 @@ onMounted( async () => {
}
else{
curBook.data = useSubject.subjectList[0]
localStorage.setItem('curBook', JSON.stringify(curBook.data))
treeData.value = useSubject.treeData
}
// 设置展开并选中

3
src/renderer/src/hooks/useGetClassWork.js
View File

@ -102,8 +102,9 @@ const getTreeData = () => {
levelFirstId = curNode.id
levelSecondId = ''
}
let bookeId = curBookId
// 头部 教材分析、作业设计：打开外部链接需要当前章节ID
localStorage.setItem('unitId', JSON.stringify({ levelFirstId, levelSecondId}))
localStorage.setItem('unitId', JSON.stringify({ levelFirstId, levelSecondId, bookeId}))
// const data = {
// textBook: {

4
src/renderer/src/layout/components/Header.vue
View File

@ -3,7 +3,7 @@
<div class="left-section">
<div class="flex title-box">
<el-image style="width: 23px; height: 23px" :src="logoIco" />
<span class="title" @click="changeTab">AIX智慧课堂</span>
<span class="title" @click="changeTab">{{homeTitle}}</span>
</div>
<div class="change-tab">
<ul class="flex">
@ -74,7 +74,7 @@ import outLink from '@/utils/linkConfig'
import logoIco from '@/assets/images/logo.png'
import { listEvaluation } from '@/api/classManage/index'
import { clearBookInfo } from '@/utils/ruoyi'
let homeTitle = ref(import.meta.env.VITE_APP_TITLE)
const { ipcRenderer } = window.electron || {}
const userStore = useUserStore()
const router = useRouter()

10
src/renderer/src/views/classManage/basicGroup.vue
View File

@ -1,10 +1,10 @@
<template>
<el-card style="width: 100%;height: 100%;overflow: auto">
<!-- <template #header>-->
<!-- <div class="card-header" style="text-align: left">-->
<!-- <el-button type="primary" @click="addGroup">新建分组</el-button>-->
<!-- </div>-->
<!-- </template>-->
<template #header>
<div class="card-header" style="text-align: left">
<el-button type="primary" @click="addGroup">新建分组</el-button>
</div>
</template>
<template v-if="groupList.length > 0">
<div style="font-size: 16px;font-weight: bold;color: #000;text-align: left;margin-bottom: 5px">可用分组</div>
<div class="groupList">

13
src/renderer/src/views/classManage/index.vue
View File

@ -186,7 +186,8 @@
])
//选择的班级
const classids = ref('')
// 未加入的班级
const classesNotAMemberOf = ref([])
// 获取班级信息
const getClassInfo = () => {
classList.value = []
@ -199,13 +200,13 @@
});
listClassmain({entpid: userStore.deptId, status: 'open', pageSize: 100}).then(response => {
//清除已有的班级
let arr = [...response.rows]
classesNotAMemberOf.value = [...response.rows]
classList.value.forEach(item => {
const currentIndex = arr.findIndex(items => items.id === item.id)
if(currentIndex) arr.splice(currentIndex, 1)
const currentIndex = classesNotAMemberOf.value.findIndex(items => items.id === item.id)
if(currentIndex) classesNotAMemberOf.value.splice(currentIndex, 1)
})
//这里获取组装所有班级
gradeTree.value = groupByCondition(arr, item => item.agekey);
gradeTree.value = groupByCondition(classesNotAMemberOf.value, item => item.agekey);
})
}
//将所有班级筛选成二级的数组
@ -301,7 +302,7 @@
addClasses({classIds:classids.value.join(','),userId:userStore.userId}).then(res => {
if (res.code === 200) {
dialogVisible.value = false
ElMessage({
ElMessage({x
message: res.msg,
type: 'success',
})

5
src/renderer/src/views/desktop/index.vue
View File

@ -168,10 +168,11 @@ const clickMenu = ({isOuter, path, disabled}) =>{
let fullPath = configObj.fullPath + path
if(path == '/teaching/classtaskassign?titleName=作业布置&openDialog=newClassTask' || path == '/teaching/classtaskassign?titleName=作业布置'){
// 头部 教材分析打开外部链接需要当前章节ID
const { levelFirstId, levelSecondId } = JSON.parse(localStorage.getItem('unitId'))
const { levelFirstId, levelSecondId, bookeId } = JSON.parse(localStorage.getItem('unitId'))
let unitId = levelSecondId ? levelSecondId : levelFirstId
fullPath = fullPath + `&unitId=${unitId}`
fullPath = fullPath + `&unitId=${unitId}&bookeId=${bookeId}`
console.log(fullPath)
}

50
src/renderer/src/views/login/components/Register.vue
View File

@ -7,7 +7,7 @@
:before-close="handleClose"
>
<el-steps v-if="type==1" style="max-width: 100%;-webkit-app-region: no-drag;height:35px" :active="activeIndex" finish-status="success" simple>
<el-step title="1.基本信息" @click="activeIndex=1" />
<el-step title="1.基本信息" @click="activeIndex=1" style="cursor:pointer"/>
<el-step title="2.在校信息" />
</el-steps>
<el-form
@ -40,9 +40,11 @@
<el-form-item label="所属地区" prop="address" v-if="activeIndex==2">
<el-cascader
style="width:100%"
popper-class="aix-regist-address"
v-model="ruleForm.address"
:options="regionData"
@change="handleChange"
:props="{checkStrictly: true}"
/>
</el-form-item>
<el-form-item label="学校" prop="school" v-if="activeIndex==2">
@ -72,6 +74,7 @@
</el-form-item>
<el-form-item v-if="activeIndex==2">
<div class="centerDiv">
<el-button type="default" @click="activeIndex=1">上一步</el-button>
<el-button type="primary" @click="submitForm(ruleFormRef)">立即注册</el-button>
</div>
</el-form-item>
@ -211,12 +214,6 @@ const rules = reactive({
message: '请选择地址',
trigger: 'change',
},],
class:[ {
type:'array',
required: true,
message: '请选择班级',
trigger: 'change',
},],
discipline:[ {
type: 'array',
required: true,
@ -300,7 +297,6 @@ const nextStep = (formEl) => {
}
})
getSubject()
console.log(res)
})
console.log('submit!')
}
@ -314,7 +310,8 @@ const getSubject = async ()=>{
const rows= await listEvaluation({ itemkey: "subject", pageSize: 500 })
console.log(rows,'所有学科')
allSubjectList.value = rows.data
accessToDisciplines()
getClassmain()
}
const submitForm = async (formEl) => {
@ -425,9 +422,15 @@ const sbmitImg=()=>{
const handleChange = (value) => {
console.log('选中的地址值：', value);
};
const handleSchoolChange= async ()=>{
const handleSchoolChange= ()=>{
ruleForm.discipline=[];
ruleForm.class=[];
//获取学科班级
accessToDisciplines()
getClassmain()
}
// 获取学科
const accessToDisciplines = () => {
getDept({deptId:ruleForm.school[2]}).then(res =>{
if(res.data.studying && res.data.studying.length){
let studying = res.data.studying.split(',')
@ -450,11 +453,12 @@ const handleSchoolChange= async ()=>{
schoolSubject.value = []
}
})
listClassmain( {entpid: ruleForm.school[2], pageSize: 500, status: 'open'}).then(res=>{
}
// 获取班级
const getClassmain = async ()=>{
console.log(ruleForm.school)
const res = await listClassmain( {entpid: ruleForm.school[2], pageSize: 500, status: 'open'})
gradeTree.value = groupByCondition(res.rows, item => item.agekey);
console.log(gradeTree.value,'班级')
})
}
//将所有班级筛选成二级的数组
const groupByCondition = (arr, condition)=>{
@ -490,7 +494,10 @@ const gradeName = (key) =>{
}
}
onMounted(()=>{
//默认给到地区重庆
ruleForm.address = ['50']
//默认给到学校的值
ruleForm.school = [100,255,279]
})
defineExpose({
OpenModel,
@ -504,4 +511,17 @@ defineExpose({
display: flex;
justify-content: center;
}
</style>
<style lang="scss">
.aix-regist-address{
.el-cascader-node{
position: relative!important;
.el-radio{
position: absolute!important;
width: 90%!important;
left:5px!important;
}
}
}
</style>

3
src/renderer/src/views/login/index.vue
View File

@ -2,7 +2,7 @@
<div class="login-container">
<div class="box-item desc">
<div class="welcome">
<p>欢迎登录 AIX智慧课堂</p>
<p>欢迎登录 {{homeTitle}}</p>
</div>
<img class="welcome-img" :src="leftBg2" />
</div>
@ -93,6 +93,7 @@ const rules = reactive({
})
let curWinUrl = import.meta.env.VITE_APP_BUILD_BASE_PATH
let homeTitle = ref(import.meta.env.VITE_APP_TITLE)
ipcRenderer.on('update-app-progress', (e, prop) => {
downloadProp.value = prop
showDownLoading.value = prop !== 100

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

@ -108,6 +108,12 @@ export default {
name: 'FileListItem',
components: { FileImage },
props: {
curNode: {
type: Object,
default: function () {
return {}
}
},
item: {
type: Object,
default: function () {
@ -201,8 +207,9 @@ export default {
},
openFileWin(items) {
if (items.fileFlag === 'apt') {
console.log(items);
const path="/teaching/aptindex?id="+items.fileId
console.log(this.curNode);
let curBook = JSON.parse(localStorage.getItem('curBook'))
const path="/teaching/aptindex?id="+items.fileId + "&unitId=" + this.curNode.id + "&bookId=" + curBook.id;
let configObj = outLink().getBaseData()
let fullPath = configObj.fullPath + path
fullPath = fullPath.replaceAll('//', '/')

5
src/renderer/src/views/prepare/index.vue
View File

@ -20,6 +20,7 @@
:key="index"
:item="item"
:index="index"
:curNode="currentNode"
@on-delete="deleteTalk"
@on-start-class="startClass"
>
@ -115,13 +116,13 @@
</el-checkbox-group>
</el-tab-pane>
<el-tab-pane label="作业" name="作业">
<div class="prepare-body-header">
<!-- <div class="prepare-body-header">
<div>
<label style="font-size: 15px">共{{ currentWorkList.length }}个作业</label>&nbsp;
<el-button size="small" @click="handleOutLink('feedback')">作业反馈</el-button>
<el-button size="small" @click="handleOutLink('homeWork')">布置作业</el-button>
</div>
</div>
</div>-->
<div class="prepare-work-wrap">
<file-list-item
v-for="(item, index) in currentWorkList"

6
src/renderer/src/views/profile/index.vue
View File

@ -30,9 +30,9 @@
<li class="list-group-item">
<div class="left-align">
<Message class="Message"/>
<span>用户邮箱</span>
<span>身份证号</span>
</div>
<div class="right-align">{{ state.user.email }}</div>
<div class="right-align">{{ state.user.identity }}</div>
</li>
<li class="list-group-item">
<div class="left-align">
@ -48,7 +48,7 @@
<Avatar class="Avatar"/>
<span>所属角色</span>
</div>
<div class="right-align">{{ state.roleGroup }}</div>
<div class="right-align">{{ state.roleGroup || '教师' }}</div>
</li>
<li class="list-group-item">
<div class="left-align">

29
src/renderer/src/views/profile/userInfo.vue
View File

@ -6,10 +6,10 @@
<el-form-item label="手机号码" prop="phonenumber">
<el-input v-model="user.phonenumber" maxlength="11" />
</el-form-item>
<el-form-item label="邮箱" prop="email">
<el-input v-model="user.email" maxlength="50" />
<el-form-item label="身份证号" prop="identity">
<el-input v-model="user.identity" maxlength="50" />
</el-form-item>
<el-form-item label="性别">
<el-form-item label="性别" style="display: none">
<el-radio-group v-model="user.sex">
<el-radio value="0">男</el-radio>
<el-radio value="1">女</el-radio>
@ -18,8 +18,8 @@
<el-form-item label="学段">
<el-radio-group v-model="user.edustage" @change="semeterChange">
<template v-for="(item,index) in semesterList" :key="index">
<el-radio :value="item.title">
{{item.title }}
<el-radio :value="item.label">
{{item.label }}
</el-radio>
</template>
</el-radio-group>
@ -42,6 +42,7 @@
<script setup>
import { ref, getCurrentInstance,onMounted } from 'vue'
import {updateUserInfo } from '@/api/system/user'
import {getDept } from '@/api/login'
import { listEvaluation } from '@/api/subject/index'
import useUserStore from '@/store/modules/user'
import {ElMessage} from 'element-plus'
@ -60,21 +61,30 @@ const userStore = useUserStore()
const semesterList = ref([
{
id:1,
title:'幼儿园'
label:'幼儿园'
},
{
id:2,
title:'小学'
label:'小学'
},
{
id:3,
title:'初中'
label:'初中'
},
{
id:4,
title:'高中'
label:'高中'
},
])
// 获取学校所存在的学段
const getTheSection = () => {
getDept({deptId:userStore.user.deptId}).then(res => {
//获取该学校可以选择的学科
const arr = res.data.studying.split(',')
semesterList.value = semesterList.value.filter(items => {return arr.includes(items.label)}).map(item => item)
})
}
const rules = ref({
nickName: [{ required: true, message: '用户昵称不能为空', trigger: 'blur' }],
@ -159,5 +169,6 @@ const semeterChange = (item) => {
}
onMounted(() => {
getSubject()
getTheSection()
})
</script>