+
+
+
@@ -142,6 +155,7 @@
v-model:value="textV1"
placeholder="请输入投票说明"
allow-clear
+ :rows="6"
maxlength="150"
/>
@@ -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;
diff --git a/src/components/vote/CreateVote.vue b/src/components/vote/CreateVote.vue
index c15ab7b7..7105db41 100644
--- a/src/components/vote/CreateVote.vue
+++ b/src/components/vote/CreateVote.vue
@@ -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) => {
diff --git a/src/views/learningpath/LearningPath.vue b/src/views/learningpath/LearningPath.vue
index 0112720a..f82e7bc4 100644
--- a/src/views/learningpath/LearningPath.vue
+++ b/src/views/learningpath/LearningPath.vue
@@ -878,11 +878,16 @@ export default {
api
.handleLearnPath(obj)
.then((res) => {
- console.log("发布成功", res);
- message.destroy();
- message.success("发布成功");
- state.pub = false;
- getLearnPath();
+ 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) => {
- console.log("复制成功", res);
- message.destroy();
- message.success("复制成功");
- state.copyModal = false;
- getLearnPath();
+ 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) => {
- console.log("停用成功", res);
- message.destroy();
- message.success("停用成功");
- state.stopModal = false;
- getLearnPath();
+ 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) => {
- console.log("撤回成功", res);
- message.destroy();
- message.success("撤回成功");
- state.backModal = false;
- getLearnPath();
+ 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) => {
- console.log("删除成功", res);
- message.destroy();
- message.success("删除成功");
- state.deleteModal = false;
- getLearnPath();
+ 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,23 +1604,28 @@ export default {
api
.createLearnPath(obj)
.then((res) => {
- console.log("修改成功", res);
- message.destroy();
- message.success("修改成功");
- // state.createLoading = false;
- // state.currentPage = 1;
- state.out1 = false;
- // router.push("/leveladd");
- getLearnPath();
- // setTimeout(() => {
- // console.log("修改成功", res);
- // message.success("修改成功");
- // // state.createLoading = false;
- // // state.currentPage = 1;
- // state.out1 = false;
- // // router.push("/leveladd");
- // getLearnPath();
- // }, 1000);
+ if (res.data.code === 200) {
+ console.log("修改成功", res);
+ message.destroy();
+ message.success("修改成功");
+ // state.createLoading = false;
+ // state.currentPage = 1;
+ state.out1 = false;
+ // router.push("/leveladd");
+ getLearnPath();
+ // setTimeout(() => {
+ // console.log("修改成功", res);
+ // message.success("修改成功");
+ // // state.createLoading = false;
+ // // state.currentPage = 1;
+ // state.out1 = false;
+ // // router.push("/leveladd");
+ // getLearnPath();
+ // }, 1000);
+ }
+ if (res.data.code === -1) {
+ message.warning(res.data.msg);
+ }
})
.catch((err) => {
console.log("修改失败", err);
diff --git a/src/views/learningpath/LevelAdd.vue b/src/views/learningpath/LevelAdd.vue
index edf0de79..8bba71ef 100644
--- a/src/views/learningpath/LevelAdd.vue
+++ b/src/views/learningpath/LevelAdd.vue
@@ -138,10 +138,11 @@
快速添加学员