Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into baigl
This commit is contained in:
白了个白
commit
e59071c16b
|
|
@ -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/'
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
# 页面标题
|
||||
VITE_APP_TITLE = AIx数字平台
|
||||
VITE_APP_TITLE = AIX智慧课堂
|
||||
|
||||
# 生产环境配置
|
||||
VITE_APP_ENV = 'production'
|
||||
|
|
|
|||
|
|
@ -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:
|
||||
- '**/*'
|
||||
|
|
@ -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()]
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
"name": "aix-win",
|
||||
"version": "1.2.3",
|
||||
"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",
|
||||
|
|
|
|||
|
|
@ -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'])
|
||||
|
|
|
|||
|
|
@ -2,12 +2,12 @@
|
|||
<div class="book-wrap">
|
||||
<el-scrollbar height="100%">
|
||||
<div class="book-name flex" @click="dialogVisible = true">
|
||||
<span>{{ curBookName }}</span>
|
||||
<span>{{ curBook.data.itemtitle }}</span>
|
||||
<i class="iconfont icon-xiangyou"></i>
|
||||
</div>
|
||||
<div class="book-list" v-loading="treeLoading">
|
||||
<el-tree ref="refTree" :data="treeData" accordion :props="defaultProps" node-key="id"
|
||||
:default-expanded-keys="defaultExpandedKeys" :current-node-key="currentNodeId" highlight-current
|
||||
<el-tree :data="treeData" accordion :props="defaultProps" node-key="id"
|
||||
:default-expanded-keys="defaultExpandedKeys" :current-node-key="curNode.data.id" highlight-current
|
||||
@node-click="handleNodeClick">
|
||||
<template #default="{ node }">
|
||||
<span :title="node.label" class="tree-label">{{ node.label }}</span>
|
||||
|
|
@ -28,9 +28,9 @@
|
|||
|
||||
<div class="textbook-container">
|
||||
<el-scrollbar height="450px">
|
||||
<div class="textbook-item flex" v-for="item in subjectList" :class="curBookId == item.id ? 'active-item' : ''"
|
||||
<div class="textbook-item flex" v-for="item in subjectList" :class="curBook.data.id == item.id ? 'active-item' : ''"
|
||||
:key="item.id" @click="changeBook(item)">
|
||||
<img v-if="item.avartar" :src="BaseUrl + item.avartar" class="textbook-img" alt="">
|
||||
<img v-if="item.avartar" :src="item.avartar.indexOf('http') === 0 ? item.avartar : BaseUrl + item.avartar" class="textbook-img" alt="">
|
||||
<div v-else class="textbook-img">
|
||||
<i class="iconfont icon-jiaocaixuanze" style="font-size: 40px;"></i>
|
||||
</div>
|
||||
|
|
@ -43,166 +43,86 @@
|
|||
|
||||
<script setup>
|
||||
import { onMounted, ref, nextTick, toRaw, reactive } from 'vue';
|
||||
import useUserStore from '@/store/modules/user'
|
||||
import { listEvaluation } from '@/api/subject'
|
||||
import { cloneDeep } from 'lodash'
|
||||
import { useGetSubject } from '@/hooks/useGetSubject'
|
||||
|
||||
const BaseUrl = import.meta.env.VITE_APP_BUILD_BASE_PATH
|
||||
// 定义要发送的emit事件
|
||||
const emit = defineEmits(['nodeClick', 'changeBook'])
|
||||
// store
|
||||
const userStore = useUserStore()
|
||||
const { edustage, edusubject, userId } = userStore.user
|
||||
//
|
||||
let useSubject = null
|
||||
const subjectList = ref([])
|
||||
const evaluationList = ref([])
|
||||
const dialogVisible = ref(false)
|
||||
// 当前教材下面单元内容数据
|
||||
const treeData = ref([])
|
||||
const defaultProps = {
|
||||
children: 'children',
|
||||
label: 'label',
|
||||
label: 'itemtitle',
|
||||
class: 'textbook-tree'
|
||||
}
|
||||
|
||||
const treeLoading = ref(false)
|
||||
//当前教材ID
|
||||
const curBookId = ref(-1)
|
||||
//当前教材名称
|
||||
const curBookName = ref('')
|
||||
//当前教材封面图
|
||||
const curBookImg = ref('')
|
||||
//当前教材文件路径
|
||||
const curBookPath = ref('')
|
||||
// 上册
|
||||
const volumeOne = ref([])
|
||||
//
|
||||
const volumeTwo = ref([])
|
||||
|
||||
// 当前选中的教材
|
||||
const curBook = reactive({
|
||||
data: {}
|
||||
})
|
||||
// 当前节点
|
||||
const currentNode = reactive({
|
||||
const curNode = reactive({
|
||||
data:{}
|
||||
})
|
||||
// 当前选中的节点ID
|
||||
const currentNodeId = ref(0)
|
||||
// 当前选中的节点名称
|
||||
const currentNodeName = ref('')
|
||||
const treeLoading = ref(false)
|
||||
// 默认展开的节点
|
||||
const defaultExpandedKeys = ref([])
|
||||
// tree
|
||||
const refTree = ref(null)
|
||||
|
||||
|
||||
//获取教材下面的单元 + 章节
|
||||
const getSubjectContent = async () => {
|
||||
treeLoading.value = true
|
||||
const params = {
|
||||
edusubject,
|
||||
edustage,
|
||||
// entpcourseedituserid: userId,
|
||||
itemgroup: 'textbook',
|
||||
orderby: 'orderidx asc',
|
||||
pageSize: 10000
|
||||
}
|
||||
|
||||
|
||||
if(localStorage.getItem('evaluationList')){
|
||||
evaluationList.value = JSON.parse(localStorage.getItem('evaluationList'))
|
||||
}
|
||||
else{
|
||||
localStorage.removeItem('defaultExpandedKeys')
|
||||
localStorage.removeItem('currentNodeId')
|
||||
const { rows } = await listEvaluation(params)
|
||||
localStorage.setItem('evaluationList', JSON.stringify(rows))
|
||||
evaluationList.value = rows
|
||||
}
|
||||
|
||||
treeLoading.value = false
|
||||
|
||||
//获取教材版本
|
||||
await getSubject()
|
||||
//上册
|
||||
/**
|
||||
* 不区分上下册
|
||||
* 2024/08/20调整
|
||||
*/
|
||||
// volumeOne.value = data.filter(item => item.level == 1 && item.semester == '上册')
|
||||
// volumeTwo.value = data.filter(item => item.level == 1 && item.semester == '下册')
|
||||
getTreeData()
|
||||
}
|
||||
|
||||
//选择教材
|
||||
const changeBook = ({ id, itemtitle, avartar, fileurl }) => {
|
||||
curBookId.value = id
|
||||
curBookName.value = itemtitle
|
||||
curBookImg.value = BaseUrl + avartar
|
||||
curBookPath.value = fileurl
|
||||
const changeBook = (data) => {
|
||||
curBook.data = data
|
||||
|
||||
localStorage.removeItem('defaultExpandedKeys')
|
||||
localStorage.removeItem('currentNodeId')
|
||||
localStorage.setItem('curBook', JSON.stringify({id, itemtitle, avartar, fileurl}))
|
||||
getTreeData()
|
||||
localStorage.setItem('curBook', JSON.stringify(data))
|
||||
treeData.value = useSubject.getTreeData(data.id)
|
||||
|
||||
//切换教材后默认展开第一个并选中
|
||||
nextTick(() =>{
|
||||
defaultExpandedKeys.value = [treeData.value[0].id]
|
||||
curNode.data = getLastLevelData(treeData.value)[0]
|
||||
|
||||
localStorage.setItem('defaultExpandedKeys', JSON.stringify(defaultExpandedKeys.value))
|
||||
localStorage.setItem('curNode',JSON.stringify(curNode.data))
|
||||
emitChangeBook()
|
||||
})
|
||||
// 延迟关闭 视觉上选中
|
||||
setTimeout(() => {
|
||||
dialogVisible.value = false
|
||||
}, 100);
|
||||
}
|
||||
|
||||
const getTreeData = () => {
|
||||
//数据过滤
|
||||
let upData = transData(evaluationList.value)
|
||||
|
||||
if(upData.length){
|
||||
treeData.value = [...upData]
|
||||
}
|
||||
else{
|
||||
treeData.value = []
|
||||
return
|
||||
}
|
||||
nextTick(() => {
|
||||
|
||||
let defaultCurNodeId = localStorage.getItem('currentNodeId')
|
||||
if(defaultCurNodeId){
|
||||
defaultCurNodeId = JSON.parse(defaultCurNodeId)
|
||||
const data = findNode(defaultCurNodeId)
|
||||
currentNode.data = findNode(defaultCurNodeId)
|
||||
currentNodeId.value = data.id
|
||||
currentNodeName.value = data.label
|
||||
}
|
||||
else{
|
||||
defaultExpandedKeys.value = [treeData.value[0].id]
|
||||
currentNode.data = getLastLevelData(treeData.value)[0]
|
||||
currentNodeId.value = getLastLevelData(treeData.value)[0].id
|
||||
currentNodeName.value = getLastLevelData(treeData.value)[0].label
|
||||
}
|
||||
|
||||
emitChangeBook()
|
||||
})
|
||||
|
||||
}
|
||||
|
||||
const emitChangeBook = () => {
|
||||
let curNode = {
|
||||
id: currentNodeId.value,
|
||||
label: currentNodeName.value,
|
||||
itemtitle: currentNode.data.itemtitle,
|
||||
edudegree: currentNode.data.edudegree,
|
||||
edustage: currentNode.data.edustage,
|
||||
edusubject: currentNode.data.edusubject,
|
||||
}
|
||||
let parentNode = findParentByChildId(treeData.value, currentNodeId.value)
|
||||
curNode.parentNode = toRaw(parentNode)
|
||||
|
||||
const emitChangeBook = async () => {
|
||||
let curData = cloneDeep(toRaw(curNode.data))
|
||||
let parentNode = findParentByChildId(treeData.value, curData.id)
|
||||
curData.parentNode = toRaw(parentNode)
|
||||
//怎加一个label 之前取的label
|
||||
curData.label = curData.itemtitle
|
||||
const data = {
|
||||
textBook: {
|
||||
curBookId: curBookId.value,
|
||||
curBookName: curBookName.value,
|
||||
curBookImg: curBookImg.value,
|
||||
curBookPath: curBookPath.value
|
||||
curBookId: curBook.data.id,
|
||||
curBookName: curBook.data.itemtitle,
|
||||
curBookImg: BaseUrl + curBook.data.avartar,
|
||||
curBookPath: curBook.data.fileurl
|
||||
},
|
||||
node: curNode
|
||||
node: curData
|
||||
}
|
||||
|
||||
localStorage.setItem('defaultExpandedKeys', JSON.stringify(defaultExpandedKeys.value))
|
||||
localStorage.setItem('currentNodeId', JSON.stringify(currentNodeId.value))
|
||||
/**
|
||||
* 临时用 后续删除 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)
|
||||
}
|
||||
|
||||
|
|
@ -250,135 +170,95 @@ const findParentByChildId = (treeData, targetNodeId) => {
|
|||
return null;
|
||||
}
|
||||
|
||||
const findNode = (id) =>{
|
||||
if(!id) return
|
||||
return evaluationList.value.find( item => item.id == id)
|
||||
}
|
||||
|
||||
const transData = (data) => {
|
||||
let ary = []
|
||||
data.forEach(item => {
|
||||
let obj = {}
|
||||
// 根据当前教材ID 过滤出对应的单元、章节
|
||||
if (item.rootid == curBookId.value) {
|
||||
if(item.level == 1){
|
||||
obj.label = item.itemtitle
|
||||
obj.id = item.id
|
||||
obj.itemtitle = item.itemtitle
|
||||
obj.edudegree = item.edudegree
|
||||
obj.edustage = item.edustage
|
||||
obj.edusubject = item.edusubject
|
||||
let ary2 = []
|
||||
evaluationList.value.forEach(el => {
|
||||
let obj2 = {}
|
||||
if (item.id == el.parentid) {
|
||||
obj2 = {
|
||||
label: el.itemtitle,
|
||||
id: el.id,
|
||||
itemtitle : el.itemtitle,
|
||||
edudegree : el.edudegree,
|
||||
edustage : el.edustage,
|
||||
edusubject : el.edusubject,
|
||||
}
|
||||
ary2.push(obj2)
|
||||
}
|
||||
obj.children = ary2
|
||||
})
|
||||
ary.push(obj)
|
||||
}
|
||||
}
|
||||
})
|
||||
return ary
|
||||
}
|
||||
|
||||
//获取教材
|
||||
const getSubject = async () => {
|
||||
if(localStorage.getItem('subjectList')){
|
||||
subjectList.value = JSON.parse(localStorage.getItem('subjectList'))
|
||||
}
|
||||
else{
|
||||
const { rows } = await listEvaluation({ itemkey: "version", edusubject, edustage, pageSize: 10000,orderby: 'orderidx asc', })
|
||||
|
||||
// subjectList.value = rows.filter(item => item.edustage == edustage && item.edusubject == edusubject)
|
||||
subjectList.value = rows
|
||||
localStorage.setItem('subjectList', JSON.stringify(subjectList.value))
|
||||
}
|
||||
|
||||
// 默认第一个
|
||||
if(!subjectList.value.length) return
|
||||
let curBook = localStorage.getItem('curBook')
|
||||
if(curBook){
|
||||
curBook = JSON.parse(curBook)
|
||||
curBookName.value = curBook.itemtitle
|
||||
curBookId.value = curBook.id
|
||||
curBookImg.value = BaseUrl + curBook.avartar
|
||||
curBookPath.value = curBook.fileurl
|
||||
}
|
||||
else{
|
||||
curBookName.value = subjectList.value[0].itemtitle
|
||||
curBookId.value = subjectList.value[0].id
|
||||
curBookImg.value = BaseUrl + subjectList.value[0].avartar
|
||||
curBookPath.value = subjectList.value[0].fileurl
|
||||
localStorage.setItem('curBookId', curBookId.value)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
const isHaveUnit = (id) => {
|
||||
return evaluationList.value.some(item => {
|
||||
return item.rootid == id
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
const handleNodeClick = (data, node) => {
|
||||
/**
|
||||
* data : 当前节点数据
|
||||
* node : 当前节点对象 包含当前节点所有数据 parent属性 指向父节点Node对象
|
||||
*/
|
||||
|
||||
const nodeData = data;
|
||||
let nodeData = cloneDeep(toRaw(data));
|
||||
//怎加一个label 之前取的label
|
||||
nodeData.label = nodeData.itemtitle
|
||||
const parentNode = node.parent.data;
|
||||
|
||||
// parentNode 为数组 则点击的是一级节点
|
||||
if (Array.isArray(parentNode)) {
|
||||
//
|
||||
nodeData.parentNode = null
|
||||
}
|
||||
else {
|
||||
nodeData.parentNode = parentNode
|
||||
// 否则 点击的为二级节点 parentNode 为它的父级节点
|
||||
nodeData.parentNode = toRaw(parentNode)
|
||||
}
|
||||
|
||||
let curData = {
|
||||
textBook: {
|
||||
curBookId: curBookId.value,
|
||||
curBookName: curBookName.value,
|
||||
curBookImg: curBookImg.value,
|
||||
curBookPath: curBookPath.value
|
||||
curBookId: curBook.data.id,
|
||||
curBookName: curBook.data.itemtitle,
|
||||
curBookImg: BaseUrl + curBook.data.avartar,
|
||||
curBookPath: curBook.data.fileurl
|
||||
},
|
||||
node: toRaw(nodeData)
|
||||
}
|
||||
currentNode.data = curData
|
||||
localStorage.setItem('defaultExpandedKeys', parentNode ? JSON.stringify([parentNode.id]) : JSON.stringify([data.id]))
|
||||
localStorage.setItem('curNode', JSON.stringify(nodeData))
|
||||
|
||||
localStorage.setItem('defaultExpandedKeys', nodeData.parentNode ? JSON.stringify([parentNode.id]) : JSON.stringify([data.id]))
|
||||
localStorage.setItem('currentNodeId', JSON.stringify(data.id))
|
||||
//#region 保存当前章节单元节点信息
|
||||
let levelSecondId = curData.node.id
|
||||
let levelFirstId
|
||||
if (curData.node.parentNode) {
|
||||
levelFirstId = curData.node.parentNode.id
|
||||
/**
|
||||
* 临时用 后续删除 unitId
|
||||
*/
|
||||
let levelFirstId = null
|
||||
let levelSecondId = null
|
||||
let bookeId = curBook.data.id
|
||||
if (nodeData.parentNode) {
|
||||
levelFirstId = nodeData.parentNode.id
|
||||
levelSecondId = nodeData.id
|
||||
} else {
|
||||
levelFirstId = curData.node.id
|
||||
levelFirstId = nodeData.id
|
||||
levelSecondId = ''
|
||||
}
|
||||
console.log('levelFirstId---', levelFirstId)
|
||||
console.log('levelSecondId---', levelSecondId)
|
||||
localStorage.setItem('unitId', JSON.stringify({ levelFirstId, levelSecondId}))
|
||||
//#endregion
|
||||
localStorage.setItem('unitId', JSON.stringify({ levelFirstId, levelSecondId, bookeId}))
|
||||
|
||||
emit('nodeClick', curData)
|
||||
|
||||
}
|
||||
onMounted(() => {
|
||||
getSubjectContent()
|
||||
onMounted( async () => {
|
||||
treeLoading.value = true
|
||||
|
||||
try{
|
||||
useSubject = await useGetSubject()
|
||||
subjectList.value = useSubject.subjectList
|
||||
|
||||
let book = localStorage.getItem('curBook')
|
||||
if(book){
|
||||
book = JSON.parse(book)
|
||||
curBook.data = book
|
||||
treeData.value = useSubject.getTreeData(book.id)
|
||||
}
|
||||
else{
|
||||
curBook.data = useSubject.subjectList[0]
|
||||
treeData.value = useSubject.treeData
|
||||
}
|
||||
// 设置展开并选中
|
||||
nextTick(() =>{
|
||||
// 取缓存
|
||||
let node = localStorage.getItem('curNode')
|
||||
if(node){
|
||||
curNode.data = JSON.parse(node)
|
||||
defaultExpandedKeys.value = JSON.parse(localStorage.getItem('defaultExpandedKeys'))
|
||||
}
|
||||
else{
|
||||
defaultExpandedKeys.value = [treeData.value[0].id]
|
||||
curNode.data = getLastLevelData(treeData.value)[0]
|
||||
//缓存记录当前展开以及选中节点
|
||||
localStorage.setItem('defaultExpandedKeys', JSON.stringify(defaultExpandedKeys.value))
|
||||
localStorage.setItem('curNode', JSON.stringify(curNode.data))
|
||||
}
|
||||
emitChangeBook()
|
||||
})
|
||||
|
||||
} finally{
|
||||
treeLoading.value = false
|
||||
}
|
||||
|
||||
})
|
||||
|
||||
</script>
|
||||
|
|
|
|||
|
|
@ -137,7 +137,7 @@ const getSubjectContent = async () => {
|
|||
}
|
||||
|
||||
const getSubject = async () => {
|
||||
subjectList.value = JSON.parse(localStorage.getItem('subjectList'))
|
||||
|
||||
|
||||
if (localStorage.getItem('subjectList')) {
|
||||
subjectList.value = JSON.parse(localStorage.getItem('subjectList'))
|
||||
|
|
|
|||
|
|
@ -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: {
|
||||
|
|
|
|||
|
|
@ -0,0 +1,82 @@
|
|||
import { ref } from 'vue'
|
||||
import useUserStore from '@/store/modules/user'
|
||||
import { listEvaluation } from '@/api/subject'
|
||||
|
||||
export const useGetSubject = async () =>{
|
||||
|
||||
// user store
|
||||
const userStore = useUserStore()
|
||||
const { edustage, edusubject, userId } = userStore.user
|
||||
const BaseUrl = import.meta.env.VITE_APP_BUILD_BASE_PATH
|
||||
// 章节List
|
||||
const unitList = ref([])
|
||||
// 教材List
|
||||
let subjectList = null
|
||||
// 单元章节树结构
|
||||
let treeData = null
|
||||
|
||||
|
||||
// 根据 学科 + 学段 获取所有单元章节
|
||||
const getSubjectUnit = async () =>{
|
||||
let strUnit = localStorage.getItem('unitList')
|
||||
if(strUnit){
|
||||
unitList.value = JSON.parse(strUnit)
|
||||
}
|
||||
else{
|
||||
const unitParams = {
|
||||
edusubject,
|
||||
edustage,
|
||||
itemgroup: 'textbook',
|
||||
orderby: 'orderidx asc',
|
||||
pageSize: 10000
|
||||
}
|
||||
const { rows } = await listEvaluation(unitParams)
|
||||
unitList.value = rows
|
||||
localStorage.setItem('unitList', JSON.stringify(rows))
|
||||
}
|
||||
|
||||
await getSubject()
|
||||
}
|
||||
|
||||
// 获取 学科 + 学段 获取教材
|
||||
const getSubject = async () =>{
|
||||
|
||||
let strSubject = localStorage.getItem('subjectList')
|
||||
if(strSubject){
|
||||
subjectList = JSON.parse(strSubject)
|
||||
}
|
||||
else{
|
||||
const subjectParams = {
|
||||
itemkey: "version",
|
||||
edusubject,
|
||||
edustage,
|
||||
pageSize: 10000,
|
||||
orderby: 'orderidx asc'
|
||||
}
|
||||
const { rows } = await listEvaluation(subjectParams)
|
||||
subjectList = rows
|
||||
localStorage.setItem('subjectList', JSON.stringify(rows))
|
||||
}
|
||||
|
||||
// 默认选中第一个教材
|
||||
if(subjectList && subjectList.length){
|
||||
treeData = getTreeData(subjectList[0].id)
|
||||
}
|
||||
}
|
||||
|
||||
// 单元章节数据转为“树”结构
|
||||
const getTreeData = (bookId) =>{
|
||||
// 根据当前教材的id 查找出对应的章节
|
||||
let data = unitList.value.filter(item => item.rootid == bookId && item.level == 1)
|
||||
data.forEach( item => {
|
||||
item.children = unitList.value.filter( item2 => item2.parentid == item.id && item2.level == 2)
|
||||
})
|
||||
return data
|
||||
|
||||
}
|
||||
|
||||
await getSubjectUnit()
|
||||
|
||||
return { subjectList, treeData, getTreeData }
|
||||
|
||||
}
|
||||
|
|
@ -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">
|
||||
|
|
@ -37,7 +37,7 @@
|
|||
<div class="user-info flex">
|
||||
<span class="user-name">{{ userStore.user.nickName }}</span>
|
||||
<div class="flex">
|
||||
<div class="user-depname">{{ userStore.user.deptName }}</div>
|
||||
|
||||
<el-dropdown @command="changeSubject">
|
||||
<div class="user-subject">{{ userStore.user.edusubject }}
|
||||
<el-icon class="el-icon--right"><arrow-down />
|
||||
|
|
@ -52,6 +52,7 @@
|
|||
</template>
|
||||
</el-dropdown>
|
||||
</div>
|
||||
<div class="user-depname">{{ userStore.user.deptName }}</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
|
@ -72,7 +73,8 @@ import { updateUserInfo } from '@/api/system/user'
|
|||
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()
|
||||
|
|
@ -190,6 +192,7 @@ function setLayout() {
|
|||
}
|
||||
// 切换学科
|
||||
const changeSubject = async (command) =>{
|
||||
clearBookInfo()
|
||||
const { userId, userName, phonenumber, plainpwd } = userStore.user
|
||||
const data = {
|
||||
userId,
|
||||
|
|
@ -200,8 +203,6 @@ const changeSubject = async (command) =>{
|
|||
await updateUserInfo(data)
|
||||
await userStore.login({username: phonenumber, password: plainpwd})
|
||||
await userStore.getInfo()
|
||||
localStorage.removeItem('subjectList')
|
||||
localStorage.removeItem('evaluationList')
|
||||
router.go()
|
||||
}
|
||||
|
||||
|
|
@ -331,7 +332,7 @@ onMounted(() => {
|
|||
justify-content: space-around;
|
||||
|
||||
.user-depname {
|
||||
margin-right: 5px;
|
||||
margin-right: 0;
|
||||
}
|
||||
|
||||
.user-subject {
|
||||
|
|
@ -351,8 +352,8 @@ onMounted(() => {
|
|||
align-items: center;
|
||||
|
||||
.user-avatar {
|
||||
width: 35px;
|
||||
height: 35px;
|
||||
width: 45px;
|
||||
height: 45px;
|
||||
border-radius: 10px;
|
||||
margin-right: 10px;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -61,7 +61,7 @@ function stateSyncWatch(storeName, newState) {
|
|||
// console.log('state-change-diffData', diffData)
|
||||
try {
|
||||
for(const key in diffData) {
|
||||
const value = diffData[key]
|
||||
const value = diffData[key] || null
|
||||
const newValue = {} // 重新组装pinia需要的数据 {a:{b:1}} 这种
|
||||
const keyArr = key.split('.') || []
|
||||
keyArr.reduce((o,c,i)=>{o[c] = i === keyArr.length-1 ? value : {};return o[c]}, newValue)
|
||||
|
|
@ -172,6 +172,8 @@ const getObjValue = (obj, key) => {
|
|||
const findDifferences = (obj1, obj2) => {
|
||||
const differences = {};
|
||||
function compareObjects(o1, o2, path = '') {
|
||||
if (o1 == null) return
|
||||
if (o2 == null) return
|
||||
for (const key in o1) {
|
||||
if (o1.hasOwnProperty(key)) {
|
||||
const newPath = path ? `${path}.${key}` : key;
|
||||
|
|
|
|||
|
|
@ -257,3 +257,17 @@ export const getFileName = (filename) => {
|
|||
if(!filename) return
|
||||
return filename.replace(/\.[^/.]+$/, "");
|
||||
}
|
||||
|
||||
// 清除当前选中的教材 章节 相关信息
|
||||
export const clearBookInfo = () =>{
|
||||
//当前选中的教材
|
||||
localStorage.removeItem('curBook')
|
||||
// 当前选中的节点
|
||||
localStorage.removeItem('curNode')
|
||||
// 所有章节单元数据
|
||||
localStorage.removeItem('unitList')
|
||||
// 所有教材数据
|
||||
localStorage.removeItem('subjectList')
|
||||
// 展开的节点
|
||||
localStorage.removeItem('defaultExpandedKeys')
|
||||
}
|
||||
|
|
@ -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">
|
||||
|
|
|
|||
|
|
@ -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',
|
||||
})
|
||||
|
|
|
|||
|
|
@ -302,7 +302,7 @@ const entpCourseWorkTypeList = ref([
|
|||
{value: 5, label: "主观题"},
|
||||
{value: 6, label: "复合题"},
|
||||
]); // 习题查询条件 - 题型
|
||||
|
||||
|
||||
const entpCourseWorkGroupList = ref([{
|
||||
Key: -1,
|
||||
Value: '不限',
|
||||
|
|
@ -380,7 +380,7 @@ const queryForm = reactive({
|
|||
sectionName: props.bookobj.coursetitle,
|
||||
edusubject: userStore.edusubject,
|
||||
edustage: userStore.edustage,
|
||||
//
|
||||
//
|
||||
// 题类
|
||||
worktype: entpCourseWorkQueryParams.worktype.label,
|
||||
workTypeId: entpCourseWorkQueryParams.worktype.value,
|
||||
|
|
@ -886,8 +886,8 @@ watch(() => props.bookobj.levelSecondId, (newVal) => {
|
|||
overflow: hidden;
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
</style>
|
||||
|
|
|
|||
|
|
@ -2,9 +2,9 @@
|
|||
<div class="desktop-work-item">
|
||||
<div class="item-title flex">
|
||||
<span class="title">工作动态</span>
|
||||
<el-radio-group v-model="type">
|
||||
<!-- <el-radio-group v-model="type">
|
||||
<el-radio-button label="全部" :value="-1" />
|
||||
</el-radio-group>
|
||||
</el-radio-group> -->
|
||||
</div>
|
||||
<div class="item-content" v-loading="loading">
|
||||
<el-scrollbar height="500px">
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
@ -37,12 +37,14 @@
|
|||
<el-form-item label="确认密码" prop="confirmPassword" v-if="activeIndex==1">
|
||||
<el-input v-model="ruleForm.confirmPassword" type="password" placeholder="请确认密码" />
|
||||
</el-form-item>
|
||||
<el-form-item label="所属地区" prop="address" v-if="activeIndex==2">
|
||||
<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">
|
||||
|
|
@ -60,7 +62,7 @@
|
|||
<el-form-item label="学科" prop="discipline" v-if="activeIndex==2">
|
||||
<div v-for="item in schoolSubject" style="display: flex;">
|
||||
<span style="width:50px">{{ item.name }}：</span>
|
||||
<el-checkbox-group style="width:100%" v-model="ruleForm.discipline">
|
||||
<el-checkbox-group style="width:100%" v-model="ruleForm.discipline">
|
||||
<el-checkbox style="margin-right:10px" v-for="el in item.children" :key="el.id" :label="el.itemtitle" :value="el" />
|
||||
</el-checkbox-group>
|
||||
</div>
|
||||
|
|
@ -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>
|
||||
|
|
@ -104,7 +107,7 @@
|
|||
</template> -->
|
||||
</el-dialog>
|
||||
</el-dialog>
|
||||
|
||||
|
||||
</template>
|
||||
|
||||
<script setup>
|
||||
|
|
@ -211,18 +214,12 @@ const rules = reactive({
|
|||
message: '请选择地址',
|
||||
trigger: 'change',
|
||||
},],
|
||||
class:[ {
|
||||
type:'array',
|
||||
required: true,
|
||||
message: '请选择班级',
|
||||
trigger: 'change',
|
||||
},],
|
||||
discipline:[ {
|
||||
type: 'array',
|
||||
required: true,
|
||||
message: '请选择学科',
|
||||
trigger: 'change',
|
||||
},]
|
||||
},]
|
||||
})
|
||||
const dialogVisible = ref(false)
|
||||
|
||||
|
|
@ -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) => {
|
||||
|
|
@ -415,46 +412,53 @@ const sbmitImg=()=>{
|
|||
ruleForm.Code=res.data
|
||||
isImg.value=false
|
||||
}
|
||||
|
||||
|
||||
})
|
||||
}else{
|
||||
ElMessage.error('请根据图片输入验证码')
|
||||
}
|
||||
//
|
||||
//
|
||||
}
|
||||
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(',')
|
||||
let ary = []
|
||||
studying.forEach(item =>{
|
||||
let obj = {
|
||||
name: item,
|
||||
children: []
|
||||
if(res.data.studying && res.data.studying.length){
|
||||
let studying = res.data.studying.split(',')
|
||||
let ary = []
|
||||
studying.forEach(item =>{
|
||||
let obj = {
|
||||
name: item,
|
||||
children: []
|
||||
}
|
||||
allSubjectList.value.forEach(el =>{
|
||||
if(item == el.edustage){
|
||||
obj.children.push(el)
|
||||
}
|
||||
allSubjectList.value.forEach(el =>{
|
||||
if(item == el.edustage){
|
||||
obj.children.push(el)
|
||||
}
|
||||
})
|
||||
ary.push(obj)
|
||||
})
|
||||
schoolSubject.value = ary
|
||||
}
|
||||
else{
|
||||
schoolSubject.value = []
|
||||
}
|
||||
})
|
||||
listClassmain( {entpid: ruleForm.school[2], pageSize: 500, status: 'open'}).then(res=>{
|
||||
gradeTree.value = groupByCondition(res.rows, item => item.agekey);
|
||||
console.log(gradeTree.value,'班级')
|
||||
ary.push(obj)
|
||||
})
|
||||
schoolSubject.value = ary
|
||||
}
|
||||
else{
|
||||
schoolSubject.value = []
|
||||
}
|
||||
})
|
||||
|
||||
}
|
||||
// 获取班级
|
||||
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);
|
||||
}
|
||||
//将所有班级筛选成二级的数组
|
||||
const groupByCondition = (arr, condition)=>{
|
||||
|
|
@ -490,8 +494,11 @@ 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>
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
@ -25,7 +25,7 @@
|
|||
<el-checkbox v-model="loginForm.rememberMe" >记住密码</el-checkbox>
|
||||
<!-- <el-checkbox >阅读并同意《xxx》</el-checkbox> -->
|
||||
</div>
|
||||
|
||||
|
||||
<el-form-item>
|
||||
<el-button :loading="btnLoading" class="btn" type="primary" @click="submitForm(formRef)"
|
||||
>登录</el-button
|
||||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -89,6 +89,8 @@ const userStore = useUserStore()
|
|||
const visible = ref(false) // 是否打开窗口
|
||||
const myClassActive = ref({}) // 我的课件：准备上课的APT课件
|
||||
const imChatRef = ref(null) // im-chat ref
|
||||
const emit = defineEmits(['close'])
|
||||
|
||||
const classForm = reactive({ // 班级(左侧)：表单数据 表单配置
|
||||
form: {}, itemOption: [], option: {}
|
||||
})
|
||||
|
|
@ -137,6 +139,7 @@ const handleClose = async () => {
|
|||
reset() // 重置数据
|
||||
await chat?.logout()
|
||||
chat = null
|
||||
emit('close')
|
||||
}
|
||||
// 初始化-数据
|
||||
const initData = () => {
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
<template>
|
||||
<div class="file-oper-batch-wrap">
|
||||
<div style="margin: 0 20px; line-height: 40px">
|
||||
<div style="line-height: 40px">
|
||||
<el-checkbox
|
||||
v-model="isCheckAll"
|
||||
:indeterminate="indeterminate"
|
||||
|
|
@ -15,7 +15,7 @@
|
|||
</template>
|
||||
<script>
|
||||
import { deleteSmarttalkBatch } from '@/api/file'
|
||||
import { ElMessage, ElMessageBox } from 'element-plus'
|
||||
import { ElMessage } from 'element-plus'
|
||||
import { exportFile } from '@/utils/talkFile'
|
||||
export default {
|
||||
name: 'FileOperBatch',
|
||||
|
|
|
|||
|
|
@ -52,8 +52,8 @@
|
|||
</div>
|
||||
</div>
|
||||
<div class="prepare-body-main-item-btn">
|
||||
<el-button v-if="activeClassId==item.id" type="success" @click="clickStartClass(item)">上课中</el-button>
|
||||
<el-button v-else type="primary" @click="clickStartClass(item)">上课</el-button>
|
||||
<!-- <el-button v-if="activeClassId==item.id" type="success" @click="clickStartClass(item)">上课中</el-button> -->
|
||||
<el-button type="primary" @click="clickStartClass(item)">上课</el-button>
|
||||
</div>
|
||||
<div class="prepare-body-main-item-tool">
|
||||
<el-popover
|
||||
|
|
@ -74,7 +74,7 @@
|
|||
</el-button>
|
||||
</div>
|
||||
<div class="item-popover-item">
|
||||
<el-button text @click="deleteTalk(item)" :disabled="activeClassId==item.id">
|
||||
<el-button text @click="deleteTalk(item)">
|
||||
<i class="iconfont icon-shanchu"></i>
|
||||
<span>删除</span>
|
||||
</el-button>
|
||||
|
|
@ -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('//', '/')
|
||||
|
|
|
|||
|
|
@ -86,7 +86,7 @@ import useUserStore from '@/store/modules/user'
|
|||
import { ElMessage } from 'element-plus'
|
||||
import { getCurrentTime, getAfterMinutes } from '@/utils/date'
|
||||
|
||||
const emit = defineEmits(['addSuccess'])
|
||||
const emit = defineEmits(['addSuccess','close'])
|
||||
const props = defineProps({
|
||||
bookId: {
|
||||
type: Number,
|
||||
|
|
@ -115,7 +115,7 @@ const updateForm = ref({})
|
|||
watch(
|
||||
() => props.currentNode,
|
||||
(newValue, oldValue) => {
|
||||
form.name = newValue.label
|
||||
form.name = newValue.itemtitle
|
||||
}
|
||||
)
|
||||
const ruleForm = reactive({
|
||||
|
|
@ -216,7 +216,9 @@ const openDialog = (data) => {
|
|||
const closeDialog = () => {
|
||||
ruleFormDialog.value.resetFields()
|
||||
centerDialogVisible.value = false
|
||||
form.name = props.currentNode.label
|
||||
form.name = props.currentNode.itemtitle
|
||||
emit('close')
|
||||
|
||||
}
|
||||
const classList = ref([])
|
||||
onMounted(() => {
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@
|
|||
:key="index"
|
||||
:item="item"
|
||||
:index="index"
|
||||
:activeClassId="activeClass?.id"
|
||||
:curNode="currentNode"
|
||||
@on-delete="deleteTalk"
|
||||
@on-start-class="startClass"
|
||||
>
|
||||
|
|
@ -69,7 +69,7 @@
|
|||
<el-tab-pane label="素材" name="素材">
|
||||
<div class="prepare-body-header">
|
||||
<div>
|
||||
<label style="font-size: 15px">共{{ currentFileList.length }}个文件</label>
|
||||
<label style="font-size: 15px">共{{ currentFileList.filter(ite=>ite.fileFlag!=='apt'&&ite.fileFlag!=='课件').length }}个文件</label>
|
||||
<el-popover placement="top-start" :width="250" trigger="hover">
|
||||
<template #default>
|
||||
<div>
|
||||
|
|
@ -116,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>
|
||||
<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"
|
||||
|
|
@ -141,7 +141,7 @@
|
|||
</div>
|
||||
<file-oper-batch
|
||||
v-show="checkFileList.length > 0"
|
||||
:indeterminate="checkFileList.length > 0 && checkFileList.length < currentFileList.length"
|
||||
:indeterminate="checkFileList.length > 0 && checkFileList.length < currentSCFileList.length"
|
||||
:choose="checkFileList"
|
||||
:check-all="isCheckAll"
|
||||
@click-delete="clickDelete"
|
||||
|
|
@ -159,9 +159,10 @@
|
|||
:current-node="currentNode"
|
||||
:book-id="uploadData.textbookId"
|
||||
@add-success="initReserv"
|
||||
@close="closeChange"
|
||||
></reserv>
|
||||
<!-- 上课配置 -->
|
||||
<class-start ref="calssRef"/>
|
||||
<class-start ref="calssRef" @close="closeChange"/>
|
||||
</template>
|
||||
<script setup>
|
||||
import { Check,Plus } from '@element-plus/icons-vue'
|
||||
|
|
@ -255,7 +256,7 @@ export default {
|
|||
computed: {
|
||||
isCheckAll() {
|
||||
return (
|
||||
this.checkFileList.length > 0 && this.checkFileList.length === this.currentFileList.length
|
||||
this.checkFileList.length > 0 && this.checkFileList.length === this.currentSCFileList.length
|
||||
)
|
||||
},
|
||||
currentKJFileList() {
|
||||
|
|
@ -305,10 +306,10 @@ export default {
|
|||
methods: {
|
||||
startClass(item) {
|
||||
// console.log(item, sessionStore)
|
||||
// 关闭状态，打开上课相关功能(已打开，忽略)
|
||||
const id = sessionStore.has('activeClass.id') ? sessionStore.get('activeClass.id') : null
|
||||
if (id && id == item.id) return ElMessage.warning('当前正在上课，请勿重复操作')
|
||||
if(item.fileFlag === '课件') {
|
||||
// 关闭状态，打开上课相关功能(已打开，忽略)
|
||||
const id = sessionStore.has('activeClass.id') ? sessionStore.get('activeClass.id') : null
|
||||
if (id && id == item.id) return ElMessage.warning('当前正在上课，请勿重复操作')
|
||||
this.openReserv()
|
||||
}
|
||||
if(item.fileFlag === 'apt') {
|
||||
|
|
@ -319,6 +320,11 @@ export default {
|
|||
sessionStore.set('activeClass', item)
|
||||
this.activeClass = item
|
||||
},
|
||||
closeChange() { // 上课弹窗被关闭-触发
|
||||
console.log('关闭上课弹窗')
|
||||
this.activeClass = null
|
||||
sessionStore.delete('activeClass')
|
||||
},
|
||||
initReserv(id) {
|
||||
getClassInfo(id).then((res) => {
|
||||
this.curClassReserv = res.data
|
||||
|
|
@ -363,7 +369,7 @@ export default {
|
|||
this.downloadNum = num
|
||||
},
|
||||
createFile() {
|
||||
creatPPT(this.currentNode.label + '.pptx', this.uploadData).then((res) => {
|
||||
creatPPT(this.currentNode.itemtitle + '.pptx', this.uploadData).then((res) => {
|
||||
this.currentFileList.unshift(res.resData)
|
||||
})
|
||||
},
|
||||
|
|
@ -443,7 +449,7 @@ export default {
|
|||
creatAPT({
|
||||
...this.uploadData,
|
||||
fileId: slideid,
|
||||
fileShowName: this.currentNode.label + '.apt'
|
||||
fileShowName: this.currentNode.itemtitle + '.apt'
|
||||
}).then((res) => {
|
||||
this.currentFileList.unshift(res.resData)
|
||||
})
|
||||
|
|
@ -660,7 +666,7 @@ export default {
|
|||
'/tool/sphere?entpcourseid=' +
|
||||
this.entpcourseid +
|
||||
'&label=' +
|
||||
this.currentNode.label +
|
||||
this.currentNode.itemtitle +
|
||||
'&reservId=' +
|
||||
id
|
||||
})
|
||||
|
|
|
|||
|
|
@ -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">
|
||||
|
|
|
|||
|
|
@ -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,9 +42,11 @@
|
|||
<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'
|
||||
import { clearBookInfo } from '@/utils/ruoyi'
|
||||
|
||||
const props = defineProps({
|
||||
user: {
|
||||
|
|
@ -59,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' }],
|
||||
|
|
@ -137,8 +148,7 @@ function submit() {
|
|||
userStore.login({username:props.user.userName,password:props.user.plainpwd}).then(() => {
|
||||
userStore.getInfo().then(res => {
|
||||
if(res.code === 200){
|
||||
localStorage.removeItem('subjectList')
|
||||
localStorage.removeItem('evaluationList')
|
||||
clearBookInfo()
|
||||
ElMessage.success('修改成功')
|
||||
}else{
|
||||
ElMessage.error(response.msg)
|
||||
|
|
@ -159,5 +169,6 @@ const semeterChange = (item) => {
|
|||
}
|
||||
onMounted(() => {
|
||||
getSubject()
|
||||
getTheSection()
|
||||
})
|
||||
</script>
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@ const curBookId = ref('')
|
|||
const evaluationList = ref([])
|
||||
|
||||
const getTreeData = () => {
|
||||
evaluationList.value = JSON.parse(localStorage.getItem('evaluationList'))
|
||||
evaluationList.value = JSON.parse(localStorage.getItem('unitList'))
|
||||
|
||||
//上册
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -16,8 +16,7 @@
|
|||
<div class="tool-bottom-all"
|
||||
@mouseenter="mouseChange(0)" @mouseleave="mouseChange(1)">
|
||||
<div v-drag="{handle:'.tool-bottom-all', dragtime}"
|
||||
@v-drag-start="dragtime = Date.now()"
|
||||
@v-drag-end="mouseChange(1)">
|
||||
@v-drag-start="dragtime = Date.now()">
|
||||
<div class="c-logo" @click="logoHandle" title="拖动 | 折叠 | 展开">
|
||||
<el-image :src="logo" draggable="false" />
|
||||
</div>
|
||||
|
|
|
|||
Loading…
Reference in New Issue