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

zhuhao_dev #61

Merged
zhuhao merged 2 commits from zhuhao_dev into main 2024-07-25 09:20:59 +08:00
Conversation 0 Commits 2 Files Changed 1 +150 -79
11 changed files with 150 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 88e306e8a2 - Show all commits

1
package.json
View File

@ -28,6 +28,7 @@
"element-plus": "^2.7.6",
"js-cookie": "^3.0.5",
"jsencrypt": "^3.3.2",
"lodash": "^4.17.21",
"pinia": "^2.1.7",
"pinia-plugin-persistedstate": "^3.2.1",
"spark-md5": "^3.0.2",

58
src/main/index.js
View File

@ -5,7 +5,7 @@ import icon from '../../resources/icon.png?asset'
import File from './file'
File({ app, shell, BrowserWindow, ipcMain })
process.env['ELECTRON_DISABLE_SECURITY_WARNINGS'] = 'true'
let mainWindow, loginWindow
//登录窗口
@ -24,9 +24,16 @@ function createLoginWindow() {
nodeIntegration: true
}
})
const loginURL = is.dev ? `http://localhost:5173/#/login` : `file://${__dirname}/index.html/login`
loginWindow.loadURL(loginURL)
// handleUpdate(loginWindow,ipcMain)
// const loginURL = is.dev ? `http://localhost:5173/#/login` : `file://${__dirname}/index.html/#/login`
// loginWindow.loadURL(loginURL)
if (is.dev && process.env['ELECTRON_RENDERER_URL']) {
loginWindow.loadURL('http://localhost:5173/#/login')
} else {
loginWindow.loadFile(join(__dirname, '../renderer/index.html'), {hash: 'login'})
}
loginWindow.webContents.openDevTools()
loginWindow.once('ready-to-show', () => {
loginWindow.show()
})
@ -41,7 +48,7 @@ function createMainWindow() {
width: 1200,
height: 700,
show: false,
frame: false,// 无边框
frame: false, // 无边框
autoHideMenuBar: true,
...(process.platform === 'linux' ? { icon } : {}),
webPreferences: {
@ -61,17 +68,18 @@ function createMainWindow() {
mainWindow.webContents.openDevTools()
if (is.dev && process.env['ELECTRON_RENDERER_URL']) {
mainWindow.loadURL(process.env['ELECTRON_RENDERER_URL'])
mainWindow.loadURL(process.env['ELECTRON_RENDERER_URL'] )
} else {
mainWindow.loadFile(join(__dirname, '../renderer/index.html'))
}
}
// 作业窗口相关-开发中
let openWindow
function createOpenWin(data) {
if (openWindow) return
openWindow = new BrowserWindow({
let linkWindow
async function createLinkWin(data) {
if (linkWindow) return
linkWindow = new BrowserWindow({
width: 650,
height: 500,
show: false,
@ -81,28 +89,32 @@ function createOpenWin(data) {
...(process.platform === 'linux' ? { icon } : {}),
webPreferences: {
sandbox: false,
nodeIntegration: true
nodeIntegration: true,
worldSafeExecuteJavaScript: true,
contextIsolation: true
}
})
let cookieDetails = {...data.cookieData}
openWindow.webContents.session.cookies.set(cookieDetails).then(()=>{
console.log('Cookie set successfully.')
}).catch(err =>{
console.error('Set cookie failed:', error)
let cookieDetails = { ...data.cookieData }
await linkWindow.webContents.session.cookies.set(cookieDetails).then(()=>{
console.log('Cookie is successful');
}).catch( error =>{
console.error('Cookie is error', error);
})
openWindow.loadURL(data.fullPath)
linkWindow.loadURL(data.fullPath)
openWindow.once('ready-to-show', () => {
openWindow.show()
linkWindow.once('ready-to-show', () => {
linkWindow.show()
linkWindow.maximize()
})
openWindow.on('closed', () => {
openWindow = null
linkWindow.on('closed', () => {
linkWindow = null
})
}
// 初始化完成
app.on('ready', () => {
// 设置应用程序用户模型标识符
electronApp.setAppUserModelId('com.electron')
@ -149,16 +161,18 @@ app.on('ready', () => {
createLoginWindow()
}
mainWindow.destroy()
mainWindow = null
loginWindow.show()
loginWindow.focus()
})
//打开作业窗口
ipcMain.on('openWork', (e, data) => {
createOpenWin(data)
ipcMain.on('openWindow', (e, data) => {
createLinkWin(data)
})
createLoginWindow()
app.on('activate', function () {
if (BrowserWindow.getAllWindows().length === 0) createLoginWindow()
})

12
src/renderer/src/components/select-subject/index.vue
View File

@ -79,10 +79,6 @@ const subjectList = ref([])
const allSubject = ref([])
const dialogVisible = ref(false)
watch(() => props.modelValue, (newVal) => {
dialogVisible.value = newVal
})
//切换年级
const changeGrade = ()=>{
// 切换年级 过滤出对应学科数据
@ -120,8 +116,13 @@ const editUserInfo = async () =>{
emit('onSuccess')
}
watch(() => props.modelValue, (newVal) => {
dialogVisible.value = newVal
if(newVal){
getSubject()
}
})
onMounted(getSubject)
</script>
<style lang="scss" scoped>
@ -138,6 +139,7 @@ onMounted(getSubject)
.dialog-content {
padding: 30px 20px 10px 30px;
-webkit-app-region: no-drag;
}
.dialog-footer{

9
src/renderer/src/utils/config.js
View File

@ -1,9 +0,0 @@
// 作业
export const homeWorkConfig = {
// host 设置token 等
host: 'https://file.ysaix.com:7868',
name: 'Admin-Token',
// 完整路径
fullPath: 'https://file.ysaix.com:7868/teaching/classtaskassign?titleName=%E4%BD%9C%E4%B8%9A%E5%B8%83%E7%BD%AE'
}

18
src/renderer/src/utils/hasPermission.js Normal file
View File

@ -0,0 +1,18 @@
import useUserStore from '@/store/modules/user'
import array from 'lodash/array'
export const hasPermission = (value, def = true) => {
// 不传值，默认视为有权限，不做鉴权
if (!value) {
return def
}
const allCodeList = useUserStore().roles
// 如果不是数组，直接判断pinia里的权限数组有没有相同的元素即可
if (!Array.isArray(value)) {
return allCodeList.includes(value)
}
// intersection是lodash提供的一个方法，用于返回一个所有给定数组都存在的元素组成的数组
return array.intersection(value, allCodeList).length > 0
}

40
src/renderer/src/utils/linkConfig.js Normal file
View File

@ -0,0 +1,40 @@
import useUserStore from '@/store/modules/user'
const userStore = useUserStore()
const baseConfig = {
// Electron 设置cookie
url: 'https://file.ysaix.com:7868',
//cookie 名称 这里为 token
name: 'Admin-Token',
//cookie 值
value: userStore.token,
// 域名
domain: 'file.ysaix.com',
}
// 作业
const homeWork = {
data: { ...baseConfig},
// 完整路径
fullPath: `${baseConfig.url}/teaching/classtaskassign?titleName=%E4%BD%9C%E4%B8%9A%E5%B8%83%E7%BD%AE`
}
// 高考研读
const gk = {
data: { ...baseConfig},
fullPath: `${baseConfig.url}/education/colentrance`
}
// 课标研读
const standard = {
data: { ...baseConfig},
fullPath: `${baseConfig.url}/teaching/chatwithstandard`
}
export default {
homeWork,
gk,
standard
}

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

@ -31,7 +31,7 @@
</div>
</div>
<!--选择学科-->
<SelectSubject v-model="isSubject" v-if="isSubject" class="select-subject" @onSuccess="successEditSubject" />
<SelectSubject v-model="isSubject" @onSuccess="successEditSubject" />
</template>
<script setup>
import { onMounted, reactive, ref } from 'vue'
@ -202,7 +202,5 @@ onMounted(()=>{
.el-form-item {
margin-bottom: 40px;
}
.select-subject{
-webkit-app-region: drag;
}
</style>

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

@ -7,9 +7,9 @@
<el-image style="width: 80px; height: 110px" :src="curBookImg" />
</div>
<div class="top-item">
<el-button class="btn">教材研读</el-button>
<el-button class="btn">电子课本</el-button>
<el-button class="btn">高考研读</el-button>
<el-button class="btn" @click="handleOutLink('standard')">课标研读</el-button>
<el-button class="btn" >电子课本</el-button>
<el-button class="btn" @click="handleOutLink('gk')">高考研读</el-button>
<el-button class="btn">教学大模型</el-button>
</div>
<el-button type="primary" class="to-class-btn">
@ -37,7 +37,7 @@
</el-popover>
</div>
<div style="display: flex">
<el-button @click="handleHomeWork">布置作业</el-button>
<el-button @click="handleOutLink('homeWork')">布置作业</el-button>
<el-button @click="isDialogOpen = true">上传资料</el-button>
<el-button type="primary" style="margin-left: 10px" @click="createFile">新建课件</el-button>
</div>
@ -73,8 +73,8 @@ import { toTimeText } from '@/utils/date'
import { ElMessage } from 'element-plus'
import { parseCataByNode, creatPPT, asyncLocalFile } from '@/utils/talkFile'
import FileOperBatch from '@/views/prepare/container/file-oper-batch.vue'
import useUserStore from '@/store/modules/user'
import { homeWorkConfig } from '@/utils/config'
import outLink from '@/utils/linkConfig'
const { ipcRenderer } = window.electron || {}
export default {
@ -102,7 +102,6 @@ export default {
},
// 当前教材封面图
curBookImg: '',
userStore: ''
}
},
computed: {
@ -118,7 +117,7 @@ export default {
this.callback(param)
})
this.lastAsyncAllTime = localStorage.getItem('lastAsyncAllTime')
this.userStore = useUserStore()
},
mounted() {
},
@ -251,15 +250,14 @@ export default {
this.uploadData.textbookId = data.textBook.curBookId
this.asyncAllFile()
},
// 布置组后也
handleHomeWork(){
ipcRenderer.send('openWork',{
fullPath: homeWorkConfig.fullPath,
cookieData: {
url: homeWorkConfig.host,
name: homeWorkConfig.name,
value: this.userStore.token
}
// 打开外部链接
handleOutLink(key){
// key 对应的 linkConfig.js 外部链接配置
let configObj = outLink[key]
// 通知主进程
ipcRenderer.send('openWindow', {
fullPath: configObj.fullPath,
cookieData: {...(configObj.data)}
})
},
}

13
src/renderer/src/views/resource/container/resoure-search.vue
View File

@ -8,12 +8,13 @@
}}</el-button>
</el-col>
<el-col :span="12" class="search-box flex">
<el-input v-model="sourceStore.query.fileName" @input="sourceStore.changeName" style="width: 240px" placeholder="请输入关键词" />
<el-input v-model="sourceStore.query.fileName" @input="sourceStore.changeName" style="width: 240px"
placeholder="请输入关键词" />
</el-col>
</el-row>
<el-row class="resoure-btns">
<el-col :span="24" class="query-row flex">
<div class="flex row-left"> <el-select v-model="sourceStore.query.fileSuffix" @change="sourceStore.changeSuffix"
<div class="flex row-left"> <el-select v-model="sourceStore.query.fileSuffix" @change="sourceStore.changeSuffix"
style="width: 110px">
<el-option v-for="item in sourceStore.resourceFormatList" :key="item.value" :label="item.label"
:value="item.value" />
@ -22,7 +23,7 @@
<el-button v-for="item in sourceStore.resourceTypeList" :key="item.id"
:type="sourceStore.query.fileFlag == item.value ? 'primary' : ''" round
@click="sourceStore.changeType(item.value)">{{
item.label }}</el-button>
item.label }}</el-button>
</div>
<div>
<slot name="add" />
@ -58,7 +59,8 @@ const sourceStore = useResoureStore()
.query-row {
justify-content: space-between;
.row-left{
.row-left {
align-items: center;
}
}
@ -74,7 +76,8 @@ const sourceStore = useResoureStore()
}
}
.el-button.is-round{
.el-button.is-round {
padding: 3px 15px;
font-size: 13px;
}

4
src/renderer/src/views/resource/index.vue
View File

@ -6,7 +6,7 @@
<div class="page-right">
<!-- 搜索 -->
<ResoureSearch #add>
<el-button type="primary" round @click="openDialog" class="create-btn">
<el-button v-if="hasPermission(['platformmanager'])" type="primary" round @click="openDialog" class="create-btn">
<i class="iconfont icon-jiahao"></i>
新建资源</el-button>
</ResoureSearch>
@ -26,6 +26,7 @@ import ResoureSearch from './container/resoure-search.vue'
import ResoureList from './container/resoure-list.vue'
import uploadDialog from '@/components/upload-dialog/index.vue'
import uploaderState from '@/store/modules/uploader'
import { hasPermission } from '@/utils/hasPermission'
const sourceStore = useResoureStore()
const isDialogOpen = ref(false)
@ -76,7 +77,6 @@ const submitFile = (data) => {
const fileCallBack = (res) => {
console.log(res)
if (res.code == 200) {
sourceStore.handleQuery()
}

30
src/renderer/src/views/resource/store.js
View File

@ -2,6 +2,7 @@ import { defineStore } from 'pinia'
import { getSmarttalkPage } from '@/api/file/index'
import { tabs, resourceType, resourceFormat } from '@/utils/resourceDict'
import useUserStore from '@/store/modules/user'
import { hasPermission } from '@/utils/hasPermission'
const userStore = useUserStore()
@ -21,10 +22,15 @@ const resourceFormatList = [
]
// 校本资源为学校ID
tabs.forEach(item =>{
if( item.label == "校本资源"){
item.value = userStore.user.deptId
}
tabs.forEach((item) => {
if (item.label == '校本资源') {
item.value = userStore.user.deptId
}
})
tabs.forEach((item, i) => {
if (item.label == '平台资源' && !hasPermission(['platformmanager'])) {
tabs.splice(i, 1)
}
})
const structQuery = {
@ -41,12 +47,12 @@ export default defineStore('resource', {
searchKey: '',
//节点数据
nodeData:{},
nodeData: {},
loading: false,
//查询条件
query: {
textbookId: '',
fileSource: '平台',
fileSource: tabs[0].value,
//资源格式 mp3 ppt ...
fileSuffix: -1,
// 资源类型 课件 素材 教案
@ -66,10 +72,11 @@ export default defineStore('resource', {
handleQuery() {
try {
this.loading = true
let data = {...this.query}
if(data.fileSuffix == -1){
let data = { ...this.query }
if (data.fileSuffix == -1) {
data.fileSuffix = ''
}
console.log(data, 200)
getSmarttalkPage(data).then((res) => {
this.result.total = res.total
this.result.list = res.rows
@ -86,14 +93,13 @@ export default defineStore('resource', {
this.query.fileFlag = val
this.handleQuery()
},
changeSuffix(val){
changeSuffix(val) {
this.query.fileSuffix = val
this.handleQuery()
},
// 关键词搜索
changeName(){
console.log(this.query.fileName)
changeName() {
this.handleQuery()
},
}
}
})