-
-
-
-
搜索
+
+
+
-
-
-
+
+
+
+
+
+
搜索
+
+
+
+
+
+
重置
-
重置
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
搜索
-
-
-
-
-
-
重置
-
-
-
-
-
-
-
-
-
-
-
搜索
-
-
-
-
-
-
重置
-
-
+
+
-
-
-
-
-
-
-
-
- 李二明
-
+
+
快速选人
+
+
+
+
查看更多
+
+
+
收起
+
+
+
@@ -305,11 +201,44 @@
+
+
+
+
+
+
+
diff --git a/src/components/vote/CreateVote.vue b/src/components/vote/CreateVote.vue
new file mode 100644
index 00000000..2b9d3e18
--- /dev/null
+++ b/src/components/vote/CreateVote.vue
@@ -0,0 +1,652 @@
+
+
+
+
+
+
+
+
+
+
+
+
投票名称：
+
+
+
+
+
+
+
+
+
创建题干：
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/components/vote/VoteQuestion.vue b/src/components/vote/VoteQuestion.vue
new file mode 100644
index 00000000..d63e2b07
--- /dev/null
+++ b/src/components/vote/VoteQuestion.vue
@@ -0,0 +1,454 @@
+
+
+
+
+
+
+
+
+
题干{{item.id}}
+
+
+
+
+
+
+
+
diff --git a/src/components/vote/VoteQuestionItem.vue b/src/components/vote/VoteQuestionItem.vue
new file mode 100644
index 00000000..97776f69
--- /dev/null
+++ b/src/components/vote/VoteQuestionItem.vue
@@ -0,0 +1,439 @@
+
+
+
+
+
+
+ +添加图片
+
+
+
![]()
+
{{ hasImgName }}
+
+
+
+
+
+
diff --git a/src/views/certificate/CertificateCenter.vue b/src/views/certificate/CertificateCenter.vue
index 32dff498..4ea4ed49 100644
--- a/src/views/certificate/CertificateCenter.vue
+++ b/src/views/certificate/CertificateCenter.vue
@@ -234,17 +234,17 @@ export default {
const closeModal = () => {
state.visible = false;
};
- const getMousePosition = () => {
+ const getClientHeight = () => {
state.screenHeight = document.body.clientHeight;
};
onMounted(() => {
// console.log("11111", 1);
- window.addEventListener("resize", getMousePosition, false);
+ window.addEventListener("resize", getClientHeight, false);
// judgeUrl();
});
onUnmounted(() => {
- window.removeEventListener("resize", getMousePosition, false);
+ window.removeEventListener("resize", getClientHeight, false);
});
return {
diff --git a/src/views/learningpath/LevelAddDetail.vue b/src/views/learningpath/LevelAddDetail.vue
index 5da3bc3b..f1112328 100644
--- a/src/views/learningpath/LevelAddDetail.vue
+++ b/src/views/learningpath/LevelAddDetail.vue
@@ -51,7 +51,10 @@
@@ -1241,15 +1244,15 @@ export default {
};
//测试评估投票抽屉
const showDrawerAddEval = (id, eleId) => {
-
- state.addhomeworkvisible = true;
+ state.addevalVisible = true;
state.EditEvalId = id;
state.routerTaskId = eleId;
};
const showDrawerAddInvist = (id, eleId) => {
- state.addhomeworkvisible = true;
- state.EditInvistId = id;
+ state.addinvistVisible = true;
state.routerTaskId = eleId;
+ state.EditInvistId =id;
+
};
const showDrawerAddVote = (id, eleId) => {
state.addhomeworkvisible = true;
@@ -1713,16 +1716,20 @@ export default {
}
};
//删除关卡
- const deleteChapter=(chapterId)=>{
-let obj={
- chapterId:chapterId
-}
-api.deleteChapter(obj).then(res=>{
-console.log('删除关卡成功',res)
-}).catch(err=>{
- console.log('删除关卡失败',err)
-})
- }
+ const deleteChapter = (chapterId) => {
+ console.log('chapterId',chapterId)
+ let obj = {
+ chapterId: chapterId,
+ };
+ api
+ .deleteChapter(obj)
+ .then((res) => {
+ console.log("删除关卡成功", res);
+ })
+ .catch((err) => {
+ console.log("删除关卡失败", err);
+ });
+ };
return {
...toRefs(state),
// tableDataFunc,
diff --git a/src/views/projectcenter/TaskAdd.vue b/src/views/projectcenter/TaskAdd.vue
index 360f5a35..293616e0 100644
--- a/src/views/projectcenter/TaskAdd.vue
+++ b/src/views/projectcenter/TaskAdd.vue
@@ -280,6 +280,7 @@
v-model:edit="edit"
v-model:projectId="projectId"
v-model:chooseStageId="chooseStageId"
+ v-model:projectTaskId="projectTaskId"
v-model:EditEvalId="EditEvalId"
/>
@@ -301,6 +302,8 @@
v-model:edit="edit"
v-model:projectId="projectId"
v-model:chooseStageId="chooseStageId"
+ v-model:projectTaskId="projectTaskId"
+ v-model:EditInvistId = "EditInvistId"
/>
@@ -321,6 +324,8 @@
v-model:edit="edit"
v-model:projectId="projectId"
v-model:chooseStageId="chooseStageId"
+ v-model:projectTaskId="projectTaskId"
+ v-model:EditVoteId = "EditVoteId"
/>
@@ -840,19 +845,11 @@ import AddInvist from "../../components/drawers/AddInvist.vue";
import AddVote from "../../components/drawers/AddVote.vue";
import { message } from "ant-design-vue";
import * as api from "../../api/indexTaskadd";
-import * as apilive from "../../api/indexLiveBroadcast";
-import * as apiExternal from "../../api/indexExternalChain";
-import * as apidiscuss from "../../api/indexDiscuss";
-import * as apiactivity from "../../api/indexActivity";
-import * as apieval from "../../api/indexEval";
-import * as apiinvist from "../../api/indexInvist";
-import * as apivote from "../../api/indexVote";
import * as apistage from "../../api/indexStage";
import * as apimove from "../../api/indexMovetask";
import draggable from "vuedraggable";
import { storage } from "../../api/storage";
-import { deleteExaminationById } from "@/api/indexExam";
-import { deleteWorkTask } from "@/api/indexWork";
+
const drawercolumns = [
{
@@ -928,6 +925,8 @@ export default {
EditWorkId:null, // 要编辑的作业id
EditTestId: null,// 要编辑的考试id
EditEvalId:null,
+ EditInvistId:null,
+ EditVoteId:null,
projectTaskId:null, // 要编辑的具体任务id
projectNameList: [
{
@@ -1352,13 +1351,7 @@ export default {
});
};
- //获取阶段
- // const getStage = () =>{
- // let obj = {
- // projectId:state.projectId
- // }
- // }
//获取删除id（投票)
const changeVData = (data) => {
@@ -1370,150 +1363,7 @@ export default {
console.log("添加数据", data);
getTask(data);
};
- // 删除考试
- const deleteTest = () => {
- let obj = {
- examinationId: state.deleteID,
- };
- deleteExaminationById(obj)
- .then((res) => {
- console.log("删除成功", res);
- message.success("删除成功");
- //重新获取列表
- getTask();
- })
- .catch((err) => {
- console.log(err);
- });
- };
-
- // 删除作业
- const deleteWork = () => {
- let obj = {
- workId: state.deleteID,
- };
- deleteWorkTask(obj)
- .then((res) => {
- console.log("删除成功", res);
- message.success("删除成功");
- //重新获取列表
- getTask();
- })
- .catch((err) => {
- console.log(err);
- });
- };
-
- //删除直播
- const deleteLiveBroadcast = () => {
- let obj = {
- liveId: state.deleteLiveID,
- };
- apilive
- .deleteLiveBroadcast(obj)
- .then((res) => {
- console.log("删除成功", res);
- message.success("删除成功");
- //重新获取列表
- getTask();
- })
- .catch((err) => {
- console.log(err);
- });
- };
-
- //删除外链
- const deleteExternalChain = () => {
- let obj = {
- linkId: state.deleteExternalID,
- // linkId: 11,
- };
- apiExternal
- .deleteLink(obj)
- .then((res) => {
- console.log(res);
- //重新获取列表
- getTask();
- })
- .catch((err) => {
- console.log(err);
- });
- };
- //删除讨论
- const deleteDiscuss = () => {
- let obj = {
- discussId: state.deleteDiscussID,
- };
- apidiscuss
- .deleteDiscuss(obj)
- .then((res) => {
- console.log("删除成功", res);
- message.success("删除成功");
- state.deleteModal = false;
- //重新获取列表
- getTask();
- })
- .catch((err) => {
- console.log("删除失败", err);
- });
- };
- //删除活动
- const deleteActivity = () => {
- let obj = {
- activityId: state.deleteActivityID,
- };
- apiactivity
- .deleteActivity(obj)
- .then((res) => {
- console.log("删除成功", res);
- message.success("删除成功");
- state.deleteModal = false;
- //重新获取列表
- getTask();
- })
- .catch((err) => {
- console.log("删除失败", err);
- });
- };
-
- //删除测评测试
- const deleteEvalText = () => {
- let obj = {
- evaluationId: "",
- token: 123,
- };
- apieval
- .deleteEvaluationById(obj)
- .then((res) => {
- console.log("删除成功", res);
- message.success("删除成功");
- //重新获取列表
- getTask();
- })
- .catch((err) => {
- console.log("删除失败", err);
- });
- };
-
- //删除评估测试
- const deleteInvistText = () => {
- let obj = {
- 评估信息Id: "",
- token: "",
- };
- apiinvist
- .deleteAppraise(obj)
- .then((res) => {
- console.log("删除成功", res);
- message.success("删除成功");
- //重新获取列表
- getTask();
- })
- .catch((err) => {
- console.log("删除失败", err);
- });
- };
-
+
//删除任务
const deleteTask = () => {
let obj = { projectTaskIds: state.deleteID };
@@ -1528,25 +1378,6 @@ export default {
});
};
- //删除投票信息
- const deleteVoteText = () => {
- let obj = {
- voteId: state.voteId,
- };
- apivote
- .deleteVoteMessage(obj)
- .then((res) => {
- console.log("删除成功", res);
- message.success("删除成功");
- //重新获取列表
- getTask();
- })
- .catch((err) => {
- console.log("删除失败", err);
- });
- };
-
-
const showChangeModal = () => {
state.visiblene = true;
};
@@ -1678,14 +1509,19 @@ export default {
state.projectTaskId = eleId;
console.log("active=======",id);
};
- const showDrawerAddEval = () => {
+ const showDrawerAddEval = (id, eleId) => {
state.addevalvisible = true;
+ state.evaluationId = id;
+ state.projectTaskId = eleId;
};
- const showDrawerAddInvist = () => {
+ const showDrawerAddInvist = (id, eleId) => {
state.addinvistvisible = true;
+ state.projectTaskId = eleId;
};
- const showDrawerAddVote = () => {
+ const showDrawerAddVote = (id, eleId) => {
state.addvotevisible = true;
+ state.EditVoteId = id;
+ state.projectTaskId = eleId;
};
const showConfirm = () => {
state.confirmModal = true;
@@ -1840,14 +1676,6 @@ export default {
closeChangeModal,
changebgc,
getTask,
- deleteLiveBroadcast,
- deleteDiscuss,
-
- deleteEvalText,
- deleteExternalChain,
- deleteActivity,
- deleteVoteText,
- deleteInvistText,
getTableData,
deleteTask,
editStage,
@@ -1859,8 +1687,6 @@ export default {
getStageData,
moveTask,
deleteTaskAll,
- deleteTest,
- deleteWork,
decideType,
diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue
index f3538b06..223c22a9 100644
--- a/src/views/projectcenter/TaskPage.vue
+++ b/src/views/projectcenter/TaskPage.vue
@@ -446,7 +446,7 @@
-
+
+ 
+ 
diff --git a/vue.config.js b/vue.config.js
index 00b489e9..83ff56c7 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -2,6 +2,7 @@ const { defineConfig } = require("@vue/cli-service");
module.exports = defineConfig({
// transpileDependencies: true,
devServer: {
+ port:8080,
proxy: {
"/api": {
target: "http://111.231.196.214:30001/", //这里后台的地址模拟的;应该填写你们真实的后台接口