From d17d64c1d4c5379c20be895e4c7deea438a41caf Mon Sep 17 00:00:00 2001 From: wyx Date: Thu, 19 Jan 2023 08:47:31 +0800 Subject: [PATCH 1/8] =?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 7ca7582f..eaa77157 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.1.5------------"); + console.log("版本2.1.6------------"); const routes = computed(() => { return router.getRoutes().filter((e) => e.meta?.isLink); }); From 0e29925e2f6472c959ce7c49574170f11b3d72fb Mon Sep 17 00:00:00 2001 From: wyx Date: Thu, 19 Jan 2023 09:35:33 +0800 Subject: [PATCH 2/8] =?UTF-8?q?fix:=E4=B8=8B=E8=BD=BD=E4=B8=AD=E5=BF=83?= =?UTF-8?q?=E5=AE=B9=E9=87=8F=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/DownLoad.vue | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/views/DownLoad.vue b/src/views/DownLoad.vue index 2507bdb2..af7fe54b 100644 --- a/src/views/DownLoad.vue +++ b/src/views/DownLoad.vue @@ -59,7 +59,7 @@ '0%': countCMB>2?'#FF0000 ':'#45B058', '100%': countCMB>2?'#FF0000 ':'#45B058', }" /> -
容量已满，请删除文件
+
容量已满，请删除文件
@@ -176,6 +176,12 @@ export default { return CMB } + function formatCapacityGB(data) { + let num = Number(data); + let CMB = (num / (1048576*1024)).toFixed(2); + return CMB + } + // 下载文件 function downLoadFile(data) { console.log(data) @@ -226,7 +232,8 @@ export default { changePaginationStu, searchDownloadList, reseatDownloadList, - formatCapacity + formatCapacity, + formatCapacityGB }; }, }; From 9c433a4472492a1afa00957a566e27905b1761e7 Mon Sep 17 00:00:00 2001 From: wyx Date: Thu, 19 Jan 2023 09:43:26 +0800 Subject: [PATCH 3/8] =?UTF-8?q?style:=E4=B8=8A=E4=BC=A0=E9=99=84=E4=BB=B6?= =?UTF-8?q?=E8=B6=85=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/drawers/AddHomework.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/drawers/AddHomework.vue b/src/components/drawers/AddHomework.vue index 1f70b2d9..b1031950 100644 --- a/src/components/drawers/AddHomework.vue +++ b/src/components/drawers/AddHomework.vue @@ -72,7 +72,7 @@ - +
From b46d4c8c2a1109612ef316872bd84e87e109ca1d Mon Sep 17 00:00:00 2001 From: wyx Date: Thu, 19 Jan 2023 09:44:26 +0800 Subject: [PATCH 4/8] =?UTF-8?q?style:=E4=B8=8A=E4=BC=A0=E9=99=84=E4=BB=B6?= =?UTF-8?q?=E8=B6=85=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/drawers/AddHomework.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/drawers/AddHomework.vue b/src/components/drawers/AddHomework.vue index b1031950..b68e77fd 100644 --- a/src/components/drawers/AddHomework.vue +++ b/src/components/drawers/AddHomework.vue @@ -75,7 +75,7 @@
-
+
取消 确定
From 5173e01cf381812677573af7362b60b1a0474f0f Mon Sep 17 00:00:00 2001 From: wyx Date: Thu, 19 Jan 2023 10:03:51 +0800 Subject: [PATCH 5/8] =?UTF-8?q?style:=E9=A1=B9=E7=9B=AE=E5=85=AC=E5=91=8A?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=A0=B7=E5=BC=8F=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/drawers/NoticeHis.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/drawers/NoticeHis.vue b/src/components/drawers/NoticeHis.vue index 329ff3f9..eb3343a3 100644 --- a/src/components/drawers/NoticeHis.vue +++ b/src/components/drawers/NoticeHis.vue @@ -7,7 +7,7 @@
发布时间
-
+
Date: Thu, 19 Jan 2023 10:19:48 +0800 Subject: [PATCH 6/8] =?UTF-8?q?fix:=E9=A1=B9=E7=9B=AE/=E8=B7=AF=E5=BE=84?= =?UTF-8?q?=E5=9B=BE/=E9=9D=A2=E6=8E=88=E8=AF=BE=E5=AD=A6=E5=91=98?= =?UTF-8?q?=E9=83=A8=E9=97=A8=E5=85=A8=E8=B7=AF=E5=BE=84=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/student/TableStudent.vue | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/components/student/TableStudent.vue b/src/components/student/TableStudent.vue index 2908b9b5..586d4600 100644 --- a/src/components/student/TableStudent.vue +++ b/src/components/student/TableStudent.vue @@ -457,6 +457,8 @@ const tablecolumns = ref([ align: "center", className: "h", ellipsis: true, + customRender: ({ record: { studentOrgName, studentDepartName } }) => + (allDepartShow(studentOrgName, studentDepartName)), }, { title: "加入方式", @@ -478,6 +480,14 @@ const tablecolumns = ref([ slots: { customRender: "action" }, }, ]); + +function allDepartShow(a,b) { + let org = (a=="" || a == null || a == undefined) ? a = "" : a.slice(0,1) =='/' ? a.slice(1,a.length) : a; + let depart = (b=="" || b == null || b == undefined) ? b = "" : b; + let allname = org == "" && depart == "" ? '-' : org + depart; + return allname; +} + const tableParam = ref({ studentName: "", //学员名称 groupName: "", //学员小组 From f78cac0ea2bd5a7ef7b32ab7b66240a0addf5921 Mon Sep 17 00:00:00 2001 From: wyx Date: Thu, 19 Jan 2023 10:37:37 +0800 Subject: [PATCH 7/8] =?UTF-8?q?fix:=E5=8A=A0=E5=85=A5=E6=96=B9=E5=BC=8F?= =?UTF-8?q?=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/student/TableStudent.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/student/TableStudent.vue b/src/components/student/TableStudent.vue index 586d4600..5d8481fe 100644 --- a/src/components/student/TableStudent.vue +++ b/src/components/student/TableStudent.vue @@ -468,7 +468,7 @@ const tablecolumns = ref([ align: "center", customRender: ({ record: { source } }) => // ({ 1: "快速添加", 2: "组织", 3: "受众", 4: "报名" }[source]), - ({ 1: "手动加入", 2: "手动加入", 3: "手动加入", 4: "报名" }[source]), + ({ 0: "手动加入", 1: "手动加入", 2: "手动加入", 3: "手动加入", 4: "报名", 5: "手动加入", 6: "手动加入"}[source]), }, ...props.columns, { From cad87d36cb1a78710689e70b4b3f731a52cc1f0c Mon Sep 17 00:00:00 2001 From: wyx Date: Thu, 19 Jan 2023 17:19:16 +0800 Subject: [PATCH 8/8] =?UTF-8?q?fix:=E5=AF=BC=E5=85=A530s=E6=97=A0=E5=8F=8D?= =?UTF-8?q?=E5=BA=94=E7=BB=93=E6=9D=9F=E8=AF=B7=E6=B1=82=EF=BC=8C=E6=8F=90?= =?UTF-8?q?=E7=A4=BA=E5=AF=BC=E5=85=A5=E5=A4=B1=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/drawers/ExportScore.vue | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/components/drawers/ExportScore.vue b/src/components/drawers/ExportScore.vue index 3c3f18c4..c06a1061 100644 --- a/src/components/drawers/ExportScore.vue +++ b/src/components/drawers/ExportScore.vue @@ -298,6 +298,12 @@ export default { console.log("查询导入状态失败", err); }); }, 500); + setTimeout(() => { + clearInterval(timer) + state.addLoading = false; + message.destroy(); + message.error(`文件导入超时`); + }, 30000); } else if (status === "error") { state.uploadErr = true; message.error(`${info.file.name}上传失败`);