hz/fe-manage
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/fe-manage.git synced 2025-12-09 10:56:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix:关卡和阶段添加测评完善需要有效token，关卡添加关联项目完善，修改遍历方法

Browse Source
This commit is contained in:
Ggysh-7
2022-11-23 23:07:03 +08:00
parent 97b357066c
commit cff9a26071
9 changed files with 221 additions and 371 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/api/config.js
View File

@@ -32,7 +32,7 @@ http.interceptors.request.use(
// 此处测试默认配置token // 此处测试默认配置token
config.headers.token = "123456"; config.headers.token = "123456";
// config.headers.token = "eyJ0eXBlIjoidG9rZW4iLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC91LmJvZS5jb20iLCJpYXQiOjE2Njg4NjI2MTAsImV4cCI6MTY2ODg2OTgxMCwiR2l2ZW5OYW1lIjoiYm9ldSIsInVzZXJJZCI6IjZCMDQ5RkFGLUMzMTQtN0NDRi0wRDI4LTBEMjNGNEM0MjUzMSIsInVJZCI6Ijk2NTM0MjAyNzQ5NzYwNzE2OCIsInBlcm1pc3Npb24iOiIifQ==.defa91ecb2b61d9b20d858db0c2c8d7d80dea4613cb2559a22569b7df36b3f6b"; // config.headers.token = "eyJ0eXBlIjoidG9rZW4iLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC91LmJvZS5jb20iLCJpYXQiOjE2NjkyMTE4MzMsImV4cCI6MTY2OTIxOTAzMywiR2l2ZW5OYW1lIjoiYm9ldSIsInVzZXJJZCI6IjZCMDQ5RkFGLUMzMTQtN0NDRi0wRDI4LTBEMjNGNEM0MjUzMSIsInVJZCI6Ijk2NTM0MjAyNzQ5NzYwNzE2OCIsInBlcm1pc3Npb24iOiIifQ==.40067eca3be5d50857448005a673cbe1a48f560ff8e9c7aea4e7ff12f59c7962";
} }
return config; return config;
}, },

71
src/components/drawers/AddCase.vue
View File

@@ -49,7 +49,7 @@
:row-class-name=" :row-class-name="
(_record, index) => (index % 2 === 1 ? 'table-striped' : null) (_record, index) => (index % 2 === 1 ? 'table-striped' : null)
" "
:row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange,onSelect:onSelect }" :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
:columns="tableDataFunc()" :columns="tableDataFunc()"
:data-source="tableData" :data-source="tableData"
:loading="tableDataTotal === -1 ? true : false" :loading="tableDataTotal === -1 ? true : false"
@@ -189,11 +189,8 @@ export default {
} }
state.selectedRowKeys = selectedRowKeys; state.selectedRowKeys = selectedRowKeys;
state.apiTaskList = selectedRows; state.apiTaskList = selectedRows;
console.log('-------------%o-%o',state.apiTaskList, state.apiTaskList.length);
}; };
const onSelect = ( record ) => {
state.caseId = record.caseid;
state.caseName = record.title;
}
const handelChangePage = (page, pageSize) => { const handelChangePage = (page, pageSize) => {
state.currentPage = page; state.currentPage = page;
state.pageSize = pageSize; state.pageSize = pageSize;
@@ -215,6 +212,7 @@ export default {
array.push(obj); array.push(obj);
}); });
state.tableData = array; state.tableData = array;
console.log('get下来的数据',state.tableData);
}; };
//获取全部案例信息接口 //获取全部案例信息接口
const getAllCaseText = () => { const getAllCaseText = () => {
@@ -237,29 +235,32 @@ export default {
}; };
const updateTask = () => { const updateTask = () => {
if (props.isLevel == 1) { if (props.isLevel == 1) {
RouterEditTask({ for(let i = 0;i < state.apiTaskList.length;i++){
chapterId: props.isactive, RouterEditTask({
courseId: state.caseId, chapterId: props.isactive,
name: state.caseName, courseId: state.apiTaskList[i].caseid,
routerId: props.routerId, name: state.apiTaskList[i].caseName,
routerTaskId: props.routerTaskId || 0, routerId: props.routerId,
type: 3, routerTaskId: props.routerTaskId || 0,
}) type: 3,
.then(() => {
message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`);
ctx.emit("changeData", false);
closeDrawer();
state.addLoading = false;
}) })
.catch(() => { .then(() => {
message.error(`${props.edit ? "编辑" : "新增"}关卡任务失败`); message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`);
}); ctx.emit("changeData", false);
closeDrawer();
state.addLoading = false;
})
.catch(() => {
message.error(`${props.edit ? "编辑" : "新增"}关卡任务失败`);
});
}
} else if (props.isLevel == 2) { } else if (props.isLevel == 2) {
if(state.apiTaskList.length > 1){ console.log("state api task list: %o-length: %o", state.apiTaskList, state.apiTaskList.length )
for(let i = 0;i <= state.apiTaskList.length;i++){ for(let i = 0;i < state.apiTaskList.length;i++){
console.log(state.apiTaskList[i],'state.apiTaskList[i].caseIdstate.apiTaskList[i].caseId');
apiTask apiTask
.addTask({ .addTask({
"courseId": state.apiTaskList[i].caseId, "courseId": state.apiTaskList[i].caseid,
"duration": 0, "duration": 0,
"flag": true, "flag": true,
"name": state.apiTaskList[i].caseName, "name": state.apiTaskList[i].caseName,
@@ -279,27 +280,6 @@ export default {
message.error(`${props.edit ? "编辑" : "新增"}阶段任务失败`); message.error(`${props.edit ? "编辑" : "新增"}阶段任务失败`);
}); });
} }
} else {
apiTask
.addTask({
"courseId": state.caseId,
"duration": 0,
"flag": true,
"name": state.caseName,
"projectId": props.projectId,
"projectTaskId": props.projectTaskId,
"stageId": props.chooseStageId,
"type": 3,
})
.then(() => {
message.success(`${props.edit ? "编辑" : "新增"}阶段任务成功`);
ctx.emit("changeData", false);
closeDrawer();
})
.catch(() => {
message.error(`${props.edit ? "编辑" : "新增"}阶段任务失败`);
});
}
} else if (props.isLevel == 3) { } else if (props.isLevel == 3) {
console.log(""); console.log("");
} }
@@ -315,7 +295,6 @@ export default {
closeDrawer, closeDrawer,
tableDataFunc, tableDataFunc,
onSelectChange, onSelectChange,
onSelect,
handelChangePage, handelChangePage,
getTableDate, getTableDate,
updateTask, updateTask,

145
src/components/drawers/AddEval.vue
View File

@@ -51,6 +51,14 @@
<button class="checkEval" @click="showEvalDrawer"> <button class="checkEval" @click="showEvalDrawer">
选择测评 选择测评
</button> </button>
<span style="margin-left: 10px">
<a-tag
class="tag-style"
v-if="evaluationTypeName != ''"
:closable="true"
>{{ evaluationTypeName }}</a-tag
>
</span>
</div> </div>
</div> </div>
<div class="main_item"> <div class="main_item">
@@ -88,11 +96,8 @@
</div> </div>
<EvList <EvList
v-model:EvalListVisible="EvalListVisible" v-model:EvalListVisible="EvalListVisible"
@getEvLsitDate="checkFinish" @getEvListData="checkFinish"
/> />
<!-- v-model:evaluationTypeId="evaluationTypeId"
v-model:evaluationTypeName="evaluationTypeName" -->
<!-- <div class="aeLoading" :style="{display:addLoading?'flex':'none'}"> <!-- <div class="aeLoading" :style="{display:addLoading?'flex':'none'}">
<a-spin :spinning="addLoading" tip="添加中..." /> <a-spin :spinning="addLoading" tip="添加中..." />
</div> --> </div> -->
@@ -161,106 +166,105 @@ export default {
setup(props, ctx) { setup(props, ctx) {
const state = reactive({ const state = reactive({
inputV1: "", inputV1: "",
inputV2: "",
time: undefined, time: undefined,
EvalId: null, EvalId: null,
//子传回来的参数 //子传回来的参数
evaluationTypeId: null, evaluationTypeId: 0,
evaluationTypeName: "", evaluationTypeName: "",
description: "", description: "",
EvalListVisible: false, EvalListVisible: false,
// addLoading:false, // addLoading:false,
}); });
const checkFinish = (EvListDate)=> { const checkFinish = (value)=> {
state.evaluationTypeId = EvListDate.Id state.evaluationTypeId = value.quiz_kid
state.evaluationTypeName = EvListDate.Name state.evaluationTypeName = value.title
} }
const closeDrawer = () => { const closeDrawer = () => {
ctx.emit("update:addevalVisible", false); ctx.emit("update:addevalVisible", false);
ctx.emit("update:edit", false); ctx.emit("update:edit", false);
state.inputV1 = ""; state.inputV1 = "";
state.inputV2 = "";
localStorage.setItem("stageId", props.chooseStageId); localStorage.setItem("stageId", props.chooseStageId);
localStorage.setItem("chapterId", props.isactive); localStorage.setItem("chapterId", props.isactive);
}; };
const afterVisibleChange = (bool) => { const afterVisibleChange = (bool) => {
if (props.edit && bool) { if (props.edit && bool) {
queryEval(); queryInvistById()
} }
}; };
const showEvalDrawer = () => { const showEvalDrawer = () => {
state.EvalListVisible = true; state.EvalListVisible = true;
}; };
const queryEval = () => { const updateTask = (value) => {
api
.queryEvaluationDetailById({ evaluationId: props.evaluationId })
.then((res) => {
state.inputV1 = res.data.data.evaluationName;
state.time = [
dayjs(res.data.data.evaluationStartTime, "YYYY-MM-DD"),
dayjs(res.data.data.evaluationEndTime, "YYYY-MM-DD"),
];
state.evaluationTypeId = res.data.data.evaluationTypeId;
state.evaluationTypeName = res.data.data.evaluationTypeName;
})
.catch(() => {
});
};
const updateTask = (res) => {
if (props.isLevel == 1) { if (props.isLevel == 1) {
apitaskadd
.addTask({
courseId: res.data.data.evaluationId,
name: res.data.data.evaluationName,
projectId: props.projectId,
projectTaskId: props.projectTaskId || 0,
stageId: props.chooseStageId,
evaluationTypeId: state.evaluationTypeId,
evaluationTypeName: state.evaluationTypeName,
type: 10,
})
.then(( ) => {
message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`);
})
.catch(( ) => {
message.error(`${props.edit ? "编辑" : "新增"}关卡任务失败`);
});
} else if (props.isLevel == 2) {
RouterEditTask({ RouterEditTask({
chapterId: props.isactive, chapterId: props.isactive,
courseId: res.data.data.evaluationId, courseId: Number(value.evaluationId),
name: res.data.data.evaluationName, name: value.evaluationName,
routerId: props.routerId, routerId: props.routerId,
routerTaskId: props.routerTaskId || 0, routerTaskId: props.routerTaskId || 0,
evaluationTypeId: state.evaluationTypeId,
evaluationTypeName: state.evaluationTypeName,
type: 10, type: 10,
}) })
.then(( ) => { .then(( ) => {
message.success(`${props.EditTestId ? "编辑" : "新增"}阶段任务成功`); message.success(`${props.EditTestId ? "编辑" : "新增"}关卡任务成功`);
}) })
.catch(( ) => { .catch(( ) => {
message.error(`${props.EditTestId ? "编辑" : "新增"}阶段任务失败`); message.error(`${props.EditTestId ? "编辑" : "新增"}关卡任务失败`);
});
} else if (props.isLevel == 2) {
apitaskadd
.addTask({
duration: 0,
flag: true,
courseId: Number(value.evaluationId),
name: value.evaluationName,
projectId: props.projectId,
projectTaskId: props.projectTaskId || 0,
stageId: props.chooseStageId,
type: 10,
})
.then(( ) => {
message.success(`${props.edit ? "编辑" : "新增"}阶段任务成功`);
})
.catch(( ) => {
message.error(`${props.edit ? "编辑" : "新增"}阶段任务失败`);
}); });
} else if (props.isLevel == 3) { } else if (props.isLevel == 3) {
console.log(""); console.log("");
} }
}; };
//创建或编辑测评信息 //根据id获取测评信息
const queryInvistById = ()=> {
let objqi = {
evaluationId : props.EditEvalId
}
api
.queryEvaluationDetailById(objqi)
.then((res) => {
message.destroy()
message.success("获取测评信息成功");
state.inputV1 = res.data.data.evaluationName
state.evaluationTypeName = res.data.data.evaluationTypeName
state.evaluationTypeId = res.data.data.evaluationTypeId;
state.time = [
dayjs(res.data.data.evaluationStartTime, "YYYY-MM-DD"),
dayjs(res.data.data.evaluationEndTime, "YYYY-MM-DD"),
];
})
.catch(() => {
message.destroy()
message.error("获取测量平信息失败");
});
}
//创建测评信息
const createEvalText = () => { const createEvalText = () => {
if (!state.inputV1) { if (!state.inputV1) {
message.destroy(); message.destroy();
return message.info("请输入测评名称"); return message.info("请输入测评名称");
} }
if (!state.inputV2) { if (!state.evaluationTypeId) {
message.destroy(); message.destroy();
return message.info("请选择测评"); return message.info("请选择测评");
} }
if (!state.time) {
message.destroy();
return message.warning("请输入直播时间");
}
let obj = { let obj = {
evaluationName: state.inputV1, evaluationName: state.inputV1,
evaluationEndTime: dayjs(state.time[1]).format("YYYY-MM-DD"), evaluationEndTime: dayjs(state.time[1]).format("YYYY-MM-DD"),
@@ -268,12 +272,15 @@ export default {
evaluationStartTime: dayjs(state.time[0]).format("YYYY-MM-DD"), evaluationStartTime: dayjs(state.time[0]).format("YYYY-MM-DD"),
evaluationTypeId: state.evaluationTypeId, evaluationTypeId: state.evaluationTypeId,
evaluationTypeName: state.evaluationTypeName, evaluationTypeName: state.evaluationTypeName,
evaluationFlag: "",
evaluationPictureAddress: "",
evaluationTag: "",
updateTime: "",
}; };
if (props.edit !== true) {
api api
.createEvaluation(obj) .createEvaluation(obj)
.then((res) => { .then((res) => {
updateTask(res); updateTask(res.data.data);
message.success("创建成功"); message.success("创建成功");
closeDrawer(); closeDrawer();
ctx.emit("changeData", false); ctx.emit("changeData", false);
@@ -281,19 +288,6 @@ export default {
.catch(() => { .catch(() => {
message.error("创建失败"); message.error("创建失败");
}); });
} else {
api
.updateEvaluation(obj)
.then((res) => {
updateTask(res);
message.success("编辑成功");
closeDrawer();
ctx.emit("changeData", false);
})
.catch(( ) => {
message.error("编辑失败");
});
}
}; };
return { return {
@@ -303,6 +297,7 @@ export default {
closeDrawer, closeDrawer,
//增改 //增改
createEvalText, createEvalText,
queryInvistById,
showEvalDrawer, showEvalDrawer,
updateTask, updateTask,
}; };
@@ -366,6 +361,10 @@ export default {
margin-left: 15px; margin-left: 15px;
color: #fff; color: #fff;
} }
.tag-style {
color: rgb(113, 113, 237);
background-color: #d7d1f7;
}
} }
} }
.main_item2 { .main_item2 {

2
src/components/drawers/AddTest.vue
View File

@@ -759,7 +759,7 @@ export default {
}; };
const getData = (value)=> { const getData = (value)=> {
state.paperId = value.paperId; state.paperId = value.paperId;
state.paperName = value.paperName; state.paperName = value.testName;
} }
return { return {
formState, formState,

19
src/components/drawers/EvList.vue
View File

@@ -77,7 +77,7 @@
<script> <script>
import { reactive, toRefs } from "vue"; import { reactive, toRefs } from "vue";
import * as api from "../../api/indexEval"; import * as api from "../../api/indexEval";
export default { export default {
name: "EvList", name: "EvList",
props: { props: {
EvalListVisible: { EvalListVisible: {
@@ -103,6 +103,7 @@
evaluationTypeName:"", evaluationTypeName:"",
tableData: [], tableData: [],
selectedRowKeys:[], selectedRowKeys:[],
evListData:{},
columns:[ columns:[
{ {
title: "课程编号", title: "课程编号",
@@ -148,17 +149,12 @@
}, },
] ]
}); });
// const onSelect = (record)=> {
// state.evaluationTypeName = record.title
// state.evaluationTypeId = record.quiz_code
// };
const onSelectChange = (selectedRowKeys,selectedRows)=> { const onSelectChange = (selectedRowKeys,selectedRows)=> {
if(state.selectedRowKeys.length>1){ if(selectedRowKeys.length>1){
return return
} }
state.selectedRowKeys = selectedRowKeys state.selectedRowKeys = selectedRowKeys
state.evaluationTypeName = selectedRows[0].record.title state.evListData = selectedRows[0] ? selectedRows[0] : []
state.evaluationTypeId = selectedRows[0].quiz_code
} }
const closeDrawer = () => { const closeDrawer = () => {
ctx.emit("update:EvalListVisible", false); ctx.emit("update:EvalListVisible", false);
@@ -169,11 +165,7 @@
} }
}; };
const checkFinish =() =>{ const checkFinish =() =>{
let EvListDate = { ctx.emit("getEvListData", state.evListData);
Id : state.evaluationTypeId,
Name : state.evaluationTypeName,
}
ctx.emit("getEvListDate", EvListDate);
closeDrawer(); closeDrawer();
} }
const changePagination = (page) => { const changePagination = (page) => {
@@ -187,6 +179,7 @@
let obj = { let obj = {
status:value.status, status:value.status,
quiz_code:value.quiz_code, quiz_code:value.quiz_code,
quiz_kid:value.quiz_kid,
title:value.title, title:value.title,
theme_desc:value.theme_desc, theme_desc:value.theme_desc,
quiz_price:value.quiz_price, quiz_price:value.quiz_price,

26
src/components/drawers/SelectTest.vue
View File

@@ -61,7 +61,7 @@
:columns="tableDataFunc()" :columns="tableDataFunc()"
:data-source="tableData" :data-source="tableData"
:loading="tableDataTotal === -1 ? true : false" :loading="tableDataTotal === -1 ? true : false"
:row-selection="{selectedRowKeys:selectedRowKeys,onSelect:onSelect,onChange:onSelectChange}" :row-selection="{selectedRowKeys:selectedRowKeys, onChange:onSelectChange, hideSelectAll:true}"
:scroll="{ x: 900 }" :scroll="{ x: 900 }"
:pagination="false" :pagination="false"
/> />
@@ -119,7 +119,7 @@
}); });
//点击确认后执行此方法将参数传给父亲 //点击确认后执行此方法将参数传给父亲
const CreatSTText = ()=> { const CreatSTText = ()=> {
ctx.emit('getSTData',state.SelectTestData) ctx.emit('getSTData',state.SelectTestData)
closeDrawer() closeDrawer()
} }
const closeDrawer = () => { const closeDrawer = () => {
@@ -184,14 +184,13 @@
console.log("Page: ", pageNumber); console.log("Page: ", pageNumber);
}; };
const onSelect = (record) => { const onSelectChange = (selectedRowKeys,selectedRows) => {
state.SelectTestData = record
};
const onSelectChange = (selectedRowKeys) => {
if(selectedRowKeys.length>1){ if(selectedRowKeys.length>1){
return return
} }
state.selectedRowKeys = selectedRowKeys; state.selectedRowKeys = selectedRowKeys;
state.SelectTestData = selectedRows[0];
console.log('state.SelectTestData---------------',state.SelectTestData);
} }
const newTest = ()=> { const newTest = ()=> {
@@ -282,7 +281,6 @@
closeDrawer, closeDrawer,
afterVisibleChange, afterVisibleChange,
getTableDate, getTableDate,
onSelect,
onSelectChange, onSelectChange,
CreatSTText, CreatSTText,
newTest, newTest,
@@ -298,7 +296,6 @@
<style lang="scss"> <style lang="scss">
.TimeManage { .TimeManage {
// overflow-x: auto;
.drawerMain { .drawerMain {
min-width: 550px; min-width: 550px;
margin: 0px 32px 0px 32px; margin: 0px 32px 0px 32px;
@@ -406,13 +403,7 @@
} }
} }
.tab { .tab {
th,th.h {
.ant-table-selection-column {
.ant-table-selection{
display: none;
}
}
th.h {
background-color: #eff4fc !important; background-color: #eff4fc !important;
} }
@@ -423,15 +414,10 @@
} }
.tableBox { .tableBox {
.pa { .pa {
// left: 0;
margin-top: 15px; margin-top: 15px;
width: 100%; width: 100%;
// height: 20px;
// background-color: red;
display: flex; display: flex;
justify-content: center; justify-content: center;
// position: absolute;
// bottom: 20px;
.ant-pagination-prev, .ant-pagination-prev,
.ant-pagination-next, .ant-pagination-next,
.ant-pagination-item, .ant-pagination-item,

2
src/components/drawers/TestManage.vue
View File

@@ -669,7 +669,7 @@ export default {
background-color: #eff4fc !important; background-color: #eff4fc !important;
} }
th.h { th,th.h {
background-color: #eff4fc !important; background-color: #eff4fc !important;
} }

322
src/views/learningpath/LevelAddDetail.vue
View File

@@ -470,7 +470,6 @@
<div class="img"> <div class="img">
<img <img
src="../../assets/images/leveladd/xiang.png" src="../../assets/images/leveladd/xiang.png"
@click="showDrawer"
/> />
</div> </div>
<div class="text">项目</div> <div class="text">项目</div>
@@ -718,6 +717,7 @@
<a-table <a-table
:columns="drawertableColumns()" :columns="drawertableColumns()"
:data-source="drawertableData" :data-source="drawertableData"
:row-selection="{selectedRowKeys:selectedProjRowKeys,onChange:onProjSelectChange}"
:loading="tableDataTotal === -1 ? true : false" :loading="tableDataTotal === -1 ? true : false"
:scroll="{ x: 700 }" :scroll="{ x: 700 }"
@expand="expandTable" @expand="expandTable"
@@ -1051,7 +1051,7 @@ import draggable from "vuedraggable";
import { editTask } from "../../api/indexTaskadd"; import { editTask } from "../../api/indexTaskadd";
import * as apiProj from "../../api/index.js"; import * as apiProj from "../../api/index.js";
import { RouterEditTask } from "@/api/indexTask"; import { RouterEditTask } from "@/api/indexTask";
// import dayjs from "dayjs"; import dayjs from "dayjs";
import { toDate } from "../../api/method"; import { toDate } from "../../api/method";
import UnlockMode from "../../components/drawers/UnlockMode.vue"; import UnlockMode from "../../components/drawers/UnlockMode.vue";
export default { export default {
@@ -1173,101 +1173,58 @@ export default {
time: "2022-07-15 14:00", time: "2022-07-15 14:00",
}, },
], ],
// drawertableData: [ //项目抽屉、列表参数
// { drawertableData: [
// key: 1, {
// projectName: "管理者进阶", key: 1,
// manager: "黄华 刘俊", parentId:1,
// creater: "毛继禹", name: '123',
// time: "2022-07-20 14:00:03", manager:'afssfa',
// children: [ children:[
// { {
// key: "1-1", key: 5,
// projectName: "管理者进阶-腾飞班", parentId:1,
// manager: "黄华 刘俊", name: '123',
// creater: "毛继禹", manager:'afssfa',
// time: "2022-07-20 14:00:03", },
// children: [ ]
// { },
// key: "1-1-1", {
// projectName: "管理者进阶-腾飞班K1", key: 2,
// manager: "黄华 刘俊", parentId:2,
// creater: "毛继禹", name: '123',
// time: "2022-07-20 14:00:03", manager:'afssfa',
// }, children:[
// ], {
// }, key: 7,
// ], parentId:1,
// }, name: '123',
// { manager:'afssfa',
// key: 2, children:[
// projectName: "管理者进阶", {
// manager: "黄华 刘俊", key: 9,
// creater: "毛继禹", parentId:1,
// time: "2022-07-20 14:00:03", name: '123',
// children: [ manager:'afssfa',
// { },
// key: "2-1", ]
// projectName: "管理者进阶-腾飞班", },
// manager: "黄华 刘俊", ]
// creater: "毛继禹", },
// time: "2022-07-20 14:00:03", {
// children: [ key: 3,
// { parentId:3,
// key: "2-1-1", name: '123',
// projectName: "管理者进阶-腾飞班K1", manager:'afssfa',
// manager: "黄华 刘俊", },
// creater: "毛继禹", ],
// time: "2022-07-20 14:00:03", selectedProjRowKeys:[],
// }, editproj: false,
// ], addprojvisible: false,
// },
// ],
// },
// {
// key: 3,
// projectName: "管理者进阶-腾飞班K1",
// manager: "黄华 刘俊",
// creater: "毛继禹",
// time: "2022-07-20 14:00:03",
// },
// {
// key: 4,
// projectName: "管理者进阶-腾飞班K1",
// manager: "黄华 刘俊",
// creater: "毛继禹",
// time: "2022-07-20 14:00:03",
// },
// {
// key: 5,
// projectName: "管理者进阶-腾飞班K1",
// manager: "黄华 刘俊",
// creater: "毛继禹",
// time: "2022-07-20 14:00:03",
// },
// {
// key: 6,
// projectName: "管理者进阶-腾飞班K1",
// manager: "黄华 刘俊",
// creater: "毛继禹",
// time: "2022-07-20 14:00:03",
// },
// {
// key: 7,
// projectName: "管理者进阶-腾飞班K1",
// manager: "黄华 刘俊",
// creater: "毛继禹",
// time: "2022-07-20 14:00:03",
// },
// ],
drawertableData: [],
currentPage: 1, currentPage: 1,
tableDataTotal: 0, tableDataTotal: 0,
pageSize: 10, pageSize: 10,
visible: false,
//项目
editproj: false,
addprojvisible: false,
AddSvisible: false, //添加学员抽屉 AddSvisible: false, //添加学员抽屉
AddImpStuvisible: false, //导入学员抽屉 AddImpStuvisible: false, //导入学员抽屉
addlivevisible: false, //添加直播抽屉 addlivevisible: false, //添加直播抽屉
@@ -1304,7 +1261,6 @@ export default {
isLevel: 1, //学习路径1项目2模板库3 isLevel: 1, //学习路径1项目2模板库3
gqxy_hs: true, gqxy_hs: true,
isactive: 0, isactive: 0,
projectChecked: null, //项目单选框
adddiscussvisible: false, //讨论抽屉 adddiscussvisible: false, //讨论抽屉
isStudiscuss: false, isStudiscuss: false,
addactivevisible: false, //活动抽屉 addactivevisible: false, //活动抽屉
@@ -1434,14 +1390,6 @@ export default {
console.log("删除关卡失败", err); console.log("删除关卡失败", err);
}); });
}; };
const showDrawer = () => {
state.visible = true;
};
//关闭项目抽屉
const leaveProjDrawer = () => {
state.addprojvisible = false;
};
//在线抽屉 //在线抽屉
const showDrawerAddOnline = (id, eleId) => { const showDrawerAddOnline = (id, eleId) => {
state.addonlinevisible = true; state.addonlinevisible = true;
@@ -1469,14 +1417,12 @@ export default {
}; };
//测试抽屉 //测试抽屉
const showDrawerAddEval = (id, eleId) => { const showDrawerAddEval = (id, eleId) => {
// state.addevalVisible = true;
state.addevalvisible = true; state.addevalvisible = true;
state.EditEvalId = id; state.EditEvalId = id;
state.routerTaskId = eleId; state.routerTaskId = eleId;
}; };
//评估抽屉 //评估抽屉
const showDrawerAddInvist = (id, eleId) => { const showDrawerAddInvist = (id, eleId) => {
// state.addinvistVisible = true;
state.addinvistvisible = true; state.addinvistvisible = true;
state.routerTaskId = eleId; state.routerTaskId = eleId;
state.EditInvistId = id; state.EditInvistId = id;
@@ -1518,6 +1464,10 @@ export default {
state.EditActiveId = id; state.EditActiveId = id;
state.routerTaskId = eleId; state.routerTaskId = eleId;
}; };
//关闭项目抽屉
const leaveProjDrawer = () => {
state.addprojvisible = false;
};
//tableData数据赋值方法 //tableData数据赋值方法
const dataAssignment = (id) => { const dataAssignment = (id) => {
console.log(state.level); console.log(state.level);
@@ -1583,9 +1533,6 @@ export default {
message.error(err); message.error(err);
}); });
}; };
const closeDrawer = () => {
state.visible = false;
};
const afterProjVisibleChange = (bol) => { const afterProjVisibleChange = (bol) => {
if(bol == true){ if(bol == true){
getAllProjText() getAllProjText()
@@ -1747,7 +1694,6 @@ export default {
"rgb(245, 247, 250,1)"; "rgb(245, 247, 250,1)";
document.getElementsByTagName("main")[0].style.boxShadow = "none"; document.getElementsByTagName("main")[0].style.boxShadow = "none";
getDetail(); getDetail();
getAllProjText();
}); });
onUnmounted(() => { onUnmounted(() => {
document.getElementsByTagName("main")[0].style.background = "#ffffff"; document.getElementsByTagName("main")[0].style.background = "#ffffff";
@@ -1921,9 +1867,9 @@ export default {
} else if (type == "活动") { } else if (type == "活动") {
showDrawerAddActive(id, eleId); showDrawerAddActive(id, eleId);
} else if (type == "测评") { } else if (type == "测评") {
showDrawerAddInvist(id, eleId);
} else if (type == "评估") {
showDrawerAddEval(id, eleId); showDrawerAddEval(id, eleId);
} else if (type == "评估") {
showDrawerAddInvist(id, eleId);
} else if (type == "投票") { } else if (type == "投票") {
showDrawerAddVote(id, eleId); showDrawerAddVote(id, eleId);
} else if (type == "项目") { } else if (type == "项目") {
@@ -1976,91 +1922,43 @@ export default {
state.removeStageId = option.chapterId; state.removeStageId = option.chapterId;
}; };
//项目抽屉用的 //项目抽屉用的
const rowSelection = { const onProjSelectChange = (selectedRowKeys,selectedRows) => {
onSelect: (selectedRows, selected, selectedRowKeys) => { state.selectedProjRowKeys = selectedRowKeys
console.log( // if(selectedRowKeys.length>1){
"selectedRowKeys", // return
selectedRowKeys, // }
"selectedRows", state.projId = selectedRows[0].projectId
selectedRows, state.projName = selectedRows[0].name
"selected", console.log(state.projId,'------------------');
selected // console.log(selectedRowKeys,selectedRows);
); }
state.projId = selectedRows.parentId; const getTableDate = (data) => {
state.projName = selectedRows.name;
},
};
const getTableDate = (drawertableData) => {
console.log(drawertableData,'drawertableDatadrawertableDatadrawertableDatadrawertableData')
let data = drawertableData
let array = [] let array = []
data.map((value)=>{ data.map((value)=>{
if(value.type ==3){ if(value.type == 3){
let obj = {
key: value.projectId,
parentId:value.parentId,
name: value.name,
manager:value.manager,
creator: value.createName,
// time: dayjs(value.createTime).format("YYYY-MM-DD"),
};
array.push(obj);
}
else if(value.type == 2){
value.subList.map((item)=>{
let obj = { let obj = {
key: value.projectId, key: value.projectId,
parentId:value.parentId, parentId:value.parentId,
name: value.name, projectId:value.projectId,
manager:value.manager, name: value.name,
creator: value.createName, manager:value.manager,
// time: dayjs(value.createTime).format("YYYY-MM-DD"), time: dayjs(value.createTime).format("YYYY-MM-DD"),
children:[{
key: item.projectId,
parentId:item.parentId,
name: item.name,
manager:item.manager,
creator: item.createName,
// time: dayjs(value.createTime).format("YYYY-MM-DD"),
}]
} }
array.push(obj); array.push(obj)
}) }
} else {
else{ let obj = {
value.subList.map((item)=>{ key: value.projectId,
item.subList.map((items)=>{ parentId:value.parentId,
let obj = { name: value.name,
key: value.projectId, manager:value.manager,
parentId:value.parentId, time: dayjs(value.createTime).format("YYYY-MM-DD"),
name: value.name, children: value.subList ? getTableDate(value.subList) : [] ,
manager:value.manager, }
creator: value.createName, array.push(obj)
// time: dayjs(value.createTime).format("YYYY-MM-DD"), }
children:[{ })
key: item.projectId, return array
parentId:item.parentId,
name: item.name,
manager:item.manager,
creator: item.createName,
children:[{
key: items.projectId,
parentId:items.parentId,
name: items.name,
manager:items.manager,
creator: items.createName,
}]
// time: dayjs(value.createTime).format("YYYY-MM-DD"),
}]
}
array.push(obj);
})
})
}
})
state.drawertableData = array;
console.log(state.drawertableData,"------------state.drawertableData---------------");
}; };
//获取全部项目信息接口 //获取全部项目信息接口
const getAllProjText = () => { const getAllProjText = () => {
@@ -2078,35 +1976,35 @@ export default {
.then((res) => { .then((res) => {
let arr = res.data.data.rows; let arr = res.data.data.rows;
if (res.status === 200) { if (res.status === 200) {
getTableDate(arr); state.drawertableData = getTableDate(arr);
console.log("---------------项目信息---------------------------",res.data.data);
} }
}) })
.catch((err) => { .catch(() => {
console.log("获取全部项目信息接口失败", err); message.destroy()
console.log("+++++++++++++++++++++++++++++++++++++++++++++++"); message.error("获取全部项目信息接口失败")
// state.createLoading = false;
}); });
}; };
//不需要下面这个添加应该 没选数据 //添加关卡项目
const updateTask = () => { const updateTask = () => {
RouterEditTask({ RouterEditTask({
duration: 0,
flag: true,
chapterId: state.isactive, chapterId: state.isactive,
courseId: state.assessmentId, courseId: Number(state.projId),
name: state.assessmentName, name: state.projName,
routerId: state.routerId, routerId: state.routerId,
routerTaskId: state.routerTaskId || 0, routerTaskId: state.routerTaskId,
type: 13, type: 13,
}) })
.then((res) => { .then(( ) => {
console.log(res, 11111);
message.success(`${state.editproj ? "编辑" : "新增"}关卡任务成功`); message.success(`${state.editproj ? "编辑" : "新增"}关卡任务成功`);
// ctx.emit("changeData", false); // ctx.emit("changeData", false);
closeDrawer(); leaveProjDrawer()
state.addLoading = false; state.addLoading = false;
}) })
.catch((err) => { .catch(() => {
console.log(err, 1111); message.destroy()
message.error("添加关卡任务失败")
}); });
}; };
@@ -2114,16 +2012,10 @@ export default {
const showModeVisible = () => { const showModeVisible = () => {
state.unlockModeVisible = true; state.unlockModeVisible = true;
}; };
onMounted(() => {
// createCase();
getAllProjText();
});
return { return {
...toRefs(state), ...toRefs(state),
// tableDataFunc, // tableDataFunc,
tableDataFunc2, tableDataFunc2,
showDrawer,
closeDrawer,
showModal, showModal,
closeModal, closeModal,
afterProjVisibleChange, afterProjVisibleChange,
@@ -2166,7 +2058,7 @@ export default {
showChangeModal, showChangeModal,
closeChangeModal, closeChangeModal,
handleChangeStage, handleChangeStage,
rowSelection, onProjSelectChange,
getTableDate, getTableDate,
getAllProjText, getAllProjText,
updateTask, updateTask,

1
vue.config.js
View File

@@ -14,6 +14,7 @@ module.exports = defineConfig({
port: 8080, port: 8080,
proxy: { proxy: {
"/manageApi": { "/manageApi": {
// target:"http://192.168.19.246:30001",
// target:"http://192.168.100.208:30001", // target:"http://192.168.100.208:30001",
target: "http://111.231.196.214:30001/", //这里后台的地址模拟的;应该填写你们真实的后台接口 target: "http://111.231.196.214:30001/", //这里后台的地址模拟的;应该填写你们真实的后台接口
changeOrigin: true, //表示是否改变原域名 changeOrigin: true, //表示是否改变原域名