diff --git a/src/api/configGrowth.js b/src/api/configGrowth.js index 2f010b28..ab3fedbe 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 11200974..40eaecbf 100644 --- a/src/api/growthpath.js +++ b/src/api/growthpath.js @@ -100,4 +100,14 @@ export const batchSendMessage = (data) => http.post('/professional/urgeLearning/ export const delGrowth = (growthId) => http.get('/professional/compulsory/delGrowth/' + growthId) // 删除手动添加的专业力必修 -export const markComplete = (obj) => http.get('/professional/allocation/markComplete', { params: obj }) \ No newline at end of file +export const markComplete = (obj) => http.get('/professional/allocation/markComplete', { params: obj }) + + + +export const attendanceList = (obj) => http.post('/professional/task/attendanceList', obj) + +export const taskSign = (obj) => http.post('/professional/task/taskSign', obj) + +export const taskLeave = (obj) => http.post('/professional/task/taskLeave', obj) + +export const taskBatchSign = (id) => http.get('/professional/task/batchSign/' + id) diff --git a/src/assets/images/growthpath/path1.png b/src/assets/images/growthpath/path1.png index e6f49da0..09dd4bd5 100644 Binary files a/src/assets/images/growthpath/path1.png and b/src/assets/images/growthpath/path1.png differ diff --git a/src/assets/images/growthpath/path2.png b/src/assets/images/growthpath/path2.png index 87af47e0..1823a5a4 100644 Binary files a/src/assets/images/growthpath/path2.png and b/src/assets/images/growthpath/path2.png differ diff --git a/src/components/growthpath/GrowthActiveAttendance.vue b/src/components/growthpath/GrowthActiveAttendance.vue new file mode 100644 index 00000000..d63ffb96 --- /dev/null +++ b/src/components/growthpath/GrowthActiveAttendance.vue @@ -0,0 +1,1165 @@ + + + + + diff --git a/src/components/growthpath/GrowthCommonImport.vue b/src/components/growthpath/GrowthCommonImport.vue index b46815dc..f70a356a 100644 --- a/src/components/growthpath/GrowthCommonImport.vue +++ b/src/components/growthpath/GrowthCommonImport.vue @@ -101,7 +101,6 @@
-
diff --git a/src/components/growthpath/GrowthCommonStudent.vue b/src/components/growthpath/GrowthCommonStudent.vue index b6757a81..83e31775 100644 --- a/src/components/growthpath/GrowthCommonStudent.vue +++ b/src/components/growthpath/GrowthCommonStudent.vue @@ -360,8 +360,13 @@ const deleteDepSelect = () => { //确定添加授权 const confirm = () => { + if(!stuSelectRows.value.length && !projectSelectRows.value.length){ + message.warning('请选择学员') + return + } visiable.value = false; emit("confirm", stuSelectRows.value, projectSelectRows.value); + closeDrawer() }; onMounted(() => { @@ -378,7 +383,7 @@ onMounted(() => { } }); -