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

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

Browse Source 
# Conflicts:
#	src/views/courselibrary/CoursewareManage.vue
This commit is contained in:
yuping
2023-02-13 16:36:53 +08:00
parent 518f779fe6 7151f8cb6a
commit 7035371d40
6 changed files with 1250 additions and 1047 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/components/drawers/ProjCheckPower.vue
View File

@@ -800,7 +800,7 @@ export default {
state.searchOrgName = null; state.searchOrgName = null;
state.isSearchOrg = false; state.isSearchOrg = false;
state.treeData2 = []; state.treeData2 = [];
getAudienceInfo(); // getAudienceInfo();
}; };
const afterVisibleChange = (bool) => { const afterVisibleChange = (bool) => {
console.log("state", bool); console.log("state", bool);
@@ -1164,23 +1164,23 @@ export default {
}); });
} }
}; };
getAudienceInfo(); // getAudienceInfo();
//分页获取受众 //分页获取受众
const changePagination1 = (page) => { const changePagination1 = (page) => {
// console.log(page); // console.log(page);
state.currentPage2 = page; state.currentPage2 = page;
getAudienceInfo(); // getAudienceInfo();
}; };
//搜索受众 //搜索受众
const searchAudienceInfo = () => { const searchAudienceInfo = () => {
state.currentPage2 = 1; state.currentPage2 = 1;
getAudienceInfo(); // getAudienceInfo();
}; };
//重置受众 //重置受众
const resetAudienceInfo = () => { const resetAudienceInfo = () => {
state.currentPage2 = 1; state.currentPage2 = 1;
state.audienceName = ""; state.audienceName = "";
getAudienceInfo(); // getAudienceInfo();
}; };
//受众关联 选中的数组 //受众关联 选中的数组
const onSelectChange2 = (selectedRowKeys, item) => { const onSelectChange2 = (selectedRowKeys, item) => {

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

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

2128
src/views/courselibrary/courseModal.vue
View File

File diff suppressed because it is too large Load Diff

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

@@ -408,9 +408,7 @@
height: 68px; height: 68px;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;">
"
>
<div class="headerLeft" style="margin-left: 32px"> <div class="headerLeft" style="margin-left: 32px">
<span style="width: 15px; height: 15px" <span style="width: 15px; height: 15px"
><img src="../../assets/images/taskpage/pub.png" ><img src="../../assets/images/taskpage/pub.png"
@@ -1230,7 +1228,7 @@ export default {
message.destroy(); message.destroy();
message.success("创建成功"); message.success("创建成功");
state.lpLoading = false; state.lpLoading = false;
router.push( {path: "/leveladd",query:{routerId: id }}) router.push( {path: "/leveladd",query:{routerId: id.data.data }})
}) })
}; };

2
src/views/learningpath/LevelAdd.vue
View File

@@ -1969,7 +1969,7 @@ export default {
routerId: state.routerId, routerId: state.routerId,
}; };
api api
.getStudent(obj) .getStuPage(obj)
.then((res) => { .then((res) => {
console.log("获取学员列表", res); console.log("获取学员列表", res);
let data = res.data.data.rows || null; let data = res.data.data.rows || null;

13
src/views/learningpath/LevelAddDetail.vue
View File

@@ -181,7 +181,7 @@
:objData="routerInfo" @saveUnlock="saveUnlock" /> :objData="routerInfo" @saveUnlock="saveUnlock" />
</div> </div>
<div class="line"></div> <div class="line"></div>
<router-link to="/leveladd"> <router-link :to="{ path: '/leveladd', query:{ routerId: routerId } }">
<div style="display: flex"> <div style="display: flex">
<img class="img2" style="margin-right: 22px" src="../../assets/images/leveladd/back.png" /> <img class="img2" style="margin-right: 22px" src="../../assets/images/leveladd/back.png" />
<div class="return">返回</div> <div class="return">返回</div>
@@ -622,7 +622,7 @@
:objData="routerInfo" @saveUnlock="saveUnlock" /> :objData="routerInfo" @saveUnlock="saveUnlock" />
</div> </div>
<div class="line"></div> <div class="line"></div>
<router-link to="/leveladd"> <router-link :to="{ path: '/leveladd', query:{ routerId: routerId } }">
<div style="display: flex"> <div style="display: flex">
<img class="img2" src="../../assets/images/leveladd/back.png" /> <img class="img2" src="../../assets/images/leveladd/back.png" />
<div class="return">返回</div> <div class="return">返回</div>
@@ -857,7 +857,7 @@ import AddFaceteach from "../../components/drawers/AddFaceteach.vue";
import * as api from "../../api/indexLevel"; import * as api from "../../api/indexLevel";
import { GetRouterDetail, changeChapterSort, changeTasklistSort, releaseRouter, cancelRouterTask } from "../../api/indexTask"; import { GetRouterDetail, changeChapterSort, changeTasklistSort, releaseRouter, cancelRouterTask } from "../../api/indexTask";
import { message, Modal } from "ant-design-vue"; import { message, Modal } from "ant-design-vue";
import { storage } from "../../api/storage"; // import { storage } from "../../api/storage";
import { deleteStudyTask } from "../../api/indexStudy"; import { deleteStudyTask } from "../../api/indexStudy";
import draggable from "vuedraggable"; import draggable from "vuedraggable";
import { editTask } from "../../api/indexTaskadd"; import { editTask } from "../../api/indexTaskadd";
@@ -891,9 +891,7 @@ export default {
const route = useRoute(); const route = useRoute();
const unlockModeModal = ref() const unlockModeModal = ref()
const state = reactive({ const state = reactive({
routerId: storage.get("routerId") routerId: route.query.routerId,
? JSON.parse(storage.get("routerId"))
: route.query.routerId,
routerDetail: null, routerDetail: null,
level: [ level: [
// { // {
@@ -1775,6 +1773,7 @@ export default {
setTimeout(() => { setTimeout(() => {
router.push({ router.push({
path: "/leveladd", path: "/leveladd",
query:{ routerId: state.routerId }
}); });
}, 3000); }, 3000);
} }
@@ -1796,6 +1795,7 @@ export default {
setTimeout(() => { setTimeout(() => {
router.push({ router.push({
path: "/leveladd", path: "/leveladd",
query:{ routerId: state.routerId }
}); });
}, 5000) }, 5000)
} }
@@ -1817,6 +1817,7 @@ export default {
} else { } else {
router.push({ router.push({
path: "/leveladd", path: "/leveladd",
query:{ routerId: state.routerId }
}); });
} }