feat:测试评估投票 创建完信息添加到学习路径完善

This commit is contained in:
dongwug
2022-11-04 16:23:46 +08:00
parent bbd64a50f2
commit 09d6a19ac4
4 changed files with 104 additions and 47 deletions

View File

@@ -242,7 +242,6 @@ export default {
console.log("创建成功", res); console.log("创建成功", res);
message.success("创建成功"); message.success("创建成功");
closeDrawer(); closeDrawer();
console.log("1111", props.learn);
if (props.learn == 0) if (props.learn == 0)
apitaskadd apitaskadd
.addTask({ .addTask({
@@ -257,7 +256,11 @@ export default {
}) })
.then((res) => { .then((res) => {
console.log("调用项目添加接口后", res.data); console.log("调用项目添加接口后", res.data);
//自定义事件给父组件传值
ctx.emit("changeData", false); ctx.emit("changeData", false);
//重新获取任务列表
// apiTask.getTask({ projectId: 28 });
// router.push("/taskadd");
}) })
.catch((err) => { .catch((err) => {
console.log(err); console.log(err);
@@ -274,12 +277,6 @@ export default {
type: 10, type: 10,
}; };
RouterEditTask(editObj1) RouterEditTask(editObj1)
.then((res) => {
console.log("调用学历路径添加接口后", res.data);
})
.catch((err) => {
console.log(err);
});
} }
}) })
.catch((err) => { .catch((err) => {

View File

@@ -74,6 +74,7 @@ import { reactive, toRefs } from "vue";
import * as api from "../../api/indexInvist"; import * as api from "../../api/indexInvist";
import * as apitaskadd from "../../api/indexTaskadd"; import * as apitaskadd from "../../api/indexTaskadd";
import { message } from "ant-design-vue"; import { message } from "ant-design-vue";
import { RouterEditTask } from "@/api/indexTask";
export default { export default {
name: "AddInvist", name: "AddInvist",
// components: { // components: {
@@ -83,6 +84,14 @@ export default {
type: Boolean, type: Boolean,
default: false, default: false,
}, },
edit: {
type: Boolean,
default: false,
},
learn: {
type: Number,
default: 0,
},
}, },
setup(props, ctx) { setup(props, ctx) {
const state = reactive({ const state = reactive({
@@ -198,6 +207,7 @@ export default {
message.success("创建成功"); message.success("创建成功");
closeDrawer(); closeDrawer();
getAllInvistText(); getAllInvistText();
if (props.learn == 0)
apitaskadd apitaskadd
.addTask({ .addTask({
courseId: 0, courseId: 0,
@@ -211,11 +221,28 @@ export default {
}) })
.then((res) => { .then((res) => {
console.log("调用项目添加接口后", res.data); console.log("调用项目添加接口后", res.data);
//自定义事件给父组件传值
ctx.emit("changeData", false); ctx.emit("changeData", false);
//重新获取任务列表
// apiTask.getTask({ projectId: 28 });
// router.push("/taskadd");
}) })
.catch((err) => { .catch((err) => {
console.log(err); console.log(err);
}); });
else {
let editObj1 = {
chapterId: 36,
courseId: 0,
duration: 0,
flag: true,
name: obj.appraiseName,
routerId: 92,
routerTaskId: 0,
type: 11,
};
RouterEditTask(editObj1)
}
}) })
.catch((err) => { .catch((err) => {
console.log("创建失败", err); console.log("创建失败", err);

View File

@@ -52,8 +52,7 @@
</div> </div>
<!-- 创建投票侧弹窗 --> <!-- 创建投票侧弹窗 -->
<div> <div>
<cre-vote v-model:crevoteVisible="crevotevisible" <cre-vote v-model:crevoteVisible="crevotevisible"/>
@setStemId="changeStemId"/>
</div> </div>
<!-- 创建投票侧弹窗 --> <!-- 创建投票侧弹窗 -->
</div> </div>
@@ -111,6 +110,7 @@ import * as api from "../../api/indexVote";
import * as apitaskadd from "../../api/indexTaskadd"; import * as apitaskadd from "../../api/indexTaskadd";
import { message } from "ant-design-vue"; import { message } from "ant-design-vue";
import { toDate } from "../../api/method"; import { toDate } from "../../api/method";
import { RouterEditTask } from "@/api/indexTask";
const options1 = ref([ const options1 = ref([
{ {
value: "value1", value: "value1",
@@ -144,6 +144,14 @@ export default {
type: Boolean, type: Boolean,
default: false, default: false,
}, },
edit: {
type: Boolean,
default: false,
},
learn: {
type: Number,
default: 0,
},
}, },
setup(props, ctx) { setup(props, ctx) {
const state = reactive({ const state = reactive({
@@ -207,8 +215,8 @@ export default {
.then((res) => { .then((res) => {
console.log("创建成功", res); console.log("创建成功", res);
message.success("创建成功"); message.success("创建成功");
// changeStemId();
closeDrawer(); closeDrawer();
if (props.learn == 0)
apitaskadd apitaskadd
.addTask({ .addTask({
courseId: 0, courseId: 0,
@@ -219,16 +227,36 @@ export default {
projectTaskId: 0, projectTaskId: 0,
stageId: 3, stageId: 3,
type: 12, type: 12,
})
.then((res) => {
console.log("调用项目添加接口后", res.data);
//自定义事件给父组件传值
ctx.emit("changeData", false);
//重新获取任务列表
// apiTask.getTask({ projectId: 28 });
// router.push("/taskadd");
})
.catch((err) => {
console.log(err);
}); });
else {
let editObj1 = {
chapterId: 36,
courseId: 0,
duration: 0,
flag: true,
name: obj.voteName,
routerId: 92,
routerTaskId: 0,
type: 12,
};
RouterEditTask(editObj1)
}
}) })
.catch((err) => { .catch((err) => {
console.log("创建失败", err); console.log("创建失败", err);
// state.createLoading = false;
}); });
}; };
const changeStemId = (stemId) => {
console.log(stemId);
}
return { return {
...toRefs(state), ...toRefs(state),
showDrawerCreVote, showDrawerCreVote,
@@ -237,7 +265,6 @@ export default {
rowSelection, rowSelection,
options1, options1,
createVoteText, createVoteText,
changeStemId,
}; };
}, },
}; };

View File

@@ -262,7 +262,8 @@
<div> <div>
<add-invist <add-invist
v-model:addinvistVisible="addinvistvisible" v-model:addinvistVisible="addinvistvisible"
@changeData="updateTableData" v-model:edit="edit"
v-model:learn="learn"
/> />
</div> </div>
<!-- 添加评估侧弹窗 --> <!-- 添加评估侧弹窗 -->
@@ -279,7 +280,8 @@
<div> <div>
<add-vote <add-vote
v-model:addvoteVisible="addvotevisible" v-model:addvoteVisible="addvotevisible"
@changeData="updateTableData" v-model:edit="edit"
v-model:learn="learn"
/> />
</div> </div>
<!-- 添加投票侧弹窗 --> <!-- 添加投票侧弹窗 -->
@@ -527,14 +529,16 @@
<!-- 添加讨论侧弹窗 --> <!-- 添加讨论侧弹窗 -->
<div> <div>
<add-discuss <add-discuss
v-model:adddiscussVisible="adddiscussvisible" v-model:isStudiscuss="isStudiscuss" v-model:adddiscussVisible="adddiscussvisible"
v-model:isStudiscuss="isStudiscuss"
/> />
</div> </div>
<!-- 添加讨论侧弹窗 --> <!-- 添加讨论侧弹窗 -->
<!-- 添加活动侧弹窗 --> <!-- 添加活动侧弹窗 -->
<div> <div>
<add-active <add-active
v-model:addactiveVisible="addactivevisible" v-model:isStudiscuss="isStudiscuss" v-model:addactiveVisible="addactivevisible"
v-model:isStudiscuss="isStudiscuss"
/> />
</div> </div>
<!-- 添加活动侧弹窗 --> <!-- 添加活动侧弹窗 -->
@@ -941,9 +945,11 @@ export default {
}; };
const showDrawerAddInvist = () => { const showDrawerAddInvist = () => {
state.addinvistvisible = true; state.addinvistvisible = true;
state.learn = 1;
}; };
const showDrawerAddVote = () => { const showDrawerAddVote = () => {
state.addvotevisible = true; state.addvotevisible = true;
state.learn = 1;
}; };
// tableData数据赋值方法 // tableData数据赋值方法
@@ -1099,8 +1105,8 @@ export default {
<span <span
style="color:#4EA6FF;margin-right:25px;cursor:pointer" style="color:#4EA6FF;margin-right:25px;cursor:pointer"
onClick={() => { onClick={() => {
console.log("编辑id",e.record.routerTaskId); console.log("编辑id", e.record.routerTaskId);
console.log("编辑类型",e.record.lei); console.log("编辑类型", e.record.lei);
state.editID = e.record.routerTaskId; state.editID = e.record.routerTaskId;
//state.addhomeworkvisible = true; //state.addhomeworkvisible = true;
}} }}