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

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

Browse Source 
# Conflicts:
#	src/views/courselibrary/CoursewareManage.vue
This commit is contained in:
yuping
2022-12-08 00:41:13 +08:00
parent 20bc4096ae 059d3ece97
commit 806cb101b9
23 changed files with 10721 additions and 761 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/App.vue
View File

@@ -43,7 +43,7 @@ export default defineComponent({
const store = useStore();
const isLogin = ref(false);
// console.log("router", router.getRoutes(), route);
console.log("版本0.9.3------------");
console.log("版本0.9.4------------");
const routes = computed(() => {
return router.getRoutes().filter((e) => e.meta?.isLink);
});

2
src/api/config.js
View File

@@ -2,7 +2,7 @@
* @Author: lixg lixg@dongwu-inc.com
* @Date: 2022-11-21 14:32:52
* @LastEditors: lixg lixg@dongwu-inc.com
* @LastEditTime: 2022-12-07 08:54:55
* @LastEditTime: 2022-12-07 13:41:47
* @FilePath: /fe-manage/src/api/config.js
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
*/

3
src/api/indexAudit.js
View File

@@ -1,7 +1,8 @@
import http from "./config";
//获取待审核面授课列表
export const list = (obj) => http.post('/admin/offcourse/list', obj)
export const list = (obj) => http.post('/admin/offcourse/listToBeReviewed', obj)
// export const list = (obj) => http.post('/admin/offcourse/list', obj)
//获取待审核项目列表
export const projlist = (obj) => http.post('/admin/project/list', obj)

BIN
src/assets/images/project/finish.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
src/assets/images/project/reviewrecall.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
src/assets/images/project/reviewsubmit.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

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

@@ -78,7 +78,7 @@
</a-drawer>
</template>
<script>
import { reactive, toRefs } from "vue";
import { reactive, toRefs, ref } from "vue";
// import { useRouter } from "vue-router";
import EvList from "./EvList.vue";
import * as api from "../../api/indexEval";
@@ -252,7 +252,15 @@ export default {
console.log(err, "erererrerererererer");
});
}
// 防止连续点击出现添加多条问题
const prohibitClick = ref(false);
const creoredit = () => {
if(prohibitClick.value){
message.destroy();
message.error('请勿频繁点击')
return
}
prohibitClick.value = true;
if (props.edit) {
editInvistText()
} else {
@@ -289,10 +297,12 @@ export default {
ctx.emit("changeData", false);
message.destroy();
message.success("创建测评成功");
prohibitClick.value = false;
})
.catch(() => {
message.destroy();
message.error("创建测评失败");
prohibitClick.value = false;
});
}
//创建测评信息
@@ -326,10 +336,12 @@ export default {
ctx.emit("changeData", false);
message.destroy();
message.success("创建测评成功");
prohibitClick.value = false;
})
.catch(() => {
message.destroy();
message.error("创建测评失败");
prohibitClick.value = false;
});
};

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

@@ -256,8 +256,9 @@ export default {
const resetForm = () => {
// formRef.value.resetFields();
formState.workName = ''
formState.workRequirement = ''
formState.choosedTime = []
};
const handleValidate = (...args) => {
@@ -299,14 +300,28 @@ export default {
resetForm();
};
const closeDrawer2 = () => {
ctx.emit("update:edit", false);
formState.choosedTime = "";
ctx.emit("update:addhomeworkVisible", false);
ctx.emit("update:edit", false);
ctx.emit("update:EditWorkId", state.EditWorkId);
ctx.emit("update:workName", formState.workName);
console.log("state.EditWorkId==============", state.workName);
localStorage.setItem("stageId", props.chooseStageId);
localStorage.setItem("chapterId", props.isactive);
fileList.value = [];
state.workEnclosureAddress = "";
resetForm();
};
// 重置表单选项
const afterVisibleChange = () => {
console.log('11223344', props.EditWorkId)
if (props.EditWorkId > 0) {
state.EditWorkId = props.EditWorkId;
queryWork();
}else{
formRef.value.resetFields();
resetForm();
}
};

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

@@ -21,24 +21,24 @@
<div class="main_items">
<div class="mi_ipts">
<div class="mii_ipt">
<div class="ipt_name">课程编号：</div>
<div class="ipt_name">课程名称：</div>
<div class="fi_input">
<a-input
v-model:value="inputV1"
style="width: 240px; height: 40px; border-radius: 8px"
placeholder="请输入项目名称"
placeholder="请输入课程名称"
maxlength="20"
/>
</div>
</div>
<div class="mii_ipt">
<div class="ipt_name">内容分类：</div>
<div class="ipt_name">课程分类：</div>
<div class="select">
<a-select
v-model:value="selectV"
dropdownClassName="dropdown-style"
style="width: 240px"
placeholder="请选择"
placeholder="请选择课程分类"
:options="options1"
allowClear
showSearch
@@ -209,7 +209,7 @@ export default {
},
setup(props, ctx) {
const state = reactive({
inputV1: "",
inputV1: null,
options1: [
{
value: "微课",
@@ -223,7 +223,7 @@ export default {
time: undefined,
onlineClassesId: null,
onlineName: "",
selectV: "",
selectV: null,
selectedRowKeys: [],
tableData: [],
addOnlineList: [],
@@ -239,7 +239,8 @@ export default {
state.choicecourse = true;
ctx.emit("update:addonlineVisible", false);
ctx.emit("update:edit", false);
state.inputV1 = "";
state.inputV1 = null;
state.selectV = null;
state.selectedRowKeys = [];
state.addOnlineList = [];
state.currentPage = 1;
@@ -258,7 +259,7 @@ export default {
dataIndex: "num",
key: "num",
width: "80px",
align: "left",
align: "center",
},
{
title: "名称",
@@ -266,9 +267,10 @@ export default {
key: "name",
width: "100px",
align: "center",
ellipsis: true,
},
{
title: "内容分类",
title: "课程分类",
dataIndex: "contenttype",
key: "contenttype",
width: "80px",
@@ -539,17 +541,13 @@ export default {
})
.then(() => {
message.destroy();
message.success(
`${props.edit ? "编辑" : "新增"}任务成功`
);
message.success(`${props.edit ? "编辑" : "新增"}任务成功`);
ctx.emit("changeData", false);
closeDrawer();
})
.catch(() => {
message.destroy();
message.error(
`${props.edit ? "编辑" : "新增"}任务失败`
);
message.error(`${props.edit ? "编辑" : "新增"}任务失败`);
});
});
}
@@ -583,7 +581,7 @@ export default {
};
//搜索在线列表
const searchList = () => {
if (state.inputV1 !== "" || state.selectV !== "") {
if (state.inputV1 || state.selectV) {
getAllOnlineText();
} else {
resetOnline();
@@ -591,8 +589,8 @@ export default {
};
//重置在线信息
const resetOnline = () => {
state.inputV1 = "";
state.selectV = "";
state.inputV1 = null;
state.selectV = null;
state.selectedRowKeys = [];
state.addOnlineList = [];
state.currentPage = 1;
@@ -763,6 +761,7 @@ export default {
}
.ant-table-selection-column {
padding: 0px !important;
padding-left: 5px !important;
}
.ant-table-thead > tr > th {
background-color: rgba(239, 244, 252, 1);

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

@@ -580,6 +580,7 @@ export default {
// state.addLoading = true;
queryExaminationDetailById({ examinationId: props.EditTestId })
.then((res) => {
console.log("获取编辑考试信息", res);
formState.examinationName = res.data.data.examinationName;
formState.workRequirement = res.data.data.workRequirement;
formState.examinationDuration = res.data.data.examinationDuration;
@@ -594,6 +595,9 @@ export default {
formState.showAnswers = Number(res.data.data.showAnswers) || 1;
formState.papaerName = res.data.data.examinationTestName;
state.paperName = res.data.data.examinationTestName;
// state.paperId=
state.paperId = res.data.data.examinationTestId;
state.paperName = res.data.data.examinationTestName;
if (
res.data.data.examinationEndTime &&
res.data.data.examinationStartTime
@@ -658,7 +662,7 @@ export default {
updateExamination(obj)
.then(async (res) => {
await updateTask(res);
closeDrawer();
// closeDrawer();
})
.catch(() => {
message.destroy();
@@ -669,7 +673,7 @@ export default {
createExamination(obj)
.then(async (res) => {
await updateTask(res);
closeDrawer();
// closeDrawer();
})
.catch(() => {
message.destroy();
@@ -694,7 +698,8 @@ export default {
};
RouterEditTask(editObj1)
.then(() => {
//message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`);
console.log("props.edit", props.edit);
message.success(`${props.edit ? "编辑" : "新增"}任务成功`);
ctx.emit("changeData", false);
state.addLoading = false;
closeDrawer();
@@ -715,8 +720,9 @@ export default {
// 新增编辑或新增项目
ProjectEditTask(editObj)
.then(() => {
//message.success(`${props.EditTestId ? "编辑" : "新增"}阶段任务成功`);
message.success(`${props.edit ? "编辑" : "新增"}任务成功`);
ctx.emit("changeData", false);
closeDrawer();
})
.catch(() => {
//message.error(`${props.EditTestId ? "编辑" : "新增"}阶段任务失败`);
@@ -732,8 +738,9 @@ export default {
type: 5,
})
.then(() => {
//message.success( `${props.EditTestId ? "编辑" : "新增"}阶段任务成功`);
message.success(`${props.edit ? "编辑" : "新增"}任务成功`);
ctx.emit("changeData", false);
closeDrawer();
})
.catch(() => {
//message.error(`${props.EditTestId ? "编辑" : "新增"}阶段任务失败`);

61
src/components/drawers/EvList.vue
View File

@@ -48,7 +48,10 @@
:data-source="tableData"
:loading="tableDataTotal === -1 ? true : false"
:pagination="false"
:row-selection="{ selectedRowKeys:selectedRowKeys,onChange:onSelectChange}"
:row-selection="{
selectedRowKeys: selectedRowKeys,
onChange: onSelectChange,
}"
/>
<div class="pa">
<a-pagination
@@ -124,9 +127,9 @@ import { reactive, toRefs } from "vue";
key: "content",
align: "center",
maxWidth: "13%",
overflow: 'hidden',
whiteSpace: 'nowrap',
textOverflow: 'ellipsis',
overflow: "hidden",
whiteSpace: "nowrap",
textOverflow: "ellipsis",
},
{
title: "状态",
@@ -149,19 +152,19 @@ import { reactive, toRefs } from "vue";
key: "time",
align: "center",
},
]
],
});
const onSelectChange = (selectedRowKeys, selectedRows) => {
if (selectedRowKeys.length > 1) {
return
}
state.selectedRowKeys = selectedRowKeys
state.evListData = selectedRows[0] ? selectedRows[0] : {}
return;
}
state.selectedRowKeys = selectedRowKeys;
state.evListData = selectedRows[0] ? selectedRows[0] : {};
};
const closeDrawer = () => {
state.selectedRowKeys = []
state.evListData = {}
state.inputV1 = ""
state.selectedRowKeys = [];
state.evListData = {};
state.inputV1 = "";
ctx.emit("update:EvalListVisible", false);
};
const afterVisibleChange = (bol) => {
@@ -172,7 +175,7 @@ import { reactive, toRefs } from "vue";
const checkFinish = () => {
ctx.emit("getEvListData", state.evListData);
closeDrawer();
}
};
const changePagination = (page) => {
state.currentPage = page;
getAllEvalText();
@@ -194,15 +197,14 @@ import { reactive, toRefs } from "vue";
quiz_price: value.quiz_price,
quiz_range: value.quiz_range,
};
array.push(obj)
array.push(obj);
if (obj.title == props.evaluationTypeName) {
arrayKey.push(obj.key);
}
});
state.tableData = array;
state.selectedRowKeys = arrayKey;
}
else{
} else {
data.map((value, index) => {
let obj = {
key: index + 1,
@@ -223,32 +225,31 @@ import { reactive, toRefs } from "vue";
//获取测评列表
const getAllEvalText = () => {
let objael = {
"keyword": state.inputV1,
"user_id": "965341999643234304",
}
keyword: state.inputV1,
user_id: "965341999643234304",
};
api
.choiceEvaluation(objael)
.then((res) => {
getTableDataList(res.data.data)
getTableDataList(res.data.data);
})
.catch(()=>{
})
}
.catch(() => {});
};
//搜索测评列表
const searchList = () => {
if(state.inputV1 !== ''){
getAllEvalText()
if (state.inputV1 !== "") {
getAllEvalText();
} else {
resetData()
}
resetData();
}
};
//重置测评列表
const resetData = () => {
state.currentPage = 1;
state.selectedRowKeys = [];
state.evListData = {}
state.evListData = {};
getAllEvalText();
}
};
return {
...toRefs(state),
afterVisibleChange,
@@ -406,7 +407,7 @@ import { reactive, toRefs } from "vue";
}
.ant-table-selection-column {
padding: 0px !important;
padding-left: 60px !important;
padding-left: 5px !important;
}
.ant-table-thead > tr > th {
background-color: rgba(239, 244, 252, 1);

18
src/components/drawers/NoticePub.vue
View File

@@ -11,11 +11,11 @@
</span>
</div>
<template v-if="noticeChecked">
<p>公告内容</p>
<p>当前公告内容</p>
<!-- 预览 -->
<template v-if="!editOn">
<div class="txt-content">
{{ noticeContent ? noticeContent : "暂无公告" }}
{{ noticeContent1 ? noticeContent1 : "暂无公告" }}
</div>
<div class="btn-content">
<a-button type="primary" @click="handleEdit">编辑</a-button>
@@ -23,13 +23,12 @@
</template>
<!-- 编辑 -->
<template v-if="editOn">
<div class="txt-contain">
<span>预览：</span>
<div class="txt-content">
{{ noticeContent }}
{{ noticeContent1 ? noticeContent1 : "暂无公告" }}
</div>
</div>
<p>编辑：</p>
<p>编辑新公告：</p>
<a-textarea
v-model:value="noticeContent"
:maxlength="150"
@@ -65,14 +64,15 @@ export default {
const state = reactive({
noticeChecked: true,
projectInfo: {},
noticeContent1: "",
noticeContent: "",
editOn: false,
});
const getTaskInfo = () => {
getTask({ projectId: props.projectId }).then((res) => {
console.log("公告获取项目", res.data.data.projectInfo);
state.projectInfo = res.data.data.projectInfo;
state.noticeContent1 = state.projectInfo.notice;
state.noticeContent = state.projectInfo.notice;
});
};
@@ -104,7 +104,7 @@ export default {
if (res.data.code === 200) {
message.destroy();
message.success("发布成功", res);
state.noticeContent = res.data.data.notice;
state.noticeContent1 = res.data.data.notice==""?"暂无公告":res.data.data.notice;
handleCancel();
emitter.emit("setNotice", false);
}

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

@@ -269,15 +269,20 @@
</a-modal>
<!-- 选择线上还是面授课弹窗 -->
<!-- 确定新建面授课弹窗 -->
<CourseModal
ref="CourseModalRef"
@visibleClose="closeOnlineCoursevisible"
/>
<!-- 查看面授课弹框 start -->
<a-modal
v-model:visible="ft_hs"
v-model:visible="lookMs"
title="Title"
@ok="handlePush"
@ok="handlelookMs"
:footer="null"
:closable="false"
wrapClassName="modalStyle facteachModal"
width="80%"
@cancel="ft_exit_1"
@cancel="handlelookMs"
>
<div class="modalHeader">
<div class="headerLeft">
@@ -285,24 +290,18 @@
style="width: 17px; height: 18px; margin-right: 8px"
src="../../assets/images/basicinfo/add.png"
/>
<span v-if="ft_eidt" class="headerLeftText">编辑面授课</span>
<span v-else class="headerLeftText">新建面授课</span>
<span class="headerLeftText">查看面授课</span>
</div>
<div style="margin-right: 57px; cursor: pointer">
<img
@click="ft_exit_1"
@click="handlelookMs"
style="width: 22px; height: 22px"
src="../../assets/images/basicinfo/close22.png"
/>
</div>
</div>
<div class="modalMain">
<!-- 审核理由 -->
<div v-if="statusJuJue" class="statusJuJue">
<span>审核意见：</span>
<span>111</span>
</div>
<div class="faceteach" :style="{ display: ft_hs ? 'block' : 'none' }">
<div class="faceteach">
<div class="ft_main">
<div class="m_title">课程信息</div>
<div class="m_body">
@@ -320,6 +319,7 @@
<div class="item_inp">
<div class="i1_input">
<a-input
aria-readonly="true"
v-model:value="qdms_inputV1"
maxlength="90"
style="width: 440px; height: 40px; border-radius: 8px"
@@ -389,7 +389,7 @@
return triggerNode.parentNode || document.body;
}
"
v-model:value="feng_mian_1"
v-model:value="feng_mian_2"
dropdownClassName="dropdown-style"
style="width: 440px"
placeholder="请选择"
@@ -399,8 +399,8 @@
></a-select>
<img
class="i_upload_img"
v-if="feng_mian_1"
:src="feng_mian_1"
v-if="feng_mian_2"
:src="feng_mian_2"
alt="avatar"
/>
<!-- <a-upload
@@ -535,7 +535,7 @@
<span style="margin-right: 14px">内容标签</span>
</div>
<div class="item_inp">
<!-- <a-select
<a-select
:getPopupContainer="
(triggerNode) => {
return triggerNode.parentNode || document.body;
@@ -546,22 +546,7 @@
style="width: 440px; height: 40px"
placeholder="请输入按回车键创建成功"
:options="tagsOptions"
></a-select> -->
<a-input
v-model:value="tags_val_single"
placeholder="请输入按回车键创建成功"
@pressEnter="handleTagChange"
/>
<div class="tag-content">
<a-tag
v-for="(item, index) in tags_val"
:key="index"
closable
@close="handleTagClose(index)"
>
{{ item }}
</a-tag>
</div>
></a-select>
</div>
</div>
</div>
@@ -574,7 +559,6 @@
alt="asterisk"
/>
</div>
<!-- 授课教师1 -->
<span style="margin-right: 14px">授课教师</span>
</div>
<div class="item_inp">
@@ -606,12 +590,82 @@
</div>
</div>
</div>
<div class="mbl_items2">
<div class="mbl_items">
<div class="item_nam">
<span style="margin-right: 14px">附件</span>
<span style="margin-right: 10px">附件</span>
</div>
<div class="item_inp">
<FJUpload v-model:value="attach"></FJUpload>
<a-upload
multiple
:show-upload-list="false"
:before-upload="beforeUpload2"
>
<div class="accessory" style="cursor: pointer">
<div class="accessory_icon">
<img
src="@/assets/images/coursewareManage/enclosure.png"
alt="enclosure"
/>
</div>
<span style="color: #4ea6ff">添加附件</span>
</div>
</a-upload>
<span>
支持.pdf,.ppt,.pptx,.doc,.docx,.xls,.xlsx,.jpg,.jpeg,.png,.gif,.zip
</span>
</div>
</div>
<div class="mbl_items12">
<div
class="i12_box1"
v-for="(item, index) in imgList"
:key="index"
>
<div class="file_img"></div>
<div class="file_detail">
<!-- <div class="file_name">
<span style="color: #6f6f6f">{{ item.name }}</span>
</div> -->
<!-- 条件渲染 s -->
<!-- <div class="file_size">
<span style="color: #999ba3">{{ item.size }}</span>
</div> -->
<div class="file_updata">
<div class="updatabox">
<div class="updatacolor"></div>
<div class="updataxq">上传完成</div>
<!-- <div class="updatacolor2"></div>
<div class="updataxq2">上传失败</div> -->
<!-- <div class="updatacolor3"></div>
<div class="updataxq3">正在上传</div> -->
</div>
<div class="upjd">
<span style="margin: auto 5px">100%</span>
</div>
</div>
<!-- 条件渲染 e -->
</div>
<div class="file_operation">
<div class="fobox">
<span style="color: #4ea6ff" @click="handleDel(index)">
删除
</span>
</div>
<!-- <div class="fobox">
<span style="color: #4ea6ff">重传</span>
</div>
<div class="fobox">
<span style="color: #4ea6ff">取消</span>
</div> -->
<!-- <div class="fobox">
<span style="color: #4ea6ff; margin-right: 5px">
暂停
</span>
</div>
<div class="fobox">
<span style="color: #4ea6ff">取消</span>
</div> -->
</div>
</div>
</div>
</div>
@@ -639,26 +693,17 @@
</div>
</div>
<div class="m_btn">
<div class="btn btn5" @click="ft_exit_1">
<!-- <div class="btn btn5" @click="handlelookMs">
<div class="btnText">取消</div>
</div>
<div class="btn btn6" @click="handlePush">
<div class="btnText">保存</div>
</div>
<div
class="btn btn6"
v-if="statusTingQi == 1"
@click="reviewClick"
>
<div class="btnText">提交审核</div>
</div>
<div class="btn btn6" v-if="isEdit == 0" @click="handlelookMs">
<div class="btnText">确定</div>
</div> -->
</div>
</div>
</div>
</div>
</a-modal>
<!-- 查看面授课弹框 start -->
<!-- 查看面授课弹框 end -->
<!-- 确定新建面授课弹窗 -->
<!-- 表格 -->
@@ -1706,7 +1751,7 @@
/>
</div>
</div>
<div class="cstm_items">f
<div class="cstm_items">
<div class="signbox">
<div class="sign">
<img
@@ -1845,12 +1890,96 @@
</a-checkbox>
</div>
</div>
<div class="cstm_items items_fj" style="align-items: flex-start">
<div class="cstm_items items_fj">
<div class="signbox">
<span style="margin-right: 3px">附件</span>
</div>
<div class="b_input">
<FJUpload v-model:value="attach"></FJUpload>
<a-upload
name="file"
:show-upload-list="false"
:before-upload="beforeUpload3"
>
<div class="upload_box">
<div class="upload_icon">
<img
src="@/assets/images/coursewareManage/enclosure.png"
alt=""
/>
</div>
<span style="color: #4ea6ff">上传附件</span>
</div>
<!-- <template #itemRender="{ file }">
<a-space>
<span :style="file.status === 'error' ? 'color: red' : ''">
{{ file.name }}
</span>
</a-space>
</template> -->
</a-upload>
</div>
</div>
<div class="cstm_items">
<div class="signbox">
<span style="margin-right: 3px"> </span>
</div>
<div class="b_input">
<span style="color: #999ba3">
支持.pdf,.ppt,.pptx,.doc,.docx,.xls,.xlsx,.jpg,.jpeg,.png,.gif,.zip
</span>
</div>
</div>
<div class="mbl_items12">
<div
class="i12_box1"
v-for="(item, index) in filesList"
:key="index"
>
<div class="file_img"></div>
<div class="file_detail">
<!-- <div class="file_name">
<span style="color: #6f6f6f">{{ item.name }}</span>
</div> -->
<!-- 条件渲染 s -->
<!-- <div class="file_size">
<span style="color: #999ba3">{{ item.size }}</span>
</div> -->
<div class="file_updata">
<div class="updatabox">
<div class="updatacolor"></div>
<div class="updataxq">上传完成</div>
<!-- <div class="updatacolor2"></div>
<div class="updataxq2">上传失败</div> -->
<!-- <div class="updatacolor3"></div>
<div class="updataxq3">正在上传</div> -->
</div>
<div class="upjd">
<span style="margin: auto 5px">100%</span>
</div>
</div>
<!-- 条件渲染 e -->
</div>
<div class="file_operation">
<div class="fobox">
<span style="color: #4ea6ff" @click="handleDel2(index)">
删除
</span>
</div>
<!-- <div class="fobox">
<span style="color: #4ea6ff">重传</span>
</div>
<div class="fobox">
<span style="color: #4ea6ff">取消</span>
</div> -->
<!-- <div class="fobox">
<span style="color: #4ea6ff; margin-right: 5px">
暂停
</span>
</div>
<div class="fobox">
<span style="color: #4ea6ff">取消</span>
</div> -->
</div>
</div>
</div>
<div class="items_btn">
@@ -1858,8 +1987,7 @@
<div class="btnText">取消</div>
</div>
<div class="cstm_btn btn6" @click="handleSureStu">
<div v-if="addLoading" class="btnText">保存中</div>
<div v-else class="btnText">确定</div>
<div class="btnText">确定</div>
</div>
</div>
</div>
@@ -2425,8 +2553,7 @@
<div class="btnText" @click="delete_exit1">取消</div>
</div>
<div class="del_btn btn2">
<div v-if="addLoading" class="btnText">保存中...</div>
<div v-else class="btnText" @click="handleDeleteExit">确定</div>
<div class="btnText" @click="handleDeleteExit">确定</div>
</div>
</div>
</div>
@@ -2494,7 +2621,7 @@
</div>
<div class="aeLoading" :style="{ display: addLoading ? 'flex' : 'none' }">
<a-spin :spinning="addLoading" tip="保存中..."/>
<a-spin :spinning="addLoading" tip="" />
</div>
</template>
<script>
@@ -2509,6 +2636,7 @@ import {
watch,
} from "vue";
import * as api from "../../api/indexInvist.js";
import * as api2 from "../../api/indexAudit.js";
import { message } from "ant-design-vue";
import { useRouter, useRoute } from "vue-router";
// import StuAdd from "../../components/drawers/StuAdd";
@@ -2554,7 +2682,7 @@ import {Editor, Toolbar} from "@wangeditor/editor-for-vue";
import ProjectManager from "@/components/project/ProjectManagerNew";
import SeeModal from "./components/seeModal.vue";
import FJUpload from "@/components/common/FJUpload.vue";
import CourseModal from "./courseModal.vue";
import * as moment from "moment";
//列表表格
@@ -2824,8 +2952,8 @@ const columns6 = [
},
{
title: "创建人",
dataIndex: "name",
key: "name",
dataIndex: "createName",
key: "createName",
width: "10%",
align: "center",
ellipsis: true,
@@ -3056,12 +3184,12 @@ const columns7 = [
];
export default defineComponent({
components: {
FJUpload,
// OwnPower,
// Corpowerlist,
Editor,
Toolbar,
SeeModal,
CourseModal,
// StuAdd,
ProjectManager,
ProjOwnerShip,
@@ -3074,15 +3202,16 @@ export default defineComponent({
addOnlineCourse,
},
setup() {
const CourseModalRef = ref(null);
const state = reactive({
attach: '',//附件
shipType: 1,
addLoading: false,
currentPlanItem: {},
teacherId: null,
teacher: null,
fileList: [],
selectedRowKeys7: [],
auditDescription: "",
isEdit: 0,
member: { name: "", value: "" },
//列表表格
@@ -3461,6 +3590,8 @@ export default defineComponent({
});
};
const beforeUpload2 = (file) => {
console.log(6765555);
console.log(file);
const fileType = [
"jpg",
"jpeg",
@@ -3475,8 +3606,7 @@ export default defineComponent({
"xlsx",
"zip",
];
console.log(file.name.split(".").slice(-1))
if (!fileType.includes(file.name.split(".").slice(-1).join(''))) {
if (!fileType.includes(file.name.split(".")[1])) {
message.error(
"仅支持.pdf,.ppt,.pptx,.doc,.docx,.xls,.xlsx,.jpg,.jpeg,.png,.gif,.zip格式!"
);
@@ -3489,21 +3619,21 @@ export default defineComponent({
// return false;
// }
// const formData = new FormData();
// formData.append("file", file);
// console.log(file);
// fileUp(formData).then((res) => {
// if (res.data.code === 200) {
// state.imgList.push({
// img: res.data.data,
// name: file.name,
// size: file.size,
// });
// console.log(state.imgList);
// // state.hasImgName = res.data.data;
// }
// });
// return false;
const formData = new FormData();
formData.append("file", file);
console.log(file);
fileUp(formData).then((res) => {
if (res.data.code === 200) {
state.imgList.push({
img: res.data.data,
name: file.name,
size: file.size,
});
console.log(state.imgList);
// state.hasImgName = res.data.data;
}
});
return false;
};
const handleDel = (index) => {
state.imgList.splice(index, 1);
@@ -3946,7 +4076,7 @@ export default defineComponent({
let obj = {
pageNo: state.currentPage222,
pageSize: state.pageSize222,
name: state.kk_inputV1,
createName: state.kk_inputV1,
teacher: state.kk_inputV2,
beginTime: parseInt(new Date(state.selectTime).getTime() / 1000),
offcourseId: state.offcourseId,
@@ -4059,7 +4189,9 @@ export default defineComponent({
const createft = () => {
if (state.bs_hs == false && state.valueE1 != "") {
state.of_hs = false;
state.ft_hs = true;
// state.ft_hs = true;
CourseModalRef.value.visibleOpen(null);
state.valueE1 = "";
state.teacher = "";
state.teacherName = "";
@@ -4081,9 +4213,14 @@ export default defineComponent({
}
return count ? false : true;
};
const ft_exit_0 = () => {
// state.ft_hs = false;
CourseModalRef.value.visibleClose();
};
const ft_exit_1 = () => {
state.ft_hs = false;
router.go(0);
// state.ft_hs = false;
CourseModalRef.value.visibleClose();
// router.go(0);
};
const ft_exit = () => {
state.ft_eidt = false;
@@ -4135,7 +4272,7 @@ export default defineComponent({
teacherId: state.member.value,
teacher: state.member.name,
intro: state.qdms_inputV6,
attach: state.attach,
attach: files,
outline: valueHtml.value,
//teacherId:state.teacherId ,
};
@@ -4159,7 +4296,7 @@ export default defineComponent({
edit(postData).then((res) => {
if (res.data.code === 200) {
getTableDate();
// ft_exit_1();
ft_exit_0();
rest();
state.addLoading = false;
@@ -4223,7 +4360,7 @@ export default defineComponent({
address: state.xjkkinputV2,
applyFlag: state.checked1 ? 1 : 0,
attach: state.attach,
attach: state.filesList.length ? state.filesList.join(",") : "",
beginTime: startTime,
completeType: type,
endTime: endTime,
@@ -4287,6 +4424,7 @@ export default defineComponent({
state.xjkkinputV2 = item.address;
state.checked1 = item.applyFlag === 1 ? true : false;
state.filesList = item.attach ? item.attach.split(",") : [];
state.xjkkinputV3 = [
dayjs(item.beginTime, "YYYY-MM-DD HH:mm:ss"),
dayjs(item.endTime, "YYYY-MM-DD HH:mm:ss"),
@@ -4314,7 +4452,6 @@ export default defineComponent({
*/
state.member = { value: item.teacherId, name: item.teacher };
state.attach = item.attach;
state.cstm_hs = true;
state.kk_eidt = true;
};
@@ -4694,6 +4831,17 @@ export default defineComponent({
};
//编辑面授课
const handleEdit = async (itm, type) => {
// auditDescription
let obj = {
offcourseId: itm.offcourseId,
pageNo: 1,
pageSize: 1,
type: 2,
};
api2.auditList(obj).then((res) => {
state.auditDescription = res.data.data.rows[0].description;
});
console.log(45555);
console.log(itm);
if (type === "1") {
@@ -4701,38 +4849,53 @@ export default defineComponent({
}
state.offcourseId = itm.offcourseId;
const item = await detail({
offcourseId: Number(state.offcourseId),
}).then((res) => {
if (res.data.code === 200) return res.data.data;
});
// const item = await detail({
// offcourseId: Number(state.offcourseId),
// }).then((res) => {
// if (res.data.code === 200) return res.data.data;
// });
state.statusJuJue = Number(item.auditStatus) === -1 ? 1 : 0;
// state.statusJuJue = Number(item.auditStatus) === -1 ? 1 : 0;
if (Number(item.auditStatus) === 2 && Number(item.status) === 1) {
state.statusTingQi = 1;
}
if (Number(item.auditStatus) === 2 && Number(item.status) === 0) {
state.statusTingQi = 0;
}
// if (Number(item.auditStatus) === 2 && Number(item.status) === 1) {
// state.statusTingQi = 1;
// }
// if (Number(item.auditStatus) === 2 && Number(item.status) === 0) {
// state.statusTingQi = 0;
// }
state.qdms_inputV1 = item.name;
// state.imageUrl = item.picUrl;
state.feng_mian_1 = item.picUrl;
state.qdms_inputV2 = item.targetUser;
state.qdms_inputV3 = item.meaning;
state.fen_lei = String(item.categoryId);
state.chang_jin = String(item.sceneId);
state.tags_val = item.tips ? item.tips.split(",") : [];
//state.qdms_inputV5 = item.teacherId;
state.teacher = item.teacher;
state.teacherId = item.teacherId;
state.qdms_inputV6 = item.intro;
state.member = {value: item.teacherId, name: item.teacher};
state.attach = item.attach;
valueHtml.value = item.outline;
state.ft_hs = true;
// state.qdms_inputV1 = item.name;
// // state.imageUrl = item.picUrl;
// state.feng_mian_1 = item.picUrl;
// state.qdms_inputV2 = item.targetUser;
// state.qdms_inputV3 = item.meaning;
// state.fen_lei = String(item.categoryId);
// state.chang_jin = String(item.sceneId);
// state.tags_val = item.tips ? item.tips.split(",") : [];
// //state.qdms_inputV5 = item.teacherId;
// state.teacher = item.teacher;
// state.teacherId = item.teacherId;
// state.qdms_inputV6 = item.intro;
// state.member = { value: item.teacherId, name: item.teacher };
// if (item.attach == "") {
// state.imgList = [];
// } else {
// if (item.attach.indexOf(",")) {
// const arr = item.attach.split(",");
// arr.forEach((item) => {
// state.imgList.push({ img: item });
// });
// } else {
// state.imgList = [{ img: item.attach }];
// }
// }
// valueHtml.value = item.outline;
// state.ft_hs = true;
CourseModalRef.value.visibleOpen(state.offcourseId);
state.ft_eidt = true;
getTea();
};
// handleTagChange
@@ -4762,6 +4925,7 @@ export default defineComponent({
if (res.data.code === 200) return res.data.data;
});
state.lookCourseModal = true;
item.attach = item.attach == "" ? [] : item.attach.split(",");
state.faceDetailObj = item;
};
// const handleTea = async () => {
@@ -4898,28 +5062,28 @@ export default defineComponent({
"xlsx",
"zip",
];
if (!fileType.includes(file.name.split(".").slice(-1).join(''))) {
if (!fileType.includes(file.name.split(".")[1])) {
message.error(
"仅支持.pdf,.ppt,.pptx,.doc,.docx,.xls,.xlsx,.jpg,.jpeg,.png,.gif,.zip格式!"
);
return false;
}
// const formData = new FormData();
// formData.append("file", file);
// console.log(file);
// fileUp(formData).then((res) => {
// if (res.data.code === 200) {
// // state.filesList.push({
// // img: res.data.data,
// // name: file.name,
// // size: file.size,
// // });
// // console.log(state.filesList);
// state.filesList = [res.data.data];
// // state.hasImgName = res.data.data;
// }
const formData = new FormData();
formData.append("file", file);
console.log(file);
fileUp(formData).then((res) => {
if (res.data.code === 200) {
// state.filesList.push({
// img: res.data.data,
// name: file.name,
// size: file.size,
// });
// console.log(state.filesList);
state.filesList = [res.data.data];
// state.hasImgName = res.data.data;
}
});
return false;
};
@@ -4983,7 +5147,7 @@ export default defineComponent({
handle(obj).then((res) => {
console.log("提交审核成功", res.data);
if (res.data.code === 200) {
ft_exit_1();
ft_exit_0();
rest();
getTableDate();
state.addLoading = false;
@@ -5091,14 +5255,10 @@ export default defineComponent({
getTableDate();
};
function handleFileChange({file, fileList}) {
file.response && file.response.code === 200 && (file.src = file.response.data)
state.fileList = fileList
}
return {
...toRefs(state),
handleFileChange,
CourseModalRef,
getdateToDateFn,
moment,
getdateToTimeFn,
@@ -5144,6 +5304,7 @@ export default defineComponent({
createft,
ft_exit,
ft_exit_1,
ft_exit_0,
om_exit,
ckxq_hs,
ftsr_exit,

8356
src/views/courselibrary/CoursewareManage_Old.vue Normal file
View File

File diff suppressed because it is too large Load Diff

1211
src/views/courselibrary/courseModal.vue Normal file
View File

File diff suppressed because it is too large Load Diff

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

@@ -319,6 +319,7 @@
'background-image': 'url(' + item.dictValue + ')',
display: index >= 5 ? 'none' : 'flex',
}"
style="background-size: 100% 100%"
>
<!-- <img class="im" :src="item.source" /> -->
</div>
@@ -857,8 +858,8 @@ export default {
api
.getLearnCount(router.id)
.then((res) => {
console.log("获取关卡、任务、学员统计数据", res.data);
if (res.status === 200) {
// console.log("获取关卡、任务、学员统计数据", res.data);
state.routeStudentsNum = res.data.students;
state.routeChapters = res.data.chapters;
state.routeTasks = res.data.tasks;
@@ -1045,18 +1046,14 @@ export default {
? "已结束"
: "-",
creater: value.createName ? value.createName : "-",
pubtime: value.publishTime
? value.publishTime
: "-",
cretime: value.createTime
? value.createTime
: "-",
pubtime: value.publishTime ? value.publishTime : "-",
cretime: value.createTime ? value.createTime : "-",
remark: value.remark ? value.remark : "-",
};
array.push(obj);
});
state.tableData = array;
console.log(array,tableData)
console.log(array, tableData);
};
const tableDataFunc = () => {

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

@@ -455,7 +455,9 @@
<div class="iconame">
「{{ checkType(item.type) }}」
</div>
<div class="icontext">{{ item.name }}</div>
<div class="icontext" :title="item.name">
{{ item.name }}
</div>
</div>
</div>
<div class="type">
@@ -466,7 +468,7 @@
<div class="time">
<div class="timetext">开始时间</div>
<div class="timetext">
{{ item.startTime !== null ? item.startTime : "" }}
{{ item.startTime !== null ? item.startTime : "-" }}
</div>
</div>
<div class="progress">
@@ -692,63 +694,78 @@
</div>
<div class="onemain clearfix">
<div class="checkcon">
<input
<a-checkbox
class="in"
:disabled="number"
v-model:checked="previewSelect"
></a-checkbox>
<!-- <input
type="checkbox"
name="cb1"
value="yulan"
v-model: ="previewSelect"
class="in"
/>
:disabled="number"
/> -->
<span class="yulan">预览其他关卡</span><br />
<div style="width: 10px; height: 4px"></div>
<div style="display: flex; align-items: center">
<span class="yulan2">学员可预览第</span>
<span style="color: #4ea6ff" v-show="number">1</span>
<span style="color: #4ea6ff" v-show="number">{{
previewStartNum
}}</span>
<a-input-number
v-model:value="nubvalue"
v-model:value="previewStartNum"
v-show="inputbox"
:controls="false"
:autofocus="true"
:min="1"
:min="0"
/>
<span>关-第</span
><span style="color: #4ea6ff" v-show="number">4</span>
><span style="color: #4ea6ff" v-show="number">{{
previewEndNum
}}</span>
<a-input-number
v-model:value="nubvalue1"
v-model:value="previewEndNum"
v-show="inputbox"
:controls="false"
:autofocus="true"
:min="1"
:min="0"
/>
<span>关内容</span>
</div>
</div>
<div class="checkcon" style="margin-top: 20px">
<input
<!-- <input
type="checkbox"
name="cb1"
value="xuexi"
v-model:value="studySelect"
class="in"
/>
:disabled="number"
/> -->
<span class="yulan">学习其他关卡</span><br />
<div style="width: 10px; height: 4px"></div>
<div style="display: flex; align-items: center">
<span class="yulan2">学员可预览第</span>
<span style="color: #4ea6ff" v-show="number">1</span>
<span class="yulan2">学员可学习第</span>
<span style="color: #4ea6ff" v-show="number">{{
studyStartNum
}}</span>
<a-input-number
v-model:value="nubvalue2"
v-model:value="studyStartNum"
v-show="inputbox"
:controls="false"
:autofocus="true"
:min="1"
:min="0"
/>
<span>关-第</span
><span style="color: #4ea6ff" v-show="number">4</span>
><span style="color: #4ea6ff" v-show="number">{{
studyEndNum
}}</span>
<a-input-number
v-model:value="nubvalue3"
v-model:value="studyEndNum"
v-show="inputbox"
:controls="false"
:autofocus="true"
:min="1"
:min="0"
/>
<span>关内容</span>
</div>
@@ -1459,6 +1476,11 @@ export default {
name: "关卡二xx",
},
],
previewStartNum: 0,
previewEndNum: 0,
studyStartNum: 0,
studyEndNum: 0,
});
const tableDataFunc = () => {
@@ -3738,7 +3760,7 @@ export default {
//height: 71px;
margin-left: 12px;
margin-right: 50px;
width: 120px;
.iconame {
//position: absolute;
color: #4f5156;
@@ -3751,7 +3773,10 @@ export default {
color: #999ba3;
font-size: 14px;
margin-left: 12px;
width: 83px;
width: 120px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
}
@@ -3787,7 +3812,7 @@ export default {
//height: 71px;
flex-grow: 1;
margin-right: 50px;
width: 100px;
.timetext {
font-size: 14px;
color: #999ba3;

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

@@ -168,6 +168,15 @@
</div>
</div>
</div>
<div
class="aeLoading"
:style="{ display: addLoading ? 'flex' : 'none' }"
>
<a-spin
:spinning="addLoading"
:tip="updateChapterID ? '修改中...' : '添加中...'"
/>
</div>
</a-modal>
<div class="right" :style="{ display: gqxy_hs ? 'block' : 'none' }">
<div class="addhead">
@@ -1202,6 +1211,8 @@ export default {
curLevel: null, //选择移动到的关卡名称
deleteType: null, //批量删除学员/任务 1：任务 2：学员
addLoading: false, //添加编辑关卡动画
});
const showModal = (element) => {
@@ -1223,6 +1234,7 @@ export default {
//新建关卡
const editChapter = () => {
if (!state.value1) return message.warning("请输入关卡名称");
state.addLoading = true;
if (state.updateChapterID) {
let obj = {
name: state.value1,
@@ -1235,6 +1247,7 @@ export default {
.then((res) => {
console.log("修改成功", res);
message.success("修改成功");
state.addLoading = false;
getDetail();
closeModal();
})
@@ -1262,6 +1275,7 @@ export default {
// state.createLoading = false;
//state.currentPage = 1;
// getLearnPath();
state.addLoading = false;
getDetail();
closeModal();
})

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

@@ -2,7 +2,7 @@
<div class="addwrapper">
<div class="addhead">
<div class="leftimg">
<img class="img" src="../../assets/images/projectadd/picture.png" />
<img class="img" :src="projectInfo.picUrl" />
</div>
<div class="imgfor">
<div class="forz">{{ projectInfo.name || "-" }}</div>
@@ -151,17 +151,16 @@
</div>
</div>
<div class="type">
<div
:class="
item.classify == '必修' ? 'typename1' : 'typename'
"
>
{{ item.classify }}
<div :class="item.classify ? 'typename1' : 'typename'">
<span v-if="item.classify">必修</span>
<span v-else>选修</span>
</div>
</div>
<div class="time">
<div class="timetext">开始时间</div>
<div class="timetext">{{ item.beginTime }}</div>
<div class="timetext">
{{ item.beginTime ? item.beginTime : "-" }}
</div>
</div>
<div class="progress">
<div class="progresstext">
@@ -311,9 +310,9 @@
/>
<div class="btnarea">
<div>&nbsp;</div>
<div class="area_btn">
<div class="area_btn" @click="addNotice">
<div class="pub"></div>
<div class="btnText" @click="addNotice">发布</div>
<div class="btnText">发布</div>
</div>
</div>
</div>
@@ -498,7 +497,7 @@
<div class="setc_main">
<img
style="width: 151px; height: 84px"
:src="picUrl"
:src="projectInfo.picUrl"
alt=""
/>
</div>
@@ -582,12 +581,12 @@
<div class="box"></div>
<div class="onetitle">上传共享文档</div>
<div class="oneedi">
<a-switch v-model:checked="docChecked"></a-switch>
<a-switch v-model:checked="attachSwitch" @change="checkedClose"></a-switch>
</div>
</div>
<div class="btnbox" style="margin: 20px">
<a-upload
v-if="docChecked == true"
v-if="attachSwitch == true"
v-model:file-list="fileList"
name="file"
action="/manageApi/file/upload"
@@ -605,7 +604,7 @@
/>
</a-upload>
<div
v-if="docChecked == true"
v-if="attachSwitch == true"
class="btnbox"
style="margin: 20px"
>
@@ -834,6 +833,8 @@ export default defineComponent({
seven1: null,
seven2: null,
edit: true,
fileList:[],
attachSwitch:true,
// 共享文档列表
docList: [
{
@@ -937,34 +938,35 @@ export default defineComponent({
state.taskSyllabus = [];
console.log(res);
state.projectInfo.name = res.data.data.projectTemplateInfo.name;
state.projectInfo.beginTime =
res.data.data.projectTemplateInfo.beginTime;
state.projectInfo.beginTime = res.data.data.projectTemplateInfo.beginTime;
state.projectInfo.endTime = res.data.data.projectTemplateInfo.endTime;
state.projectInfo.manager = res.data.data.projectTemplateInfo.manager;
state.projectInfo.notice = res.data.data.projectTemplateInfo.notice;
state.projectInfo.sourceBelongId =
res.data.data.projectTemplateInfo.sourceBelongId;
state.projectInfo.managerId =
res.data.data.projectTemplateInfo.managerId;
state.projectInfo.sourceBelongId = res.data.data.projectTemplateInfo.sourceBelongId;
state.projectInfo.managerId = res.data.data.projectTemplateInfo.managerId;
state.projectInfo.remark = res.data.data.projectTemplateInfo.remark;
state.projectInfo.courseSyncFlag =
res.data.data.projectTemplateInfo.courseSyncFlag;
state.projectInfo.courseSyncFlag = res.data.data.projectTemplateInfo.courseSyncFlag;
state.projectInfo.level = res.data.data.projectTemplateInfo.level;
state.projectInfo.systemId =
res.data.data.projectTemplateInfo.systemId;
state.projectInfo.systemId = res.data.data.projectTemplateInfo.systemId;
state.projectInfo.boeFlag = res.data.data.projectTemplateInfo.boeFlag;
state.projectInfo.noticeFlag =
res.data.data.projectTemplateInfo.noticeFlag;
state.projectInfo.noticeFlag = res.data.data.projectTemplateInfo.noticeFlag;
state.projectInfo.remark = res.data.data.projectTemplateInfo.remark;
state.projectInfo.status = res.data.data.projectTemplateInfo.status;
state.projectInfo.picUrl = res.data.data.projectTemplateInfo.picUrl;
state.picUrl = res.data.data.projectTemplateInfo.picUrl;
state.projectInfo.attach = res.data.data.projectTemplateInfo.attach;
state.projectInfo.category = res.data.data.projectTemplateInfo.category;
try{
state.fileList = JSON.parse(res.data.data.projectTemplateInfo.attach);
}catch{
state.fileList = [];
}
state.attachSwitch = res.data.data.projectTemplateInfo.attachSwitch == 1 ? true : false
let data = res.data.data.stageList;
console.log("data=====", data);
for (let i in data) {
console.log("what ------ > ", i, data);
state.taskSyllabus.push({ text: data[i].name, children: [] });
state.taskSyllabus.push({ text: data[i].name?data[i].name:'无阶段任务', children: [] });
for (let j in data[i].taskList) {
state.taskSyllabus[i].children.push({
course: checkType(data[i].taskList[j].type),
@@ -991,8 +993,6 @@ export default defineComponent({
name: state.projectInfo.name,
category: state.projectInfo.category,
picUrl: state.projectInfo.picUrl,
beginTime: new Date(state.projectInfo.beginTime).getTime(),
endTime: new Date(state.projectInfo.endTime).getTime(),
manager: state.projectInfo.manager,
managerId: state.projectInfo.managerId || 0,
sourceBelongId: state.projectInfo.sourceBelongId,
@@ -1126,6 +1126,7 @@ export default defineComponent({
});
};
const handleChange2 = ({ file, fileList }) => {
console.log(fileList);
let list = [];
if (file.status !== "uploading") {
console.log("上传的list", fileList);
@@ -1138,8 +1139,6 @@ export default defineComponent({
name: state.projectInfo.name,
category: state.projectInfo.category,
picUrl: state.projectInfo.picUrl,
beginTime: new Date(state.projectInfo.beginTime).getTime()/1000,
endTime: new Date(state.projectInfo.endTime).getTime()/1000,
manager: state.projectInfo.manager,
managerId: state.projectInfo.managerId || 0,
sourceBelongId: state.projectInfo.sourceBelongId,
@@ -1149,19 +1148,17 @@ export default defineComponent({
courseSyncFlag: state.projectInfo.courseSyncFlag ? 1 : 0,
notice: state.projectInfo.notice,
noticeFlag: state.projectInfo.noticeFlag,
projectTemplateId: Number(localStorage.getItem("projectTemplateId")),
projectTemplateId: localStorage.getItem("projectTemplateId"),
remark: state.projectInfo.remark,
status: state.projectInfo.status,
attach: str,
})
});
//要编辑项目
api
.templateEdit({
name: state.projectInfo.name,
category: state.projectInfo.category,
picUrl: state.projectInfo.picUrl,
beginTime: new Date(state.projectInfo.beginTime).getTime(),
endTime: new Date(state.projectInfo.endTime).getTime(),
manager: state.projectInfo.manager,
managerId: state.projectInfo.managerId || 0,
sourceBelongId: state.projectInfo.sourceBelongId,
@@ -1190,6 +1187,27 @@ export default defineComponent({
message.error(`${file.name} 文件上传失败.`);
}
};
// 设置上传图片开关
const checkedClose = (data, a) => {
console.log(data, a);
state.attachSwitch = data;
// 更新开关状态
api
.templateEdit({
sourceBelongId: state.projectInfo.sourceBelongId,
projectTemplateId: localStorage.getItem("projectTemplateId"),
attachSwitch: state.attachSwitch?1:-1
})
.then((res) => {
console.log("开关更新成功", res);
})
.catch((err) => {
console.log("开关更新失败", err);
});
};
//设置积分规则
const editRule = () => {
let obj = {
@@ -1270,6 +1288,7 @@ export default defineComponent({
editRule,
handleChange2,
scoresum,
checkedClose
};
},
});
@@ -2060,7 +2079,7 @@ export default defineComponent({
//height: 71px;
margin-left: 12px;
margin-right: 50px;
width: 120px;
.iconame {
//position: absolute;
color: #4f5156;
@@ -2072,7 +2091,10 @@ export default defineComponent({
color: #999ba3;
font-size: 14px;
margin-left: 12px;
width: 83px;
width: 120px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
}
.type {
@@ -2104,6 +2126,7 @@ export default defineComponent({
//height: 71px;
flex-grow: 1;
margin-right: 50px;
width: 100px;
.timetext {
font-size: 14px;
color: #999ba3;

15
src/views/projectcenter/TaskAdd.vue
View File

@@ -823,6 +823,15 @@
</button>
</div>
</div>
<div
class="aeLoading"
:style="{ display: addLoading ? 'flex' : 'none' }"
>
<a-spin
:spinning="addLoading"
:tip="updateStageID ? '修改中...' : '添加中...'"
/>
</div>
</a-modal>
</div>
<!-- 确认添加阶段弹窗 -->
@@ -1154,6 +1163,8 @@ export default {
deleteStageModal: false, //删除阶段弹窗
unlockModeVisible: false, //切换模式抽屉
addLoading: false, // 添加编辑阶段动画
});
console.log("projectId", state.projectId);
const selectProjectName = (value, index) => {
@@ -1607,6 +1618,8 @@ export default {
message.destroy();
return message.warning("请输入阶段名称");
}
state.addLoading = true;
if (state.updateStageID) {
let obj = {
name: state.valuesname,
@@ -1630,6 +1643,7 @@ export default {
(item) => item.id == state.chooseStageId
);
getTableData(final.taskList);
state.addLoading = false;
})
.catch((err) => {
console.log("添加阶段失败", err);
@@ -1655,6 +1669,7 @@ export default {
(item) => item.id == state.chooseStageId
);
getTableData(final.taskList);
state.addLoading = false;
})
.catch((err) => {
console.log("添加阶段失败", err);

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

@@ -17,31 +17,33 @@
@click="showCodeModel2()"
/>
<div class="line" v-if="action == 1 || action == 0"></div>
<!-- 显示发布图标 -->
<img
v-if="action == 1 || action == 0"
v-if="action == 2"
class="img2"
src="../../assets/images/leveladd/pub.png"
/>
<!-- <div class="pub">发布</div> -->
<!-- 已发布的显示 -->
<div
class="pub"
style="width: 28px"
<!-- 显示撤回发布图标 -->
<img
v-if="action == 3"
class="img2"
src="../../assets/images/leveladd/pub.png"
/>
<!-- 显示审核图标 -->
<img
v-if="action == 0"
class="img2"
src="../../assets/images/project/reviewsubmit.png"
/>
<!-- 显示撤回审核图标 -->
<img
v-if="action == 1"
@click="showBackModal"
>
{{ act }}
</div>
<!-- 未发布/草稿的显示 -->
<div
class="pub"
style="width: 28px"
v-if="action == 2"
@click="showProjectPub"
>
{{ act }}
</div>
class="img2"
src="../../assets/images/project/reviewrecall.png"
/>
<!-- <div class="pub">发布</div> -->
<!-- 显示提交审核 -->
<div
class="pub"
style="width: 56px"
@@ -50,6 +52,34 @@
>
{{ act }}
</div>
<!-- 显示撤回审核 -->
<div
class="pub"
style="width: 56px"
v-if="action == 1"
@click="showRecallReviewModal"
>
{{ act }}
</div>
<!-- 显示发布 -->
<div
class="pub"
style="width: 28px"
v-if="action == 2"
@click="showProjectPub"
>
{{ act }}
</div>
<!-- 显示撤回发布 -->
<div
class="pub"
style="width: 56px"
v-if="action == 3"
@click="showBackModal"
>
{{ act }}
</div>
<!-- 项目提交审核弹窗 -->
<a-modal
v-model:visible="reviewModal"
@@ -74,7 +104,7 @@
<div class="del_btn btn1" @click="closeReviewModal">
<div class="btnText">取消</div>
</div>
<div class="del_btn btn2" @click="recallReviewProject">
<div class="del_btn btn2" @click="submitReviewProject">
<div class="btnText">确定</div>
</div>
</div>
@@ -494,7 +524,7 @@
<div class="time">
<div class="timetext">开始时间</div>
<div class="timetext">
{{ item.startTime !== null ? item.startTime : "" }}
{{ item.startTime !== null ? item.startTime : "-" }}
</div>
</div>
<div class="progress">
@@ -1725,7 +1755,37 @@
</div>
</div>
</a-modal>
<!-- 项目撤回审核弹窗 -->
<a-modal
v-model:visible="recallReviewModal"
:footer="null"
:closable="false"
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="closeRecallReviewModal"></div>
</div>
<div class="body">
<span>您确定要撤回审核吗</span>
<div class="back"></div>
</div>
<div class="del_btnbox">
<div class="del_btn btn1" @click="closeRecallReviewModal">
<div class="btnText">取消</div>
</div>
<div class="del_btn btn2" @click="recallReviewProject">
<div class="btnText">确定</div>
</div>
</div>
</div>
</div>
</a-modal>
<!-- 结束项目弹窗 -->
<a-modal
v-model:visible="stopModal"
@@ -2028,6 +2088,7 @@ export default {
releaseProjectName: null, //发布的项目名称
releaseProjectTime: null, //发布的项目时间
backModal: false, //撤回弹窗
recallReviewModal: false, //撤回审核
closeBack: false,
stopModal: false,
closeStop: false,
@@ -2873,7 +2934,7 @@ export default {
state.reviewModal = true;
};
const recallReviewProject = () => {
const submitReviewProject = () => {
let obj = {
projectId: state.projectId,
type: 3,
@@ -2887,6 +2948,8 @@ export default {
message.success("提交成功");
state.reviewModal = false;
getTaskInfo();
// getTask();
reget();
})
.catch((err) => {
console.log("提交失败", err);
@@ -3802,6 +3865,7 @@ export default {
getTask({
projectId: state.projectId,
}).then((res) => {
console.log("获取项目状态", res);
state.action = res.data.data.projectInfo.status;
state.act =
state.action == 2
@@ -3809,7 +3873,9 @@ export default {
: state.action == 0
? "提交审核"
: state.action == 1
? "撤回"
? "撤回审核"
: state.action == 3
? "撤回发布"
: state.action == -1
? ""
: "-";
@@ -3852,9 +3918,10 @@ export default {
console.log("点击发布");
let obj = {
projectId: state.releaseProjectId,
type: 4,
};
apiproj
.releaseProject(obj)
.handleProject(obj)
.then((res) => {
console.log("发布成功", res);
message.destroy();
@@ -3878,7 +3945,7 @@ export default {
const recallProject = () => {
let obj = {
projectId: state.projectId,
type: 0,
type: -4,
};
apiproj
.handleProject(obj)
@@ -3893,6 +3960,36 @@ export default {
console.log("撤回失败", err);
});
};
//打开撤回审核弹窗
const showRecallReviewModal = () => {
state.recallReviewModal = true;
};
//确认撤回审核
const recallReviewProject = () => {
let obj = {
projectId: state.projectId,
type: -3,
};
console.log("撤回成功obj", obj);
apiproj
.handleProject(obj)
.then((res) => {
console.log("撤回成功", res);
message.destroy();
message.success("撤回成功");
state.recallReviewModal = false;
reget();
})
.catch((err) => {
console.log("撤回成功", err);
});
};
//关闭提交审核弹窗
const closeRecallReviewModal = () => {
state.recallReviewModal = false;
};
//关闭结束弹窗
const closeStopModal = () => {
state.stopModal = false;
@@ -4162,7 +4259,10 @@ export default {
checkedClose,
submitExamine,
closeReviewModal,
showRecallReviewModal,
recallReviewProject,
closeRecallReviewModal,
submitReviewProject,
showCodeModel,
showCodeModel2,
checkType,
@@ -5594,7 +5694,7 @@ export default {
//height: 71px;
margin-left: 12px;
margin-right: 50px;
width: 120px;
.iconame {
//position: absolute;
color: #4f5156;
@@ -5607,7 +5707,10 @@ export default {
color: #999ba3;
font-size: 14px;
margin-left: 12px;
width: 83px;
width: 120px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
}
@@ -5643,7 +5746,7 @@ export default {
//height: 71px;
flex-grow: 1;
margin-right: 50px;
width: 100px;
.timetext {
font-size: 14px;
color: #999ba3;

24
src/views/projectcenter/temTask.vue
View File

@@ -148,7 +148,7 @@
<!-- <img class="img2" src="../../assets/images/projectadd/keep.png" />
<div class="pub">保存</div>
<div class="line"></div> -->
<router-link to="/taskpage">
<router-link to="/libraryAdd">
<div style="display: flex">
<img
class="img2"
@@ -824,6 +824,15 @@
</button>
</div>
</div>
<div
class="aeLoading"
:style="{ display: addLoading ? 'flex' : 'none' }"
>
<a-spin
:spinning="addLoading"
:tip="updateStageID ? '修改中...' : '添加中...'"
/>
</div>
</a-modal>
</div>
<!-- 确认添加阶段弹窗 -->
@@ -1301,6 +1310,8 @@ export default {
deleteStageModal: false, //删除阶段弹窗
unlockModeVisible: false, //切换模式抽屉
addLoading: false, //添加、编辑阶段动画
});
console.log("projectTemplateId", state.projectTemplateId);
const selectProjectName = (value, index) => {
@@ -1377,7 +1388,13 @@ export default {
};
array.push(obj);
});
console.log(array)
if(array[0].id=='0'){
state.level = [];
}else{
state.level = array;
}
};
const tableDataFunc = () => {
@@ -1514,11 +1531,12 @@ export default {
api
.templateDetail(localStorage.getItem("projectTemplateId"))
.then((res) => {
console.log('获取的任务列表信息',res)
if (res.status == 200) {
console.log("22222", res.data.data.stageList);
state.projectTitle = res.data.data.projectTemplateInfo.name;
state.picUrl = res.data.data.projectTemplateInfo.picUrl;
let leng = res.data.data.stageList.length;
let leng = res.data.data.stageList[0].name!==null ?res.data.data.stageList.length:0;
if (leng > 0) {
let stage = localStorage.getItem("templateStageId")
? localStorage.getItem("templateStageId")
@@ -1709,6 +1727,7 @@ export default {
message.destroy();
return message.warning("请输入阶段名称");
}
state.addLoading = true;
let obj = {
name: state.valuesname,
projectTemplateId: localStorage.getItem("projectTemplateId"),
@@ -1726,6 +1745,7 @@ export default {
message.destroy();
message.success("修改阶段成功");
getTask();
state.addLoading = false;
})
.catch((err) => {
console.log("添加阶段失败", err);

80
src/views/research/ResearchManage.vue
View File

@@ -230,46 +230,46 @@ export default {
number: null,
selectTime: null,
tableData: [
{
key: 1,
number: 1,
manager: "产品经理评估",
state: "已发布",
creater: "管理员",
pubtime: "2022-07-20 9:03",
cretime: "2022-07-20 9:03",
haspub: false,
},
{
key: 2,
number: 2,
manager: "高级产品经理评估",
state: "已发布",
creater: "管理员",
pubtime: "2022-07-20 9:03",
cretime: "2022-07-20 9:03",
haspub: false,
},
{
key: 3,
number: 3,
manager: "管理者进阶腾飞班管理者进阶腾飞班评估",
state: "待发布",
creater: "管理员",
pubtime: "2022-07-20 9:03",
cretime: "2022-07-20 9:03",
haspub: true,
},
{
key: 4,
number: 4,
manager: "HR评估",
state: "已结束",
creater: "管理员",
pubtime: "2022-07-20 9:03",
cretime: "2022-07-20 9:03",
haspub: true,
},
// {
// key: 1,
// number: 1,
// manager: "产品经理评估",
// state: "已发布",
// creater: "管理员",
// pubtime: "2022-07-20 9:03",
// cretime: "2022-07-20 9:03",
// haspub: false,
// },
// {
// key: 2,
// number: 2,
// manager: "高级产品经理评估",
// state: "已发布",
// creater: "管理员",
// pubtime: "2022-07-20 9:03",
// cretime: "2022-07-20 9:03",
// haspub: false,
// },
// {
// key: 3,
// number: 3,
// manager: "管理者进阶腾飞班管理者进阶腾飞班评估",
// state: "待发布",
// creater: "管理员",
// pubtime: "2022-07-20 9:03",
// cretime: "2022-07-20 9:03",
// haspub: true,
// },
// {
// key: 4,
// number: 4,
// manager: "HR评估",
// state: "已结束",
// creater: "管理员",
// pubtime: "2022-07-20 9:03",
// cretime: "2022-07-20 9:03",
// haspub: true,
// },
],
currentPage: 1,
tableDataTotal: 0,