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
* @Date: 2022-11-21 14:32:52
* @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
* @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(
(config) => {
console.log("config", config);
// console.log("config", config);
// const token = localStorage.getItem("token");
// // const token = getCookie('token')
// // console.log('token', token)

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

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

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

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

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

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

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

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

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

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

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

@@ -1339,7 +1339,9 @@
"
>
<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 style="cursor: pointer; margin-right: 32px" @click="closeModal2">
<img
@@ -1374,11 +1376,15 @@
</div>
<div class="inname">小组长:</div>
<div class="in">
<a-input
<ProjectManager
v-model:value="stuGroupId"
v-model:name="stuGroupName"
></ProjectManager>
<!-- <a-input
v-model:value="valueaddm"
placeholder="请输入小组长"
style="border-radius: 8px; height: 40px"
/>
/> -->
</div>
</div>
<div class="pubtn">
@@ -1782,7 +1788,7 @@ import TwoDimensionalCode from "../../components/TwoDimensionalCode.vue";
import { useStore } from "vuex";
import ProjectLevel from "@/components/project/ProjectLevel";
import TrainClass from "@/components/project/TrainClass";
import ProjectManager from "@/components/project/ProjectManager";
export default {
name: "taskPage",
components: {
@@ -1807,6 +1813,7 @@ export default {
projSet,
NoticeHis,
TwoDimensionalCode,
ProjectManager,
},
setup() {
const store = useStore();
@@ -1946,6 +1953,8 @@ export default {
valuestugroup: "", //学员管理小组名称
projectGroupId: null, //是编辑小组id
stuMemberClassify: null, //1：新建小组 2：编辑小组
stuGroupId: null, //选择的小组长id
stuGroupName: null, //选择的小组长名字
valueDate: "", //排行榜输入日期
noticeChecked: true,
noticeContent: "",
@@ -2661,22 +2670,25 @@ export default {
state.projectGroupId =
item && item.projectGroupId ? item.projectGroupId : null;
state.stugroup = true;
console.log("item", item);
if (item) {
state.valueaddg = item.groupName;
state.valueaddm = item.leaderName;
state.stuGroupName = item.leaderName;
state.stuGroupId = item.leaderId;
}
console.log("编辑小组item", item);
};
const closeModal2 = () => {
state.stugroup = false;
state.valueaddg = null;
state.valueaddm = null;
state.stuGroupName = null;
state.stuGroupId = null;
state.projectGroupId = null;
state.stuMemberClassify = null;
};
//点击确定创建小组
const createG = () => {
if (state.valueaddm == "" || state.valueaddg == "") {
if (state.stuGroupName == "" || state.valueaddg == "") {
message.destroy();
return message.warning("请输入必填项");
} else {
@@ -3460,8 +3472,8 @@ export default {
if (state.stuMemberClassify === 1) {
let obj = {
groupName: state.valueaddg,
leaderId: 0,
leaderName: state.valueaddm,
leaderId: state.stuGroupId,
leaderName: state.stuGroupName,
// projectGroupId: 0,
projectId: state.projectId,
};
@@ -3480,8 +3492,8 @@ export default {
if (state.stuMemberClassify === 2) {
let obj = {
groupName: state.valueaddg,
leaderId: 0,
leaderName: state.valueaddm,
leaderId: state.stuGroupId,
leaderName: state.stuGroupName,
projectGroupId: state.projectGroupId,
projectId: state.projectId,
};
@@ -3551,6 +3563,7 @@ export default {
};
//end---------项目概览
// 设置上传图片开关
const checkedClose = (data, a) => {
console.log(data, a);

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

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