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

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
yuping
2023-02-21 03:02:51 +08:00
parent 51b435c46b ff791d2059
commit 2104d9f2eb
14 changed files with 93 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/api/indexTaskadd.js
View File

@@ -14,6 +14,8 @@ export const deleteTask = (obj) => http.delete('/admin/project/deleteTask', { pa
//新建或编辑项目
export const editProj = (obj) => http.post('/admin/project/edit', obj)
export const editProjs = (obj) => http.post('/admin/project/editStatus', obj)
//编辑项目共享文档
export const editProjDoc = (obj) => http.post('/admin/project/editShareAttach', obj)

9
src/components/drawers/AddLive.vue
View File

@@ -284,7 +284,7 @@
<span style="margin-right: 3px">评估：</span>
</div>
<div class="btnbox2">
<a-checkbox v-model:checked="formData.isEvaluate"
<a-checkbox v-model:checked="formData.isEvaluate" @change="getchanges(formData.isEvaluate)"
>需要评估
</a-checkbox>
</div>
@@ -338,6 +338,9 @@ const removePG = () => {
const getchange = (mess) => {
console.log(mess); //输出true或者false
};
const getchanges = (mess) => {
console.log(mess); //输出true或者false
};
const props = defineProps({
type: Number,
taskList: [],
@@ -355,7 +358,7 @@ const formData = ref({
liveCover: "",
beforeSignIn: "",
afterSignIn: "",
isEvaluate: "",
isEvaluate: false,
assessmentId: "",
assessmentName: "",
livePlayback: "",
@@ -375,7 +378,7 @@ const rulesRef = ref({
{
type: "url",
required: true,
message: "请输入直播链接",
message: "请输入合法的直播链接",
},
],
liveStartTime: [

1
src/components/drawers/ExportScore.vue
View File

@@ -627,4 +627,3 @@ export default {
}
}
</style>

4
src/components/drawers/NoticePub.vue
View File

@@ -62,7 +62,7 @@
<script>
import { message } from "ant-design-vue";
import { reactive, toRefs, onMounted } from "vue";
import { editProj, getTask } from "../../api/indexTaskadd";
import { editProj,editProjs, getTask } from "../../api/indexTaskadd";
// import { editProj } from "../../api/indexTaskadd";
import { publishNotice } from "../../api/indexNotice";
import emitter from "../../utils/bus";
@@ -112,7 +112,7 @@ export default {
state.projectInfo.projectId = props.projectId;
state.projectInfo.beginTime = null;
state.projectInfo.endTime = null;
editProj(state.projectInfo)
editProjs(state.projectInfo)
.then((res) => {
console.log("res5555555555", res);
})

12
src/components/drawers/project/ProjectHomeWorkManage.vue
View File

@@ -133,7 +133,7 @@
<EScore
v-model:eScorevisible="Evisible"
:type="1"
:id="projectTaskInfo?.projectTaskId"
:id="projectTaskInfo?.id"
:pid="projectTaskInfo?.projectId"
v-model:searchTaskList="searchTaskList"
/>
@@ -511,7 +511,7 @@ export default {
pid: props.projectTaskInfo.projectId,
status: state.projectName,
studentName: state.name,
taskId: props.projectTaskInfo.projectTaskId,
taskId: props.projectTaskInfo.id,
taskType: props.projectTaskInfo.type,
});
api
@@ -523,7 +523,7 @@ export default {
pid: props.projectTaskInfo.projectId,
status: state.projectName,
studentName: state.name,
taskId: props.projectTaskInfo.projectTaskId,
taskId: props.projectTaskInfo.id,
taskType: props.projectTaskInfo.type,
})
.then((res) => {
@@ -585,7 +585,7 @@ export default {
// pageNo: state.currentPage,
// pageSize: state.pageSize,
// currentStageId: props.projectTaskInfo.stageId,
// currentTaskId: props.projectTaskInfo.projectTaskId,
// currentTaskId: props.projectTaskInfo.id,
// type: 1,
// pid: props.projectTaskInfo.projectId,
// })
@@ -603,7 +603,7 @@ export default {
let obj = {
currentStageId: props.projectTaskInfo.stageId,
pid: props.projectTaskInfo.projectId,
taskId: props.projectTaskInfo.projectTaskId,
taskId: props.projectTaskInfo.id,
taskType: props.projectTaskInfo.type,
type: 1,
};
@@ -634,7 +634,7 @@ export default {
}/admin/student/exportHomeWork?currentStageId=${
props.projectTaskInfo.stageId
}&type=${1}&pid=${props.projectTaskInfo.projectId}&taskId=${
props.projectTaskInfo.projectTaskId
props.projectTaskInfo.id
}&taskType=${props.projectTaskInfo.type}`
);
}

3
src/components/drawers/router/RouterEvaluationManage.vue
View File

@@ -360,7 +360,7 @@ export default {
currentStageId: props.datasource.chapterId,
type: 2,
pid: props.datasource.routerId,
taskId: props.datasource.routerTaskId,
taskId: props.datasource.id,
taskType: props.datasource.type,
status: state.projectName,
studentName: state.name,
@@ -660,4 +660,3 @@ export default {
}
}
</style>

3
src/components/drawers/router/RouterFaceTeachManage.vue
View File

@@ -627,7 +627,7 @@ export default {
}/admin/student/exportHomeWork?currentStageId=${
props.datasource.chapterId
}&type=${2}&pid=${props.datasource.routerId}&taskId=${
props.datasource.routerTaskId
props.datasource.id
}&taskType=${props.datasource.type}&thirdType=5`
);
}
@@ -949,4 +949,3 @@ export default {
}
}
</style>

9
src/components/drawers/router/RouterHomeworkManage.vue
View File

@@ -10,7 +10,7 @@
>
<div class="drawerMain">
<div class="header">
<div class="headerTitle">【作业111】{{ title }}</div>
<div class="headerTitle">【作业】{{ title }}</div>
<img
style="width: 29px; height: 29px; cursor: pointer"
src="../../../assets/images/basicinfo/close.png"
@@ -128,7 +128,7 @@
<EScore
v-model:eScorevisible="Evisible"
:type="2"
:id="datasource?.routerTaskId"
:id="datasource?.id"
:pid="datasource?.routerId"
v-model:searchTaskList="searchTaskList"
/>
@@ -443,6 +443,7 @@ export default {
}}
>
<a-button
disabled
class="operation"
style="margin-right:10px;color:rgba(56, 125, 247, 0.5)"
>
@@ -521,6 +522,7 @@ export default {
studentName: state.name,
})
.then((res) => {
debugger
console.log("获取作业管理学员", res);
if (res.data.code == 200) {
let newData = [];
@@ -594,7 +596,7 @@ export default {
let obj = {
currentStageId: props.datasource.chapterId,
pid: props.datasource.routerId,
taskId: props.datasource.routerTaskId,
taskId: props.datasource.id,
taskType: props.datasource.type,
type: 2,
};
@@ -603,6 +605,7 @@ export default {
.then((res) => {
console.log("导出作业", res.data.data);
if (res.data.code === 200) {
debugger
// message.destroy();
// message.success("导出作业成功");
state.exportHomeWorkV = true;

3
src/components/drawers/router/RouterProjectManage.vue
View File

@@ -428,7 +428,7 @@
currentStageId: props.datasource.chapterId,
type: 2,
pid: props.datasource.routerId,
taskId: props.datasource.routerTaskId,
taskId: props.datasource.id,
taskType: props.datasource.type,
status: state.projectName,
studentName: state.name,
@@ -723,4 +723,3 @@
}
}
</style>

27
src/views/courselibrary/CoursewareManage.vue
View File

@@ -1629,6 +1629,29 @@ const columns1 = [
return text ? text : "-";
},
},
{
title: " 资源归属",
width: 250,
dataIndex: "sourceBelongFullName",
key: "3",
align: "center",
ellipsis: true,
customRender: ({text}) => {
return text ? text : "-";
},
},
{
title: " 目标人群",
width: 250,
dataIndex: "targetUser",
key: "3",
align: "center",
ellipsis: true,
customRender: ({text}) => {
return text ? text : "-";
},
},
{
title: "学习人数",
width: 130,
@@ -3353,12 +3376,12 @@ export default defineComponent({
if (state.selectTime) {
// beginTime = parseInt(new Date(state.selectTime[0].$d).getTime() / 1000);
// endTime = parseInt(new Date(state.selectTime[1].$d).getTime() / 1000);
beginTime = dayjs(state.selectTime[0]).format('YYYY-MM-DD HH:mm')
beginTime = dayjs(state.selectTime[0]).format('YYYY-MM-DD HH:mm:ss')
// toDate(
// new Date(state.selectTime[0].$d).getTime() / 1000,
// "Y-M-D h:m:s"
// );
endTime = dayjs(state.selectTime[1]).format('YYYY-MM-DD HH:mm')
endTime = dayjs(state.selectTime[1]).format('YYYY-MM-DD HH:mm:ss')
// toDate(
// new Date(state.selectTime[1].$d).getTime() / 1000,
// "Y-M-D h:m:s"

4
src/views/learningpath/LearningPath.vue
View File

@@ -1522,8 +1522,8 @@ export default {
state.editPathId = id;
let arr = imgData.value;
arr.forEach((item) => {
if (item.dictValue === state.pathBg) {
state.pathBgId = item.dictCode;
if (item.value === state.pathBg) {
state.pathBgId = item.code;
}
});

5
src/views/projectcenter/ProjectAdd.vue
View File

@@ -102,7 +102,7 @@
<a-range-picker
separator="至"
:show-time="{ format: 'HH:mm' }"
:placeholder="[' 开始时间2', ' 结束时间2']"
:placeholder="[' 开始时间', ' 结束时间']"
:disabledDate="disabledDate"
v-model:value="timeRange"
@calendarChange="calendarChange"
@@ -530,7 +530,8 @@ export default {
if (state.projectInfo.id && state.datePartial === 'start') {
return current && current > dayjs(state.timeRange[0]).endOf("YYYY-MM-DD HH:mm");
}
return current && current < dayjs().endOf('day');
// return current && current < dayjs().endOf('day');
return current && current < dayjs().subtract(1, 'days').endOf('day')
};
function calendarChange(date, dateStr, partial) {

2
src/views/projectcenter/TaskPage.vue
View File

@@ -4052,6 +4052,7 @@ export default {
parentId: state.parentId,
picUrl: state.picUrl,
projectId: Number(state.projectId),
id: Number(state.projectId),
remark: state.remark,
sourceBelongId: Number(state.tsourceBelong),
status: state.status,
@@ -4074,6 +4075,7 @@ export default {
parentId: state.parentId,
picUrl: state.picUrl,
projectId: Number(state.projectId),
id: Number(state.projectId),
remark: state.remark,
sourceBelongId: Number(state.tsourceBelong),
status: state.status,