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

feat:合并

Browse Source
This commit is contained in:
lixg
2022-12-07 21:15:09 +08:00
parent bdf6418b49 3f7f89eaea
commit ece2ceba9f
6 changed files with 8436 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/api/indexAudit.js
View File

@@ -1,7 +1,8 @@
import http from "./config"; 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) export const projlist = (obj) => http.post('/admin/project/list', obj)

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

@@ -3407,8 +3407,8 @@ const columns6 = [
}, },
{ {
title: "创建人", title: "创建人",
dataIndex: "name", dataIndex: "createName",
key: "name", key: "createName",
width: "10%", width: "10%",
align: "center", align: "center",
ellipsis: true, ellipsis: true,
@@ -4527,7 +4527,7 @@ export default defineComponent({
let obj = { let obj = {
pageNo: state.currentPage222, pageNo: state.currentPage222,
pageSize: state.pageSize222, pageSize: state.pageSize222,
name: state.kk_inputV1, createName: state.kk_inputV1,
teacher: state.kk_inputV2, teacher: state.kk_inputV2,
beginTime: parseInt(new Date(state.selectTime).getTime() / 1000), beginTime: parseInt(new Date(state.selectTime).getTime() / 1000),
offcourseId: state.offcourseId, offcourseId: state.offcourseId,

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

File diff suppressed because it is too large Load Diff

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

@@ -2,7 +2,7 @@
<div class="addwrapper"> <div class="addwrapper">
<div class="addhead"> <div class="addhead">
<div class="leftimg"> <div class="leftimg">
<img class="img" src="../../assets/images/projectadd/picture.png" /> <img class="img" :src="projectInfo.picUrl" />
</div> </div>
<div class="imgfor"> <div class="imgfor">
<div class="forz">{{ projectInfo.name || "-" }}</div> <div class="forz">{{ projectInfo.name || "-" }}</div>
@@ -310,9 +310,9 @@
/> />
<div class="btnarea"> <div class="btnarea">
<div>&nbsp;</div> <div>&nbsp;</div>
<div class="area_btn"> <div class="area_btn" @click="addNotice">
<div class="pub"></div> <div class="pub"></div>
<div class="btnText" @click="addNotice">发布</div> <div class="btnText">发布</div>
</div> </div>
</div> </div>
</div> </div>
@@ -497,7 +497,7 @@
<div class="setc_main"> <div class="setc_main">
<img <img
style="width: 151px; height: 84px" style="width: 151px; height: 84px"
:src="picUrl" :src="projectInfo.picUrl"
alt="" alt=""
/> />
</div> </div>
@@ -581,12 +581,12 @@
<div class="box"></div> <div class="box"></div>
<div class="onetitle">上传共享文档</div> <div class="onetitle">上传共享文档</div>
<div class="oneedi"> <div class="oneedi">
<a-switch v-model:checked="docChecked"></a-switch> <a-switch v-model:checked="attachSwitch" @change="checkedClose"></a-switch>
</div> </div>
</div> </div>
<div class="btnbox" style="margin: 20px"> <div class="btnbox" style="margin: 20px">
<a-upload <a-upload
v-if="docChecked == true" v-if="attachSwitch == true"
v-model:file-list="fileList" v-model:file-list="fileList"
name="file" name="file"
action="/manageApi/file/upload" action="/manageApi/file/upload"
@@ -604,7 +604,7 @@
/> />
</a-upload> </a-upload>
<div <div
v-if="docChecked == true" v-if="attachSwitch == true"
class="btnbox" class="btnbox"
style="margin: 20px" style="margin: 20px"
> >
@@ -833,6 +833,8 @@ export default defineComponent({
seven1: null, seven1: null,
seven2: null, seven2: null,
edit: true, edit: true,
fileList:[],
attachSwitch:true,
// 共享文档列表 // 共享文档列表
docList: [ docList: [
{ {
@@ -936,35 +938,35 @@ export default defineComponent({
state.taskSyllabus = []; state.taskSyllabus = [];
console.log(res); console.log(res);
state.projectInfo.name = res.data.data.projectTemplateInfo.name; state.projectInfo.name = res.data.data.projectTemplateInfo.name;
state.projectInfo.beginTime = state.projectInfo.beginTime = res.data.data.projectTemplateInfo.beginTime;
res.data.data.projectTemplateInfo.beginTime;
state.projectInfo.endTime = res.data.data.projectTemplateInfo.endTime; state.projectInfo.endTime = res.data.data.projectTemplateInfo.endTime;
state.projectInfo.manager = res.data.data.projectTemplateInfo.manager; state.projectInfo.manager = res.data.data.projectTemplateInfo.manager;
state.projectInfo.notice = res.data.data.projectTemplateInfo.notice; state.projectInfo.notice = res.data.data.projectTemplateInfo.notice;
state.projectInfo.sourceBelongId = state.projectInfo.sourceBelongId = res.data.data.projectTemplateInfo.sourceBelongId;
res.data.data.projectTemplateInfo.sourceBelongId; state.projectInfo.managerId = res.data.data.projectTemplateInfo.managerId;
state.projectInfo.managerId =
res.data.data.projectTemplateInfo.managerId;
state.projectInfo.remark = res.data.data.projectTemplateInfo.remark; state.projectInfo.remark = res.data.data.projectTemplateInfo.remark;
state.projectInfo.courseSyncFlag = state.projectInfo.courseSyncFlag = res.data.data.projectTemplateInfo.courseSyncFlag;
res.data.data.projectTemplateInfo.courseSyncFlag;
state.projectInfo.level = res.data.data.projectTemplateInfo.level; state.projectInfo.level = res.data.data.projectTemplateInfo.level;
state.projectInfo.systemId = state.projectInfo.systemId = res.data.data.projectTemplateInfo.systemId;
res.data.data.projectTemplateInfo.systemId;
state.projectInfo.boeFlag = res.data.data.projectTemplateInfo.boeFlag; state.projectInfo.boeFlag = res.data.data.projectTemplateInfo.boeFlag;
state.projectInfo.noticeFlag = state.projectInfo.noticeFlag = res.data.data.projectTemplateInfo.noticeFlag;
res.data.data.projectTemplateInfo.noticeFlag;
state.projectInfo.remark = res.data.data.projectTemplateInfo.remark; state.projectInfo.remark = res.data.data.projectTemplateInfo.remark;
state.projectInfo.status = res.data.data.projectTemplateInfo.status; state.projectInfo.status = res.data.data.projectTemplateInfo.status;
state.projectInfo.picUrl = res.data.data.projectTemplateInfo.picUrl; 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.attach = res.data.data.projectTemplateInfo.attach;
state.projectInfo.category = state.projectInfo.category = res.data.data.projectTemplateInfo.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; let data = res.data.data.stageList;
console.log("data=====", data); console.log("data=====", data);
for (let i in data) { for (let i in data) {
console.log("what ------ > ", i, 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) { for (let j in data[i].taskList) {
state.taskSyllabus[i].children.push({ state.taskSyllabus[i].children.push({
course: checkType(data[i].taskList[j].type), course: checkType(data[i].taskList[j].type),
@@ -991,8 +993,6 @@ export default defineComponent({
name: state.projectInfo.name, name: state.projectInfo.name,
category: state.projectInfo.category, category: state.projectInfo.category,
picUrl: state.projectInfo.picUrl, picUrl: state.projectInfo.picUrl,
beginTime: new Date(state.projectInfo.beginTime).getTime(),
endTime: new Date(state.projectInfo.endTime).getTime(),
manager: state.projectInfo.manager, manager: state.projectInfo.manager,
managerId: state.projectInfo.managerId || 0, managerId: state.projectInfo.managerId || 0,
sourceBelongId: state.projectInfo.sourceBelongId, sourceBelongId: state.projectInfo.sourceBelongId,
@@ -1136,25 +1136,23 @@ export default defineComponent({
let str = JSON.stringify(fileList); let str = JSON.stringify(fileList);
console.log("str", str); console.log("str", str);
console.table({ console.table({
name: state.projectInfo.name, name: state.projectInfo.name,
category: state.projectInfo.category, category: state.projectInfo.category,
picUrl: state.projectInfo.picUrl, picUrl: state.projectInfo.picUrl,
beginTime: new Date(state.projectInfo.beginTime).getTime() / 1000, manager: state.projectInfo.manager,
endTime: new Date(state.projectInfo.endTime).getTime() / 1000, managerId: state.projectInfo.managerId || 0,
manager: state.projectInfo.manager, sourceBelongId: state.projectInfo.sourceBelongId,
managerId: state.projectInfo.managerId || 0, level: state.projectInfo.level,
sourceBelongId: state.projectInfo.sourceBelongId, systemId: state.projectInfo.systemId,
level: state.projectInfo.level, boeFlag: state.projectInfo.boeFlag ? 1 : 0,
systemId: state.projectInfo.systemId, courseSyncFlag: state.projectInfo.courseSyncFlag ? 1 : 0,
boeFlag: state.projectInfo.boeFlag ? 1 : 0, notice: state.projectInfo.notice,
courseSyncFlag: state.projectInfo.courseSyncFlag ? 1 : 0, noticeFlag: state.projectInfo.noticeFlag,
notice: state.projectInfo.notice, projectTemplateId: localStorage.getItem("projectTemplateId"),
noticeFlag: state.projectInfo.noticeFlag, remark: state.projectInfo.remark,
projectTemplateId: Number(localStorage.getItem("projectTemplateId")), status: state.projectInfo.status,
remark: state.projectInfo.remark, attach: str,
status: state.projectInfo.status, });
attach: str,
});
//要编辑项目 //要编辑项目
api api
.templateEdit({ .templateEdit({
@@ -1189,6 +1187,27 @@ export default defineComponent({
message.error(`${file.name} 文件上传失败.`); 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 = () => { const editRule = () => {
let obj = { let obj = {
@@ -1269,6 +1288,7 @@ export default defineComponent({
editRule, editRule,
handleChange2, handleChange2,
scoresum, scoresum,
checkedClose
}; };
}, },
}); });

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

@@ -148,7 +148,7 @@
<!-- <img class="img2" src="../../assets/images/projectadd/keep.png" /> <!-- <img class="img2" src="../../assets/images/projectadd/keep.png" />
<div class="pub">保存</div> <div class="pub">保存</div>
<div class="line"></div> --> <div class="line"></div> -->
<router-link to="/taskpage"> <router-link to="/libraryAdd">
<div style="display: flex"> <div style="display: flex">
<img <img
class="img2" class="img2"
@@ -1388,7 +1388,13 @@ export default {
}; };
array.push(obj); array.push(obj);
}); });
state.level = array; console.log(array)
if(array[0].id=='0'){
state.level = [];
}else{
state.level = array;
}
}; };
const tableDataFunc = () => { const tableDataFunc = () => {
@@ -1525,11 +1531,12 @@ export default {
api api
.templateDetail(localStorage.getItem("projectTemplateId")) .templateDetail(localStorage.getItem("projectTemplateId"))
.then((res) => { .then((res) => {
console.log('获取的任务列表信息',res)
if (res.status == 200) { if (res.status == 200) {
console.log("22222", res.data.data.stageList); console.log("22222", res.data.data.stageList);
state.projectTitle = res.data.data.projectTemplateInfo.name; state.projectTitle = res.data.data.projectTemplateInfo.name;
state.picUrl = res.data.data.projectTemplateInfo.picUrl; 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) { if (leng > 0) {
let stage = localStorage.getItem("templateStageId") let stage = localStorage.getItem("templateStageId")
? localStorage.getItem("templateStageId") ? localStorage.getItem("templateStageId")

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

@@ -44,7 +44,7 @@
<div class="btns"> <div class="btns">
<div class="btn btn3" @click="handleNew"> <div class="btn btn3" @click="handleNew">
<div class="search"></div> <div class="search"></div>
<div class="btnText">创建评估2</div> <div class="btnText">创建评估</div>
</div> </div>
</div> </div>
</div> </div>