mirror of
https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/fe-manage.git
synced 2025-12-21 00:36:46 +08:00
Merge remote-tracking branch 'origin/develop' into develop
# Conflicts: # src/views/courselibrary/CoursewareManage.vue
This commit is contained in:
@@ -305,34 +305,90 @@
|
||||
<!-- 查看面授课弹框 end -->
|
||||
<!-- 确定新建面授课弹窗 -->
|
||||
<!-- 表格 -->
|
||||
<div style="padding:10px 35px">
|
||||
<div style="padding: 10px 35px">
|
||||
<a-table
|
||||
:header-cell-style="{'text-align':'center'}"
|
||||
:header-cell-style="{ 'text-align': 'center' }"
|
||||
style="border: 1px solid #f2f6fe"
|
||||
:columns="columns1"
|
||||
:data-source="tableData1"
|
||||
:loading="tableLoading"
|
||||
:pagination="false"
|
||||
:scroll="{x:'max-content'}"
|
||||
:scroll="{ x: 'max-content' }"
|
||||
>
|
||||
<template #bodyCell="{ record, column }">
|
||||
<template v-if="column.key === 'operation'">
|
||||
<a-space>
|
||||
<a-button v-if="(record.status===0 || record.status===-1 || !record.kkty) && checkPer(record.permissions)" @click="() => handleEdit(record, String(record.courseform))" type="link">编辑</a-button>
|
||||
<a-button v-if="record.status===2 && checkPer(record.permissions)" @click="() => handleStart(record, String(record.courseform))" type="link">开课</a-button>
|
||||
<a-button v-if="record.status===2 && checkPer(record.permissions)" @click="() => handleLook(record, String(record.courseform))" type="link">查看</a-button>
|
||||
<a-button v-if="record.status===2 && checkPer(record.permissions)" @click="() => handleGuan22(record, String(record.courseform))" type="link">管理</a-button>
|
||||
<DropDown v-if="checkPer(record.permissions)" value="授权">
|
||||
<OwnerTableModelStudent :types="[10,11,12]" :id="record.offcourseId">权限名单</OwnerTableModelStudent>
|
||||
<CommonStudent :type="10" :id="record.offcourseId" title="查看权">查看权</CommonStudent>
|
||||
<CommonStudent :type="11" :id="record.offcourseId" title="管理权">管理权</CommonStudent>
|
||||
<a-button
|
||||
v-if="
|
||||
(record.status === 0 ||
|
||||
record.status === -1 ||
|
||||
!record.kkty) &&
|
||||
checkPer(record.permissions)
|
||||
"
|
||||
@click="() => handleEdit(record, String(record.courseform))"
|
||||
type="link"
|
||||
>编辑</a-button
|
||||
>
|
||||
<a-button
|
||||
v-if="record.status === 2 && checkPer(record.permissions)"
|
||||
@click="() => handleStart(record, String(record.courseform))"
|
||||
type="link"
|
||||
>开课</a-button
|
||||
>
|
||||
<a-button
|
||||
v-if="record.status === 2 && checkPer(record.permissions)"
|
||||
@click="() => handleLook(record, String(record.courseform))"
|
||||
type="link"
|
||||
>查看</a-button
|
||||
>
|
||||
<a-button
|
||||
v-if="record.status === 2 && checkPer(record.permissions)"
|
||||
@click="() => handleGuan22(record, String(record.courseform))"
|
||||
type="link"
|
||||
>管理</a-button
|
||||
>
|
||||
<DropDown v-if="checkPer(record.permissions)" value="授权">
|
||||
<OwnerTableModelStudent :types="[10, 11, 12]" :id="record.id"
|
||||
>权限名单</OwnerTableModelStudent
|
||||
>
|
||||
<CommonStudent :type="10" :id="record.id" title="查看权"
|
||||
>查看权</CommonStudent
|
||||
>
|
||||
<CommonStudent :type="11" :id="record.id" title="管理权"
|
||||
>管理权</CommonStudent
|
||||
>
|
||||
</DropDown>
|
||||
<DropDown v-if="checkPer(record.permissions)" value="更多">
|
||||
<a-button @click="() => handleCopy(record, String(record.courseform))" type="link">复制</a-button>
|
||||
<a-button @click="() => handleRejectExit(record, String(record.courseform))" type="link">撤回</a-button>
|
||||
<a-button v-if="record.status===2 && record.kkty" @click="() => handleStop(record, String(record.courseform))" type="link">停用</a-button>
|
||||
<a-button v-if="record.status===2 && !record.kkty" @click="() => handleOpen(record, String(record.courseform))" type="link">启用</a-button>
|
||||
<a-button @click="() => handleDelete(record, String(record.courseform))" type="link" danger>删除</a-button>
|
||||
<DropDown v-if="checkPer(record.permissions)" value="更多">
|
||||
<a-button
|
||||
@click="() => handleCopy(record, String(record.courseform))"
|
||||
type="link"
|
||||
>复制</a-button
|
||||
>
|
||||
<a-button
|
||||
@click="
|
||||
() => handleRejectExit(record, String(record.courseform))
|
||||
"
|
||||
type="link"
|
||||
>撤回</a-button
|
||||
>
|
||||
<a-button
|
||||
v-if="record.status === 2 && record.kkty"
|
||||
@click="() => handleStop(record, String(record.courseform))"
|
||||
type="link"
|
||||
>停用</a-button
|
||||
>
|
||||
<a-button
|
||||
v-if="record.status === 2 && !record.kkty"
|
||||
@click="() => handleOpen(record, String(record.courseform))"
|
||||
type="link"
|
||||
>启用</a-button
|
||||
>
|
||||
<a-button
|
||||
@click="() => handleDelete(record, String(record.courseform))"
|
||||
type="link"
|
||||
danger
|
||||
>删除</a-button
|
||||
>
|
||||
</DropDown>
|
||||
</a-space>
|
||||
</template>
|
||||
@@ -2123,7 +2179,7 @@ export default defineComponent({
|
||||
const store = useStore();
|
||||
|
||||
const state = reactive({
|
||||
tableLoading:false,
|
||||
tableLoading: false,
|
||||
//新加
|
||||
stuColumns: [
|
||||
{
|
||||
@@ -2896,7 +2952,7 @@ export default defineComponent({
|
||||
|
||||
// 渲染列表1操作
|
||||
const getTableDate = async () => {
|
||||
state.tableLoading = true
|
||||
state.tableLoading = true;
|
||||
console.log("我是点击搜索的数据", state.sysTypeId);
|
||||
// let datas = state.tableData1;
|
||||
let startTime = "";
|
||||
@@ -2958,7 +3014,8 @@ export default defineComponent({
|
||||
findClassFullName(sysTypeOptions.value, itm.sysTypeId) || "-";
|
||||
});
|
||||
state.tableData1 = datas;
|
||||
state.tableLoading = false
|
||||
console.log("state.tableData1", state.tableData1);
|
||||
state.tableLoading = false;
|
||||
};
|
||||
|
||||
function findClassFullName(list, classify, name = "") {
|
||||
@@ -3619,7 +3676,7 @@ export default defineComponent({
|
||||
let type = t.concat(p);
|
||||
const postData = {
|
||||
offcourseId: state.offcourseId,
|
||||
id: state.offcoursePlanId, //开课ID,不传代表新增
|
||||
offcoursePlanId: state.offcoursePlanId, //开课ID,不传代表新增
|
||||
address: state.xjkkinputV2,
|
||||
applyFlag: state.checked1 ? 1 : 0,
|
||||
attach: state.attach,
|
||||
@@ -3685,9 +3742,12 @@ export default defineComponent({
|
||||
}
|
||||
);
|
||||
}
|
||||
|
||||
console.log("res");
|
||||
console.log("获取面授课详情", item);
|
||||
|
||||
state.xjkkinputV2 = item.address;
|
||||
state.checked1 = item.applyFlag === 1;
|
||||
state.checked1 = item.applyFlag === 1 ? true : false;
|
||||
let arrss = item.attach.split(",");
|
||||
let str = "";
|
||||
for (let i = 0; i < arrss.length; i++) {
|
||||
@@ -3708,9 +3768,9 @@ export default defineComponent({
|
||||
(state.comLeave =
|
||||
item.completeType.split(",")[1] == "1" ? true : false),
|
||||
(state.checked4 = item.evalFlag === 1 ? true : false);
|
||||
state.assessmentId =item.evaluateId || '';
|
||||
state.EditTestId = item.testId || '';
|
||||
state.EditWorkId = item.homeWorkId || ''
|
||||
state.assessmentId = String(item.evaluateId);
|
||||
state.EditTestId = String(item.testId);
|
||||
state.EditWorkId = String(item.homeWorkId);
|
||||
state.xjkkinputV1 = item.name;
|
||||
if (item.signFlag === 1) {
|
||||
//是否允许未报名的签到:1是0否
|
||||
@@ -3953,13 +4013,15 @@ export default defineComponent({
|
||||
if (state.copy_hs) {
|
||||
console.log(2222222);
|
||||
if (state.offcourseId && state.offcoursePlanId) {
|
||||
copyCoursePlan({offcoursePlanId:state.offcoursePlanId}).then(() => {
|
||||
message.destroy();
|
||||
message.success("复制成功");
|
||||
getTableDate3();
|
||||
delete_exit1();
|
||||
rest();
|
||||
});
|
||||
copyCoursePlan({ offcoursePlanId: state.offcoursePlanId }).then(
|
||||
() => {
|
||||
message.destroy();
|
||||
message.success("复制成功");
|
||||
getTableDate3();
|
||||
delete_exit1();
|
||||
rest();
|
||||
}
|
||||
);
|
||||
} else if (state.offcourseId) {
|
||||
console.log(87887);
|
||||
// 拿数据
|
||||
@@ -4119,7 +4181,7 @@ export default defineComponent({
|
||||
if (type === "1") {
|
||||
return;
|
||||
}
|
||||
// console.log(itm)
|
||||
console.log("编辑面授课信息", itm, type);
|
||||
state.offcourseId = itm.id;
|
||||
|
||||
const item = await detail({
|
||||
@@ -4128,8 +4190,6 @@ export default defineComponent({
|
||||
if (res.data.code === 200) return res.data.data;
|
||||
});
|
||||
|
||||
|
||||
|
||||
state.statusJuJue = Number(item.auditStatus) === -1 ? 1 : 0;
|
||||
|
||||
if (Number(item.auditStatus) === 2 && Number(item.status) === 1) {
|
||||
@@ -4270,7 +4330,8 @@ export default defineComponent({
|
||||
});
|
||||
};
|
||||
const handleStart = (item, type) => {
|
||||
console.log(item);
|
||||
console.log("点击开课item", item);
|
||||
// console.log(item);
|
||||
if (type === "1") {
|
||||
return;
|
||||
}
|
||||
@@ -4368,6 +4429,7 @@ export default defineComponent({
|
||||
|
||||
// 管理开课
|
||||
const handleGuan22 = (item) => {
|
||||
console.log("点击管理信息", item);
|
||||
if (String(item.courseform) === "1") {
|
||||
return;
|
||||
}
|
||||
@@ -4610,7 +4672,9 @@ export default defineComponent({
|
||||
name: record.name ? record.name : "",
|
||||
url:
|
||||
type == 1
|
||||
? window.location.protocol + process.env.VUE_APP_COURSE_STUDY + record.offcourseId
|
||||
? window.location.protocol +
|
||||
process.env.VUE_APP_COURSE_STUDY +
|
||||
record.offcourseId
|
||||
: process.env.VUE_APP_BASE_API +
|
||||
`/admin/student/studentSign?taskId=${
|
||||
record.offcoursePlanId
|
||||
|
||||
Reference in New Issue
Block a user