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 

# Conflicts:
#	src/renderer/src/views/desktop/container/work-trend.vue
This commit is contained in:
zdg 2024-09-14 17:32:04 +08:00
parent f615efbd88 a67f801356
commit 67d7395c47
25 changed files with 970 additions and 404 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "aix-win", "name": "aix-win",
"version": "1.2.2", "version": "1.2.3",
"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",
@ -29,6 +29,7 @@
"@vue-office/excel": "^1.7.11", "@vue-office/excel": "^1.7.11",
"@vue-office/pdf": "^2.0.2", "@vue-office/pdf": "^2.0.2",
"@vueuse/core": "^10.11.0", "@vueuse/core": "^10.11.0",
"circular-json": "^0.5.9",
"cropperjs": "^1.6.2", "cropperjs": "^1.6.2",
"crypto-js": "^4.2.0", "crypto-js": "^4.2.0",
"echarts": "^5.5.1", "echarts": "^5.5.1",

2
src/main/file.js
View File

@ -224,7 +224,7 @@ export default async function ({ app, shell, BrowserWindow, ipcMain }) {
formData.append(key, uploadData[key]) formData.append(key, uploadData[key])
} }
} }
formData.append('fileFlag', '教案') formData.append('fileFlag', '课件')
uploadFileByFS({ uploadFileByFS({
url: uploadUrl, url: uploadUrl,
path, path,

6
src/main/index.js
View File

@ -68,7 +68,7 @@ function createLoginWindow() {
function createMainWindow() { function createMainWindow() {
mainWindow = new BrowserWindow({ mainWindow = new BrowserWindow({
width: 1200, width: 1200,
minWidth: 1200, minWidth: 1350,
height: 700, height: 700,
show: false, show: false,
frame: false, // 无边框 frame: false, // 无边框
@ -142,9 +142,9 @@ async function createLinkWin(data) {
.catch((error) => {}) .catch((error) => {})
data.fullPath = data.fullPath.replaceAll('//', '/') data.fullPath = data.fullPath.replaceAll('//', '/')
if (data.fullPath.indexOf('?') !== -1) { if (data.fullPath.indexOf('?') !== -1) {
data.fullPath += '&urlSource=smarttalk' data.fullPath += '&urlSource=smarttalk&t' + Date.now()
}else { }else {
data.fullPath += '?urlSource=smarttalk' data.fullPath += '?urlSource=smarttalk&t' + Date.now()
} }
linkWin[data.key].loadURL(data.fullPath) linkWin[data.key].loadURL(data.fullPath)

2
src/renderer/src/components/ai-chart/container/text.vue
View File

@ -16,7 +16,7 @@ import { ref, onMounted, nextTick } from 'vue'
default: 50, // 默认每字符间隔100毫秒 default: 50, // 默认每字符间隔100毫秒
}, },
}) })
const emit = defineEmits(['loaded']) const emit = defineEmits(['loaded', 'onSuccess'])
const displayedText = ref('') const displayedText = ref('')

12
src/renderer/src/components/ai-chart/index.vue
View File

@ -65,7 +65,7 @@
</template> </template>
<script setup> <script setup>
import { ref, onMounted } from 'vue' import { ref, onMounted, watch } from 'vue'
import useUserStore from '@/store/modules/user' import useUserStore from '@/store/modules/user'
import outLink from '@/utils/linkConfig' import outLink from '@/utils/linkConfig'
import Answer from './container/text.vue' import Answer from './container/text.vue'
@ -200,12 +200,16 @@ const closeChart = () =>{
isOpen.value = false isOpen.value = false
} }
watch(isOpen, (newVal)=>{
if(newVal){
if (!conversation_id) {
getChartId();
}
}
})
onMounted(() => { onMounted(() => {
conversation_id = localStorage.getItem("conversation_id"); conversation_id = localStorage.getItem("conversation_id");
if (!conversation_id) {
getChartId();
}
}) })
</script> </script>

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

@ -104,11 +104,16 @@ const getSubjectContent = async () => {
pageSize: 10000 pageSize: 10000
} }
let data;
const { rows } = await listEvaluation(params) if(localStorage.getItem('evaluationList')){
localStorage.setItem('evaluationList', JSON.stringify(rows)) evaluationList.value = JSON.parse(localStorage.getItem('evaluationList'))
evaluationList.value = rows }
data = rows else{
const { rows } = await listEvaluation(params)
localStorage.setItem('evaluationList', JSON.stringify(rows))
evaluationList.value = rows
}
treeLoading.value = false treeLoading.value = false
//获取教材版本 //获取教材版本
@ -263,12 +268,16 @@ const transData = (data) => {
//获取教材 //获取教材
const getSubject = async () => { 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', })
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
// subjectList.value = rows.filter(item => item.edustage == edustage && item.edusubject == edusubject) localStorage.setItem('subjectList', JSON.stringify(subjectList.value))
subjectList.value = rows }
localStorage.setItem('subjectList', JSON.stringify(subjectList.value))
// 默认第一个 // 默认第一个
if(!subjectList.value.length) return if(!subjectList.value.length) return

2
src/renderer/src/components/file-image/index.vue
View File

@ -34,7 +34,7 @@ const getFileTypeIcon = () => {
gif: 'icon-gif', gif: 'icon-gif',
txt: 'icon-txt', txt: 'icon-txt',
rar: 'icon-rar', rar: 'icon-rar',
apt: 'icon-lunwen'
} }
if (iconObj[name]) { if (iconObj[name]) {
return '#' + iconObj[name] return '#' + iconObj[name]

17
src/renderer/src/components/upload-dialog/index.vue
View File

@ -49,7 +49,6 @@
import { ref, watch } from 'vue' import { ref, watch } from 'vue'
import FileImage from '@/components/file-image/index.vue' import FileImage from '@/components/file-image/index.vue'
import { ElMessage } from 'element-plus' import { ElMessage } from 'element-plus'
import { resourceType } from '@/utils/resourceDict'
import { getFileSuffix, getFileName } from '@/utils/ruoyi' import { getFileSuffix, getFileName } from '@/utils/ruoyi'
const props = defineProps({ const props = defineProps({
@ -58,6 +57,22 @@ const props = defineProps({
default: false default: false
}, },
}) })
const resourceType = ref([
{
label: '素材',
value: '素材'
},
{
label: '课件',
value: '课件'
},
{
label: '教案',
value: '教案'
}
])
const dialogValue = ref(false) const dialogValue = ref(false)
const limit = ref(5) const limit = ref(5)
// 定义要发送的emit事件 // 定义要发送的emit事件

2
src/renderer/src/layout/components/AppMain.vue
View File

@ -9,7 +9,7 @@
</div> </div>
</div> --> </div> -->
<transition mode="out-in" name="fade-transform"> <transition mode="out-in" name="fade-transform">
<div v-show="$route != null" style="height: 100%; flex: 1"> <div v-show="$route != null" style="height: 100%; flex: 1;width: 100%">
<router-view v-slot="{ Component, route }"> <router-view v-slot="{ Component, route }">
<keep-alive> <keep-alive>
<component :is="Component" v-if="route.meta.keepAlive" :key="route.name" /> <component :is="Component" v-if="route.meta.keepAlive" :key="route.name" />

6
src/renderer/src/plugins/shareStore.js
View File

@ -4,6 +4,7 @@
const isNode = typeof require !== 'undefined' // 是否支持node函数 const isNode = typeof require !== 'undefined' // 是否支持node函数
const { ipcRenderer } = isNode?require('electron'):{} // app使用 const { ipcRenderer } = isNode?require('electron'):{} // app使用
import { sessionStore } from '@/utils/store' import { sessionStore } from '@/utils/store'
import CircularJSON from 'circular-json'
// import { diff } from 'jsondiffpatch' // import { diff } from 'jsondiffpatch'
// const Remote = isNode?require('@electron/remote'):{} // 远程模块 // const Remote = isNode?require('@electron/remote'):{} // 远程模块
@ -173,6 +174,7 @@ const findDifferences = (obj1, obj2) => {
for (const key in o1) { for (const key in o1) {
if (o1.hasOwnProperty(key)) { if (o1.hasOwnProperty(key)) {
const newPath = path ? `${path}.${key}` : key; const newPath = path ? `${path}.${key}` : key;
if(!o2) return
if (o2.hasOwnProperty(key)) { if (o2.hasOwnProperty(key)) {
const v1 = toJsonStr(o1[key]) const v1 = toJsonStr(o1[key])
const v2 = toJsonStr(o2[key]) const v2 = toJsonStr(o2[key])
@ -202,6 +204,6 @@ const findDifferences = (obj1, obj2) => {
return differences; return differences;
} }
// 对象克隆 // 对象克隆
const objClone = (obj) => JSON.parse(JSON.stringify(obj)) const objClone = (obj) => JSON.parse(CircularJSON.stringify(obj))
// 转换为json // 转换为json
const toJsonStr = (obj) => JSON.stringify(obj) const toJsonStr = (obj) => CircularJSON.stringify(obj)

3
src/renderer/src/utils/date.js
View File

@ -88,6 +88,9 @@ export const getCurrentTime = (format)=> {
const day = now.getDate().toString().padStart(2, '0'); const day = now.getDate().toString().padStart(2, '0');
const hours = now.getHours().toString().padStart(2, '0'); const hours = now.getHours().toString().padStart(2, '0');
const minutes = now.getMinutes().toString().padStart(2, '0'); const minutes = now.getMinutes().toString().padStart(2, '0');
if(format == 'YYYY-MM-DD HH:mm'){
return `${year}-${month}-${day} ${hours}:${minutes}`;
}
if(format == 'YYYY-MM-DD'){ if(format == 'YYYY-MM-DD'){
return `${year}-${month}-${day}`; return `${year}-${month}-${day}`;
} }

25
src/renderer/src/utils/resourceDict.js
View File

@ -1,14 +1,14 @@
export const tabs = [ export const tabs = [
{ {
label: '平台资源', label: '平台',
value: '平台' value: '平台'
}, },
{ {
label: '校本资源', label: '校本',
value: '校本' value: '校本'
}, },
{ {
label: '第三方资源', label: '第三方',
value: '第三方' value: '第三方'
}, },
] ]
@ -57,18 +57,23 @@ export const resourceFormat = [
// 资源类型 // 资源类型
export const resourceType = [ export const resourceType = [
{ {
label: '素材', label: '课例库',
value: '素材' value: "'apt','课件','教案'"
},
{
label: '作业库',
value: '作业',
disabled: true
}, },
{ {
label: '课件', label: '素材库',
value: '课件' value: "'素材'"
}, },
{ {
label: '教案', label: '习题库',
value: '教案' value: '习题',
disabled: true
} }
] ]
// 年级划分 // 年级划分

8
src/renderer/src/views/classTask/classTask.vue
View File

@ -140,7 +140,7 @@ const getClassWorkList = () => {
edustage: userStore.edustage,// 学段 edustage: userStore.edustage,// 学段
edusubject: userStore.edusubject,//学科 edusubject: userStore.edusubject,//学科
deaddate: tabActive.value === '进行中'? getTomorrow() : EndDate.value,// 进行中：明天，已结束：选择的日期 deaddate: tabActive.value === '进行中'? getTomorrow() : EndDate.value,// 进行中：明天，已结束：选择的日期
orderby: 'uniquekey DESC', orderby: 'concat(deaddate,uniquekey) DESC',
pageSize: 100 pageSize: 100
}).then((response) => { }).then((response) => {
for (var i = 0; i < response.rows.length; i++) { for (var i = 0; i < response.rows.length; i++) {
@ -213,7 +213,8 @@ const getStudentClassWorkData = () => {
edustage: userStore.edustage,// 学段 edustage: userStore.edustage,// 学段
edusubject: userStore.edusubject,//学科 edusubject: userStore.edusubject,//学科
deaddate: tabActive.value === '进行中'? getTomorrow() : EndDate.value,// 进行中：明天，已结束：选择的日期 deaddate: tabActive.value === '进行中'? getTomorrow() : EndDate.value,// 进行中：明天，已结束：选择的日期
orderby: "uniquekey DESC", status: '1', // 作业状态：1-已发布
orderby: "uniquekey DESC",// TODO： 这里是否加 deaddate 的排序，后续看
pageSize: 1000 pageSize: 1000
}).then((res) => { }).then((res) => {
for (var t = 0; t < classWorkList.value.length; t++) { for (var t = 0; t < classWorkList.value.length; t++) {
@ -369,7 +370,8 @@ const getStudentVisible = async () => {
edustage: userStore.edustage,// 学段 edustage: userStore.edustage,// 学段
edusubject: userStore.edusubject,//学科 edusubject: userStore.edusubject,//学科
deaddate: tabActive.value === '进行中'? getTomorrow() : EndDate.value,// 进行中：明天，已结束：选择的日期 deaddate: tabActive.value === '进行中'? getTomorrow() : EndDate.value,// 进行中：明天，已结束：选择的日期
orderby: 'uniquekey DESC', status: '1', // 作业状态：1-已发布
orderby: 'concat(deaddate,uniquekey) DESC',
pageSize: 100 pageSize: 100
}) })
const curWorkList = response.rows const curWorkList = response.rows

183
src/renderer/src/views/classTask/container/item-dialog-score.vue
View File

@ -150,6 +150,7 @@
:min-scale="0.2" :min-scale="0.2"
:preview-src-list="stuItem.imagefile" :preview-src-list="stuItem.imagefile"
:initial-index="4" :initial-index="4"
fit="contain"
/> />
</div> </div>
</el-col> </el-col>
@ -233,6 +234,7 @@
.map((item) => item.url) .map((item) => item.url)
" "
:initial-index="4" :initial-index="4"
fit="contain"
/> />
</div> </div>
</div> </div>
@ -276,6 +278,7 @@
.map((item) => item.url) .map((item) => item.url)
" "
:initial-index="4" :initial-index="4"
fit="contain"
/> />
</div> </div>
</div> </div>
@ -314,102 +317,102 @@
</el-card> </el-card>
</div> </div>
</div> </div>
</div>
<!-- 批改评价与评语 --> <!-- 批改评价与评语 -->
<div class="tacher_conten_foot"> <div class="tacher_conten_foot">
<el-row style="padding: 1% 4%; border: 2px dotted"> <el-row style="padding: 1% 4%; border: 2px dotted">
<el-col :span="24" style="display: flex; flex-direction: column"> <el-col :span="24" style="display: flex; flex-direction: column">
<el-row> <el-row>
<el-col :span="14"> <el-col :span="14">
<div style="display: flex; margin: 10px auto"> <div style="display: flex; margin: 10px auto">
<span style="display: flex; align-items: center"> <span style="display: flex; align-items: center">
<span v-if="dialogProps.studentObj.worktype == '习题训练'"> <span v-if="dialogProps.studentObj.worktype == '习题训练'">
<span>得分： </span> <span>得分： </span>
<span style="margin: 0; color: red">{{ <span style="margin: 0; color: red">{{
classWorkFormScore.teacherRating.reduce((a, b) => a + b.score, 0).toFixed(2) classWorkFormScore.teacherRating.reduce((a, b) => a + b.score, 0).toFixed(2)
}}</span> }}</span>
<span>分</span> <span>分</span>
</span> </span>
<span v-else> <span v-else>
<span>得分： </span> <span>得分： </span>
<span v-if="classWorkFormScore.teacherRating.length > 0"> <span v-if="classWorkFormScore.teacherRating.length > 0">
<el-input-number <el-input-number
v-model="classWorkFormScore.teacherRating[0].score" v-model="classWorkFormScore.teacherRating[0].score"
:controls="false" :controls="false"
type="number" type="number"
:min="0" :min="0"
:max="classWorkFormScore.teacherRating[0].maxScore" :max="classWorkFormScore.teacherRating[0].maxScore"
size="small" size="small"
style="width: 60px" style="width: 60px"
@change="handleChange" @change="handleChange"
></el-input-number> ></el-input-number>
</span>
<span>分</span>
</span> </span>
<span>分</span>
</span> </span>
</span> <div class="score-container">
<div class="score-container"> <div
<div v-for="(score, index) in teacherRatingList"
v-for="(score, index) in teacherRatingList" :key="index"
:key="index" :class="[
:class="[ 'score-circle',
'score-circle', { active: classWorkFormScore.rating == score.ratingKey }
{ active: classWorkFormScore.rating == score.ratingKey } ]"
]" @click="selectScore(score)"
@click="selectScore(score)" >
> {{ score.ratingValue }}
{{ score.ratingValue }} </div>
</div> </div>
</div> </div>
</div> </el-col>
</el-col> <el-col :span="10" style="display: flex; align-items: center">
<el-col :span="10" style="display: flex; align-items: center"> <el-select
<el-select v-model="value"
v-model="value" placeholder="常用评语"
placeholder="常用评语" style="width: 240px"
style="width: 240px" @change="onSelectOption"
@change="onSelectOption" >
> <el-option
<el-option v-for="item in cities"
v-for="item in cities" :key="item.value"
:key="item.value" :label="item.label"
:label="item.label" :value="item.value"
:value="item.value" />
/> <template #footer>
<template #footer> <el-button v-if="!isAdding" text bg size="small" @click="onAddOption">
<el-button v-if="!isAdding" text bg size="small" @click="onAddOption"> 新增常用语
新增常用语 </el-button>
</el-button> <template v-else>
<template v-else> <el-input
<el-input v-model="optionName"
v-model="optionName" class="option-input"
class="option-input" placeholder="输入新的常用语"
placeholder="输入新的常用语" size="small"
size="small" />
/> <el-button type="primary" size="small" @click="onConfirm"> 确定 </el-button>
<el-button type="primary" size="small" @click="onConfirm"> 确定 </el-button> <el-button size="small" @click="clear">取消</el-button>
<el-button size="small" @click="clear">取消</el-button> </template>
</template> </template>
</template> </el-select>
</el-select> </el-col>
</el-col> </el-row>
</el-row> </el-col>
</el-col> <el-col :span="24" style="display: flex; flex-direction: column">
<el-col :span="24" style="display: flex; flex-direction: column"> <el-form-item label="评语说明">
<el-form-item label="评语说明"> <el-col :span="15" style="padding: 0px">
<el-col :span="15" style="padding: 0px"> <el-input
<el-input v-model="classWorkFormScore.teacherremark"
v-model="classWorkFormScore.teacherremark" type="textarea"
type="textarea" rows="1"
rows="3" placeholder="请输入评语说明"
placeholder="请输入评语说明" />
/> </el-col>
</el-col> </el-form-item>
</el-form-item> </el-col>
</el-col> </el-row>
</el-row> <div style="margin: 10px">
<div style="margin: 10px"> <el-button type="primary" @click="onClassWorkFormScoreSave">批阅确认</el-button>
<el-button type="primary" @click="onClassWorkFormScoreSave">批阅确认</el-button> </div>
</div> </div>
</div> </div>
</div> </div>

2
src/renderer/src/views/classTask/container/item-dialog.vue
View File

@ -10,7 +10,7 @@
destory-on-close destory-on-close
:before-close="onBeforeClose" :before-close="onBeforeClose"
> >
<template #title> <template #header>
<div style="font-size: 18px; display: flex; flex-wrap: nowrap"> <div style="font-size: 18px; display: flex; flex-wrap: nowrap">
<div style="flex: 1"> <div style="flex: 1">
{{ classWorkAnalysis.title }}答题情况 {{ classWorkAnalysis.title }}答题情况

2
src/renderer/src/views/classTask/container/task-item.vue
View File

@ -2,7 +2,7 @@
<div class="class-reserv-item"> <div class="class-reserv-item">
<div class="class-reserv-item-body"> <div class="class-reserv-item-body">
<div class="class-reserv-item-title1"> <div class="class-reserv-item-title1">
<el-tag style="margin-left: 5px" :type="item.workclass"> {{ item.worktype }}</el-tag> <el-tag style="margin-left: 5px" :type="item.workclass?item.workclass:'info'"> {{ item.worktype }}</el-tag>
<label style="margin-left: 10px">{{ item.uniquekey }}</label> <label style="margin-left: 10px">{{ item.uniquekey }}</label>
</div> </div>

118
src/renderer/src/views/desktop/container/class-start.vue
View File

@ -81,8 +81,8 @@ import { toLinkWeb } from '@/utils/tool'
import * as Http_ClassManage from '@/api/classManage' // api接口 import * as Http_ClassManage from '@/api/classManage' // api接口
import * as Http_Classcourse from '@/api/teaching/classcourse' // api接口 import * as Http_Classcourse from '@/api/teaching/classcourse' // api接口
import * as Http_Entpcoursefile from '@/api/education/entpcoursefile' // api接口
import useUserStore from "@/store/modules/user" // 状态管理：user import useUserStore from "@/store/modules/user" // 状态管理：user
import { get } from 'lodash'
const baseUrl = import.meta.env.VITE_APP_BUILD_BASE_PATH const baseUrl = import.meta.env.VITE_APP_BUILD_BASE_PATH
const userStore = useUserStore() const userStore = useUserStore()
@ -117,62 +117,63 @@ onMounted(() => {
* @description 暴露方法-打开对话框 * @description 暴露方法-打开对话框
* @param row 课件对象 * @param row 课件对象
*/ */
const open = async (row) => { const open = async (id) => {
visible.value = true visible.value = true
// if (row) myClassActive.value = row // 获取apt详情
if (id) await getAptInfo(id)
// 模拟数据 // 模拟数据
myClassActive.value = { // myClassActive.value = {
"createBy": null, // "createBy": null,
"createTime": null, // "createTime": null,
"updateBy": null, // "updateBy": null,
"updateTime": null, // "updateTime": null,
"remark": null, // "remark": null,
"id": 14740, // "id": 14740,
"idarray": null, // "idarray": null,
"jsonarray": null, // "jsonarray": null,
"entpid": 255, // "entpid": 255,
"parentid": 14741, // "parentid": 14741,
"linkids": "", // "linkids": "",
"linklist": "", // "linklist": "",
"entpcourseid": 7300, // "entpcourseid": 7300,
"entpcourseidarray": null, // "entpcourseidarray": null,
"evalid": 39952, // "evalid": 39952,
"evaltitle": " 质点 参考系", // "evaltitle": " 质点 参考系",
"coursetitle": " 质点 参考系", // "coursetitle": " 质点 参考系",
"classid": 0, // "classid": 0,
"ppttype": "file", // "ppttype": "file",
"title": " 质点 参考系", // "title": " 质点 参考系",
"fileidx": 0, // "fileidx": 0,
"fileurl": "", // "fileurl": "",
"pathfile": null, // "pathfile": null,
"filetype": "ppt", // "filetype": "ppt",
"filesize": null, // "filesize": null,
"datacontent": "", // "datacontent": "",
"filekey": "", // "filekey": "",
"filetag": "", // "filetag": "",
"dflag": 0, // "dflag": 0,
"status": "", // "status": "",
"edituserid": 2781, // "edituserid": 2781,
"editusername": "张雪林", // "editusername": "张雪林",
"edituserheadimgurl": "/profile/avatar/2024/08/12/blob_20240812152930A001.jpeg", // "edituserheadimgurl": "/profile/avatar/2024/08/12/blob_20240812152930A001.jpeg",
"edituserentpname": "AIx数字平台内测中心", // "edituserentpname": "AIx数字平台内测中心",
"editstudentid": null, // "editstudentid": null,
"editstudentname": null, // "editstudentname": null,
"timestamp": "2024-09-10 15:07:20", // "timestamp": "2024-09-10 15:07:20",
"token": null, // "token": null,
"base64Code": null, // "base64Code": null,
"orderby": null, // "orderby": null,
"childcount": 4, // "childcount": 4,
"commentlikecount": 0, // "commentlikecount": 0,
"commenttextcount": 0, // "commenttextcount": 0,
"commentusecount": 0, // "commentusecount": 0,
"commentvisitcount": 90, // "commentvisitcount": 90,
"unixstamp": null, // "unixstamp": null,
"classworkcount": 0, // "classworkcount": 0,
"classworklist": "", // "classworklist": "",
"authjson": "", // "authjson": "",
"defaultslide": null // "defaultslide": null
} // }
// 获取班级列表 // 获取班级列表
getClassList() getClassList()
@ -203,6 +204,13 @@ const initData = () => {
{ label: '故障备用', prop: 'backup', show: false }, { label: '故障备用', prop: 'backup', show: false },
] ]
} }
// 获取课件APT
const getAptInfo = async (id) => {
const res = await Http_Entpcoursefile.getEntpcoursefile(id)
if (res.code == 200) {
myClassActive.value = res.data
}
}
// 获取当前账号-班级 // 获取当前账号-班级
const getClassList = async () => { const getClassList = async () => {
const res = await Http_ClassManage.listClassmain({ const res = await Http_ClassManage.listClassmain({

233
src/renderer/src/views/desktop/container/work-trend.vue
View File

@ -1,101 +1,194 @@
<template> <template>
<div class="desktop-item"> <div class="desktop-work-item">
<div class="item-title flex"> <div class="item-title flex">
<span>工作动态</span> <span class="title">工作动态</span>
<el-radio-group v-model="type"> <el-radio-group v-model="type">
<el-radio-button label="全部" :value="-1" /> <el-radio-button label="全部" :value="-1" />
<el-radio-button label="备课" :value="1" />
<el-radio-button label="上课" :value="2" />
<el-radio-button label="作业" :value="3" />
</el-radio-group> </el-radio-group>
</div> </div>
<div class="item-content"> <div class="item-content" v-loading="loading">
<el-button type="primary" size="small" @click.stop="initClass(item)">上课</el-button> <el-scrollbar height="500px">
<ul> <ul>
<li class="flex class-item" v-for="item in classList" :key="item.id"> <!--作业-->
<div class="class-left flex"> <li class="flex class-item home-list" v-for="item in homeworkList" :key="item.id" @click="onClickItem(item)">
<div class="class-name flex"> <div class="class-left flex">
<span>{{ item.className }}</span> <div class="class-name flex">
<span class="name">{{ item.uniquekey }}</span>
<el-tag class="tag" round :type="tagType(item.deaddate)" effect="dark" size="small">{{
getCurrentTime('YYYY-MM-DD HH:mm') > item.deaddate ? '已结束' : '进行中' }}</el-tag>
</div>
<div class="class-time">{{ item.classcaption }} | 截止时间：{{ item.deaddate }} </div>
</div> </div>
<div class="class-time"> {{ item.classDay }}&nbsp;{{ item.startTime }} ~ {{ item.classDay }}&nbsp;{{ item.endTime }}</div> <div class="class-right">
<div class="class-grade"> <div><span class="num">{{ item.workdataresultcount }}</span> / {{ item.workdatacount }}</div>
<span v-for="(tag, index) in item.classItemList" :key="index" style="margin-left: 5px"> <div>已交</div>
{{ index === 0 ? tag.name : '、' + tag.name }}
</span>
</div> </div>
</div> </li>
<div class="class-right"> <el-empty v-if="!homeworkList.length" description="暂无数据" />
<el-button type="primary" size="small" @click.stop="initClass(item)">上课</el-button> </ul>
</div> </el-scrollbar>
</li>
</ul>
</div> </div>
<item-dialog ref="itemDialogRef" @cle-click="closeDialog"></item-dialog>
</div> </div>
<!-- 上课配置 -->
<start-class ref="calssRef"/>
</template> </template>
<script setup> <script setup>
import { ref, onMounted } from 'vue' import { ref, onMounted } from 'vue'
import useUserStore from '@/store/modules/user'
import { getSelfReserv } from '@/api/classManage' import { getSelfReserv } from '@/api/classManage'
import startClass from './class-start.vue' import { homeworklist } from '@/api/teaching/classwork'
import { getCurrentTime, getTomorrow } from '@/utils/date'
import ItemDialog from '@/views/classTask/container/item-dialog.vue'
const type = ref(-1) const type = ref(-1)
const classList = ref([]) const user = useUserStore().user
const calssRef = ref() // ref 获取组件实例 const loading = ref(false)
const classList = ref([])
// 获取上课 const homeworkList = ref([])
const getClass = () =>{ const itemDialogRef = ref(null)
getSelfReserv().then((res) => {
let list = res.data || []
list.sort((a,b) => { if(a.status=='上课中') return -1; else return 0 })
classList.value = list.filter(item => item.status !== '已结束')
// 获取上课
const getClass = async () => {
loading.value = true
try {
const res = await getSelfReserv()
let list = res.data || []
list.sort((a, b) => { if (a.status == '上课中') return -1; else return 0 })
classList.value = list.filter(item => item.status !== '已结束')
} finally {
loading.value = false
}
}
// 获取作业
const getHomework = async () => {
loading.value = true
const { edustage, edusubject } = user
try {
const { rows } = await homeworklist({ edituserid: user.userId, edustage, edusubject, deaddate: getTomorrow(), status: '1', orderby: 'uniquekey DESC', pageSize: 500 })
// 只展示进行中的
homeworkList.value = rows.filter(item => item.deaddate && item.uniquekey && getCurrentTime('YYYY-MM-DD HH:mm') < item.deaddate)
homeworkList.value.forEach((item) => {
item.workdatacount = JSON.parse('[' + item.classworkdatastudentids + ']').length
// 如果是习题训练任务，则检查一共有多少道
if (item.entpcourseworklist != '') {
item.entpcourseworklistarray = JSON.parse(
'[' + item.entpcourseworklist + ']'
)
} else {
item.entpcourseworklistarray = []
}
}) })
} finally {
loading.value = false
} }
// 上课Apt }
const initClass = (item) =>{ // 批改作业
calssRef.value.open() const onClickItem = (item) => {
} console.log('开启弹窗')
itemDialogRef.value.openDialog(item)
}
// 批阅关闭
const closeDialog = () => {
console.log('关闭弹窗,查询一下作业数据，更新界面')
getHomework()
}
onMounted(()=>{ const tagType = (time) => {
getClass() return getCurrentTime('YYYY-MM-DD HH:mm') > time ? 'info' : 'warning'
}) }
onMounted(() => {
// getClass()
getHomework()
})
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.desktop-item{ .desktop-work-item {
margin-bottom: 20px; align-items: center;
height: 100%;
.item-title {
height: 32px;
text-align: left;
font-size: 18px;
font-weight: bold;
margin-bottom: 10px;
align-items: center; align-items: center;
.item-title{
height: 32px; .title {
text-align: left; margin-right: 5px;
font-size: 18px;
font-weight: bold;
margin-bottom: 10px;
align-items: center;
justify-content: space-between;
} }
.item-content{ }
background-color: #fff;
.item-content {
background-color: #fff;
border-radius: 5px;
padding: 10px 15px;
font-size: 13px;
height: calc(100% - 60px);
.class-item {
justify-content: space-between;
align-items: center;
background: #eff5fa;
border-radius: 5px; border-radius: 5px;
padding: 10px 15px; margin-bottom: 10px;
font-size: 13px; padding: 10px;
.class-item{
justify-content: space-between; .class-left {
align-items: center; flex-direction: column;
background: #e2e4f4; align-items: flex-start;
border-radius: 5px; width: 90%;
margin-bottom: 10px;
padding: 10px; .class-name {
.class-left{ display: flex;
flex-direction: column; align-items: center;
align-items: flex-start;
.class-time{ .name {
font-size: 13px; font-size: 14px;
color: #bfbfbf; font-weight: bold;
} }
.tag {
margin-left: 5px;
border: none;
:deep(.el-tag__content) {
font-size: 12px;
}
}
}
.class-time {
font-size: 13px;
color: #a5a4a4;
padding-top: 3px;
width: 100%;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
text-align: left;
}
}
.class-right {
font-size: 12px;
color: #a5a4a4;
flex-shrink: 0;
font-size: 13px;
.num {
font-size: 14px;
color: #409EFF;
font-weight: bold;
} }
} }
} }
.class-grade {
padding-top: 3px }
} }
}
</style> </style>

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

@ -3,7 +3,7 @@
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="17"> <el-col :span="17">
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="12" v-for="item in menuList"> <el-col :span="item.span" v-for="item in menuList" :key="item.id">
<div class="desktop-item"> <div class="desktop-item">
<div class="item-title">{{ item.name }}</div> <div class="item-title">{{ item.name }}</div>
<div class="item-content"> <div class="item-content">
@ -54,6 +54,8 @@ let chartInstance = null
const menuList = [{ const menuList = [{
name: '教学分析', name: '教学分析',
span: 24,
id: 1,
list: [ list: [
{ {
name: '课标分析', name: '课标分析',
@ -77,16 +79,6 @@ const menuList = [{
icon: 'icon-xueqingfenxi', icon: 'icon-xueqingfenxi',
disabled: true disabled: true
}, },
{
name: '资源分析',
icon: 'icon-ziyuanfenxi',
disabled: true
}
]
},
{
name: '课程教学',
list: [
{ {
name: '教学设计', name: '教学设计',
icon: 'icon-jiaoxuesheji', icon: 'icon-jiaoxuesheji',
@ -95,7 +87,7 @@ const menuList = [{
{ {
name: '教学实施', name: '教学实施',
icon: 'icon-jiaoxuefenxi', icon: 'icon-jiaoxuefenxi',
path: '/classReserv' path: '/prepare'
}, },
{ {
name: '教学反思', name: '教学反思',
@ -106,16 +98,20 @@ const menuList = [{
}, },
{ {
name: '作业管理', name: '作业管理',
span: 12,
id: 2,
list: [ list: [
{ {
name: '作业设计', name: '作业设计',
icon: 'icon-jiaoxuefansi', icon: 'icon-jiaoxuefansi',
disabled: true isOuter: true,
path: '/teaching/classtaskassign?titleName=作业布置&&openDialog=newClassTask'
}, },
{ {
name: '作业布置', name: '作业布置',
icon: 'icon-xiezuo1', icon: 'icon-xiezuo1',
disabled: true isOuter: true,
path: '/teaching/classtaskassign?titleName=作业布置'
}, },
{ {
name: '作业批改', name: '作业批改',
@ -131,6 +127,8 @@ const menuList = [{
}, },
{ {
name: '教学管控', name: '教学管控',
span: 12,
id: 3,
list: [ list: [
{ {
name: '教学计划', name: '教学计划',

323
src/renderer/src/views/prepare/container/kj-list-item.vue Normal file
View File

@ -0,0 +1,323 @@
<template>
<div class="prepare-body-main-item">
<div class="prepare-body-main-item-icon">
<slot name="default"></slot>
<FileImage :size="50" :file-name="item.fileShowName" @click="openFileWin(item)" />
</div>
<div class="prepare-body-main-item-info" @click="openFileWin(item)">
<div class="prepare-item-info-title" :title="item.fileShowName">
<div
style="
flex: 1;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
width: 200px;
"
>
{{ item.fileShowName.substring(0, item.fileShowName.lastIndexOf('.')) }}
<el-tag type="danger" effect="dark">{{item.fileShowName.substring(item.fileShowName.lastIndexOf('.')+1)}}</el-tag>
<template v-if="item.fileTag">
<el-tag v-for="(item1, index1) in item.fileTag.split(',')" :key="index1" type="success" effect="dark" style="margin-left: 5px">{{item1}}</el-tag>
</template>
</div>
</div>
<div class="prepare-item-info-message">
<div v-if="item.fileFlag ==='课件'" style="width: 60px">
<el-icon
v-loading="item.async === 'on'"
style="background-color: green; border-radius: 20px; color: white; top: 2px"
>
<Check v-if="item.async === true" />
<UploadFilled v-if="!item.async" />
</el-icon>
{{ item.async === true ? '已同步' : '' }}
{{ !item.async ? '待同步' : '' }}
{{ item.async === 'on' ? '同步中' : '' }}
</div>
<template v-if="item.fileFlag ==='课件'">|</template>
<div style="width: 70px">访问 100</div>
|
<div style="width: 70px">引用 50</div>
|
<div
style="
flex: 1;
text-align: left;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
width: 200px;
">点赞 20</div>
</div>
</div>
<div class="prepare-body-main-item-btn">
<el-button type="primary" @click="clickStartClass(item)">上课</el-button>
</div>
<div class="prepare-body-main-item-tool">
<el-popover
:ref="'popover_' + index"
placement="left-start"
:hide-after="100"
popper-class="prepare-popper"
trigger="click"
>
<template #default>
<div style="width: 100%">
<div class="item-popover" @click="closePopver(index)">
<div v-if="userInfo.userId === Number(item.createUserId)" class="item-popover-item">
<el-button text @click="editTalk(item, index)">
<i class="iconfont icon-bianji"></i>
<span>标签</span>
</el-button>
</div>
<div v-if="userInfo.userId === Number(item.createUserId)" class="item-popover-item">
<el-button text @click="deleteTalk(item)">
<i class="iconfont icon-shanchu"></i>
<span>删除</span>
</el-button>
</div>
</div>
</div>
</template>
<template #reference>
<span class="iconfont icon-shenglvehao" style="cursor: pointer" @click.stop></span>
</template>
</el-popover>
</div>
</div>
</template>
<script setup>
import { Check, UploadFilled, Switch } from '@element-plus/icons-vue'
</script>
<script>
import FileImage from '@/components/file-image/index.vue'
import { asyncLocalFile } from '@/utils/talkFile'
import { toTimeText } from '@/utils/date'
import { ElMessage, ElMessageBox } from 'element-plus'
import { deleteSmarttalk, updateSmarttalk, getPrepareById } from '@/api/file'
import useUserStore from '@/store/modules/user'
import outLink from '@/utils/linkConfig'
const { ipcRenderer } = window.electron || {}
export default {
name: 'FileListItem',
components: { FileImage },
props: {
item: {
type: Object,
default: function () {
return {}
}
},
index: {
type: Number,
default: function () {
return 0
}
}
},
emits: { 'on-start-class': null, 'on-delete': null, 'on-set': null, 'on-delhomework': null,'on-filearg': null },
data() {
return {
listenList: [],
userInfo:{}
}
},
mounted() {
this.userInfo = useUserStore().user
},
methods: {
clickStartClass(item) {
this.$emit('on-start-class', item)
},
editTalk(item) {
ElMessageBox.prompt('请输入新的标签', '添加标签', {
confirmButtonText: '确认',
cancelButtonText: '取消',
inputValue: "",
inputPattern: /^[a-zA-Z0-9\u4e00-\u9fa5]{1,5}$/,
inputErrorMessage: '请输入最多五个字的标签,不能携带标点符号'
})
.then(({ value }) => {
let fileTagList = []
if (!item.fileTag) {
item.fileTag="";
fileTagList = [];
}else {
fileTagList = item.fileTag.split(',');
}
fileTagList.push(value);
item.fileTagList = fileTagList;
item.fileTag = fileTagList.join(",")
updateSmarttalk({ id: item.id, fileTag: item.fileTag, fileShowName: item.fileShowName }).then((res) => {
if (res.data === true) {
ElMessage({
type: 'success',
message: `添加成功！`
})
}
})
})
.catch(() => {})
},
downloadFile(item) {
ipcRenderer.send('save-as', item.fileFullPath, item.fileShowName)
},
deleteTalk(item) {
deleteSmarttalk(item.id).then((res) => {
if (res.data === true) {
this.$emit('on-delete', item)
}
})
},
closePopver(index) {
this.$refs['popover_' + index].hide()
},
formatFileSize(fileSize) {
if (fileSize < 1024) {
return fileSize + 'B'
} else if (fileSize < 1024 * 1024) {
let temp = fileSize / 1024
temp = temp.toFixed(2)
return temp + 'KB'
} else if (fileSize < 1024 * 1024 * 1024) {
let temp = fileSize / (1024 * 1024)
temp = temp.toFixed(2)
return temp + 'MB'
} else {
let temp = fileSize / (1024 * 1024 * 1024)
temp = temp.toFixed(2)
return temp + 'GB'
}
},
openFileWin(items) {
if (items.fileFlag === 'apt') {
console.log(items);
const path="/teaching/aptindex?id="+items.fileId
let configObj = outLink().getBaseData()
let fullPath = configObj.fullPath + path
fullPath = fullPath.replaceAll('//', '/')
// 通知主进程
ipcRenderer.send('openWindow', {
key: path,
fullPath: fullPath,
cookieData: { ...configObj.data }
})
return
}
if (!items||!items.fileSuffix) return;
getPrepareById(items.id).then((item) => {
Object.assign(items, item)
asyncLocalFile(items).then(() => {
ipcRenderer.send('open-path-app', item.fileNewName)
if (this.listenList.indexOf(item.fileNewName) === -1) {
this.listenList.push(item.fileNewName)
let cookie = localStorage.getItem('Admin-Token')
ipcRenderer.send('listen-file-change', {
id: item.id,
fileNewName: item.fileNewName,
md5: item.fileMd5,
cookie,
fileType: item.fileType
})
ipcRenderer.on('listen-file-change-on' + item.fileNewName, () => {
items.async = 'on'
})
ipcRenderer.on('listen-file-change-success' + item.fileNewName, (e, { data, md5 }) => {
items.fileSize = data.fileSize
items.md5 = md5
items.async = true
})
}
})
})
},
//布置
setHomeWork(item) {
// this.$emit('on-set', item)
},
// 删除作业
deleteHomework(item){
this.$emit('on-delhomework', item)
},
// 文件资源打开web AIX 布置作业
openFileLink(item){
let unitId = item.levelSecondId ? item.levelSecondId : item.levelFirstId
// key 对应的 linkConfig.js 外部链接配置
let key = 'filehomework'
let configObj = outLink()[key]
// 通知主进程
ipcRenderer.send('openWindow', {
key,
fullPath: configObj.fullPath + `&fileShowName=${item.fileShowName}&fileFullPath=${item.fileFullPath}&unitId=${unitId}`,
cookieData: { ...configObj.data }
})
this.$emit('on-filearg', item)
}
}
}
</script>
<style>
.prepare-item-info-message {
.circular {
width: 100% !important;
}
}
</style>
<style scoped lang="scss">
.prepare-body-main-item {
display: flex;
align-items: center;
border-bottom: 1px solid rgba(131, 131, 127, 0.17);
padding: 10px 0;
&:hover {
background-color: rgba(144, 147, 153, 0.2);
cursor: pointer;
}
.prepare-body-main-item-icon {
width: 80px;
display: flex;
justify-content: center;
align-items: center;
.icon-zuoye {
font-size: 40px;
color: #707070;
}
}
.prepare-body-main-item-tool {
font-size: 18px !important;
font-weight: bold;
width: 40px;
text-align: center;
}
.prepare-body-main-item-info {
display: flex;
flex-direction: column;
min-width: 0;
flex: 1;
.prepare-item-info-title {
text-align: left;
font-size: 16px;
display: flex;
}
.prepare-item-info-message {
font-size: 12px;
line-height: 23px;
color: #909399;
display: flex;
.circular {
width: 100% !important;
}
}
}
}
</style>

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

@ -2,7 +2,7 @@
<el-dialog <el-dialog
v-model="centerDialogVisible" v-model="centerDialogVisible"
class="reserv-dialog" class="reserv-dialog"
title="预约课程" title="上课"
destroy-on-close destroy-on-close
:before-close="closeDialog" :before-close="closeDialog"
width="600" width="600"
@ -74,7 +74,7 @@
<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="submitForm"> 提交 </el-button> <el-button type="primary" @click="submitForm"> 上课 </el-button>
</div> </div>
</template> </template>
</el-dialog> </el-dialog>
@ -105,7 +105,7 @@ const userStore = useUserStore().user
const centerDialogVisible = ref(false) const centerDialogVisible = ref(false)
const form = reactive({ const form = reactive({
name: '', name: '',
type: '常规课', type: '互动课',
day: '', day: '',
time: [], time: [],
resource: [], resource: [],
@ -126,12 +126,6 @@ const ruleForm = reactive({
resource: [{ required: true, message: '请选择授课对象', trigger: 'change' }] resource: [{ required: true, message: '请选择授课对象', trigger: 'change' }]
}) })
const locationOptions = [ const locationOptions = [
{
label: '常规课',
value: '常规课',
disabled: false,
message: '现场公屏授课，学生无需长时间打开平板上。'
},
{ {
label: '互动课', label: '互动课',
value: '互动课', value: '互动课',
@ -288,13 +282,13 @@ const addClassReserv = (formData) => {
ex2: props.currentNode.id ex2: props.currentNode.id
} }
addSmartClassReserv(param).then((res) => { addSmartClassReserv(param).then((res) => {
if (res.data === true) { if (res.msg) {
closeDialog() closeDialog()
ElMessage({ ElMessage({
type: 'success', type: 'success',
message: '预约成功！' message: '预约成功！'
}) })
emit('addSuccess') emit('addSuccess',res.msg)
} else { } else {
ElMessage({ ElMessage({
type: 'error', type: 'error',

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

@ -1,8 +1,38 @@
<template> <template>
<div v-loading="isLoading" class="page-resource flex"> <div v-loading="isLoading" class="page-resource flex">
<ChooseTextbook @change-book="nodeClick" @node-click="nodeClick" /> <ChooseTextbook @change-book="nodeClick" @node-click="nodeClick" />
<div class="page-center-wrap">
<el-tabs v-model="activeAptTab" style="height: 100%;">
<el-tab-pane label="教学课件" name="教学课件" class="prepare-center-jxkj">
<div class="prepare-center-header">
<div class="center-create-btn" style="background-color: rgb(64,158,255)" @click="createAptFile">
<div class="create-btn-title"><el-icon><Plus /></el-icon><label>创建APT</label></div>
<div class="create-btn-info">智能交互课件</div>
</div>
<div class="center-create-btn" style="background-color: rgb(112,182,3)" @click="createFile">
<div class="create-btn-title"><el-icon><Plus /></el-icon><label>创建PPT</label></div>
<div class="create-btn-info">传统课件</div>
</div>
</div>
<div class="prepare-center-body">
<kj-list-item
v-for="(item, index) in currentKJFileList"
:key="index"
:item="item"
:index="index"
@on-delete="deleteTalk"
@on-start-class="startClass"
>
</kj-list-item>
</div>
</el-tab-pane>
<el-tab-pane label="教学实录" name="教学实录" class="prepare-center-jxsl">
<class-reserv></class-reserv>
</el-tab-pane>
</el-tabs>
</div>
<div class="page-right"> <div class="page-right">
<div class="header-top flex"> <!-- <div class="header-top flex">
<div class="textbook-img" @click="navtoPdf"> <div class="textbook-img" @click="navtoPdf">
<el-image style="width: 80px; height: 110px" :src="curBookImg" /> <el-image style="width: 80px; height: 110px" :src="curBookImg" />
<el-progress <el-progress
@ -32,85 +62,82 @@
<label>{{ curClassReserv.startTime }}-{{ curClassReserv.endTime }}</label> <label>{{ curClassReserv.startTime }}-{{ curClassReserv.endTime }}</label>
</el-button> </el-button>
<div class="top-zoom-style"></div> <div class="top-zoom-style"></div>
</div> </div>-->
<div class="prepare-body-header"> <div style="padding: 0 20px;height: 100%;">
<div> <el-tabs v-model="activeTab" class="prepare-tabs" >
<label style="font-size: 15px">共{{ currentFileList.length }}个文件</label>&nbsp; <el-tab-pane label="素材" name="素材">
<el-popover placement="top-start" :width="250" trigger="hover"> <div class="prepare-body-header">
<template #default>
<div> <div>
<el-button <label style="font-size: 15px">共{{ currentFileList.length }}个文件</label>&nbsp;
v-if="lastAsyncAllTime" <el-popover placement="top-start" :width="250" trigger="hover">
type="success" <template #default>
size="small" <div>
:icon="Check" <el-button
circle v-if="lastAsyncAllTime"
/> type="success"
{{ lastAsyncAllTime ? toTimeText(lastAsyncAllTime) + '同步成功' : '' }} size="small"
:icon="Check"
circle
/>
{{ lastAsyncAllTime ? toTimeText(lastAsyncAllTime) + '同步成功' : '' }}
</div>
</template>
<template #reference>
<el-button size="small" text @click="asyncAllFile">
<el-icon v-loading="asyncAllFileVisiable">
<Refresh />
</el-icon>
{{ asyncAllFileVisiable ? '同步中' : '云同步' }}
</el-button>
</template>
</el-popover>
<el-button size="small" @click="isDialogOpen = true">上传资料</el-button>
</div> </div>
</template> </div>
<template #reference> <el-checkbox-group
<el-button size="small" text @click="asyncAllFile"> v-model="checkFileList"
<el-icon v-loading="asyncAllFileVisiable"> class="prepare-body-main"
<Refresh /> :style="{ 'margin-bottom': checkFileList.length > 0 ? '40px' : '0' }"
</el-icon> >
{{ asyncAllFileVisiable ? '同步中' : '云同步' }} <file-list-item
</el-button> v-for="(item, index) in currentSCFileList"
</template> :key="index"
</el-popover> :item="item"
</div> :index="index"
<div style="display: flex"> @on-move="onMoveSingleFile"
<el-button @click="handleOutLink('feedback')">作业反馈</el-button> @on-delete="deleteTalk"
<el-button @click="handleOutLink('homeWork')">布置作业</el-button> @on-set="openSet"
<el-button @click="isDialogOpen = true">上传资料</el-button> @on-delhomework="delhomework"
<el-dropdown trigger="click" style="margin-left: 12px"> @on-filearg="isOpenHomework = true"
<el-button type="primary"> >
新建课件<el-icon class="el-icon--right"><arrow-down /></el-icon> <el-checkbox v-if="!item.uniquekey" label="" :value="item" />
</el-button> </file-list-item>
<template #dropdown> </el-checkbox-group>
<el-dropdown-menu> </el-tab-pane>
<el-dropdown-item style="padding: 0"> <el-tab-pane label="作业" name="作业">
<el-button type="default" style="" @click="createFile">PPT课件</el-button> <div class="prepare-body-header">
</el-dropdown-item> <div>
<el-dropdown-item style="padding: 0"> <label style="font-size: 15px">共{{ currentWorkList.length }}个作业</label>&nbsp;
<el-button type="default" style="" @click="createAptFile">APT课件</el-button> <el-button size="small" @click="handleOutLink('feedback')">作业反馈</el-button>
</el-dropdown-item> <el-button size="small" @click="handleOutLink('homeWork')">布置作业</el-button>
</el-dropdown-menu> </div>
</template> </div>
</el-dropdown> <div class="prepare-work-wrap">
</div> <file-list-item
v-for="(item, index) in currentWorkList"
:key="index"
:item="item"
:index="index"
@on-move="onMoveSingleFile"
@on-delete="deleteTalk"
@on-set="openSet"
@on-delhomework="delhomework"
>
</file-list-item>
</div>
</el-tab-pane>
</el-tabs>
</div> </div>
<el-checkbox-group
v-model="checkFileList"
class="prepare-body-main"
:style="{ 'margin-bottom': checkFileList.length > 0 ? '40px' : '0' }"
>
<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"
@on-filearg="isOpenHomework = true"
>
<el-checkbox v-if="!item.uniquekey" label="" :value="item" />
</file-list-item>
<file-list-item
v-for="(item, index) in currentWorkList"
: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>
</el-checkbox-group>
<file-oper-batch <file-oper-batch
v-show="checkFileList.length > 0" v-show="checkFileList.length > 0"
:indeterminate="checkFileList.length > 0 && checkFileList.length < currentFileList.length" :indeterminate="checkFileList.length > 0 && checkFileList.length < currentFileList.length"
@ -132,10 +159,11 @@
:book-id="uploadData.textbookId" :book-id="uploadData.textbookId"
@add-success="initReserv" @add-success="initReserv"
></reserv> ></reserv>
<!-- <button @click="ipcMsgSend('tool-sphere:close')">测试</button> --> <!-- 上课配置 -->
<class-start ref="calssRef"/>
</template> </template>
<script setup> <script setup>
import { Check } from '@element-plus/icons-vue' import { Check,Plus } from '@element-plus/icons-vue'
import Reserv from '@/views/prepare/container/reserv.vue' import Reserv from '@/views/prepare/container/reserv.vue'
import { ArrowDown } from '@element-plus/icons-vue' import { ArrowDown } from '@element-plus/icons-vue'
</script> </script>
@ -149,6 +177,7 @@ import useUserStore from '@/store/modules/user'
import { useToolState } from '@/store/modules/tool' import { useToolState } from '@/store/modules/tool'
import MoveFile from '@/components/move-file/index.vue' import MoveFile from '@/components/move-file/index.vue'
import FileListItem from '@/views/prepare/container/file-list-item.vue' import FileListItem from '@/views/prepare/container/file-list-item.vue'
import KjListItem from '@/views/prepare/container/kj-list-item.vue'
import { getSmarttalkPage, moveSmarttalk, creatAPT } from '@/api/file' import { getSmarttalkPage, moveSmarttalk, creatAPT } from '@/api/file'
import { toTimeText } from '@/utils/date' import { toTimeText } from '@/utils/date'
import { ElMessage } from 'element-plus' import { ElMessage } from 'element-plus'
@ -159,10 +188,11 @@ import outLink from '@/utils/linkConfig'
import { createWindow, sessionStore } from '@/utils/tool' import { createWindow, sessionStore } from '@/utils/tool'
import { cloneDeep } from 'lodash' import { cloneDeep } from 'lodash'
import { delClasswork, listEntpcourse } from '@/api/teaching/classwork' import { delClasswork, listEntpcourse } from '@/api/teaching/classwork'
import { getSelfReserv } from '@/api/classManage' import { getClassInfo, getSelfReserv } from '@/api/classManage'
import { useGetHomework } from '@/hooks/useGetHomework' import { useGetHomework } from '@/hooks/useGetHomework'
import { addEntpcoursefileReturnId } from '@/api/education/entpcoursefile' import { addEntpcoursefileReturnId } from '@/api/education/entpcoursefile'
import ClassReserv from '@/views/classManage/classReserv.vue'
import classStart from '@/views/desktop/container/class-start.vue' // 预备上课
const toolStore = useToolState() const toolStore = useToolState()
const fs = require('fs') const fs = require('fs')
@ -175,9 +205,12 @@ export default {
Refresh, Refresh,
uploadDialog, uploadDialog,
FileListItem, FileListItem,
KjListItem,
FileOperBatch, FileOperBatch,
MoveFile, MoveFile,
SetHomework SetHomework,
ClassReserv,
classStart
}, },
data() { data() {
return { return {
@ -196,6 +229,8 @@ export default {
curClassReserv: {}, curClassReserv: {},
downloadNum: 0, downloadNum: 0,
lastAsyncAllTime: '', lastAsyncAllTime: '',
activeTab: "素材",
activeAptTab: "教学课件",
uploadData: { uploadData: {
textbookId: null, textbookId: null,
levelFirstId: 39103, levelFirstId: 39103,
@ -219,6 +254,12 @@ export default {
return ( return (
this.checkFileList.length > 0 && this.checkFileList.length === this.currentFileList.length this.checkFileList.length > 0 && this.checkFileList.length === this.currentFileList.length
) )
},
currentKJFileList() {
return this.currentFileList.filter((item) => item.fileFlag === 'apt' || item.fileFlag === '课件')
},
currentSCFileList() {
return this.currentFileList.filter((item) => item.fileFlag !== 'apt' && item.fileFlag !== '课件')
} }
}, },
@ -230,13 +271,13 @@ export default {
this.callback(param) this.callback(param)
}) })
this.lastAsyncAllTime = localStorage.getItem('lastAsyncAllTime') this.lastAsyncAllTime = localStorage.getItem('lastAsyncAllTime')
this.initReserv() // this.initReserv()
}, },
mounted() { mounted() {
this.$watch( this.$watch(
() => toolStore.isToolWin, () => toolStore.isToolWin,
(newD, oldD) => { (newD, oldD) => {
setTimeout(this.initReserv, 500) // setTimeout(this.initReserv, 500)
} }
) )
// electron 当前窗口 // electron 当前窗口
@ -256,16 +297,21 @@ export default {
// } // }
// }, // },
methods: { methods: {
initReserv() { startClass(item) {
getSelfReserv().then((res) => { console.log(item)
let list = res.data.filter((item) => { if(item.fileFlag === '课件') {
return item.status !== '已结束' this.openReserv()
}) }
if (list.length > 0) { if(item.fileFlag === 'apt') {
this.curClassReserv = list[list.length - 1] //TODO 打开apt
} else { const { fileId: aptId } = item
this.curClassReserv = {} this.$refs.calssRef.open(aptId)
} }
},
initReserv(id) {
getClassInfo(id).then((res) => {
this.curClassReserv = res.data
this.openLesson(res.data.id);
}) })
}, },
getBookPathFromServer() { getBookPathFromServer() {
@ -312,7 +358,7 @@ export default {
}, },
createAptFile() { createAptFile() {
listEntpcourse({ listEntpcourse({
evalid: this.uploadData.levelSecondId, evalid: this.currentNode.id,
edituserid: this.userStore.userId, edituserid: this.userStore.userId,
pageSize: 500 pageSize: 500
}).then((response) => { }).then((response) => {
@ -596,7 +642,7 @@ export default {
}) })
}, },
// 上课-工具类悬浮 // 上课-工具类悬浮
async openLesson() { async openLesson(id) {
// await startClass(this.curClassReserv.id) // await startClass(this.curClassReserv.id)
createWindow('tool-sphere', { createWindow('tool-sphere', {
url: url:
@ -605,7 +651,7 @@ export default {
'&label=' + '&label=' +
this.currentNode.label + this.currentNode.label +
'&reservId=' + '&reservId=' +
this.curClassReserv.id id
}) })
} }
} }
@ -643,20 +689,78 @@ export default {
user-select: none; user-select: none;
padding-top: 10px; padding-top: 10px;
height: 100%; height: 100%;
:deep(.el-tabs__nav) {
.el-tabs__item{
font-weight: bold;
font-size: 18px;
}
}
.page-center-wrap{
flex: 1;
height: 100%;
padding: 0 10px;
.prepare-center-jxkj{
height: 100%;
display: flex;
flex-direction: column;
.prepare-center-header{
display: flex;
cursor: pointer;
.center-create-btn{
cursor: pointer;
margin: 5px;
flex: 1;
height: 60px;
border-radius: 5px;
.create-btn-title{
font-weight: 900;
display: flex;
align-items: center;
justify-content: center;
font-size: 15px;
color: #ffffff;
height: 15px;
margin-top: 15px;
label{
cursor: pointer;
}
}
.create-btn-info{
cursor: pointer;
font-size: 12px;
color: #ffffff;
margin-top: 5px;
}
}
}
.prepare-center-body{
flex: 1;
overflow: auto;
}
}
.prepare-center-jxsl{
height: 100%;
}
}
.page-right { .page-right {
overflow: hidden; overflow: hidden;
position: relative; position: relative;
min-width: 0; min-width: 375px;
flex: 1; width: 375px;
margin-left: 20px;
height: 100%; height: 100%;
background: #ffffff; background: #ffffff;
border-radius: 10px; border-radius: 10px;
box-shadow: 0px 0px 20px 0px rgba(99, 99, 99, 0.06); box-shadow: 0px 0px 20px 0px rgba(99, 99, 99, 0.06);
display: flex; display: flex;
flex-direction: column; flex-direction: column;
.prepare-tabs{
height: 100%;
:deep(.el-tab-pane) {
height: 100%;
display: flex;
flex-direction: column;
}
}
.header-top { .header-top {
height: 150px; height: 150px;
align-items: center; align-items: center;
@ -742,20 +846,24 @@ export default {
} }
.prepare-body-header { .prepare-body-header {
height: 60px; //height: 60px;
width: 100%; width: 100%;
display: flex; display: flex;
align-items: center; align-items: center;
flex-wrap: wrap; flex-wrap: wrap;
justify-content: space-between; justify-content: space-between;
padding: 0 20px; //padding: 0 20px;
}
.prepare-work-wrap{
width: 100%;
flex: 1;
overflow: auto;
} }
.prepare-body-main { .prepare-body-main {
flex: 1; flex: 1;
width: 100%; width: 100%;
overflow: auto; overflow: auto;
padding: 0 30px; //padding: 0 30px;
line-height: normal; line-height: normal;
} }
} }

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

@ -135,6 +135,8 @@ function submit() {
userStore.login({username:props.user.userName,password:props.user.plainpwd}).then(() => { userStore.login({username:props.user.userName,password:props.user.plainpwd}).then(() => {
userStore.getInfo().then(res => { userStore.getInfo().then(res => {
if(res.code === 200){ if(res.code === 200){
localStorage.removeItem('subjectList')
localStorage.removeItem('evaluationList')
ElMessage.success('修改成功') ElMessage.success('修改成功')
}else{ }else{
ElMessage.error(response.msg) ElMessage.error(response.msg)

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

@ -2,9 +2,9 @@
<div class="resoure-search"> <div class="resoure-search">
<el-row justify="space-between"> <el-row justify="space-between">
<el-col :span="12" class="tab-btns flex"> <el-col :span="12" class="tab-btns flex">
<el-button text v-for="item in sourceStore.tabs" :key="item.id" <el-button text v-for="item in sourceStore.resourceTypeList" :key="item.id"
:type="sourceStore.query.fileSource == item.value ? 'primary' : ''" :type="sourceStore.query.fileFlags == item.value ? 'primary' : ''"
@click="sourceStore.changeTab(item.value)">{{ item.label @click="sourceStore.changeType(item.value)" :disabled="item.disabled">{{ item.label
}}</el-button> }}</el-button>
</el-col> </el-col>
@ -19,7 +19,7 @@
</el-row> </el-row>
<!-- 第三方资源筛选--> <!-- 第三方资源筛选-->
<el-row class="resoure-btns" v-if="isThird"> <!-- <el-row class="resoure-btns" v-if="isThird">
<el-col :span="24" class="query-row flex"> <el-col :span="24" class="query-row flex">
<div class="flex row-left"> <div class="flex row-left">
<el-button v-for="item in coursewareTypeList" :key="item.id" <el-button v-for="item in coursewareTypeList" :key="item.id"
@ -29,8 +29,8 @@
</el-button> </el-button>
</div> </div>
</el-col> </el-col>
</el-row> </el-row> -->
<el-row class="resoure-btns" v-else> <el-row class="resoure-btns">
<el-col :span="24" class="query-row flex"> <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"> style="width: 110px">
@ -38,9 +38,9 @@
:value="item.value" /> :value="item.value" />
</el-select> </el-select>
<div class="line"></div> <div class="line"></div>
<el-button v-for="item in sourceStore.resourceTypeList" :key="item.id" <el-button v-for="item in sourceStore.tabs" :key="item.id"
:type="sourceStore.query.fileFlag == item.value ? 'primary' : ''" round :type="sourceStore.query.fileSource == item.value ? 'primary' : ''"
@click="sourceStore.changeType(item.value)">{{ @click="sourceStore.changeTab(item.value)">{{
item.label }}</el-button> item.label }}</el-button>
</div> </div>
<div> <div>
@ -81,12 +81,12 @@ watch(() => sourceStore.query.fileSource,() => {
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.resoure-search { .resoure-search {
padding: 20px; padding: 15px;
border-bottom: solid #f1f1f1 1px; border-bottom: solid #f1f1f1 1px;
.tab-btns { .tab-btns {
.el-button { .el-button {
font-size: 16px; font-size: 18px;
} }
} }

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

@ -8,10 +8,6 @@ import { hasPermission } from '@/utils/hasPermission'
const userStore = useUserStore() const userStore = useUserStore()
const resourceTypeList = [ const resourceTypeList = [
{
label: '全部',
value: ''
},
...resourceType ...resourceType
] ]
const resourceFormatList = [ const resourceFormatList = [
@ -54,7 +50,7 @@ export default defineStore('resource', {
//资源格式 mp3 ppt ... //资源格式 mp3 ppt ...
fileSuffix: -1, fileSuffix: -1,
// 资源类型 课件 素材 教案 // 资源类型 课件 素材 教案
fileFlag: '', fileFlags: resourceType[0].value,
fileRoot: '资源', fileRoot: '资源',
fileName: '', fileName: '',
orderByColumn: 'uploadTime', orderByColumn: 'uploadTime',
@ -123,7 +119,7 @@ export default defineStore('resource', {
this.handleQuery() this.handleQuery()
}, },
changeType(val) { changeType(val) {
this.query.fileFlag = val this.query.fileFlags = val
this.handleQuery() this.handleQuery()
}, },
thirdChangeType(val) { thirdChangeType(val) {