From ba5b178026274b8f9f7ab8a386e7cdb37e237a58 Mon Sep 17 00:00:00 2001 From: wyx Date: Thu, 12 Jan 2023 09:40:15 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/App.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/App.vue b/src/App.vue index e84908a9..ad2ec813 100644 --- a/src/App.vue +++ b/src/App.vue @@ -44,7 +44,7 @@ export default defineComponent({ const store = useStore(); const isLogin = ref(false); // console.log("router", router.getRoutes(), route); - console.log("版本2.0.4------------"); + console.log("版本2.0.5------------"); const routes = computed(() => { return router.getRoutes().filter((e) => e.meta?.isLink); }); From 98faedeecd1dd3c7345dd9ddd2cf1cc1d73edd0e Mon Sep 17 00:00:00 2001 From: wyx Date: Thu, 12 Jan 2023 10:41:04 +0800 Subject: [PATCH 2/3] =?UTF-8?q?style:=E4=BF=AE=E6=94=B9=E9=9D=A2=E6=8E=88?= =?UTF-8?q?=E8=AF=BE-=E5=BC=80=E8=AF=BE-=E5=AD=A6=E5=91=98=E7=AE=A1?= =?UTF-8?q?=E7=90=86-=E5=B1=95=E7=A4=BA=E8=A1=A8=E6=A0=BC=E5=AE=BD?= =?UTF-8?q?=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/courselibrary/CoursewareManage.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue index 8c921fd0..18d5fd39 100644 --- a/src/views/courselibrary/CoursewareManage.vue +++ b/src/views/courselibrary/CoursewareManage.vue @@ -1659,7 +1659,7 @@ :footer="null" :closable="false" wrapClassName="modalStyle stusmanageModal" - width="80%" + width="90%" @cancel="sm_exit" >
@@ -7793,7 +7793,7 @@ export default defineComponent({ .stusmanageModal { .ant-modal { - max-width: 1700px; + max-width: 1800px; .ant-modal-content { // width:1358px !important; .ant-modal-body { From 9ae7169f6c54a10a1f74ea7ad447d67b43ee2992 Mon Sep 17 00:00:00 2001 From: wyx Date: Thu, 12 Jan 2023 11:53:50 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E8=AF=84=E4=BC=B0?= =?UTF-8?q?=E7=BC=96=E8=BE=91=E7=A9=BA=E5=AD=90=E6=AE=B5=E6=8F=90=E4=BA=A4?= =?UTF-8?q?=E9=97=AE=E9=A2=98=EF=BC=8C=E4=B8=8A=E4=BC=A0=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E5=87=BA=E9=94=99=E5=90=8E=E6=98=BE=E7=A4=BA=E7=BD=91=E5=9D=80?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/common/FJUpload.vue | 6 +++++- src/views/research/ResearchManage.vue | 6 ++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/src/components/common/FJUpload.vue b/src/components/common/FJUpload.vue index d5d3c265..a9f9bffc 100644 --- a/src/components/common/FJUpload.vue +++ b/src/components/common/FJUpload.vue @@ -20,7 +20,11 @@
- {{ item.name.indexOf('-')!==-1?item.name.slice(0,item.name.indexOf('-')) + item.name.slice(item.name.indexOf('.')) :item.name }} + {{ + item.name.indexOf('http')!==-1? + item.name.slice(item.name.lastIndexOf('/') + 1) + :item.name.indexOf('-')!==-1?item.name.slice(0,item.name.indexOf('-')) + item.name.slice(item.name.indexOf('.')) :item.name + }}
diff --git a/src/views/research/ResearchManage.vue b/src/views/research/ResearchManage.vue index 20ead7d9..4ba0c4f6 100644 --- a/src/views/research/ResearchManage.vue +++ b/src/views/research/ResearchManage.vue @@ -599,6 +599,7 @@ export default { const handleNext = async() => { if (!state.assessmentId) { if (!state.assessmentName) { + message.destroy(); message.error("请输入评估名称"); return false; } @@ -620,6 +621,11 @@ export default { router.push("/researchadd"); handleCancel(); } else { + if (!state.assessmentName) { + message.destroy(); + message.error("请输入评估名称"); + return false; + } editAssessmentName({ assessmentId: state.assessmentId, assessmentName: state.assessmentName,