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

feat:合并

Browse Source
This commit is contained in:
lixg
2022-12-05 21:57:14 +08:00
parent 5a96a57208 9d91607314
commit cdcf65754c
13 changed files with 687 additions and 496 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
package.json
View File

@@ -13,6 +13,7 @@
"ant-design-vue": "^3.2.12", "ant-design-vue": "^3.2.12",
"axios": "^1.1.3", "axios": "^1.1.3",
"core-js": "^3.8.3", "core-js": "^3.8.3",
"dayjs": "^1.11.6",
"element-plus": "^2.2.17", "element-plus": "^2.2.17",
"element-resize-detector": "^1.2.4", "element-resize-detector": "^1.2.4",
"html2canvas": "^1.4.1", "html2canvas": "^1.4.1",

10
src/api/config.js
View File

@@ -2,7 +2,7 @@
* @Author: lixg lixg@dongwu-inc.com * @Author: lixg lixg@dongwu-inc.com
* @Date: 2022-11-21 14:32:52 * @Date: 2022-11-21 14:32:52
* @LastEditors: lixg lixg@dongwu-inc.com * @LastEditors: lixg lixg@dongwu-inc.com
* @LastEditTime: 2022-12-05 17:39:23 * @LastEditTime: 2022-12-05 21:56:56
* @FilePath: /fe-manage/src/api/config.js * @FilePath: /fe-manage/src/api/config.js
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
*/ */
@@ -55,10 +55,10 @@ http.interceptors.response.use(
if (code === 0 || code === 200) { if (code === 0 || code === 200) {
return response; return response;
} else { } else {
if (code === 1000) { // if (code === 1000) {
// window.open("https://u-pre.boe.com/web/", '_self'); // window.open("https://u-pre.boe.com/web/", '_self');
// window.open("http://111.231.196.214:12013/manage/login", '_self'); // // window.open("http://111.231.196.214:12013/manage/login", '_self');
} // }
console.log("api %o", msg); console.log("api %o", msg);
} }
return response; return response;

2
src/api/indexFace.js
View File

@@ -1,7 +1,7 @@
import http from "./config"; import http from "./config";
//获取面授课开课详情 //获取面授课开课详情
export const queryFaceDetailById = (offcoursePlanId) => http.post(`http://localhost:8080/manageApi/admin/offcourse/detailPlan?offcoursePlanId=` + offcoursePlanId + ``) export const queryFaceDetailById = (offcoursePlanId) => http.post(`/admin/offcourse/detailPlan?offcoursePlanId=` + offcoursePlanId + ``)
//新建或编辑面授课开课 //新建或编辑面授课开课
export const editPlan = (obj) => http.post('/admin/offcourse/editPlan', obj) export const editPlan = (obj) => http.post('/admin/offcourse/editPlan', obj)

8
src/components/drawers/AddCase.vue
View File

@@ -216,6 +216,7 @@ export default {
state.apiTaskList = selectedRows; state.apiTaskList = selectedRows;
}; };
const handelChangePage = (page, pageSize) => { const handelChangePage = (page, pageSize) => {
state.selectedRowKeys = []
state.currentPage = page; state.currentPage = page;
state.pageSize = pageSize; state.pageSize = pageSize;
getAllCaseText(); getAllCaseText();
@@ -250,7 +251,14 @@ export default {
isTop: "", isTop: "",
}) })
.then((res) => { .then((res) => {
console.log('案例列表',res)
if (res.status === 200) { if (res.status === 200) {
state.selectedRowKeys=[0]
for(let i=0;i<res.data.data.length;i++){
if(Number(res.data.data[i].casesId) == props.EditCaseId){
state.selectedRowKeys = [i]
}
}
getTableDate(res.data.data); getTableDate(res.data.data);
} }
}) })

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

@@ -3,7 +3,7 @@
placement="right" @after-visible-change="afterVisibleChange"> placement="right" @after-visible-change="afterVisibleChange">
<div class="drawerMain"> <div class="drawerMain">
<div class="header"> <div class="header">
<div v-if="edit" class="headerTitle">编辑面授</div> <div v-if="edit" class="headerTitle">编辑面授</div>
<div v-else class="headerTitle">添加面授</div> <div v-else class="headerTitle">添加面授</div>
<img style="width: 29px; height: 29px; cursor: pointer" src="../../assets/images/basicinfo/close.png" <img style="width: 29px; height: 29px; cursor: pointer" src="../../assets/images/basicinfo/close.png"
@@ -20,7 +20,7 @@
</div> </div>
<div class="btnbox"> <div class="btnbox">
<a-input v-model:value="courseName" style="width: 384px; height: 32px" placeholder="请输入名称" <a-input v-model:value="courseName" style="width: 384px; height: 32px" placeholder="请输入名称"
:maxlength="50"/> :maxlength="50"/>
</div> </div>
</div> </div>
<div class="main_item"> <div class="main_item">
@@ -32,7 +32,7 @@
</div> </div>
<div class="btnbox"> <div class="btnbox">
<button class="xkbtn" @click="showDrawerSelFacet"> <button class="xkbtn" @click="showDrawerSelFacet">
{{ chooseCourse == null ? "选择" : "重选" }}面授课 {{ chooseCourseName ? chooseCourseName : "选择面授课" }}
</button> </button>
<div v-if="chooseCourse"> <div v-if="chooseCourse">
<a-tag closable color="processing" @close="logC"> <a-tag closable color="processing" @close="logC">
@@ -43,7 +43,8 @@
</div> </div>
<!-- 选择面授侧弹窗 --> <!-- 选择面授侧弹窗 -->
<div> <div>
<sel-facet v-model:selfacetVisible="selfacetvisible" v-model:chooseCourse="chooseCourse" v-model:chooseCourseName="chooseCourseName"/> <sel-facet v-model:selfacetVisible="selfacetvisible" v-model:chooseCourse="chooseCourse"
v-model:chooseCourseName="chooseCourseName"/>
</div> </div>
<!-- 选择面授侧弹窗 --> <!-- 选择面授侧弹窗 -->
</div> </div>
@@ -52,7 +53,8 @@
<span style="margin-right: 3px">面授说明：</span> <span style="margin-right: 3px">面授说明：</span>
</div> </div>
<div class="textarea"> <div class="textarea">
<a-textarea v-model:value="description" placeholder="请输入说明" allow-clear show-count :maxlength="200" :rows="6"/> <a-textarea v-model:value="description" placeholder="请输入说明" allow-clear show-count :maxlength="200"
:rows="6"/>
</div> </div>
</div> </div>
<div class="main_item"> <div class="main_item">
@@ -63,8 +65,8 @@
<span style="margin-right: 3px">授课教师：</span> <span style="margin-right: 3px">授课教师：</span>
</div> </div>
<div class="btnbox"> <div class="btnbox">
<!-- <a-auto-complete placeholder="选择老师" :value="memberValue.label" style="width: 364px"--> <!-- <a-auto-complete placeholder="选择老师" :value="memberValue.label" style="width: 364px"-->
<!-- :options="options" @change="handleChange2" @search="handleSearch"></a-auto-complete>--> <!-- :options="options" @change="handleChange2" @search="handleSearch"></a-auto-complete>-->
<ProjectManager v-model:value="memberValue.value" v-model:name="memberValue.label"></ProjectManager> <ProjectManager v-model:value="memberValue.value" v-model:name="memberValue.label"></ProjectManager>
</div> </div>
</div> </div>
@@ -105,7 +107,7 @@
</div> </div>
<div class="btnbox"> <div class="btnbox">
<a-input v-model:value="address" style="width: 384px; height: 32px" placeholder="请输入上课地址" <a-input v-model:value="address" style="width: 384px; height: 32px" placeholder="请输入上课地址"
:maxlength="100"/> :maxlength="100"/>
</div> </div>
</div> </div>
<div class="main_item2"> <div class="main_item2">
@@ -350,7 +352,7 @@ export default {
setup(props, ctx) { setup(props, ctx) {
const options = ref([]); const options = ref([]);
const state = reactive({ const state = reactive({
loading:false, loading: false,
selfacetvisible: false, selfacetvisible: false,
addhomeworkvisible: false, addhomeworkvisible: false,
addtestvisible: false, addtestvisible: false,
@@ -408,6 +410,7 @@ export default {
}; };
const closeDrawer = () => { const closeDrawer = () => {
ctx.emit("update:addfaceteachVisible", false); ctx.emit("update:addfaceteachVisible", false);
ctx.emit("update:edit", false);
localStorage.setItem("stageId", props.chooseStageId); localStorage.setItem("stageId", props.chooseStageId);
localStorage.setItem("chapterId", props.isactive); localStorage.setItem("chapterId", props.isactive);
state.fileList = [] state.fileList = []
@@ -533,22 +536,22 @@ export default {
offcourseId: state.chooseCourse, offcourseId: state.chooseCourse,
offcoursePlanId: props.EditFaceId > 0 ? props.EditFaceId : 0, offcoursePlanId: props.EditFaceId > 0 ? props.EditFaceId : 0,
testId: state.EditTestId, testId: state.EditTestId,
duration:state.duration, duration: state.duration,
}; };
console.log("obj============", obj, "6" + "9"); console.log("obj============", obj, "6" + "9");
console.log("222222222"); console.log("222222222");
editPlan(obj).then(async (res) => { editPlan(obj).then(async (res) => {
message.destroy(); message.destroy();
message.success(`添加成功`); message.success(`添加成功`);
await updateTask(res); await updateTask(res);
ctx.emit("changeData", false); ctx.emit("changeData", false);
closeDrawer(); closeDrawer();
}).catch((e) => { }).catch((e) => {
console.log(e) console.log(e)
message.destroy(); message.destroy();
message.error(`添加失败`); message.error(`添加失败`);
}); });
} }
}; };
@@ -796,6 +799,7 @@ export default {
display: flex; display: flex;
align-items: flex-start; align-items: flex-start;
margin-bottom: 32px; margin-bottom: 32px;
.textarea { .textarea {
width: 423px; width: 423px;
@@ -817,6 +821,7 @@ export default {
border-radius: 8px; border-radius: 8px;
} }
} }
.signbox { .signbox {
width: 120px; width: 120px;
display: flex; display: flex;

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

@@ -66,8 +66,10 @@
</div> </div>
<div class="btnbox"> <div class="btnbox">
<a-range-picker <a-range-picker
show-time
style="width: 424px" style="width: 424px"
v-model:value="time" v-model:value="time"
format="YYYY/MM/DD HH:mm"
:placeholder="[' 开始时间', ' 结束时间']" :placeholder="[' 开始时间', ' 结束时间']"
/> />
</div> </div>
@@ -492,9 +494,11 @@ export default {
console.log("获取的数据",res) console.log("获取的数据",res)
state.inputV1 = res.data.data.liveName; state.inputV1 = res.data.data.liveName;
state.time = [ state.time = [
dayjs(res.data.data.liveStartTime, "YYYY-MM-DD"), dayjs(res.data.data.liveStartTime, "YYYY-MM-DD HH:mm"),
dayjs(res.data.data.liveEndTime, "YYYY-MM-DD"), dayjs(res.data.data.liveEndTime, "YYYY-MM-DD HH:mm"),
]; ];
console.log(state.time)
state.inputV2 = res.data.data.liveDuration; state.inputV2 = res.data.data.liveDuration;
state.inputV3 = res.data.data.liveTeacherId; state.inputV3 = res.data.data.liveTeacherId;
//state.fileList= res.data.data //state.fileList= res.data.data
@@ -632,11 +636,11 @@ export default {
} }
let startTime = toDate( let startTime = toDate(
new Date(state.time[0].$d).getTime() / 1000, new Date(state.time[0].$d).getTime() / 1000,
"Y-M-D" "Y-M-D h:m"
); );
let endTime = toDate( let endTime = toDate(
new Date(state.time[1].$d).getTime() / 1000, new Date(state.time[1].$d).getTime() / 1000,
"Y-M-D" "Y-M-D h:m"
); );
state.obj = { state.obj = {
afterSignIn: state.inputV6, afterSignIn: state.inputV6,
@@ -661,6 +665,7 @@ export default {
isEvaluate: state.needEval ? "1" : "0", isEvaluate: state.needEval ? "1" : "0",
}; };
console.log('我是要更新的数据',state.obj ) console.log('我是要更新的数据',state.obj )
if (props.edit) { if (props.edit) {
api api
.updateLiveBroadcastMessage(state.obj) .updateLiveBroadcastMessage(state.obj)

25
src/components/drawers/AddOnline.vue
View File

@@ -79,24 +79,7 @@
<div class="main_table"> <div class="main_table">
<!-- 编辑的表格 --> <!-- 编辑的表格 -->
<div v-if="edit"> <div v-if="edit">
<div <div>
v-if="choicecourse"
class="main_btns"
style="justify-content: flex-start"
>
<div
class="btn2"
style="
display: flex;
justify-content: center;
align-items: center;
"
@click="ChoiceCourse"
>
选择在线课
</div>
</div>
<div v-else>
<a-table <a-table
class="ant-table-striped" class="ant-table-striped"
:row-class-name=" :row-class-name="
@@ -338,6 +321,7 @@ export default {
}; };
const handelChangePage = (page) => { const handelChangePage = (page) => {
state.currentPage = page; state.currentPage = page;
state.selectedRowKeys = []
getAllOnlineText(); getAllOnlineText();
}; };
const getTableDate = (tableData) => { const getTableDate = (tableData) => {
@@ -381,6 +365,11 @@ export default {
state.tableDataTotal = res.data.data.count; state.tableDataTotal = res.data.data.count;
if (res.status === 200) { if (res.status === 200) {
console.log("获取在线课列表数据", res); console.log("获取在线课列表数据", res);
for(let i=0;i<res.data.data.list.length;i++){
if(Number(res.data.data.list[i].onlineClassesId) == props.EditOnlineId){
state.selectedRowKeys = [i+1]
}
}
getTableDate(arr); getTableDate(arr);
} }
}) })

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

@@ -1,18 +1,18 @@
<template> <template>
<a-drawer <a-drawer
:visible="addtestVisible" :visible="addtestVisible"
class="drawerStyle addtestDrawer" class="drawerStyle addtestDrawer"
width="80%" width="80%"
placement="right" placement="right"
@after-visible-change="afterVisibleChange" @after-visible-change="afterVisibleChange"
> >
<div class="drawerMain"> <div class="drawerMain">
<div class="header"> <div class="header">
<div class="headerTitle">{{ edit ? "编辑" : "添加" }}考试</div> <div class="headerTitle">{{ edit ? "编辑" : "添加" }}考试</div>
<img <img
style="width: 29px; height: 29px; cursor: pointer" style="width: 29px; height: 29px; cursor: pointer"
src="../../assets/images/basicinfo/close.png" src="../../assets/images/basicinfo/close.png"
@click="closeDrawer2" @click="closeDrawer2"
/> />
</div> </div>
<!-- 2022-11-30注释 后面放开 修改div的padding-topL:32 --> <!-- 2022-11-30注释 后面放开 修改div的padding-topL:32 -->
@@ -34,60 +34,62 @@
</button> --> </button> -->
</div> </div>
<a-form <a-form
v-if="isOuter == 1" v-if="isOuter == 1"
ref="formRef" ref="formRef"
name="custom-validation" name="custom-validation"
:model="formState" :model="formState"
:rules="rules" :rules="rules"
v-bind="layout" v-bind="layout"
@finish="handleFinish" @finish="handleFinish"
@validate="handleValidate" @validate="handleValidate"
@finishFailed="handleFinishFailed" @finishFailed="handleFinishFailed"
> >
<div class="contentMain"> <div class="contentMain">
<div class="main_left"> <div class="main_left">
<div class="main_item"> <div class="main_item">
<div class="btnbox"> <div class="btnbox">
<a-form-item <a-form-item
has-feedback has-feedback
label="考试名称" label="考试名称"
name="examinationName" name="examinationName"
> >
<a-input <a-input
v-model:value="formState.examinationName" v-model:value="formState.examinationName"
style="width: 424px; height: 32px; margin-left: 35px" style="width: 424px; height: 32px; margin-left: 35px"
autocomplete="off" autocomplete="off"
placeholder="请输入考试名称" placeholder="请输入考试名称"
show-count :maxlength="50" show-count :maxlength="50"
/> />
</a-form-item> </a-form-item>
</div> </div>
</div> </div>
<div class="main_item2"> <div class="main_item2">
<a-form-item <a-form-item
has-feedback has-feedback
label="考试说明" label="考试说明"
name="examinationExplain" name="examinationExplain"
><div class="textarea"> >
<a-textarea <div class="textarea">
v-model:value="formState.examinationExplain" <a-textarea
placeholder="请输入考试说明" v-model:value="formState.examinationExplain"
allow-clear placeholder="请输入考试说明"
:rows="6" allow-clear
style="margin-left: 35px" :rows="6"
show-count :maxlength="200" style="margin-left: 35px"
/></div> show-count :maxlength="200"
/>
</div>
</a-form-item> </a-form-item>
</div> </div>
<div class="main_item"> <div class="main_item">
<div class="btnbox"> <div class="btnbox">
<a-form-item has-feedback label="选择考试" name="choosedTest"> <a-form-item has-feedback label="选择考试" name="choosedTest">
<a-button <a-button
type="primary" type="primary"
style="width: 100px; margin-left: 35px" style="width: 100px; margin-left: 35px"
class="outer" class="outer"
@click.prevent @click.prevent
@click="selectTest()" @click="selectTest()"
> >
选择考试 选择考试
</a-button> </a-button>
@@ -115,28 +117,25 @@
</a-menu> </a-menu>
</template> </template>
</a-dropdown> --> </a-dropdown> -->
<a-tag v-if="paperName != ''" closable color="processing" @close="delTag"> <a-tag v-if="paperName != ''" closable color="processing" @close="delTag">
<span style="font-size:14px;line-height: 33px;">删除考试</span> <span style="font-size:14px;line-height: 33px;">删除考试</span>
</a-tag> </a-tag>
</a-form-item> </a-form-item>
</div> </div>
</div> </div>
<div class="main_item"> <div class="main_item">
<div class="btnbox"> <div class="btnbox">
<a-form-item has-feedback label="考试时间" name="choosedTime"> <a-form-item has-feedback label="考试时间" name="choosedTime">
<a-range-picker <a-range-picker
v-model:value="formState.choosedTime" v-model:value="formState.choosedTime"
format="YYYY-MM-DD" format="YYYY-MM-DD"
style="width: 424px; margin-left: 35px" style="width: 424px; margin-left: 35px"
:placeholder="[' 开始时间', ' 结束时间']" :placeholder="[' 开始时间', ' 结束时间']"
/> />
</a-form-item> </a-form-item>
</div> </div>
@@ -144,14 +143,14 @@
<div class="main_item"> <div class="main_item">
<div class="btnbox"> <div class="btnbox">
<a-form-item <a-form-item
has-feedback has-feedback
label="考试时长" label="考试时长"
name="examinationDuration" name="examinationDuration"
> >
<a-input <a-input
v-model:value="formState.examinationDuration" v-model:value="formState.examinationDuration"
type="number" type="number"
style="width: 388px; height: 32px; margin-left: 35px" style="width: 388px; height: 32px; margin-left: 35px"
/> />
</a-form-item> </a-form-item>
<span style="transform: translateY(-50%)">分钟</span> <span style="transform: translateY(-50%)">分钟</span>
@@ -161,16 +160,16 @@
<div class="btnbox"> <div class="btnbox">
<span style="margin-right: 43px">考试限制</span> <span style="margin-right: 43px">考试限制</span>
<a-form-item <a-form-item
has-feedback has-feedback
label="允许重复考试" label="允许重复考试"
name="examinationLimit" name="examinationLimit"
> >
<a-input-number <a-input-number
:min="-1" :min="-1"
:precision="0" :precision="0"
type="number" type="number"
v-model:value="formState.examinationLimit" v-model:value="formState.examinationLimit"
style=" style="
width: 88px; width: 88px;
height: 32px; height: 32px;
border-radius: 8px; border-radius: 8px;
@@ -179,7 +178,7 @@
/> />
<span style="margin-left: 8px">次</span> <span style="margin-left: 8px">次</span>
<span style="margin-left: 24px; color: #999999" <span style="margin-left: 24px; color: #999999"
>-1表示无限制</span >-1表示无限制</span
> >
</a-form-item> </a-form-item>
</div> </div>
@@ -188,20 +187,22 @@
<div class="btnbox"> <div class="btnbox">
<a-form-item has-feedback label="显示答案" name="showAnswers"> <a-form-item has-feedback label="显示答案" name="showAnswers">
<a-radio-group <a-radio-group
style="margin-left: 35px; margin-right: 12px" style="margin-left: 35px; margin-right: 12px"
v-model:value="formState.showAnswers" v-model:value="formState.showAnswers"
> >
<a-radio <a-radio
v-model:checked="checked" v-model:checked="checked"
:value="1" :value="1"
@click="cloradio1" @click="cloradio1"
>允许查看</a-radio >允许查看
</a-radio
> >
<a-radio <a-radio
v-model:checked="checked" v-model:checked="checked"
:value="2" :value="2"
@click="cloradio1" @click="cloradio1"
>不允许查看</a-radio >不允许查看
</a-radio
> >
</a-radio-group> </a-radio-group>
</a-form-item> </a-form-item>
@@ -211,20 +212,22 @@
<div class="btnbox"> <div class="btnbox">
<a-form-item has-feedback label="显示解析" name="showAnalysis"> <a-form-item has-feedback label="显示解析" name="showAnalysis">
<a-radio-group <a-radio-group
style="margin-left: 35px; margin-right: 12px" style="margin-left: 35px; margin-right: 12px"
v-model:value="formState.showAnalysis" v-model:value="formState.showAnalysis"
> >
<a-radio <a-radio
v-model:checked="checked" v-model:checked="checked"
:value="1" :value="1"
@click="cloradio2" @click="cloradio2"
>允许查看</a-radio >允许查看
</a-radio
> >
<a-radio <a-radio
v-model:checked="checked" v-model:checked="checked"
:value="2" :value="2"
@click="cloradio2" @click="cloradio2"
>不允许查看</a-radio >不允许查看
</a-radio
> >
</a-radio-group> </a-radio-group>
</a-form-item> </a-form-item>
@@ -234,20 +237,22 @@
<div class="btnbox"> <div class="btnbox">
<a-form-item has-feedback label="评分模式" name="scoringModel"> <a-form-item has-feedback label="评分模式" name="scoringModel">
<a-radio-group <a-radio-group
style="margin-left: 35px; margin-right: 12px" style="margin-left: 35px; margin-right: 12px"
v-model:value="formState.scoringModel" v-model:value="formState.scoringModel"
> >
<a-radio <a-radio
v-model:checked="checked" v-model:checked="checked"
:value="1" :value="1"
@click="cloradio3" @click="cloradio3"
>最高一次</a-radio >最高一次
</a-radio
> >
<a-radio <a-radio
v-model:checked="checked" v-model:checked="checked"
:value="2" :value="2"
@click="cloradio3" @click="cloradio3"
>最后一次</a-radio >最后一次
</a-radio
> >
</a-radio-group> </a-radio-group>
</a-form-item> </a-form-item>
@@ -257,9 +262,9 @@
<div class="btnbox"> <div class="btnbox">
<a-form-item has-feedback label="及格线" name="passLine"> <a-form-item has-feedback label="及格线" name="passLine">
<a-input <a-input
v-model:value="formState.passLine" v-model:value="formState.passLine"
type="number" type="number"
style="width: 88px; height: 32px; margin-left: 35px" style="width: 88px; height: 32px; margin-left: 35px"
/> />
</a-form-item> </a-form-item>
<span style="margin-left: 8px">分</span> <span style="margin-left: 8px">分</span>
@@ -268,31 +273,34 @@
<div class="main_item"> <div class="main_item">
<div class="btnbox"> <div class="btnbox">
<a-form-item <a-form-item
has-feedback has-feedback
label="作业要求" label="作业要求"
name="questionArrangement" name="questionArrangement"
> >
<a-radio-group <a-radio-group
style="margin-right: 12px" style="margin-right: 12px"
v-model:value="formState.questionArrangement" v-model:value="formState.questionArrangement"
> >
<a-radio <a-radio
v-model:checked="checked" v-model:checked="checked"
:value="1" :value="1"
@click="cloradio4" @click="cloradio4"
>试题乱序</a-radio >试题乱序
</a-radio
> >
<a-radio <a-radio
v-model:checked="checked" v-model:checked="checked"
:value="2" :value="2"
@click="cloradio4" @click="cloradio4"
>试题排序</a-radio >试题排序
</a-radio
> >
<a-radio <a-radio
v-model:checked="checked" v-model:checked="checked"
:value="3" :value="3"
@click="cloradio4" @click="cloradio4"
>全部乱序</a-radio >全部乱序
</a-radio
> >
</a-radio-group> </a-radio-group>
</a-form-item> </a-form-item>
@@ -306,31 +314,31 @@
</div> </div>
</a-form> </a-form>
<a-form <a-form
v-else v-else
ref="formRef" ref="formRef"
name="custom-validation" name="custom-validation"
:model="formState" :model="formState"
:rules="rules" :rules="rules"
v-bind="layout" v-bind="layout"
@finish="handleFinish" @finish="handleFinish"
@validate="handleValidate" @validate="handleValidate"
@finishFailed="handleFinishFailed" @finishFailed="handleFinishFailed"
> >
<div class="contentMain"> <div class="contentMain">
<div class="main_left"> <div class="main_left">
<div class="main_item"> <div class="main_item">
<div class="btnbox"> <div class="btnbox">
<a-form-item <a-form-item
has-feedback has-feedback
label="考试名称" label="考试名称"
name="examinationName" name="examinationName"
> >
<a-input <a-input
v-model:value="formState.examinationName" v-model:value="formState.examinationName"
style="width: 424px; height: 32px; margin-left: 35px" style="width: 424px; height: 32px; margin-left: 35px"
autocomplete="off" autocomplete="off"
placeholder="请输入考试名称" placeholder="请输入考试名称"
show-count :maxlength="50" show-count :maxlength="50"
/> />
</a-form-item> </a-form-item>
</div> </div>
@@ -338,16 +346,16 @@
<div class="main_item"> <div class="main_item">
<div class="btnbox"> <div class="btnbox">
<a-form-item <a-form-item
has-feedback has-feedback
label="数据来源" label="数据来源"
name="examinationName" name="examinationName"
> >
<a-input <a-input
v-model:value="请输入数据来源" v-model:value="请输入数据来源"
style="width: 424px; height: 32px; margin-left: 35px" style="width: 424px; height: 32px; margin-left: 35px"
autocomplete="off" autocomplete="off"
placeholder="数据来源" placeholder="数据来源"
show-count :maxlength="50" show-count :maxlength="50"
/> />
</a-form-item> </a-form-item>
</div> </div>
@@ -355,19 +363,20 @@
<div class="main_item2"> <div class="main_item2">
<a-form-item <a-form-item
has-feedback has-feedback
label="考试说明" label="考试说明"
name="examinationExplain" name="examinationExplain"
> >
<div class="textarea"> <div class="textarea">
<a-textarea <a-textarea
v-model:value="formState.examinationExplain" v-model:value="formState.examinationExplain"
placeholder="请输入考试说明" placeholder="请输入考试说明"
allow-clear allow-clear
:rows="6" :rows="6"
style="margin-left: 35px" style="margin-left: 35px"
show-count :maxlength="200" show-count :maxlength="200"
/></div> />
</div>
</a-form-item> </a-form-item>
</div> </div>
</div> </div>
@@ -380,24 +389,25 @@
</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>
<!-- 选择考试抽屉 --> <!-- 选择考试抽屉 -->
<s-test v-model:STvisible="STvisible" @getSTData="getData" /> <s-test v-model:STvisible="STvisible" @getSTData="getData"/>
</a-drawer> </a-drawer>
</template> </template>
<script> <script>
import { reactive, ref, toRefs } from "vue"; import {reactive, ref, toRefs} from "vue";
import { message } from "ant-design-vue"; import {message} from "ant-design-vue";
import { import {
createExamination, createExamination,
queryExaminationDetailById, queryExaminationDetailById,
updateExamination, updateExamination,
} from "@/api/indexExam"; } from "@/api/indexExam";
import STest from "./SelectTest.vue"; import STest from "./SelectTest.vue";
import { ProjectEditTask, RouterEditTask } from "@/api/indexTask"; import {ProjectEditTask, RouterEditTask} from "@/api/indexTask";
import { addTempTask } from "../../api/indexTaskadd"; import {addTempTask} from "../../api/indexTaskadd";
import dayjs from "dayjs"; import dayjs from "dayjs";
export default { export default {
name: "AddTest", name: "AddTest",
components: { components: {
@@ -519,7 +529,7 @@ export default {
return Promise.reject("请选择时间"); return Promise.reject("请选择时间");
} }
}; };
let checkExaminationDuration = async (_rule, value) => { let checkExaminationDuration = async (_rule, value) => {
if (!value) { if (!value) {
return Promise.reject("请输入考试时长"); return Promise.reject("请输入考试时长");
@@ -642,6 +652,7 @@ export default {
console.log(args); console.log(args);
}; };
const closeDrawer = () => { const closeDrawer = () => {
console.log('closeDrawer')
formState.choosedTime = ""; formState.choosedTime = "";
ctx.emit("update:addtestVisible", false); ctx.emit("update:addtestVisible", false);
ctx.emit("update:edit", false); ctx.emit("update:edit", false);
@@ -652,10 +663,12 @@ export default {
}; };
const closeDrawer2 = () => { const closeDrawer2 = () => {
formState.choosedTime = ""; formState.choosedTime = "";
ctx.emit("update:edit", false);
ctx.emit("update:addtestVisible", false); ctx.emit("update:addtestVisible", false);
resetForm(); resetForm();
}; };
const afterVisibleChange = () => { const afterVisibleChange = () => {
console.log('props', props)
if (props.addtestVisible && props.edit) { if (props.addtestVisible && props.edit) {
// 该页面显示同时 edit为true 时，发送查询请求, // 该页面显示同时 edit为true 时，发送查询请求,
queryTest(); queryTest();
@@ -669,46 +682,46 @@ export default {
state.paperName = ""; state.paperName = "";
}; };
const queryTest = () => { const queryTest = () => {
// state.addLoading = true; // state.addLoading = true;
queryExaminationDetailById({ examinationId: props.EditTestId }) queryExaminationDetailById({examinationId: props.EditTestId})
.then((res) => { .then((res) => {
formState.examinationName = res.data.data.examinationName; formState.examinationName = res.data.data.examinationName;
formState.workRequirement = res.data.data.workRequirement; formState.workRequirement = res.data.data.workRequirement;
formState.examinationDuration = res.data.data.examinationDuration; formState.examinationDuration = res.data.data.examinationDuration;
formState.examinationLimit = formState.examinationLimit =
Number(res.data.data.examinationLimit) || -1; Number(res.data.data.examinationLimit) || -1;
formState.passLine = res.data.data.passLine; formState.passLine = res.data.data.passLine;
formState.examinationExplain = res.data.data.examinationExplain; formState.examinationExplain = res.data.data.examinationExplain;
formState.questionArrangement = formState.questionArrangement =
Number(res.data.data.questionArrangement) || 1; Number(res.data.data.questionArrangement) || 1;
formState.scoringModel = Number(res.data.data.scoringModel) || 1; formState.scoringModel = Number(res.data.data.scoringModel) || 1;
formState.showAnalysis = Number(res.data.data.showAnalysis) || 1; formState.showAnalysis = Number(res.data.data.showAnalysis) || 1;
formState.showAnswers = Number(res.data.data.showAnswers) || 1; formState.showAnswers = Number(res.data.data.showAnswers) || 1;
formState.papaerName = res.data.data.examinationTestName; formState.papaerName = res.data.data.examinationTestName;
state.paperName = res.data.data.examinationTestName; state.paperName = res.data.data.examinationTestName;
if ( if (
res.data.data.examinationEndTime && res.data.data.examinationEndTime &&
res.data.data.examinationStartTime res.data.data.examinationStartTime
) { ) {
formState.choosedTime = [ formState.choosedTime = [
dayjs(res.data.data.examinationStartTime, "YYYY-MM-DD"), dayjs(res.data.data.examinationStartTime, "YYYY-MM-DD"),
dayjs(res.data.data.examinationEndTime, "YYYY-MM-DD"), dayjs(res.data.data.examinationEndTime, "YYYY-MM-DD"),
]; ];
state.addLoading = false; state.addLoading = false;
} else { } else {
formState.choosedTime = []; formState.choosedTime = [];
} }
}) })
.catch(() => { .catch(() => {
//message.error(`查询失败`); //message.error(`查询失败`);
}); });
}; };
const updateTest = () => { const updateTest = () => {
//state.addLoading = true;updateTask //state.addLoading = true;updateTask
let obj = { let obj = {
examinationDuration: formState.examinationDuration, examinationDuration: formState.examinationDuration,
examinationEndTime: dayjs(formState.choosedTime[1]).format( examinationEndTime: dayjs(formState.choosedTime[1]).format(
"YYYY-MM-DD" "YYYY-MM-DD"
), ),
examinationExplain: formState.examinationExplain, examinationExplain: formState.examinationExplain,
examinationId: props.edit ? props.EditTestId : 0, examinationId: props.edit ? props.EditTestId : 0,
@@ -717,7 +730,7 @@ export default {
examinationPaperId: 0, examinationPaperId: 0,
// examinationPaperName: formState.choosedTest, // examinationPaperName: formState.choosedTest,
examinationStartTime: dayjs(formState.choosedTime[0]).format( examinationStartTime: dayjs(formState.choosedTime[0]).format(
"YYYY-MM-DD" "YYYY-MM-DD"
), ),
passLine: formState.passLine, passLine: formState.passLine,
questionArrangement: formState.questionArrangement, questionArrangement: formState.questionArrangement,
@@ -727,32 +740,32 @@ export default {
examinationTestId: state.paperId, examinationTestId: state.paperId,
examinationTestName: state.paperName, examinationTestName: state.paperName,
}; };
if(!(state.paperId >0)){ if (!(state.paperId > 0)) {
message.destroy(); message.destroy();
return message.error("请选择考试"); return message.error("请选择考试");
} }
if (props.edit) { if (props.edit) {
// 编辑任务 // 编辑任务
updateExamination(obj) updateExamination(obj)
.then(async (res) => { .then(async (res) => {
await updateTask(res); await updateTask(res);
closeDrawer(); closeDrawer();
}) })
.catch(() => { .catch(() => {
message.destroy(); message.destroy();
message.error(`编辑失败`); message.error(`编辑失败`);
}); });
} else { } else {
// 创建任务 // 创建任务
createExamination(obj) createExamination(obj)
.then(async (res) => { .then(async (res) => {
await updateTask(res); await updateTask(res);
closeDrawer(); closeDrawer();
}) })
.catch(() => { .catch(() => {
message.destroy(); message.destroy();
message.error(`创建失败`); message.error(`创建失败`);
}); });
} }
}; };
const updateTask = (res) => { const updateTask = (res) => {
@@ -771,15 +784,15 @@ export default {
type: 5, type: 5,
}; };
RouterEditTask(editObj1) RouterEditTask(editObj1)
.then(() => { .then(() => {
//message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`); //message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`);
ctx.emit("changeData", false); ctx.emit("changeData", false);
state.addLoading = false; state.addLoading = false;
closeDrawer(); closeDrawer();
}) })
.catch(() => { .catch(() => {
//message.error(`${props.edit ? "编辑" : "新增"}关卡任务失败`); //message.error(`${props.edit ? "编辑" : "新增"}关卡任务失败`);
}); });
} else if (props.isLevel == 2) { } else if (props.isLevel == 2) {
let editObj = { let editObj = {
courseId: res.data.data.examinationId, courseId: res.data.data.examinationId,
@@ -792,13 +805,13 @@ export default {
}; };
// 新增编辑或新增项目 // 新增编辑或新增项目
ProjectEditTask(editObj) ProjectEditTask(editObj)
.then(() => { .then(() => {
//message.success(`${props.EditTestId ? "编辑" : "新增"}阶段任务成功`); //message.success(`${props.EditTestId ? "编辑" : "新增"}阶段任务成功`);
ctx.emit("changeData", false); ctx.emit("changeData", false);
}) })
.catch(() => { .catch(() => {
//message.error(`${props.EditTestId ? "编辑" : "新增"}阶段任务失败`); //message.error(`${props.EditTestId ? "编辑" : "新增"}阶段任务失败`);
}); });
} else if (props.isLevel == 3) { } else if (props.isLevel == 3) {
addTempTask({ addTempTask({
courseId: res.data.data.examinationId, courseId: res.data.data.examinationId,
@@ -809,13 +822,13 @@ export default {
stageId: props.chooseStageId || 0, stageId: props.chooseStageId || 0,
type: 5, type: 5,
}) })
.then(() => { .then(() => {
//message.success( `${props.EditTestId ? "编辑" : "新增"}阶段任务成功`); //message.success( `${props.EditTestId ? "编辑" : "新增"}阶段任务成功`);
ctx.emit("changeData", false); ctx.emit("changeData", false);
}) })
.catch(() => { .catch(() => {
//message.error(`${props.EditTestId ? "编辑" : "新增"}阶段任务失败`); //message.error(`${props.EditTestId ? "编辑" : "新增"}阶段任务失败`);
}); });
} }
} }
}; };
@@ -851,7 +864,7 @@ export default {
}; };
const closeTag = (removedTag) => { const closeTag = (removedTag) => {
const tags = state.choosedTestList.filter( const tags = state.choosedTestList.filter(
(item) => item.key != removedTag (item) => item.key != removedTag
); );
state.choosedTestList = tags; state.choosedTestList = tags;
}; };
@@ -887,7 +900,7 @@ export default {
chooseTest, chooseTest,
closeTag, closeTag,
getData, getData,
...toRefs(state), ...toRefs(state),
}; };
}, },
@@ -897,6 +910,7 @@ export default {
.ant-table-striped :deep(.table-striped) td { .ant-table-striped :deep(.table-striped) td {
background-color: #fafafa !important; background-color: #fafafa !important;
} }
.outer { .outer {
background-color: #4ea6ff; background-color: #4ea6ff;
color: #fff; color: #fff;
@@ -905,6 +919,7 @@ export default {
height: 36px; height: 36px;
margin-right: 10px; margin-right: 10px;
} }
.notOuter { .notOuter {
color: #000; color: #000;
border-radius: 5px; border-radius: 5px;
@@ -913,10 +928,12 @@ export default {
margin-right: 10px; margin-right: 10px;
padding: 3px; padding: 3px;
} }
.tag-style { .tag-style {
color: rgb(113, 113, 237); color: rgb(113, 113, 237);
background-color: #d7d1f7; background-color: #d7d1f7;
} }
.addtestDrawer { .addtestDrawer {
.drawerMain { .drawerMain {
.header { .header {
@@ -926,6 +943,7 @@ export default {
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
flex-shrink: 0; flex-shrink: 0;
.headerTitle { .headerTitle {
font-size: 18px; font-size: 18px;
font-weight: 600; font-weight: 600;
@@ -934,31 +952,38 @@ export default {
margin-left: 24px; margin-left: 24px;
} }
} }
.contentMain { .contentMain {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
.main_left { .main_left {
padding-right: 30px; padding-right: 30px;
flex: 1; flex: 1;
border-right: 1px solid #e8e8e8; border-right: 1px solid #e8e8e8;
.main_item { .main_item {
display: flex; display: flex;
align-items: center; align-items: center;
margin-top: 32px; margin-top: 32px;
margin-bottom: 32px; margin-bottom: 32px;
.signbox { .signbox {
width: 120px; width: 120px;
display: flex; display: flex;
justify-content: end; justify-content: end;
align-items: center; align-items: center;
.sign { .sign {
margin-right: 5px; margin-right: 5px;
} }
} }
.btnbox { .btnbox {
display: flex; display: flex;
flex: 1; flex: 1;
align-items: center; align-items: center;
.xkbtn { .xkbtn {
cursor: pointer; cursor: pointer;
width: 130px; width: 130px;
@@ -971,10 +996,12 @@ export default {
} }
} }
} }
.main_item2 { .main_item2 {
display: flex; display: flex;
align-items: flex-start; align-items: flex-start;
margin-bottom: 32px; margin-bottom: 32px;
.textarea { .textarea {
width: 423px; width: 423px;
@@ -996,24 +1023,29 @@ export default {
border-radius: 8px; border-radius: 8px;
} }
} }
.signbox { .signbox {
width: 120px; width: 120px;
display: flex; display: flex;
justify-content: end; justify-content: end;
align-items: center; align-items: center;
.sign { .sign {
margin-right: 5px; margin-right: 5px;
} }
} }
.kqszbox { .kqszbox {
.qdqtbox { .qdqtbox {
margin-left: 56px; margin-left: 56px;
} }
.setbox { .setbox {
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
margin-top: 10px; margin-top: 10px;
margin-bottom: 24px; margin-bottom: 24px;
.timerbox { .timerbox {
margin-top: 6px; margin-top: 6px;
margin-right: 32px; margin-right: 32px;
@@ -1023,10 +1055,12 @@ export default {
} }
} }
} }
.btnbox2 { .btnbox2 {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
justify-content: flex-start; justify-content: flex-start;
.xkbtn { .xkbtn {
cursor: pointer; cursor: pointer;
width: 130px; width: 130px;
@@ -1043,6 +1077,7 @@ export default {
} }
} }
} }
.main_btns { .main_btns {
height: 72px; height: 72px;
width: 100%; width: 100%;
@@ -1052,6 +1087,7 @@ export default {
align-items: center; align-items: center;
justify-content: center; justify-content: center;
box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.16); box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.16);
.btn1 { .btn1 {
width: 100px; width: 100px;
height: 40px; height: 40px;
@@ -1061,6 +1097,7 @@ export default {
background-color: #fff; background-color: #fff;
cursor: pointer; cursor: pointer;
} }
.btn2 { .btn2 {
cursor: pointer; cursor: pointer;
width: 100px; width: 100px;

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

@@ -1,18 +1,18 @@
<template> <template>
<a-drawer <a-drawer
:visible="ProjPvisible" :visible="ProjPvisible"
class="drawerStyle ProjPowerList" class="drawerStyle ProjPowerList"
placement="right" placement="right"
width="60%" width="60%"
@after-visible-change="afterVisibleChange" @after-visible-change="afterVisibleChange"
> >
<div class="drawerMain"> <div class="drawerMain">
<div class="header"> <div class="header">
<div class="headerTitle">授权名单</div> <div class="headerTitle">授权名单</div>
<img <img
style="width: 29px; height: 29px; cursor: pointer" style="width: 29px; height: 29px; cursor: pointer"
src="../../assets/images/basicinfo/close.png" src="../../assets/images/basicinfo/close.png"
@click="closeDrawer" @click="closeDrawer"
/> />
</div> </div>
<div class="main"> <div class="main">
@@ -21,18 +21,18 @@
<div class="namecon" style="margin-right: 30px"> <div class="namecon" style="margin-right: 30px">
<div class="name">姓名：</div> <div class="name">姓名：</div>
<a-input <a-input
v-model:value="name" v-model:value="name"
style="width: 270px; height: 40px; border-radius: 8px" style="width: 270px; height: 40px; border-radius: 8px"
placeholder="请输入姓名" placeholder="请输入姓名"
/> />
</div> </div>
</div> </div>
<div class="btns"> <div class="btns">
<div <div
class="btn btn1" class="btn btn1"
style="margin-right: 20px" style="margin-right: 20px"
@click="searchAuth" @click="searchAuth"
> >
<div class="img1"></div> <div class="img1"></div>
<div class="wz">搜索</div> <div class="wz">搜索</div>
@@ -46,28 +46,28 @@
<div class="tableBox" style="margin-top: 10px"> <div class="tableBox" style="margin-top: 10px">
<a-table <a-table
style="border: 1px solid #f2f6fe" style="border: 1px solid #f2f6fe"
:columns="tableDataFunc()" :columns="tableDataFunc()"
:data-source="tableData" :data-source="tableData"
:loading="tableDataTotal === -1 ? true : false" :loading="tableDataTotal === -1 ? true : false"
expandRowByClick="true" expandRowByClick="true"
@expand="expandTable" @expand="expandTable"
:scroll="{ x: 900 }" :scroll="{ x: 900 }"
:pagination="false" :pagination="false"
/> />
</div> </div>
<div class="tableBox"> <div class="tableBox">
<div class="pa"> <div class="pa">
<a-pagination <a-pagination
v-if="tableDataTotal > 10" v-if="tableDataTotal > 10"
showSizeChanger="true" showSizeChanger="true"
showQuickJumper="true" showQuickJumper="true"
hideOnSinglePage="true" hideOnSinglePage="true"
:pageSize="pageSize" :pageSize="pageSize"
:current="currentPage" :current="currentPage"
:total="tableDataTotal" :total="tableDataTotal"
class="pagination" class="pagination"
@change="changePagination" @change="changePagination"
/> />
</div> </div>
</div> </div>
@@ -93,11 +93,11 @@
</div> </div>
<!-- 取消授权弹窗 --> <!-- 取消授权弹窗 -->
<a-modal <a-modal
v-model:visible="cancelModal" v-model:visible="cancelModal"
:footer="null" :footer="null"
:closable="closeCancel" :closable="closeCancel"
wrapClassName="CopyModal" wrapClassName="CopyModal"
centered="true" centered="true"
> >
<div class="delete"> <div class="delete">
<div class="del_header"></div> <div class="del_header"></div>
@@ -131,9 +131,10 @@
</template> </template>
<script> <script>
import { toRefs, reactive } from "vue"; import {toRefs, reactive} from "vue";
import * as api from "../../api/index1"; import * as api from "../../api/index1";
import { message } from "ant-design-vue"; import {message} from "ant-design-vue";
export default { export default {
name: "ProjPowerList", name: "ProjPowerList",
props: { props: {
@@ -217,13 +218,13 @@ export default {
width: 70, width: 70,
// align: "left", // align: "left",
className: "classify", className: "classify",
scopedSlots: { customRender: "action" }, //引入的插槽 scopedSlots: {customRender: "action"}, //引入的插槽
customRender: (text) => { customRender: (text) => {
// console.log(text.record.checked1); // console.log(text.record.checked1);
return ( return (
<div class="racona"> <div class="racona">
<span> {text.record.name}</span> <span> {text.record.name}</span>
</div> </div>
); );
}, },
}, },
@@ -269,18 +270,17 @@ export default {
key: "opacation", key: "opacation",
width: 100, width: 100,
align: "center", align: "center",
scopedSlots: { customRender: "action" }, //引入的插槽 scopedSlots: {customRender: "action"}, //引入的插槽
customRender: (text) => { customRender: (text) => {
return ( return (text.record.state === '归属权' ? '' : <div
<div className="opa"
class="opa" onClick={() => {
onClick={() => { console.log("text.record.id", text.record.id);
console.log("text.record.id", text.record.id); showCancelModal(text.record);
showCancelModal(text.record); }}
}} >
> 取消授权
取消授权 </div>
</div>
); );
}, },
}, },
@@ -293,13 +293,13 @@ export default {
let obj = { let obj = {
keyWord: state.name ? state.name : "", keyWord: state.name ? state.name : "",
type: type:
props.classify === "learnPath" props.classify === "learnPath"
? 1 ? 1
: props.classify === "project" : props.classify === "project"
? 2 ? 2
: props.classify === "course" : props.classify === "course"
? 3 ? 3
: null, : null,
tag: 1, tag: 1,
opt: 1, opt: 1,
refId: props.selectProjectId, refId: props.selectProjectId,
@@ -308,34 +308,34 @@ export default {
}; };
console.log("获取权限名单obj", obj); console.log("获取权限名单obj", obj);
api api
.optionAuthPerm(obj) .optionAuthPerm(obj)
.then((res) => { .then((res) => {
// console.log("获取权限名单成功", res); // console.log("获取权限名单成功", res);
if (res.data.code === 200) { if (res.data.code === 200) {
console.log("获取权限名单成功", res.data.data.records); console.log("获取权限名单成功", res.data.data.records);
let arr = res.data.data.records; let arr = res.data.data.records;
let array = []; let array = [];
arr.map((value) => { arr.map((value) => {
let obj = { let obj = {
key: value.memberId, key: value.memberId,
id: value.memberId, id: value.memberId,
name: value.memberName ? value.memberName : "-", name: value.memberName ? value.memberName : "-",
com: value.orgName ? value.orgName : "-", com: value.orgName ? value.orgName : "-",
gang: "-", gang: "-",
number: value.memberNo ? value.memberNo : "-", number: value.memberNo ? value.memberNo : "-",
state: value.tagName ? value.tagName : "-", state: value.tagName ? value.tagName : "-",
}; };
array.push(obj); array.push(obj);
}); });
state.tableData = array; state.tableData = array;
state.tableDataTotal = res.data.data.total; state.tableDataTotal = res.data.data.total;
} }
}) })
.catch((err) => { .catch((err) => {
console.log("获取权限名单失败", err); console.log("获取权限名单失败", err);
}); });
}; };
//分页 //分页
@@ -360,21 +360,21 @@ export default {
let obj = { let obj = {
keyWord: "", keyWord: "",
type: type:
props.classify === "learnPath" props.classify === "learnPath"
? 1 ? 1
: props.classify === "project" : props.classify === "project"
? 2 ? 2
: props.classify === "course" : props.classify === "course"
? 3 ? 3
: null, : null,
tag: tag:
state.cancelAuthState === "归属权" state.cancelAuthState === "归属权"
? 2 ? 2
: state.cancelAuthState === "查看权" : state.cancelAuthState === "查看权"
? 3 ? 3
: state.cancelAuthState === "管理权" : state.cancelAuthState === "管理权"
? 4 ? 4
: null, : null,
opt: 4, opt: 4,
refId: props.selectProjectId, refId: props.selectProjectId,
pageNo: 1, pageNo: 1,
@@ -385,19 +385,19 @@ export default {
}; };
console.log("取消权限名单obj", obj, state.cancelAuthState); console.log("取消权限名单obj", obj, state.cancelAuthState);
api api
.optionAuthPerm(obj) .optionAuthPerm(obj)
.then((res) => { .then((res) => {
console.log("取消权限名单", res); console.log("取消权限名单", res);
if (res.data.code === 200) { if (res.data.code === 200) {
// console.log("取消授权成功", res.data.data); // console.log("取消授权成功", res.data.data);
optionAuthPerm(); optionAuthPerm();
message.success("取消授权成功"); message.success("取消授权成功");
closeCancelModal(); closeCancelModal();
} }
}) })
.catch((err) => { .catch((err) => {
console.log("取消授权失败", err); console.log("取消授权失败", err);
}); });
}; };
return { return {
...toRefs(state), ...toRefs(state),
@@ -430,16 +430,19 @@ export default {
.ant-drawer-header { .ant-drawer-header {
display: none !important; display: none !important;
} }
.ant-drawer-body { .ant-drawer-body {
padding: 0; padding: 0;
} }
} }
.drawerMain { .drawerMain {
min-width: 550px; min-width: 550px;
margin: 0px 32px 0px 32px; margin: 0px 32px 0px 32px;
// overflow-x: auto; // overflow-x: auto;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
.header { .header {
height: 73px; height: 73px;
border-bottom: 1px solid #e8e8e8; border-bottom: 1px solid #e8e8e8;
@@ -449,6 +452,7 @@ export default {
// background-color: red; // background-color: red;
margin-bottom: 20px; margin-bottom: 20px;
flex-shrink: 0; flex-shrink: 0;
.headerTitle { .headerTitle {
font-size: 18px; font-size: 18px;
font-weight: 600; font-weight: 600;
@@ -457,11 +461,13 @@ export default {
// margin-left: 24px; // margin-left: 24px;
} }
} }
.main { .main {
width: 100%; width: 100%;
height: 100%; height: 100%;
// background-color: #bfa; // background-color: #bfa;
overflow-y: auto; overflow-y: auto;
.search { .search {
width: 100%; width: 100%;
display: flex; display: flex;
@@ -471,14 +477,17 @@ export default {
.leftchoose { .leftchoose {
display: flex; display: flex;
margin-right: 20px; margin-right: 20px;
.namecon { .namecon {
display: flex; display: flex;
flex-wrap: nowrap; flex-wrap: nowrap;
margin-bottom: 10px; margin-bottom: 10px;
.name { .name {
margin-top: 8px; margin-top: 8px;
white-space: nowrap; white-space: nowrap;
} }
// .name { // .name {
// margin-top: 8px; // margin-top: 8px;
@@ -501,6 +510,7 @@ export default {
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
.img1 { .img1 {
width: 15px; width: 15px;
height: 17px; height: 17px;
@@ -508,6 +518,7 @@ export default {
background-size: 100% 100%; background-size: 100% 100%;
margin-right: 7px; margin-right: 7px;
} }
.img2 { .img2 {
width: 16px; width: 16px;
height: 18px; height: 18px;
@@ -522,6 +533,7 @@ export default {
color: #ffffff; color: #ffffff;
} }
.btn2 { .btn2 {
background: #ffffff; background: #ffffff;
@@ -539,26 +551,31 @@ export default {
// padding-left: 9px !important; // padding-left: 9px !important;
padding-left: 20px !important; padding-left: 20px !important;
} }
.ant-checkbox-wrapper { .ant-checkbox-wrapper {
align-items: center; align-items: center;
margin-top: -2px; margin-top: -2px;
} }
.ant-table-selection-column { .ant-table-selection-column {
padding: 0px !important; padding: 0px !important;
// padding-left: 45px !important; // padding-left: 45px !important;
} }
.ant-table-thead > tr > th { .ant-table-thead > tr > th {
background-color: rgba(239, 244, 252, 1); background-color: rgba(239, 244, 252, 1);
} }
th.h { th.h {
background-color: #eff4fc !important; background-color: #eff4fc !important;
} }
.ant-table-tbody .ant-table-tbody
> tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected) > tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected)
> td { > td {
background: #f6f9fd; background: #f6f9fd;
} }
.opa { .opa {
// background-color: #bfa; // background-color: #bfa;
font-size: 14px; font-size: 14px;
@@ -567,6 +584,7 @@ export default {
cursor: pointer; cursor: pointer;
} }
} }
.pa { .pa {
// left: 0; // left: 0;
margin-top: 25px; margin-top: 25px;
@@ -585,6 +603,7 @@ export default {
margin-bottom: 10px; margin-bottom: 10px;
} }
} }
// .tab { // .tab {
// .ant-table-thead > tr > th { // .ant-table-thead > tr > th {
// background-color: rgba(239, 244, 252, 1) !important; // background-color: rgba(239, 244, 252, 1) !important;
@@ -602,6 +621,7 @@ export default {
// } // }
} }
} }
// .botm { // .botm {
// width: 100%; // width: 100%;
// height: 100%; // height: 100%;
@@ -619,6 +639,7 @@ export default {
align-items: center; align-items: center;
justify-content: center; justify-content: center;
box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.16); box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.16);
.btn1 { .btn1 {
width: 100px; width: 100px;
height: 40px; height: 40px;
@@ -628,6 +649,7 @@ export default {
background-color: #fff; background-color: #fff;
cursor: pointer; cursor: pointer;
} }
.btn2 { .btn2 {
cursor: pointer; cursor: pointer;
width: 100px; width: 100px;

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

@@ -69,7 +69,7 @@ export default {
onMounted(() => { onMounted(() => {
console.log('onMounted') console.log('onMounted')
init() // init()
}) })
function getMember() { function getMember() {

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

@@ -2924,7 +2924,11 @@
</div> </div>
</a-modal> </a-modal>
<!-- 预览弹窗 --> <!-- 预览弹窗 -->
<!-- <SeeModal :show="lookCourseModal" /> --> <SeeModal
:visible="lookCourseModal"
:detail="faceDetailObj"
@cancel="ft_exit_see"
/>
<!--删除 复制 停用弹窗 --> <!--删除 复制 停用弹窗 -->
<!-- 学员管理课程库-归属权抽屉 --> <!-- 学员管理课程库-归属权抽屉 -->
<!-- <own-power v-model:ownpowervisible="ownpowervisible" /> --> <!-- <own-power v-model:ownpowervisible="ownpowervisible" /> -->
@@ -3037,7 +3041,7 @@ import "@wangeditor/editor/dist/css/style.css";
import { Editor, Toolbar } from "@wangeditor/editor-for-vue"; import { Editor, Toolbar } from "@wangeditor/editor-for-vue";
import ProjectManager from "@/components/project/ProjectManager"; import ProjectManager from "@/components/project/ProjectManager";
// import SeeModal from "./components/seeModal.vue"; import SeeModal from "./components/seeModal.vue";
//列表表格 //列表表格
const columns1 = [ const columns1 = [
@@ -3090,7 +3094,17 @@ const columns1 = [
{ {
title: " 所属项目", title: " 所属项目",
width: 250, width: 250,
dataIndex: "project", dataIndex: "projectName",
key: "3",
align: "center",
ellipsis: true,
customRender: ({ text }) => {
return text ? text : "-";
},
},{
title: " 所属路径",
width: 250,
dataIndex: "routerName",
key: "3", key: "3",
align: "center", align: "center",
ellipsis: true, ellipsis: true,
@@ -3498,6 +3512,7 @@ export default defineComponent({
// Corpowerlist, // Corpowerlist,
Editor, Editor,
Toolbar, Toolbar,
SeeModal,
// StuAdd, // StuAdd,
ProjectManager, ProjectManager,
ProjOwnerShip, ProjOwnerShip,
@@ -4770,9 +4785,12 @@ export default defineComponent({
score: state.lrcj_inputV1, score: state.lrcj_inputV1,
studentIds: [state.studentId], studentIds: [state.studentId],
type: 1, type: 1,
}).then((res) => {
if (res.data.code === 200) {
getTableDate2();
delete_exit1();
}
}); });
getTableDate2();
delete_exit1();
} }
} }
}; };
@@ -4783,9 +4801,12 @@ export default defineComponent({
score: "", score: "",
studentIds: [state.studentId], studentIds: [state.studentId],
type: 2, type: 2,
}).then((res) => {
if (res.data.code === 200) {
getTableDate2();
delete_exit1();
}
}); });
getTableDate2();
delete_exit1();
} }
}; };
//确认复制 //确认复制
@@ -4796,10 +4817,13 @@ export default defineComponent({
score: "", score: "",
studentIds: [state.studentId], studentIds: [state.studentId],
type: 3, type: 3,
}).then((res) => {
if (res.data.code === 200) {
getTableDate2();
delete_exit1();
state.addLoading = false;
}
}); });
getTableDate2();
delete_exit1();
state.addLoading = false;
} }
if (state.rejectstudy_hs) { if (state.rejectstudy_hs) {
handleStudent({ handleStudent({
@@ -4807,9 +4831,12 @@ export default defineComponent({
score: "", score: "",
studentIds: [state.studentId], studentIds: [state.studentId],
type: 4, type: 4,
}).then((res) => {
if (res.data.code === 200) {
getTableDate2();
delete_exit1();
}
}); });
getTableDate2();
delete_exit1();
} }
}; };
//确认复制课程 //确认复制课程
@@ -4825,16 +4852,22 @@ export default defineComponent({
score: "", score: "",
studentIds: [state.studentId], studentIds: [state.studentId],
type: 5, type: 5,
}).then((res) => {
if (res.data.code === 200) {
getTableDate2();
delete_exit1();
}
}); });
getTableDate2();
delete_exit1();
} else if (state.offcourseId && state.offcoursePlanId) { } else if (state.offcourseId && state.offcoursePlanId) {
console.log(2222222); console.log(2222222);
deletePlan({ deletePlan({
offcoursePlanId: state.offcoursePlanId, offcoursePlanId: state.offcoursePlanId,
}).then((res) => {
if (res.data.code === 200) {
getTableDate3();
delete_exit1();
}
}); });
getTableDate3();
delete_exit1();
} else if (state.offcourseId) { } else if (state.offcourseId) {
console.log(3333333); console.log(3333333);
handle({ handle({
@@ -5086,7 +5119,6 @@ export default defineComponent({
state.lookCourseModal = false; state.lookCourseModal = false;
}; };
const handleLook = async (itm, type) => { const handleLook = async (itm, type) => {
state.lookCourseModal = true;
// state.isEdit = 0; // state.isEdit = 0;
console.log(45555); console.log(45555);
console.log(itm); console.log(itm);
@@ -5100,12 +5132,14 @@ export default defineComponent({
}).then((res) => { }).then((res) => {
if (res.data.code === 200) return res.data.data; if (res.data.code === 200) return res.data.data;
}); });
state.lookCourseModal = true;
state.faceDetailObj = item; state.faceDetailObj = item;
// heroImg.value.src = item.picUrl; // heroImg.value.src = item.picUrl;
// valueHtmlRef.value = item.outline; // valueHtmlRef.value = item.outline;
// attachMap.value = item.attach == "" ? [] : item.attach.split(","); // attachMap.value = item.attach == "" ? [] : item.attach.split(",");
console.log("res222222222"); console.log("res222222222");
console.log(item); console.log(item);
console.log(state.lookCourseModal);
// state.qdms_inputV1 = item.name; // state.qdms_inputV1 = item.name;
// state.imageUrl = item.picUrl; // state.imageUrl = item.picUrl;

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

@@ -2,14 +2,14 @@
<template> <template>
<!-- 预览弹窗 --> <!-- 预览弹窗 -->
<a-modal <a-modal
v-model:visible="showM" :visible="visible"
title="查看" title="查看"
@ok="handleCancel"
:footer="null" :footer="null"
:closable="false" :closable="false"
wrapClassName="modalStyle lookCourseModal" wrapClassName="modalStyle lookCourseModal"
width="80%" width="80%"
@cancel="handleCancel" @cancel="handleCancel"
@ok="handleCancel"
> >
<div class="modalHeader"> <div class="modalHeader">
<div class="headerLeft"> <div class="headerLeft">
@@ -37,7 +37,7 @@
<div class="asterisk_icon"> <div class="asterisk_icon">
<img <img
src="@/assets/images/coursewareManage/asterisk.png" src="@/assets/images/coursewareManage/asterisk.png"
alt="" alt="img"
/> />
</div> </div>
<span style="margin-right: 14px">课程名称：</span> <span style="margin-right: 14px">课程名称：</span>
@@ -48,7 +48,7 @@
</div> </div>
</div> </div>
</div> </div>
<div class="i2_cz"> <!-- <div class="i2_cz">
<div class="i2_top"> <div class="i2_top">
<div <div
class="i2_right" class="i2_right"
@@ -58,13 +58,13 @@
<div class="b_icon"></div> <div class="b_icon"></div>
</div> </div>
</div> </div>
</div> </div> -->
<div class="mbl_items2"> <div class="mbl_items2">
<div class="item_nam"> <div class="item_nam">
<div class="asterisk_icon"> <div class="asterisk_icon">
<img <img
src="@/assets/images/coursewareManage/asterisk.png" src="@/assets/images/coursewareManage/asterisk.png"
alt="" alt="img"
/> />
</div> </div>
<span style="margin-right: 14px">封面图：</span> <span style="margin-right: 14px">封面图：</span>
@@ -82,7 +82,7 @@
<img <img
style="width: 10px; height: 10px" style="width: 10px; height: 10px"
src="@/assets/images/coursewareManage/asterisk.png" src="@/assets/images/coursewareManage/asterisk.png"
alt="" alt="img"
/> />
</div> </div>
<span style="margin-right: 14px">目标人群：</span> <span style="margin-right: 14px">目标人群：</span>
@@ -193,10 +193,10 @@
</div> </div>
</div> </div>
<div class="mbl_items"> <div class="mbl_items">
<div v-if="attachMap.length > 0" class="item_nam"> <!-- <div v-if="attachMap.length > 0" class="item_nam">
<span style="margin-right: 10px">附件</span> <span style="margin-right: 10px">附件</span>
</div> </div> -->
<div <!-- <div
class="item_inp" class="item_inp"
v-for="(value, index) in attachMap" v-for="(value, index) in attachMap"
:key="index" :key="index"
@@ -215,8 +215,9 @@
</a> </a>
<a style="margin-left: 120px" :src="value" :href="value"> <a style="margin-left: 120px" :src="value" :href="value">
查看 查看
</a> </a>
<!-- <a-upload multiple :show-upload-list="false" :before-upload="beforeUpload2"> </div>-->
<!-- <a-upload multiple :show-upload-list="false" :before-upload="beforeUpload2">
<div class="accessory" style="cursor: pointer"> <div class="accessory" style="cursor: pointer">
<div class="accessory_icon"> <div class="accessory_icon">
<img src="@/assets/images/coursewareManage/enclosure.png" alt="enclosure" /> <img src="@/assets/images/coursewareManage/enclosure.png" alt="enclosure" />
@@ -227,7 +228,6 @@
<span> <span>
支持.pdf,.ppt,.pptx,.doc,.docx,.xls,.xlsx,.jpg,.jpeg,.png,.gif,.zip 支持.pdf,.ppt,.pptx,.doc,.docx,.xls,.xlsx,.jpg,.jpeg,.png,.gif,.zip
</span> --> </span> -->
</div>
</div> </div>
<div class="mbl_items12"> <div class="mbl_items12">
<div <div
@@ -253,13 +253,13 @@
</div> </div>
</div> </div>
</div> </div>
<div class="file_operation"> <!-- <div class="file_operation">
<div class="fobox"> <div class="fobox">
<span style="color: #4ea6ff" @click="handleDel(index)"> <span style="color: #4ea6ff" @click="handleDel(index)">
删除 删除
</span> </span>
</div> </div>
</div> </div> -->
</div> </div>
</div> </div>
</div> </div>
@@ -301,11 +301,11 @@
</a-modal> </a-modal>
</template> </template>
<script> <script>
import { reactive, toRefs, defineComponent } from "vue"; import { reactive, toRefs, defineComponent, toRef, watch } from "vue";
export default defineComponent({ export default defineComponent({
props: { props: {
show: { visible: {
type: Boolean, type: Boolean,
default: false, default: false,
}, },
@@ -316,10 +316,18 @@ export default defineComponent({
}, },
setup(props, { emit }) { setup(props, { emit }) {
console.log(props); console.log(props);
// const showM = ref(props.show); const detailWatch = toRef(props, "detail");
const state = reactive({ const state = reactive({
showM: false, imgList: [],
}); });
watch(
() => detailWatch,
(newValue) => {
console.log(78787878);
console.log(newValue);
},
{ deep: true }
);
const filterTxt = (txt) => { const filterTxt = (txt) => {
if (txt) { if (txt) {
@@ -329,7 +337,6 @@ export default defineComponent({
} }
}; };
const handleCancel = () => { const handleCancel = () => {
console.log(6767767);
emit("cancel"); emit("cancel");
}; };

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

@@ -377,7 +377,7 @@
<img src="../../assets/images/taskpage/right2.png"/> <img src="../../assets/images/taskpage/right2.png"/>
</div> </div>
<div class="centerbox" style="color: rgba(78, 166, 255, 1)"> <div class="centerbox" style="color: rgba(78, 166, 255, 1)">
单层项目 单层{{projectInfo.parentId?'子':''}}项目
</div> </div>
<div class="centermain"> <div class="centermain">
不包含子项目，直接填写项目基础信息后创建任务 不包含子项目，直接填写项目基础信息后创建任务
@@ -402,10 +402,10 @@
<img src="../../assets/images/taskpage/right3.png"/> <img src="../../assets/images/taskpage/right3.png"/>
</div> </div>
<div class="centerbox1" style="color: rgba(93, 201, 136, 1)"> <div class="centerbox1" style="color: rgba(93, 201, 136, 1)">
多层项目 多层{{projectInfo.parentId?'子':''}}项目
</div> </div>
<div class="centermain1"> <div class="centermain1">
包含子项目，分为多层子项目和单层子项目，多层子项目可创建班级，通过班级填写基础信息并创建任务 {{projectInfo.parentId?'可创建班级，通过班级填写基础信息并创建任务':'包含子项目，分为多层子项目和单层子项目，多层子项目可创建班级，通过班级填写基础信息并创建任务'}}
</div> </div>
</div> </div>
</div> </div>
@@ -644,6 +644,37 @@
</div> </div>
</div> </div>
</a-modal> </a-modal>
<!-- 撤回结束弹窗-->
<a-modal
v-model:visible="backFinashModal"
:footer="null"
:closable="closeBack"
wrapClassName="CopyModal"
centered="true"
>
<div class="delete">
<div class="del_header"></div>
<div class="del_main">
<div class="header">
<div class="icon"></div>
<span>提示</span>
<div class="close_exit" @click="closeBackFinashModal"></div>
</div>
<div class="body">
<span>是否撤回结束</span>
<div class="back">（项目撤回结束后学员可继续学习）</div>
</div>
<div class="del_btnbox">
<div class="del_btn btn1" @click="closeBackFinashModal">
<div class="btnText">取消</div>
</div>
<div class="del_btn btn2" @click="reFinashedProject">
<div class="btnText">确定</div>
</div>
</div>
</div>
</div>
</a-modal>
<!-- 创建项目提示框 --> <!-- 创建项目提示框 -->
<a-modal <a-modal
v-model:visible="reminderModal" v-model:visible="reminderModal"
@@ -778,6 +809,8 @@ import {storage} from "../../api/storage";
import ProjectManager from "@/components/project/ProjectManager"; import ProjectManager from "@/components/project/ProjectManager";
import ProjectClass from "@/components/project/ProjectClass"; import ProjectClass from "@/components/project/ProjectClass";
import OrgClass from "@/components/project/OrgClass"; import OrgClass from "@/components/project/OrgClass";
import dayjs from "dayjs";
export default { export default {
name: "projectManage", name: "projectManage",
@@ -848,6 +881,7 @@ export default {
projectClass: [], projectClass: [],
managerList: [], managerList: [],
managerLoading: false, managerLoading: false,
backFinashModal:false,
memberParam: { memberParam: {
pageNo: 1, pageNo: 1,
pageSize: 10, pageSize: 10,
@@ -965,16 +999,11 @@ export default {
api api
.getProjectCount(object.projectId) .getProjectCount(object.projectId)
.then((res) => { .then((res) => {
if (res.status === 200) { console.log("获取关卡、任务、学员统计数据", res.data);
console.log("获取关卡、任务、学员统计数据", res.data); state.projectStudentsNum = res.data.students;
state.projectStudentsNum = res.data.students; state.projectStages = res.data.stages;
state.projectStages = res.data.stages; state.projectTasks = res.data.tasks;
state.projectTasks = res.data.tasks;
}
}) })
.catch((err) => {
console.log("err", err);
});
// //获取学员总数 // //获取学员总数
// let obj = { // let obj = {
// pageNo: 0, // pageNo: 0,
@@ -1003,8 +1032,7 @@ export default {
projectId: state.releaseProjectId, projectId: state.releaseProjectId,
type: 4, type: 4,
}; };
api api.handleProject(obj)
.handleProject(obj)
.then((res) => { .then((res) => {
console.log("发布成功", res); console.log("发布成功", res);
message.destroy(); message.destroy();
@@ -1012,19 +1040,21 @@ export default {
state.projectPub = false; state.projectPub = false;
getTableDate(); getTableDate();
}) })
.catch((err) => {
console.log("发布失败", err);
});
}; };
//关闭发布弹窗 //关闭发布弹窗
const closeProjectPub = () => { const closeProjectPub = () => {
state.projectPub = false; state.projectPub = false;
}; };
//打开撤回弹窗 //打开撤回发布弹窗
const showBackModal = (projectId) => { const showBackModal = (projectId) => {
state.backModal = true; state.backModal = true;
state.recallProjectId = projectId; state.recallProjectId = projectId;
}; };
//打开撤回结束弹窗
const showBackFinashModal = (projectId) => {
state.backFinashModal = true;
state.recallProjectId = projectId;
};
//确认撤回发布 //确认撤回发布
const recallProject = () => { const recallProject = () => {
let obj = { let obj = {
@@ -1044,10 +1074,32 @@ export default {
console.log("撤回失败", err); console.log("撤回失败", err);
}); });
}; };
//确认撤回结束
const reFinashedProject = () => {
let obj = {
projectId: state.recallProjectId,
type: -6,
};
api
.handleProject(obj)
.then((res) => {
console.log("撤回成功", res);
message.destroy();
message.success("撤回成功");
state.backFinashModal = false;
getTableDate();
})
.catch((err) => {
console.log("撤回失败", err);
});
};
//关闭撤回弹窗 //关闭撤回弹窗
const closeBackModal = () => { const closeBackModal = () => {
state.backModal = false; state.backModal = false;
}; };
const closeBackFinashModal = () => {
state.backFinashModal = false;
};
//打开结束弹窗 //打开结束弹窗
const showStopModal = (projectId) => { const showStopModal = (projectId) => {
state.stopModal = true; state.stopModal = true;
@@ -1250,24 +1302,15 @@ export default {
customRender: (value) => { customRender: (value) => {
return ( return (
<div> <div>
{value.record.status == 0 || {value.record.type === 3 ? {
value.record.status == 1 || '0': () => '草稿',
value.record.status == 2 || '1': () => '草稿',
value.record.status == -2 '2': () => '草稿',
? "草稿" '3': () => dayjs().isBefore(value.record.beginTime) ? '未开始' : '进行中',
: value.record.status == 3 && '4': () => dayjs().isBefore(value.record.end) ? '进行中' : '已结束',
Number(value.record.beginTime) < '-1': () => '已结束',
Math.ceil(new Date().getTime() / 1000) '-5': () => '草稿'
? "进行中" }[value.record.status + '']() || '' : '-'}
: value.record.status == 3 &&
Number(value.record.beginTime) >
Math.ceil(new Date().getTime() / 1000) &&
value.record.type !== 1 &&
value.record.type !== 2
? "未开始"
: value.record.status == -1
? "已结束"
: "-"}
</div> </div>
); );
}, },
@@ -1290,19 +1333,15 @@ export default {
customRender: (value) => { customRender: (value) => {
return ( return (
<div> <div>
{value.record.type !== 3 {value.record.type === 3 ? {
? "-" '0': '未审核',
: value.record.status == 0 '1': '审核中',
? "未审核" '2': '已审核',
: value.record.status == 1 '3': '已审核',
? "审核中" '4': '已审核',
: value.record.status == 2 || '-1': '已审核',
value.record.status == 3 || '-5': '拒绝'
value.record.status == -1 }[value.record.status + ''] || '' : '-'}
? "已审核"
: value.record.status == -2
? "未通过"
: "-"}
</div> </div>
); );
}, },
@@ -1325,7 +1364,7 @@ export default {
// console.log("value", value.record.type, value.record.status); // console.log("value", value.record.type, value.record.status);
return ( return (
<div className="operation"> <div className="operation">
{value.record.status === 0 || value.record.status === -2 ? ( {value.record.status === 0 || value.record.status === -5 ? (
<span <span
onClick={() => { onClick={() => {
if (value.record.type === 1 || value.record.type === 2) { if (value.record.type === 1 || value.record.type === 2) {
@@ -1351,7 +1390,7 @@ export default {
) : ( ) : (
"" ""
)} )}
{(value.record.status === 0 || value.record.status === -2) && {(value.record.status === 0 || value.record.status === -5) &&
value.record.type === 3 ? ( value.record.type === 3 ? (
<span <span
onClick={() => { onClick={() => {
@@ -1365,7 +1404,7 @@ export default {
) : ( ) : (
"" ""
)} )}
{value.record.status === 1 && value.record.type !== 1 ? ( {value.record.status === 1 && value.record.type === 3 ? (
<span <span
onClick={() => { onClick={() => {
showRecallReviewModal(value.record.projectId); showRecallReviewModal(value.record.projectId);
@@ -1378,10 +1417,10 @@ export default {
) : ( ) : (
"" ""
)} )}
{value.record.status === 2 ? ( {value.record.status === 2 && value.record.type === 3 ? (
<span <span
onClick={() => { onClick={() => {
let time = value.record.beginTime + "-" + value.record.beginTime; let time = value.record.beginTime + "-" + value.record.endTime;
let obj = { let obj = {
projectId: value.record.projectId, projectId: value.record.projectId,
name: value.record.name, name: value.record.name,
@@ -1397,6 +1436,19 @@ export default {
) : ( ) : (
"" ""
)} )}
{value.record.status === 3 && value.record.type === 3 ? (
<span
onClick={() => {
showBackModal(value.record.projectId);
}}
style="cursor:pointer"
class="operation3"
>
撤回发布
</span>
) : (
""
)}
<div className="tableSelect"> <div className="tableSelect">
<a-select <a-select
style="width: 50px" style="width: 50px"
@@ -1519,6 +1571,33 @@ export default {
) : ( ) : (
"" ""
)} )}
{value.record.status === 3 && value.record.type === 3 ? (
<a-select-option value="结束" label="结束">
<div
onClick={() => {
showStopModal(value.record.projectId);
}}
>
结束
</div>
</a-select-option>
) : (
""
)}
{value.record.status === -1 && value.record.type === 3 ? (
<a-select-option value="撤回" label="撤回">
<div
onClick={() => {
showBackFinashModal(value.record.projectId);
}}
>
撤回
</div>
</a-select-option>
) : (
""
)}
{value.record.type === 3 ? ( {value.record.type === 3 ? (
<a-select-option value="基础信息" label="基础信息"> <a-select-option value="基础信息" label="基础信息">
<div <div
@@ -1664,6 +1743,9 @@ export default {
); );
return { return {
...toRefs(state), ...toRefs(state),
dayjs,
reFinashedProject,
showBackFinashModal,
timeChange, timeChange,
expandTable, expandTable,
showModal, showModal,
@@ -1684,6 +1766,7 @@ export default {
closeStartModal, closeStartModal,
showBackModal, showBackModal,
closeBackModal, closeBackModal,
closeBackFinashModal,
getTableDate, getTableDate,
showProjOwner, showProjOwner,
showProjPrower, showProjPrower,