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..43f85b32 100644
--- a/src/components/growthpath/GrowthActiveAttendance.vue
+++ b/src/components/growthpath/GrowthActiveAttendance.vue
@@ -419,6 +419,7 @@ export default {
username: state.username,
taskId: props.datasource.id,
taskType: props.datasource.taskType,
+ signStatus: state.signStatus,
})
.then((res) => {
console.log("在线课数据获取", res);
@@ -445,7 +446,7 @@ export default {
console.log(obj);
state.tableDataTotalLoading = true;
- taskLeave(obj)
+ taskSign(obj)
.then((res) => {
console.log("签到结果", res, obj);
if (res.data.code === 200) {
@@ -794,6 +795,7 @@ export default {
state.currentPage = 1;
state.name = null;
state.signStatus = undefined;
+ state.username = null;
state.tableDataTotal = 0;
getTableData();
}
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"
>
-
+
@@ -897,12 +896,10 @@ const closeDrawer = () => {
type: props.type,
offcourseId: params.value.offcourseId,
});
+ emit("refresh");
}
};
-const emit = defineEmits(["call-parent-method"]);
-const confirm = async () => {
- closeDrawer();
-};
+const emit = defineEmits(["call-parent-method", "refresh"]);
const createNewCourse = () => {
changeName.value = true;
diff --git a/src/components/growthpath/ImportStu.vue b/src/components/growthpath/ImportStu.vue
index 6a4f77f9..b368995b 100644
--- a/src/components/growthpath/ImportStu.vue
+++ b/src/components/growthpath/ImportStu.vue
@@ -238,6 +238,7 @@ export default {
importStudent: `${process.env.VUE_APP_BOE_API_URL}${
process.env.VUE_APP_BASE_API_GROWTH || ""
}/professional/allocation/importLearner`,
+
timers: "", // 定时器,用于清空定时器使用
isAddStudent: false, // 用于判断用户是否关闭弹框需要重新获取学员列表
uploadpercent: -1,
@@ -342,11 +343,12 @@ export default {
console.log("上传成功返回的UUID----->", info);
console.log("我是导入学员接口传递的参数", {
file: info.file.originFileObj,
- targetId: props.courseId,
+ targetId: props.courseId,
type: 14,
});
state.fileName = info.file.name;
let i = 0;
+ message.success("上传成功");
if (info.file.response.code == 1) {
state.fileList = [];
state.addLoading = false;
diff --git a/src/components/growthpath/StudentManage.vue b/src/components/growthpath/StudentManage.vue
index 878989da..f60e9c78 100644
--- a/src/components/growthpath/StudentManage.vue
+++ b/src/components/growthpath/StudentManage.vue
@@ -280,7 +280,7 @@
:courseId="id"
:courseType="type"
/>
-
+
-
+
@@ -171,7 +171,7 @@ export default {
title: "类型",
dataIndex: "courseType",
key: "courseType",
- width: 80,
+ width: 120,
align: "center",
ellipsis: true,
slots: { customRender: "courseType" },
@@ -180,7 +180,6 @@ export default {
title: "任务名称",
dataIndex: "taskName",
key: "taskName",
- width: 80,
align: "center",
ellipsis: true,
},
@@ -188,9 +187,9 @@ export default {
title: "必修/选修",
dataIndex: "taskType",
key: "taskType",
- width: 30,
align: "center",
ellipsis: true,
+ width: 120,
customRender: ({ record: { taskType } }) =>
({
1: "必修",
@@ -201,23 +200,23 @@ export default {
title: "开始时间",
dataIndex: "startTime",
key: "startTime",
- width: 50,
align: "center",
+ width: 200,
ellipsis: true,
},
{
title: "完成时间",
dataIndex: "finishTime",
key: "finishTime",
- width: 50,
align: "center",
+ width: 200,
},
{
title: "任务状态",
dataIndex: "completionStatus",
key: "completionStatus",
- width: 30,
align: "center",
+ width: 120,
customRender: ({ record: { completionStatus } }) =>
({
2: "进行中",
@@ -225,14 +224,14 @@ export default {
0: "未开始",
}[completionStatus]),
},
- {
- title: "操作",
- dataIndex: "operation",
- key: "operation",
- width: 50,
- align: "center",
- slots: { customRender: "action" },
- },
+ // {
+ // title: "操作",
+ // dataIndex: "operation",
+ // key: "operation",
+ // width: 50,
+ // align: "center",
+ // slots: { customRender: "action" },
+ // },
]);
const formData = ref()
const openDrawer = (row) => {
diff --git a/src/components/growthpath/UpdateRecord.vue b/src/components/growthpath/UpdateRecord.vue
index c2ed3658..80d9fc43 100644
--- a/src/components/growthpath/UpdateRecord.vue
+++ b/src/components/growthpath/UpdateRecord.vue
@@ -105,21 +105,18 @@ export default {
title: "操作内容",
dataIndex: "operationContent",
key: "operationContent",
- width: "80px",
align: "center",
},
{
title: "操作人",
dataIndex: "createName",
key: "createName",
- width: "150px",
align: "center",
},
{
title: "操作时间",
dataIndex: "createTime",
key: "createTime",
- width: "150px",
align: "center",
},
]);
diff --git a/src/views/growthpath/EditingTasks.vue b/src/views/growthpath/EditingTasks.vue
index a75ac23f..0c2ae9a4 100644
--- a/src/views/growthpath/EditingTasks.vue
+++ b/src/views/growthpath/EditingTasks.vue
@@ -439,7 +439,6 @@ const withdraw = (element) => {
width: 100%;
display: flex;
flex-direction: column;
- min-width: 933px;
background-color: rgba(245, 247, 250, 1);
.tableBox {
margin-top: 21px;
diff --git a/src/views/growthpath/GrowthPath.vue b/src/views/growthpath/GrowthPath.vue
index 2763f1c8..1b25d799 100644
--- a/src/views/growthpath/GrowthPath.vue
+++ b/src/views/growthpath/GrowthPath.vue
@@ -93,6 +93,11 @@
更多
@@ -110,10 +115,7 @@
修改记录
@@ -501,18 +503,17 @@ export default {
ok: () => {
published({
growId: item.id,
- })
- .then((res) => {
- if (res.data.code == 200) {
- message.success("发布成功");
- listDatas();
- } else {
- message.error(err.data.msg);
- }
- })
- .catch((err) => {
+ }).then((res) => {
+ if (res.data.code == 200) {
+ message.success("发布成功");
+ listDatas();
+ } else {
message.error(err.data.msg);
- });
+ }
+ });
+ // .catch((err) => {
+ // message.error(err.data.msg);
+ // });
},
});
};
@@ -546,7 +547,6 @@ export default {
title: "标准岗位",
dataIndex: "stdPositionName",
key: "stdPositionName",
- width: 100,
align: "center",
ellipsis: true,
customRender: ({ record }) => {
@@ -559,7 +559,6 @@ export default {
title: "任职资格等级",
dataIndex: "qualsLevelDesr",
key: "qualsLevelDesr",
- width: 120,
align: "center",
ellipsis: true,
},
@@ -568,7 +567,6 @@ export default {
title: "状态",
dataIndex: "isPublished",
key: "isPublished",
- width: 100,
align: "center",
ellipsis: true,
customRender: ({ record }) => {
@@ -587,7 +585,6 @@ export default {
title: "数据来源",
dataIndex: "dataSource",
key: "dataSource",
- width: 100,
align: "center",
ellipsis: true,
customRender: ({ record }) => {
@@ -596,7 +593,6 @@ export default {
},
{
title: "操作",
- width: 160,
align: "right",
slots: { customRender: "listData" },
},
@@ -776,7 +772,6 @@ export default {
// 查看修改记录
const UpdateRecordRef = ref(null);
const updateList = (record) => {
- console.log(record, "record");
UpdateRecordRef.value.open(record);
};
return {
diff --git a/src/views/growthpath/PathManage.vue b/src/views/growthpath/PathManage.vue
index 82f7caaa..869325a0 100644
--- a/src/views/growthpath/PathManage.vue
+++ b/src/views/growthpath/PathManage.vue
@@ -299,11 +299,13 @@
"
>
+
+
+
+
-
-
+
{
+ console.log("getTeacherFeeList catch err.data.msg",err.data.msg)
state.tableLoading = false
message.destroy()
message.error(err.data.msg)
@@ -1259,6 +1260,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)
diff --git a/vue.config.js b/vue.config.js
index 7af19044..23bba32c 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -18,16 +18,16 @@ module.exports = defineConfig({
overlay: false,// 解决代码抛出异常
},
proxy: {
- "/professional": {
- target: 'http://192.168.68.211:32002',
- // target: 'http://192.168.50.195:32002',
- // target: 'http://192.168.86.195:32002',
- changeOrigin: true,
- },
- // "/growth": {
- // target: 'https:' + process.env.VUE_APP_BOE_API_URL,
+ // "/professional": {
+ // target: 'http://192.168.68.211:32002',
+ // // target: 'http://192.168.50.195:32002',
+ // // target: 'http://192.168.86.195:32002',
// changeOrigin: true,
// },
+ "/growth": {
+ target: 'https:' + process.env.VUE_APP_BOE_API_URL,
+ changeOrigin: true,
+ },
"/manageApi": {
target: 'https:' + process.env.VUE_APP_PROXY_URL,
changeOrigin: true, //表示是否改变原域名