From 27bb696b2aa17e8693222031492e06f3fd89325f Mon Sep 17 00:00:00 2001 From: gengxin Date: Fri, 21 Feb 2025 09:30:27 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/lecturer/LecturerFee.vue | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/views/lecturer/LecturerFee.vue b/src/views/lecturer/LecturerFee.vue index 87966afe..41fd5305 100644 --- a/src/views/lecturer/LecturerFee.vue +++ b/src/views/lecturer/LecturerFee.vue @@ -1159,6 +1159,7 @@ export default { state.tableDataTotal = Number(res.data.data.total); state.tableLoading = false }).catch(err => { + console.log("getTeacherFeeList catch err.data.msg",err.data.msg) state.tableLoading = false message.destroy() message.error(err.data.msg) @@ -1258,6 +1259,7 @@ export default { cancel() getTableDate(); }).catch(err => { + console.log("updateTeacherFee catch err",err.data.msg) message.destroy() state.teacherdialog = false; message.error(err.data.msg) From 4c91874ee0abdbb5a2cf0fccc9d542c342b0a0fc Mon Sep 17 00:00:00 2001 From: gengxin Date: Fri, 21 Feb 2025 10:35:46 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E4=B8=AD=E5=BF=83?= =?UTF-8?q?=E5=85=A8=E9=83=A8=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/lecturer/OrganizationApproval.vue | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/views/lecturer/OrganizationApproval.vue b/src/views/lecturer/OrganizationApproval.vue index bbb41dfa..53ecaec0 100644 --- a/src/views/lecturer/OrganizationApproval.vue +++ b/src/views/lecturer/OrganizationApproval.vue @@ -756,10 +756,12 @@ export default { if(objA.status == 0){ objA.approvalType = null; //全部数据 + objA.status = null; } if(objA.status == 3){ //审核通过 - objA.approvalType = 0 + objA.approvalType = 0; + } queryTrainOrg(objA).then((res) => { From 01ab826dcf5f6b3bffd3945f61a9a29ca7cdd59d Mon Sep 17 00:00:00 2001 From: Pengxiansen <2422914688@qq.com> Date: Fri, 21 Feb 2025 14:04:17 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/configGrowth.js | 4 +- src/api/growthpath.js | 2 +- .../growthpath/GrowthActiveAttendance.vue | 2 +- src/components/growthpath/GrowthCase.vue | 4 +- .../growthpath/GrowthCommonImport.vue | 4 +- src/components/growthpath/GrowthDrawer.vue | 14 +++-- src/components/growthpath/GrowthExa.vue | 4 +- src/components/growthpath/GrowthFaceStu.vue | 53 ++++++++++++------- .../growthpath/GrowthFaceTaskManage.vue | 9 +++- .../growthpath/GrowthOpenCourse.vue | 13 ++--- src/components/growthpath/ImportStu.vue | 4 +- src/components/growthpath/StudentManage.vue | 2 +- src/components/growthpath/UpdateRecord.vue | 3 -- src/views/growthpath/EditingTasks.vue | 1 - src/views/growthpath/GrowthPath.vue | 12 ++--- src/views/growthpath/PathManage.vue | 35 ++++++++---- vue.config.js | 16 +++--- 17 files changed, 107 insertions(+), 75 deletions(-) diff --git a/src/api/configGrowth.js b/src/api/configGrowth.js index ab3fedbe..2f010b28 100644 --- a/src/api/configGrowth.js +++ b/src/api/configGrowth.js @@ -18,8 +18,8 @@ import { boeRequest } from "@/api/request"; // "application/x-www-form-urlencoded"; axios.defaults.withCredentials = true; const http = axios.create({ - // baseURL: '/growth', - baseURL: process.env.VUE_APP_BASE_API_GROWTH, + baseURL: '/growth', + // baseURL: process.env.VUE_APP_BASE_API_GROWTH, timeout: 1000 * 15, // headers: { "Content-Type": "multipart/form-data" }, headers: { "Content-Type": "application/json" }, diff --git a/src/api/growthpath.js b/src/api/growthpath.js index 40eaecbf..7378c185 100644 --- a/src/api/growthpath.js +++ b/src/api/growthpath.js @@ -81,7 +81,7 @@ export const taskInformation = (growthId) => http.get('/professional/managementO export const taskCompletionRate = (growthId) => http.get('/professional/managementOverview/taskCompletionRate/' + growthId) // 运营数据概览 -export const getStudyStatisticsList = (data) => http.post('/professional/statics/getStudyStatisticsList',) +export const getStudyStatisticsList = (data) => http.post('/professional/statics/getStudyStatisticsList', data) // 专业力列表 export const boeuGrowthPlatePageList = (obj) => http.post('/boeu/growth/pageList', obj) diff --git a/src/components/growthpath/GrowthActiveAttendance.vue b/src/components/growthpath/GrowthActiveAttendance.vue index d63ffb96..a09340bd 100644 --- a/src/components/growthpath/GrowthActiveAttendance.vue +++ b/src/components/growthpath/GrowthActiveAttendance.vue @@ -445,7 +445,7 @@ export default { console.log(obj); state.tableDataTotalLoading = true; - taskLeave(obj) + taskSign(obj) .then((res) => { console.log("签到结果", res, obj); if (res.data.code === 200) { diff --git a/src/components/growthpath/GrowthCase.vue b/src/components/growthpath/GrowthCase.vue index 929b855a..01212077 100644 --- a/src/components/growthpath/GrowthCase.vue +++ b/src/components/growthpath/GrowthCase.vue @@ -131,7 +131,7 @@ const params = useResetRef({ orderAsc: true, }); -const { data, loading, total, fetch } = useBoeApiPage(CASE_PAGE, params.value, { +const { data, loading, total, fetch } = useBoeApiPage(CASE_PAGE, params, { init: false, result: (res) => res.result.list, totalPage: (res) => res.result.totalPages, @@ -157,7 +157,7 @@ function search() { } function reset() { - params.reset(); + params.reset() fetch(); } diff --git a/src/components/growthpath/GrowthCommonImport.vue b/src/components/growthpath/GrowthCommonImport.vue index f70a356a..e6446027 100644 --- a/src/components/growthpath/GrowthCommonImport.vue +++ b/src/components/growthpath/GrowthCommonImport.vue @@ -101,6 +101,7 @@
+
@@ -138,7 +139,7 @@ const { start } = useTimeout(async ({ uuid, file }) => { fileList.value = [...fileList.value]; if (upData && upData.status !== "START" && upData.status !== "NULL") { emit("change", "end"); - // message.success("导入成功"); + message.success("导入成功"); // closeDrawer(); throw Error("查询任务结束"); } @@ -170,6 +171,7 @@ function handleChange({ file }) { overflow-x: auto; display: flex; flex-direction: column; + height: 100%; .main { .minatitl { diff --git a/src/components/growthpath/GrowthDrawer.vue b/src/components/growthpath/GrowthDrawer.vue index 3eeb35cd..1f355534 100644 --- a/src/components/growthpath/GrowthDrawer.vue +++ b/src/components/growthpath/GrowthDrawer.vue @@ -4,7 +4,7 @@ class="drawerStyle" placement="right" destroyOnClose - width="60%" + :width="width" >
@@ -29,17 +29,21 @@ const props = defineProps({ type: String, default: "", }, + width: { + type: String, + default: "60%", + }, }); const visiable = ref(false); const openDrawer = () => { visiable.value = true; }; -const closeDrawer = ()=>{ +const closeDrawer = () => { visiable.value = false; -} +}; defineExpose({ openDrawer, - closeDrawer -}) + closeDrawer, +}); diff --git a/src/components/growthpath/GrowthExa.vue b/src/components/growthpath/GrowthExa.vue index 8d6524e2..38170c41 100644 --- a/src/components/growthpath/GrowthExa.vue +++ b/src/components/growthpath/GrowthExa.vue @@ -7,6 +7,7 @@ class="drawerStyle growth-exa" width="1500" placement="right" + destroyOnClose >
@@ -511,12 +512,13 @@ const closeDrawer = () => { if (step.value > 1) { step.value = step.value - 1; } else { - visible.value = false; + formData.reset(); formData.value.info = { examType: 1, }; dateTime.value = []; + visible.value = false; } }; diff --git a/src/components/growthpath/GrowthFaceStu.vue b/src/components/growthpath/GrowthFaceStu.vue index acd62645..0ad26c45 100644 --- a/src/components/growthpath/GrowthFaceStu.vue +++ b/src/components/growthpath/GrowthFaceStu.vue @@ -8,7 +8,7 @@ >
-
【面授】{{ datasource?.name }}
+
【面授】{{ datasource?.taskName }}
-
+