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

Merge pull request 'zhuhao_dev' (#109) from zhuhao_dev into main 

Reviewed-on: #109
This commit is contained in:
朱浩 2024-08-08 14:05:48 +08:00
parent 6ddd172bb9 32c64d073b
commit c56039270c
5 changed files with 205 additions and 124 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "aix-win", "name": "aix-win",
"version": "1.0.4", "version": "1.0.5",
"description": "An Electron application with Vue", "description": "An Electron application with Vue",
"main": "./out/main/index.js", "main": "./out/main/index.js",
"author": "example.com", "author": "example.com",

65
src/main/file.js
View File

@ -201,7 +201,8 @@ export default async function ({ app, shell, BrowserWindow, ipcMain }) {
/*创建新的ppt文件*/ /*创建新的ppt文件*/
ipcMain.on('creat-file-default', (e, { name, uploadData, cookie }) => { ipcMain.on('creat-file-default', (e, { name, uploadData, cookie }) => {
createFolder('tempFile').then(() => { createFolder('tempFile').then(() => {
let path = appTempFilePath + name let path = appTempFilePath + name.replace(/[\\/:*?"<>|]/, '')
console.log(path)
fs.writeFileSync(path, '', 'utf-8') fs.writeFileSync(path, '', 'utf-8')
let fileType = 'application/vnd.openxmlformats-officedocument.presentationml.presentation' let fileType = 'application/vnd.openxmlformats-officedocument.presentationml.presentation'
let formData = new FormData() let formData = new FormData()
@ -237,37 +238,41 @@ export default async function ({ app, shell, BrowserWindow, ipcMain }) {
//下载文件 //下载文件
ipcMain.on('download-file-default', (e, { url, fileName }) => { ipcMain.on('download-file-default', (e, { url, fileName }) => {
createFolder('selfFile').then(async () => { createFolder('selfFile')
const browserWindow = BrowserWindow.getFocusedWindow() .then(async () => {
const id = await manager.download({ const browserWindow = BrowserWindow.getFocusedWindow()
window: browserWindow, const id = await manager.download({
url: url, window: browserWindow,
saveAsFilename: fileName, url: url,
directory: appRootFilePath, saveAsFilename: fileName,
callbacks: { directory: appRootFilePath,
onDownloadStarted: async ({ id, item, webContents }) => { callbacks: {
// Do something with the download id onDownloadStarted: async ({ id, item, webContents }) => {
}, // Do something with the download id
onDownloadProgress: async ({ id, item, percentCompleted }) => {}, },
onDownloadCompleted: async ({ id, item }) => { onDownloadProgress: async ({ id, item, percentCompleted }) => {},
console.log('完成') onDownloadCompleted: async ({ id, item }) => {
e.reply('download-file-default' + fileName, true) console.log('完成')
}, e.reply('download-file-default' + fileName, true)
onDownloadCancelled: async () => { },
console.log('取消') onDownloadCancelled: async () => {
e.reply('download-file-default' + fileName, false) console.log('取消')
}, e.reply('download-file-default' + fileName, false)
onDownloadInterrupted: async () => { },
console.log('中断') onDownloadInterrupted: async () => {
e.reply('download-file-default' + fileName, false) console.log('中断')
}, e.reply('download-file-default' + fileName, false)
onError: (err, data) => { },
console.log(err.toString()) onError: (err, data) => {
e.reply('download-file-default' + fileName, false) console.log(err.toString())
e.reply('download-file-default' + fileName, false)
}
} }
} })
})
.catch((error) => {
e.reply('download-file-default' + fileName, false)
}) })
})
}) })
/**另存为... /**另存为...

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

@ -73,6 +73,7 @@ const handleOutLink = (path, type) => {
fullPath = fullPath.replaceAll('//', '/') fullPath = fullPath.replaceAll('//', '/')
// 通知主进程 // 通知主进程
ipcRenderer.send('openWindow', { ipcRenderer.send('openWindow', {
key: path,
fullPath: fullPath, fullPath: fullPath,
cookieData: { ...configObj.data } cookieData: { ...configObj.data }
}) })

111
src/renderer/src/views/prepare/container/reserv.vue
View File

@ -4,60 +4,74 @@
class="reserv-dialog" class="reserv-dialog"
title="预约课程" title="预约课程"
destroy-on-close destroy-on-close
:before-close="closeDialog"
width="600" width="600"
style="text-align: left" style="text-align: left"
> >
<el-form :model="form" label-width="auto" style="max-width: 600px"> <el-form
<el-form-item label="课程名称"> ref="ruleFormDialog"
:model="form"
:rules="ruleForm"
label-width="auto"
style="max-width: 600px"
>
<el-form-item label="课程名称" prop="name">
<el-input v-model="form.name" /> <el-input v-model="form.name" />
</el-form-item> </el-form-item>
<el-form-item label="课程类型" prop="location"> <el-form-item label="课程类型" prop="type">
<el-segmented v-model="form.type" :block="false" :options="locationOptions" /> <el-segmented v-model="form.type" :block="false" :options="locationOptions" />
</el-form-item> </el-form-item>
<el-form-item label="&nbsp;" prop="location"> <el-form-item label="&nbsp;">
<div>{{ locationMessage }}</div> <div>{{ locationMessage }}</div>
</el-form-item> </el-form-item>
<el-form-item label="上课时间"> <el-form-item label="上课时间">
<el-col :span="6"> <el-form-item prop="day">
<el-date-picker <el-col :span="6">
v-model="form.day" <el-date-picker
type="date" v-model="form.day"
:editable="false" type="date"
class="reserv-date-pick" :editable="false"
placeholder="请选择日期" class="reserv-date-pick"
format="YYYY-MM-DD" placeholder="请选择日期"
value-format="YYYY-MM-DD" format="YYYY-MM-DD"
/> value-format="YYYY-MM-DD"
</el-col> />
</el-col>
</el-form-item>
<el-col :span="2" class="text-center"> <el-col :span="2" class="text-center">
<span class="text-gray-500">-</span> <span class="text-gray-500">-</span>
</el-col> </el-col>
<el-col :span="11"> <el-form-item prop="time">
<el-time-picker <el-col :span="11">
v-model="form.time" <el-time-picker
is-range v-model="form.time"
:editable="false" is-range
format="HH:mm" :editable="false"
class="reserv-time-pick" format="HH:mm"
range-separator="-" value-format="HH:mm"
start-placeholder="开始时间" class="reserv-time-pick"
end-placeholder="结束时间" range-separator="-"
/> start-placeholder="开始时间"
</el-col> end-placeholder="结束时间"
/>
</el-col>
</el-form-item>
</el-form-item> </el-form-item>
<el-form-item label="授课对象"> <el-form-item label="授课对象" prop="resource">
<el-radio-group v-model="form.resource"> <el-checkbox-group v-model="form.resource">
<el-radio v-for="(item, index) in classList" :key="index" :value="item.id">{{item.caption}}({{item.classstudentcount}})人</el-radio> <el-checkbox v-for="(item, index) in classList" :key="index" name="type" :value="item.id"
</el-radio-group> >{{ item.caption }}({{ item.classstudentcount }})人
</el-checkbox>
</el-checkbox-group>
</el-form-item> </el-form-item>
<el-form-item label="教室"> <el-form-item label="教室" prop="classRoom">
<el-input v-model="form.classRoom" /> <el-input v-model="form.classRoom" />
</el-form-item> </el-form-item>
</el-form> </el-form>
<template #footer> <template #footer>
<div class="dialog-footer"> <div class="dialog-footer">
<el-button @click="centerDialogVisible = false">取消</el-button> <el-button @click="centerDialogVisible = false">取消</el-button>
<el-button type="primary" @click="centerDialogVisible = false"> 提交 </el-button> <el-button type="primary" @click="submitForm"> 提交 </el-button>
</div> </div>
</template> </template>
</el-dialog> </el-dialog>
@ -66,17 +80,24 @@
import { ref, defineExpose, onMounted, reactive, computed } from 'vue' import { ref, defineExpose, onMounted, reactive, computed } from 'vue'
import { listClassmain } from '@/api/classManage' import { listClassmain } from '@/api/classManage'
import useUserStore from '@/store/modules/user' import useUserStore from '@/store/modules/user'
const ruleFormDialog = ref(null)
const userStore = useUserStore().user const userStore = useUserStore().user
const centerDialogVisible = ref(false) const centerDialogVisible = ref(false)
const form = reactive({ const form = reactive({
name: '', name: '',
type: '常规课', type: '常规课',
delivery: false, day: '',
day:'', time: '',
time:'', resource: [],
resource: '',
classRoom: '' classRoom: ''
}) })
const ruleForm = reactive({
name: [{ required: true, message: '请输入课程名称', trigger: 'blur' }],
day: [{ required: true, message: '请选择上课日期', trigger: 'change' }],
time: [{ required: true, message: '请选择上课时间', trigger: 'change' }],
classRoom: [{ required: false, message: '请选择上课时间', trigger: 'change' }],
resource: [{ required: true, message: '请选择授课对象', trigger: 'change' }]
})
const locationOptions = [ const locationOptions = [
{ {
label: '常规课', label: '常规课',
@ -85,9 +106,9 @@ const locationOptions = [
message: '现场公屏授课，学生无需长时间打开平板上。' message: '现场公屏授课，学生无需长时间打开平板上。'
}, },
{ {
label: '公开课', label: '互动课',
value: '公开课', value: '互动课',
disabled: true, disabled: false,
message: '现场公屏授课，学生需打开平开与老师进行互动，如点赞、互动作业。' message: '现场公屏授课，学生需打开平开与老师进行互动，如点赞、互动作业。'
}, },
{ {
@ -104,6 +125,7 @@ const openDialog = () => {
centerDialogVisible.value = true centerDialogVisible.value = true
} }
const closeDialog = () => { const closeDialog = () => {
ruleFormDialog.value.resetFields()
centerDialogVisible.value = false centerDialogVisible.value = false
} }
const classList = ref([]) const classList = ref([])
@ -114,6 +136,15 @@ onMounted(() => {
} }
) )
}) })
const submitForm = async () => {
const formEl = ruleFormDialog.value
if (!formEl) return
await formEl.validate((valid) => {
if (valid) {
centerDialogVisible.value = false
}
})
}
defineExpose({ defineExpose({
openDialog, openDialog,
closeDialog closeDialog

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

@ -13,7 +13,8 @@
<el-button class="btn" @click="handleOutLink('aiModel')">教学大模型</el-button> <el-button class="btn" @click="handleOutLink('aiModel')">教学大模型</el-button>
</div> </div>
<el-button type="primary" class="to-class-btn" @click="openLesson"> <el-button type="primary" class="to-class-btn" @click="openLesson">
<i class="iconfont icon-lingdang"></i>上课</el-button> <i class="iconfont icon-lingdang"></i>上课</el-button
>
<div class="top-zoom-style"></div> <div class="top-zoom-style"></div>
</div> </div>
<div class="prepare-body-header"> <div class="prepare-body-header">
@ -22,7 +23,13 @@
<el-popover placement="top-start" :width="250" trigger="hover"> <el-popover placement="top-start" :width="250" trigger="hover">
<template #default> <template #default>
<div> <div>
<el-button v-if="lastAsyncAllTime" type="success" size="small" :icon="Check" circle /> <el-button
v-if="lastAsyncAllTime"
type="success"
size="small"
:icon="Check"
circle
/>
{{ lastAsyncAllTime ? toTimeText(lastAsyncAllTime) + '同步成功' : '' }} {{ lastAsyncAllTime ? toTimeText(lastAsyncAllTime) + '同步成功' : '' }}
</div> </div>
</template> </template>
@ -40,24 +47,60 @@
<el-button @click="handleOutLink('feedback')">作业反馈</el-button> <el-button @click="handleOutLink('feedback')">作业反馈</el-button>
<el-button @click="handleOutLink('homeWork')">布置作业</el-button> <el-button @click="handleOutLink('homeWork')">布置作业</el-button>
<el-button @click="isDialogOpen = true">上传资料</el-button> <el-button @click="isDialogOpen = true">上传资料</el-button>
<el-button type="primary" style="margin-left: 10px" @click="createFile">新建课件</el-button> <el-button type="primary" style="margin-left: 10px" @click="createFile"
>新建课件</el-button
>
</div> </div>
</div> </div>
<el-checkbox-group v-model="checkFileList" class="prepare-body-main" <el-checkbox-group
:style="{ 'margin-bottom': checkFileList.length > 0 ? '40px' : '0' }"> v-model="checkFileList"
<file-list-item v-for="(item, index) in currentFileList" :key="index" :item="item" :index="index" class="prepare-body-main"
@on-move="onMoveSingleFile" @on-delete="deleteTalk" @on-set="openSet" @on-delhomework="delhomework"> :style="{ 'margin-bottom': checkFileList.length > 0 ? '40px' : '0' }"
<el-checkbox label="" :value="item" v-if="!item.uniquekey" /> >
<file-list-item
v-for="(item, index) in currentFileList"
:key="index"
:item="item"
:index="index"
@on-move="onMoveSingleFile"
@on-delete="deleteTalk"
@on-set="openSet"
@on-delhomework="delhomework"
>
<el-checkbox v-if="!item.uniquekey" label="" :value="item" />
</file-list-item>
<file-list-item
v-for="(item, index) in currentWorkList"
:key="'work_' + index"
:item="item"
:index="index"
@on-move="onMoveSingleFile"
@on-delete="deleteTalk"
@on-set="openSet"
@on-delhomework="delhomework"
>
<el-checkbox v-if="!item.uniquekey" label="" :value="item" />
</file-list-item> </file-list-item>
</el-checkbox-group> </el-checkbox-group>
<file-oper-batch v-show="checkFileList.length > 0" <file-oper-batch
v-show="checkFileList.length > 0"
:indeterminate="checkFileList.length > 0 && checkFileList.length < currentFileList.length" :indeterminate="checkFileList.length > 0 && checkFileList.length < currentFileList.length"
:choose="checkFileList" :check-all="isCheckAll" @click-delete="clickDelete" @click-move="clickMove" :choose="checkFileList"
@cancel="checkFileList = []" @click-choose="clickChoose"></file-oper-batch> :check-all="isCheckAll"
@click-delete="clickDelete"
@click-move="clickMove"
@cancel="checkFileList = []"
@click-choose="clickChoose"
></file-oper-batch>
</div> </div>
<MoveFile v-model="isMoveDialogOpen" @on-submit="chooseMoveCata" /> <MoveFile v-model="isMoveDialogOpen" @on-submit="chooseMoveCata" />
<uploadDialog v-model="isDialogOpen" @submit-file="submitFile" /> <uploadDialog v-model="isDialogOpen" @submit-file="submitFile" />
<SetHomework v-model="setDialog" :entpcourseid="entpcourseid" :row="row" @on-close="closeHomework" /> <SetHomework
v-model="setDialog"
:entpcourseid="entpcourseid"
:row="row"
@on-close="closeHomework"
/>
</div> </div>
<reserv ref="reservDialog"></reserv> <reserv ref="reservDialog"></reserv>
</template> </template>
@ -86,7 +129,7 @@ import outLink from '@/utils/linkConfig'
import { createWindow } from '@/utils/tool' import { createWindow } from '@/utils/tool'
import { uniqBy, cloneDeep } from 'lodash' import { uniqBy, cloneDeep } from 'lodash'
import { delClasswork, addEntpcourse } from '@/api/teaching/classwork' import { delClasswork, addEntpcourse } from '@/api/teaching/classwork'
const fs = require('fs'); const fs = require('fs')
const { ipcRenderer } = window.electron || {} const { ipcRenderer } = window.electron || {}
export default { export default {
@ -112,6 +155,7 @@ export default {
fileList: [], fileList: [],
currentNode: {}, currentNode: {},
currentFileList: [], currentFileList: [],
currentWorkList: [],
curBookPath: '', curBookPath: '',
lastAsyncAllTime: '', lastAsyncAllTime: '',
uploadData: { uploadData: {
@ -155,7 +199,7 @@ export default {
}) })
this.lastAsyncAllTime = localStorage.getItem('lastAsyncAllTime') this.lastAsyncAllTime = localStorage.getItem('lastAsyncAllTime')
}, },
mounted() { }, mounted() {},
activated() { activated() {
if (this.uploadData.textbookId !== null) { if (this.uploadData.textbookId !== null) {
this.asyncAllFile() this.asyncAllFile()
@ -167,7 +211,7 @@ export default {
let fileName = this.curBookPath let fileName = this.curBookPath
if (!fileName) return if (!fileName) return
fileName = fileName.replace('.txt', '.pdf') fileName = fileName.replace('.txt', '.pdf')
return new Promise((resolve, reject)=>{ return new Promise((resolve, reject) => {
const userDataPath = Remote.app.getPath('userData') const userDataPath = Remote.app.getPath('userData')
const appRootFilePath = userDataPath + '\\selfFile\\' const appRootFilePath = userDataPath + '\\selfFile\\'
let filePath = appRootFilePath + fileName let filePath = appRootFilePath + fileName
@ -182,14 +226,14 @@ export default {
ipcRenderer.once('download-file-default' + fileName, (e, isSuccess) => { ipcRenderer.once('download-file-default' + fileName, (e, isSuccess) => {
if (isSuccess === true) { if (isSuccess === true) {
resolve(appRootFilePath + fileName) resolve(appRootFilePath + fileName)
}else { } else {
ElMessage({ ElMessage({
type: 'info', type: 'info',
message: `下载教材失败！` message: `下载教材失败！`
}) })
} }
}) })
}else { } else {
resolve(appRootFilePath + fileName) resolve(appRootFilePath + fileName)
} }
}) })
@ -314,7 +358,6 @@ export default {
}) })
}, },
async nodeClick(data) { async nodeClick(data) {
console.log(data)
if (this.currentNode.id === data.node.id) return if (this.currentNode.id === data.node.id) return
this.curBookImg = data.textBook.curBookImg this.curBookImg = data.textBook.curBookImg
this.curBookPath = data.textBook.curBookPath this.curBookPath = data.textBook.curBookPath
@ -327,9 +370,9 @@ export default {
this.uploadData.textbookId = data.textBook.curBookId this.uploadData.textbookId = data.textBook.curBookId
this.initHomeWork() this.initHomeWork()
await this.asyncAllFile() await this.asyncAllFile()
}, },
async initHomeWork() { async initHomeWork() {
this.currentWorkList = []
if (this.timerId) { if (this.timerId) {
clearInterval(this.timerId) clearInterval(this.timerId)
} }
@ -338,11 +381,10 @@ export default {
let { rows } = await this.getChapterId() let { rows } = await this.getChapterId()
if (rows.length > 0) { if (rows.length > 0) {
this.entpcourseid = rows[0].id this.entpcourseid = rows[0].id
} } else {
else{ await this.createEntpcourse()
await this.createEntpcourse() let { rows } = await this.getChapterId()
let { rows } = await this.getChapterId() this.entpcourseid = rows[0].id
this.entpcourseid = rows[0].id
} }
// 查询作业 // 查询作业
@ -351,27 +393,27 @@ export default {
}, },
// 创建新的entpcourse // 创建新的entpcourse
createEntpcourse() { createEntpcourse() {
var cform = {}; var cform = {}
cform.entpid = this.userStore.deptId; cform.entpid = this.userStore.deptId
cform.level = 1; cform.level = 1
cform.parentid = 0; cform.parentid = 0
cform.dictid = 0; cform.dictid = 0
cform.evalid = this.currentNode.id; cform.evalid = this.currentNode.id
cform.evalparentid = 0; cform.evalparentid = 0
cform.edusubject = this.currentNode.edusubject; cform.edusubject = this.currentNode.edusubject
cform.edudegree = this.currentNode.edudegree; cform.edudegree = this.currentNode.edudegree
cform.edustage = this.currentNode.edustage; cform.edustage = this.currentNode.edustage
cform.coursetype = '课标学科'; cform.coursetype = '课标学科'
cform.coursetitle = this.currentNode.itemtitle; cform.coursetitle = this.currentNode.itemtitle
cform.coursedesc = ''; cform.coursedesc = ''
cform.status = ''; cform.status = ''
cform.dflag = 0; cform.dflag = 0
cform.edituserid = this.userStore.userId; cform.edituserid = this.userStore.userId
cform.createblankfile = 'yes'; cform.createblankfile = 'yes'
return addEntpcourse(cform) return addEntpcourse(cform)
}, },
openReserv(){ openReserv() {
// this.$refs['reservDialog'].openDialog() this.$refs['reservDialog'].openDialog()
}, },
// 打开外部链接 // 打开外部链接
handleOutLink(key) { handleOutLink(key) {
@ -463,9 +505,9 @@ export default {
} }
} }
// 去重 // 去重
let ary = uniqBy([...this.currentFileList, ...list], 'id') let ary = uniqBy([...list], 'id')
// 深度克隆 // 深度克隆
this.currentFileList = cloneDeep(ary) this.currentWorkList = cloneDeep(ary)
}) })
}, },
// 打开布置作业窗口 // 打开布置作业窗口
@ -476,14 +518,16 @@ export default {
// 删除作业 // 删除作业
delhomework(item) { delhomework(item) {
this.isLoading = true this.isLoading = true
delClasswork(item.id).then(async res => { delClasswork(item.id)
ElMessage.success('操作成功') .then(async (res) => {
this.isLoading = false ElMessage.success('操作成功')
await this.asyncAllFile() this.isLoading = false
this.getHomeWorkList() await this.asyncAllFile()
}).catch(() => { this.getHomeWorkList()
this.isLoading = false })
}) .catch(() => {
this.isLoading = false
})
}, },
closeHomework() { closeHomework() {
this.setDialog = false this.setDialog = false