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

This commit is contained in:
wyx
2022-12-05 23:00:29 +08:00
8 changed files with 927 additions and 834 deletions

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)

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;

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) => {

View File

@@ -878,11 +878,16 @@ export default {
api api
.handleLearnPath(obj) .handleLearnPath(obj)
.then((res) => { .then((res) => {
console.log("发布成功", res); console.log("发布", res);
message.destroy(); if (res.data.code === 200) {
message.success("发布成功"); message.destroy();
state.pub = false; message.success("发布成功");
getLearnPath(); state.pub = false;
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) => {
console.log("复制成功", res); if (res.data.code === 200) {
message.destroy(); console.log("复制成功", res);
message.success("复制成功"); message.destroy();
state.copyModal = false; message.success("复制成功");
getLearnPath(); state.copyModal = false;
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) => {
console.log("停用成功", res); if (res.data.code === 200) {
message.destroy(); console.log("停用成功", res);
message.success("停用成功"); message.destroy();
state.stopModal = false; message.success("停用成功");
getLearnPath(); state.stopModal = false;
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) => {
console.log("撤回成功", res); if (res.data.code === 200) {
message.destroy(); console.log("撤回成功", res);
message.success("撤回成功"); message.destroy();
state.backModal = false; message.success("撤回成功");
getLearnPath(); state.backModal = false;
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) => {
console.log("删除成功", res); if (res.data.code === 200) {
message.destroy(); console.log("删除成功", res);
message.success("删除成功"); message.destroy();
state.deleteModal = false; message.success("删除成功");
getLearnPath(); state.deleteModal = false;
getLearnPath();
}
if (res.data.code === -1) {
message.warning(res.data.msg);
}
}) })
.catch((err) => { .catch((err) => {
console.log("删除失败", err); console.log("删除失败", err);
@@ -1579,23 +1604,28 @@ export default {
api api
.createLearnPath(obj) .createLearnPath(obj)
.then((res) => { .then((res) => {
console.log("修改成功", res); if (res.data.code === 200) {
message.destroy(); console.log("修改成功", res);
message.success("修改成功"); message.destroy();
// state.createLoading = false; message.success("修改成功");
// state.currentPage = 1; // state.createLoading = false;
state.out1 = false; // state.currentPage = 1;
// router.push("/leveladd"); state.out1 = false;
getLearnPath(); // router.push("/leveladd");
// setTimeout(() => { getLearnPath();
// console.log("修改成功", res); // setTimeout(() => {
// message.success("修改成功"); // console.log("修改成功", res);
// // state.createLoading = false; // message.success("修改成功");
// // state.currentPage = 1; // // state.createLoading = false;
// state.out1 = false; // // state.currentPage = 1;
// // router.push("/leveladd"); // state.out1 = false;
// getLearnPath(); // // router.push("/leveladd");
// }, 1000); // getLearnPath();
// }, 1000);
}
if (res.data.code === -1) {
message.warning(res.data.msg);
}
}) })
.catch((err) => { .catch((err) => {
console.log("修改失败", err); console.log("修改失败", err);

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) => {
console.log("发布成功", res); if (res.data.code === 200) {
message.destroy(); console.log("发布成功", res);
message.success("发布成功"); message.destroy();
state.pub = false; message.success("发布成功");
state.nodata = false; state.pub = false;
// getLearnPath(); state.nodata = false;
// 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;

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">

File diff suppressed because it is too large Load Diff

View File

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