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

Merge branch 'develop' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage into develop

Browse Source
This commit is contained in:
zhangyc
2022-12-03 18:52:32 +08:00
parent c44ac4b0e9 44e0ecf40a
commit 67982d3720
23 changed files with 1963 additions and 1591 deletions
Download Patch File Download Diff File Expand all files Collapse all files

238
src/api/method.js
View File

@@ -1,3 +1,4 @@
import * as api from './index1'
function formatNumber(n) {
n = n.toString();
return n[1] ? n : "0" + n;
@@ -215,7 +216,7 @@ function getCookie(name) {
//滚动加载信息
const scrollLoad = (e) => {
// console.log("滚动", e, b);
const {target} = e;
const { target } = e;
const scrllHeight = target.scrollHeight - target.scrollTop;
const clientHeight = target.clientHeight;
// console.log("scrllHeight", scrllHeight, clientHeight);
@@ -225,211 +226,47 @@ const scrollLoad = (e) => {
return 2
}
};
//添加归属权
function changeOwnership(classify, selectProjectId, selectPeopleArr) {
let obj = {
keyWord: "",
tag: 2, //归属权
opt: 3, //修改
type:
classify === "project"
? 2
: classify === "learnPath"
? 1
: classify === "course"
? 3
: null,
refId: selectProjectId, //项目id
// refId: 64,
pageNo: 1,
pageSize: 10,
// studentList: state.selectPeopleArr,
deptList: [],
groupList: [],
studentList: selectPeopleArr,
};
console.log("修改归属权obj", obj);
api
.optionAuthPerm(obj)
.then((res) => {
console.log("修改授权成功", res);
// closeDrawer();
})
.catch((err) => {
console.log("修改授权失败", err);
});
}
//新建延迟
const commonData = {
timeout: 50,
}
// const organizationalTree = [
// {
// title: "京东方",
// value: "京东方",
// children: [
// {
// title: "产研部",
// value: "产研部",
// children: [
// {
// title: "产品部",
// value: "产品部",
// },
// {
// title: "研究部",
// value: "研究部",
// },
// {
// title: "研究部2",
// value: "研究部2",
// },
// {
// title: "研究3",
// value: "研究3",
// },
// {
// title: "研究4",
// value: "研究4",
// },
// {
// title: "研究部5",
// value: "研究部5",
// },
// {
// title: "研究部6",
// value: "研究部6",
// },
// {
// title: "研究部7",
// value: "研究部7",
// },
// {
// title: "研究部8",
// value: "研究部8",
// },
// {
// title: "研究部9",
// value: "研究部9",
// },
// ],
// },
// {
// title: "二级标题",
// value: "二级标题",
// children: [
// {
// title: "三级标题",
// value: "三级标题",
// children: [
// {
// title: "四级标题",
// value: "四级标题",
// children: [
// {
// title: "五级标题",
// value: "五级标题",
// children: [
// {
// title: "六级标题",
// value: "六级标题",
// children: [
// {
// title: "七级标题",
// value: "七级标题",
// children: [
// {
// title: "八级标题",
// value: "八级标题",
// children: [
// {
// title: "九级标题",
// value: "九级标题",
// children: [
// {
// title: "十级标题",
// value: "十级标题",
// children: [
// {
// title: "十一级标题",
// value: "十一级标题",
// children: [
// {
// title: "十二级标题",
// value: "十二级标题",
// children: [
// {
// title:
// "十三级标题十三级标题十三级标题十三级标题",
// value: "十三级标题",
// children: [
// {
// title:
// "十四级标题",
// value:
// "十四级标题",
// children: [
// {
// title:
// "十五级标题",
// value:
// "十五级标题",
// children: [
// {
// title:
// "十六级标题",
// value:
// "十六级标题",
// children:
// [
// {
// title:
// "十七级标题",
// value:
// "十七级标题",
// children:
// [
// {
// title:
// "十八级标题",
// value:
// "十八级标题",
// children:
// [
// {
// title:
// "十九级标题",
// value:
// "十九级标题",
// children:
// [
// {
// title:
// "二十级标题二十级标题",
// value:
// "二十级标题二十级标题",
// },
// ],
// },
// ],
// },
// ],
// },
// ],
// },
// ],
// },
// ],
// },
// ],
// },
// ],
// },
// ],
// },
// ],
// },
// ],
// },
// ],
// },
// ],
// },
// ],
// },
// ],
// },
// ],
// },
// ],
// },
// ],
// },
// {
// title: "人力资源部",
// value: "人力资源部",
// children: [
// {
// title: "人事部",
// value: "人事部",
// },
// {
// title: "行政部",
// value: "行政部",
// },
// ],
// },
// ],
// },
// ]
// const organizationalTree = [// ]
//组织树
const organizationalTree = []
@@ -444,6 +281,7 @@ export {
setCookie,
getCookie,
scrollLoad,
changeOwnership,
commonData,
organizationalTree,
iframeUrl,

BIN
src/assets/images/leveladd/pinggu.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
src/assets/images/leveladd/xiangmu.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 785 B

9
src/components/common/Upload.vue Normal file
View File

@@ -0,0 +1,9 @@
<template>
<div>12312</div>
</template>
<script setup>
import {reactive} from "vue";
const options = reactive([]);
</script>

23
src/components/drawers/ AssessmentList.vue
View File

@@ -47,7 +47,11 @@
expandRowByClick="true"
@expand="expandTable"
:pagination="false"
:row-selection="rowSelection"
:row-selection="{
selectedRowKeys: selectedRowKeys,
onChange: onSelectChange,
type: 'radio',
}"
filterMultiple:false
/>
@@ -101,9 +105,10 @@ export default {
tableDataTotal: 0,
tableData: [],
selectedRowKeys: [],
assessmentId:null,
assessmentId:null
});
const closeDrawer = () => {
state.selectedRowKeys = [];
ctx.emit("update:assessmentVisible", false);
ctx.emit("update:titleTag", true);
@@ -165,6 +170,19 @@ export default {
// state.selectedRowKeys = selectedRowKeys;
// };
const onSelectChange = (selectedRowKeys, selectRow) => {
console.log("selectedRowKeys changed: ", selectedRowKeys, selectRow);
state.selectedRowKeys = selectedRowKeys;
state.selectedRows = selectRow;
console.log(selectRow)
state.assessment =selectRow[0];
state.assessmentId = selectRow[0].assessmentId;
ctx.emit("checkedAss", state.assessment);
ctx.emit("update:assessmentId", state.assessmentId);
state.selectedRowKeys = [];
closeDrawer();
};
const handelChangePage = (page, pageSize) => {
state.currentPage = page;
state.pageSize = pageSize;
@@ -222,6 +240,7 @@ export default {
getAllInvistText,
resetInvist,
handelChangePage,
onSelectChange
};
},
};

198
src/components/drawers/AddDiscuss.vue
View File

@@ -1,18 +1,18 @@
<template>
<a-drawer
:visible="adddiscussVisible"
class="drawerStyle addrefDrawer"
width="80%"
placement="right"
@after-visible-change="afterVisibleChange"
:visible="adddiscussVisible"
class="drawerStyle addrefDrawer"
width="80%"
placement="right"
@after-visible-change="afterVisibleChange"
>
<div class="drawerMain">
<div class="header">
<div class="headerTitle">{{ edit ? "编辑" : "添加" }}讨论</div>
<img
style="width: 29px; height: 29px; cursor: pointer"
src="../../assets/images/basicinfo/close.png"
@click="closeDrawer"
style="width: 29px; height: 29px; cursor: pointer"
src="../../assets/images/basicinfo/close.png"
@click="closeDrawer"
/>
</div>
<div class="contentMain">
@@ -21,19 +21,19 @@
<div class="signbox">
<div class="sign">
<img
src="@/assets/images/coursewareManage/asterisk.png"
alt=""
src="@/assets/images/coursewareManage/asterisk.png"
alt=""
/>
</div>
<span style="margin-right: 3px">讨论名称：</span>
</div>
<div class="btnbox">
<a-input
v-model:value="inputV1"
style="width: 424px; height: 32px"
placeholder="请输入讨论名称"
show-count
:maxlength="20"
v-model:value="inputV1"
style="width: 424px; height: 32px"
placeholder="请输入讨论名称"
show-count
:maxlength="20"
/>
</div>
</div>
@@ -43,11 +43,11 @@
</div>
<div class="textarea">
<a-textarea
v-model:value="textV1"
placeholder="请输入讨论说明"
allow-clear
show-count
:maxlength="200"
v-model:value="textV1"
placeholder="请输入讨论说明"
allow-clear
show-count
:maxlength="200"
/>
</div>
</div>
@@ -57,7 +57,8 @@
</div>
<div class="btnbox">
<a-checkbox v-model:checked="checkedC1" @change="checkRadio"
>允许评论</a-checkbox
>允许评论
</a-checkbox
>
</div>
</div>
@@ -71,12 +72,13 @@
</a-drawer>
</template>
<script>
import { reactive, toRefs } from "vue";
import {reactive, toRefs} from "vue";
import * as api from "../../api/indexDiscuss";
import * as apiTask from "../../api/indexTaskadd";
import { RouterEditTask } from "@/api/indexTask";
import { message } from "ant-design-vue";
import { addTempTask } from "../../api/indexTaskadd";
import {RouterEditTask} from "@/api/indexTask";
import {message} from "ant-design-vue";
import {addTempTask} from "../../api/indexTaskadd";
export default {
name: "AddDiscuss",
props: {
@@ -170,15 +172,16 @@ export default {
if (props.edit) {
//编辑讨
api
.getDiscussDetail({ discussId: props.EditDiscussId })
.then((res) => {
//更新讨论信息
state.inputV1 = res.data.data.discussName;
state.textV1 = res.data.data.discussExplain;
state.checkedC1 =
res.data.data.discussSettings == "true" ? true : false;
})
.catch(() => {});
.getDiscussDetail({discussId: props.EditDiscussId})
.then((res) => {
//更新讨论信息
state.inputV1 = res.data.data.discussName;
state.textV1 = res.data.data.discussExplain;
state.checkedC1 =
res.data.data.discussSettings == "true" ? true : false;
})
.catch(() => {
});
}
};
const afterVisibleChange = (bool) => {
@@ -186,9 +189,9 @@ export default {
queryDiscuss();
}
};
const updateTask = (res) => {
const updateTask = async (res) => {
if (props.isLevel == 1) {
RouterEditTask({
await RouterEditTask({
chapterId: props.isactive,
courseId: res.data.data.discussId,
name: res.data.data.discussName,
@@ -196,28 +199,28 @@ export default {
routerTaskId: props.routerTaskId || 0,
type: 8,
})
.then(() => {
//message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`);
})
.catch(() => {
//message.error(`${props.edit ? "编辑" : "新增"}关卡任务失败`);
});
.then(() => {
//message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`);
})
.catch(() => {
//message.error(`${props.edit ? "编辑" : "新增"}关卡任务失败`);
});
} else if (props.isLevel == 2) {
apiTask
.addTask({
courseId: res.data.data.discussId,
name: res.data.data.discussName,
projectId: props.projectId,
projectTaskId: props.projectTaskId || 0,
stageId: props.chooseStageId || 0,
type: 8,
})
.then(() => {
//message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`);
})
.catch(() => {
//message.error(`${props.edit ? "编辑" : "新增"}关卡任务失败`);
});
await apiTask
.addTask({
courseId: res.data.data.discussId,
name: res.data.data.discussName,
projectId: props.projectId,
projectTaskId: props.projectTaskId || 0,
stageId: props.chooseStageId || 0,
type: 8,
})
.then(() => {
//message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`);
})
.catch(() => {
//message.error(`${props.edit ? "编辑" : "新增"}关卡任务失败`);
});
} else if (props.isLevel == 3) {
console.log("");
addTempTask({
@@ -228,12 +231,12 @@ export default {
stageId: props.chooseStageId || 0,
type: 8,
})
.then(() => {
//message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`);
})
.catch(() => {
//message.error(`${props.edit ? "编辑" : "新增"}关卡任务失败`);
});
.then(() => {
//message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`);
})
.catch(() => {
//message.error(`${props.edit ? "编辑" : "新增"}关卡任务失败`);
});
}
};
const updateDiscussInfo = () => {
@@ -250,32 +253,32 @@ export default {
};
if (props.edit) {
api
.updateDiscuss(obj)
.then(async (res) => {
await updateTask(res);
closeDrawer();
ctx.emit("changeData", false);
message.destroy();
message.success("创建讨论成功");
})
.catch(() => {
message.destroy();
message.error("创建讨论失败");
});
.updateDiscuss(obj)
.then(async (res) => {
await updateTask(res);
closeDrawer();
ctx.emit("changeData", false);
message.destroy();
message.success("创建讨论成功");
})
.catch(() => {
message.destroy();
message.error("创建讨论失败");
});
} else {
api
.createDiscuss(obj)
.then(async (res) => {
await updateTask(res);
closeDrawer();
ctx.emit("changeData", false);
message.destroy();
message.success("创建讨论成功");
})
.catch(() => {
message.destroy();
message.error("创建讨论失败");
});
.createDiscuss(obj)
.then(async (res) => {
await updateTask(res);
closeDrawer();
ctx.emit("changeData", false);
message.destroy();
message.success("创建讨论成功");
})
.catch(() => {
message.destroy();
message.error("创建讨论失败");
});
}
};
return {
@@ -293,6 +296,7 @@ export default {
.ant-table-striped :deep(.table-striped) td {
background-color: #fafafa !important;
}
.addrefDrawer {
.drawerMain {
.header {
@@ -302,6 +306,7 @@ export default {
justify-content: space-between;
align-items: center;
flex-shrink: 0;
.headerTitle {
font-size: 18px;
font-weight: 600;
@@ -310,35 +315,43 @@ export default {
margin-left: 24px;
}
}
.contentMain {
display: flex;
justify-content: space-between;
.main_left {
margin-top: 32px;
padding-right: 30px;
flex: 1;
border-right: 1px solid #e8e8e8;
.main_item {
display: flex;
align-items: center;
margin-top: 32px;
margin-bottom: 32px;
.signbox {
width: 120px;
display: flex;
justify-content: end;
align-items: center;
.sign {
margin-right: 5px;
}
}
.btnbox {
display: flex;
flex: 1;
align-items: center;
.ant-input {
height: 100%;
}
.xkbtn {
cursor: pointer;
width: 130px;
@@ -351,32 +364,40 @@ export default {
}
}
}
.main_item2 {
display: flex;
align-items: flex-start;
margin-bottom: 32px;
.signbox {
width: 120px;
display: flex;
justify-content: end;
align-items: center;
.sign {
margin-right: 5px;
}
}
.textarea {
width: 423px;
.ant-input {
width: 100%;
}
.ant-input-textarea-show-count {
position: relative;
}
.ant-input-textarea-show-count::after {
position: absolute;
right: 10px;
bottom: 0px;
}
.ant-input {
border-radius: 8px;
}
@@ -384,6 +405,7 @@ export default {
}
}
}
.main_btns {
height: 72px;
width: 100%;
@@ -393,6 +415,7 @@ export default {
align-items: center;
justify-content: center;
box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.16);
.btn1 {
width: 100px;
height: 40px;
@@ -402,6 +425,7 @@ export default {
background-color: #fff;
cursor: pointer;
}
.btn2 {
cursor: pointer;
width: 100px;

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

@@ -287,7 +287,7 @@ export default {
})
.catch(() => {
message.destroy();
message.success("创建测评失败");
message.error("创建测评失败");
});
}
//创建测评信息
@@ -324,7 +324,7 @@ export default {
})
.catch(() => {
message.destroy();
message.success("创建测评失败");
message.error("创建测评失败");
});
};

19
src/components/drawers/AddFaceteach.vue
View File

@@ -28,11 +28,11 @@
</div>
<span style="margin-right: 3px">选择课程：</span>
</div>
<div class="btnbox" @click="showDrawerSelFacet">
<button class="xkbtn">
{{ chooseCourse == null ? "选择" : "修改" }}面授课
<div class="btnbox">
<button class="xkbtn" @click="showDrawerSelFacet">
{{ chooseCourse == null ? "选择" : chooseCourseName }}面授课
</button>
<div v-if="chooseCourse > 0">
<div v-if="chooseCourse">
<a-tag closable color="processing" @close="logC">
<span style="font-size:14px;line-height: 33px;">删除课程</span>
</a-tag>
@@ -41,7 +41,7 @@
</div>
<!-- 选择面授侧弹窗 -->
<div>
<sel-facet v-model:selfacetVisible="selfacetvisible" v-model:chooseCourse="chooseCourse"/>
<sel-facet v-model:selfacetVisible="selfacetvisible" v-model:chooseCourse="chooseCourse" v-model:chooseCourseName="chooseCourseName"/>
</div>
<!-- 选择面授侧弹窗 -->
</div>
@@ -61,8 +61,9 @@
<span style="margin-right: 3px">授课教师：</span>
</div>
<div class="btnbox">
<a-auto-complete placeholder="选择老师" :value="memberValue.label" style="width: 364px"
:options="options" @change="handleChange2" @search="handleSearch"></a-auto-complete>
<!-- <a-auto-complete placeholder="选择老师" :value="memberValue.label" style="width: 364px"-->
<!-- :options="options" @change="handleChange2" @search="handleSearch"></a-auto-complete>-->
<ProjectManager v-model:value="memberValue.value" v-model:name="memberValue.label"></ProjectManager>
</div>
</div>
<div class="main_item">
@@ -278,6 +279,7 @@ import dayjs from "dayjs";
import AssessmentList from "../drawers/ AssessmentList.vue";
// import { toDate } from "../../api/method";、
import {addTempTask} from "../../api/indexTaskadd";
import ProjectManager from "@/components/project/ProjectManager";
export default {
name: "AddFaceteach",
@@ -286,6 +288,7 @@ export default {
AddHomework,
AddTest,
AssessmentList,
ProjectManager,
},
props: {
addfaceteachVisible: {
@@ -368,6 +371,7 @@ export default {
chooseTime: [],
fileList: [],
chooseCourse: null, //选择的在线课程
chooseCourseName: null, //选择的在线课程
assessmentId: null,
EditTestId: null,
EditWorkId: null,
@@ -416,6 +420,7 @@ export default {
const logC = e => {
state.chooseCourse = null;
state.chooseCourseName = null;
console.log(e);
};
const logW = e => {

5
src/components/drawers/AddInvist.vue
View File

@@ -54,7 +54,7 @@
>
<span class="title"
>名称：
<span class="data">{{ assessment1.createName }}</span>
<span class="data">{{ assessment1.assessmentName }}</span>
</span>
<span class="title"
>题数：
@@ -184,6 +184,8 @@ export default {
const closeDrawer = () => {
ctx.emit("update:addinvistVisible", false);
ctx.emit("update:edit", false);
state.assessment = null;
state.assessment1 = null;
state.inputV1 = "";
// ctx.emit("changeData", false);
localStorage.setItem("stageId", props.chooseStageId);
@@ -205,6 +207,7 @@ export default {
api
.queryAppraiseDetailById({ assessmentId: props.EditInvistId })
.then((res) => {
console.log(res)
//更新讨论信息
state.assessment1 = res.data.data;
})

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

@@ -1,20 +1,20 @@
<!-- 直播抽屉 -->
<template>
<a-drawer
:visible="addliveVisible"
class="drawerStyle addliveDrawer"
width="80%"
title="添加直播"
placement="right"
@after-visible-change="afterVisibleChange"
:visible="addliveVisible"
class="drawerStyle addliveDrawer"
width="80%"
title="添加直播"
placement="right"
@after-visible-change="afterVisibleChange"
>
<div class="drawerMain">
<div class="header">
<div class="headerTitle">{{ edit ? "编辑" : "添加" }}直播</div>
<img
style="width: 29px; height: 29px; cursor: pointer"
src="../../assets/images/basicinfo/close.png"
@click="closeDrawer"
style="width: 29px; height: 29px; cursor: pointer"
src="../../assets/images/basicinfo/close.png"
@click="closeDrawer"
/>
</div>
<div class="contentMain">
@@ -23,18 +23,18 @@
<div class="signbox">
<div class="sign">
<img
src="@/assets/images/coursewareManage/asterisk.png"
alt=""
src="@/assets/images/coursewareManage/asterisk.png"
alt=""
/>
</div>
<span style="margin-right: 3px">直播名称：</span>
</div>
<div class="btnbox">
<a-input
v-model:value="inputV1"
style="width: 400px; height: 32px"
placeholder="请输入考试名称"
maxlength="20"
v-model:value="inputV1"
style="width: 400px; height: 32px"
placeholder="请输入考试名称"
maxlength="20"
/>
</div>
</div>
@@ -44,10 +44,10 @@
</div>
<div class="textarea">
<a-textarea
v-model:value="textV1"
placeholder="请输入考试说明"
allow-clear
maxlength="364px"
v-model:value="textV1"
placeholder="请输入考试说明"
allow-clear
maxlength="364px"
/>
</div>
</div>
@@ -55,17 +55,17 @@
<div class="signbox">
<div class="sign">
<img
src="@/assets/images/coursewareManage/asterisk.png"
alt=""
src="@/assets/images/coursewareManage/asterisk.png"
alt=""
/>
</div>
<span style="margin-right: 3px">直播时间：</span>
</div>
<div class="btnbox">
<a-range-picker
style="width: 424px"
v-model:value="time"
:placeholder="[' 开始时间', ' 结束时间']"
style="width: 424px"
v-model:value="time"
:placeholder="[' 开始时间', ' 结束时间']"
/>
</div>
</div>
@@ -73,24 +73,24 @@
<div class="signbox">
<div class="sign">
<img
src="@/assets/images/coursewareManage/asterisk.png"
alt=""
src="@/assets/images/coursewareManage/asterisk.png"
alt=""
/>
</div>
<span style="margin-right: 3px">直播时长：</span>
</div>
<div class="btnbox">
<a-input-number
:min="0"
:max="300"
:precision="0"
style="
:min="0"
:max="300"
:precision="0"
style="
width: 364px;
height: 32px;
border-radius: 8px;
overflow: hidden;
"
v-model:value="inputV2"
v-model:value="inputV2"
></a-input-number>
<span style="margin-left: 5px">分钟</span>
</div>
@@ -99,50 +99,40 @@
<div class="signbox">
<div class="sign">
<img
src="@/assets/images/coursewareManage/asterisk.png"
alt=""
src="@/assets/images/coursewareManage/asterisk.png"
alt=""
/>
</div>
<span style="margin-right: 3px">授课老师：</span>
</div>
<div class="btnbox">
<a-auto-complete
:value="memberValue.label"
show-search
:not-found-content="fetching ? undefined : null"
placeholder="Select a teacher"
style="width: 364px"
:options="options"
@focus="handleFocus"
@change="handleChange2"
@popupScroll="templateScroll"
@search="handleSearch"
></a-auto-complete>
<ProjectManager v-model:value="memberValue.value"
v-model:name="memberValue.label"></ProjectManager>
</div>
</div>
<div class="mbl_items2">
<div class="item_nam">
<div class="asterisk_icon">
<img
src="@/assets/images/coursewareManage/asterisk.png"
alt=""
src="@/assets/images/coursewareManage/asterisk.png"
alt=""
/>
</div>
<span style="margin-right: 14px">直播封面</span>
</div>
<div class="item_inp">
<a-upload
name="avatar"
list-type="picture-card"
class="avatar-uploader"
:show-upload-list="false"
:before-upload="beforeUpload"
name="avatar"
list-type="picture-card"
class="avatar-uploader"
:show-upload-list="false"
:before-upload="beforeUpload"
>
<img
class="i_upload_img"
v-if="imageUrl"
:src="imageUrl"
alt="avatar"
class="i_upload_img"
v-if="imageUrl"
:src="imageUrl"
alt="avatar"
/>
<div class="i_upload" v-else>
<div class="addimg">
@@ -162,9 +152,9 @@
</div>
<div class="btnbox">
<a-input
v-model:value="inputV4"
style="width: 424px; height: 32px"
placeholder="请输入直播链接"
v-model:value="inputV4"
style="width: 424px; height: 32px"
placeholder="请输入直播链接"
/>
</div>
</div>
@@ -173,7 +163,7 @@
<span style="margin-right: 3px">回放设置：</span>
</div>
<div class="btnbox">
<a-switch v-model:checked="switchC1" @click="PlayBack" />
<a-switch v-model:checked="switchC1"/>
</div>
</div>
<div v-if="switchC1">
@@ -183,9 +173,9 @@
</div>
<div class="btnbox">
<a-input
v-model:value="inputV5"
style="width: 424px; height: 32px"
placeholder="请输入回放链接"
v-model:value="inputV5"
style="width: 424px; height: 32px"
placeholder="请输入回放链接"
/>
</div>
</div>
@@ -196,9 +186,10 @@
</div>
<div class="btnbox2">
<a-checkbox
v-model:checked="needEval"
@click="needEval = !needEval"
>需要评估</a-checkbox
v-model:checked="needEval"
@click="needEval = !needEval"
>需要评估
</a-checkbox
>
</div>
</div>
@@ -206,17 +197,17 @@
<div class="signbox"></div>
<div class="btnbox">
<button class="xkbtn" @click="showAssessment">选择评估</button>
<div v-if="assessmentId > 0">
<a-tag closable color="processing" @close="logA">
<div v-if="(assessmentId !== '0')">
<a-tag closable @close="removePG" color="processing">
<span style="font-size: 14px; line-height: 33px"
>删除评估</span
>删除评估</span
>
</a-tag>
</div>
<AssessmentList
v-model:assessmentVisible="assessmentVisible"
v-model:titleTag="titleTag"
v-model:assessmentId="assessmentId"
v-model:assessmentVisible="assessmentVisible"
v-model:titleTag="titleTag"
v-model:assessmentId="assessmentId"
/>
</div>
</div>
@@ -226,38 +217,40 @@
</div>
<div class="kqszbox">
<div class="qdqtbox">
<div class="qdbtn"><div class="btntext">签到</div></div>
<div class="qdbtn">
<div class="btntext">签到</div>
</div>
</div>
<div class="setbox">
<div class="timerbox">
<span>开始前：</span>
<a-input-number
:min="0"
:max="30"
:precision="0"
style="
:min="0"
:max="30"
:precision="0"
style="
width: 88px;
height: 32px;
border-radius: 8px;
overflow: hidden;
"
v-model:value="inputV6"
v-model:value="inputV6"
></a-input-number>
<span style="color: #999999; margin-left: 8px">分钟</span>
</div>
<div class="timerbox">
<span>开始后：</span>
<a-input-number
:min="0"
:max="30"
:precision="0"
style="
:min="0"
:max="30"
:precision="0"
style="
width: 88px;
height: 32px;
border-radius: 8px;
overflow: hidden;
"
v-model:value="inputV7"
v-model:value="inputV7"
></a-input-number>
<span style="color: #999999; margin-left: 8px">分钟</span>
</div>
@@ -306,9 +299,10 @@
</div>
<div class="btnbox">
<a-checkbox
v-model:checked="switchC2"
@onclick="switchC2 = !switchC2"
>学员请假后记为任务完成</a-checkbox
v-model:checked="switchC2"
@onclick="switchC2 = !switchC2"
>学员请假后记为任务完成
</a-checkbox
>
</div>
</div>
@@ -322,28 +316,32 @@
</a-drawer>
</template>
<script>
import { reactive, toRefs, ref } from "vue";
import { message } from "ant-design-vue";
import {reactive, toRefs, ref} from "vue";
import {message} from "ant-design-vue";
import * as api from "../../api/indexLiveBroadcast";
import * as apiTask from "../../api/indexTaskadd";
import { toDate } from "@/api/method";
import { RouterEditTask } from "@/api/indexTask";
import { addTempTask } from "../../api/indexTaskadd";
import { getMemberInfo } from "@/api/index1";
import {toDate} from "@/api/method";
import {RouterEditTask} from "@/api/indexTask";
import {addTempTask} from "../../api/indexTaskadd";
import {getMemberInfo} from "@/api/index1";
import dayjs from "dayjs";
import { fileUp } from "../../api/indexEval";
import {fileUp} from "../../api/indexEval";
import AssessmentList from "../drawers/ AssessmentList.vue";
import { debounce } from "lodash-es";
import {debounce} from "lodash-es";
import ProjectManager from "@/components/project/ProjectManager";
// import { useRouter } from "vue-router";
function getBase64(img, callback) {
const reader = new FileReader();
reader.addEventListener("load", () => callback(reader.result));
reader.readAsDataURL(img);
}
export default {
name: "AddLive",
components: {
AssessmentList,
ProjectManager,
},
props: {
addliveVisible: {
@@ -460,51 +458,55 @@ export default {
queryLive();
}
api
.queryAssessmentDetailList({
assessmentName: "",
pageNo: 1,
pageSize: 200,
releaseStatus: "",
searchEndTime: "",
searchStartTime: "",
})
.then((res) => {
res.data.data.rows.forEach((item) => {
let obj = item;
obj.value = item.assessmentId;
obj.label = item.assessmentName;
state.assessment.push(obj);
.queryAssessmentDetailList({
assessmentName: "",
pageNo: 1,
pageSize: 200,
releaseStatus: "",
searchEndTime: "",
searchStartTime: "",
})
.then((res) => {
res.data.data.rows.forEach((item) => {
let obj = item;
obj.value = item.assessmentId;
obj.label = item.assessmentName;
state.assessment.push(obj);
});
});
});
};
const queryLive = () => {
let d = props.EditLiveId;
api
.getLiveBroadcastInfor({ liveId: d })
.then((res) => {
state.inputV1 = res.data.data.liveName;
state.time = [
dayjs(res.data.data.liveStartTime, "YYYY-MM-DD"),
dayjs(res.data.data.liveEndTime, "YYYY-MM-DD"),
];
state.inputV2 = res.data.data.liveDuration;
state.inputV3 = res.data.data.liveTeacherId;
//state.fileList= res.data.data
state.inputV4 = res.data.data.liveLink;
state.inputV5 = res.data.data.livePlaybackLink;
state.inputV6 = res.data.data.beforeSignIn;
state.inputV7 = res.data.data.afterSignIn;
state.inputV8 = res.data.data.signOutTime;
state.textV1 = res.data.data.liveExplain;
state.radioV1 = Number(res.data.data.standardSettings);
//state.= res.data.data
state.assessmentId = res.data.data.assessmentId;
state.imageUrl = res.data.data.liveCover;
state.switchC2 = res.data.data.otherSettings == 1 ? true : false;
})
.catch(() => {
//message.error(`查询失败`);
});
.getLiveBroadcastInfor({liveId: d})
.then((res) => {
console.log("获取的数据",res)
state.inputV1 = res.data.data.liveName;
state.time = [
dayjs(res.data.data.liveStartTime, "YYYY-MM-DD"),
dayjs(res.data.data.liveEndTime, "YYYY-MM-DD"),
];
state.inputV2 = res.data.data.liveDuration;
state.inputV3 = res.data.data.liveTeacherId;
//state.fileList= res.data.data
state.inputV4 = res.data.data.liveLink;
state.inputV5 = res.data.data.livePlaybackLink;
state.inputV6 = res.data.data.beforeSignIn;
state.inputV7 = res.data.data.afterSignIn;
state.inputV8 = res.data.data.signOutTime;
state.textV1 = res.data.data.liveExplain;
state.radioV1 = Number(res.data.data.standardSettings);
//state.= res.data.data
state.assessmentId = res.data.data.assessmentId;
state.imageUrl = res.data.data.liveCover;
state.switchC1 = res.data.data.livePlayback === '1' ? true : false;
state.switchC2 = res.data.data.otherSettings == 1 ? true : false;
state.needEval = res.data.data.isEvaluate == '1' ? true : false;
state.memberValue = {value: res.data.data.liveTeacherId || '', label: res.data.data.liveTeacherName || ''};
})
.catch(() => {
//message.error(`查询失败`);
});
};
const cloradio1 = (value) => {
if (state.radioV1 === value.target._value) {
@@ -542,31 +544,31 @@ export default {
routerTaskId: props.routerTaskId || 0,
type: 6,
})
.then(() => {
//message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`);
ctx.emit("changeData", false);
})
.catch(() => {
//message.error(`${props.edit ? "编辑" : "新增"}关卡任务失败`);
});
.then(() => {
//message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`);
ctx.emit("changeData", false);
})
.catch(() => {
//message.error(`${props.edit ? "编辑" : "新增"}关卡任务失败`);
});
} else if (props.isLevel == 2) {
apiTask
.addTask({
courseId: res.data.data.liveId,
duration: res.data.data.liveDuration,
name: res.data.data.liveName,
projectId: props.projectId,
projectTaskId: props.projectTaskId || 0,
stageId: props.chooseStageId || 0,
type: 6,
})
.then(() => {
//message.success(`${props.edit ? "编辑" : "新增"}阶段任务成功`);
ctx.emit("changeData", false);
})
.catch(() => {
//message.error(`${props.edit ? "编辑" : "新增"}阶段任务失败`);
});
.addTask({
courseId: res.data.data.liveId,
duration: res.data.data.liveDuration,
name: res.data.data.liveName,
projectId: props.projectId,
projectTaskId: props.projectTaskId || 0,
stageId: props.chooseStageId || 0,
type: 6,
})
.then(() => {
//message.success(`${props.edit ? "编辑" : "新增"}阶段任务成功`);
ctx.emit("changeData", false);
})
.catch(() => {
//message.error(`${props.edit ? "编辑" : "新增"}阶段任务失败`);
});
} else if (props.isLevel == 3) {
console.log("props.projectTemplateId", props.projectTemplateId);
addTempTask({
@@ -578,13 +580,13 @@ export default {
stageId: props.chooseStageId || 0,
type: 6,
})
.then(() => {
//message.success(`${props.edit ? "编辑" : "新增"}阶段任务成功`);
ctx.emit("changeData", false);
})
.catch(() => {
//message.error(`${props.edit ? "编辑" : "新增"}阶段任务失败`);
});
.then(() => {
//message.success(`${props.edit ? "编辑" : "新增"}阶段任务成功`);
ctx.emit("changeData", false);
})
.catch(() => {
//message.error(`${props.edit ? "编辑" : "新增"}阶段任务失败`);
});
}
};
const showAssessment = () => {
@@ -611,65 +613,71 @@ export default {
return message.warning("直播时长需大于0");
}
let startTime = toDate(
new Date(state.time[0].$d).getTime() / 1000,
"Y-M-D"
new Date(state.time[0].$d).getTime() / 1000,
"Y-M-D"
);
let endTime = toDate(
new Date(state.time[1].$d).getTime() / 1000,
"Y-M-D"
new Date(state.time[1].$d).getTime() / 1000,
"Y-M-D"
);
state.obj = {
afterSignIn: state.inputV6,
beforeSignIn: state.inputV7,
assessmentId: state.assessmentId == null ? 0 : state.assessmentId,
assessmentId: state.assessmentId == null || state.assessmentId == "" ? 0 : Number(state.assessmentId),
liveCover: state.imageUrl, //直播封面
liveDuration: state.inputV2,
liveDuration: Number(state.inputV2),
liveEndTime: endTime,
liveStartTime: startTime,
liveExplain: state.textV1,
liveFlag: "",
liveId: props.edit ? props.EditLiveId : 0,
liveId: props.edit ? Number(props.EditLiveId) : 0,
liveLink: state.inputV4,
liveName: state.inputV1,
livePlayback: state.switchC1 ? "1" : "0",
livePlaybackLink: state.switchC1 ? state.inputV5 : "",
liveTeacherId: state.inputV3,
liveTeacherId: Number(state.memberValue.value),
liveTeacherName: state.memberValue.label,
otherSettings: state.switchC2 ? "1" : "0", //1或0
signOutTime: state.inputV8,
signOutTime: state.inputV8,
standardSettings: state.radioV1, //1或2
isEvaluate: state.needEval ? "1" : "0",
};
console.log('我是要更新的数据',state.obj )
if (props.edit) {
api
.updateLiveBroadcastMessage(state.obj)
.then(async(res) => {
message.destroy();
message.success("提交成功");
await updateTask(res);
closeDrawer();
})
.catch(() => {});
.updateLiveBroadcastMessage(state.obj)
.then(async (res) => {
console.log(res)
message.destroy();
message.success("提交成功");
await updateTask(res);
closeDrawer();
})
.catch((err) => {
console.log(err)
});
} else {
api
.createLiveBroadcast(state.obj)
.then(async(res) => {
message.destroy();
message.success("提交成功");
await updateTask(res);
closeDrawer();
})
.catch(() => {});
.createLiveBroadcast(state.obj)
.then(async (res) => {
message.destroy();
message.success("提交成功");
await updateTask(res);
closeDrawer();
})
.catch(() => {
});
}
};
const beforeUpload = (file) => {
return new Promise((resolve, reject) => {
const isJpgOrPng =
file.type === "image/jpg" ||
file.type === "image/jpeg" ||
file.type === "image/png" ||
file.type === "image/svg" ||
file.type === "image/bmp" ||
file.type === "image/gif";
file.type === "image/jpg" ||
file.type === "image/jpeg" ||
file.type === "image/png" ||
file.type === "image/svg" ||
file.type === "image/bmp" ||
file.type === "image/gif";
if (!isJpgOrPng) {
message.destroy();
message.error("仅支持jpg、gif、png、jpeg、svg、bmp格式!");
@@ -697,7 +705,7 @@ export default {
};
const templateScroll = (e) => {
console.log("滚动", e);
const { target } = e;
const {target} = e;
const scrllHeight = target.scrollHeight - target.scrollTop;
const clientHeight = target.clientHeight;
// console.log("scrllHeight", scrllHeight, clientHeight);
@@ -723,20 +731,20 @@ export default {
pageSize: state.pageSize,
};
getMemberInfo(obj)
.then((res) => {
let data = res.data.data.rows;
state.totalPages = res.data.data.total;
for (let i in data) {
options.value.push({
value: data[i].id,
label: data[i].realName,
});
}
})
.catch((err) => {
message.destroy();
message.error("获取员工失败" + err);
});
.then((res) => {
let data = res.data.data.rows;
state.totalPages = res.data.data.total;
for (let i in data) {
options.value.push({
value: data[i].id,
label: data[i].realName,
});
}
})
.catch((err) => {
message.destroy();
message.error("获取员工失败" + err);
});
};
const handleSearch = debounce((memberValue) => {
console.log("fetching user", memberValue);
@@ -762,6 +770,14 @@ export default {
state.discussSettings = "false";
}
};
// 删除评估
const removePG = () => {
console.log("11111")
state.assessmentId = "";
state.isEvaluate = "0";
}
return {
...toRefs(state),
afterVisibleChange,
@@ -778,6 +794,7 @@ export default {
templateScroll,
handleSearch,
showAssessment,
removePG
};
},
};
@@ -786,6 +803,7 @@ export default {
.ant-table-striped :deep(.table-striped) td {
background-color: #fafafa !important;
}
.addliveDrawer {
.drawerMain {
.header {
@@ -795,6 +813,7 @@ export default {
justify-content: space-between;
align-items: center;
flex-shrink: 0;
.headerTitle {
font-size: 18px;
font-weight: 600;
@@ -803,32 +822,39 @@ export default {
margin-left: 24px;
}
}
.contentMain {
display: flex;
justify-content: space-between;
.main_left {
padding-right: 30px;
flex: 1;
border-right: 1px solid #e8e8e8;
margin-top: 32px;
.main_item {
display: flex;
align-items: center;
margin-top: 32px;
margin-bottom: 32px;
.signbox {
width: 120px;
display: flex;
justify-content: end;
align-items: center;
.sign {
margin-right: 5px;
}
}
.btnbox {
display: flex;
flex: 1;
align-items: center;
.xkbtn {
cursor: pointer;
width: 130px;
@@ -841,24 +867,29 @@ export default {
}
}
}
.main_item2 {
display: flex;
align-items: flex-start;
margin-bottom: 32px;
.signbox {
width: 120px;
display: flex;
justify-content: end;
align-items: center;
.sign {
margin-right: 5px;
}
}
.kqszbox {
.qdqtbox {
margin-left: 5px;
cursor: pointer;
}
.qdbtn,
.qtbtn {
width: 75px;
@@ -869,15 +900,18 @@ export default {
display: flex;
align-items: center;
justify-content: center;
.btntext {
color: #387df7;
}
}
.setbox {
display: flex;
flex-wrap: wrap;
margin-top: 10px;
margin-bottom: 24px;
.timerbox {
margin-top: 6px;
margin-right: 32px;
@@ -887,10 +921,12 @@ export default {
}
}
}
.btnbox2 {
display: flex;
flex-direction: column;
justify-content: flex-start;
.xkbtn {
cursor: pointer;
width: 130px;
@@ -905,20 +941,24 @@ export default {
}
}
}
.mbl_items2 {
display: flex;
align-items: start;
margin-top: 10px;
margin-bottom: 10px;
.i_bottom {
margin-bottom: 30px;
}
.item_nam {
width: 100px;
display: flex;
align-items: center;
justify-content: flex-end;
white-space: nowrap;
.asterisk_icon {
width: 10px;
height: 10px;
@@ -926,13 +966,16 @@ export default {
margin-top: -15px;
}
}
.item_inp {
flex: 1;
.i_upload_img {
width: 100px;
height: 100px;
border-radius: 8px;
}
.i_upload {
width: 100px;
height: 100px;
@@ -941,8 +984,10 @@ export default {
text-align: center;
align-items: center;
cursor: pointer;
.addimg {
position: relative;
.heng {
position: absolute;
top: 50px;
@@ -950,6 +995,7 @@ export default {
width: 50px;
border: 1px solid #4ea6ff;
}
.shu {
position: absolute;
top: 25px;
@@ -963,6 +1009,7 @@ export default {
}
}
}
.main_btns {
height: 72px;
width: 100%;
@@ -972,6 +1019,7 @@ export default {
align-items: center;
justify-content: center;
box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.16);
.btn1 {
width: 100px;
height: 40px;
@@ -981,6 +1029,7 @@ export default {
background-color: #fff;
cursor: pointer;
}
.btn2 {
cursor: pointer;
width: 100px;

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

@@ -181,8 +181,34 @@
</div>
<div class="boeTree">
<div class="boeTreeTitle">BOE组织树</div>
<a-tree
v-if="!isSearchOrg"
class="treeMain treeMain2"
:style="{ height: screenHeight - 430 + 'px' }"
dropdownClassName="changetreedropdownboe"
:dropdown-style="{
maxHeight: '600px',
}"
placeholder="BOE组织树"
allow-clear
tree-default-expand-all
:tree-data="isSearchOrg ? treeData2 : treeData"
@select="departmentSelect1"
multiple
v-model:selectedKeys="selectedKeys1"
:fieldNames="{
children: 'treeChildList',
key: 'id',
title: 'name',
value: 'name',
}"
v-model:expandedKeys="expandedKeys"
>
<template #suffixIcon></template>
</a-tree>
<a-tree
v-else-if="isSearchOrg"
class="treeMain treeMain2"
:style="{ height: screenHeight - 430 + 'px' }"
dropdownClassName="changetreedropdownboe"
@@ -953,13 +979,14 @@ export default {
.getOrgInfo(obj)
.then((res) => {
if (res.data.code === 200) {
console.log("搜索组织", res);
state.isSearchOrg = true;
// res.data.data.rows.forEach((element) => {
// // console.log("element", element);
// element.treeChildList = [];
// });
// console.log("组织树搜索成功", res.data.data.rows);
state.treeData2 = res.data.data.rows;
state.treeData2 = res.data.data;
}
})
.catch((err) => {

3
src/components/drawers/ProjPowerList.vue
View File

@@ -177,6 +177,9 @@ export default {
const closeDrawer = () => {
ctx.emit("update:ProjPvisible", false);
state.currentPage = 1;
state.tableData = [];
state.tableDataTotal = -1;
state.name = null;
};
const afterVisibleChange = (bool) => {
console.log("state", bool, props);

12
src/components/drawers/ProjectOwn.vue
View File

@@ -200,6 +200,7 @@ import elementResizeDetectorMaker from "element-resize-detector";
// import { message } from "ant-design-vue";
import * as api from "../../api/index1";
import { useStore } from "vuex";
import { message } from "ant-design-vue";
export default {
name: "ProjOwnerShip",
props: {
@@ -407,6 +408,16 @@ export default {
.optionAuthPerm(obj)
.then((res) => {
console.log("获取授权成功", res);
if (res.data.code === 200 && res.data.data.records.length > 0) {
state.selectedRowKeys = res.data.data.records[0].memberId;
let obj = {
id: res.data.data.records[0].memberId,
name: res.data.data.records[0].memberName,
};
state.choosepeople = [obj];
state.selectPeopleArr = [obj];
}
})
.catch((err) => {
console.log("获取授权失败", err);
@@ -440,6 +451,7 @@ export default {
.optionAuthPerm(obj)
.then((res) => {
console.log("修改授权成功", res);
message.success("修改归属权成功");
closeDrawer();
})
.catch((err) => {

327
src/components/drawers/SelFacet.vue
View File

@@ -1,19 +1,19 @@
<template>
<a-drawer
:visible="selfacetVisible"
class="drawerStyle selfacetDrawer"
width="80%"
title="添加在线"
placement="right"
@after-visible-change="afterVisibleChange"
:visible="selfacetVisible"
class="drawerStyle selfacetDrawer"
width="80%"
title="添加在线"
placement="right"
@after-visible-change="afterVisibleChange"
>
<div class="drawerMain">
<div class="header">
<div class="headerTitle">选择面授</div>
<img
style="width: 29px; height: 29px; cursor: pointer"
src="../../assets/images/basicinfo/close.png"
@click="closeDrawer"
style="width: 29px; height: 29px; cursor: pointer"
src="../../assets/images/basicinfo/close.png"
@click="closeDrawer"
/>
</div>
<div class="contentMain">
@@ -23,26 +23,26 @@
<div class="ipt_name">课程信息：</div>
<div class="fi_input">
<a-input
v-model:value="name"
style="width: 240px; height: 40px; border-radius: 8px"
placeholder="请输入项目名称"
v-model:value="name"
style="width: 240px; height: 40px; border-radius: 8px"
placeholder="请输入项目名称"
/>
</div>
</div>
<div class="mii_ipt">
<div class="ipt_name">课程状态：</div>
<div class="select fitems">
<a-select
v-model:value="auditStatus"
dropdownClassName="dropdown-style"
style="width: 200px"
placeholder="请选择状态"
:options="options1"
allowClear
showSearch
>
</a-select>
</div>
<a-select
v-model:value="auditStatus"
dropdownClassName="dropdown-style"
style="width: 200px"
placeholder="请选择状态"
:options="options1"
allowClear
showSearch
>
</a-select>
</div>
</div>
</div>
<div class="mi_btns">
@@ -57,88 +57,88 @@
</div>
</div>
<div class="main_notice">
<div class="mntc_left">
<div class="notice_icon"></div>
<div v-if="offcourse == null">
<div class="mntc_left">
<div class="notice_icon"></div>
<div v-if="offcourse == null">
<span class="title"
>已选择 <span class="data">0</span> 条</span
>已选择 <span class="data">0</span> 条</span
>
</div>
<div v-else>
</div>
<div v-else>
<span class="title"
>已选择 <span class="data">1</span> 条;</span
>已选择 <span class="data">1</span> 条;</span
>
<span class="title"
>课程编号：
<span class="title"
>课程编号：
<span class="data">{{ offcourse.offcourseId }}</span>
</span>
<span class="title"
>名称：
<span class="title"
>名称：
<span class="data">{{
offcourse.name
}}</span>
offcourse.name
}}</span>
</span>
<span class="title"
>分类：
<span class="title"
>分类：
<span class="data">{{
offcourse.categoryId
}}</span>
offcourse.categoryId
}}</span>
</span>
<span class="title"
>授课老师：
<span class="title"
>授课老师：
<span class="data">{{
offcourse.teacherId
}}</span>
offcourse.teacherId
}}</span>
</span>
<span class="title"
>创建人：
<span class="title"
>创建人：
<span class="data">{{ offcourse.createUser }}</span>
</span>
</div>
</div>
</div>
</div>
</div>
<div class="main_table">
<a-table
class="ant-table-striped"
:row-class-name="
class="ant-table-striped"
:row-class-name="
(_record, index) => (index % 2 === 1 ? 'table-striped' : null)
"
:row-selection="rowSelection"
:columns="columns1"
:data-source="classTableData"
:loading="tableDataTotal === -1 ? true : false"
:pagination="false"
:row-selection="rowSelection"
:columns="columns1"
:data-source="classTableData"
:loading="tableDataTotal === -1 ? true : false"
:pagination="false"
/>
<div class="pa">
<a-pagination
v-if="total > 10"
showSizeChanger="true"
showQuickJumper="true"
hideOnSinglePage="true"
:pageSize="pageSize"
:current="currentPage"
:total="tableDataTotal"
class="pagination"
@change="changePaginationStu"
v-if="total > 10"
showSizeChanger="true"
showQuickJumper="true"
hideOnSinglePage="true"
:pageSize="pageSize"
:current="currentPage"
:total="tableDataTotal"
class="pagination"
@change="changePaginationStu"
/>
</div>
</div>
</div>
</div>
</a-drawer>
</template>
<script>
//import { ApiFilled } from "@ant-design/icons-vue";
import { reactive, toRefs, ref } from "vue";
import {reactive, toRefs, ref, computed} from "vue";
// import { planList } from "../../api/indexTaskadd";
import {detail} from "../../api/indexCourse";
import { list } from "../../api/indexTaskadd";
import { toDate } from "../../api/method";
// import {detail} from "../../api/indexCourse";
import {list} from "../../api/indexTaskadd";
import {toDate} from "../../api/method";
const columns1 = [
{
@@ -196,6 +196,10 @@ export default {
type: Number,
default: null,
},
chooseCourseName: {
type: String,
default: null,
},
titleTag: {
type: Boolean,
default: false,
@@ -221,59 +225,75 @@ export default {
valueContent: null, //内容分类
selectedRows: [], //选择的数据
selectedRowKeys: [],
titleTag:false,
offcourse:null,
auditStatus:null,
name:null,
titleTag: false,
offcourse: null,
auditStatus: null,
name: null,
courseInfo:[]
});
const rowSelection = {
type: "radio",
onSelect: (selectedRows) => {
state.chooseCourse=selectedRows.num;
console.log(selectedRows,"==========",state.chooseCourse);
closeDrawer();
},
};
const rowSelection = computed(() => {
console.log(3333333333)
console.log(state.selectedRows)
return {
type: "radio",
selectedRowKeys: state.selectedRows,
onSelect: (selectedRows) => {
console.log('select')
state.chooseCourse = selectedRows.num;
state.chooseCourseName = selectedRows.name;
console.log(selectedRows, "==========", state.chooseCourse);
closeDrawer();
},
onChange: (selectedRows) => {
console.log('onChange')
state.selectedRows = selectedRows
},
}
})
const closeDrawer = () => {
ctx.emit("update:selfacetVisible", false);
ctx.emit("update:chooseCourse", state.chooseCourse);
state.chooseCourse && ctx.emit("update:chooseCourse", state.chooseCourse);
state.chooseCourseName && ctx.emit("update:chooseCourseName", state.chooseCourseName);
};
const afterVisibleChange = (bool) => {
if(bool){
state.chooseCourse=props.chooseCourse;
getClassList();
getFaceInfo();
if (bool) {
state.chooseCourse = props.chooseCourse;
state.chooseCourseName = props.chooseCourseName;
state.selectedRows = props.chooseCourse ? [props.chooseCourse] : [];
getClassList();
// getFaceInfo();
}
};
// const showDrawerSelFacet = () => {
// state.selfacetvisible = true;
// };
const getFaceInfo =()=>{
detail({offcourseId:36}).then((res) => {
state.chooseCourse = res.data.data;
}).catch();
}
// const getFaceInfo = () => {
// detail({offcourseId: 36}).then((res) => {
// state.courseInfo = res.data.data;
// }).catch();
// }
//获取面授课列表
const getClassList = (obj) => {
let objn = obj || {
auditStatus:state.auditStatus,
name:state.name,
pageNo:state.currentPage,
pageSize:state.pageSize
auditStatus: state.auditStatus,
name: state.name,
pageNo: state.currentPage,
pageSize: state.pageSize
};
list(objn)
.then((res) => {
console.log(res.data.data.rows);
let result = res.data.data;
state.tableDataTotal = result.total;
getClassData(result.rows);
})
.catch((err) => {
console.log("获取列表失败", err.data);
});
.then((res) => {
console.log(res.data.data.rows);
let result = res.data.data;
state.tableDataTotal = result.total;
getClassData(result.rows);
})
.catch((err) => {
console.log("获取列表失败", err.data);
});
};
const getClassData = (tabledata) => {
@@ -317,7 +337,7 @@ export default {
console.log("改变了", value, option);
console.log(state.valueContent);
};
//搜索
//搜索
const search = () => {
//重新获取列表
getClassList();
@@ -366,6 +386,7 @@ export default {
display: flex;
justify-content: space-between;
align-items: center;
.headerTitle {
font-size: 18px;
font-weight: 600;
@@ -374,6 +395,7 @@ export default {
margin-left: 24px;
}
}
.contentMain {
.main_items {
display: flex;
@@ -381,23 +403,28 @@ export default {
margin-bottom: 12px;
margin-top: 32px;
flex-wrap: wrap;
.mi_ipts {
display: flex;
margin-bottom: 20px;
.mii_ipt {
display: flex;
align-items: center;
margin-right: 24px;
.ipt_name {
white-space: nowrap;
}
}
}
.mi_btns {
display: flex;
margin-left: 38px;
margin-bottom: 20px;
cursor: pointer;
.btn {
padding: 0px 26px 0px 26px;
height: 38px;
@@ -408,9 +435,11 @@ export default {
justify-content: center;
margin-left: 14px;
flex-shrink: 0;
.search {
background-size: 100%;
}
.btnText {
font-size: 14px;
font-weight: 400;
@@ -418,78 +447,96 @@ export default {
margin-left: 5px;
}
}
.btn1 {
background: rgb(64, 158, 255);
.search {
width: 15px;
height: 17px;
background-image: url("@/assets/images/coursewareManage/search0.png");
}
.btnText {
color: rgb(255, 255, 255);
}
}
.btn2 {
background: rgb(255, 255, 255);
.search {
width: 15px;
height: 17px;
background-image: url("@/assets/images/coursewareManage/reset1.png");
}
.btnText {
color: rgb(64, 158, 255);
}
}
.btn1:hover {
background: rgb(255, 255, 255);
.search {
background-image: url("@/assets/images/courseManage/search1.png");
}
.btnText {
color: #388be1;
}
}
.btn2:hover {
background: rgba(64, 158, 255, 1);
.search {
background-image: url("@/assets/images/courseManage/reset0.png");
}
.btnText {
color: #ffffff;
}
}
}
}
.main_notice {
display: flex;
justify-content: space-between;
align-items: center;
margin-bottom: 32px;
height: 40px;
background-color: #e9f6fe;
.mntc_left {
display: flex;
align-items: center;
.title {
color: rgba(0, 0, 0, 0.65);
margin-right: 17px;
}
.data {
color: #388be1;
}
.notice_icon {
width: 14px;
height: 14px;
margin-right: 9px;
margin-left: 9px;
background-image: url(@/assets/images/coursewareManage/gan.png);
background-size: 100% 100%;
}
}
.mntc_right {
cursor: pointer;
}
display: flex;
justify-content: space-between;
align-items: center;
margin-bottom: 32px;
height: 40px;
background-color: #e9f6fe;
.mntc_left {
display: flex;
align-items: center;
.title {
color: rgba(0, 0, 0, 0.65);
margin-right: 17px;
}
.data {
color: #388be1;
}
.notice_icon {
width: 14px;
height: 14px;
margin-right: 9px;
margin-left: 9px;
background-image: url(@/assets/images/coursewareManage/gan.png);
background-size: 100% 100%;
}
}
.mntc_right {
cursor: pointer;
}
}
}
.main_btns {
@@ -501,6 +548,7 @@ export default {
align-items: center;
justify-content: center;
box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.16);
.btn1 {
width: 100px;
height: 40px;
@@ -510,6 +558,7 @@ export default {
background-color: #fff;
cursor: pointer;
}
.btn2 {
cursor: pointer;
width: 100px;

26
src/components/project/ProjectManager.vue
View File

@@ -1,13 +1,13 @@
<template>
<a-select
v-model:value="managerArray"
placeholder="请选择项目经理"
:placeholder="placeholder"
:filterOption="false"
style="width: 100%"
:options="options"
allowClear
showSearch
mode="multiple"
:mode="mode"
:disabled="disabled"
@popupScroll="memberScroll"
@search="searchMember"
@@ -37,6 +37,15 @@ export default {
type: Boolean,
default: false
},
placeholder: {
type: String,
default: '请选择'
},
// 'multiple' | 'tags'
mode: {
type: String,
default: 'select'
},
},
setup(props, ctx) {
const state = reactive({
@@ -93,11 +102,11 @@ export default {
function init() {
console.log('init--', props)
if (props.value !== state.managerArray.join(',')) {
if (props.value !== typeof state.managerArray === 'object' ? state.managerArray.join(',') : state.managerArray) {
if (props.value) {
const arrManager = props.name.split(',')
const arrManagerId = props.value.split(',')
state.managerArray = arrManagerId
state.managerArray = props.mode === 'select' ? props.value : arrManagerId;
state.options = arrManager.map((e, i) => ({label: e, value: arrManagerId[i]}))
} else {
state.managerArray = []
@@ -116,8 +125,13 @@ export default {
function change(e, l) {
console.log('change')
ctx.emit('update:value', e.join(','))
ctx.emit('update:name', l.map(t => t.label).join(','))
if (Array.isArray(l)) {
ctx.emit('update:value', l.map(t => t.value).join(','))
ctx.emit('update:name', l.map(t => t.label).join(','))
} else {
ctx.emit('update:value', l.value)
ctx.emit('update:name', l.label)
}
}
return {

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

File diff suppressed because it is too large Load Diff

16
src/views/examine/CourseReviewedN.vue
View File

@@ -390,12 +390,12 @@ export default {
key: "status",
align: "center",
},
{
title: "转审",
dataIndex: "change",
key: "change",
align: "center",
},
// {
// title: "转审",
// dataIndex: "change",
// key: "change",
// align: "center",
// },
{
title: "创建人",
dataIndex: "creater",
@@ -637,12 +637,16 @@ export default {
state.courAuditModal = false;
message.destroy();
message.success("审核提交成功");
state.valueSugg = null;
state.valuepass="1";
getFaceList();
})
.catch((err) => {
console.log(err);
message.destroy();
message.warning("审核提交失败");
state.valueSugg = null;
state.valuepass="1";
});
};
onMounted(async () => {

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

@@ -161,26 +161,7 @@
</div>
<div class="inname">归属组织</div>
<div class="select in">
<a-tree-select
:getPopupContainer="
(triggerNode) => {
return triggerNode.parentNode || document.body;
}
"
v-model:value="organizationSelectName"
style="width: 270px"
placeholder="请选择组织"
:tree-data="organizationList"
:options="organizationList"
@change="selectorganization"
allowClear
showSearch
:fieldNames="{
children: 'treeChildList',
label: 'name',
value: 'id',
}"
></a-tree-select>
<OrgClass v-model:value="organizationSelectId" v-model:name="organizationSelectName"></OrgClass>
</div>
<!-- <div class="in">
<a-input
@@ -295,26 +276,7 @@
</div>
<div class="inname">归属组织</div>
<div class="select in">
<a-tree-select
:getPopupContainer="
(triggerNode) => {
return triggerNode.parentNode || document.body;
}
"
v-model:value="organizationSelectName"
style="width: 270px"
placeholder="请选择组织"
:options="organizationList"
:tree-data="organizationList"
@change="selectorganization"
allowClear
showSearch
:fieldNames="{
children: 'treeChildList',
label: 'name',
value: 'id',
}"
></a-tree-select>
<OrgClass v-model:value="organizationSelectId" v-model:name="organizationSelectName"></OrgClass>
</div>
<!-- <div class="in">
<a-input
@@ -702,10 +664,12 @@ import { message } from "ant-design-vue";
import {
toDate,
commonData,
changeOwnership,
// setCookie
} from "../../api/method";
import { storage } from "../../api/storage";
import { useStore } from "vuex";
import OrgClass from "@/components/project/OrgClass";
export default {
name: "learningPath",
components: {
@@ -714,7 +678,7 @@ export default {
// QueryRight,
// ManageRight,
ProjOwnerShip,
OrgClass,
ProjPowerList,
ProjCheckShip,
},
@@ -1464,6 +1428,15 @@ export default {
.catch((chapterErr) => {
console.log("关卡创建失败", chapterErr);
});
//添加归属权 [id: '966735050643083264', name: '丁舟航']
let selectPeopleArr = [
{ id: res.data.data.createId, name: res.data.data.createName },
];
changeOwnership(
"learnPath",
res.data.data.routerId,
selectPeopleArr
);
}
})
.catch((err) => {
@@ -1471,6 +1444,7 @@ export default {
// state.createLoading = false;
});
};
//获取学习路径列表
const getLearnPath = () => {
let obj = {

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

@@ -415,31 +415,33 @@
>
<img
:src="
item.type === 1
item.type == 1
? require('../../assets/images/leveladd/zai.png')
: type === 2
: item.type == 2
? require('../../assets/images/leveladd/mian.png')
: item.type === 3
: item.type == 3
? require('../../assets/images/leveladd/an.png')
: item.type === 4
: item.type == 4
? require('../../assets/images/leveladd/zuo.png')
: item.type === 5
: item.type == 5
? require('../../assets/images/leveladd/kao.png')
: item.type === 6
: item.type == 6
? require('../../assets/images/leveladd/zhi.png')
: item.type === 7
: item.type == 7
? require('../../assets/images/leveladd/wai.png')
: item.type === 8
: item.type == 8
? require('../../assets/images/leveladd/tao.png')
: item.type === 9
: item.type == 9
? require('../../assets/images/leveladd/huo.png')
: item.type === 10
: item.type == 10
? require('../../assets/images/leveladd/ce.png')
: item.type === 11
? require('../../assets/images/leveladd/diao.png')
: item.type === 12
: item.type == 11
? require('../../assets/images/leveladd/pinggu.png')
: item.type == 12
? require('../../assets/images/leveladd/tou.png')
: null
: item.type == 13
? require('../../assets/images/leveladd/tou.png')
: require('../../assets/images/leveladd/xiangmu.png')
"
/>
</div>
@@ -462,7 +464,7 @@
</div>
<div class="progress">
<div class="progresstext">
{{ item.complete }}/{{ item.total }}人
{{ item.complete?item.complete:0 }}/{{ item.total?item.total:0 }}人
</div>
<div style="display: flex">
<a-progress
@@ -472,7 +474,7 @@
trailColor="rgba(253, 209, 98, 0.2)"
/>
<span class="progresstext" style="margin-left: 10px"
>{{ item.percent }}%</span
>{{ item.percent?item.percent:0 }}%</span
>
</div>
</div>
@@ -992,7 +994,7 @@
<div class="header">
<div class="icon"></div>
<span>活动管理</span>
<div class="close_exit" @click="closehuodModal"></div>
<!-- <div class="close_exit" @click="closehuodModal"></div> -->
</div>
<div class="body">
<div><img src="../../assets/images/taskpage/erweima.png" /></div>
@@ -1882,6 +1884,7 @@ export default {
const getOverview = () => {
getRouterOverview(state.routerId)
.then((res) => {
console.log(res)
Object.keys(res.data.data.routerInfoOverview).forEach((item) => {
levelList.routerInfoOverview[item] =
res.data.data.routerInfoOverview[item] || 0;
@@ -1894,7 +1897,7 @@ export default {
// console.log(r)
// })
state.addLoading = false;
console.log("项目概览--" + res);
console.log("项目概览--", res);
})
.catch((err) => {
state.addLoading = false;
@@ -1906,6 +1909,7 @@ export default {
const myGetRouterDetail = () => {
GetRouterDetail(state.routerId)
.then((res) => {
console.log('router-list',res)
if (res.data.data.routerInfo.status == 1) {
state.nodata = false;
}

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

@@ -124,7 +124,8 @@
<div class="inname">项目经理</div>
</div>
<div class="in">
<ProjectManager v-model:value="projectInfo.managerId" v-model:name="projectInfo.manager"></ProjectManager>
<ProjectManager v-model:value="projectInfo.managerId" v-model:name="projectInfo.manager"
mode="multiple"></ProjectManager>
</div>
</div>
<div class="name">
@@ -201,10 +202,10 @@
</div>
<div class="name">
<div class="namebox">
<img
class="nameimg"
src="../../assets/images/basicinfo/asterisk.png"
/>
<!-- <img-->
<!-- class="nameimg"-->
<!-- src="../../assets/images/basicinfo/asterisk.png"-->
<!-- />-->
<div class="inname">是否BOEU实施</div>
</div>
<div class="in">
@@ -346,6 +347,7 @@ export default {
let obj = {
pageNo: state.currentPage,
pageSize: state.pageSize,
status: 1
};
api.getTemplate(obj).then((res) => {
state.totalPages = Number(res.data.data.pages);

45
src/views/projectcenter/ProjectManage.vue
View File

@@ -47,14 +47,14 @@
showSearch
></a-select>
</div>
<!-- <div class="select">-->
<!-- <a-date-picker-->
<!-- v-model:value="searchParam.createTime"-->
<!-- type="date"-->
<!-- placeholder="创建时间"-->
<!-- style="width: 270px"-->
<!-- />-->
<!-- </div>-->
<div class="select">
<a-range-picker
v-model:value="searchParam.valueDate"
style="border-radius: 8px; height: 40px; margin-left: 5px"
:placeholder="[' 开始时间', ' 结束时间']"
valueFormat="X"
/>
</div>
<div style="display: flex; margin-bottom: 20px">
<div class="btnn btn1" @click="searchSubmit">
<div class="search"></div>
@@ -202,7 +202,8 @@
</div>
<div class="inname">项目经理:</div>
<div class="in">
<ProjectManager v-model:value="projectInfo.managerId" v-model:name="projectInfo.manager"></ProjectManager>
<ProjectManager v-model:value="projectInfo.managerId" v-model:name="projectInfo.manager"
mode="multiple"></ProjectManager>
</div>
</div>
<div class="name">
@@ -347,7 +348,8 @@
</div>
</div>
<div class="modalMain">
<router-link :to="`/projectadd?parentId=${projectInfo.parentId || ''}&parentName=${projectInfo.parentName || ''}`">
<router-link
:to="`/projectadd?parentId=${projectInfo.parentId || ''}&parentName=${projectInfo.parentName || ''}`">
<div
class="taskbox"
style="
@@ -853,7 +855,8 @@ export default {
searchParam: {
pageNo: 1,
pageSize: 10,
}
},
valueDate: []
});
// 数据接入 - start -
const router = useRouter();
@@ -876,6 +879,17 @@ export default {
getTableDate()
};
function timeChange(e) {
console.log(e)
if (e && e.length === 2) {
state.searchParam.beginTime = e[0]
state.searchParam.endTime = e[1]
} else {
state.searchParam.beginTime = ''
state.searchParam.endTime = ''
}
}
function validate(obj, errorMsgs) {
for (let i in errorMsgs) {
if (!obj[i]) {
@@ -1439,7 +1453,7 @@ export default {
className="operation3"
style="cursor: pointer"
onClick={() => {
state.projectInfo = {parentName: value.record.name, parentId: value.record.projectId,type:2};
state.projectInfo = {parentName: value.record.name, parentId: value.record.projectId, type: 2};
state.reminderModal = true;
}}
>
@@ -1514,7 +1528,11 @@ export default {
}
]);
const getTableDate = () => api.getProjectList(state.searchParam).then((res) => {
const getTableDate = () => api.getProjectList({
...state.searchParam,
beginTime: state.searchParam.valueDate && state.searchParam.valueDate.length === 2 ? state.searchParam.valueDate[0] : '',
endTime: state.searchParam.valueDate && state.searchParam.valueDate.length === 2 ? state.searchParam.valueDate[1] : ''
}).then((res) => {
console.log(res);
state.tableDataTotal = Number(res.data.data.total);
const data = res.data.data.rows;
@@ -1626,6 +1644,7 @@ export default {
)
return {
...toRefs(state),
timeChange,
expandTable,
showModal,
closeModal,

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

@@ -383,31 +383,33 @@
>
<img
:src="
item.type == '1'
item.type == 1
? require('../../assets/images/leveladd/zai.png')
: item.type == '2'
: item.type == 2
? require('../../assets/images/leveladd/mian.png')
: item.type == '3'
: item.type == 3
? require('../../assets/images/leveladd/an.png')
: item.type == '4'
: item.type == 4
? require('../../assets/images/leveladd/zuo.png')
: item.type == '5'
: item.type == 5
? require('../../assets/images/leveladd/kao.png')
: item.type == '6'
: item.type == 6
? require('../../assets/images/leveladd/zhi.png')
: item.type == '7'
: item.type == 7
? require('../../assets/images/leveladd/wai.png')
: item.type == '8'
: item.type == 8
? require('../../assets/images/leveladd/tao.png')
: item.type == '9'
: item.type == 9
? require('../../assets/images/leveladd/huo.png')
: item.type == '10'
: item.type == 10
? require('../../assets/images/leveladd/ce.png')
: item.type == '11'
? require('../../assets/images/leveladd/diao.png')
: item.type == '12'
: item.type == 11
? require('../../assets/images/leveladd/pinggu.png')
: item.type == 12
? require('../../assets/images/leveladd/tou.png')
: null
: item.type == 13
? require('../../assets/images/leveladd/tou.png')
: require('../../assets/images/leveladd/xiangmu.png')
"
/>
</div>
@@ -427,11 +429,11 @@
</div>
<div class="time">
<div class="timetext">开始时间</div>
<div class="timetext">{{ item.createTime }}</div>
<div class="timetext">{{item.createTime?toDate(Number(item.createTime),"Y-M-D"):'---'}}</div>
</div>
<div class="progress">
<div class="progresstext">
{{ item.finishStuCnt }}/{{ item.totalStuCnt }}人
{{ item.finishStuCnt&&item.finishStuCnt!==null?item.finishStuCnt:0 }}/{{ item.totalStuCnt&&item.totalStuCnt!==null?item.totalStuCnt:0 }}人
</div>
<div style="display: flex">
<a-progress
@@ -442,7 +444,7 @@
/>
<span class="progresstext" style="margin-left: 10px"
>{{
(item.finishStuCnt / item.totalStuCnt) * 100
(item.finishStuCnt&&item.finishStuCnt!==null?item.finishStuCnt:0 / item.totalStuCnt&&item.totalStuCnt!==null?item.totalStuCnt:0) * 100
}}%</span
>
</div>
@@ -3248,8 +3250,10 @@ export default {
}).then((res) => {
console.log("get task", res.data.data);
let info = res.data.data.projectInfo;
let start = toDate(info.beginTime / 1000, "Y-M-D h:m");
let end = toDate(info.endTime / 1000, "Y-M-D h:m");
// let start = toDate(info.beginTime / 1000, "Y-M-D h:m");
let start = info.beginTime
// let end = toDate(info.endTime / 1000, "Y-M-D h:m");
let end = info.endTime
state.tstartTime = info.beginTime;
state.tendTime = info.endTime;
state.tsourceBelong = info.sourceBelongId;
@@ -3823,6 +3827,7 @@ export default {
templateProject,
changeGrouped,
deFile,
toDate
};
},
};

4
vue.config.js
View File

@@ -15,7 +15,11 @@ module.exports = defineConfig({
proxy: {
"/manageApi": {
target:"http://111.231.196.214:30001/",
<<<<<<< HEAD
//target: "http://localhost:30001/", //这里后台的地址模拟的;应该填写你们真实的后台接口
=======
// target: "http://localhost:30001/", //这里后台的地址模拟的;应该填写你们真实的后台接口
>>>>>>> 44e0ecf40abb960193bb4add3c7c2da6f54dd899
changeOrigin: true, //表示是否改变原域名
// secure: false,
// ws: false, //表示WebSocket协议