Compare commits
11 Commits
877c971415
...
6ea3246428
Author | SHA1 | Date |
---|---|---|
白了个白 | 6ea3246428 | |
yangws | 45f1a70d7a | |
小杨 | 08f0b63741 | |
小杨 | a711aef5f3 | |
朱浩 | c8aa529621 | |
朱浩 | 60f2790b0c | |
baigl | 5be6659ab5 | |
小杨 | ce523bdcd5 | |
小杨 | 7e0718498f | |
朱浩 | adbb4f0067 | |
朱浩 | def9433647 |
|
@ -8,7 +8,7 @@
|
||||||
http-equiv="Content-Security-Policy"
|
http-equiv="Content-Security-Policy"
|
||||||
content="default-src 'self'; script-src 'self'; style-src 'self' 'unsafe-inline'; img-src 'self' data:"
|
content="default-src 'self'; script-src 'self'; style-src 'self' 'unsafe-inline'; img-src 'self' data:"
|
||||||
/> -->
|
/> -->
|
||||||
<meta http-equiv="Content-Security-Policy" content="connect-src * blob:; default-src 'self'; script-src 'self' 'unsafe-eval'; style-src 'self' 'unsafe-inline'; media-src *;img-src * 'self' data: blob:" />
|
<meta http-equiv="Content-Security-Policy" content="connect-src * blob:; default-src 'self'; script-src 'self' 'unsafe-eval'; style-src 'self' 'unsafe-inline'; media-src * blob:;img-src * 'self' data: blob:" />
|
||||||
|
|
||||||
</head>
|
</head>
|
||||||
|
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
@font-face {
|
@font-face {
|
||||||
font-family: "iconfont"; /* Project id 4723712 */
|
font-family: "iconfont"; /* Project id 4723712 */
|
||||||
src: url('iconfont.woff2?t=1731913617367') format('woff2'),
|
src: url('iconfont.woff2?t=1732173266977') format('woff2'),
|
||||||
url('iconfont.woff?t=1731913617367') format('woff'),
|
url('iconfont.woff?t=1732173266977') format('woff'),
|
||||||
url('iconfont.ttf?t=1731913617367') format('truetype');
|
url('iconfont.ttf?t=1732173266977') format('truetype');
|
||||||
}
|
}
|
||||||
|
|
||||||
.iconfont {
|
.iconfont {
|
||||||
|
@ -13,6 +13,26 @@
|
||||||
-moz-osx-font-smoothing: grayscale;
|
-moz-osx-font-smoothing: grayscale;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.icon-jiqiren_o:before {
|
||||||
|
content: "\eb62";
|
||||||
|
}
|
||||||
|
|
||||||
|
.icon-zhaoxiangji:before {
|
||||||
|
content: "\e679";
|
||||||
|
}
|
||||||
|
|
||||||
|
.icon-huaban:before {
|
||||||
|
content: "\e6e2";
|
||||||
|
}
|
||||||
|
|
||||||
|
.icon-tubiao_wuxing-:before {
|
||||||
|
content: "\e612";
|
||||||
|
}
|
||||||
|
|
||||||
|
.icon-soutibao-:before {
|
||||||
|
content: "\e605";
|
||||||
|
}
|
||||||
|
|
||||||
.icon-baocun:before {
|
.icon-baocun:before {
|
||||||
content: "\e60e";
|
content: "\e60e";
|
||||||
}
|
}
|
||||||
|
|
File diff suppressed because one or more lines are too long
|
@ -5,6 +5,41 @@
|
||||||
"css_prefix_text": "icon-",
|
"css_prefix_text": "icon-",
|
||||||
"description": "",
|
"description": "",
|
||||||
"glyphs": [
|
"glyphs": [
|
||||||
|
{
|
||||||
|
"icon_id": "5387814",
|
||||||
|
"name": "机器人_o",
|
||||||
|
"font_class": "jiqiren_o",
|
||||||
|
"unicode": "eb62",
|
||||||
|
"unicode_decimal": 60258
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"icon_id": "630128",
|
||||||
|
"name": "照相机",
|
||||||
|
"font_class": "zhaoxiangji",
|
||||||
|
"unicode": "e679",
|
||||||
|
"unicode_decimal": 59001
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"icon_id": "12592146",
|
||||||
|
"name": "画板",
|
||||||
|
"font_class": "huaban",
|
||||||
|
"unicode": "e6e2",
|
||||||
|
"unicode_decimal": 59106
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"icon_id": "6025688",
|
||||||
|
"name": "图标_五星-2",
|
||||||
|
"font_class": "tubiao_wuxing-",
|
||||||
|
"unicode": "e612",
|
||||||
|
"unicode_decimal": 58898
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"icon_id": "11756625",
|
||||||
|
"name": "搜题宝-37",
|
||||||
|
"font_class": "soutibao-",
|
||||||
|
"unicode": "e605",
|
||||||
|
"unicode_decimal": 58885
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"icon_id": "11467388",
|
"icon_id": "11467388",
|
||||||
"name": "保存",
|
"name": "保存",
|
||||||
|
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
After Width: | Height: | Size: 1.8 KiB |
Binary file not shown.
After Width: | Height: | Size: 2.0 KiB |
Binary file not shown.
After Width: | Height: | Size: 6.0 KiB |
|
@ -1,5 +1,5 @@
|
||||||
<template>
|
<template>
|
||||||
<div class="whiteboart-container">
|
<div class="whiteboart-container" :style="{ height: height + 'px' }">
|
||||||
<div class="canvasBox" ref="box"></div>
|
<div class="canvasBox" ref="box"></div>
|
||||||
|
|
||||||
<div class="footerLeft" @click.stop
|
<div class="footerLeft" @click.stop
|
||||||
|
@ -15,7 +15,7 @@
|
||||||
</el-tooltip>
|
</el-tooltip>
|
||||||
</div>
|
</div>
|
||||||
<div class="blockBox">
|
<div class="blockBox">
|
||||||
<el-button @click="currentType = 'selection'"><el-image src="/src/assets/icons/pngjpg/mouse-pointer.png"
|
<el-button @click="currentType = 'selection'"><el-image src="/src/assets/images/mouse-pointer.png"
|
||||||
style="width: 14px; height: 14px; color: silver" /></el-button>
|
style="width: 14px; height: 14px; color: silver" /></el-button>
|
||||||
</div>
|
</div>
|
||||||
<template v-if="type == 'design'">
|
<template v-if="type == 'design'">
|
||||||
|
@ -53,7 +53,8 @@
|
||||||
</el-radio-group>
|
</el-radio-group>
|
||||||
</template>
|
</template>
|
||||||
<div class="blockBox">
|
<div class="blockBox">
|
||||||
<el-button @click="currentType = 'selection'" style="color:#848282" :icon="Camera" disabled></el-button>
|
<!-- <el-button @click="currentType = 'selection'" style="color:#848282" :icon="Camera" disabled></el-button> -->
|
||||||
|
<el-button @click="handleToolTypeChange('image')">图片</el-button>
|
||||||
</div>
|
</div>
|
||||||
<div class="blockBox" v-if="!readonly">
|
<div class="blockBox" v-if="!readonly">
|
||||||
<el-dropdown @command="handleToolTypeChange" placement="top">
|
<el-dropdown @command="handleToolTypeChange" placement="top">
|
||||||
|
@ -71,7 +72,7 @@
|
||||||
<template v-if="type != 'design'">
|
<template v-if="type != 'design'">
|
||||||
<el-dropdown-item command="freedraw">画笔</el-dropdown-item>
|
<el-dropdown-item command="freedraw">画笔</el-dropdown-item>
|
||||||
<el-dropdown-item command="text">文字</el-dropdown-item>
|
<el-dropdown-item command="text">文字</el-dropdown-item>
|
||||||
<el-dropdown-item command="image">图片</el-dropdown-item>
|
<!-- <el-dropdown-item command="image">图片</el-dropdown-item> -->
|
||||||
</template>
|
</template>
|
||||||
</el-dropdown-menu>
|
</el-dropdown-menu>
|
||||||
</template>
|
</template>
|
||||||
|
@ -122,7 +123,7 @@
|
||||||
<!-- 边框样式 -->
|
<!-- 边框样式 -->
|
||||||
<div class="blockBox">
|
<div class="blockBox">
|
||||||
<el-dropdown @command="updateStyle('lineDash', $event)" placement="top">
|
<el-dropdown @command="updateStyle('lineDash', $event)" placement="top">
|
||||||
<el-button><el-image src="/src/assets/icons/pngjpg/borderstyle.png"
|
<el-button><el-image src="/src/assets/images/borderstyle.png"
|
||||||
style="width: 14px; height: 14px"></el-image></el-button>
|
style="width: 14px; height: 14px"></el-image></el-button>
|
||||||
<template #dropdown>
|
<template #dropdown>
|
||||||
<el-dropdown-menu>
|
<el-dropdown-menu>
|
||||||
|
@ -134,8 +135,7 @@
|
||||||
</el-dropdown>
|
</el-dropdown>
|
||||||
</div>
|
</div>
|
||||||
<!--透明度-->
|
<!--透明度-->
|
||||||
<div class="blockBox" style="width: 120px"
|
<div class="blockBox" style="width: 120px">
|
||||||
v-if="type == 'design' ? true : ['image'].includes(activeElement?.type) || hasSelectedElements">
|
|
||||||
<el-tooltip effect="light" content="透明度" placement="top">
|
<el-tooltip effect="light" content="透明度" placement="top">
|
||||||
<el-input-number v-model="globalAlpha" :min="0" :max="1" :step="0.1"
|
<el-input-number v-model="globalAlpha" :min="0" :max="1" :step="0.1"
|
||||||
@change="updateStyle('globalAlpha', $event)"></el-input-number>
|
@change="updateStyle('globalAlpha', $event)"></el-input-number>
|
||||||
|
@ -145,7 +145,7 @@
|
||||||
<!-- 边框粗细 -->
|
<!-- 边框粗细 -->
|
||||||
<div class="blockBox">
|
<div class="blockBox">
|
||||||
<el-dropdown @command="updateStyle('lineWidth', $event)" placement="top">
|
<el-dropdown @command="updateStyle('lineWidth', $event)" placement="top">
|
||||||
<el-button><el-image src="/src/assets/icons/pngjpg/borderwidth.png"
|
<el-button><el-image src="/src/assets/images/borderwidth.png"
|
||||||
style="width: 14px; height: 14px"></el-image></el-button>
|
style="width: 14px; height: 14px"></el-image></el-button>
|
||||||
<template #dropdown>
|
<template #dropdown>
|
||||||
<el-dropdown-menu>
|
<el-dropdown-menu>
|
||||||
|
@ -309,11 +309,11 @@ const props = defineProps({
|
||||||
default: true
|
default: true
|
||||||
},
|
},
|
||||||
height: {
|
height: {
|
||||||
type: Number,
|
type: [Number,String],
|
||||||
default: 700,
|
default: 700,
|
||||||
},
|
},
|
||||||
width: {
|
width: {
|
||||||
type: Number,
|
type: [Number,String],
|
||||||
default: 1000,
|
default: 1000,
|
||||||
},
|
},
|
||||||
data: {
|
data: {
|
||||||
|
@ -685,6 +685,20 @@ const getCanvasBase64 = async () =>{
|
||||||
return base64
|
return base64
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const getCanvasBlob = async () =>{
|
||||||
|
return await app.exportImage({
|
||||||
|
type: 'image/jpeg',
|
||||||
|
renderBg: exportRenderBackground.value,
|
||||||
|
paddingX: exportImagePaddingX.value,
|
||||||
|
paddingY: exportImagePaddingY.value,
|
||||||
|
onlySelected: exportOnlySelected.value,
|
||||||
|
useBlob: true,
|
||||||
|
backgroundColor: '#ffffff'
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
watch(() => props.data, (newVal) => {
|
watch(() => props.data, (newVal) => {
|
||||||
if (newVal) {
|
if (newVal) {
|
||||||
setCanvasData(newVal)
|
setCanvasData(newVal)
|
||||||
|
@ -773,7 +787,8 @@ defineExpose({
|
||||||
showFit,
|
showFit,
|
||||||
getCanvasJson,
|
getCanvasJson,
|
||||||
getCanvasBase64,
|
getCanvasBase64,
|
||||||
setCanvasData
|
setCanvasData,
|
||||||
|
getCanvasBlob
|
||||||
})
|
})
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
|
@ -895,7 +910,7 @@ ol {
|
||||||
font-size: 14px;
|
font-size: 14px;
|
||||||
color: #000;
|
color: #000;
|
||||||
|
|
||||||
:deep(.jsontree_tree) {
|
/deep/ .jsontree_tree {
|
||||||
font-family: 'Trebuchet MS', Arial, sans-serif !important;
|
font-family: 'Trebuchet MS', Arial, sans-serif !important;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,12 +1,23 @@
|
||||||
<template>
|
<template>
|
||||||
<div class="list-container">
|
<div class="list-content">
|
||||||
<div class="content-list" v-for="(item, index) in items" :key="index" @click="handleClick(item)">
|
<div class="list-container">
|
||||||
<div class="item-content">
|
<div class="content-list" v-for="(item, index) in items" :key="index" @click="handleClick(item)">
|
||||||
<div class="item-text">
|
<div class="item-content">
|
||||||
<div class="item-title">{{ item.title }}</div>
|
<div class="item-text">
|
||||||
<div class="item-description">{{ item.description }}</div>
|
<div class="title-header">
|
||||||
|
<div class="item-title">{{ item.title }}</div>
|
||||||
|
<div class="icon-box">
|
||||||
|
<svg class="icon iconfont" aria-hidden="true" style="font-size: 35px;">
|
||||||
|
<use :xlink:href="item.icon"></use>
|
||||||
|
</svg>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="item-description">{{ item.description }}</div>
|
||||||
|
<div class="item-bottom">
|
||||||
|
<el-tag :type="item.type" size="default">{{ item.title }}</el-tag>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<el-icon class="item-icon"><component :is="item.icon" /></el-icon>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
@ -15,17 +26,16 @@
|
||||||
<script setup>
|
<script setup>
|
||||||
import { shallowRef } from 'vue';
|
import { shallowRef } from 'vue';
|
||||||
import { ElMessage } from 'element-plus'
|
import { ElMessage } from 'element-plus'
|
||||||
import { Plus, ArrowDown, Document, User, Setting } from '@element-plus/icons-vue';
|
|
||||||
|
|
||||||
const emit = defineEmits(['itemClick'])
|
const emit = defineEmits(['itemClick'])
|
||||||
const items = shallowRef([
|
const items = shallowRef([
|
||||||
{ title: '自主搜题', description: '1111111', icon: Document },
|
{ title: '自主搜题', description: '1111111111111111111111111111111111111', icon: '#icon-soutibao-',type:'primary' },
|
||||||
{ title: '校本题库', description: '222222', icon: User },
|
{ title: '校本题库', description: '222222', icon: '#icon-soutibao-',type:'success' },
|
||||||
{ title: '个人题库', description: '333333', icon: Setting },
|
{ title: '个人题库', description: '333333', icon: '#icon-soutibao-',type:'default' },
|
||||||
{ title: '智能推荐', description: '444444', icon: Plus },
|
{ title: '智能推荐', description: '444444', icon: '#icon-tubiao_wuxing-',type:'default' },
|
||||||
{ title: '课堂展示', description: '555555', icon: ArrowDown },
|
{ title: '课堂展示', description: '555555', icon: '#icon-huaban',type:'primary' },
|
||||||
{ title: '常规作业', description: '555555', icon: ArrowDown },
|
{ title: '常规作业', description: '555555', icon: '#icon-zhaoxiangji',type:'primary' },
|
||||||
{ title: 'AI设计作业', description: '555555', icon: ArrowDown },
|
{ title: 'AI设计作业', description: '555555', icon: '#icon-jiqiren_o',type:'danger' },
|
||||||
]);
|
]);
|
||||||
|
|
||||||
const handleClick = (item) => {
|
const handleClick = (item) => {
|
||||||
|
@ -42,20 +52,25 @@ const handleClick = (item) => {
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<style scoped>
|
<style scoped>
|
||||||
|
.list-content{
|
||||||
|
padding: 8px;
|
||||||
|
background-color: #f5f5f5;
|
||||||
|
border-radius: 8px;
|
||||||
|
height: 100%;
|
||||||
|
margin-left: 10px
|
||||||
|
}
|
||||||
.list-container {
|
.list-container {
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-wrap: wrap;
|
flex-wrap: wrap;
|
||||||
gap: 16px;
|
gap: 16px;
|
||||||
padding: 16px;
|
|
||||||
/* background-color: #f5f5f5; */
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.content-list {
|
.content-list {
|
||||||
background-color: #fff;
|
background-color: #fff;
|
||||||
border-radius: 8px;
|
border-radius: 8px;
|
||||||
box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
|
box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
|
||||||
padding: 16px;
|
padding: 8px;
|
||||||
width: calc(33.333% - 32px); /* 3列布局,每列减去gap */
|
width: calc(25% - 16px);
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
transition: all 0.3s ease;
|
transition: all 0.3s ease;
|
||||||
}
|
}
|
||||||
|
@ -68,6 +83,7 @@ const handleClick = (item) => {
|
||||||
.item-content {
|
.item-content {
|
||||||
display: flex;
|
display: flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
|
height: 100%;
|
||||||
}
|
}
|
||||||
|
|
||||||
.item-icon {
|
.item-icon {
|
||||||
|
@ -78,6 +94,10 @@ const handleClick = (item) => {
|
||||||
|
|
||||||
.item-text {
|
.item-text {
|
||||||
flex: 1;
|
flex: 1;
|
||||||
|
justify-content: space-between;
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
height: 100%;
|
||||||
}
|
}
|
||||||
|
|
||||||
.item-title {
|
.item-title {
|
||||||
|
@ -85,10 +105,38 @@ const handleClick = (item) => {
|
||||||
font-weight: 500;
|
font-weight: 500;
|
||||||
color: #303133;
|
color: #303133;
|
||||||
margin-bottom: 4px;
|
margin-bottom: 4px;
|
||||||
|
font-weight: bold;
|
||||||
}
|
}
|
||||||
|
|
||||||
.item-description {
|
.item-description {
|
||||||
font-size: 14px;
|
font-size: 14px;
|
||||||
color: #909399;
|
color: #909399;
|
||||||
|
text-align: left;
|
||||||
|
display: -webkit-box;
|
||||||
|
-webkit-box-orient: vertical;
|
||||||
|
-webkit-line-clamp: 2; /* 设置最大行数 */
|
||||||
|
overflow: hidden;
|
||||||
|
text-overflow: ellipsis;
|
||||||
|
word-break: break-all;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.title-header {
|
||||||
|
display: flex;
|
||||||
|
justify-content: space-between;
|
||||||
|
align-items: center;
|
||||||
|
}
|
||||||
|
|
||||||
|
.item-bottom {
|
||||||
|
text-align: right;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* 过渡动画 */
|
||||||
|
.fade-enter-active, .fade-leave-active {
|
||||||
|
transition: opacity 0.3s;
|
||||||
|
}
|
||||||
|
|
||||||
|
.fade-enter, .fade-leave-to {
|
||||||
|
opacity: 0;
|
||||||
|
}
|
||||||
|
|
||||||
</style>
|
</style>
|
|
@ -6,14 +6,14 @@
|
||||||
<el-button type="success" @click="handleTaskAssignToAllClass()">批量推送</el-button>
|
<el-button type="success" @click="handleTaskAssignToAllClass()">批量推送</el-button>
|
||||||
</div>
|
</div>
|
||||||
<div v-if="currentRow.id > 0" class="page-top-right">
|
<div v-if="currentRow.id > 0" class="page-top-right">
|
||||||
<el-button type="primary" @click="handleNewAllClass">设计新作业</el-button>
|
<el-button type="primary" @click="handleNewAllClass" :icon="Plus">设计新作业</el-button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="page-resource">
|
<div class="page-resource">
|
||||||
<div class="page-left">
|
<div class="page-left">
|
||||||
<el-table
|
<el-table
|
||||||
ref="taskTable"
|
ref="taskTable"
|
||||||
v-loading="loading"
|
v-loading="tasklist_loading"
|
||||||
:data="taskList"
|
:data="taskList"
|
||||||
:tree-props="{checkStrictly: true}"
|
:tree-props="{checkStrictly: true}"
|
||||||
row-key="id"
|
row-key="id"
|
||||||
|
@ -22,15 +22,22 @@
|
||||||
@current-change="handleCurrentChange"
|
@current-change="handleCurrentChange"
|
||||||
>
|
>
|
||||||
<el-table-column type="selection" min-width="2%" align="center" :selectable="selectable"/>
|
<el-table-column type="selection" min-width="2%" align="center" :selectable="selectable"/>
|
||||||
<el-table-column label="作业布置" min-width="18%" align="center">
|
<el-table-column label="作业布置" min-width="15%" align="center">
|
||||||
<template #default="scope">
|
<template #default="scope">
|
||||||
<div style="height: 100px;">
|
<div style="height: 100px;cursor: pointer">
|
||||||
<div class="pageleft-table-top">
|
<div style="display: flex;align-items: center;justify-content: space-between;">
|
||||||
<span>{{ scope.row.uniquekey }}</span>
|
<div style="width: 100%;">
|
||||||
</div>
|
<div class="pageleft-table-top">
|
||||||
<div class="pageleft-table-top">
|
<span>{{ scope.row.uniquekey }}</span>
|
||||||
<el-tag :type="scope.row.workclass" size="default">{{ scope.row.worktype }}</el-tag>
|
</div>
|
||||||
<span>{{ scope.row.timestamp }}</span>
|
<div class="pageleft-table-top" style="display: flex;justify-content: space-between">
|
||||||
|
<el-tag style="padding:0 2px" :type="scope.row.workclass" size="default">{{ scope.row.worktype }}</el-tag>
|
||||||
|
<el-text size="small" style="color:#ccc;white-space:nowrap">{{ scope.row.timestamp }}</el-text>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<svg class="icon iconfont" aria-hidden="true">
|
||||||
|
<use xlink:href="#icon-xiangyou"></use>
|
||||||
|
</svg>
|
||||||
</div>
|
</div>
|
||||||
<div class="pageleft-table-cont">
|
<div class="pageleft-table-cont">
|
||||||
<p class="ellipsis "> {{ scope.row.worktype == "课堂展示" ? scope.row.worktag : scope.row.title }}</p>
|
<p class="ellipsis "> {{ scope.row.worktype == "课堂展示" ? scope.row.worktag : scope.row.title }}</p>
|
||||||
|
@ -41,11 +48,11 @@
|
||||||
</el-table>
|
</el-table>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div v-if="currentRow.id == 0" style="width: 100%; height: 100%;">
|
<div v-if="currentRow.id == 0" style="width: 100%; height: 100%;">
|
||||||
<!-- 默认的习题类型卡片 -->
|
<!-- 默认的习题类型卡片 -->
|
||||||
<Right @itemClick="handleItemClick" />
|
<Right @itemClick="handleItemClick" />
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div v-if="(currentRow.worktype == '习题训练' || classWorkForm.worktype == '习题训练') && currentRow.id>0" class="page-center">
|
<div v-if="(currentRow.worktype == '习题训练' || classWorkForm.worktype == '习题训练') && currentRow.id>0" class="page-center">
|
||||||
<el-tabs v-model="activeAptTab" style="height: 100%;">
|
<el-tabs v-model="activeAptTab" style="height: 100%;">
|
||||||
<el-tab-pane label="自主搜题" name="自主搜题" class="prepare-center-zzst">
|
<el-tab-pane label="自主搜题" name="自主搜题" class="prepare-center-zzst">
|
||||||
|
@ -62,7 +69,7 @@
|
||||||
<div v-if="(currentRow.worktype == '课堂展示' || classWorkForm.worktype == '课堂展示') && currentRow.id>0" class="page-center">
|
<div v-if="(currentRow.worktype == '课堂展示' || classWorkForm.worktype == '课堂展示') && currentRow.id>0" class="page-center">
|
||||||
<div v-loading="boardLoading" class="board-wrap" style="height: 100%; flex: 1; overflow: hidden;">
|
<div v-loading="boardLoading" class="board-wrap" style="height: 100%; flex: 1; overflow: hidden;">
|
||||||
<!-- <whiteboard v-if="isShowBoard" ref="boardref" :height="mainHeight - 150" :isShowSave="false" :data="whiteboardObj"/> -->
|
<!-- <whiteboard v-if="isShowBoard" ref="boardref" :height="mainHeight - 150" :isShowSave="false" :data="whiteboardObj"/> -->
|
||||||
<whiteboard ref="boardref" height=" 100%" :isShowSave="false" :data="classWorkForm.whiteboardObj"/>
|
<whiteboard ref="boardref" height="100%" width="100%" :isShowSave="false" :data="classWorkForm.whiteboardObj"/>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div v-if="(currentRow.worktype == '常规作业' || classWorkForm.worktype == '常规作业')&& currentRow.id>0" class="page-center">
|
<div v-if="(currentRow.worktype == '常规作业' || classWorkForm.worktype == '常规作业')&& currentRow.id>0" class="page-center">
|
||||||
|
@ -70,20 +77,20 @@
|
||||||
<FileUpload v-model="classWorkForm.fileHomeworkList" :fileSize="800" :fileType="['mp3','mp4','doc','docx','xlsx','xls','pdf','ppt','pptx','jpg','jpeg','gif','png','txt']"/>
|
<FileUpload v-model="classWorkForm.fileHomeworkList" :fileSize="800" :fileType="['mp3','mp4','doc','docx','xlsx','xls','pdf','ppt','pptx','jpg','jpeg','gif','png','txt']"/>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div v-if="currentRow.id>0 " class="page-right">
|
<div v-if="currentRow.id>0 " class="page-right">
|
||||||
<div class="prepare-top" >
|
<div class="prepare-top" >
|
||||||
<el-button v-if="currentRow.id != 1 " type="success" @click="openSet(currentRow,'item')">推 送</el-button>
|
<el-button v-if="currentRow.id != 1 " type="success" @click="openSet(currentRow,'item')">推 送</el-button>
|
||||||
<el-button type="primary" @click="handleClassWorkSave">保 存</el-button>
|
<el-button type="primary" @click="handleClassWorkSave">保 存</el-button>
|
||||||
</div>
|
</div>
|
||||||
<div class="prepare-con" >
|
<div class="prepare-con" >
|
||||||
<el-form
|
<el-form
|
||||||
ref="classWorkFormRef"
|
ref="classWorkFormRef"
|
||||||
:model="classWorkForm"
|
:model="classWorkForm"
|
||||||
label-width="90"
|
label-width="90"
|
||||||
style=" height: 100%; overflow: hidden;display: flex;flex-direction: column;"
|
style=" height: 100%; overflow: hidden;display: flex;flex-direction: column;"
|
||||||
>
|
>
|
||||||
<div >
|
<div >
|
||||||
<el-form-item label="作业名称">
|
<el-form-item label="作业名称">
|
||||||
<el-input v-model="classWorkForm.uniquekey" type="text" placeholder="请输入作业名称"/>
|
<el-input v-model="classWorkForm.uniquekey" type="text" placeholder="请输入作业名称"/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
|
@ -93,8 +100,8 @@
|
||||||
<el-input v-if="classWorkForm.worktype == '课堂展示'" v-model="classWorkForm.question" type="textarea" placeholder="请输入作业说明" />
|
<el-input v-if="classWorkForm.worktype == '课堂展示'" v-model="classWorkForm.question" type="textarea" placeholder="请输入作业说明" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div v-if="classWorkForm.worktype == '习题训练'" class="pageRight-list">
|
<div v-if="classWorkForm.worktype == '习题训练'" class="pageRight-list">
|
||||||
<div :style="{height: '100%', 'overflow': 'auto', 'border':'1px dotted blue','border-radius':'5px', 'background-color': '#f7f7f7'}">
|
<div :style="{height: '100%', 'overflow': 'auto', 'border':'1px dotted blue','border-radius':'5px', 'background-color': '#f7f7f7'}">
|
||||||
<template v-for="(item,index) in classWorkForm.quizlist" :key="item.id">
|
<template v-for="(item,index) in classWorkForm.quizlist" :key="item.id">
|
||||||
<div style="margin: 5px; background-color: white">
|
<div style="margin: 5px; background-color: white">
|
||||||
|
@ -122,6 +129,7 @@
|
||||||
import { onMounted, ref,watch, reactive, getCurrentInstance,nextTick } from 'vue'
|
import { onMounted, ref,watch, reactive, getCurrentInstance,nextTick } from 'vue'
|
||||||
import { ElMessage } from 'element-plus'
|
import { ElMessage } from 'element-plus'
|
||||||
import { cloneDeep } from 'lodash'
|
import { cloneDeep } from 'lodash'
|
||||||
|
import { Plus } from '@element-plus/icons-vue'
|
||||||
import { delClasswork } from '@/api/teaching/classwork'
|
import { delClasswork } from '@/api/teaching/classwork'
|
||||||
import {listEntpcoursework, listEntpcourseworkNew, getEntpcoursework} from '@/api/education/entpCourseWork'
|
import {listEntpcoursework, listEntpcourseworkNew, getEntpcoursework} from '@/api/education/entpCourseWork'
|
||||||
import { addClassworkReturnId } from '@/api/teaching/classwork'
|
import { addClassworkReturnId } from '@/api/teaching/classwork'
|
||||||
|
@ -136,6 +144,10 @@ import whiteboard from '@/components/whiteboard/whiteboard.vue'
|
||||||
import FileUpload from "@/components/FileUpload/index.vue";
|
import FileUpload from "@/components/FileUpload/index.vue";
|
||||||
import Right from './Right/index.vue'
|
import Right from './Right/index.vue'
|
||||||
|
|
||||||
|
import {
|
||||||
|
Delete
|
||||||
|
} from '@element-plus/icons-vue'
|
||||||
|
|
||||||
import SetHomework from '@/components/set-homework/index.vue'
|
import SetHomework from '@/components/set-homework/index.vue'
|
||||||
import { useGetHomework } from '@/hooks/useGetHomework'
|
import { useGetHomework } from '@/hooks/useGetHomework'
|
||||||
import { sessionStore } from '@/utils/store'
|
import { sessionStore } from '@/utils/store'
|
||||||
|
@ -221,7 +233,7 @@ const selectable=(row, index)=>{
|
||||||
* 获取 entpcourseid 获取作业列表
|
* 获取 entpcourseid 获取作业列表
|
||||||
*/
|
*/
|
||||||
const initHomeWork = async()=> {
|
const initHomeWork = async()=> {
|
||||||
tasklist_loading.value = true;
|
tasklist_loading.value = true;
|
||||||
// const { res, chapterId } = await useGetHomework(courseObj.node);
|
// const { res, chapterId } = await useGetHomework(courseObj.node);
|
||||||
const { res, chapterId } = await useGetHomework(sessionStore.get('subject.curNode'));
|
const { res, chapterId } = await useGetHomework(sessionStore.get('subject.curNode'));
|
||||||
console.log('entpcourseid', chapterId);
|
console.log('entpcourseid', chapterId);
|
||||||
|
@ -233,7 +245,7 @@ const initHomeWork = async()=> {
|
||||||
|
|
||||||
const handleNewAllClass = () => {
|
const handleNewAllClass = () => {
|
||||||
taskTable.value.setCurrentRow({});// 清除表格选中项背景色
|
taskTable.value.setCurrentRow({});// 清除表格选中项背景色
|
||||||
currentRow.value = {id:0}; // 作业设计
|
currentRow.value = {id:0}; // 作业设计
|
||||||
//--------
|
//--------
|
||||||
classWorkForm.id = 0;
|
classWorkForm.id = 0;
|
||||||
classWorkForm.uniquekey = ""; // 作业唯一标识 作业名称
|
classWorkForm.uniquekey = ""; // 作业唯一标识 作业名称
|
||||||
|
@ -260,7 +272,7 @@ const handleDelete =() => {
|
||||||
return delClasswork(ids.join(','));
|
return delClasswork(ids.join(','));
|
||||||
}).then(() => {
|
}).then(() => {
|
||||||
taskTable.value.setCurrentRow({});// 清除表格选中项背景色
|
taskTable.value.setCurrentRow({});// 清除表格选中项背景色
|
||||||
currentRow.value = {id:0}; // 作业设计
|
currentRow.value = {id:0}; // 作业设计
|
||||||
taskList.value = [];
|
taskList.value = [];
|
||||||
// initHomeWork();
|
// initHomeWork();
|
||||||
setTimeout(() => {
|
setTimeout(() => {
|
||||||
|
@ -351,17 +363,17 @@ let propsformobj = reactive({
|
||||||
* 选中的布置作业行
|
* 选中的布置作业行
|
||||||
*/
|
*/
|
||||||
const handleCurrentChange = (val) => {
|
const handleCurrentChange = (val) => {
|
||||||
|
|
||||||
console.log(val,'???????????')
|
console.log(val,'???????????')
|
||||||
if(val && val.id >0 ) {
|
if(val && val.id >0 ) {
|
||||||
currentRow.value = val;
|
currentRow.value = val;
|
||||||
|
classWorkForm.worktype = val.worktype; //作业类型
|
||||||
editListItem(val, courseObj).then((obj) => {
|
editListItem(val, courseObj).then((obj) => {
|
||||||
if(obj){
|
if(obj){
|
||||||
propsformobj = obj;
|
propsformobj = obj;
|
||||||
// 新赋值的作业内容
|
// 新赋值的作业内容
|
||||||
classWorkForm.id = obj.id;
|
classWorkForm.id = obj.id;
|
||||||
classWorkForm.uniquekey = cloneDeep(obj.uniquekey); // 作业唯一标识 作业名称
|
classWorkForm.uniquekey = cloneDeep(obj.uniquekey); // 作业唯一标识 作业名称
|
||||||
classWorkForm.worktype = cloneDeep(obj.worktype); //作业类型
|
|
||||||
classWorkForm.title = cloneDeep(obj.title); // 作业说明
|
classWorkForm.title = cloneDeep(obj.title); // 作业说明
|
||||||
classWorkForm.quizlist = cloneDeep(obj.quizlist); // 作业习题列表内容
|
classWorkForm.quizlist = cloneDeep(obj.quizlist); // 作业习题列表内容
|
||||||
classWorkForm.chooseWorkLists = cloneDeep(obj.chooseWorkLists); // 作业框架梳理list
|
classWorkForm.chooseWorkLists = cloneDeep(obj.chooseWorkLists); // 作业框架梳理list
|
||||||
|
@ -375,7 +387,7 @@ const handleCurrentChange = (val) => {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 添加作业
|
* 添加作业
|
||||||
* @param entpcourseworkid
|
* @param entpcourseworkid
|
||||||
*/
|
*/
|
||||||
const handleClassWorkQuizAdd = (entpcourseworkid) => {
|
const handleClassWorkQuizAdd = (entpcourseworkid) => {
|
||||||
var exist = false;
|
var exist = false;
|
||||||
|
@ -679,7 +691,7 @@ const editWork = async (cform) =>{
|
||||||
// // 返回上一页
|
// // 返回上一页
|
||||||
// router.back()
|
// router.back()
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
//----
|
//----
|
||||||
|
|
||||||
|
@ -712,7 +724,7 @@ const editWork = async (cform) =>{
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
.page-left {
|
.page-left {
|
||||||
width: 300px;
|
width: 240px;
|
||||||
background-color: white;
|
background-color: white;
|
||||||
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);
|
||||||
|
@ -740,11 +752,11 @@ const editWork = async (cform) =>{
|
||||||
text-align: left;
|
text-align: left;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
.page-center{
|
.page-center{
|
||||||
flex: 1;
|
flex: 1;
|
||||||
// width: 100%;
|
//min-width: calc(100% - 675px);
|
||||||
height: 100%;
|
height: 100%;
|
||||||
padding: 0 5px;
|
padding: 0 5px;
|
||||||
margin: 0 5px;
|
margin: 0 5px;
|
||||||
|
@ -756,8 +768,8 @@ const editWork = async (cform) =>{
|
||||||
height: 100%;
|
height: 100%;
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
.prepare-center-xbtk{
|
.prepare-center-xbtk{
|
||||||
height: 100%;
|
height: 100%;
|
||||||
|
|
|
@ -127,7 +127,6 @@ onMounted(() => {
|
||||||
.title-header{
|
.title-header{
|
||||||
display: flex;
|
display: flex;
|
||||||
justify-content: space-between;
|
justify-content: space-between;
|
||||||
align-items: center;
|
|
||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1,16 +1,22 @@
|
||||||
<template>
|
<template>
|
||||||
<div>
|
<div>
|
||||||
<div class="mb-4">
|
<div class="page-resource flex">
|
||||||
<el-button type="primary" @click="onchange('/model/curriculum')">课标研读</el-button>
|
<!-- 左侧 教材 目录 -->
|
||||||
<el-button type="primary" @click="onchange('/model/management')">作业管理1</el-button>
|
<ChooseTextbook @change-book="getData" @node-click="getData" />
|
||||||
<el-button type="primary" @click="onchange('/model/newClassTaskAssign')">作业管理2</el-button>
|
|
||||||
<el-button type="success" @click="onchange('/model/teaching')">教材研读</el-button>
|
<div class="page-right">
|
||||||
<el-button type="info" @click="onchange('/model/design')">教学框架设计</el-button>
|
<div class="button-container">
|
||||||
<el-button type="success" @click="openPPTist">打开PPTist</el-button>
|
<el-button style="margin-left: 12px;" type="primary" @click="onchange('/model/curriculum')">课标研读</el-button>
|
||||||
<!-- <el-button type="info" @click="onchange('/model/examination')">考试分析</el-button> -->
|
<el-button type="primary" @click="onchange('/model/management')">作业管理1</el-button>
|
||||||
</div>
|
<el-button type="primary" @click="onchange('/model/newClassTaskAssign')">作业管理2</el-button>
|
||||||
<ChooseTextbook @change-book="getData" @node-click="getData" />
|
<el-button type="success" @click="onchange('/model/teaching')">教材研读</el-button>
|
||||||
|
<el-button type="info" @click="onchange('/model/design')">教学框架设计</el-button>
|
||||||
|
<el-button type="success" @click="openPPTist">打开PPTist</el-button>
|
||||||
|
<!-- <el-button type="info" @click="onchange('/model/examination')">考试分析</el-button> -->
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script setup>
|
<script setup>
|
||||||
|
@ -26,10 +32,10 @@ const courseObj = reactive({
|
||||||
textbookId: '',
|
textbookId: '',
|
||||||
levelFirstId: '',
|
levelFirstId: '',
|
||||||
levelSecondId: '',
|
levelSecondId: '',
|
||||||
coursetitle:'',
|
coursetitle: '',
|
||||||
node: null, // 选择的课程节点
|
node: null, // 选择的课程节点
|
||||||
//
|
|
||||||
})
|
})
|
||||||
|
|
||||||
// 查询
|
// 查询
|
||||||
const getData = (data) => {
|
const getData = (data) => {
|
||||||
const { textBook, node } = data
|
const { textBook, node } = data
|
||||||
|
@ -50,22 +56,53 @@ const getData = (data) => {
|
||||||
courseObj.node = node; // 保存当前节点
|
courseObj.node = node; // 保存当前节点
|
||||||
|
|
||||||
// 头部 教材分析打开外部链接需要当前章节ID
|
// 头部 教材分析打开外部链接需要当前章节ID
|
||||||
localStorage.setItem('unitId', JSON.stringify({ levelFirstId, levelSecondId}))
|
localStorage.setItem('unitId', JSON.stringify({ levelFirstId, levelSecondId }))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const openPPTist = () => {
|
||||||
const openPPTist = () =>{
|
createWindow('open-win', { url: '/pptist' })
|
||||||
createWindow('open-win', {url: '/pptist'})
|
|
||||||
}
|
}
|
||||||
|
|
||||||
const onchange = (path) =>{
|
const onchange = (path) => {
|
||||||
if(path == '/model/newClassTaskAssign'){
|
if (path == '/model/newClassTaskAssign') {
|
||||||
// 作业管理
|
// 作业管理
|
||||||
router.push({path, query: { courseObj: JSON.stringify(courseObj)}})
|
router.push({ path, query: { courseObj: JSON.stringify(courseObj) } })
|
||||||
}else{
|
} else {
|
||||||
router.push(path)
|
router.push(path)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<style lang="scss" scoped></style>
|
<style lang="scss" scoped>
|
||||||
|
.page-resource {
|
||||||
|
height: 100%;
|
||||||
|
padding: 10px 15px 0;
|
||||||
|
|
||||||
|
.page-right {
|
||||||
|
min-width: 0;
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
flex: 1;
|
||||||
|
margin-left: 20px;
|
||||||
|
height: 100%;
|
||||||
|
background: #ffffff;
|
||||||
|
border-radius: 10px;
|
||||||
|
box-shadow: 0px 0px 20px 0px rgba(99, 99, 99, 0.06);
|
||||||
|
}
|
||||||
|
|
||||||
|
.button-container {
|
||||||
|
display: flex;
|
||||||
|
flex-wrap: wrap;
|
||||||
|
gap: 10px;
|
||||||
|
margin: 1rem 0;
|
||||||
|
justify-content: flex-start;
|
||||||
|
|
||||||
|
.el-button {
|
||||||
|
flex: 1 1 15%;
|
||||||
|
max-width: 15%;
|
||||||
|
min-width: 15%;
|
||||||
|
box-sizing: border-box;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
</style>
|
Loading…
Reference in New Issue