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

fix:增加项目共享文档，项目审核意见

Browse Source
This commit is contained in:
wyx
2022-12-05 23:00:29 +08:00
parent 1f9345ec35 54d6528569
commit 38b6127197
8 changed files with 927 additions and 834 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
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 16:33:28 * @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
*/ */
@@ -24,7 +24,7 @@ const http = axios.create({
http.interceptors.request.use( http.interceptors.request.use(
(config) => { (config) => {
console.log("config", config); // console.log("config", config);
// const token = localStorage.getItem("token"); // const token = localStorage.getItem("token");
// // const token = getCookie('token') // // const token = getCookie('token')
// // console.log('token', token) // // console.log('token', token)

49
src/components/vote/AddVote.vue
View File

@@ -55,7 +55,7 @@
<div v-if="ballotId > 0"> <div v-if="ballotId > 0">
<a-tag closable color="processing" @close="handlelog"> <a-tag closable color="processing" @close="handlelog">
<span style="font-size: 14px; line-height: 33px"> <span style="font-size: 14px; line-height: 33px">
删除投票 {{ ballot_name }}
</span> </span>
</a-tag> </a-tag>
</div> </div>
@@ -64,6 +64,7 @@
v-model:createVoteVisible="createVoteVisible" v-model:createVoteVisible="createVoteVisible"
v-model:ballotId="ballotId" v-model:ballotId="ballotId"
v-model:editChild="editChild" v-model:editChild="editChild"
v-model:ballot_name="ballot_name"
/> />
</div> </div>
<button <button
@@ -75,7 +76,7 @@
</button> </button>
<div :style="{ display: creVote ? 'block' : 'none' }"> <div :style="{ display: creVote ? 'block' : 'none' }">
<div class="fileTigan"> <div class="fileTigan">
<span style="color: #388be1">{{ ballotName }}</span> <span style="color: #388be1">{{ ballot_name }}</span>
<div class="delBox" @click="dleVoteStem()"></div> <div class="delBox" @click="dleVoteStem()"></div>
</div> </div>
</div> </div>
@@ -93,6 +94,12 @@
</div> </div>
<div class="main_item"> <div class="main_item">
<div class="signbox"> <div class="signbox">
<div class="sign">
<img
src="@/assets/images/coursewareManage/asterisk.png"
alt=""
/>
</div>
<span style="margin-right: 3px">起止时间：</span> <span style="margin-right: 3px">起止时间：</span>
</div> </div>
<div class="btnbox"> <div class="btnbox">
@@ -105,6 +112,12 @@
</div> </div>
<div class="main_item"> <div class="main_item">
<div class="signbox"> <div class="signbox">
<div class="sign">
<img
src="@/assets/images/coursewareManage/asterisk.png"
alt=""
/>
</div>
<span style="margin-right: 3px">基础投票数：</span> <span style="margin-right: 3px">基础投票数：</span>
</div> </div>
<div class="btnbox"> <div class="btnbox">
@@ -142,6 +155,7 @@
v-model:value="textV1" v-model:value="textV1"
placeholder="请输入投票说明" placeholder="请输入投票说明"
allow-clear allow-clear
:rows="6"
maxlength="150" maxlength="150"
/> />
</div> </div>
@@ -231,7 +245,7 @@ export default {
voteStemId: null, voteStemId: null,
EditVoteId: "", EditVoteId: "",
voteStemName: "", voteStemName: "",
ballotName: "", ballot_name: "",
editStem: false, //编辑状态 editStem: false, //编辑状态
ballotId: 0, //题干id ballotId: 0, //题干id
optionId: "", //删除，修改选项id optionId: "", //删除，修改选项id
@@ -386,8 +400,12 @@ export default {
return message.info("请创建题干信息"); return message.info("请创建题干信息");
} }
if (state.basevote == "") { if (!state.time) {
state.basevote = 1; message.destroy();
return message.warning("请输入直播时间");
}
if (!state.basevote) {
return message.info("请上传投票基数");
} }
if (state.time != undefined) { if (state.time != undefined) {
state.startTime = dayjs(state.time[0]).format("YYYY-MM-DD"); state.startTime = dayjs(state.time[0]).format("YYYY-MM-DD");
@@ -672,6 +690,27 @@ export default {
display: flex; display: flex;
align-items: flex-start; align-items: flex-start;
margin-bottom: 32px; margin-bottom: 32px;
.textarea {
width: 423px;
.ant-input {
width: 100%;
}
.ant-input-textarea-show-count {
position: relative;
}
.ant-input-textarea-show-count::after {
position: absolute;
right: 10px;
bottom: 0px;
}
.ant-input {
border-radius: 8px;
}
}
.signbox { .signbox {
width: 120px; width: 120px;

7
src/components/vote/CreateVote.vue
View File

@@ -118,6 +118,10 @@ export default {
type: Number, type: Number,
default: null, default: null,
}, },
ballot_name: {
type: String,
default: null,
},
editChild: { editChild: {
type: Boolean, type: Boolean,
default: false, default: false,
@@ -150,6 +154,7 @@ export default {
handleAllCancel(); handleAllCancel();
ctx.emit("update:createVoteVisible", false); ctx.emit("update:createVoteVisible", false);
ctx.emit("update:ballotId", state.ballotId); ctx.emit("update:ballotId", state.ballotId);
ctx.emit("update:ballot_name", state.ballotName);
}; };
// 详情 // 详情
const getInfoDate = async () => { const getInfoDate = async () => {
@@ -267,7 +272,7 @@ export default {
} }
}); });
} else { } else {
virtualDel(); virtualDel(id);
} }
}; };
const virtualDel = (id) => { const virtualDel = (id) => {

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

@@ -878,11 +878,16 @@ export default {
api api
.handleLearnPath(obj) .handleLearnPath(obj)
.then((res) => { .then((res) => {
console.log("发布成功", res); console.log("发布", res);
if (res.data.code === 200) {
message.destroy(); message.destroy();
message.success("发布成功"); message.success("发布成功");
state.pub = false; state.pub = false;
getLearnPath(); getLearnPath();
}
if (res.data.code === -1) {
message.warning(res.data.msg);
}
}) })
.catch((err) => { .catch((err) => {
console.log("发布失败", err); console.log("发布失败", err);
@@ -909,11 +914,16 @@ export default {
api api
.handleLearnPath(obj) .handleLearnPath(obj)
.then((res) => { .then((res) => {
if (res.data.code === 200) {
console.log("复制成功", res); console.log("复制成功", res);
message.destroy(); message.destroy();
message.success("复制成功"); message.success("复制成功");
state.copyModal = false; state.copyModal = false;
getLearnPath(); getLearnPath();
}
if (res.data.code === -1) {
message.warning(res.data.msg);
}
}) })
.catch((err) => { .catch((err) => {
console.log("复制失败", err); console.log("复制失败", err);
@@ -937,11 +947,16 @@ export default {
api api
.handleLearnPath(obj) .handleLearnPath(obj)
.then((res) => { .then((res) => {
if (res.data.code === 200) {
console.log("停用成功", res); console.log("停用成功", res);
message.destroy(); message.destroy();
message.success("停用成功"); message.success("停用成功");
state.stopModal = false; state.stopModal = false;
getLearnPath(); getLearnPath();
}
if (res.data.code === -1) {
message.warning(res.data.msg);
}
}) })
.catch((err) => { .catch((err) => {
console.log("停用失败", err); console.log("停用失败", err);
@@ -979,11 +994,16 @@ export default {
api api
.handleLearnPath(obj) .handleLearnPath(obj)
.then((res) => { .then((res) => {
if (res.data.code === 200) {
console.log("撤回成功", res); console.log("撤回成功", res);
message.destroy(); message.destroy();
message.success("撤回成功"); message.success("撤回成功");
state.backModal = false; state.backModal = false;
getLearnPath(); getLearnPath();
}
if (res.data.code === -1) {
message.warning(res.data.msg);
}
}) })
.catch((err) => { .catch((err) => {
console.log("撤回失败", err); console.log("撤回失败", err);
@@ -1502,11 +1522,16 @@ export default {
api api
.handleLearnPath(obj) .handleLearnPath(obj)
.then((res) => { .then((res) => {
if (res.data.code === 200) {
console.log("删除成功", res); console.log("删除成功", res);
message.destroy(); message.destroy();
message.success("删除成功"); message.success("删除成功");
state.deleteModal = false; state.deleteModal = false;
getLearnPath(); getLearnPath();
}
if (res.data.code === -1) {
message.warning(res.data.msg);
}
}) })
.catch((err) => { .catch((err) => {
console.log("删除失败", err); console.log("删除失败", err);
@@ -1579,6 +1604,7 @@ export default {
api api
.createLearnPath(obj) .createLearnPath(obj)
.then((res) => { .then((res) => {
if (res.data.code === 200) {
console.log("修改成功", res); console.log("修改成功", res);
message.destroy(); message.destroy();
message.success("修改成功"); message.success("修改成功");
@@ -1596,6 +1622,10 @@ export default {
// // router.push("/leveladd"); // // router.push("/leveladd");
// getLearnPath(); // getLearnPath();
// }, 1000); // }, 1000);
}
if (res.data.code === -1) {
message.warning(res.data.msg);
}
}) })
.catch((err) => { .catch((err) => {
console.log("修改失败", err); console.log("修改失败", err);

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

@@ -138,10 +138,11 @@
<div class="centermain">快速添加学员</div> <div class="centermain">快速添加学员</div>
</div> </div>
<!-- 2022-12-2注释 后面放开 --> <!-- 2022-12-2注释 后面放开 -->
<!-- <div <div
class="taskbox" class="taskbox"
@click="showPub" @click="showPub"
style="background: linear-gradient(180deg, #e5f6ec, #eef9f3)" style="background: linear-gradient(180deg, #e5f6ec, #eef9f3)"
v-if="action === 0"
> >
<div class="leftt"> <div class="leftt">
<img src="../../assets/images/taskpage/left3.png" /> <img src="../../assets/images/taskpage/left3.png" />
@@ -156,7 +157,7 @@
发布 发布
</div> </div>
<div class="centermain">快速发布项目</div> <div class="centermain">快速发布项目</div>
</div> --> </div>
</div> </div>
</div> </div>
<!-- 概览（有数据） --> <!-- 概览（有数据） -->
@@ -1770,12 +1771,17 @@ export default {
}; };
handleLearnPath(obj) handleLearnPath(obj)
.then((res) => { .then((res) => {
if (res.data.code === 200) {
console.log("发布成功", res); console.log("发布成功", res);
message.destroy(); message.destroy();
message.success("发布成功"); message.success("发布成功");
state.pub = false; state.pub = false;
state.nodata = false; state.nodata = false;
// getLearnPath(); // getLearnPath();
}
if (res.data.code === -1) {
message.warning(res.data.msg);
}
reget(); reget();
}) })
@@ -2407,7 +2413,9 @@ export default {
.ant-modal { .ant-modal {
width: 424px !important; width: 424px !important;
height: 258px !important; height: 258px !important;
.ant-modal-close-x {
display: none;
}
.ant-modal-content { .ant-modal-content {
width: 424px !important; width: 424px !important;
height: 258px !important; height: 258px !important;

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

@@ -905,9 +905,7 @@
<div class="close_exit" @click="closedeleteAll"></div> <div class="close_exit" @click="closedeleteAll"></div>
</div> </div>
<div class="body"> <div class="body">
<span <span>请确认是否批量删除任务</span>
>请确认是否批量删除{{ deleteType === 1 ? "任务" : "学员" }}</span
>
</div> </div>
<div class="del_btnbox"> <div class="del_btnbox">
<div class="del_btn btn1" @click="closedeleteAll"> <div class="del_btn btn1" @click="closedeleteAll">

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

@@ -3,7 +3,7 @@
<div class="taskpage"> <div class="taskpage">
<div class="addhead" style="flex-shrink: 0"> <div class="addhead" style="flex-shrink: 0">
<div class="leftimg"> <div class="leftimg">
<img class="img" :src="picUrl"/> <img class="img" :src="picUrl" />
</div> </div>
<div class="imgfor"> <div class="imgfor">
<div class="forz">{{ name }}</div> <div class="forz">{{ name }}</div>
@@ -11,7 +11,7 @@
<div class="fort">起止时间：{{ startTime }}至{{ endTime }}</div> <div class="fort">起止时间：{{ startTime }}至{{ endTime }}</div>
</div> </div>
<div class="right"> <div class="right">
<img class="img1" src="../../assets/images/leveladd/ma.png"/> <img class="img1" src="../../assets/images/leveladd/ma.png" />
<div class="line" v-if="action == 1 || action == 0"></div> <div class="line" v-if="action == 1 || action == 0"></div>
<img <img
v-if="action == 1 || action == 0" v-if="action == 1 || action == 0"
@@ -88,7 +88,7 @@
<div class="line"></div> <div class="line"></div>
<router-link to="/projectmanage"> <router-link to="/projectmanage">
<div style="display: flex"> <div style="display: flex">
<img class="img2" src="../../assets/images/leveladd/back.png"/> <img class="img2" src="../../assets/images/leveladd/back.png" />
<div class="return">返回</div> <div class="return">返回</div>
</div> </div>
</router-link> </router-link>
@@ -117,13 +117,13 @@
style="background: linear-gradient(180deg, #fef3dd, #fffaf0)" style="background: linear-gradient(180deg, #fef3dd, #fffaf0)"
> >
<div class="leftt"> <div class="leftt">
<img src="../../assets/images/taskpage/left1.png"/> <img src="../../assets/images/taskpage/left1.png" />
</div> </div>
<div class="photo"> <div class="photo">
<img src="../../assets/images/taskpage/picture1.png"/> <img src="../../assets/images/taskpage/picture1.png" />
</div> </div>
<div class="rightt"> <div class="rightt">
<img src="../../assets/images/taskpage/right1.png"/> <img src="../../assets/images/taskpage/right1.png" />
</div> </div>
<div class="centerbox" style="color: rgba(255, 182, 78, 1)"> <div class="centerbox" style="color: rgba(255, 182, 78, 1)">
添加任务 添加任务
@@ -136,13 +136,13 @@
style="background: linear-gradient(180deg, #ddeaff, #f0f8fe)" style="background: linear-gradient(180deg, #ddeaff, #f0f8fe)"
> >
<div class="leftt"> <div class="leftt">
<img src="../../assets/images/taskpage/left2.png"/> <img src="../../assets/images/taskpage/left2.png" />
</div> </div>
<div class="photo"> <div class="photo">
<img src="../../assets/images/taskpage/picture2.png"/> <img src="../../assets/images/taskpage/picture2.png" />
</div> </div>
<div class="rightt"> <div class="rightt">
<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)">
添加学员 添加学员
@@ -546,13 +546,13 @@
v-if="taskSyllabus.length == 0" v-if="taskSyllabus.length == 0"
> >
<div class="leftt"> <div class="leftt">
<img src="../../assets/images/taskpage/left2.png"/> <img src="../../assets/images/taskpage/left2.png" />
</div> </div>
<div class="photo"> <div class="photo">
<img src="../../assets/images/taskpage/picture8.png"/> <img src="../../assets/images/taskpage/picture8.png" />
</div> </div>
<div class="rightt"> <div class="rightt">
<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)">
创建任务 创建任务
@@ -575,13 +575,13 @@
style="background: linear-gradient(180deg, #fef3dd, #fffaf0)" style="background: linear-gradient(180deg, #fef3dd, #fffaf0)"
> >
<div class="leftt"> <div class="leftt">
<img src="../../assets/images/taskpage/left1.png"/> <img src="../../assets/images/taskpage/left1.png" />
</div> </div>
<div class="photo"> <div class="photo">
<img src="../../assets/images/taskpage/picture1.png"/> <img src="../../assets/images/taskpage/picture1.png" />
</div> </div>
<div class="rightt"> <div class="rightt">
<img src="../../assets/images/taskpage/right1.png"/> <img src="../../assets/images/taskpage/right1.png" />
</div> </div>
<div class="centerbox" style="color: rgba(255, 182, 78, 1)"> <div class="centerbox" style="color: rgba(255, 182, 78, 1)">
添加任务 添加任务
@@ -679,18 +679,18 @@
</div> </div>
<div class="groupright"> <div class="groupright">
<div class="btn1" @click="searchStu"> <div class="btn1" @click="searchStu">
<img src="../../assets/images/courseManage/search0.png"/> <img src="../../assets/images/courseManage/search0.png" />
<span class="btn1text">搜索</span> <span class="btn1text">搜索</span>
</div> </div>
<div class="btn2" @click="resetCancel"> <div class="btn2" @click="resetCancel">
<img src="../../assets/images/courseManage/reset1.png"/> <img src="../../assets/images/courseManage/reset1.png" />
<span class="btn2text">重置</span> <span class="btn2text">重置</span>
</div> </div>
</div> </div>
</div> </div>
<div class="second2" style="margin-top: 20px"> <div class="second2" style="margin-top: 20px">
<div class="btn1" @click="showStuAdd"> <div class="btn1" @click="showStuAdd">
<img src="../../assets/images/courseManage/add0.png"/> <img src="../../assets/images/courseManage/add0.png" />
<span class="btn1text">添加学员</span> <span class="btn1text">添加学员</span>
</div> </div>
<!-- 2022-11-30注释 后面放开 --> <!-- 2022-11-30注释 后面放开 -->
@@ -699,12 +699,12 @@
<span class="btn2text">导入学员</span> <span class="btn2text">导入学员</span>
</div> --> </div> -->
<div class="btn2" @click="showAllDelete"> <div class="btn2" @click="showAllDelete">
<img src="../../assets/images/projectadd/delete.png"/> <img src="../../assets/images/projectadd/delete.png" />
<span class="btn2text">批量删除</span> <span class="btn2text">批量删除</span>
</div> </div>
</div> </div>
<div class="talk"> <div class="talk">
<img class="im" src="../../assets/images/leveladd/gan.png"/> <img class="im" src="../../assets/images/leveladd/gan.png" />
<div class="xu"> <div class="xu">
<span class="yi">已选择</span> <span class="yi">已选择</span>
<div style="width: 5px; display: inline-block"></div> <div style="width: 5px; display: inline-block"></div>
@@ -767,18 +767,18 @@
</div> </div>
<div class="groupright"> <div class="groupright">
<div class="btn1" @click="searchGroup"> <div class="btn1" @click="searchGroup">
<img src="../../assets/images/courseManage/search0.png"/> <img src="../../assets/images/courseManage/search0.png" />
<span class="btn1text">搜索</span> <span class="btn1text">搜索</span>
</div> </div>
<div class="btn2" @click="resetGroupName"> <div class="btn2" @click="resetGroupName">
<img src="../../assets/images/courseManage/reset1.png"/> <img src="../../assets/images/courseManage/reset1.png" />
<span class="btn2text">重置</span> <span class="btn2text">重置</span>
</div> </div>
</div> </div>
</div> </div>
<div class="second2"> <div class="second2">
<div class="btn1" @click="showModal2(1, null)"> <div class="btn1" @click="showModal2(1, null)">
<img src="../../assets/images/courseManage/add0.png"/> <img src="../../assets/images/courseManage/add0.png" />
<span class="btn1text">创建小组</span> <span class="btn1text">创建小组</span>
</div> </div>
<!-- 2022-12-2注释 后面放开 --> <!-- 2022-12-2注释 后面放开 -->
@@ -818,7 +818,7 @@
<div class="leader">组长：{{ item.leaderName }}</div> <div class="leader">组长：{{ item.leaderName }}</div>
<div class="grocenter"> <div class="grocenter">
<div class="leader1">进度</div> <div class="leader1">进度</div>
<a-progress :percent="item.completeRatio"/> <a-progress :percent="item.completeRatio" />
</div> </div>
<div <div
class="grofooter" class="grofooter"
@@ -1184,7 +1184,7 @@
:title="showFaceText" :title="showFaceText"
/> />
<!-- 学员（小组管理）创建小组抽屉 --> <!-- 学员（小组管理）创建小组抽屉 -->
<subset-manage v-model:Svisible="subsetVisivle"/> <subset-manage v-model:Svisible="subsetVisivle" />
<!-- 学员管理-添加学员抽屉 --> <!-- 学员管理-添加学员抽屉 -->
<!-- <stu-add v-model:Stuvisible="Stuvisible" /> --> <!-- <stu-add v-model:Stuvisible="Stuvisible" /> -->
<!-- 添加学员抽屉 --> <!-- 添加学员抽屉 -->
@@ -1197,7 +1197,7 @@
:type="2" :type="2"
/> />
<!-- 学员管理-导入学员抽屉 --> <!-- 学员管理-导入学员抽屉 -->
<import-stu v-model:Importvisible="Importvisible"/> <import-stu v-model:Importvisible="Importvisible" />
<!-- 查看学员 传入查看学员的id--> <!-- 查看学员 传入查看学员的id-->
<see-stu <see-stu
v-model:Seevisible="Seevisible" v-model:Seevisible="Seevisible"
@@ -1220,9 +1220,9 @@
v-model:projectId="projectId" v-model:projectId="projectId"
/> />
<!-- 面授学员抽屉 --> <!-- 面授学员抽屉 -->
<face-stu v-model:FSvisible="FSvisible"/> <face-stu v-model:FSvisible="FSvisible" />
<!-- 活动考勤抽屉 --> <!-- 活动考勤抽屉 -->
<active-attendance v-model:AAvisible="AAvisible" :title="showkaoqinText"/> <active-attendance v-model:AAvisible="AAvisible" :title="showkaoqinText" />
<!-- 作业管理抽屉 --> <!-- 作业管理抽屉 -->
<work-manage <work-manage
v-model:Wvisible="Wvisible" v-model:Wvisible="Wvisible"
@@ -1237,7 +1237,7 @@
:itemsType="itemstype" :itemsType="itemstype"
/> />
<!-- 批量面授报名 --> <!-- 批量面授报名 -->
<task-imp-stu v-model:TaskFaceImpStuvisible="TaskFaceImpStuvisible"/> <task-imp-stu v-model:TaskFaceImpStuvisible="TaskFaceImpStuvisible" />
<!-- 概览（无数据）-项目发布弹窗 --> <!-- 概览（无数据）-项目发布弹窗 -->
<div> <div>
@@ -1296,7 +1296,7 @@
</div> </div>
</div> </div>
<div class="send"> <div class="send">
<a-switch v-model:checked="checked" size="small"/> <a-switch v-model:checked="checked" size="small" />
<span class="sendtext">发送项目通知</span> <span class="sendtext">发送项目通知</span>
</div> </div>
<div class="ckb"> <div class="ckb">
@@ -1339,7 +1339,9 @@
" "
> >
<div class="headerLeft" style="margin-left: 32px"> <div class="headerLeft" style="margin-left: 32px">
<span class="headerLeftText" style="font-size: 16px">创建小组</span> <span class="headerLeftText" style="font-size: 16px">{{
stuMemberClassify === 1 ? "创建小组" : "编辑小组"
}}</span>
</div> </div>
<div style="cursor: pointer; margin-right: 32px" @click="closeModal2"> <div style="cursor: pointer; margin-right: 32px" @click="closeModal2">
<img <img
@@ -1374,11 +1376,15 @@
</div> </div>
<div class="inname">小组长:</div> <div class="inname">小组长:</div>
<div class="in"> <div class="in">
<a-input <ProjectManager
v-model:value="stuGroupId"
v-model:name="stuGroupName"
></ProjectManager>
<!-- <a-input
v-model:value="valueaddm" v-model:value="valueaddm"
placeholder="请输入小组长" placeholder="请输入小组长"
style="border-radius: 8px; height: 40px" style="border-radius: 8px; height: 40px"
/> /> -->
</div> </div>
</div> </div>
<div class="pubtn"> <div class="pubtn">
@@ -1554,7 +1560,7 @@
</a-modal> </a-modal>
</div> </div>
<!-- 编辑项目弹窗 --> <!-- 编辑项目弹窗 -->
<proj-set v-model:editHs="editHs" v-model:projectId="projectId"/> <proj-set v-model:editHs="editHs" v-model:projectId="projectId" />
<!-- 二维码弹窗 --> <!-- 二维码弹窗 -->
<two-dimensional-code <two-dimensional-code
@@ -1739,9 +1745,9 @@
</div> </div>
</template> </template>
<script> <script>
import {reactive, toRefs, onMounted, watch, computed} from "vue"; import { reactive, toRefs, onMounted, watch, computed } from "vue";
import {useRoute} from "vue-router"; import { useRoute } from "vue-router";
import {useRouter} from "vue-router"; import { useRouter } from "vue-router";
// import { CaretRightOutlined } from "@ant-design/icons-vue"; // import { CaretRightOutlined } from "@ant-design/icons-vue";
import TimeManage from "../../components/drawers/TimeManage"; import TimeManage from "../../components/drawers/TimeManage";
import FaceManage from "../../components/drawers/FaceManage"; import FaceManage from "../../components/drawers/FaceManage";
@@ -1760,7 +1766,7 @@ import NoticePub from "../../components/drawers/NoticePub";
import NoticeHis from "../../components/drawers/NoticeHis"; import NoticeHis from "../../components/drawers/NoticeHis";
// import ProjectScore from "../../components/drawers/ProjectScore"; // import ProjectScore from "../../components/drawers/ProjectScore";
import TaskImpStu from "../../components/drawers/TaskFaceIn"; import TaskImpStu from "../../components/drawers/TaskFaceIn";
import {storage} from "../../api/storage"; import { storage } from "../../api/storage";
import * as api from "../../api/index1"; import * as api from "../../api/index1";
import * as apiproj from "../../api/index"; import * as apiproj from "../../api/index";
import { import {
@@ -1771,18 +1777,18 @@ import {
editGroup, editGroup,
topStudent, topStudent,
} from "../../api/indexProjStu"; } from "../../api/indexProjStu";
import {message} from "ant-design-vue"; import { message } from "ant-design-vue";
import * as apitl from "../../api/index"; import * as apitl from "../../api/index";
import {getTask} from "../../api/indexTaskadd"; import { getTask } from "../../api/indexTaskadd";
import {editProj} from "../../api/indexTaskadd"; import { editProj } from "../../api/indexTaskadd";
import {toDate} from "../../api/method"; import { toDate } from "../../api/method";
import projSet from "../../components/Modals/projSet"; import projSet from "../../components/Modals/projSet";
import {overview} from "../../api/indexProjStu"; import { overview } from "../../api/indexProjStu";
import TwoDimensionalCode from "../../components/TwoDimensionalCode.vue"; import TwoDimensionalCode from "../../components/TwoDimensionalCode.vue";
import {useStore} from "vuex"; import { useStore } from "vuex";
import ProjectLevel from "@/components/project/ProjectLevel"; import ProjectLevel from "@/components/project/ProjectLevel";
import TrainClass from "@/components/project/TrainClass"; import TrainClass from "@/components/project/TrainClass";
import ProjectManager from "@/components/project/ProjectManager";
export default { export default {
name: "taskPage", name: "taskPage",
components: { components: {
@@ -1807,6 +1813,7 @@ export default {
projSet, projSet,
NoticeHis, NoticeHis,
TwoDimensionalCode, TwoDimensionalCode,
ProjectManager,
}, },
setup() { setup() {
const store = useStore(); const store = useStore();
@@ -1878,23 +1885,23 @@ export default {
projectTaskId: "", //项目任务任务id projectTaskId: "", //项目任务任务id
//进度排行学员 //进度排行学员
rankjindu: [ rankjindu: [
{value: "学员", label: "学员"}, { value: "学员", label: "学员" },
{value: "小组", label: "小组"}, { value: "小组", label: "小组" },
], ],
valuestu1: "学员", valuestu1: "学员",
//进度排行阶段 //进度排行阶段
rankjieduan: [{value: "第一阶段", label: "第一阶段"}], rankjieduan: [{ value: "第一阶段", label: "第一阶段" }],
valuestu2: "第一阶段", valuestu2: "第一阶段",
//积分排行 //积分排行
rankxuefen: [ rankxuefen: [
{value: "学员", label: "学员"}, { value: "学员", label: "学员" },
{value: "小组", label: "小组"}, { value: "小组", label: "小组" },
], ],
valuestu3: "学员", valuestu3: "学员",
//学时排行 //学时排行
rankxueshi: [ rankxueshi: [
{value: "学员", label: "学员"}, { value: "学员", label: "学员" },
{value: "小组", label: "小组"}, { value: "小组", label: "小组" },
], ],
valuestu4: "学员", valuestu4: "学员",
visible: false, //时间管理 visible: false, //时间管理
@@ -1946,6 +1953,8 @@ export default {
valuestugroup: "", //学员管理小组名称 valuestugroup: "", //学员管理小组名称
projectGroupId: null, //是编辑小组id projectGroupId: null, //是编辑小组id
stuMemberClassify: null, //1：新建小组 2：编辑小组 stuMemberClassify: null, //1：新建小组 2：编辑小组
stuGroupId: null, //选择的小组长id
stuGroupName: null, //选择的小组长名字
valueDate: "", //排行榜输入日期 valueDate: "", //排行榜输入日期
noticeChecked: true, noticeChecked: true,
noticeContent: "", noticeContent: "",
@@ -2038,21 +2047,21 @@ export default {
if (text.record.rank == "1") { if (text.record.rank == "1") {
return ( return (
<img <img
style={{width: 24, height: 24}} style={{ width: 24, height: 24 }}
src={require("../../assets/images/taskpage/one.png")} src={require("../../assets/images/taskpage/one.png")}
/> />
); );
} else if (text.record.rank == "2") { } else if (text.record.rank == "2") {
return ( return (
<img <img
style={{width: 24, height: 24}} style={{ width: 24, height: 24 }}
src={require("../../assets/images/taskpage/two.png")} src={require("../../assets/images/taskpage/two.png")}
/> />
); );
} else if (text.record.rank == "3") { } else if (text.record.rank == "3") {
return ( return (
<img <img
style={{width: 24, height: 24}} style={{ width: 24, height: 24 }}
src={require("../../assets/images/taskpage/three.png")} src={require("../../assets/images/taskpage/three.png")}
/> />
); );
@@ -2145,21 +2154,21 @@ export default {
if (text.record.rank == "1") { if (text.record.rank == "1") {
return ( return (
<img <img
style={{width: 24, height: 24}} style={{ width: 24, height: 24 }}
src={require("../../assets/images/taskpage/one.png")} src={require("../../assets/images/taskpage/one.png")}
/> />
); );
} else if (text.record.rank == "2") { } else if (text.record.rank == "2") {
return ( return (
<img <img
style={{width: 24, height: 24}} style={{ width: 24, height: 24 }}
src={require("../../assets/images/taskpage/two.png")} src={require("../../assets/images/taskpage/two.png")}
/> />
); );
} else if (text.record.rank == "3") { } else if (text.record.rank == "3") {
return ( return (
<img <img
style={{width: 24, height: 24}} style={{ width: 24, height: 24 }}
src={require("../../assets/images/taskpage/three.png")} src={require("../../assets/images/taskpage/three.png")}
/> />
); );
@@ -2252,21 +2261,21 @@ export default {
if (text.record.rank == "1") { if (text.record.rank == "1") {
return ( return (
<img <img
style={{width: 24, height: 24}} style={{ width: 24, height: 24 }}
src={require("../../assets/images/taskpage/one.png")} src={require("../../assets/images/taskpage/one.png")}
/> />
); );
} else if (text.record.rank == "2") { } else if (text.record.rank == "2") {
return ( return (
<img <img
style={{width: 24, height: 24}} style={{ width: 24, height: 24 }}
src={require("../../assets/images/taskpage/two.png")} src={require("../../assets/images/taskpage/two.png")}
/> />
); );
} else if (text.record.rank == "3") { } else if (text.record.rank == "3") {
return ( return (
<img <img
style={{width: 24, height: 24}} style={{ width: 24, height: 24 }}
src={require("../../assets/images/taskpage/three.png")} src={require("../../assets/images/taskpage/three.png")}
/> />
); );
@@ -2661,22 +2670,25 @@ export default {
state.projectGroupId = state.projectGroupId =
item && item.projectGroupId ? item.projectGroupId : null; item && item.projectGroupId ? item.projectGroupId : null;
state.stugroup = true; state.stugroup = true;
console.log("item", item);
if (item) { if (item) {
state.valueaddg = item.groupName; state.valueaddg = item.groupName;
state.valueaddm = item.leaderName; state.stuGroupName = item.leaderName;
state.stuGroupId = item.leaderId;
} }
console.log("编辑小组item", item); console.log("编辑小组item", item);
}; };
const closeModal2 = () => { const closeModal2 = () => {
state.stugroup = false; state.stugroup = false;
state.valueaddg = null; state.valueaddg = null;
state.valueaddm = null; state.stuGroupName = null;
state.stuGroupId = null;
state.projectGroupId = null; state.projectGroupId = null;
state.stuMemberClassify = null; state.stuMemberClassify = null;
}; };
//点击确定创建小组 //点击确定创建小组
const createG = () => { const createG = () => {
if (state.valueaddm == "" || state.valueaddg == "") { if (state.stuGroupName == "" || state.valueaddg == "") {
message.destroy(); message.destroy();
return message.warning("请输入必填项"); return message.warning("请输入必填项");
} else { } else {
@@ -2988,7 +3000,7 @@ export default {
// width: 60, // width: 60,
align: "center", align: "center",
className: "h", className: "h",
scopedSlots: {customRender: "action"}, //引入的插槽 scopedSlots: { customRender: "action" }, //引入的插槽
customRender: (text) => { customRender: (text) => {
// console.log(text); // console.log(text);
return ( return (
@@ -3460,8 +3472,8 @@ export default {
if (state.stuMemberClassify === 1) { if (state.stuMemberClassify === 1) {
let obj = { let obj = {
groupName: state.valueaddg, groupName: state.valueaddg,
leaderId: 0, leaderId: state.stuGroupId,
leaderName: state.valueaddm, leaderName: state.stuGroupName,
// projectGroupId: 0, // projectGroupId: 0,
projectId: state.projectId, projectId: state.projectId,
}; };
@@ -3480,8 +3492,8 @@ export default {
if (state.stuMemberClassify === 2) { if (state.stuMemberClassify === 2) {
let obj = { let obj = {
groupName: state.valueaddg, groupName: state.valueaddg,
leaderId: 0, leaderId: state.stuGroupId,
leaderName: state.valueaddm, leaderName: state.stuGroupName,
projectGroupId: state.projectGroupId, projectGroupId: state.projectGroupId,
projectId: state.projectId, projectId: state.projectId,
}; };
@@ -3527,7 +3539,7 @@ export default {
//start---------项目概览 //start---------项目概览
// 获取项目概览 // 获取项目概览
const getOverview = () => { const getOverview = () => {
overview({projectId: state.projectId}) overview({ projectId: state.projectId })
.then((res) => { .then((res) => {
Object.keys(res.data.data.projectInfoOverview).forEach((item) => { Object.keys(res.data.data.projectInfoOverview).forEach((item) => {
levelList.projectInfoOverview[item] = levelList.projectInfoOverview[item] =
@@ -3551,6 +3563,7 @@ export default {
}; };
//end---------项目概览 //end---------项目概览
// 设置上传图片开关 // 设置上传图片开关
const checkedClose = (data, a) => { const checkedClose = (data, a) => {
console.log(data, a); console.log(data, a);
@@ -3586,7 +3599,7 @@ export default {
}); });
}; };
const handleChange = ({file, fileList}) => { const handleChange = ({ file, fileList }) => {
let list = []; let list = [];
if (file.status !== "uploading") { if (file.status !== "uploading") {
console.log("上传的list", fileList); console.log("上传的list", fileList);

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

@@ -460,7 +460,7 @@ export default {
}); });
} }
} else { } else {
virtualDel(); virtualDel(id);
} }
}; };
const virtualDel = (id) => { const virtualDel = (id) => {