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

Merge remote-tracking branch 'origin/manage-release' into release

Browse Source
This commit is contained in:
yujicun
2022-12-27 09:44:55 +08:00
parent 285557fa67 b520166f80
commit 1be5d405e4
17 changed files with 6982 additions and 6895 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/api/indexProjStu.js
View File

@@ -29,6 +29,7 @@ export const studentProcess = (obj) => http.get('/admin/project/studentProcess',
//是否优秀学员 //是否优秀学员
export const topStudent = (obj) => http.post('/admin/project/topStudent', obj) export const topStudent = (obj) => http.post('/admin/project/topStudent', obj)
export const updateStudent = (obj) => http.post('/admin/student/updateStudent', obj)
//项目概览 //项目概览
export const overview = (obj) => http.get('/admin/project/overview', { params: obj }) export const overview = (obj) => http.get('/admin/project/overview', { params: obj })

2
src/components/drawers/AddHomework.vue
View File

@@ -264,7 +264,7 @@ export default {
workEnclosureAddress: state.attach workEnclosureAddress: state.attach
? state.attach ? state.attach
: "", : "",
workId: props.edit ? props.EditWorkId : 0, workId: props.EditWorkId >0 ? props.EditWorkId:0 ,
workName: state.name, workName: state.name,
workRequirement: state.workRequirement, workRequirement: state.workRequirement,
}; };

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

@@ -540,8 +540,10 @@ export default {
//考试推送 //考试推送
state.test.targetId = 0; state.test.targetId = 0;
state.test.type = 0; state.test.type = 0;
if (props.isLevel == 1) { state.test.chapterId=0;
if(props.isLevel == 1){
state.test.targetId = props.routerId; state.test.targetId = props.routerId;
state.test.chapterId = props.isactive;
state.test.type = 2; state.test.type = 2;
} else if (props.isLevel == 2) { } else if (props.isLevel == 2) {

2
src/components/drawers/ProjectAudit.vue
View File

@@ -39,7 +39,7 @@
<div class="set_content"> <div class="set_content">
<div class="setc_name"><span>资源归属：</span></div> <div class="setc_name"><span>资源归属：</span></div>
<div class="setc_main"> <div class="setc_main">
<span style="color: #999999">{{ projectInfo.sourceBelongName }}</span> <span style="color: #999999">{{ (projectInfo.sourceBelongFullName || '')+projectInfo.sourceBelongName }}</span>
</div> </div>
</div> </div>
<div class="set_content"> <div class="set_content">

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

@@ -15,7 +15,8 @@
@click="closeDrawer" @click="closeDrawer"
/> />
</div> </div>
<div class="main"> <a-spin v-if="loading" :spinning="loading"/>
<div v-if="!loading" class="main">
<div class="stuinfor"> <div class="stuinfor">
<div class="portrait"> <div class="portrait">
<img src="../../assets/images/studentimg/character.png" /> <img src="../../assets/images/studentimg/character.png" />
@@ -176,6 +177,7 @@ export default {
}, },
setup(props, ctx) { setup(props, ctx) {
const state = reactive({ const state = reactive({
loading:false,
userName: null, //用户名 userName: null, //用户名
deptName: null, //部门 deptName: null, //部门
jobName: null, //岗位 jobName: null, //岗位
@@ -302,11 +304,13 @@ export default {
state.stageList = array; state.stageList = array;
}; };
const check = () => { const check = () => {
state.loading = true
let obj = { let obj = {
projectId: 37, projectId: props.projectId,
studentId: 3, studentId: props.checkStuId,
}; };
studentProcess(obj).then((res) => { studentProcess(obj).then((res) => {
state.loading = false
console.log("查看了学员", res.data.data); console.log("查看了学员", res.data.data);
let result = res.data.data; let result = res.data.data;
state.userName = result.userInfoBo.userName; state.userName = result.userInfoBo.userName;

4
src/components/project/OrgClass.vue
View File

@@ -43,9 +43,9 @@ const id = computed(() => {
return props.value return props.value
}) })
function change(key, obj) { function change(key, obj, {triggerNode: {props: {namePath}}}) {
console.log(obj[0], key, props.value);
emit('update:name', obj[0]) emit('update:name', obj[0])
emit('update:fullName', namePath)
emit('update:value', key) emit('update:value', key)
} }

2
src/components/project/ProjectManagerNew.vue
View File

@@ -107,7 +107,7 @@ function change(e, l) {
memberParam.value.page = 1 memberParam.value.page = 1
isOpen.value = false isOpen.value = false
Array.isArray(l) && (selectOptions.value = l) Array.isArray(l) && (selectOptions.value = l)
Array.isArray(selectOptions.value) && emit('onChange', e, l, selectOptions.value.find(e => e.departId)?.departId, selectOptions.value.find(e => e.departId)?.departName) Array.isArray(selectOptions.value) && emit('onChange', e, l, selectOptions.value.find(e => e.departId)?.departId, selectOptions.value.find(e => e.departId)?.departName, selectOptions.value.find(e => e.departId)?.orgName)
if (Array.isArray(l)) { if (Array.isArray(l)) {
emit('update:name', l.map(t => t.label).join(',')) emit('update:name', l.map(t => t.label).join(','))
emit('update:value', l.map(t => t.value).join(',')) emit('update:value', l.map(t => t.value).join(','))

133
src/components/student/TableStudent.vue
View File

@@ -3,13 +3,13 @@
<a-row type="flex" gutter="12" style="padding-left: 20px; margin-right: 0px"> <a-row type="flex" gutter="12" style="padding-left: 20px; margin-right: 0px">
<a-col> <a-col>
<a-form-item title="姓名："> <a-form-item title="姓名：">
<a-input class="cus-input" v-model:value="tableParam.studentName" placeholder="请输入姓名" /> <a-input class="cus-input" v-model:value="tableParam.studentName" placeholder="请输入姓名"/>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col> <a-col>
<a-button class="cus-btn" style="width: 100px" @click="getStuList"> <a-button class="cus-btn" style="width: 100px" @click="getStuList">
<template #icon> <template #icon>
<img style="margin-right: 10px" src="../../assets/images/courseManage/search0.png" /></template> <img style="margin-right: 10px" src="../../assets/images/courseManage/search0.png"/></template>
搜索 搜索
</a-button> </a-button>
</a-col> </a-col>
@@ -24,14 +24,14 @@
<CommonStudent :type="type" :id="id" @finash="submitCall" :stage="stage"> <CommonStudent :type="type" :id="id" @finash="submitCall" :stage="stage">
<a-button class="cus-btn"> <a-button class="cus-btn">
<template #icon><img style="margin-right: 10px" <template #icon><img style="margin-right: 10px"
src="../../assets/images/courseManage/add0.png" /></template> src="../../assets/images/courseManage/add0.png"/></template>
添加学员 添加学员
</a-button> </a-button>
</CommonStudent> </CommonStudent>
</a-col> </a-col>
<a-col :span="1.5"> <a-col :span="1.5">
<a-button class="cus-btn white" @click="bathDel"> <a-button class="cus-btn white" @click="bathDel">
<template #icon><img style="margin-right: 10px" src="../../assets/images/projectadd/delete.png" /></template> <template #icon><img style="margin-right: 10px" src="../../assets/images/projectadd/delete.png"/></template>
批量删除 批量删除
</a-button> </a-button>
</a-col> </a-col>
@@ -46,7 +46,7 @@
<a-table :columns="tablecolumns" :data-source="tableData.list" :pagination="stuPagination" <a-table :columns="tablecolumns" :data-source="tableData.list" :pagination="stuPagination"
:loading="tableData.loading" row-key="id" :row-selection="stuRowSelection"> :loading="tableData.loading" row-key="id" :row-selection="stuRowSelection">
<template #action="{ record }"> <template #action="{ record }">
<div style="display:flex;justify-content: center;align-items: center;"> <!-- <div style="display:flex;justify-content: center;align-items: center;">-->
<!-- <div v-if="props.type == 1" @click="excellentStudent(record)" <!-- <div v-if="props.type == 1" @click="excellentStudent(record)"
style="color: #4ea6ff; font-size: 14px; text-align: center;margin-left: 20px;cursor: pointer;"> style="color: #4ea6ff; font-size: 14px; text-align: center;margin-left: 20px;cursor: pointer;">
优秀学员 优秀学员
@@ -61,36 +61,24 @@
style="color: #4ea6ff; font-size: 14px; text-align: center;margin-left: 20px;cursor: pointer;"> style="color: #4ea6ff; font-size: 14px; text-align: center;margin-left: 20px;cursor: pointer;">
调整 调整
</div> --> </div> -->
<!-- </div>-->
<div @click="del(record.id)" <a-row gutter="12">
style="color: #4ea6ff; font-size: 14px; text-align: center;margin-left: 20px;cursor: pointer;">
删除
</div>
</div>
<!-- <a-row gutter="12">
<a-col> <a-col>
<slot name="extension" v-bind:data="{ record }"></slot> <slot name="extension" v-bind:data="{ record }"></slot>
</a-col> </a-col>
<a-col> <a-col>
<a-select style="width: 80px" value="更多"> <div @click="del(record.id)"
<a-select-option value="删除" label="删除"> style="color: #4ea6ff; font-size: 14px; text-align: center;margin-left: 20px;cursor: pointer;">
<div @click="del(record.id)">删除</div>
</a-select-option>
</a-select>
<div
@click="del(record.id)"
style="color: #4ea6ff; font-size: 14px; text-align: center"
>
删除 删除
</div> </div>
</a-col> </a-col>
</a-row> --> </a-row>
</template> </template>
</a-table> </a-table>
</div> </div>
</div> </div>
<!-- 批量调整关卡弹窗 --> <!-- 批量调整关卡弹窗 -->
<ChangeLevelModal v-model:visiblene="visiblene" :stage="stage" :ids="stuSelectKeys" @finash="submitCall" /> <ChangeLevelModal v-model:visiblene="visiblene" :stage="stage" :ids="stuSelectKeys" @finash="submitCall"/>
<!-- 批量调整关卡弹窗 --> <!-- 批量调整关卡弹窗 -->
<!-- 取消学员弹窗 --> <!-- 取消学员弹窗 -->
<div> <div>
@@ -145,16 +133,17 @@
</a-modal> </a-modal>
</div> </div>
<!-- 查看学员 传入查看学员的id--> <!-- 查看学员 传入查看学员的id-->
<see-stu v-model:Seevisible="Seevisible" v-model:checkStuId="checkStuId" v-model:projectId="projectId" /> <see-stu v-model:Seevisible="Seevisible" v-model:checkStuId="checkStuId" v-model:projectId="projectId"/>
</template> </template>
<script setup> <script setup>
import { computed, defineProps, onMounted, ref, watch } from "vue"; import {computed, defineProps, onMounted, ref, watch} from "vue";
import { delStudentList, getStuPage } from "@/api/index1"; import {delStudentList, getStuPage} from "@/api/index1";
import CommonStudent from "@/components/student/CommonStudent"; import CommonStudent from "@/components/student/CommonStudent";
import ChangeLevelModal from "./ChangeLevelModal.vue"; import ChangeLevelModal from "./ChangeLevelModal.vue";
import { message } from "ant-design-vue"; import {message} from "ant-design-vue";
// import { topStudent } from "../../api/indexProjStu"; // import { topStudent } from "../../api/indexProjStu";
import SeeStu from "../../components/drawers/SeeStu"; import SeeStu from "../../components/drawers/SeeStu";
const props = defineProps({ const props = defineProps({
type: Number, type: Number,
id: String, id: String,
@@ -179,6 +168,21 @@ const tablecolumns = ref([
width: "8%", width: "8%",
align: "left", align: "left",
className: "h", className: "h",
customRender: ({record: {studentName, topFlag}}) => (topFlag ? <div
style={{
display: "flex",
alignItems: "center",
}}
>
<span className="stydentName">{studentName}</span>
<div className="studentExcellent">
<img
className="studentExcellentImg"
src={require("../../assets/images/taskpage/excellent.png")}
/>
<span className="studentExcellentT">优秀</span>
</div>
</div> : <div>{studentName}</div>)
}, },
{ {
title: "工号", title: "工号",
@@ -204,8 +208,8 @@ const tablecolumns = ref([
key: "source", key: "source",
width: 100, width: 100,
align: "center", align: "center",
customRender: ({ record: { source } }) => customRender: ({record: {source}}) =>
({ 1: "快速添加", 2: "组织", 3: "受众" }[source]), ({1: "快速添加", 2: "组织", 3: "受众", 4: '报名'}[source]),
}, },
...props.columns, ...props.columns,
{ {
@@ -214,7 +218,7 @@ const tablecolumns = ref([
key: "operation", key: "operation",
width: "20%", width: "20%",
align: "center", align: "center",
slots: { customRender: "action" }, slots: {customRender: "action"},
}, },
]); ]);
const tableParam = ref({ const tableParam = ref({
@@ -344,6 +348,7 @@ const canclestu1 = ref(false)
function cancelyou() { function cancelyou() {
canclestu.value = false; canclestu.value = false;
} }
// 优秀学员-设置优秀学员 // 优秀学员-设置优秀学员
function closeModal1() { function closeModal1() {
canclestu.value = false; canclestu.value = false;
@@ -356,6 +361,7 @@ function closeModal1() {
function cancelcanyou() { function cancelcanyou() {
canclestu1.value = false; canclestu1.value = false;
} }
// 取消优秀学员-取消优秀学员 // 取消优秀学员-取消优秀学员
function closeModal3() { function closeModal3() {
canclestu1.value = false; canclestu1.value = false;
@@ -381,7 +387,37 @@ const projectId = ref(null)
// } // }
</script> </script>
<style> <style lang="scss">
.stydentName {
overflow: hidden;
text-overflow: ellipsis;
}
.studentExcellent {
width: 64px;
height: 24px;
border-radius: 2px;
border: 1px solid #ffb64e;
background-color: rgba(255, 182, 78, 0.1);
margin-left: 24px;
display: flex;
align-items: center;
.studentExcellentImg {
width: 16px;
height: 16px;
margin-left: 7px;
}
.studentExcellentT {
font-size: 12px;
font-weight: 400;
color: #ffb64e;
line-height: 17px;
margin-left: 3px;
}
}
.studentopea1 { .studentopea1 {
font-size: 14px; font-size: 14px;
font-weight: 400; font-weight: 400;
@@ -423,7 +459,7 @@ const projectId = ref(null)
background: linear-gradient(rgba(78, 166, 255, 0.2) 0%, rgba(78, 166, 255, 0) 100%); background: linear-gradient(rgba(78, 166, 255, 0.2) 0%, rgba(78, 166, 255, 0) 100%);
} }
/* .delete { /*.delete {
z-index: 9999; z-index: 9999;
width: 424px; width: 424px;
background: #ffffff; background: #ffffff;
@@ -448,7 +484,7 @@ const projectId = ref(null)
position: relative; position: relative;
} }
.del_main>.header { .del_main > .header {
display: flex; display: flex;
align-items: center; align-items: center;
padding-top: 20px; padding-top: 20px;
@@ -535,7 +571,7 @@ const projectId = ref(null)
top: 105px !important; top: 105px !important;
} }
.ant-modal-body>.delete { .ant-modal-body > .delete {
z-index: 999; z-index: 999;
width: 424px; width: 424px;
height: 258px; height: 258px;
@@ -546,7 +582,7 @@ const projectId = ref(null)
} }
.ant-modal-body>.del_header { .ant-modal-body > .del_header {
position: absolute; position: absolute;
width: calc(100%); width: calc(100%);
height: 68px; height: 68px;
@@ -554,12 +590,12 @@ const projectId = ref(null)
rgba(78, 166, 255, 0) 100%); rgba(78, 166, 255, 0) 100%);
} }
.ant-modal-body>.del_main { .ant-modal-body > .del_main {
width: 100%; width: 100%;
position: relative; position: relative;
} }
.ant-modal-body>.del_main>.header { .ant-modal-body > .del_main > .header {
display: flex; display: flex;
align-items: center; align-items: center;
padding-top: 20px; padding-top: 20px;
@@ -569,7 +605,7 @@ const projectId = ref(null)
} }
.ant-modal-body>.del_main>.header>.icon1 { .ant-modal-body > .del_main > .header > .icon1 {
width: 16px; width: 16px;
height: 16px; height: 16px;
margin-right: 10px; margin-right: 10px;
@@ -577,7 +613,7 @@ const projectId = ref(null)
background-size: 100% 100%; background-size: 100% 100%;
} }
.ant-modal-body>.del_main>.header>.close_exit { .ant-modal-body > .del_main > .header > .close_exit {
position: absolute; position: absolute;
right: 42px; right: 42px;
cursor: pointer; cursor: pointer;
@@ -587,7 +623,7 @@ const projectId = ref(null)
background-size: 100% 100%; background-size: 100% 100%;
} }
.ant-modal-body>.del_main>.body { .ant-modal-body > .del_main > .body {
width: 100%; width: 100%;
margin: 34px auto 56px auto; margin: 34px auto 56px auto;
display: flex; display: flex;
@@ -599,7 +635,7 @@ const projectId = ref(null)
} }
.ant-modal-body>.del_main>.body>.back { .ant-modal-body > .del_main > .body > .back {
position: absolute; position: absolute;
top: 30px; top: 30px;
font-size: 12px; font-size: 12px;
@@ -607,13 +643,13 @@ const projectId = ref(null)
color: #666666; color: #666666;
} }
.ant-modal-body>.del_main>.del_btnbox { .ant-modal-body > .del_main > .del_btnbox {
display: flex; display: flex;
margin: 30px auto; margin: 30px auto;
justify-content: center; justify-content: center;
} }
.ant-modal-body>.del_main>.del_btnbox>.del_btn { .ant-modal-body > .del_main > .del_btnbox > .del_btn {
width: 100px; width: 100px;
height: 40px; height: 40px;
background: rgba(64, 158, 255, 0); background: rgba(64, 158, 255, 0);
@@ -625,25 +661,26 @@ const projectId = ref(null)
cursor: pointer; cursor: pointer;
} }
.ant-modal-body>.del_main>.del_btnbox>.del_btn>.btnText { .ant-modal-body > .del_main > .del_btnbox > .del_btn > .btnText {
font-size: 14px; font-size: 14px;
font-weight: 400; font-weight: 400;
line-height: 40px; line-height: 40px;
} }
.ant-modal-body>.del_main>.del_btnbox>.btn1 { .ant-modal-body > .del_main > .del_btnbox > .btn1 {
border: 1px solid rgba(64, 158, 255, 1); border: 1px solid rgba(64, 158, 255, 1);
color: #4ea6ff; color: #4ea6ff;
margin-right: 14px; margin-right: 14px;
} }
.ant-modal-body>.del_main>.del_btnbox>.btn2 { .ant-modal-body > .del_main > .del_btnbox > .btn2 {
background-color: #4ea6ff; background-color: #4ea6ff;
color: #ffffff; color: #ffffff;
} }
.canclestu>.ant-modal { .canclestu > .ant-modal {
width: 424px !important; width: 424px !important;
height: 258px !important; height: 258px !important;
} */ }
*/
</style> </style>

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

@@ -7,14 +7,15 @@
<div class="filterItems"> <div class="filterItems">
<div class="pathnameInp"> <div class="pathnameInp">
<a-input v-model:value="createName" style="width: 200px; height: 40px; border-radius: 8px" <a-input v-model:value="createName" style="width: 200px; height: 40px; border-radius: 8px"
placeholder="请输入创建人" /> placeholder="请输入创建人"/>
</div> </div>
<div class="pathnameInp"> <div class="pathnameInp">
<a-input v-model:value="name" style="width: 200px; height: 40px; border-radius: 8px" placeholder="请输入名称" /> <a-input v-model:value="name" style="width: 200px; height: 40px; border-radius: 8px"
placeholder="请输入名称"/>
</div> </div>
<div class="pathnameInp"> <div class="pathnameInp">
<a-input v-model:value="projectName" style="width: 200px; height: 40px; border-radius: 8px" <a-input v-model:value="projectName" style="width: 200px; height: 40px; border-radius: 8px"
placeholder="请输入所属项目" /> placeholder="请输入所属项目"/>
</div> </div>
<div class="select"> <div class="select">
<a-select v-model:value="auditStatus" dropdownClassName="dropdown-style" style="width: 200px" <a-select v-model:value="auditStatus" dropdownClassName="dropdown-style" style="width: 200px"
@@ -36,7 +37,8 @@
return triggerNode.parentNode || document.body; return triggerNode.parentNode || document.body;
} }
" v-model:value="categoryId" show-search style="width: 200px" " v-model:value="categoryId" show-search style="width: 200px"
:dropdown-style="{ maxHeight: '400px', overflow: 'auto' }" placeholder="请选择内容分类" allow-clear :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }" placeholder="请选择内容分类"
allow-clear
tree-default-expand-all :tree-data="options2222"> tree-default-expand-all :tree-data="options2222">
<template #title="{ value: val, title }"> <template #title="{ value: val, title }">
<b v-if="val === '11111'" style="color: #08c">sss</b> <b v-if="val === '11111'" style="color: #08c">sss</b>
@@ -48,7 +50,7 @@
<div class="select addTimeBox"> <div class="select addTimeBox">
<div class="addTime">创建时间：</div> <div class="addTime">创建时间：</div>
<a-range-picker v-model:value="projectTime" style="width: 420px" format="YYYY-MM-DD" separator="至" <a-range-picker v-model:value="projectTime" style="width: 420px" format="YYYY-MM-DD" separator="至"
:placeholder="[' 开始时间', ' 结束时间']" /> :placeholder="[' 开始时间', ' 结束时间']"/>
</div> </div>
</div> </div>
<div style="display: flex; margin-bottom: 20px"> <div style="display: flex; margin-bottom: 20px">
@@ -92,12 +94,13 @@
<div class="ofmb_items"> <div class="ofmb_items">
<div class="signbox"> <div class="signbox">
<div class="sign"> <div class="sign">
<img src="@/assets/images/coursewareManage/asterisk.png" alt="" /> <img src="@/assets/images/coursewareManage/asterisk.png" alt=""/>
</div> </div>
<span style="margin-right: 3px">课程名称：</span> <span style="margin-right: 3px">课程名称：</span>
</div> </div>
<div class="in b_input"> <div class="in b_input">
<NameInput placeholder="请输入课程名称" v-model:value="xzinputV1" v-model:validate="validate" :maxlength="20" <NameInput placeholder="请输入课程名称" v-model:value="xzinputV1" v-model:validate="validate"
:maxlength="20"
show-count :type="2"></NameInput> show-count :type="2"></NameInput>
<!-- <a-input--> <!-- <a-input-->
<!-- v-model:value="xzinputV1"--> <!-- v-model:value="xzinputV1"-->
@@ -122,7 +125,7 @@
收起 收起
</span> </span>
<div class="b_icon"> <div class="b_icon">
<img src="@/assets/images/coursewareManage/up.png" alt="" /> <img src="@/assets/images/coursewareManage/up.png" alt=""/>
</div> </div>
</div> </div>
</div> </div>
@@ -132,7 +135,7 @@
展开 展开
</span> </span>
<div class="b_icon"> <div class="b_icon">
<img src="@/assets/images/coursewareManage/down.png" alt="" /> <img src="@/assets/images/coursewareManage/down.png" alt=""/>
</div> </div>
</div> </div>
</div> </div>
@@ -140,10 +143,10 @@
</div> </div>
<div class="bl_detail" :style="{ display: hideshow ? 'block' : 'none' }"> <div class="bl_detail" :style="{ display: hideshow ? 'block' : 'none' }">
<span style="color: #999ba3"> <span style="color: #999ba3">
1、课程名称统一不加书名号。<br /> 1、课程名称统一不加书名号。<br/>
2、项目名称、属地等信息如需体现在课程名称中，请放在课程名称信息 2、项目名称、属地等信息如需体现在课程名称中，请放在课程名称信息
之后，如“时间管理（GROW180项目）”或“时间管理（B*）”确保首先 之后，如“时间管理（GROW180项目）”或“时间管理（B*）”确保首先
看到的是课程内容主题。<br /> 看到的是课程内容主题。<br/>
3、同一课程如先后有多个版本，原则上仅开放最新版本，旧版本应停用 3、同一课程如先后有多个版本，原则上仅开放最新版本，旧版本应停用
版本如必须以年份标明，请以“沟通技巧（2022年）”的方式呈现。 版本如必须以年份标明，请以“沟通技巧（2022年）”的方式呈现。
</span> </span>
@@ -152,7 +155,7 @@
<div class="ofmb_items"> <div class="ofmb_items">
<div class="signbox"> <div class="signbox">
<div class="sign"> <div class="sign">
<img src="@/assets/images/coursewareManage/asterisk.png" alt="" /> <img src="@/assets/images/coursewareManage/asterisk.png" alt=""/>
</div> </div>
<span>授课形式</span> <span>授课形式</span>
@@ -187,7 +190,7 @@
<div class="ofmb_items"> <div class="ofmb_items">
<div class="signbox"> <div class="signbox">
<div class="sign"> <div class="sign">
<img src="@/assets/images/coursewareManage/asterisk.png" alt="" /> <img src="@/assets/images/coursewareManage/asterisk.png" alt=""/>
</div> </div>
<span>是否设置目录</span> <span>是否设置目录</span>
@@ -222,7 +225,7 @@
</a-modal> </a-modal>
<!-- 选择线上还是面授课弹窗 --> <!-- 选择线上还是面授课弹窗 -->
<!-- 确定新建面授课弹窗 --> <!-- 确定新建面授课弹窗 -->
<CourseModal ref="CourseModalRef" v-model:xzinputV1="xzinputV1" @visibleClose="closeOnlineCoursevisible" /> <CourseModal ref="CourseModalRef" v-model:xzinputV1="xzinputV1" @visibleClose="closeOnlineCoursevisible"/>
<!-- 查看面授课弹框 end --> <!-- 查看面授课弹框 end -->
<!-- 确定新建面授课弹窗 --> <!-- 确定新建面授课弹窗 -->
@@ -753,7 +756,7 @@
</div> </div>
<div class="pa"> <div class="pa">
<a-pagination :showSizeChanger="false" showQuickJumper="true" hideOnSinglePage="true" :pageSize="pageSize1" <a-pagination :showSizeChanger="false" showQuickJumper="true" hideOnSinglePage="true" :pageSize="pageSize1"
:current="currentPage1" :total="tableDataTotal1" class="pagination" @change="handelChangePage1" /> :current="currentPage1" :total="tableDataTotal1" class="pagination" @change="handelChangePage1"/>
</div> </div>
<!-- 表格 --> <!-- 表格 -->
<!-- 操作 在线面授课程管理 页面 --> <!-- 操作 在线面授课程管理 页面 -->
@@ -761,7 +764,7 @@
wrapClassName="modalStyle onlmanageModal" width="80%"> wrapClassName="modalStyle onlmanageModal" width="80%">
<div class="modalHeader"> <div class="modalHeader">
<div class="headerLeft"> <div class="headerLeft">
<img style="width: 17px; height: 18px; margin-right: 8px" src="@/assets/images/coursewareManage/pc.png" /> <img style="width: 17px; height: 18px; margin-right: 8px" src="@/assets/images/coursewareManage/pc.png"/>
<div :style="{ display: ft_1 ? 'none' : 'block' }"> <div :style="{ display: ft_1 ? 'none' : 'block' }">
<span class="headerLeftText">在线课程管理</span> <span class="headerLeftText">在线课程管理</span>
</div> </div>
@@ -770,7 +773,7 @@
</div> </div>
</div> </div>
<div style="margin-right: 57px; cursor: pointer"> <div style="margin-right: 57px; cursor: pointer">
<img @click="om_exit" style="width: 22px; height: 22px" src="../../assets/images/basicinfo/close22.png" /> <img @click="om_exit" style="width: 22px; height: 22px" src="../../assets/images/basicinfo/close22.png"/>
</div> </div>
</div> </div>
<div class="modalMain"> <div class="modalMain">
@@ -861,7 +864,7 @@
</div> </div>
<div class="bm_input"> <div class="bm_input">
<a-input v-model:value="gl_inputV2" style="width: 200px; height: 40px; border-radius: 8px" <a-input v-model:value="gl_inputV2" style="width: 200px; height: 40px; border-radius: 8px"
placeholder="姓名" /> placeholder="姓名"/>
</div> </div>
<div class="bm_btn"> <div class="bm_btn">
<div class="btn btn1" @click="handleSearchTable3"> <div class="btn btn1" @click="handleSearchTable3">
@@ -883,7 +886,7 @@
<div class="pa"> <div class="pa">
<a-pagination :showSizeChanger="false" showQuickJumper="true" hideOnSinglePage="true" <a-pagination :showSizeChanger="false" showQuickJumper="true" hideOnSinglePage="true"
:pageSize="pageSize222" :current="currentPage222" :total="tableDataTotal222" :pageSize="pageSize222" :current="currentPage222" :total="tableDataTotal222"
class="pagination" @change="handelChangePage222" /> class="pagination" @change="handelChangePage222"/>
</div> </div>
</div> </div>
</div> </div>
@@ -900,11 +903,11 @@
wrapClassName="modalStyle coursewareDetail" width="80%"> wrapClassName="modalStyle coursewareDetail" width="80%">
<div class="modalHeader"> <div class="modalHeader">
<div class="headerLeft"> <div class="headerLeft">
<img style="width: 17px; height: 18px; margin-right: 8px" src="@/assets/images/coursewareManage/detail.png" /> <img style="width: 17px; height: 18px; margin-right: 8px" src="@/assets/images/coursewareManage/detail.png"/>
<span class="headerLeftText">查看详情</span> <span class="headerLeftText">查看详情</span>
</div> </div>
<div style="margin-right: 57px; cursor: pointer"> <div style="margin-right: 57px; cursor: pointer">
<img @click="ftsr_exit" style="width: 22px; height: 22px" src="../../assets/images/basicinfo/close22.png" /> <img @click="ftsr_exit" style="width: 22px; height: 22px" src="../../assets/images/basicinfo/close22.png"/>
</div> </div>
</div> </div>
<div class="modalMain"> <div class="modalMain">
@@ -928,11 +931,11 @@
wrapClassName="modalStyle schtimeModal" width="80%" @cancel="stm_exit"> wrapClassName="modalStyle schtimeModal" width="80%" @cancel="stm_exit">
<div class="modalHeader"> <div class="modalHeader">
<div class="headerLeft"> <div class="headerLeft">
<img style="width: 17px; height: 18px; margin-right: 8px" src="@/assets/images/coursewareManage/scht.png" /> <img style="width: 17px; height: 18px; margin-right: 8px" src="@/assets/images/coursewareManage/scht.png"/>
<span class="headerLeftText">开课</span> <span class="headerLeftText">开课</span>
</div> </div>
<div style="margin-right: 57px; cursor: pointer"> <div style="margin-right: 57px; cursor: pointer">
<img @click="stm_exit" style="width: 22px; height: 22px" src="../../assets/images/basicinfo/close22.png" /> <img @click="stm_exit" style="width: 22px; height: 22px" src="../../assets/images/basicinfo/close22.png"/>
</div> </div>
</div> </div>
<div class="modalMain"> <div class="modalMain">
@@ -944,13 +947,13 @@
height: 40px; height: 40px;
border-radius: 8px; border-radius: 8px;
margin-right: 14px; margin-right: 14px;
" placeholder="请输入创建人" /> " placeholder="请输入创建人"/>
<a-input v-model:value="kk_inputV2" style=" <a-input v-model:value="kk_inputV2" style="
width: 270px; width: 270px;
height: 40px; height: 40px;
border-radius: 8px; border-radius: 8px;
margin-right: 14px; margin-right: 14px;
" placeholder="请输入教师名称" /> " placeholder="请输入教师名称"/>
<div class="select"> <div class="select">
<!-- <a-date-picker <!-- <a-date-picker
v-model:value="selectTime" v-model:value="selectTime"
@@ -964,7 +967,7 @@
moment('00:00', 'HH:mm'), moment('00:00', 'HH:mm'),
moment('23:59', 'HH:mm'), moment('23:59', 'HH:mm'),
], ],
}" /> }"/>
</div> </div>
<div class="btn btn1" @click="handleSearchTable"> <div class="btn btn1" @click="handleSearchTable">
<div class="search"></div> <div class="search"></div>
@@ -1068,7 +1071,7 @@
<div class="fb" style="margin-left: -20px"> <div class="fb" style="margin-left: -20px">
<div class="jc"> <div class="jc">
更多 更多
<down-outlined /> <down-outlined/>
</div> </div>
</div> </div>
</a-dropdown> </a-dropdown>
@@ -1079,8 +1082,9 @@
<div class="tableBox" style="margin-top: 50px"> <div class="tableBox" style="margin-top: 50px">
<div class="pa"> <div class="pa">
<a-pagination :showSizeChanger="false" showQuickJumper="true" hideOnSinglePage="true" <a-pagination :showSizeChanger="false" showQuickJumper="true" hideOnSinglePage="true"
:pageSize="pageSize2" :current="currentPage2" :total="tableDataTotal2" class="pagination" :pageSize="pageSize2" :current="currentPage2" :total="tableDataTotal2"
@change="handelChangePage2" /> class="pagination"
@change="handelChangePage2"/>
</div> </div>
</div> </div>
</div> </div>
@@ -1107,25 +1111,25 @@
<div class="cstm_items"> <div class="cstm_items">
<div class="signbox"> <div class="signbox">
<div class="sign"> <div class="sign">
<img src="@/assets/images/coursewareManage/asterisk.png" alt="" /> <img src="@/assets/images/coursewareManage/asterisk.png" alt=""/>
</div> </div>
<span style="margin-right: 3px">开课名称</span> <span style="margin-right: 3px">开课名称</span>
</div> </div>
<div class="b_input"> <div class="b_input">
<a-input maxlength="30" v-model:value="xjkkinputV1" style="width: 440px; height: 40px; border-radius: 8px" <a-input maxlength="30" v-model:value="xjkkinputV1" style="width: 440px; height: 40px; border-radius: 8px"
placeholder="请输入开课名称" /> placeholder="请输入开课名称"/>
</div> </div>
</div> </div>
<div class="cstm_items"> <div class="cstm_items">
<div class="signbox"> <div class="signbox">
<div class="sign"> <div class="sign">
<img src="@/assets/images/coursewareManage/asterisk.png" alt="" /> <img src="@/assets/images/coursewareManage/asterisk.png" alt=""/>
</div> </div>
<span style="margin-right: 3px">地点</span> <span style="margin-right: 3px">地点</span>
</div> </div>
<div class="b_input"> <div class="b_input">
<a-input v-model:value="xjkkinputV2" maxlength="50" style="width: 440px; height: 40px; border-radius: 8px" <a-input v-model:value="xjkkinputV2" maxlength="50" style="width: 440px; height: 40px; border-radius: 8px"
placeholder="请输入详细地点" /> placeholder="请输入详细地点"/>
<div class="inp_num" style="right: 164px"> <div class="inp_num" style="right: 164px">
<span style="color: #c7cbd2">{{ xjkkinputV2.length }}/50</span> <span style="color: #c7cbd2">{{ xjkkinputV2.length }}/50</span>
</div> </div>
@@ -1134,20 +1138,21 @@
<div class="cstm_items"> <div class="cstm_items">
<div class="signbox"> <div class="signbox">
<div class="sign"> <div class="sign">
<img src="@/assets/images/coursewareManage/asterisk.png" alt="" /> <img src="@/assets/images/coursewareManage/asterisk.png" alt=""/>
</div> </div>
<span style="margin-right: 3px">面授时间</span> <span style="margin-right: 3px">面授时间</span>
</div> </div>
<div class="select fitems"> <div class="select fitems">
<a-range-picker style="width: 440px; height: 40px; border-radius: 8px" :show-time="{ format: 'HH:mm' }" <a-range-picker style="width: 440px; height: 40px; border-radius: 8px" :show-time="{ format: 'HH:mm' }"
:disabled-date="disabledDate" :disabled-time="disabledRangeTime" format="YYYY-MM-DD HH:mm" :disabled-date="disabledDate" :disabled-time="disabledRangeTime" format="YYYY-MM-DD HH:mm"
v-model:value="xjkkinputV3" separator="至" :placeholder="[' 开始时间', ' 结束时间']" /> v-model:value="xjkkinputV3" separator="至"
:placeholder="[' 开始时间', ' 结束时间']"/>
</div> </div>
</div> </div>
<div class="cstm_items"> <div class="cstm_items">
<div class="signbox"> <div class="signbox">
<div class="sign"> <div class="sign">
<img src="@/assets/images/coursewareManage/asterisk.png" alt="" /> <img src="@/assets/images/coursewareManage/asterisk.png" alt=""/>
</div> </div>
<span style="margin-right: 3px">授课教师</span> <span style="margin-right: 3px">授课教师</span>
</div> </div>
@@ -1207,7 +1212,7 @@
</a-tag> </a-tag>
</div> </div>
<AssessmentList v-model:assessmentVisible="assessmentVisible" v-model:assessmentName="assessmentName" <AssessmentList v-model:assessmentVisible="assessmentVisible" v-model:assessmentName="assessmentName"
:assessmentId="assessmentId" @checkedAss="getCheckedAss" /> :assessmentId="assessmentId" @checkedAss="getCheckedAss"/>
</div> </div>
</div> </div>
@@ -1225,7 +1230,7 @@
</a-tag> </a-tag>
</div> </div>
<add-homework v-model:addhomeworkVisible="addhomeworkvisible" @getWork="getWork" :faceLevel="true" <add-homework v-model:addhomeworkVisible="addhomeworkvisible" @getWork="getWork" :faceLevel="true"
v-model:EditWorkId="EditWorkId" v-model:workName="workName" /> v-model:EditWorkId="EditWorkId" v-model:workName="workName"/>
</div> </div>
</div> </div>
<div class="cstm_items main_item"> <div class="cstm_items main_item">
@@ -1240,7 +1245,7 @@
</a-tag> </a-tag>
</div> </div>
<add-test v-model:addtestVisible="addtestvisible" v-model:EditTestId="EditTestId" <add-test v-model:addtestVisible="addtestvisible" v-model:EditTestId="EditTestId"
v-model:testName="testName" :faceLevel="true" /> v-model:testName="testName" :faceLevel="true"/>
</div> </div>
</div> </div>
<!-- <!--
@@ -1274,7 +1279,7 @@
</div> </div>
<div class="b_input"> <div class="b_input">
<FJUpload v-model:value="attach" @changevalue="changevalue" /> <FJUpload v-model:value="attach" @changevalue="changevalue"/>
</div> </div>
</div> </div>
@@ -1297,11 +1302,11 @@
wrapClassName="modalStyle stusmanageModal" width="80%" @cancel="sm_exit"> wrapClassName="modalStyle stusmanageModal" width="80%" @cancel="sm_exit">
<div class="modalHeader"> <div class="modalHeader">
<div class="headerLeft"> <div class="headerLeft">
<img style="width: 17px; height: 18px; margin-right: 8px" src="@/assets/images/coursewareManage/stum.png" /> <img style="width: 17px; height: 18px; margin-right: 8px" src="@/assets/images/coursewareManage/stum.png"/>
<span class="headerLeftText">学员管理</span> <span class="headerLeftText">学员管理</span>
</div> </div>
<div style="margin-right: 57px; cursor: pointer"> <div style="margin-right: 57px; cursor: pointer">
<img @click="sm_exit" style="width: 22px; height: 22px" src="../../assets/images/basicinfo/close22.png" /> <img @click="sm_exit" style="width: 22px; height: 22px" src="../../assets/images/basicinfo/close22.png"/>
</div> </div>
</div> </div>
<div class="modalMain"> <div class="modalMain">
@@ -1329,11 +1334,40 @@
</div> </div>
<div class="stmm_i5"> <div class="stmm_i5">
<TableStudent :type="3" :id="offcoursePlanId" :columns="stuColumns" :visable="sm_hs"> <TableStudent :type="3" :id="offcoursePlanId" :columns="stuColumns" :visable="sm_hs">
<!-- <template #extension = "data">--> <template #extension="{data:{record}}">
<!-- <div style="display: flex">--> <div style="display:flex">
<!-- <button @click="handlJoinStu(data)">成绩录入</button>--> <div
<!-- </div>--> v-if="record.source===4 && record.status ===1"
<!-- </template>--> @click="()=>{
record.status = 0
auditStudent(record)
}"
style="color: #4ea6ff; font-size: 14px; text-align: center;margin-left: 20px;cursor: pointer;"
>
审核通过
</div>
<div
v-if="record.source===4 && record.status ===1"
@click="()=>{
record.status = 2
auditStudent(record)
}"
style="color: #4ea6ff; font-size: 14px; text-align: center;margin-left: 20px;cursor: pointer;"
>
拒绝
</div>
<div
v-if="record.source===4 && (record.status ===0 || record.status ===2)"
@click="()=>{
record.status = 1
auditStudent(record)
}"
style="color: #4ea6ff; font-size: 14px; text-align: center;margin-left: 20px;cursor: pointer;"
>
撤回
</div>
</div>
</template>
</TableStudent> </TableStudent>
</div> </div>
<div class="tableBox" style="margin-top: 20px"> <div class="tableBox" style="margin-top: 20px">
@@ -1556,13 +1590,13 @@
<div class="rgmb_items"> <div class="rgmb_items">
<div class="items_left"> <div class="items_left">
<div class="sign"> <div class="sign">
<img src="@/assets/images/coursewareManage/asterisk.png" alt="" /> <img src="@/assets/images/coursewareManage/asterisk.png" alt=""/>
</div> </div>
<span>得分</span> <span>得分</span>
</div> </div>
<div class="rgmb_input"> <div class="rgmb_input">
<a-input v-model:value="lrcj_inputV1" maxlength="20" <a-input v-model:value="lrcj_inputV1" maxlength="20"
style="width: 440px; height: 40px; border-radius: 8px" placeholder="" /> style="width: 440px; height: 40px; border-radius: 8px" placeholder=""/>
</div> </div>
</div> </div>
</div> </div>
@@ -1593,7 +1627,7 @@
<div class="gramb_items"> <div class="gramb_items">
<div class="items_left"> <div class="items_left">
<div class="sign"> <div class="sign">
<img src="@/assets/images/coursewareManage/asterisk.png" alt="" /> <img src="@/assets/images/coursewareManage/asterisk.png" alt=""/>
</div> </div>
<span>结业</span> <span>结业</span>
</div> </div>
@@ -1666,10 +1700,10 @@
<div class="del_main"> <div class="del_main">
<div class="header"> <div class="header">
<div class="del-icons" :style="{ display: del_hs ? 'block' : 'none' }"> <div class="del-icons" :style="{ display: del_hs ? 'block' : 'none' }">
<img src="@/assets/images/coursewareManage/notice.png" alt="" /> <img src="@/assets/images/coursewareManage/notice.png" alt=""/>
</div> </div>
<div class="del-icons" :style="{ display: copy_hs || nouse_hs ? 'block' : 'none' }"> <div class="del-icons" :style="{ display: copy_hs || nouse_hs ? 'block' : 'none' }">
<img src="@/assets/images/coursewareManage/QR.png" alt="" /> <img src="@/assets/images/coursewareManage/QR.png" alt=""/>
</div> </div>
<span>提示</span> <span>提示</span>
<div class="close_exit" @click="delete_exit1"></div> <div class="close_exit" @click="delete_exit1"></div>
@@ -1700,7 +1734,7 @@
</div> </div>
</a-modal> </a-modal>
<!-- 预览弹窗 --> <!-- 预览弹窗 -->
<SeeModal :visible="lookCourseModal" :detail="faceDetailObj" @cancel="ft_exit_see" /> <SeeModal :visible="lookCourseModal" :detail="faceDetailObj" @cancel="ft_exit_see"/>
<!--删除 复制 停用弹窗 --> <!--删除 复制 停用弹窗 -->
<!-- 学员管理课程库-归属权抽屉 --> <!-- 学员管理课程库-归属权抽屉 -->
<!-- <own-power v-model:ownpowervisible="ownpowervisible" /> --> <!-- <own-power v-model:ownpowervisible="ownpowervisible" /> -->
@@ -1720,13 +1754,13 @@
/> --> /> -->
<!-- 新建在线课弹窗 --> <!-- 新建在线课弹窗 -->
<addOnlineCourse v-model:addOnlineCoursevisible="addOnlineCoursevisible" <addOnlineCourse v-model:addOnlineCoursevisible="addOnlineCoursevisible"
:closeOnlineModal="closeOnlineCoursevisible" /> :closeOnlineModal="closeOnlineCoursevisible"/>
<!-- 新建在线课弹窗 --> <!-- 新建在线课弹窗 -->
<!-- 授权名单抽屉 --> <!-- 授权名单抽屉 -->
<proj-power-list v-model:ProjPvisible="corpowerlistvisible" :selectProjectId="selectCourseId" classify="course" /> <proj-power-list v-model:ProjPvisible="corpowerlistvisible" :selectProjectId="selectCourseId" classify="course"/>
<!-- 归属权抽屉 --> <!-- 归属权抽屉 -->
<proj-owner-ship v-model:ProjOwnervisible="ownpowervisible" :selectProjectId="selectCourseId" classify="course" /> <proj-owner-ship v-model:ProjOwnervisible="ownpowervisible" :selectProjectId="selectCourseId" classify="course"/>
<!-- 查看权抽屉 --> <!-- 查看权抽屉 -->
<!-- <proj-check-ship <!-- <proj-check-ship
v-model:ProjCheckvisible="viewpowervisible" v-model:ProjCheckvisible="viewpowervisible"
@@ -1737,16 +1771,16 @@
/> --> /> -->
<!--查看权抽屉 管理权抽屉 添加学员抽屉 --> <!--查看权抽屉 管理权抽屉 添加学员抽屉 -->
<proj-check-ship v-model:ProjCheckvisible="viewpowervisible" :selectProjectId="selectCourseId" <proj-check-ship v-model:ProjCheckvisible="viewpowervisible" :selectProjectId="selectCourseId"
v-model:addAuthList="addAuthList" :authClassify="authClassify" classify="course" :type="shipType" /> v-model:addAuthList="addAuthList" :authClassify="authClassify" classify="course" :type="shipType"/>
</div> </div>
<div class="aeLoading" :style="{ display: addLoading ? 'flex' : 'none' }"> <div class="aeLoading" :style="{ display: addLoading ? 'flex' : 'none' }">
<a-spin :spinning="addLoading" tip="" /> <a-spin :spinning="addLoading" tip=""/>
</div> </div>
<!-- 二维码弹窗 --> <!-- 二维码弹窗 -->
<two-dimensional-code v-model:codevisible="codevisible" :codeInfo="codeInfo" :index="codeIndex" <two-dimensional-code v-model:codevisible="codevisible" :codeInfo="codeInfo" :index="codeIndex"
:type="codeType === 1 ? '课程二维码' : '签到二维码'" /> :type="codeType === 1 ? '课程二维码' : '签到二维码'"/>
<!-- 二维码弹窗 --> <!-- 二维码弹窗 -->
</template> </template>
<script> <script>
@@ -1763,8 +1797,8 @@ import {
} from "vue"; } from "vue";
import * as api from "../../api/indexInvist.js"; import * as api from "../../api/indexInvist.js";
import { message } from "ant-design-vue"; import {message} from "ant-design-vue";
import { useRouter, useRoute } from "vue-router"; import {useRouter, useRoute} from "vue-router";
// import StuAdd from "../../components/drawers/StuAdd"; // import StuAdd from "../../components/drawers/StuAdd";
// import OwnPower from "../../components/drawers/OwnPower.vue"; // import OwnPower from "../../components/drawers/OwnPower.vue";
// import Corpowerlist from "../../components/drawers/CorPowerlist.vue"; // import Corpowerlist from "../../components/drawers/CorPowerlist.vue";
@@ -1801,7 +1835,7 @@ import {
getdateToDate, getdateToDate,
} from "../../utils/utils"; } from "../../utils/utils";
// import { toDate } from "../../api/method.js"; // import { toDate } from "../../api/method.js";
import { fileUp } from "../../api/indexEval"; import {fileUp} from "../../api/indexEval";
import dayjs from "dayjs"; import dayjs from "dayjs";
import * as api1 from "../../api/index1"; import * as api1 from "../../api/index1";
@@ -1813,13 +1847,14 @@ import SeeModal from "./components/seeModal.vue";
import CourseModal from "./courseModal.vue"; import CourseModal from "./courseModal.vue";
import * as moment from "moment"; import * as moment from "moment";
import TwoDimensionalCode from "../../components/TwoDimensionalCode.vue"; import TwoDimensionalCode from "../../components/TwoDimensionalCode.vue";
import { codeUrl, toDate } from "../../api/method"; import {codeUrl, toDate} from "../../api/method";
import { queryWorkDetailById } from "@/api/indexWork"; import {queryWorkDetailById} from "@/api/indexWork";
import { queryExaminationDetailById } from "@/api/indexExam"; import {queryExaminationDetailById} from "@/api/indexExam";
import AddHomework from "../../components/drawers/AddHomework.vue"; import AddHomework from "../../components/drawers/AddHomework.vue";
import AddTest from "../../components/drawers/AddTest.vue"; import AddTest from "../../components/drawers/AddTest.vue";
import TableStudent from "@/components/student/TableStudent"; import TableStudent from "@/components/student/TableStudent";
import FJUpload from "@/components/common/FJUpload"; import FJUpload from "@/components/common/FJUpload";
import {updateStudent} from "@/api/indexProjStu";
//列表表格 //列表表格
const columns1 = [ const columns1 = [
// { // {
@@ -1841,7 +1876,7 @@ const columns1 = [
key: "name", key: "name",
ellipsis: true, ellipsis: true,
align: "center", align: "center",
customRender: ({ text }) => { customRender: ({text}) => {
return text ? text : "-"; return text ? text : "-";
}, },
}, },
@@ -1851,7 +1886,7 @@ const columns1 = [
dataIndex: "contentTxt", dataIndex: "contentTxt",
key: "1", key: "1",
align: "center", align: "center",
customRender: ({ text }) => { customRender: ({text}) => {
return text ? text : "-"; return text ? text : "-";
}, },
}, },
@@ -1861,7 +1896,7 @@ const columns1 = [
dataIndex: "courseform", dataIndex: "courseform",
key: "2", key: "2",
align: "center", align: "center",
customRender: ({ record }) => { customRender: ({record}) => {
switch (String(record.courseform)) { switch (String(record.courseform)) {
case "1": case "1":
return "线上"; return "线上";
@@ -1877,7 +1912,7 @@ const columns1 = [
key: "3", key: "3",
align: "center", align: "center",
ellipsis: true, ellipsis: true,
customRender: ({ text }) => { customRender: ({text}) => {
return text ? text : "-"; return text ? text : "-";
}, },
}, },
@@ -1888,7 +1923,7 @@ const columns1 = [
key: "3", key: "3",
align: "center", align: "center",
ellipsis: true, ellipsis: true,
customRender: ({ text }) => { customRender: ({text}) => {
return text ? text : "-"; return text ? text : "-";
}, },
}, },
@@ -1918,7 +1953,7 @@ const columns1 = [
dataIndex: "status", dataIndex: "status",
key: "6", key: "6",
align: "center", align: "center",
customRender: ({ record }) => { customRender: ({record}) => {
switch (String(record.status)) { switch (String(record.status)) {
case "0": case "0":
return "未提交"; return "未提交";
@@ -1937,7 +1972,7 @@ const columns1 = [
dataIndex: "ynpub", dataIndex: "ynpub",
key: "7", key: "7",
align: "center", align: "center",
customRender: ({ record }) => { customRender: ({record}) => {
switch (String(record.ynpub)) { switch (String(record.ynpub)) {
case "0": case "0":
return "未发布"; return "未发布";
@@ -1953,7 +1988,7 @@ const columns1 = [
key: "8", key: "8",
ellipsis: true, ellipsis: true,
align: "center", align: "center",
customRender: ({ text }) => { customRender: ({text}) => {
return text ? text : "-"; return text ? text : "-";
}, },
}, },
@@ -1964,7 +1999,7 @@ const columns1 = [
key: "9", key: "9",
ellipsis: true, ellipsis: true,
align: "center", align: "center",
customRender: ({ text }) => { customRender: ({text}) => {
return text ? text : "-"; return text ? text : "-";
}, },
}, },
@@ -1975,7 +2010,7 @@ const columns1 = [
dataIndex: "pubtime", dataIndex: "pubtime",
key: "10", key: "10",
align: "center", align: "center",
customRender: ({ text }) => { customRender: ({text}) => {
return text ? text : "-"; return text ? text : "-";
}, },
}, },
@@ -1985,7 +2020,7 @@ const columns1 = [
key: "either", key: "either",
dataIndex: "kkty", dataIndex: "kkty",
align: "center", align: "center",
customRender: ({ record }) => { customRender: ({record}) => {
switch (String(record.kkty)) { switch (String(record.kkty)) {
case "0": case "0":
return "停用"; return "停用";
@@ -2095,7 +2130,7 @@ const columns6 = [
width: "15%", width: "15%",
align: "center", align: "center",
ellipsis: true, ellipsis: true,
customRender: ({ text }) => { customRender: ({text}) => {
return text ? text : "-"; return text ? text : "-";
}, },
}, },
@@ -2106,7 +2141,7 @@ const columns6 = [
width: "15%", width: "15%",
align: "center", align: "center",
ellipsis: true, ellipsis: true,
customRender: ({ text }) => { customRender: ({text}) => {
return text ? text : "-"; return text ? text : "-";
}, },
}, },
@@ -2117,7 +2152,7 @@ const columns6 = [
width: "10%", width: "10%",
align: "center", align: "center",
ellipsis: true, ellipsis: true,
customRender: ({ text }) => { customRender: ({text}) => {
return text ? text : "-"; return text ? text : "-";
}, },
}, },
@@ -2129,7 +2164,7 @@ const columns6 = [
width: "12%", width: "12%",
ellipsis: true, ellipsis: true,
align: "center", align: "center",
customRender: ({ text }) => { customRender: ({text}) => {
// return text ? getdateToTime(text * 1000) : "-"; // return text ? getdateToTime(text * 1000) : "-";
return text ? text : "-"; return text ? text : "-";
}, },
@@ -2141,7 +2176,7 @@ const columns6 = [
width: "12%", width: "12%",
ellipsis: true, ellipsis: true,
align: "center", align: "center",
customRender: ({ text }) => { customRender: ({text}) => {
// return text ? getdateToTime(text * 1000) : "-"; // return text ? getdateToTime(text * 1000) : "-";
return text ? text : "-"; return text ? text : "-";
}, },
@@ -2153,7 +2188,7 @@ const columns6 = [
width: "10%", width: "10%",
align: "center", align: "center",
ellipsis: true, ellipsis: true,
customRender: ({ text }) => { customRender: ({text}) => {
return text ? text : "-"; return text ? text : "-";
}, },
}, },
@@ -2184,7 +2219,7 @@ const columns7 = [
width: 200, width: 200,
dataIndex: "name", dataIndex: "name",
key: "name", key: "name",
customRender: ({ text }) => { customRender: ({text}) => {
return text ? text : "-"; return text ? text : "-";
}, },
}, },
@@ -2194,7 +2229,7 @@ const columns7 = [
dataIndex: "number", dataIndex: "number",
key: "1", key: "1",
align: "center", align: "center",
customRender: ({ text }) => { customRender: ({text}) => {
return text ? text : "-"; return text ? text : "-";
}, },
}, },
@@ -2204,7 +2239,7 @@ const columns7 = [
dataIndex: "department", dataIndex: "department",
key: "2", key: "2",
align: "center", align: "center",
customRender: ({ text }) => { customRender: ({text}) => {
return text ? text : "-"; return text ? text : "-";
}, },
}, },
@@ -2224,7 +2259,7 @@ const columns7 = [
dataIndex: "band", dataIndex: "band",
key: "4", key: "4",
align: "center", align: "center",
customRender: ({ text }) => { customRender: ({text}) => {
return text ? text : "-"; return text ? text : "-";
}, },
}, },
@@ -2234,7 +2269,7 @@ const columns7 = [
dataIndex: "status", dataIndex: "status",
key: "5", key: "5",
align: "center", align: "center",
customRender: ({ record }) => { customRender: ({record}) => {
switch (String(record.status)) { switch (String(record.status)) {
case "0": case "0":
return "审核通过"; return "审核通过";
@@ -2251,7 +2286,7 @@ const columns7 = [
dataIndex: "join", dataIndex: "join",
key: "6", key: "6",
align: "center", align: "center",
customRender: ({ record }) => { customRender: ({record}) => {
switch (String(record.source)) { switch (String(record.source)) {
case "1": case "1":
return "手动加入"; return "手动加入";
@@ -2356,7 +2391,7 @@ export default defineComponent({
dataIndex: "status", dataIndex: "status",
key: "5", key: "5",
align: "center", align: "center",
customRender: ({ record }) => { customRender: ({record}) => {
switch (String(record.status)) { switch (String(record.status)) {
case "0": case "0":
return "审核通过"; return "审核通过";
@@ -2423,7 +2458,7 @@ export default defineComponent({
selectedRowKeys7: [], selectedRowKeys7: [],
auditDescription: "", auditDescription: "",
isEdit: 0, isEdit: 0,
member: { name: "", value: "" }, member: {name: "", value: ""},
//列表表格 //列表表格
tableData1: [ tableData1: [
// { // {
@@ -2850,7 +2885,7 @@ export default defineComponent({
const toolbarConfig = { const toolbarConfig = {
excludeKeys: ["insertVideo", "insertImage"], excludeKeys: ["insertVideo", "insertImage"],
}; };
const editorConfig = { placeholder: "请输入内容...", MENU_CONF: {} }; const editorConfig = {placeholder: "请输入内容...", MENU_CONF: {}};
editorConfig.MENU_CONF["uploadImage"] = { editorConfig.MENU_CONF["uploadImage"] = {
// 自定义上传 // 自定义上传
async customUpload(file, insertFn) { async customUpload(file, insertFn) {
@@ -3019,7 +3054,7 @@ export default defineComponent({
endTime: endTime, endTime: endTime,
beginTime: startTime, beginTime: startTime,
}); });
const { rows, total, pageNo } = res.data.data; const {rows, total, pageNo} = res.data.data;
console.log(res.data.data); console.log(res.data.data);
state.tableDataTotal1 = total; state.tableDataTotal1 = total;
for (let i = 0; i < rows.length; i++) { for (let i = 0; i < rows.length; i++) {
@@ -3397,7 +3432,7 @@ export default defineComponent({
// console.log("获取学员信息", obj); // console.log("获取学员信息", obj);
let res = await studentList(obj); let res = await studentList(obj);
console.log("获取学员列表", res); console.log("获取学员列表", res);
const { rows, total, pageNo } = res.data.data; const {rows, total, pageNo} = res.data.data;
state.tableDataTotal3 = total; state.tableDataTotal3 = total;
for (let i = 0; i < rows.length; i++) { for (let i = 0; i < rows.length; i++) {
@@ -3522,7 +3557,7 @@ export default defineComponent({
console.log("获取开obj", obj, state.selectTime); console.log("获取开obj", obj, state.selectTime);
let res = await planList(obj); let res = await planList(obj);
console.log("开课res", res); console.log("开课res", res);
const { rows, total, pageNo } = res.data.data; const {rows, total, pageNo} = res.data.data;
state.tableDataTotal222 = total; state.tableDataTotal222 = total;
for (let i = 0; i < rows.length; i++) { for (let i = 0; i < rows.length; i++) {
@@ -3860,19 +3895,19 @@ export default defineComponent({
if (item.evaluateId) { if (item.evaluateId) {
api api
.queryAppraiseDetailById({ assessmentId: item.evaluateId }) .queryAppraiseDetailById({assessmentId: item.evaluateId})
.then((res) => { .then((res) => {
state.assessmentName = res.data.data.assessmentName; state.assessmentName = res.data.data.assessmentName;
}) })
.catch(); .catch();
} }
if (item.homeWorkId) { if (item.homeWorkId) {
queryWorkDetailById({ workId: item.homeWorkId }).then((res) => { queryWorkDetailById({workId: item.homeWorkId}).then((res) => {
state.workName = res.data.data.workName; state.workName = res.data.data.workName;
}); });
} }
if (item.testId) { if (item.testId) {
queryExaminationDetailById({ examinationId: item.testId }).then( queryExaminationDetailById({examinationId: item.testId}).then(
(res) => { (res) => {
state.testName = res.data.data.examinationName; state.testName = res.data.data.examinationName;
} }
@@ -3919,7 +3954,7 @@ export default defineComponent({
state.xjkkradioV1 = ""; state.xjkkradioV1 = "";
} }
*/ */
state.member = { value: item.teacherId, name: item.teacher }; state.member = {value: item.teacherId, name: item.teacher};
state.cstm_hs = true; state.cstm_hs = true;
state.kk_eidt = true; state.kk_eidt = true;
@@ -4277,7 +4312,7 @@ export default defineComponent({
.catch((err) => { .catch((err) => {
console.log("获取授课教师失败", err); console.log("获取授课教师失败", err);
}); });
const { rows, total } = item1; const {rows, total} = item1;
state.tableDataTotalTea1 = total; state.tableDataTotalTea1 = total;
state.tableDataTotalTea2 = total; state.tableDataTotalTea2 = total;
let newArr = []; let newArr = [];
@@ -4741,11 +4776,14 @@ export default defineComponent({
disabledSeconds: () => [55, 56], disabledSeconds: () => [55, 56],
}; };
}; };
function auditStudent(record){
updateStudent(record)
}
return { return {
...toRefs(state), ...toRefs(state),
CourseModalRef, CourseModalRef,
auditStudent,
getdateToDateFn, getdateToDateFn,
moment, moment,
disabledDate, disabledDate,
@@ -5112,7 +5150,7 @@ export default defineComponent({
text-align: center !important; text-align: center !important;
} }
.ant-table-tbody>tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected)>td { .ant-table-tbody > tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected) > td {
background: #f6f9fd; background: #f6f9fd;
} }
@@ -6704,7 +6742,7 @@ export default defineComponent({
text-align: center !important; text-align: center !important;
} }
.ant-table-tbody>tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected)>td { .ant-table-tbody > tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected) > td {
background: #f6f9fd; background: #f6f9fd;
} }
@@ -7013,7 +7051,7 @@ export default defineComponent({
padding-left: 60px !important; padding-left: 60px !important;
} }
.ant-table-thead>tr>th { .ant-table-thead > tr > th {
background-color: #eff4fc !important; background-color: #eff4fc !important;
} }
@@ -7021,7 +7059,7 @@ export default defineComponent({
background-color: #eff4fc !important; background-color: #eff4fc !important;
} }
.ant-table-tbody>tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected)>td { .ant-table-tbody > tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected) > td {
background: #f6f9fd; background: #f6f9fd;
} }
@@ -7110,8 +7148,6 @@ export default defineComponent({
justify-content: space-between; justify-content: space-between;
} }
.stmm_i6 { .stmm_i6 {
@@ -7134,7 +7170,7 @@ export default defineComponent({
padding-left: 60px !important; padding-left: 60px !important;
} }
.ant-table-thead>tr>th { .ant-table-thead > tr > th {
font-size: 14px; font-size: 14px;
font-weight: 400; font-weight: 400;
color: #999ba3; color: #999ba3;
@@ -7147,7 +7183,7 @@ export default defineComponent({
background-color: #eff4fc !important; background-color: #eff4fc !important;
} }
.ant-table-tbody>tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected)>td { .ant-table-tbody > tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected) > td {
background: #f6f9fd; background: #f6f9fd;
} }
@@ -7449,7 +7485,6 @@ export default defineComponent({
} }
// .tableSelect { // .tableSelect {
// position: relative; // position: relative;
// .hoverList { // .hoverList {

8
src/views/courselibrary/components/seeModal.vue
View File

@@ -76,13 +76,13 @@
</div> </div>
</div> </div>
</div> </div>
<div class="mbl_items" v-if="detail.sceneId"> <div class="mbl_items" v-if="detail.sceneContent">
<div class="item_nam"> <div class="item_nam">
<span style="margin-right: 14px">场景：</span> <span style="margin-right: 14px">场景：</span>
</div> </div>
<div class="item_inp"> <div class="item_inp">
<div class="select i7_input"> <div class="select i7_input">
{{ filterSenceTxt(detail.sceneId) }} {{ detail.sceneContent }}
</div> </div>
</div> </div>
</div> </div>
@@ -126,7 +126,7 @@
item.indexOf('jpg') !== -1 || item.indexOf('jpg') !== -1 ||
item.indexOf('jpeg') !== -1 || item.indexOf('jpeg') !== -1 ||
item.indexOf('png') !== -1 item.indexOf('png') !== -1
" src="@/assets/images/coursewareManage/pngpic.png" /> " src="@/assets/images/coursewareManage/pngpic.png" />
<div v-else> <div v-else>
<img v-if="item.indexOf('doc') !== -1" src="@/assets/images/coursewareManage/docpic.png" /> <img v-if="item.indexOf('doc') !== -1" src="@/assets/images/coursewareManage/docpic.png" />
<div v-else> <div v-else>
@@ -166,7 +166,7 @@
item.lastIndexOf("-") item.lastIndexOf("-")
) + item.slice(item.lastIndexOf(".")) ) + item.slice(item.lastIndexOf("."))
: item : item
}} }}
</span> </span>
</div> </div>

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

@@ -157,7 +157,7 @@
(triggerNode) => { (triggerNode) => {
return triggerNode.parentNode || document.body; return triggerNode.parentNode || document.body;
} }
" @change="changeTreeSelectValue" v-model:value="fen_lei" :tree-data="options2222"> " @change="changeTreeSelectValue" v-model:value="fen_lei" :tree-data="options2222">
</a-tree-select> </a-tree-select>
</div> </div>
</div> </div>
@@ -193,24 +193,32 @@
</div> </div>
</div> </div>
<!--
<div class="mbl_items"> <div class="mbl_items">
<div class="item_nam"> <div class="item_nam">
<span style="margin-right: 14px">场景</span> <span style="margin-right: 14px">场景</span>
</div> </div>
<div class="item_inp"> <div class="item_inp">
<div class="i1_input">
<a-input v-model:value="chang_jin" maxlength="50"
style="width: 440px; height: 40px; border-radius: 8px" placeholder="请输入场景" />
<div class="inp_num">
<span style="color: #c7cbd2">
{{ chang_jin.length }}/50
</span>
</div>
</div>
</div>
<!-- <div class="item_inp">
<div class="select i7_input"> <div class="select i7_input">
<a-select :getPopupContainer=" <a-select :getPopupContainer="
(triggerNode) => { (triggerNode) => {
return triggerNode.parentNode || document.body; return triggerNode.parentNode || document.body;
} }
" v-model:value="chang_jin" dropdownClassName="dropdown-style" style="width: 440px" placeholder="请选择" " v-model:value="chang_jin" dropdownClassName="dropdown-style" style="width: 440px" placeholder="请选择"
:options="options3" allowClear showSearch /> :options="options3" allowClear showSearch />
</div> </div>
</div> -->
</div> </div>
</div>
-->
<div class="mbl_items"> <div class="mbl_items">
<div class="item_nam"> <div class="item_nam">
@@ -359,7 +367,7 @@ export default defineComponent({
fen_lei: null, fen_lei: null,
fen_lei1: null, fen_lei1: null,
feng_mian_1: null, feng_mian_1: null,
chang_jin: null, chang_jin: "",
tags_val_single: "", tags_val_single: "",
tags_val: [], tags_val: [],
qdms_inputV6: "", qdms_inputV6: "",
@@ -564,7 +572,7 @@ export default defineComponent({
state.fen_lei = null; state.fen_lei = null;
state.fen_lei1 = null; state.fen_lei1 = null;
state.feng_mian_1 = null; state.feng_mian_1 = null;
state.chang_jin = null; state.chang_jin = "";
state.tags_val_single = ""; state.tags_val_single = "";
state.tags_val = []; state.tags_val = [];
state.qdms_inputV6 = ""; state.qdms_inputV6 = "";
@@ -751,7 +759,7 @@ export default defineComponent({
targetUser: state.qdms_inputV2, targetUser: state.qdms_inputV2,
meaning: state.qdms_inputV3, meaning: state.qdms_inputV3,
categoryId: state.fen_lei, categoryId: state.fen_lei,
sceneId: state.chang_jin, sceneContent: state.chang_jin,
tips: state.tags_val ? state.tags_val.join(",") : null, tips: state.tags_val ? state.tags_val.join(",") : null,
teacherId: state.member.value, teacherId: state.member.value,
teacher: state.member.name, teacher: state.member.name,
@@ -841,7 +849,7 @@ export default defineComponent({
state.qdms_inputV3 = item.meaning; state.qdms_inputV3 = item.meaning;
state.fen_lei = String(item.categoryId); state.fen_lei = String(item.categoryId);
state.fen_lei1 = changeTreeSelectValue(String(item.categoryId)); state.fen_lei1 = changeTreeSelectValue(String(item.categoryId));
state.chang_jin = String(item.sceneId); state.chang_jin = String(item.sceneContent ? item.sceneContent : '');
state.tags_val = item.tips ? item.tips.split(",") : []; state.tags_val = item.tips ? item.tips.split(",") : [];
state.qdms_inputV6 = item.intro; state.qdms_inputV6 = item.intro;
state.member = { value: item.teacherId, name: item.teacher }; state.member = { value: item.teacherId, name: item.teacher };

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

@@ -536,7 +536,7 @@
<div class="setc_name"><span>资源归属：</span></div> <div class="setc_name"><span>资源归属：</span></div>
<div class="setc_main"> <div class="setc_main">
<span style="color: #999999">{{ <span style="color: #999999">{{
projectInfo.sourceBelongName (projectInfo.sourceBelongFullName || '') + projectInfo.sourceBelongName
}}</span> }}</span>
</div> </div>
</div> </div>

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

@@ -3,7 +3,8 @@
<div class="projectAdd"> <div class="projectAdd">
<div class="header"> <div class="header">
<span class="title" <span class="title"
>{{ projectInfo.projectId ? "编辑" : "创建" >{{
projectInfo.projectId ? "编辑" : "创建"
}}{{ ptojectType == "3" ? "班级" : "项目" }}</span }}{{ ptojectType == "3" ? "班级" : "项目" }}</span
> >
<div <div
@@ -141,6 +142,7 @@
<OrgClass <OrgClass
v-model:value="projectInfo.sourceBelongId" v-model:value="projectInfo.sourceBelongId"
v-model:name="projectInfo.sourceBelongName" v-model:name="projectInfo.sourceBelongName"
v-model:fullName="projectInfo.sourceBelongFullName"
></OrgClass> ></OrgClass>
</div> </div>
</div> </div>
@@ -272,21 +274,21 @@
</div> </div>
</template> </template>
<script> <script>
import { onMounted, reactive, toRefs, watch } from "vue"; import {onMounted, reactive, toRefs, watch} from "vue";
import { message } from "ant-design-vue"; import {message} from "ant-design-vue";
import { useRoute, useRouter } from "vue-router"; import {useRoute, useRouter} from "vue-router";
import * as api from "../../api/index"; import * as api from "../../api/index";
import { useStore } from "vuex"; import {useStore} from "vuex";
// import ProjectClass from "@/components/project/ProjectClass"; // import ProjectClass from "@/components/project/ProjectClass";
import TrainClass from "@/components/project/TrainClass"; import TrainClass from "@/components/project/TrainClass";
import OrgClass from "@/components/project/OrgClass"; import OrgClass from "@/components/project/OrgClass";
import ProjectManager from "@/components/project/ProjectManagerNew"; import ProjectManager from "@/components/project/ProjectManagerNew";
import NameInput from "@/components/project/NameInput"; import NameInput from "@/components/project/NameInput";
import ProjectLevel from "@/components/project/ProjectLevel"; import ProjectLevel from "@/components/project/ProjectLevel";
import { changeOwnership, scrollLoad } from "@/api/method"; import {changeOwnership, scrollLoad} from "@/api/method";
import { storage } from "../../api/storage"; import {storage} from "../../api/storage";
import * as api2 from "../../api/indexAudit"; import * as api2 from "../../api/indexAudit";
import { validateName } from "@/api/index1"; import {validateName} from "@/api/index1";
import dayjs from "dayjs"; import dayjs from "dayjs";
export default { export default {
@@ -304,7 +306,7 @@ export default {
const routers = useRoute(); const routers = useRoute();
const router = useRouter(); const router = useRouter();
const state = reactive({ const state = reactive({
loading:false, loading: false,
currentPage: 1, //当前页 currentPage: 1, //当前页
tableDataTotal: -1, //模版列表总数 tableDataTotal: -1, //模版列表总数
pageSize: 10, //每页10条数据 pageSize: 10, //每页10条数据
@@ -491,23 +493,25 @@ export default {
state.loading = false state.loading = false
state.projectInfo.projectId || state.projectInfo.projectId ||
changeOwnership("project", res.data.data.projectId, [ changeOwnership("project", res.data.data.projectId, [
{ id: res.data.data.createId, name: res.data.data.createName }, {id: res.data.data.createId, name: res.data.data.createName},
]); ]);
message.destroy(); message.destroy();
message.success(state.projectInfo.projectId ? "编辑成功" : "创建成功"); message.success(state.projectInfo.projectId ? "编辑成功" : "创建成功");
// router.back(); // router.back();
router.push({ router.push({
path: "/taskpage", path: "/taskpage",
query: { projectId: res.data.data.projectId }, query: {projectId: res.data.data.projectId},
}); });
storage.set("projectId", res.data.data.projectId); storage.set("projectId", res.data.data.projectId);
}); });
}; };
function managerChange(e, l, d, t) { function managerChange(e, l, d, t, orgName) {
state.projectInfo.sourceBelongId = d state.projectInfo.sourceBelongId = d
state.projectInfo.sourceBelongName = t state.projectInfo.sourceBelongName = t
state.projectInfo.sourceBelongFullName = orgName
} }
const disabledDate = (current) => { const disabledDate = (current) => {
return current && current < dayjs().startOf('day'); return current && current < dayjs().startOf('day');
}; };

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

@@ -231,6 +231,7 @@
<OrgClass <OrgClass
v-model:value="projectInfo.sourceBelongId" v-model:value="projectInfo.sourceBelongId"
v-model:name="projectInfo.sourceBelongName" v-model:name="projectInfo.sourceBelongName"
v-model:fullName="projectInfo.sourceBelongFullName"
></OrgClass> ></OrgClass>
</div> </div>
</div> </div>
@@ -1229,22 +1230,13 @@ export default {
}; };
//确认复制 //确认复制
const copyProject = () => { const copyProject = () => {
let obj = { state.tableLoading = true
api.handleProject({
projectId: state.copyProjectId, projectId: state.copyProjectId,
type: 2, type: 2,
}; }).then(() => getTableDate())
api
.handleProject(obj)
.then((res) => {
console.log("复制成功", res);
message.destroy();
message.success("复制成功"); message.success("复制成功");
state.copyModal = false; state.copyModal = false;
getTableDate();
})
.catch((err) => {
console.log("复制失败", err);
});
}; };
//打开提交审核弹窗 //打开提交审核弹窗
const showReviewModal = (projectId) => { const showReviewModal = (projectId) => {
@@ -1803,9 +1795,10 @@ export default {
} }
); );
function managerChange(e, l, d, t) { function managerChange(e, l, d, t,orgName) {
state.projectInfo.sourceBelongId = d state.projectInfo.sourceBelongId = d
state.projectInfo.sourceBelongName = t state.projectInfo.sourceBelongName = t
state.projectInfo.sourceBelongFullName = orgName
} }
return { return {

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

@@ -83,7 +83,7 @@
</div> </div>
<div class="in select"> <div class="in select">
<OrgClass v-model:value="projectInfo.sourceBelongId" v-model:name="projectInfo.sourceBelongName"></OrgClass> <OrgClass v-model:value="projectInfo.sourceBelongId" v-model:name="projectInfo.sourceBelongName" v-model:fullName="projectInfo.sourceBelongFullName"></OrgClass>
</div> </div>
</div> </div>
<div class="name"> <div class="name">
@@ -313,9 +313,10 @@ export default {
}); });
}; };
function managerChange(e, l, d, t) { function managerChange(e, l, d, t,orgName) {
state.projectInfo.sourceBelongId = d state.projectInfo.sourceBelongId = d
state.projectInfo.sourceBelongName = t state.projectInfo.sourceBelongName = t
state.projectInfo.sourceBelongFullName = orgName
} }
const disabledDate = (current) => { const disabledDate = (current) => {
return current && current < dayjs().startOf('day'); return current && current < dayjs().startOf('day');

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

@@ -700,7 +700,24 @@
:columns="stuColumns" :columns="stuColumns"
:stage="stage" :stage="stage"
:visable ="tabFlag" :visable ="tabFlag"
></TableStudent> >
<template #extension="{data:{record}}">
<div style="display:flex">
<div
@click="showStudent(record)"
style="color: #4ea6ff; font-size: 14px; text-align: center;margin-left: 20px;cursor: pointer;"
>
查看
</div>
<div
@click="settingTopFlag(record)"
style="color: #4ea6ff; font-size: 14px; text-align: center;margin-left: 20px;cursor: pointer;"
>
{{record.topFlag?'取消优秀':'优秀学员'}}
</div>
</div>
</template>
</TableStudent>
</a-tab-pane> </a-tab-pane>
</a-tabs> </a-tabs>
</div> </div>
@@ -1275,7 +1292,7 @@
:closable="close" :closable="close"
wrapClassName="canclestu" wrapClassName="canclestu"
centered="true" centered="true"
@cancel="closeModal1" @cancel="cancelyou"
> >
<div class="delete"> <div class="delete">
<div class="del_header"></div> <div class="del_header"></div>
@@ -1288,11 +1305,11 @@
<span>您是否授予此学员优秀学员称号？</span> <span>您是否授予此学员优秀学员称号？</span>
</div> </div>
<div class="del_btnbox"> <div class="del_btnbox">
<div class="del_btn btn1"> <div class="del_btn btn1" @click="cancelyou">
<div class="btnText" @click="cancelyou">取消</div> <div class="btnText">取消</div>
</div> </div>
<div class="del_btn btn2"> <div class="del_btn btn2" @click="closeModal1">
<div class="btnText" @click="closeModal1">确定</div> <div class="btnText">确定</div>
</div> </div>
</div> </div>
</div> </div>
@@ -1320,11 +1337,11 @@
<span>您是否取消此学员优学员称号？</span> <span>您是否取消此学员优学员称号？</span>
</div> </div>
<div class="del_btnbox"> <div class="del_btnbox">
<div class="del_btn btn1"> <div class="del_btn btn1" @click="cancelcanyou">
<div class="btnText" @click="cancelcanyou">取消</div> <div class="btnText">取消</div>
</div> </div>
<div class="del_btn btn2"> <div class="del_btn btn2" @click="closeModal3">
<div class="btnText" @click="closeModal3">确定</div> <div class="btnText">确定</div>
</div> </div>
</div> </div>
</div> </div>
@@ -1678,7 +1695,7 @@ import {
getGroupList, getGroupList,
deleteGroup, deleteGroup,
editGroup, editGroup,
topStudent, updateStudent,
} from "../../api/indexProjStu"; } from "../../api/indexProjStu";
import { message, Modal } from "ant-design-vue"; import { message, Modal } from "ant-design-vue";
import * as apitl from "../../api/index"; import * as apitl from "../../api/index";
@@ -1725,6 +1742,7 @@ export default {
const store = useStore(); const store = useStore();
const route = useRoute(); const route = useRoute();
const state = reactive({ const state = reactive({
editRecord:{},
tabFlag:true, tabFlag:true,
stage: [], stage: [],
stuColumns: [ stuColumns: [
@@ -2559,24 +2577,10 @@ export default {
}; };
//点击确定授予优秀学员后 //点击确定授予优秀学员后
const closeModal1 = () => { const closeModal1 = () => {
let obj = { state.editRecord.topFlag = 1
projectId: state.projectId, updateStudent(state.editRecord)
studentIds: state.changeGoods,
topFlag: 1,
};
topStudent(obj)
.then((res) => {
console.log(`优秀学员授予成功${res.data}`);
message.success("优秀学员称号授予成功");
getStu();
})
.catch((err) => {
console.log(`优秀学员授予成功${err}`);
message.warning("优秀学员称号授予失败");
});
state.changeGoods = [];
state.canclestu = false; state.canclestu = false;
message.success("优秀学员称号授予成功");
}; };
//点击取消授予优秀学员后 //点击取消授予优秀学员后
@@ -2589,24 +2593,10 @@ export default {
}; };
//点击确定取消优秀学员称号 //点击确定取消优秀学员称号
const closeModal3 = () => { const closeModal3 = () => {
let obj = { state.editRecord.topFlag = 0
projectId: state.projectId, updateStudent(state.editRecord)
studentIds: state.changeGoods,
topFlag: 0,
};
topStudent(obj)
.then((res) => {
console.log(`取消优秀学员称号成功${res}`);
message.success("优秀学员称号取消成功");
getStu();
})
.catch((err) => {
console.log(`取消优秀学员称号失败${err}`);
message.warning("优秀学员称号取消失败");
});
state.changeGoods = [];
state.canclestu1 = false; state.canclestu1 = false;
message.success("优秀学员称号取消成功");
}; };
//点击取消取消授予优秀学员后 //点击取消取消授予优秀学员后
const cancelcanyou = () => { const cancelcanyou = () => {
@@ -3390,7 +3380,7 @@ export default {
let end = info.endTime; let end = info.endTime;
state.tstartTime = info.beginTime; state.tstartTime = info.beginTime;
state.tendTime = info.endTime; state.tendTime = info.endTime;
state.tsourceBelong = info.sourceBelongName; state.tsourceBelong = (info.sourceBelongFullName || '')+info.sourceBelongName;
state.parentId = info.parentId; state.parentId = info.parentId;
state.name = info.name; state.name = info.name;
state.startTime = start; state.startTime = start;
@@ -3417,7 +3407,7 @@ export default {
// state.attach = info.attach; // state.attach = info.attach;
// state.templateId = info.templateId; // state.templateId = info.templateId;
state.sourceBelong = info.sourceBelongName; state.sourceBelong = (info.sourceBelongFullName || '')+info.sourceBelongName;
// state.fileList=info.attach.split(",") // state.fileList=info.attach.split(",")
let d = info.attach.indexOf(","); let d = info.attach.indexOf(",");
// console.log(info.attach, "xgo", info.attach.length); // console.log(info.attach, "xgo", info.attach.length);
@@ -4024,9 +4014,19 @@ export default {
}; };
state.codeInfo = obj; state.codeInfo = obj;
}; };
function settingTopFlag(record){
record.topFlag?(state.canclestu1 = true):(state.canclestu=true)
state.editRecord = record
}
function showStudent(record){
state.Seevisible = true
state.checkStuId = record.studentId
}
return { return {
...toRefs(state), ...toRefs(state),
...toRefs(levelList), ...toRefs(levelList),
showStudent,
settingTopFlag,
totask, totask,
tostudent, tostudent,
showModal, showModal,

4
src/views/projectcenter/templateAdd.vue
View File

@@ -119,6 +119,7 @@
<OrgClass <OrgClass
v-model:value="projectInfo.sourceBelongId" v-model:value="projectInfo.sourceBelongId"
v-model:name="projectInfo.sourceBelongName" v-model:name="projectInfo.sourceBelongName"
v-model:fullName="projectInfo.sourceBelongFullName"
></OrgClass> ></OrgClass>
</div> </div>
</div> </div>
@@ -296,9 +297,10 @@ const createProject = () => {
}); });
}; };
function managerChange(e, l, d, t) { function managerChange(e, l, d, t,orgName) {
projectInfo.value.valuesourceBelongId = d; projectInfo.value.valuesourceBelongId = d;
projectInfo.value.sourceBelongName = t; projectInfo.value.sourceBelongName = t;
projectInfo.value.sourceBelongFullName = orgName
} }
</script> </script>
<style lang="scss"> <style lang="scss">