hz/fe-manage
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/fe-manage.git synced 2025-12-09 10:56:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'compulsory_professional_skills' into compulsory_professional_skills_copy

Browse Source
This commit is contained in:
gengxin
2025-02-26 18:19:16 +08:00
parent 4c5bc89d05 12b8e61a95
commit 78203cf8f9
8 changed files with 71 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/api/configGrowth.js
View File

@@ -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" },

2
src/api/growthpath.js
View File

@@ -102,7 +102,7 @@ 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 })

2
src/components/growthpath/GrowthFaceStu.vue
View File

@@ -499,7 +499,7 @@ const columns = ref([
<div class="opa">
<a
className="opa"
style={{ color: "#666" }}
style={{ color: "#4ea6ff" }}
onClick={() => removeStu(record.id)}
>
删除

36
src/components/growthpath/StudentSeeStu.vue
View File

@@ -120,10 +120,12 @@
</div>
</div>
</template>
<!-- <template #action="{ record }">
<template #action="{ record }">
<template
v-if="
record.completionStatus == 2 && checkMenu('growthStudentMarkComplete')
(record.completionStatus == 2 ||
record.completionStatus == 0) &&
checkMenu('growthStudentMarkComplete')
"
>
<a-button type="link" @click="setPermissions(record)"
@@ -133,7 +135,7 @@
<template v-else>
<div>--</div>
</template>
</template> -->
</template>
</a-table>
</div>
</div>
@@ -151,6 +153,7 @@ import { message } from "ant-design-vue";
import { TASK_TYPE } from "@/utils/constGrown";
import { checkGrowthPer } from "@/utils/utils";
import { checkMenu } from "@/utils/utils";
import dialog from "@/utils/dialog";
export default {
name: "SeeStu",
components: {},
@@ -226,14 +229,13 @@ export default {
0: "未开始",
}[completionStatus]),
},
// {
// title: "操作",
// dataIndex: "operation",
// key: "operation",
// width: 50,
// align: "center",
// slots: { customRender: "action" },
// },
{
title: "操作",
dataIndex: "operation",
key: "operation",
align: "center",
slots: { customRender: "action" },
},
]);
const formData = ref();
const openDrawer = (row) => {
@@ -258,9 +260,14 @@ export default {
};
const setPermissions = (row) => {
markComplete({ id: row.id }).then((res) => {
getData();
message.success("操作成功");
dialog({
content: "确定标记完成该任务？",
ok: async () => {
markComplete({ id: row.id }).then((res) => {
getData();
message.success("操作成功");
});
},
});
};
return {
@@ -271,6 +278,7 @@ export default {
columns,
getData,
formData,
checkMenu,
checkGrowthPer,
};
},

69
src/views/growthpath/GrowthAddPath.vue
View File

@@ -562,6 +562,7 @@ export default {
key: "stdPositionName",
align: "center",
ellipsis: true,
width: 400,
customRender: ({ record }) => {
return record.stdPosition
? `${record.stdPositionName}（${record.stdPosition}）`
@@ -576,27 +577,26 @@ export default {
ellipsis: true,
},
{
title: "学习人数",
dataIndex: "learnNum",
key: "learnNum",
title: "完成人数/总人数",
align: "center",
ellipsis: true,
width: 150,
customRender: ({ record }) => {
return `${record.comLearnNum}/${record.learnNum}`;
},
},
{
title: "完成人数",
dataIndex: "comLearnNum",
key: "comLearnNum",
title: "必修|选修",
align: "center",
ellipsis: true,
width: 150,
customRender: ({ record }) => {
return `${record.requiredTaskNum}|${record.elePublishedNum}`;
},
},
{
title: "完成比例",
dataIndex: "ratio",
key: "ratio",
align: "center",
width: 150,
ellipsis: true,
customRender: ({ record }) => {
return `${record.ratio * 100}%`;
@@ -617,30 +617,13 @@ export default {
dataIndex: "updateTime",
key: "updateTime",
align: "center",
width: 180,
ellipsis: true,
},
// {
// title: "归属人",
// dataIndex: "createName",
// key: "createName",
// width: 60,
// align: "center",
// ellipsis: true,
// },
// {
// title: "数据来源",
// dataIndex: "dataSource",
// key: "dataSource",
// align: "center",
// ellipsis: true,
// customRender: ({ record }) => {
// return record.dataSource == 1 ? "AMED" : "手动添加";
// },
// },
{
title: "操作",
align: "right",
width: 200,
slots: { customRender: "listData" },
},
]);
@@ -749,23 +732,21 @@ export default {
band: state.band,
};
if (state.editId) {
updatePostInfomation(params)
.then((res) => {
if (res.data.code == 200) {
message.success("保存成功");
of_exit();
listDatas();
}
})
updatePostInfomation(params).then((res) => {
if (res.data.code == 200) {
message.success("保存成功");
of_exit();
listDatas();
}
});
} else {
saveGrowth(params)
.then((res) => {
if (res.data.code == 200) {
message.success("保存成功");
of_exit();
listDatas();
}
})
saveGrowth(params).then((res) => {
if (res.data.code == 200) {
message.success("保存成功");
of_exit();
listDatas();
}
});
}
};
const of_exit = () => {

39
src/views/growthpath/GrowthPath.vue
View File

@@ -550,6 +550,7 @@ export default {
key: "stdPositionName",
align: "center",
ellipsis: true,
width: 400,
customRender: ({ record }) => {
return record.stdPosition
? `${record.stdPositionName}（${record.stdPosition}）`
@@ -564,27 +565,26 @@ export default {
ellipsis: true,
},
{
title: "学习人数",
dataIndex: "learnNum",
key: "learnNum",
title: "完成人数/总人数",
align: "center",
ellipsis: true,
width: 150,
customRender: ({ record }) => {
return `${record.comLearnNum}/${record.learnNum}`;
},
},
{
title: "完成人数",
dataIndex: "comLearnNum",
key: "comLearnNum",
title: "必修|选修",
align: "center",
ellipsis: true,
width: 150,
customRender: ({ record }) => {
return `${record.requiredTaskNum}|${record.elePublishedNum}`;
},
},
{
title: "完成比例",
dataIndex: "ratio",
key: "ratio",
align: "center",
width: 150,
ellipsis: true,
customRender: ({ record }) => {
return `${record.ratio * 100}%`;
@@ -605,30 +605,13 @@ export default {
dataIndex: "updateTime",
key: "updateTime",
align: "center",
width: 180,
ellipsis: true,
},
// {
// title: "归属人",
// dataIndex: "createName",
// key: "createName",
// width: 60,
// align: "center",
// ellipsis: true,
// },
// {
// title: "数据来源",
// dataIndex: "dataSource",
// key: "dataSource",
// align: "center",
// ellipsis: true,
// customRender: ({ record }) => {
// return record.dataSource == 1 ? "AMED" : "手动添加";
// },
// },
{
title: "操作",
align: "right",
width: 200,
slots: { customRender: "listData" },
},
]);

2
src/views/growthpath/PathManage.vue
View File

@@ -852,7 +852,7 @@ export default {
// 撤回
const resize = () => {
dialog({
content: "确定撤回？",
content: "确定撤回当前任务？",
contentTwo: "撤回后学员进度保留，发布后可继续学习",
ok: () => {
state.spinning = true;

16
vue.config.js
View File

@@ -18,16 +18,16 @@ module.exports = defineConfig({
overlay: false,// 解决代码抛出异常
},
proxy: {
// "/professional": {
// target: 'http://192.168.31.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.31.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, //表示是否改变原域名