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 }}
-
+