From 54be3cad4f4f1573769ce64f5cc2aee987d4fe11 Mon Sep 17 00:00:00 2001 From: lyc Date: Fri, 20 Dec 2024 10:56:55 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E9=9A=90=E8=97=8F=E6=95=99=E5=AD=A6?= =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E5=8F=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/renderer/src/layout/components/Aside.vue | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/renderer/src/layout/components/Aside.vue b/src/renderer/src/layout/components/Aside.vue index ed60198..b19f29c 100644 --- a/src/renderer/src/layout/components/Aside.vue +++ b/src/renderer/src/layout/components/Aside.vue @@ -84,7 +84,7 @@ const isStadium = () => { const headerMenus = isStadium() ?[{ name: '教学实践', - id: 4, + id: 6, icon: 'icon-jiaoxueshijian', path: '/prepare' },]:[ @@ -94,12 +94,12 @@ const headerMenus = isStadium() ?[{ icon: 'icon-shouye', path: '/model/index' }, - { - name: '教学工作台', - id: 2, - icon: 'icon-gongzuotai', - path: '/desktop' - }, + // { + // name: '教学工作台', + // id: 2, + // icon: 'icon-gongzuotai', + // path: '/desktop' + // }, { name: '教学实践', id: 4, From 7bca2fdc2ded1dd249f520a1f504f073f57de560 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Czouyf=E2=80=9D?= <80906036@qq.com> Date: Fri, 20 Dec 2024 11:05:22 +0800 Subject: [PATCH 2/3] =?UTF-8?q?[=E4=BD=9C=E4=B8=9A=E6=89=B9=E6=94=B9]=20-?= =?UTF-8?q?=20=E5=A2=9E=E5=8A=A0=E7=A7=91=E5=AD=A6=E5=AE=9E=E9=AA=8C?= =?UTF-8?q?=E7=9A=84=E6=89=B9=E6=94=B9(=E5=90=8C=E5=B8=B8=E8=A7=84?= =?UTF-8?q?=E4=BD=9C=E4=B8=9A)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../container/classTask/item-dialog-score.vue | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/src/renderer/src/views/classTask/container/classTask/item-dialog-score.vue b/src/renderer/src/views/classTask/container/classTask/item-dialog-score.vue index 044f98e..0c90c6c 100644 --- a/src/renderer/src/views/classTask/container/classTask/item-dialog-score.vue +++ b/src/renderer/src/views/classTask/container/classTask/item-dialog-score.vue @@ -141,7 +141,8 @@ v-if=" dialogProps.studentObj.worktype == '常规作业' || dialogProps.studentObj.worktype == '课堂展示' || - dialogProps.studentObj.worktype == '框架梳理' + dialogProps.studentObj.worktype == '框架梳理' || + dialogProps.studentObj.worktype == '科学实验' " >
@@ -157,7 +158,8 @@ v-if=" dialogProps.studentObj.worktype == '常规作业' || dialogProps.studentObj.worktype == '课堂展示' || - dialogProps.studentObj.worktype == '框架梳理' + dialogProps.studentObj.worktype == '框架梳理' || + dialogProps.studentObj.worktype == '科学实验' " >
-
+

学生答复内容

{{stuItem.rightanswer}}
@@ -700,7 +708,7 @@ const acceptParams = async (params) => { }) } else { // 学生回答 - if (params.studentObj.worktype == '常规作业') { + if (params.studentObj.worktype == '常规作业' || params.studentObj.worktype == '科学实验') { try { // 老师布置的附件 datacontent TODO：常规作业、其他类型还未接入 const res = await getClassworkdata(params.studentObj.id); From 8e0b9f72d5fe2adbd100b37b04edad23bea76ab2 Mon Sep 17 00:00:00 2001 From: zhuhao <979263092@qq.com> Date: Fri, 20 Dec 2024 11:16:44 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=AE=AB=E6=A0=BC=E5=9B=BE=E7=89=87?= =?UTF-8?q?=E6=8F=92=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- .../src/components/grid-pic/index.vue | 75 ++++++++++++++----- .../src/components/grid-pic/viewer-item.vue | 19 ++--- src/renderer/src/views/prepare/index.vue | 2 +- 4 files changed, 68 insertions(+), 30 deletions(-) diff --git a/package.json b/package.json index 0f89d82..e8adfd8 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "aix-win-ws", - "version": "2.5.6", + "version": "2.5.7", "description": "", "main": "./out/main/index.js", "author": "上海交大重庆人工智能研究院", diff --git a/src/renderer/src/components/grid-pic/index.vue b/src/renderer/src/components/grid-pic/index.vue index 4769a98..9725af6 100644 --- a/src/renderer/src/components/grid-pic/index.vue +++ b/src/renderer/src/components/grid-pic/index.vue @@ -1,3 +1,16 @@ + - - - 添加 - - - 画笔 - -
- +
+ + + 添加 + + + 清空 +
+ +
@@ -26,10 +44,18 @@ import {ref, computed, onMounted} from 'vue' import Draggable from 'vuedraggable' import ViewerItem from "./viewer-item.vue"; - import Fabric from 'fabric'; + // import Fabric from 'fabric'; const gridPicList = ref([]) const inputValue = ref('') const isShow = ref(false) + const emits = defineEmits(['clear','outIndex']); + + const props = defineProps({ + showToolbar: { + type: Boolean, + default: true + } + }) // 获取图片样式 const getWH = (item,index)=>{ return { @@ -118,13 +144,19 @@ } }) + const pushPic = () => { + let src = inputValue.value||picList[gridPicList.value.length] + addPic(src) + } // 添加图片 - const addPic = () => { + const addPic = (src) => { if (gridPicList.value.length >= 9) { + console.log("超出九个图片") + emits('outIndex') return } - let src = inputValue.value||picList[gridPicList.value.length] if (!src) { + console.log("图片链接不能为空") return; } gridPicList.value.push({ @@ -133,6 +165,11 @@ }) inputValue.value = '' } + // 清空图片 + const clearPic = () => { + gridPicList.value = [] + emits('clear') + } //开始画笔 const startPencil = () => { isShow.value = !isShow.value @@ -148,7 +185,7 @@ b = b.length === 1? '0' + b : b; return `#${r}${g}${b}`; } - //初始化画笔 + /* //初始化画笔 const initPend = () => { let canvas = new Fabric.fabric.Canvas('canvas_pic_001',{ interactive: false, @@ -162,10 +199,11 @@ canvas.freeDrawingBrush = new Fabric.fabric.PencilBrush(canvas) canvas.freeDrawingBrush.width = 1//设置画笔粗细 canvas.freeDrawingBrush.color = "red"//设置画笔颜色 - } - onMounted(() => { + }*/ + /*onMounted(() => { initPend() - }) + })*/ + defineExpose({addPic,clearPic})