From 257abab94b50373de3d44b9285f74af5abb8b38b Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Thu, 8 Aug 2024 22:11:15 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B5=E9=9D=A2=E6=B5=81?= =?UTF-8?q?=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Tinymce/src/tinymce.ts | 8 +- .../renKeJiaoCheng/checkKecheng/dqxqkc.vue | 6 +- src/views/site/studentWdkc/studentDbtx.vue | 15 +- src/views/site/studentWdkc/studentWdkc.vue | 25 ++- .../zy/zyInfo/StudentZyInfoLiebiaoList.vue | 209 ++++++++---------- src/views/zy/zyInfo/StudentZyInfoList.vue | 47 ++-- src/views/zy/zyInfo/ZyInfoV2List.vue | 188 ++++++++++++---- .../zy/zyInfoStudent/ZyInfoStudent.data.ts | 66 +++--- .../components/ZyInfoStudentForm.vue | 6 +- 9 files changed, 337 insertions(+), 233 deletions(-) diff --git a/src/components/Tinymce/src/tinymce.ts b/src/components/Tinymce/src/tinymce.ts index fa3ccce..58053a7 100644 --- a/src/components/Tinymce/src/tinymce.ts +++ b/src/components/Tinymce/src/tinymce.ts @@ -23,8 +23,12 @@ export const plugins = [ 'advlist anchor autolink autosave code codesample directionality fullscreen hr insertdatetime link lists media nonbreaking noneditable pagebreak paste preview print save searchreplace spellchecker tabfocus template textpattern visualblocks visualchars wordcount image', ]; -export const toolbar = - 'fullscreen code preview | undo redo | bold italic underline strikethrough | fontselect fontsizeselect formatselect | alignleft aligncenter alignright alignjustify | outdent indent lineheight|subscript superscript blockquote| numlist bullist checklist | forecolor backcolor casechange permanentpen formatpainter removeformat | pagebreak | charmap emoticons | insertfile image media pageembed link anchor codesample insertdatetime hr| a11ycheck ltr rtl'; +// export const toolbar = +// 'fullscreen code preview | undo redo | bold italic underline strikethrough | fontselect fontsizeselect formatselect | alignleft aligncenter alignright alignjustify | outdent indent lineheight|subscript superscript blockquote| numlist bullist checklist | forecolor backcolor casechange permanentpen formatpainter removeformat | pagebreak | charmap emoticons | insertfile image media pageembed link anchor codesample insertdatetime hr| a11ycheck ltr rtl'; + + export const toolbar = + 'bold italic underline strikethrough | fontselect fontsizeselect formatselect | alignleft aligncenter alignright alignjustify | outdent indent lineheight| numlist bullist checklist | forecolor backcolor casechange permanentpen formatpainter removeformat | pagebreak | charmap emoticons | insertfile image media pageembed link anchor codesample insertdatetime hr| a11ycheck ltr rtl'; + // fullscreen code preview | undo redo | export const simplePlugins = ['lists image link media table textcolor wordcount contextmenu fullscreen']; diff --git a/src/views/site/renKeJiaoCheng/checkKecheng/dqxqkc.vue b/src/views/site/renKeJiaoCheng/checkKecheng/dqxqkc.vue index f57f320..88f59c4 100644 --- a/src/views/site/renKeJiaoCheng/checkKecheng/dqxqkc.vue +++ b/src/views/site/renKeJiaoCheng/checkKecheng/dqxqkc.vue @@ -9,14 +9,14 @@
- + > --> {{ item.kcmc }} - +
{{ item.skdd }}
diff --git a/src/views/site/studentWdkc/studentDbtx.vue b/src/views/site/studentWdkc/studentDbtx.vue index 3b30b9b..32b900f 100644 --- a/src/views/site/studentWdkc/studentDbtx.vue +++ b/src/views/site/studentWdkc/studentDbtx.vue @@ -5,7 +5,7 @@
- +
查看更多
@@ -30,7 +30,7 @@
@@ -111,11 +111,12 @@ function loaddata(){ } function openKecheng(record){ - console.log(`🚀 ~ openKecheng ~ record:`, record) - - defHttp.post({ url: '/zyDbtx/zyDbtx/deleteById',params:{id:record.id} }).then((res) => { - loaddata() - }); + //通知类型(0发布作业 1评分 2测验 3问卷 4讨论 9通知公告) + if(record.type=='9'||record.type=='4'||record.type=='1'){ + defHttp.post({ url: '/zyDbtx/zyDbtx/deleteById',params:{id:record.id} }).then((res) => { + loaddata() + }); + } var url = "/stuzy/studentMain"; if(record.type=='0'||record.type=='1'){//当前作业+评分 url = "/stuzy/studentDqzy"; diff --git a/src/views/site/studentWdkc/studentWdkc.vue b/src/views/site/studentWdkc/studentWdkc.vue index d93dc15..c576a54 100644 --- a/src/views/site/studentWdkc/studentWdkc.vue +++ b/src/views/site/studentWdkc/studentWdkc.vue @@ -33,19 +33,20 @@ height: 70px; " > - - {{ item.kcmc }} - + + {{ item.kcmc }} +
+
{{item.sksj}}
{{ item.skdd }}
- {{ + {{ item.skjs }} { - loaddata(); - }); - var url = '/stuzy/StudentGonggaoList?rwbh=' + record.rwbh + '&xqxn=' + record.xqxn + '&teano=' + record.jgh; + var jgh = record.jgh.split(",")[0]; + // defHttp.post({ url: '/zyDbtx/zyDbtx/deleteByRwbhCreate', params: { rwbh: record.rwbh, fbr: jgh } }).then((res) => { + // loaddata(); + // }); + var url = '/stuzy/StudentGonggaoList?rwbh=' + record.rwbh + '&xqxn=' + record.xqxn ; window.open(url, '_blank'); } @@ -128,4 +129,10 @@ function openKecheng(record) { font-weight: 600; height: 30px; } + +.ellipsis { + overflow: hidden; /* 确保超出容器的内容被裁剪 */ + white-space: nowrap; /* 确保文本在一行内显示 */ + text-overflow: ellipsis; /* 超出部分显示省略号 */ +} diff --git a/src/views/zy/zyInfo/StudentZyInfoLiebiaoList.vue b/src/views/zy/zyInfo/StudentZyInfoLiebiaoList.vue index 808742a..9db77a3 100644 --- a/src/views/zy/zyInfo/StudentZyInfoLiebiaoList.vue +++ b/src/views/zy/zyInfo/StudentZyInfoLiebiaoList.vue @@ -30,122 +30,40 @@
+ -