diff --git a/src/api/indexVote.js b/src/api/indexVote.js index fd1a7437..11b05e52 100644 --- a/src/api/indexVote.js +++ b/src/api/indexVote.js @@ -63,7 +63,9 @@ export const deleteVoteStemOption = (obj) => http.post('/vote/deleteVoteStemOpti export const editVote = (obj) => http.post('/vote/editVote', obj) //根据题干ID获取题干信息 -export const queryStemByStemId = (obj) => http.post('/vote/queryStemByStemId', { params: obj }) +export const queryStemByStemId = (obj) => http.post('/vote/queryStemByStemId', obj,{ + headers: {'Content-Type': 'application/x-www-form-urlencoded;charset=UTF-8'} +}) //修改题干信息接口 export const updateStemMessage = (obj) => http.post('/vote/updateStemMessage', obj); diff --git a/src/components/vote/AddVote.vue b/src/components/vote/AddVote.vue index ed6c398f..2b187118 100644 --- a/src/components/vote/AddVote.vue +++ b/src/components/vote/AddVote.vue @@ -56,6 +56,7 @@ > 创建投票 + 查看投票
+ + + + + +
{ @@ -366,6 +376,12 @@ export default { } } + const queryStem = () => { + state.addStemVisible = true; + }; + const closeStem = () => { + state.addStemVisible = false; + }; return { ...toRefs(state), showDrawerCreVote, @@ -376,7 +392,8 @@ export default { dleVoteStem, updateVoteInfo, delBox, - + queryStem, + closeStem, }; }, }; diff --git a/src/components/vote/queryStem.vue b/src/components/vote/queryStem.vue new file mode 100644 index 00000000..e3be6c23 --- /dev/null +++ b/src/components/vote/queryStem.vue @@ -0,0 +1,86 @@ + + + + + \ No newline at end of file diff --git a/src/views/learningpath/LevelAdd.vue b/src/views/learningpath/LevelAdd.vue index b363e8c2..83c1647d 100644 --- a/src/views/learningpath/LevelAdd.vue +++ b/src/views/learningpath/LevelAdd.vue @@ -98,10 +98,12 @@
快速创建项目详情
+
+
@@ -116,8 +118,9 @@
快速添加任务/关卡
+
@@ -129,7 +132,9 @@
-
+
添加学员
快速添加学员
@@ -155,7 +160,6 @@
-
关卡概览
@@ -215,16 +219,16 @@ stage2: item.stageId != choosedStageId, }" :key="item.stageId" - @click="choosedStageId = item.stageId" + @click="stageChange(item.name,item.stageId)" > - {{ item.stage }} + 关卡{{ item.stageId }}
关卡名称:
-
管理者进阶-腾飞班1第一关卡
+
{{stateName}}
@@ -578,8 +582,8 @@
@@ -588,12 +592,12 @@
已选择
- 3 + {{selectedRowKeys.length}}
列表选项总数: - 5 - + {{tableData.length}} +
@@ -1203,6 +1207,7 @@ export default { CheckStuvisible: false, //学员管理的查看抽屉 addLoading: false, // 加载动画 choosedStageId: 1, // 选择的阶段id + selectedRowKeys:[], twobtn: true, number: true, twobtnn: false, @@ -1214,6 +1219,20 @@ export default { styTitle: null, cretime: null, picUrl: null, + projectNameList:[ + { + value: '1', + label: '导出信息', + }, + { + value: '2', + label: '批量调整关卡', + }, + { + value: '3', + label: '批量删除', + } + ], // 共享文档列表 docList: [ { @@ -1262,7 +1281,7 @@ export default { pageSize: 10, visiblene: false, sh: false, - nodata: false, + nodata: true, closeDeleteAll: false, curLevel: "", taskSyllabusActive: 0, @@ -1279,6 +1298,7 @@ export default { visible: false, //时间管理 TMvisible: false, //考试管理 FaceVisivle: false, //面授管理 + stateName:null, // 关卡名称 //关卡的数据 level: [ // { @@ -1330,11 +1350,11 @@ export default { // 阶段列表 { stageId: 1, - stage: "关卡一", + name: "关卡一xx", }, { stageId: 2, - stage: "关卡二", + name: "关卡二xx", }, ], }); @@ -1542,7 +1562,10 @@ export default { const closehuodModal = () => { state.huodModal = false; }; - + const stageChange = (name,id) => { + state.choosedStageId = id; + state.stateName = name; + } const changeTabs = (e) => { console.log("切换tabs", e, state.routerId); if (e == 2) { @@ -1567,12 +1590,12 @@ export default { .then((res) => { console.log("获取学员列表", res); let data = res.data.data.rows || null; - state.tableData = []; + // state.tableData = []; if (data.length) { for (let i in data) { let _time = new Date(data[i].beginStudyTime * 1000); state.tableData.push({ - key: i + 1, + key: data[i].studentId, com: data[i].userInfoBo.deptName, name: data[i].userInfoBo.userName, gang: data[i].userInfoBo.jobName, @@ -1620,6 +1643,7 @@ export default { onMounted(() => { state.addLoading = true; getOverview(); + myGetRouterDetail(); reget(); }); const closePub = () => { @@ -1807,8 +1831,10 @@ export default { const myGetRouterDetail = () => { GetRouterDetail(state.routerId) .then((res) => { + if(res.data.data.routerInfo.status == 1) { + state.nodata = false; + } let data = res.data.data.chapterList; - state.taskSyllabus = data; // for(let i in data) { // state.taskSyllabus[i].name = data[i].name @@ -1819,8 +1845,13 @@ export default { // }) // } // } - - // } + levelList.stageList = []; + for(let i in data) { + if(i==0) {state.stateName = data[0].name} + levelList.stageList.push({ + stageId:Number(i)+1, + name:data[i].name + }) } }) .catch((err) => { console.log(err); @@ -1869,6 +1900,27 @@ export default { state.gatenamee = ''; getStudent(); }; + const handleStuChange = (value) => { + console.log(value); + if(value == 2) {state.visiblene = true} + if(value == 3 ) { deleteStu() } + }; + const deleteStu = () => { + if(state.selectedRowKeys.length == 0) { + message.warning("请选择成员"); + return } + let obj = { + routerId:100, + studentIds:state.selectedRowKeys, + } + api.delStudent(obj).then((res) => { + console.log(res); + message.success("批量删除成功") + }).catch(err => { + message.error("批量删除失败"+err); + console.log(err) + }) + }; return { ...toRefs(state), ...toRefs(levelList), @@ -1898,6 +1950,7 @@ export default { changeTabs, checkType, handleChange, + handleStuChange, delConfirm, searchLevel, resetLevel, @@ -1914,6 +1967,7 @@ export default { stopLearnPath, showStop, reget, + stageChange, }; }, }; diff --git a/src/views/projectcenter/LibraryAdd.vue b/src/views/projectcenter/LibraryAdd.vue index 87f27829..d2738cac 100644 --- a/src/views/projectcenter/LibraryAdd.vue +++ b/src/views/projectcenter/LibraryAdd.vue @@ -200,7 +200,7 @@ : 'none', }" > - 考勤 +
- 二维码 +
- 管理 +
@@ -388,7 +388,7 @@
基本信息 - 编辑 + 编辑

@@ -593,6 +593,7 @@ import { ref, reactive, defineComponent, toRefs, onMounted} from "vue"; import { message } from "ant-design-vue"; import * as api from "@/api/indexTemplate" +import { useRouter } from "vue-router"; export default defineComponent({ name: "LibraryAdd", setup() { @@ -790,6 +791,7 @@ export default defineComponent({ const value = ref(""); const value2 = ref(""); const textnum = "150"; + const routered = useRouter(); const changeopclo = () => { state.hideshow = !state.hideshow; }; @@ -907,7 +909,15 @@ export default defineComponent({ console.log(err) }) } - + const toEdit = () => { + routered.push({ + path: "/templateAdd", + query: { + projectId: state.projectId, + name: state.name, + }, + }); + } // 新建或编辑阶段 const stateEdit = () => { let obj={ @@ -959,6 +969,7 @@ export default defineComponent({ taskDel, stateEdit, taskEdit, + toEdit, }; }, computed: { diff --git a/src/views/projectcenter/templateAdd.vue b/src/views/projectcenter/templateAdd.vue new file mode 100644 index 00000000..a5cc20ae --- /dev/null +++ b/src/views/projectcenter/templateAdd.vue @@ -0,0 +1,1359 @@ + + + + + \ No newline at end of file