zhuhao
/
AIx_Smarttalk_WS
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases 3 Wiki Activity

Merge pull request 'yws_dev' (#50) from yws_dev into main 

Reviewed-on: #50
This commit is contained in:
yangws 2024-11-21 16:04:12 +08:00
parent c8aa529621 08f0b63741
commit 45f1a70d7a
10 changed files with 202 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/renderer/src/assets/iconfont/iconfont.css
View File

@ -1,8 +1,8 @@
@font-face {
font-family: "iconfont"; /* Project id 4723712 */
src: url('iconfont.woff2?t=1731913617367') format('woff2'),
url('iconfont.woff?t=1731913617367') format('woff'),
url('iconfont.ttf?t=1731913617367') format('truetype');
src: url('iconfont.woff2?t=1732173266977') format('woff2'),
url('iconfont.woff?t=1732173266977') format('woff'),
url('iconfont.ttf?t=1732173266977') format('truetype');
}
.iconfont {
@ -13,6 +13,26 @@
-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 {
content: "\e60e";
}

2
src/renderer/src/assets/iconfont/iconfont.js
View File

File diff suppressed because one or more lines are too long

35
src/renderer/src/assets/iconfont/iconfont.json
View File

@ -5,6 +5,41 @@
"css_prefix_text": "icon-",
"description": "",
"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",
"name": "保存",

BIN
src/renderer/src/assets/iconfont/iconfont.ttf
View File

Binary file not shown.

BIN
src/renderer/src/assets/iconfont/iconfont.woff
View File

Binary file not shown.

BIN
src/renderer/src/assets/iconfont/iconfont.woff2
View File

Binary file not shown.

76
src/renderer/src/views/classTask/newClassTaskAssign/Right/index.vue
View File

@ -1,12 +1,23 @@
<template>
<div class="list-content">
<div class="list-container">
<div class="content-list" v-for="(item, index) in items" :key="index" @click="handleClick(item)">
<div class="item-content">
<div class="item-text">
<div class="title-header">
<div class="item-title">{{ item.title }}</div>
<div class="item-description">{{ item.description }}</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>
<el-icon class="item-icon"><component :is="item.icon" /></el-icon>
</div>
</div>
</div>
@ -15,17 +26,16 @@
<script setup>
import { shallowRef } from 'vue';
import { ElMessage } from 'element-plus'
import { Plus, ArrowDown, Document, User, Setting } from '@element-plus/icons-vue';
const emit = defineEmits(['itemClick'])
const items = shallowRef([
{ title: '自主搜题', description: '1111111', icon: Document },
{ title: '校本题库', description: '222222', icon: User },
{ title: '个人题库', description: '333333', icon: Setting },
{ title: '智能推荐', description: '444444', icon: Plus },
{ title: '课堂展示', description: '555555', icon: ArrowDown },
{ title: '常规作业', description: '555555', icon: ArrowDown },
{ title: 'AI设计作业', description: '555555', icon: ArrowDown },
{ title: '自主搜题', description: '1111111111111111111111111111111111111', icon: '#icon-soutibao-',type:'primary' },
{ title: '校本题库', description: '222222', icon: '#icon-soutibao-',type:'success' },
{ title: '个人题库', description: '333333', icon: '#icon-soutibao-',type:'default' },
{ title: '智能推荐', description: '444444', icon: '#icon-tubiao_wuxing-',type:'default' },
{ title: '课堂展示', description: '555555', icon: '#icon-huaban',type:'primary' },
{ title: '常规作业', description: '555555', icon: '#icon-zhaoxiangji',type:'primary' },
{ title: 'AI设计作业', description: '555555', icon: '#icon-jiqiren_o',type:'danger' },
]);
const handleClick = (item) => {
@ -42,20 +52,25 @@ const handleClick = (item) => {
</script>
<style scoped>
.list-content{
padding: 8px;
background-color: #f5f5f5;
border-radius: 8px;
height: 100%;
margin-left: 10px
}
.list-container {
display: flex;
flex-wrap: wrap;
gap: 16px;
padding: 16px;
/* background-color: #f5f5f5; */
}
.content-list {
background-color: #fff;
border-radius: 8px;
box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
padding: 16px;
width: calc(33.333% - 32px); /* 3列布局，每列减去gap */
padding: 8px;
width: calc(25% - 16px);
cursor: pointer;
transition: all 0.3s ease;
}
@ -68,6 +83,7 @@ const handleClick = (item) => {
.item-content {
display: flex;
align-items: center;
height: 100%;
}
.item-icon {
@ -78,6 +94,10 @@ const handleClick = (item) => {
.item-text {
flex: 1;
justify-content: space-between;
display: flex;
flex-direction: column;
height: 100%;
}
.item-title {
@ -85,10 +105,38 @@ const handleClick = (item) => {
font-weight: 500;
color: #303133;
margin-bottom: 4px;
font-weight: bold;
}
.item-description {
font-size: 14px;
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>

22
src/renderer/src/views/classTask/newClassTaskAssign/index.vue
View File

@ -6,7 +6,7 @@
<el-button type="success" @click="handleTaskAssignToAllClass()">批量推送</el-button>
</div>
<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 class="page-resource">
@ -22,15 +22,22 @@
@current-change="handleCurrentChange"
>
<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">
<div style="height: 100px;">
<div style="height: 100px;cursor: pointer">
<div style="display: flex;align-items: center;justify-content: space-between;">
<div style="width: 100%;">
<div class="pageleft-table-top">
<span>{{ scope.row.uniquekey }}</span>
</div>
<div class="pageleft-table-top">
<el-tag :type="scope.row.workclass" size="default">{{ scope.row.worktype }}</el-tag>
<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 class="pageleft-table-cont">
<p class="ellipsis "> {{ scope.row.worktype == "课堂展示" ? scope.row.worktag : scope.row.title }}</p>
@ -122,6 +129,7 @@
import { onMounted, ref,watch, reactive, getCurrentInstance,nextTick } from 'vue'
import { ElMessage } from 'element-plus'
import { cloneDeep } from 'lodash'
import { Plus } from '@element-plus/icons-vue'
import { delClasswork } from '@/api/teaching/classwork'
import {listEntpcoursework, listEntpcourseworkNew, getEntpcoursework} from '@/api/education/entpCourseWork'
import { addClassworkReturnId } from '@/api/teaching/classwork'
@ -716,7 +724,7 @@ const editWork = async (cform) =>{
}
}
.page-left {
width: 300px;
width: 240px;
background-color: white;
border-radius: 10px;
box-shadow: 0px 0px 20px 0px rgba(99, 99, 99, 0.06);

1
src/renderer/src/views/job-management/Left/index.vue
View File

@ -127,7 +127,6 @@ onMounted(() => {
.title-header{
display: flex;
justify-content: space-between;
align-items: center;
flex-direction: column;
}

49
src/renderer/src/views/model/index.vue
View File

@ -1,7 +1,12 @@
<template>
<div>
<div class="mb-4">
<el-button type="primary" @click="onchange('/model/curriculum')">课标研读</el-button>
<div class="page-resource flex">
<!-- 左侧 教材 目录 -->
<ChooseTextbook @change-book="getData" @node-click="getData" />
<div class="page-right">
<div class="button-container">
<el-button style="margin-left: 12px;" type="primary" @click="onchange('/model/curriculum')">课标研读</el-button>
<el-button type="primary" @click="onchange('/model/management')">作业管理1</el-button>
<el-button type="primary" @click="onchange('/model/newClassTaskAssign')">作业管理2</el-button>
<el-button type="success" @click="onchange('/model/teaching')">教材研读</el-button>
@ -9,7 +14,8 @@
<el-button type="success" @click="openPPTist">打开PPTist</el-button>
<!-- <el-button type="info" @click="onchange('/model/examination')">考试分析</el-button> -->
</div>
<ChooseTextbook @change-book="getData" @node-click="getData" />
</div>
</div>
</div>
</template>
@ -28,8 +34,8 @@ const courseObj = reactive({
levelSecondId: '',
coursetitle: '',
node: null, // 选择的课程节点
//
})
// 查询
const getData = (data) => {
const { textBook, node } = data
@ -53,7 +59,6 @@ const getData = (data) => {
localStorage.setItem('unitId', JSON.stringify({ levelFirstId, levelSecondId }))
}
const openPPTist = () => {
createWindow('open-win', { url: '/pptist' })
}
@ -68,4 +73,36 @@ const onchange = (path) =>{
}
</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>