Compare commits

..

No commits in common. "8a0b73d07bef241ad0e1ada69fc2bb66f40bce97" and "4066992aa20e0989999649621712dfebee24ceeb" have entirely different histories.

19 changed files with 341 additions and 918 deletions

View File

@ -17,7 +17,7 @@
"build:test": "electron-vite build --mode test && electron-builder --win --config ./electron-builder.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: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:lt": "electron-vite build --mode lt && electron-builder --win --config ./electron-builder-lt.yml",
"build:mac": "electron-vite build --mode production && electron-builder --mac --config ./electron-builder-prod.yml", "build:mac": "npm run build && electron-builder --mac",
"build:linux": "npm run build && electron-builder --linux" "build:linux": "npm run build && electron-builder --linux"
}, },
"dependencies": { "dependencies": {

View File

@ -88,10 +88,9 @@ function createLoginWindow() {
//主窗口 //主窗口
function createMainWindow() { function createMainWindow() {
mainWindow = new BrowserWindow({ mainWindow = new BrowserWindow({
width: 1350, width: 1200,
minWidth: 1200, minWidth: 1350,
height: 700, height: 700,
minHeight: 700,
show: false, show: false,
frame: false, // 无边框 frame: false, // 无边框
autoHideMenuBar: true, autoHideMenuBar: true,
@ -119,11 +118,6 @@ function createMainWindow() {
}, 1000) }, 1000)
// app.quit() // 主窗口关闭-结束所有进程 // app.quit() // 主窗口关闭-结束所有进程
}) })
mainWindow.on('resize', () => {
const { width, height } = mainWindow.getBounds();
mainWindow.webContents.send('minWinResize', { width, height });
});
mainWindow.webContents.setWindowOpenHandler((details) => { mainWindow.webContents.setWindowOpenHandler((details) => {
shell.openExternal(details.url) shell.openExternal(details.url)
return { action: 'deny' } return { action: 'deny' }
@ -135,7 +129,6 @@ function createMainWindow() {
} else { } else {
mainWindow.loadFile(join(__dirname, '../renderer/index.html')) mainWindow.loadFile(join(__dirname, '../renderer/index.html'))
} }
// mainWindow.setAlwaysOnTop(true, "screen-saver") // 将窗口设置为顶层窗口 // mainWindow.setAlwaysOnTop(true, "screen-saver") // 将窗口设置为顶层窗口
// mainWindow.setVisibleOnAllWorkspaces(true) // 如果窗口在所有工作区都可见 // mainWindow.setVisibleOnAllWorkspaces(true) // 如果窗口在所有工作区都可见
// 第三步: 开启remote服务 // 第三步: 开启remote服务

View File

@ -3144,7 +3144,7 @@ body{
background-color:var(--toolbar-bg-color); background-color:var(--toolbar-bg-color);
box-shadow:var(--toolbar-box-shadow); box-shadow:var(--toolbar-box-shadow);
border-bottom:var(--toolbar-border-bottom); border-bottom:var(--toolbar-border-bottom);
z-index: 99999; z-index: 9;
} }
#toolbarViewer{ #toolbarViewer{

View File

@ -6,7 +6,6 @@
<script setup> <script setup>
import { onMounted, ref } from 'vue'; import { onMounted, ref } from 'vue';
import { getAppInstallUrl } from '@/utils/tool'
const props = defineProps({ const props = defineProps({
url: { url: {
type: String, type: String,
@ -17,7 +16,7 @@ const props = defineProps({
/**pdf文件地址 */ /**pdf文件地址 */
const pdfUrl = ref(''); const pdfUrl = ref('');
/**pdfjs文件地址 */ /**pdfjs文件地址 */
const fileUrl = getAppInstallUrl('pdfjs-dist/web/viewer.html', 'user', '\\out\\renderer', true) + "?file=" // const fileUrl = '/pdfjs-dist/web/viewer.html?file=';
onMounted(() => { onMounted(() => {
/** 将传入的pdf地址进行编码防止中文识别错误 */ /** 将传入的pdf地址进行编码防止中文识别错误 */
pdfUrl.value = fileUrl + encodeURIComponent(props.url) pdfUrl.value = fileUrl + encodeURIComponent(props.url)

View File

@ -77,11 +77,12 @@ const changeBook = (data) => {
curBook.data = data curBook.data = data
sessionStore.set('subject.curBook', data) sessionStore.set('subject.curBook', data)
treeData.value = useSubject.getTreeData(data.id) treeData.value = useSubject.getTreeData(data.id)
sessionStore.set('subject.subjectTree', useSubject.getTreeData(data.id))
// //
nextTick(() =>{ nextTick(() =>{
defaultExpandedKeys.value = [treeData.value[0].id] defaultExpandedKeys.value = [treeData.value[0].id]
curNode.data = getLastLevelData(treeData.value)[0] curNode.data = getLastLevelData(treeData.value)[0]
handleNodeClick(curNode.data) handleNodeClick(curNode.data)
}) })
// //

View File

@ -1,5 +1,5 @@
<template> <template>
<el-dialog v-model="model" append-to-body :show-close="false" width="630" <el-dialog v-model="dialogVisible" append-to-body :show-close="false" width="630" :before-close="beforeClose"
style="border-radius: 5px;padding-top: 0"> style="border-radius: 5px;padding-top: 0">
<div class="dialog-title flex"> <div class="dialog-title flex">
<span>{{ title }}</span> <span>{{ title }}</span>
@ -7,13 +7,13 @@
</div> </div>
<div class="dialog-content"> <div class="dialog-content">
<div class="book-name flex" @click="bookVisible = true"> <div class="book-name flex" @click="bookVisible = true">
<span>{{ curNode.data.itemtitle }}</span> <span>{{ curBookName }}</span>
<i class="iconfont icon-yidongdaozu"></i> <i class="iconfont icon-yidongdaozu"></i>
</div> </div>
<el-scrollbar height="400px"> <el-scrollbar height="400px">
<div class="book-data"> <div class="book-data">
<el-tree :data="treeData" :props="defaultProps" node-key="id" <el-tree ref="refTree" :data="treeData" :props="defaultProps" node-key="id"
:default-expanded-keys="defaultExpandedKeys" :current-node-key="curNode.data.id" highlight-current :default-expanded-keys="defaultExpandedKeys" :current-node-key="currentNodeId" highlight-current
@node-click="handleNodeClick"> @node-click="handleNodeClick">
<template #default="{ node }"> <template #default="{ node }">
<span :title="node.label" class="tree-label">{{ node.label }}</span> <span :title="node.label" class="tree-label">{{ node.label }}</span>
@ -24,7 +24,7 @@
</div> </div>
<template #footer> <template #footer>
<div class="dialog-footer"> <div class="dialog-footer">
<el-button @click="model = false">取消</el-button> <el-button @click="closeDialog">取消</el-button>
<el-button type="primary" @click="onSubmit"> <el-button type="primary" @click="onSubmit">
确定 确定
</el-button> </el-button>
@ -43,12 +43,9 @@
<div class="textbook-container"> <div class="textbook-container">
<el-scrollbar height="450px"> <el-scrollbar height="450px">
<div class="textbook-item flex" v-for="item in subjectList" :class="curBook.data.id == item.id ? 'active-item' : ''" <div class="textbook-item flex" v-for="item in subjectList" :class="curBookId == item.id ? 'active-item' : ''"
:key="item.id" @click="changeBook(item)"> :key="item.id" @click="changeBook(item)">
<img v-if="item.avartar" :src="item.avartar.indexOf('http') === 0 ? item.avartar : BaseUrl + item.avartar" class="textbook-img" alt=""> <img :src="item.avartar" class="textbook-img" alt="">
<div v-else class="textbook-img">
<i class="iconfont icon-jiaocaixuanze" style="font-size: 40px;"></i>
</div>
<span class="book-name">{{ item.itemtitle }}</span> <span class="book-name">{{ item.itemtitle }}</span>
</div> </div>
</el-scrollbar> </el-scrollbar>
@ -57,10 +54,9 @@
</template> </template>
<script setup> <script setup>
import { ref, reactive, toRaw, onMounted, nextTick } from 'vue' import { ref, reactive, toRaw, onMounted, nextTick, watch } from 'vue'
import { sessionStore } from '@/utils/store' import useUserStore from '@/store/modules/user'
import { useGetSubject } from '@/hooks/useGetSubject' import { listEvaluation } from '@/api/subject'
import { cloneDeep } from 'lodash'
const props = defineProps({ const props = defineProps({
modelValue: { modelValue: {
@ -72,35 +68,134 @@ const props = defineProps({
default: '移动至' default: '移动至'
} }
}) })
const model = defineModel({ type: Boolean, default: false }) const userStore = useUserStore()
const BaseUrl = import.meta.env.VITE_APP_BUILD_BASE_PATH const { edustage, edusubject, userId } = userStore.user
let useSubject = null
const dialogVisible = ref(false)
const bookVisible = ref(false) const bookVisible = ref(false)
// //
const subjectList = ref([]) const subjectList = ref([])
const evaluationList = ref([])
const treeData = ref([]) const treeData = ref([])
const defaultProps = { const defaultProps = {
children: 'children', children: 'children',
label: 'itemtitle', label: 'label',
class: 'textbook-tree' class: 'textbook-tree'
} }
// //ID
const curBook = reactive({ const curBookId = ref(-1)
//
const curBookName = ref('')
//
const volumeOne = ref([])
//
const currentNode = reactive({
data: {} data: {}
}) })
// // ID
const curNode = reactive({ const currentNodeId = ref(0)
data:{} //
}) const currentNodeName = ref('')
//
let submitNode = null
// //
const defaultExpandedKeys = ref([]) const defaultExpandedKeys = ref([])
// tree
const refTree = ref(null)
// emit // emit
const emit = defineEmits(['onSubmit']) const emit = defineEmits(['update:modelValue', 'onSubmit'])
watch(() => props.modelValue, (newVal) => {
dialogVisible.value = newVal
})
const getSubjectContent = async () => {
const params = {
edusubject,
edustage,
// entpcourseedituserid: userId,
itemgroup: 'textbook',
orderby: 'orderidx asc',
pageSize: 10000
}
let data;
const { rows } = await listEvaluation(params)
localStorage.setItem('evaluationList', JSON.stringify(rows))
evaluationList.value = rows
data = rows
//
getSubject()
//
/**
* 不区分上下册
* 2024/08/20调整
*/
// volumeOne.value = data.filter(item => item.level == 1)
getTreeData()
}
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
localStorage.setItem('subjectList', JSON.stringify(subjectList.value))
}
//
if(!subjectList.value.length) return
curBookName.value = subjectList.value[0].itemtitle
curBookId.value = subjectList.value[0].id
}
const isHaveUnit = (id) => {
return evaluationList.value.some(item => {
return item.rootid == id
})
}
const getTreeData = () => {
//
let upData = transData(evaluationList.value)
if(upData.length){
treeData.value = [...upData]
}
else{
treeData.value = []
return
}
nextTick(() => {
defaultExpandedKeys.value = [treeData.value[0].id]
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
}
let parentNode = findParentByChildId(treeData.value, currentNodeId.value)
curNode.parentNode = toRaw(parentNode)
const data = {
textBook: {
curBookId: curBookId.value,
curBookName: curBookName.value
},
node: curNode
}
currentNode.data = data
}
// id // id
const findParentByChildId = (treeData, targetNodeId) => { const findParentByChildId = (treeData, targetNodeId) => {
@ -124,32 +219,70 @@ const findParentByChildId = (treeData, targetNodeId) => {
return null; return null;
} }
const handleNodeClick = (data) => { const handleNodeClick = (data, node) => {
/** /**
* data : 当前节点数据 * data : 当前节点数据
* node : 当前节点对象 包含当前节点所有数据 parent属性 指向父节点Node对象
*/ */
let nodeData = cloneDeep(toRaw(data)); const nodeData = data;
//label label const parentNode = node.parent.data;
nodeData.label = nodeData.itemtitle
// null if (Array.isArray(parentNode)) {
let parent = { nodeData.parentNode = null
id: nodeData.parentid, }
label: nodeData.parenttitle, else {
itemtitle: nodeData.parenttitle nodeData.parentNode = parentNode
} }
const parentNode = nodeData.parentid ? parent : null
nodeData.parentNode = parentNode
let curData = { let curData = {
textBook: { textBook: {
curBookId: curBook.data.id, curBookId: curBookId.value,
curBookName: curBook.data.itemtitle curBookName: curBookName.value
}, },
node: nodeData node: toRaw(nodeData)
} }
submitNode = curData
currentNode.data = curData
// emit('nodeClick', curData)
} }
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 getLastLevelData = (tree) => { const getLastLevelData = (tree) => {
let lastLevelData = []; let lastLevelData = [];
@ -174,53 +307,33 @@ const getLastLevelData = (tree) => {
} }
// //
const changeBook = (data) => { const changeBook = ({ id, itemtitle }) => {
curBook.data = data curBookId.value = id
treeData.value = useSubject.getTreeData(data.id) curBookName.value = itemtitle
getTreeData()
//
nextTick(() =>{
defaultExpandedKeys.value = [treeData.value[0].id]
curNode.data = getLastLevelData(treeData.value)[0]
handleNodeClick(curNode.data)
})
setTimeout(() => { setTimeout(() => {
bookVisible.value = false bookVisible.value = false
}, 0); }, 0);
} }
const onSubmit = () => { const onSubmit = () => {
emit('onSubmit', submitNode) emit('onSubmit', toRaw(currentNode.data))
model.value = false closeDialog()
} }
onMounted(async () => { const closeDialog = () => {
// emit('update:modelValue', false)
useSubject = await useGetSubject() }
subjectList.value = sessionStore.get('subject.bookList')
//
if(sessionStore.get('subject.curBook')){
curBook.data = sessionStore.get('subject.curBook')
}
else{
curBook.data = subjectList.value[0]
}
// "" //
treeData.value = useSubject.getTreeData(curBook.data.id) const beforeClose = (done) => {
nextTick(() =>{ emit('update:modelValue', false)
// done()
if(sessionStore.get('subject.curNode')){ }
defaultExpandedKeys.value = sessionStore.get('subject.defaultExpandedKeys')
curNode.data = sessionStore.get('subject.curNode')
}else{
defaultExpandedKeys.value = [treeData.value[0].id]
curNode.data = getLastLevelData(treeData.value)[0]
}
handleNodeClick(curNode.data)
})
onMounted(() => {
getSubjectContent()
}) })
</script> </script>

View File

@ -63,6 +63,7 @@ export const useGetSubject = async () =>{
} }
sessionStore.set('subject.curNode', curNode) sessionStore.set('subject.curNode', curNode)
} }
} }
// 单元章节数据转为“树”结构 // 单元章节数据转为“树”结构
@ -72,7 +73,9 @@ export const useGetSubject = async () =>{
data.forEach( item => { data.forEach( item => {
item.children = unitList.value.filter( item2 => item2.parentid == item.id && item2.level == 2) item.children = unitList.value.filter( item2 => item2.parentid == item.id && item2.level == 2)
}) })
sessionStore.set('subject.subjectTree', data)
return data return data
} }
await getSubjectUnit() await getSubjectUnit()

View File

@ -67,7 +67,7 @@ const title = reactive([
}, },
{ {
name: '教材分析', name: '教材分析',
url: '/textbookAnalysis', url: '/teaching/chatwithtextbook',
img: 'iconfont icon-yanjiushi', img: 'iconfont icon-yanjiushi',
child1: [] child1: []
}, },

View File

@ -70,8 +70,10 @@ import { ArrowDown } from '@element-plus/icons-vue'
import WindowTools from '@/components/window-tools/index.vue' import WindowTools from '@/components/window-tools/index.vue'
import useUserStore from '@/store/modules/user' import useUserStore from '@/store/modules/user'
import { updateUserInfo } from '@/api/system/user' import { updateUserInfo } from '@/api/system/user'
import outLink from '@/utils/linkConfig'
import logoIco from '@/assets/images/logo.png' import logoIco from '@/assets/images/logo.png'
import { listEvaluation } from '@/api/classManage/index' import { listEvaluation } from '@/api/classManage/index'
import { clearBookInfo } from '@/utils/ruoyi'
import { sessionStore } from '@/utils/store' import { sessionStore } from '@/utils/store'
import { useToolState } from '@/store/modules/tool' import { useToolState } from '@/store/modules/tool'
@ -173,13 +175,7 @@ function setLayout() {
} }
// //
const changeSubject = async (command) =>{ const changeSubject = async (command) =>{
let sessionSubject = { clearBookInfo()
bookList: null,
curBook: null,
curNode: null,
defaultExpandedKeys: [],
}
sessionStore.set( 'subject', sessionSubject)
const { userId, userName, phonenumber, plainpwd } = userStore.user const { userId, userName, phonenumber, plainpwd } = userStore.user
const data = { const data = {
userId, userId,
@ -188,7 +184,7 @@ const changeSubject = async (command) =>{
edusubject: command.edusubject edusubject: command.edusubject
} }
await updateUserInfo(data) await updateUserInfo(data)
await userStore.login({username: phonenumber ? phonenumber : userName, password: plainpwd}) await userStore.login({username: phonenumber, password: plainpwd})
await userStore.getInfo() await userStore.getInfo()
router.go() router.go()
} }

View File

@ -54,13 +54,7 @@ export const constantRoutes = [
path: '/standardanalysis', path: '/standardanalysis',
component: () => import('@/views/teach/standardAnalysis/index.vue'), component: () => import('@/views/teach/standardAnalysis/index.vue'),
name: 'standardanalysis', name: 'standardanalysis',
meta: {title: '课标分析'} meta: {title: '课标分析'},
},
{
path: '/textbookAnalysis',
component: () => import('@/views/textbookAnalysis/index.vue'),
name: 'textbookAnalysis',
meta: {title: '教材分析'}
}, },
{ {
path: '/profile', path: '/profile',

View File

@ -49,18 +49,6 @@ export const getStaticUrl = (url = '', type = 'app', exitPath = '', isFile = fal
} }
} }
} }
export const getAppInstallUrl = (url = '', type = 'app', exitPath = '', isFile = false) => {
if (isDev) return url
else { // 生产环境获取-url
switch(type) {
case 'app': return path.join(__dirname, url) // 应用目录
case 'user': return (isFile?'file://':'')+path.join(Remote.app.getAppPath(),exitPath, url) // 用户目录
// case 'user': return (isFile?'file://':'')+path.join(Remote.app.getPath('userData'),exitPath, url) // 用户目录
default: return ''
}
}
}
/** /**
* @description 消息发送-nodejs 消息发送 * @description 消息发送-nodejs 消息发送
* @form src/main/tool.js 来源 * @form src/main/tool.js 来源

View File

@ -26,9 +26,9 @@
<!-- <el-button type="primary" icon="Postcard" @click="handleNewClassWorkDialog" style="margin-left: 20px; margin-top: 10px">{{initDataProps.queryType!=='single'?'设计新作业':'设计新活动'}}</el-button> <!-- <el-button type="primary" icon="Postcard" @click="handleNewClassWorkDialog" style="margin-left: 20px; margin-top: 10px">{{initDataProps.queryType!=='single'?'设计新作业':'设计新活动'}}</el-button>
<el-button v-if="initDataProps.queryType!=='single'" type="success" icon="Promotion" @click="handleTaskAssignToAllClass()" style="margin-left: 20px; margin-top: 10px">一键推送</el-button> <el-button v-if="initDataProps.queryType!=='single'" type="success" icon="Promotion" @click="handleTaskAssignToAllClass()" style="margin-left: 20px; margin-top: 10px">一键推送</el-button>
<el-button type="danger" icon="delete" @click="handleDelete" style="margin-left: 20px; margin-top: 10px">删除</el-button> --> <el-button type="danger" icon="delete" @click="handleDelete" style="margin-left: 20px; margin-top: 10px">删除</el-button> -->
<el-button type="primary" style="margin-left: 20px; margin-top: 10px" @click="handleNewClassWorkDialog">设计新作业</el-button> <el-button type="primary" @click="handleNewClassWorkDialog" style="margin-left: 20px; margin-top: 10px">设计新作业</el-button>
<el-button type="success" style="margin-left: 20px; margin-top: 10px" @click="handleTaskAssignToAllClass()">一键推送</el-button> <el-button type="success" @click="handleTaskAssignToAllClass()" style="margin-left: 20px; margin-top: 10px">一键推送</el-button>
<el-button type="danger" style="margin-left: 20px; margin-top: 10px" @click="handleDelete">删除</el-button> <el-button type="danger" @click="handleDelete" style="margin-left: 20px; margin-top: 10px">删除</el-button>
</div> </div>
</el-col> </el-col>
</el-row> </el-row>
@ -71,14 +71,14 @@
<template #default="scope"> <template #default="scope">
<div style="border: 1px solid #ccc; width: 100%; height: auto; display: flex; justify-content: space-between; padding-left: 10px"> <div style="border: 1px solid #ccc; width: 100%; height: auto; display: flex; justify-content: space-between; padding-left: 10px">
<div style="display: flex; margin-top: 5px"> <div style="display: flex; margin-top: 5px">
<div class="singe-line" style="max-width: 200px" v-html="scope.row.title"></div> <div v-html="scope.row.title" style="max-width: 200px" class="singe-line"></div>
</div> </div>
<div> <div>
<div v-if="scope.row.status == '10'"> <div v-if="scope.row.status == '10'">
<el-button v-hasPermi="['teaching:classwork:edit']" text @click="handleWorkTitleEdit(scope.row, scope.$index)">编辑</el-button> <el-button text @click="handleWorkTitleEdit(scope.row, scope.$index)" v-hasPermi="['teaching:classwork:edit']">编辑</el-button>
</div> </div>
<div v-else> <div v-else>
<el-button v-hasPermi="['teaching:classwork:edit']" text @click="handleWorkTitleEdit(scope.row, scope.$index)">查看详情</el-button> <el-button text @click="handleWorkTitleEdit(scope.row, scope.$index)" v-hasPermi="['teaching:classwork:edit']">查看详情</el-button>
</div> </div>
</div> </div>
</div> </div>
@ -112,19 +112,19 @@
<el-table-column label="题目内容" align="left" > <el-table-column label="题目内容" align="left" >
<template #default="scope"> <template #default="scope">
<div> <div>
<div style="overflow: hidden; text-overflow: ellipsis; font-weight:700" v-html="scope.row.titleFormat"></div> <div v-html="scope.row.titleFormat" style="overflow: hidden; text-overflow: ellipsis; font-weight:700"></div>
<div style="overflow: hidden; text-overflow: ellipsis; margin-top: 6px;" v-html="scope.row.workdescFormat"></div> <div v-html="scope.row.workdescFormat" style="overflow: hidden; text-overflow: ellipsis; margin-top: 6px;"></div>
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="分值" align="center" width="180"> <el-table-column label="分值" align="center" width="180">
<template #default="scope"> <template #default="scope">
<el-input-number v-model="scope.row.score" :min="1" :max="100" :disabled="checkTaskAssigned(currentWorkEdit.currentTask)"></el-input-number > <el-input-number v-model="scope.row.score" :min="1" :max="100" :disabled="taskParams.viewkey=='作业反馈'||checkTaskAssigned(currentTask)"></el-input-number >
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" width="100"> <el-table-column label="操作" align="center" width="100">
<template #default="scope"> <template #default="scope">
<el-button :disabled="checkTaskAssigned(currentWorkEdit.currentTask)" @click="handleWorkConfigQuizMinus(scope.$index)">删除</el-button> <el-button @click="handleWorkConfigQuizMinus(scope.$index)" :disabled="taskParams.viewkey=='作业反馈'||checkTaskAssigned(currentTask)">删除</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -133,9 +133,9 @@
<div slot="footer" class="dialog-footer" style="text-align: right; margin-top: 20px;"> <div slot="footer" class="dialog-footer" style="text-align: right; margin-top: 20px;">
<div style="display: flex"> <div style="display: flex">
<el-button v-if="currentTag=='习题训练'" style="margin-right: auto" type="primary" <el-button v-if="currentTag=='习题训练'" style="margin-right: auto" type="primary"
:disabled="checkTaskAssigned(currentWorkEdit.currentTask)" @click="handleWorkEdit2ClassWorkQuizAdd">添加作业</el-button> @click="handleWorkEdit2ClassWorkQuizAdd" :disabled="taskParams.viewkey=='作业反馈'||checkTaskAssigned(currentTask)">添加作业</el-button>
<el-button type="primary" style="margin-left: auto" :disabled="checkTaskAssigned(currentWorkEdit.currentTask)" <el-button type="primary" style="margin-left: auto" @click="submitStudy('submit')"
@click="submitStudy('submit')"> </el-button> :disabled="taskParams.viewkey=='作业反馈'||checkTaskAssigned(currentTask)"> </el-button>
</div> </div>
</div> </div>
@ -143,10 +143,10 @@
<!-- 作业说明编辑 --> <!-- 作业说明编辑 -->
<el-dialog v-model="currentWorkEdit.workTitleEdit" title="作业说明编辑" width="70%" append-to-body> <el-dialog v-model="currentWorkEdit.workTitleEdit" title="作业说明编辑" width="70%" append-to-body>
<el-input v-model="currentWorkEdit.currentTitle" type="textarea" rows="5" placeholder="请输入作业说明" :disabled="checkTaskAssigned(currentWorkEdit.currentTask)"/> <el-input v-model="currentTitle" type="textarea" rows="5" placeholder="请输入作业说明" :disabled="taskParams.viewkey=='作业反馈'||checkTaskAssigned(currentTask)"/>
<div slot="footer" class="dialog-footer" style="text-align: right; margin-top: 20px;"> <div slot="footer" class="dialog-footer" style="text-align: right; margin-top: 20px;">
<el-button type="primary" :disabled="checkTaskAssigned(currentWorkEdit.currentTask)" <el-button type="primary" @click="submitWorkTitle('submit')"
@click="submitWorkTitle('submit')"> </el-button> :disabled="taskParams.viewkey=='作业反馈'||checkTaskAssigned(currentTask)"> </el-button>
</div> </div>
</el-dialog> </el-dialog>
</div> </div>
@ -154,12 +154,9 @@
</template> </template>
<script setup> <script setup>
import { onMounted, ref, toRaw,watch, reactive, getCurrentInstance } from 'vue' import { onMounted, ref, toRaw,watch, reactive } from 'vue'
import { ElMessage } from 'element-plus'
import ChooseTextbook from '@/components/choose-textbook/index.vue' import ChooseTextbook from '@/components/choose-textbook/index.vue'
import { homeworklist, delClasswork } from '@/api/teaching/classwork' import { homeworklist, listEntpcoursework, listClassworkeval } from '@/api/teaching/classwork'
import { listEntpcoursework, listClassworkeval,updateClasswork } from '@/api/classTask'
import { useGetHomework } from '@/hooks/useGetHomework' import { useGetHomework } from '@/hooks/useGetHomework'
import { processList } from '@/hooks/useProcessList' import { processList } from '@/hooks/useProcessList'
@ -167,7 +164,6 @@ import { processList } from '@/hooks/useProcessList'
import { getCurrentTime } from '@/utils/date' import { getCurrentTime } from '@/utils/date'
import useUserStore from '@/store/modules/user' import useUserStore from '@/store/modules/user'
const userStore = useUserStore().user const userStore = useUserStore().user
const { proxy } = getCurrentInstance()
const props = defineProps({ const props = defineProps({
initDataProps: { initDataProps: {
@ -236,30 +232,6 @@ const getData = (data) => {
localStorage.setItem('unitId', JSON.stringify({ levelFirstId, levelSecondId})) localStorage.setItem('unitId', JSON.stringify({ levelFirstId, levelSecondId}))
} }
/**
* 删除按钮操作 TODO 待完善
* */
const handleDelete =() => {
let rows = proxy.$refs.taskTable.getSelectionRows();
if (rows.length > 0) {
proxy.$modal.confirm('是否确认选中的学习任务?').then(()=> {
let ids = [];
for (let i = 0; i < rows.length; i++) {
ids.push(rows[i].id);
}
return delClasswork(ids.join(','));
}).then(() => {
setTimeout(() => {
getTaskList();
}, 1500);
proxy.$modal.msgSuccess("删除成功");
}).catch(() => {})
}else{
proxy.$modal.alertWarning("请选择删除项")
}
};
/** /**
* 1.获取作业列表 * 1.获取作业列表
*/ */
@ -450,54 +422,6 @@ const handleWorkEdit = (row, index) =>{
} }
}; };
// -
const submitWorkTitle = () => {
console.log(taskList.value)
console.log(currentWorkEdit)
// ? taskList currentIndex
// if (taskList.value[currentWorkEdit.currentIndex].title == currentWorkEdit.currentTitle) {
// currentWorkEdit.workTitleEdit = false;
// return;
// }
taskList.value&&taskList.value.forEach((item)=>{
if(item.children.length>0){
item.children.map(_item=>{
if(_item.title == currentWorkEdit.currentTitle){
currentWorkEdit.workTitleEdit = false;
return;
}
})
}else{
if(item.title == currentWorkEdit.currentTitle){
currentWorkEdit.workTitleEdit = false;
return;
}
}
})
console.log('有更改!')
//
taskList.value[currentWorkEdit.currentIndex].title = currentWorkEdit.currentTitle;
updateClasswork({id: taskList.value[currentWorkEdit.currentIndex].id, title: currentWorkEdit.currentTitle}).then(response => {
ElMessage("修改成功");
currentWorkEdit.workTitleEdit = false;
//this.getClassWorkAllList();
});
};
//
const checkTaskAssigned = (row) => {
console.log(row,'checkTaskAssigned')
// taskconfigid0
let bAssigned = false;
for (let i=0; i<row.taskconfig.length; i++) {
if (row.taskconfig[i].id != 0) {
bAssigned = true;
return bAssigned;
}
}
return bAssigned;
};
/** /**
* 表格子项背景暗调 * 表格子项背景暗调

View File

@ -34,15 +34,30 @@
<script setup> <script setup>
import { ref, onMounted } from 'vue' import { ref, onMounted } from 'vue'
import useUserStore from '@/store/modules/user' import useUserStore from '@/store/modules/user'
import { getSelfReserv } from '@/api/classManage'
import { homeworklist } from '@/api/teaching/classwork' import { homeworklist } from '@/api/teaching/classwork'
import { getCurrentTime, getTomorrow } from '@/utils/date' import { getCurrentTime, getTomorrow } from '@/utils/date'
import ItemDialog from '@/views/classTask/container/item-dialog.vue' import ItemDialog from '@/views/classTask/container/item-dialog.vue'
const type = ref(-1)
const user = useUserStore().user const user = useUserStore().user
const loading = ref(false) const loading = ref(false)
const classList = ref([])
const homeworkList = ref([]) const homeworkList = ref([])
const itemDialogRef = ref(null) const itemDialogRef = ref(null)
//
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 () => { const getHomework = async () => {
loading.value = true loading.value = true
@ -84,16 +99,16 @@ const tagType = (time) => {
onMounted(() => { onMounted(() => {
// getClass()
getHomework() getHomework()
}) })
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.desktop-work-item { .desktop-work-item {
width: 100%; align-items: center;
height: 100%; height: 100%;
display: flex;
flex-direction: column;
.item-title { .item-title {
height: 32px; height: 32px;
text-align: left; text-align: left;
@ -112,7 +127,7 @@ onMounted(() => {
border-radius: 5px; border-radius: 5px;
padding: 10px 15px; padding: 10px 15px;
font-size: 13px; font-size: 13px;
flex: 1; height: calc(100% - 60px);
.class-item { .class-item {
justify-content: space-between; justify-content: space-between;

View File

@ -1,40 +1,40 @@
<template> <template>
<div class="page-desktop"> <div class="page-desktop">
<el-row :gutter="20" style="height: 100%;"> <el-row :gutter="20">
<el-col :span="17" class="desktop-left"> <el-col :span="17">
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="item.span" v-for="item in menuList" :key="item.id"> <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">
<ul class="flex con-ul"> <ul class="flex con-ul">
<li v-for="menu in item.list" :key="menu.id" @click="clickMenu(menu)" class="flex item-menu" :class="menu.disabled ? 'menu-disabled' : ''"> <li v-for="menu in item.list" :key="menu.id" @click="clickMenu(menu)" class="flex item-menu" :class="menu.disabled ? 'menu-disabled' : ''">
<i class="iconfont" :class="menu.icon"></i> <i class="iconfont" :class="menu.icon"></i>
<span>{{ menu.name }}</span> <span>{{ menu.name }}</span>
</li> </li>
</ul> </ul>
</div>
</div> </div>
</el-col> </div>
</el-row> </el-col>
<el-row style="height: 100%;"> </el-row>
<el-col :span="24"> <el-row>
<div class="desktop-item-chart"> <el-col :span="24">
<div class="item-title flex"> <div class="desktop-item">
<span>教学进度</span> <div class="item-title flex">
</div> <span>教学进度</span>
<div class="item-content">
<div ref="chartDom" class="chart-box"></div>
</div>
</div> </div>
</el-col> <div class="item-content">
</el-row> <div ref="chartDom" class="chart-box"></div>
</el-col> </div>
<el-col :span="7" style="flex: 1;"> </div>
<!--工作动态--> </el-col>
<workTrend/> </el-row>
</el-col> </el-col>
</el-row> <el-col :span="7">
<!--工作动态-->
<workTrend/>
</el-col>
</el-row>
</div> </div>
</template> </template>
@ -42,12 +42,11 @@
<script setup> <script setup>
import { ref, onMounted, nextTick } from 'vue' import { ref, onMounted, nextTick } from 'vue'
import { useRouter } from 'vue-router' import { useRouter } from 'vue-router'
import * as echarts from 'echarts'
import workTrend from './container/work-trend.vue' import workTrend from './container/work-trend.vue'
import outLink from '@/utils/linkConfig' import outLink from '@/utils/linkConfig'
import * as echarts from 'echarts'
import { useGetSubject } from '@/hooks/useGetSubject' import { useGetSubject } from '@/hooks/useGetSubject'
import { sessionStore } from '@/utils/store' import { sessionStore } from '@/utils/store'
import { debounce } from 'lodash'
const router = useRouter() const router = useRouter()
const { ipcRenderer } = window.electron || {} const { ipcRenderer } = window.electron || {}
@ -67,7 +66,8 @@ const menuList = [{
{ {
name: '教材分析', name: '教材分析',
icon: 'icon-jiaocaixuanze', icon: 'icon-jiaocaixuanze',
path: '/textbookAnalysis', isOuter: true,
path: '/teaching/chatwithtextbook',
id: '1-2' id: '1-2'
}, },
{ {
@ -106,7 +106,10 @@ const menuList = [{
icon: 'icon-jiaoxuefansi', icon: 'icon-jiaoxuefansi',
isOuter: true, isOuter: true,
path: '/teaching/classtaskassign?titleName=作业布置&openDialog=newClassTask', path: '/teaching/classtaskassign?titleName=作业布置&openDialog=newClassTask',
// path: '/newClassTask', // path: '/newClassTask'
//path: '/classTaskAssign'
//isOuter: true,
//path: '/teaching/classtaskassign?titleName=&&openDialog=newClassTask'
id: '2-1' id: '2-1'
}, },
{ {
@ -114,8 +117,8 @@ const menuList = [{
icon: 'icon-xiezuo1', icon: 'icon-xiezuo1',
isOuter: true, isOuter: true,
path: '/teaching/classtaskassign?titleName=作业布置', path: '/teaching/classtaskassign?titleName=作业布置',
// path: '/classTaskAssign',
id: '2-2' id: '2-2'
// path: '/classTaskAssign'
}, },
{ {
name: '作业批改', name: '作业批改',
@ -192,10 +195,6 @@ const clickMenu = ({isOuter, path, disabled, id}) =>{
} }
} }
ipcRenderer.on('minWinResize', debounce((e, data) =>{
chartInstance.resize()
}, 100))
onMounted(async ()=>{ onMounted(async ()=>{
await useGetSubject() await useGetSubject()
@ -255,10 +254,7 @@ onMounted(async ()=>{
.page-desktop{ .page-desktop{
height: 100%; height: 100%;
padding-top: 20px; padding-top: 20px;
.desktop-left{
display: flex;
flex-direction: column;
}
.desktop-item{ .desktop-item{
margin-bottom: 20px; margin-bottom: 20px;
.item-title{ .item-title{
@ -306,30 +302,12 @@ onMounted(async ()=>{
} }
} }
} }
.chart-box{
height: 220px;
}
} }
} }
} }
.desktop-item-chart{
height: 100%;
display: flex;
flex-direction: column;
.item-title{
height: 32px;
font-size: 18px;
font-weight: bold;
margin-bottom: 10px;
align-items: center;
}
.item-content{
background: #fff;
flex: 1;
.chart-box{
height: 100%;
}
}
}
</style> </style>

View File

@ -1,10 +1,10 @@
<template> <template>
<el-dialog v-model="visible" width="35%" :close-on-click-modal="false" <el-dialog v-model="visible" width="75%" :close-on-click-modal="false"
@close="handleClose"> @close="handleClose">
<template #header><div style="width: 100%;text-align: left"><b>开始上课APT</b></div></template> <template #header><b>准备开始上课</b></template>
<div class="class-all"> <div class="class-all">
<el-row> <el-row>
<!-- <el-col :span="10"> <el-col :span="10">
<c-form v-bind="classForm"> <c-form v-bind="classForm">
<template #item_classid="{prop, form}"> <template #item_classid="{prop, form}">
<el-select v-model="form[prop]" placeholder="请选择班级"> <el-select v-model="form[prop]" placeholder="请选择班级">
@ -20,16 +20,8 @@
</el-scrollbar> </el-scrollbar>
</template> </template>
</c-form> </c-form>
</el-col>--> </el-col>
<el-col :span="24"> <el-col :span="14">
<c-form v-bind="classForm">
<template #item_classid="{prop, form}">
<el-select v-model="form[prop]" placeholder="请选择班级">
<el-option v-for="item in listData.classList" :value="item.id"
:label="`${item.caption} (${item.classstudentcount}人)`" />
</el-select>
</template>
</c-form>
<c-form v-bind="teacherForm"> <c-form v-bind="teacherForm">
<!-- 上课 --> <!-- 上课 -->
<template #item_classcourseid="{prop,form}"> <template #item_classcourseid="{prop,form}">
@ -52,7 +44,7 @@
<div :title="value" v-if="!!value"> <div :title="value" v-if="!!value">
<vue-qr :text="value" :size="200" :margin="10" colorDark="green" colorLight="white" :logoSrc="getStaticUrl('/img/logo.png')" :logoScale="0.2" :dotScale="0.7"></vue-qr> <vue-qr :text="value" :size="200" :margin="10" colorDark="green" colorLight="white" :logoSrc="getStaticUrl('/img/logo.png')" :logoScale="0.2" :dotScale="0.7"></vue-qr>
</div> </div>
<!-- <el-button type="warning" :loading="dt.loadingDel" @click="removeClasscourse()">删除记录</el-button>--> <el-button type="warning" :loading="dt.loadingDel" @click="removeClasscourse()">删除记录</el-button>
</template> </template>
<!-- 手机登录 --> <!-- 手机登录 -->
<template #item_mobile> <template #item_mobile>
@ -98,6 +90,7 @@ const visible = ref(false) // 是否打开窗口
const myClassActive = ref({}) // APT const myClassActive = ref({}) // APT
const imChatRef = ref(null) // im-chat ref const imChatRef = ref(null) // im-chat ref
const emit = defineEmits(['close']) const emit = defineEmits(['close'])
const classForm = reactive({ // () const classForm = reactive({ // ()
form: {}, itemOption: [], option: {} form: {}, itemOption: [], option: {}
}) })
@ -151,16 +144,15 @@ const handleClose = async () => {
// - // -
const initData = () => { const initData = () => {
// - // -
classForm.option = { labelW: 80 } classForm.option = { labelW: 40 }
classForm.itemOption = [ classForm.itemOption = [
{ label: '班级', prop: 'classid' }, { label: '班级', prop: 'classid' },
// { label: '', prop: 'student' }, { label: '学生', prop: 'student' },
] ]
// - // -
teacherForm.form = { classcourseid: 0 } teacherForm.form = { classcourseid: 0 }
teacherForm.itemOption = [ teacherForm.itemOption = [
// { label: '', prop: 'classid' }, { label: '上课', prop: 'classcourseid' },
// { label: '', prop: 'classcourseid' },
{ label: '老师扫码', prop: 'qrUrl', show: false }, { label: '老师扫码', prop: 'qrUrl', show: false },
{ label: '手机登录', prop: 'mobile', show: false }, { label: '手机登录', prop: 'mobile', show: false },
{ label: '故障备用', prop: 'backup', show: false }, { label: '故障备用', prop: 'backup', show: false },
@ -195,9 +187,9 @@ const getClassList = async () => {
return o return o
}); });
// //
/*if (listData.classList.length > 0) { if (listData.classList.length > 0) {
classForm.form.classid = listData.classList[0].id classForm.form.classid = listData.classList[0].id
}*/ }
} }
} }
@ -225,12 +217,8 @@ const getClasscourseList = async type => {
} }
// //
const createClasscourse = async () => { const createClasscourse = async () => {
const { classid } = classForm.form
if (!classid) {
ElMessage.warning('请选择班级')
return
}
dt.loading = true dt.loading = true
const { classid } = classForm.form
const { entpcourseid, evalid, id, coursetitle } = myClassActive.value // const { entpcourseid, evalid, id, coursetitle } = myClassActive.value //
const curDate = commUtil.getDateNow('yyyy-MM-dd') const curDate = commUtil.getDateNow('yyyy-MM-dd')
const params = { const params = {

View File

@ -2,10 +2,10 @@
<el-dialog <el-dialog
v-model="centerDialogVisible" v-model="centerDialogVisible"
class="reserv-dialog" class="reserv-dialog"
title="开始上课PPT" title="上课"
destroy-on-close destroy-on-close
:before-close="closeDialog" :before-close="closeDialog"
width="35%" width="600"
style="text-align: left" style="text-align: left"
> >
<el-form <el-form
@ -15,7 +15,7 @@
label-width="auto" label-width="auto"
style="max-width: 600px" style="max-width: 600px"
> >
<!-- <el-form-item label="课程名称" prop="name"> <el-form-item label="课程名称" prop="name">
<el-input v-model="form.name" /> <el-input v-model="form.name" />
</el-form-item> </el-form-item>
<el-form-item label="课程类型" prop="type"> <el-form-item label="课程类型" prop="type">
@ -59,21 +59,17 @@
/> />
</el-col> </el-col>
</el-form-item> </el-form-item>
</el-form-item>--> </el-form-item>
<el-form-item label-width="80px" label="班级" prop="resource"> <el-form-item label="授课对象" prop="resource">
<el-select v-model="form.resource" placeholder="请选择班级"> <el-checkbox-group v-model="form.resource">
<el-option v-for="(item, index) in classList" :value="item.id"
:label="`${item.caption} (${item.classstudentcount}人)`" />
</el-select>
<!-- <el-checkbox-group v-model="form.resource">
<el-checkbox v-for="(item, index) in classList" :key="index" name="type" :value="item.id" <el-checkbox v-for="(item, index) in classList" :key="index" name="type" :value="item.id"
>{{ item.caption }}({{ item.classstudentcount }}) >{{ item.caption }}({{ item.classstudentcount }})
</el-checkbox> </el-checkbox>
</el-checkbox-group>--> </el-checkbox-group>
</el-form-item> </el-form-item>
<!-- <el-form-item label="教室" prop="classRoom"> <el-form-item label="教室" prop="classRoom">
<el-input v-model="form.classRoom" /> <el-input v-model="form.classRoom" />
</el-form-item>--> </el-form-item>
</el-form> </el-form>
<template #footer> <template #footer>
<div class="dialog-footer"> <div class="dialog-footer">
@ -276,7 +272,7 @@ const updateClassReserv = (formData) => {
}) })
} }
const addClassReserv = (formData) => { const addClassReserv = (formData) => {
let ids = formData.resource let ids = formData.resource.join(',')
// //
if(!props.bookId){ if(!props.bookId){
ElMessage.warning('请选择教材') ElMessage.warning('请选择教材')
@ -297,10 +293,10 @@ const addClassReserv = (formData) => {
addSmartClassReserv(param).then((res) => { addSmartClassReserv(param).then((res) => {
if (res.msg) { if (res.msg) {
closeDialog() closeDialog()
/*ElMessage({ ElMessage({
type: 'success', type: 'success',
message: '预约成功!' message: '预约成功!'
})*/ })
emit('addSuccess',res.msg) emit('addSuccess',res.msg)
} else { } else {
ElMessage({ ElMessage({

View File

@ -313,6 +313,7 @@ export default {
this.openReserv() this.openReserv()
} }
if(item.fileFlag === 'apt') { if(item.fileFlag === 'apt') {
//TODO apt - fileId: aptId
this.$refs.calssRef.open(item.fileId) this.$refs.calssRef.open(item.fileId)
} }
// -store // -store
@ -511,7 +512,6 @@ export default {
}) })
this.currentFileList.splice(index, 1) this.currentFileList.splice(index, 1)
}) })
ElMessage.success('操作成功')
} }
}) })
}, },

View File

@ -70,10 +70,7 @@
</div> </div>
<el-dialog v-model="dialogVisible" title="切换教材" append-to-body width="550"> <el-dialog v-model="dialogVisible" title="切换教材" append-to-body width="550">
<div class="booklist"> <div class="booklist">
<div :class="{'item': true,'active': booksel === idx}" v-for="item,idx in bookList" :key="idx" @click="bookChange(item,idx)"> <div :class="{'item': true,'active': booksel === idx}" v-for="item,idx in bookList" :key="idx" @click="bookChange(item)">{{item.edustage + item.edusubject}}</div>
<el-image class="bookimg" :src="item.avartar" />
<div class="bookname">{{item.fileurl.replace('.txt', '')}}</div>
</div>
</div> </div>
</el-dialog> </el-dialog>
</div> </div>
@ -240,6 +237,8 @@ const getData = (data) => {
} }
sourceStore.handleQuery() sourceStore.handleQuery()
getlistEvaluationclue(levelFirstId, levelSecondId) getlistEvaluationclue(levelFirstId, levelSecondId)
// ID
localStorage.setItem('unitId', JSON.stringify({ levelFirstId, levelSecondId}))
} }
// //
const getAllSubject = async () => { const getAllSubject = async () => {
@ -253,16 +252,12 @@ const getAllSubject = async () => {
bookList.value.push({...item,avartar: import.meta.env.VITE_APP_BUILD_BASE_PATH + item.avartar}) bookList.value.push({...item,avartar: import.meta.env.VITE_APP_BUILD_BASE_PATH + item.avartar})
} }
}) })
const textselidx = bookList.value.findIndex(item => item.edustage === edustage && item.edusubject === edusubject) booksel.value = bookList.value.findIndex(item => item.edustage === edustage && item.edusubject === edusubject)
booksel.value = textselidx
booktitle.value = bookList.value[textselidx].fileurl.replace('.txt','')
const filePath = import.meta.env.VITE_APP_RES_FILE_PATH + bookList.value[textselidx].fileurl.replace('.txt','.pdf')
await loadPdfAnimation(filePath)
} }
const bookChange = async (item, idx) => { const bookChange = async (item, idx) => {
booksel.value = idx booksel.value = idx
bookInfo.value = {...item} bookInfo.value = {...item}
booktitle.value = item.fileurl.replace('.txt','') booktitle.value = `${item.edustage + item.edusubject}课程标准`
pdfUrl.value = ''; pdfUrl.value = '';
const filepath = import.meta.env.VITE_APP_RES_FILE_PATH + item.fileurl.replace('.txt','.pdf') const filepath = import.meta.env.VITE_APP_RES_FILE_PATH + item.fileurl.replace('.txt','.pdf')
await loadPdfAnimation(filepath) await loadPdfAnimation(filepath)
@ -276,6 +271,10 @@ const loadPdfAnimation = (path) => {
} }
onMounted(async () => { onMounted(async () => {
await getAllSubject(); await getAllSubject();
const { edustage, edusubject } = userStore.user;
booktitle.value = `${edustage + edusubject}课程标准`
const filePath = `${import.meta.env.VITE_APP_RES_FILE_PATH}${edustage}-${edusubject}-课标.pdf`
await loadPdfAnimation(filePath)
if(cardref.value && headref.value){ if(cardref.value && headref.value){
const cardH = cardref.value.offsetHeight; const cardH = cardref.value.offsetHeight;
const headh = headref.value.offsetHeight; const headh = headref.value.offsetHeight;
@ -530,22 +529,13 @@ onMounted(async () => {
padding-top: 1px; padding-top: 1px;
overflow: auto; overflow: auto;
.item{ .item{
width: 162px; width: 100%;
height: auto; height: auto;
padding: 8px 16px; padding: 8px 16px;
background-color: #ffffff; background-color: #ffffff;
float: left; border-top: 1px solid #f1f1f1;
.bookimg{ font-size: 14px;
width: 130px; color: #3b3b3b;
height: 180px;
}
.name{
font-size: 14px;
color: #3b3b3b;
}
}
.item:hover{
cursor: pointer;
} }
.active{ .active{
background-color: #409eff; background-color: #409eff;

View File

@ -1,555 +0,0 @@
<template>
<div class="page-con flex" ref="cardref">
<!-- <el-button @click="saveJSON">测试保存</el-button> -->
<div class="page-con-left">
<div class="stand-head" ref="headref">
<div class="stand-head-left">
<el-image class="imges" :src="bookInfo ? bookInfo.avartar : ''" />
</div>
<div class="stand-head-right">
<div class="stand-head-right-tit">{{booktitle}}</div>
<i class="iconfont icon-yidongdaozu stand-head-right-icon" @click="dialogVisible = true"></i>
<div class="stand-head-right-row">
<div class="stand-head-right-row-time">更新2024.9.10</div>
<!-- <el-switch class="stand-head-right-row-switch" v-model="isOpenClass" inline-prompt active-text="公开" inactive-text="非公" /> -->
</div>
</div>
</div>
<div class="stand-down">
<div class="stand-down-search" ref="searchref">
<el-input
v-model="searchInp"
placeholder="搜索课标、学校和老师"
clearable
@input="searchHandel"
/>
<el-select v-model="searchSel" placeholder="请选择" style="width: 140px;padding-left:6px" @change="selectHandel">
<el-option
v-for="item in searchOptions"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</div>
<div class="stand-down-con" :style="{overflow: 'auto',height: listHeight + 'px'}">
<div class="stand-down-con-list" v-for="item,idx in showData" :key="idx">
<div class="stand-down-con-list-icon">
<el-image class="imges" :src="item.userheadimgurl" />
</div>
<div class="stand-down-con-list-txt">
<div class="stand-down-con-list-txt-top">
<div class="stand-down-con-list-txt-top-name">{{item.username}}</div>
<div class="stand-down-con-list-txt-top-tip">{{item.childcount}}</div>
</div>
<div class="stand-down-con-list-txt-down">
<div class="stand-down-con-list-txt-down-tip">{{ item.userentpname }}</div>
<div class="stand-down-con-list-txt-down-tip">{{ item.timeStr }}</div>
</div>
</div>
</div>
</div>
<p v-if="loading">加载中...</p>
<p v-if="noMore">~没有更多了~</p>
</div>
</div>
<div class="page-con-right">
<PDF :url="pdfUrl" v-if="pdfUrl" />
<div class="loading" v-else>
<div class="setup">
<span style="--i:1"></span>
<span style="--i:2"></span>
<span style="--i:3"></span>
<span style="--i:4"></span>
<span style="--i:5"></span>
<span style="--i:6">.</span>
<span style="--i:7">.</span>
<span style="--i:8">.</span>
</div>
</div>
</div>
<el-dialog v-model="dialogVisible" title="切换教材" append-to-body width="550">
<div class="booklist">
<div :class="{'item': true,'active': booksel === idx}" v-for="item,idx in bookList" :key="idx" @click="bookChange(item,idx)">
<el-image class="bookimg" :src="item.avartar" />
<div class="bookname">{{item.fileurl.replace('.txt', '')}}</div>
</div>
</div>
</el-dialog>
</div>
</template>
<script setup>
import { onMounted, ref } from 'vue'
import PDF from '@/components/PdfJs/index.vue'
import { useRoute } from 'vue-router';
import useResoureStore from '../resource/store'
import { listEvaluationclue } from '@/api/teaching/classwork'
import { uploadServer, getJSONFile } from '@/utils/common'
import { ElNotification } from 'element-plus'
import ChooseTextbook from "@/components/choose-textbook/index.vue";
import { listEvaluation } from '@/api/classManage/index'
import useUserStore from '@/store/modules/user'
const userStore = useUserStore()
const sourceStore = useResoureStore()
// import { getStaticUrl } from '@/utils/tool'
const route = useRoute();
const pdfUrl = ref('');
const isOpenClass = ref(true);
const searchInp = ref('');
const searchSel = ref('0');
const loading = ref(false);
const noMore = ref(false);
const cardref = ref(null);
const headref = ref(null);
const searchref = ref(null);
const listHeight = ref(0);
const dialogVisible = ref(false);
const booktitle = ref('');
const bookInfo = ref(null);
const booksel = ref(0);
const bookList = ref([])
const searchOptions = [{
value: '0',
label: '按时间',
},{
value: '1',
label: '按内容量',
}];
const standList = ref([]);
const showData = ref([]);
//
const getlistEvaluationclue = (firstid, levelid) => {
const newid = firstid ? firstid : levelid;
listEvaluationclue({evalid: newid, parentid: 0, cluegroup: 'teachresource', orderby: "timestamp desc", pageSize: 100}).then((res) => {
if(res.code === 200){
const newData = formaterTime(res.rows)
standList.value = newData
showData.value = filterList(newData)
}
})
}
const formaterTime = (data) => {
return data.map(item => {
return {
...item,
timeStr: item.timestamp.split(' ')[0].replace('-', '.').replace('-', '.')
}
})
}
//
const filterList = (data) => {
let standData = JSON.parse(JSON.stringify(data));
let arr = [];
if (searchSel.value === '0') {
arr = standData.sort((a, b)=>{
return new Date(b.timestamp) - new Date(a.timestamp);
})
}
else {
arr = standData.sort((a, b)=>{
return b.childcount - a.childcount;
})
}
return arr;
}
//
const searchHandel = (value) => {
const newData = [];
standList.value.map(item => {
const str = JSON.stringify(item)
if(str.indexOf(value) !== -1){
newData.push(item);
}
})
showData.value = newData
}
//
const selectHandel = (value) => {
const filterData = searchInp.value !== '' ? showData.value : standList.value
showData.value = filterList(filterData);
}
//json
const saveJSON = (data) => {
let filename = ''
// const data = {
// name: 'txt',
// class: '2',
// school: '',
// time: '2024-08-09'
// }
// saveJSON(jsonStr);
if (!data) {
console.log('传入的data数据为null');
return;
}
if (!filename) {
filename = `json${Date.now()}.json`
console.log('未传入文件名,采用默认文件名' + filename);
}
let newdata = null;
if (typeof data === 'object') {
newdata = JSON.stringify(data, undefined, 4)
}
// jsonblob
const blob = new Blob([newdata], { type: 'text/json' });
// file
// const file = new File([blob],filename, {type: blob.type})
//
// const formdata = new FormData();
// formdata.append('file', file);
//
//
// uploadServer(formdata).then(res => {
// console.log('+++++++++++++');
// console.log(res.data);
// })
let e = document.createEvent('MouseEvents');
let a = document.createElement('a');
a.download = filename;
a.href = window.URL.createObjectURL(blob);
a.dataset.downloadurl = ['text/json', a.download, a.href].join(':');
e.initMouseEvent('click', true, false, window, 0, 0, 0, 0, 0, false, false, false, false, 0, null);
a.dispatchEvent(e);
}
//
const getData = (data) => {
const { textBook, node } = data
let textbookId = textBook.curBookId
let levelSecondId = node.id
let levelFirstId
if (node.parentNode) {
levelFirstId = node.parentNode.id
} else {
levelFirstId = node.id
levelSecondId = ''
}
sourceStore.query.levelFirstId = levelFirstId
sourceStore.query.levelSecondId = levelSecondId
sourceStore.query.textbookId = textbookId
sourceStore.nodeData = {
textbookId, //
levelFirstId, //
levelSecondId //
}
sourceStore.handleQuery()
getlistEvaluationclue(levelFirstId, levelSecondId)
}
//
const getAllSubject = async () => {
const { edustage, edusubject } = userStore.user;
const { rows } = await listEvaluation({ itemkey: "version", edustage, edusubject, pageSize: 500 })
rows && rows.map(item => {
if(item.edustage === edustage && item.edusubject === edusubject){
bookInfo.value = {...item,avartar: import.meta.env.VITE_APP_BUILD_BASE_PATH + item.avartar}
}
if(item.fileurl !== ''){
bookList.value.push({...item,avartar: import.meta.env.VITE_APP_BUILD_BASE_PATH + item.avartar})
}
})
const textselidx = bookList.value.findIndex(item => item.edustage === edustage && item.edusubject === edusubject)
booksel.value = textselidx
booktitle.value = bookList.value[textselidx].fileurl.replace('.txt','')
const filePath = import.meta.env.VITE_APP_RES_FILE_PATH + bookList.value[textselidx].fileurl.replace('.txt','.pdf')
await loadPdfAnimation(filePath)
}
const bookChange = async (item, idx) => {
booksel.value = idx
bookInfo.value = {...item}
booktitle.value = item.fileurl.replace('.txt','')
pdfUrl.value = '';
const filepath = import.meta.env.VITE_APP_RES_FILE_PATH + item.fileurl.replace('.txt','.pdf')
await loadPdfAnimation(filepath)
dialogVisible.value = false
}
const loadPdfAnimation = (path) => {
const timer = setTimeout(() => {
pdfUrl.value = path
clearTimeout(timer);
},2000)
}
onMounted(async () => {
await getAllSubject();
if(cardref.value && headref.value){
const cardH = cardref.value.offsetHeight;
const headh = headref.value.offsetHeight;
const searchh = searchref.value.offsetHeight;
listHeight.value = Math.floor(cardH) - Math.floor(headh) - Math.floor(searchh) - 60;
}
window.addEventListener('resize', () => {
if(cardref.value && headref.value){
const cardH = cardref.value.offsetHeight;
const headh = headref.value.offsetHeight;
const searchh = searchref.value.offsetHeight;
listHeight.value = Math.floor(cardH) - Math.floor(headh) - Math.floor(searchh) - 60;
}
})
window.addEventListener('message',(event) => {
// console.log('------------');
const iframeMes = event.data;
if(iframeMes.storageInfo){
// saveJSON(iframeMes.storageInfo);
// console.log(JSON.stringify(iframeMes.storageInfo));
}
if(iframeMes.quoteInfo){
console.log(iframeMes.quoteInfo);
const { textStr, StartStr, EndStr } = iframeMes.quoteInfo;
if(textStr === StartStr || textStr === EndStr){
ElNotification({
title: '引用内容',
message: textStr,
duration: 0,
type: 'info',
offset: 120
})
//
console.log('无需替换------',textStr);
return
}
let midStr = ''
if(StartStr === '' && EndStr === '' && textStr === '') return
if(StartStr === '' && EndStr !== '') {
midStr = textStr.replace(EndStr,'eeeeee').split('eeeeee')[0]
}else if(StartStr !== '' && EndStr === ''){
midStr = textStr.replace(StartStr,'ssssss').split('ssssss')[1]
}else{
midStr = textStr.replace(StartStr, 'ssssss').replace(EndStr,'eeeeee').split('ssssss')[1].split('eeeeee')[0];
}
ElNotification({
title: '引用内容',
message: StartStr + midStr + EndStr,
duration: 0,
type: 'info',
offset: 120
})
console.log('中间文字------',midStr);
console.log('转换后整体文字------',StartStr + midStr + EndStr);
}
})
// const isDev = process.env.NODE_ENV == 'development'
// if (isDev)
// pdfUrl.value = '/'+getStaticUrl('aaa.pdf', 'user', 'selfFile', true)
// else
// pdfUrl.value = getStaticUrl(route.query.path, 'user', 'selfFile', true)
// console.log('',pdfUrl.value);
})
</script>
<style scoped lang="scss">
.page-con {
padding-top: 20px;
height: 100%;
&-left{
width: 300px;
height: auto;
background: #ffffff;
border-radius: 10px;
}
&-right{
display: flex;
flex-direction: column;
flex: 1;
margin-left: 20px;
height: 100%;
background: #ffffff;
overflow: hidden;
border-radius: 10px;
box-shadow: 0px 0px 20px 0px rgba(99, 99, 99, 0.06);
}
.loading {
display: flex;
align-items: center;
justify-content:center;
min-height: 100vh;
.setup {
position: relative;
-webkit-box-reflect: below -12px linear-gradient(transparent, rgba(0, 0, 0, 0.2))
}
.setup span {
position: relative;
display: inline-block;
color: #409eff;
font-size: 26px;
animation: animate 1s ease-in-out infinite;
animation-delay: calc(.1s*var(--i))
}
}
@keyframes animate {
0% {
transform: translateY(0px)
}
20% {
transform: translateY(-24px)
}
40%,
100% {
transform: translateY(0px)
}
}
}
.stand-head{
width: 100%;
padding: 6px;
border-radius: 6px;
position: relative;
&-left{
width: 48px;
height: 66px;
border-radius: 2px;
overflow: hidden;
.imges{
width: 48px;
height: 66px;
}
}
&-right{
position: absolute;
width: 100%;
height: auto;
padding-left: 60px;
padding-right: 6px;
left: 0;
top: 6px;
z-index: 2;
&-tit{
width: 100%;
font-size: 15px;
font-weight: 600;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
color: #3b3b3b;
text-align: left;
}
&-icon{
position: absolute;
right: 12px;
top: 0px;
z-index: 3;
color: var(--el-color-primary);
}
&-row{
width: 100%;
height: 32px;
display: flex;
justify-content: space-between;
margin-top: 12px;
&-time{
font-size: var(--el-font-size-extra-small);
color: var(--el-color-info-rgb);
line-height: 32px;
}
&-switch{
height: 32px;
}
}
}
}
.stand-down{
width: 100%;
height: auto;
padding-top: 20px;
padding-right: 6px;
&-search{
width: 100%;
height: 32px;
display: flex;
justify-content: space-between;
align-items: center;
}
&-con{
width: 100%;
&-list{
width: 100%;
height: auto;
position: relative;
padding: 8px 0;
border-top: 1px dashed #e1e1e1;
&-icon{
width: 48px;
height: 48px;
border-radius: 50%;
position: absolute;
left: 0;
top: 8px;
z-index: 2;
overflow: hidden;
.imges{
width: 48px;
height: 48px;
}
}
&-txt{
width: 100%;
min-height: 48px;
padding-left: 56px;
padding-right: 12px;
&-top,&-down{
width: 100%;
min-height: 24px;
display: flex;
justify-content: space-between;
align-items: center;
&-name{
font-size: 14px;
color: #3b3b3b;
font-weight: 600;
}
&-tip{
font-size: 12px;
color: #787878;
text-align: left;
}
}
&-down{
margin-top: 4px;
}
}
}
&-list:first-of-type{
border: 0;
}
}
}
.booklist{
width: 100%;
height: 500px;
padding-top: 1px;
overflow: auto;
.item{
width: 162px;
height: auto;
padding: 8px 16px;
background-color: #ffffff;
float: left;
.bookimg{
width: 130px;
height: 180px;
}
.name{
font-size: 14px;
color: #3b3b3b;
}
}
.item:hover{
cursor: pointer;
}
.active{
background-color: #409eff;
color: #ffffff;
}
}
</style>