mirror of
https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/fe-manage.git
synced 2025-12-13 04:46:46 +08:00
Merge branch 'master' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage
This commit is contained in:
@@ -32,7 +32,7 @@ http.interceptors.request.use(
|
||||
|
||||
// 此处测试默认配置token
|
||||
config.headers.token = "123456";
|
||||
// config.headers.token = "eyJ0eXBlIjoidG9rZW4iLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC91LmJvZS5jb20iLCJpYXQiOjE2NjkyMTE4MzMsImV4cCI6MTY2OTIxOTAzMywiR2l2ZW5OYW1lIjoiYm9ldSIsInVzZXJJZCI6IjZCMDQ5RkFGLUMzMTQtN0NDRi0wRDI4LTBEMjNGNEM0MjUzMSIsInVJZCI6Ijk2NTM0MjAyNzQ5NzYwNzE2OCIsInBlcm1pc3Npb24iOiIifQ==.40067eca3be5d50857448005a673cbe1a48f560ff8e9c7aea4e7ff12f59c7962";
|
||||
// config.headers.token = "eyJ0eXBlIjoidG9rZW4iLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC91LmJvZS5jb20iLCJpYXQiOjE2NjkyODg3MzIsImV4cCI6MTY2OTI5NTkzMiwiR2l2ZW5OYW1lIjoiYm9ldSIsInVzZXJJZCI6IjZCMDQ5RkFGLUMzMTQtN0NDRi0wRDI4LTBEMjNGNEM0MjUzMSIsInVJZCI6Ijk2NTM0MjAyNzQ5NzYwNzE2OCIsInBlcm1pc3Npb24iOiIifQ==.af724ca2f4c530868cf923daa2e1a4a3733ee97430b830039ace513d628dfb42";
|
||||
}
|
||||
return config;
|
||||
},
|
||||
|
||||
@@ -199,6 +199,7 @@ export default {
|
||||
const getTableDate = (tableData) => {
|
||||
let data = tableData;
|
||||
let array = [];
|
||||
if(state.inputV1 == ""){
|
||||
data.map((value, index) => {
|
||||
let obj = {
|
||||
key: index,
|
||||
@@ -206,13 +207,31 @@ export default {
|
||||
authorName:value.authorName,
|
||||
companyId:value.companyId,
|
||||
coverUrl:value.coverUrl,
|
||||
caseid:value.id,
|
||||
id:value.id,
|
||||
title:value.title,
|
||||
};
|
||||
array.push(obj);
|
||||
});
|
||||
state.tableData = array;
|
||||
console.log('get下来的数据',state.tableData);
|
||||
console.log('get下来获取全部的的数据',state.tableData);
|
||||
} else {
|
||||
data.map((value, index) => {
|
||||
let obj = {
|
||||
key: index,
|
||||
authorId:value.authorId,
|
||||
authorName:value.authorName,
|
||||
companyId:value.companyId,
|
||||
coverUrl:value.coverUrl,
|
||||
id:value.id,
|
||||
title:value.title,
|
||||
};
|
||||
if(obj.title == state.inputV1){
|
||||
array.push(obj);
|
||||
}
|
||||
});
|
||||
state.tableData = array;
|
||||
console.log('get下来搜索的的数据',state.tableData);
|
||||
}
|
||||
};
|
||||
//获取全部案例信息接口
|
||||
const getAllCaseText = () => {
|
||||
@@ -238,7 +257,7 @@ export default {
|
||||
for(let i = 0;i < state.apiTaskList.length;i++){
|
||||
RouterEditTask({
|
||||
chapterId: props.isactive,
|
||||
courseId: state.apiTaskList[i].caseid,
|
||||
courseId: state.apiTaskList[i].id,
|
||||
name: state.apiTaskList[i].caseName,
|
||||
routerId: props.routerId,
|
||||
routerTaskId: props.routerTaskId || 0,
|
||||
|
||||
@@ -91,7 +91,7 @@
|
||||
</div>
|
||||
<div class="main_btns">
|
||||
<button class="btn1" @click="closeDrawer">取消</button>
|
||||
<button class="btn2" @click="createEvalText">确定</button>
|
||||
<button class="btn2" @click="creoredit">确定</button>
|
||||
</div>
|
||||
</div>
|
||||
<EvList
|
||||
@@ -183,6 +183,10 @@ export default {
|
||||
ctx.emit("update:addevalVisible", false);
|
||||
ctx.emit("update:edit", false);
|
||||
state.inputV1 = "";
|
||||
state.time= undefined;
|
||||
state.description="";
|
||||
state.evaluationTypeId= 0,
|
||||
state.evaluationTypeName= "",
|
||||
localStorage.setItem("stageId", props.chooseStageId);
|
||||
localStorage.setItem("chapterId", props.isactive);
|
||||
};
|
||||
@@ -194,6 +198,7 @@ export default {
|
||||
const showEvalDrawer = () => {
|
||||
state.EvalListVisible = true;
|
||||
};
|
||||
//向关卡或阶段渲染
|
||||
const updateTask = (value) => {
|
||||
if (props.isLevel == 1) {
|
||||
RouterEditTask({
|
||||
@@ -223,9 +228,11 @@ export default {
|
||||
type: 10,
|
||||
})
|
||||
.then(( ) => {
|
||||
message.destroy()
|
||||
message.success(`${props.edit ? "编辑" : "新增"}阶段任务成功`);
|
||||
})
|
||||
.catch(( ) => {
|
||||
message.destroy()
|
||||
message.error(`${props.edit ? "编辑" : "新增"}阶段任务失败`);
|
||||
});
|
||||
} else if (props.isLevel == 3) {
|
||||
@@ -271,6 +278,60 @@ export default {
|
||||
message.error("获取测量平信息失败");
|
||||
});
|
||||
}
|
||||
const creoredit = ()=> {
|
||||
if(props.edit){
|
||||
editInvistText
|
||||
}else{
|
||||
createEvalText
|
||||
}
|
||||
}
|
||||
const editInvistText = ()=> {
|
||||
if (!state.inputV1) {
|
||||
message.destroy();
|
||||
return message.info("请输入测评名称");
|
||||
}
|
||||
if (!state.evaluationTypeId) {
|
||||
message.destroy();
|
||||
return message.info("请选择测评");
|
||||
}
|
||||
let objei = {
|
||||
// "createTime": "",
|
||||
// "createUser": 0,
|
||||
// "evaluationEndTime": "",
|
||||
// "evaluationFlag": "",
|
||||
// "evaluationId": "",
|
||||
// "evaluationName": "",
|
||||
// "evaluationPictureAddress": "",
|
||||
// "evaluationStartTime": "",
|
||||
// "evaluationTag": "",
|
||||
// "evaluationTypeId": 0,
|
||||
// "evaluationTypeName": "",
|
||||
// "updateTime": "",
|
||||
// "updateUser": 0
|
||||
evaluationName: state.inputV1,
|
||||
evaluationEndTime: dayjs(state.time[1]).format("YYYY-MM-DD"),
|
||||
evaluationId: props.edit ? props.evaluationId : 0,
|
||||
evaluationStartTime: dayjs(state.time[0]).format("YYYY-MM-DD"),
|
||||
evaluationTypeId: state.evaluationTypeId,
|
||||
evaluationTypeName: state.evaluationTypeName,
|
||||
evaluationFlag: "",
|
||||
evaluationPictureAddress: "",
|
||||
evaluationTag: "",
|
||||
updateTime: "",
|
||||
}
|
||||
api
|
||||
.updateEvaluation(objei)
|
||||
.then((res) => {
|
||||
updateTask(res.data.data);
|
||||
console.log('编辑后的测评信息 编辑后的测评id还和之前一样么?',res.data.data);
|
||||
message.success("编辑测评信息成功");
|
||||
closeDrawer();
|
||||
ctx.emit("changeData", false);
|
||||
})
|
||||
.catch(() => {
|
||||
message.error("编辑测评信息创建失败");
|
||||
});
|
||||
}
|
||||
//创建测评信息
|
||||
const createEvalText = () => {
|
||||
if (!state.inputV1) {
|
||||
@@ -312,8 +373,10 @@ export default {
|
||||
checkFinish,
|
||||
closeDrawer,
|
||||
//增改
|
||||
creoredit,
|
||||
createEvalText,
|
||||
queryInvistById,
|
||||
editInvistText,
|
||||
showEvalDrawer,
|
||||
updateTask,
|
||||
};
|
||||
|
||||
@@ -29,7 +29,6 @@
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
<div class="mi_btns">
|
||||
<div class="btn btn1">
|
||||
@@ -42,7 +41,6 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="main_table">
|
||||
<a-table
|
||||
style="border: 1px solid #f2f6fe"
|
||||
|
||||
@@ -399,16 +399,17 @@ export default {
|
||||
array.push(obj)
|
||||
})
|
||||
state.tabledata = array
|
||||
ListOpera();
|
||||
}
|
||||
//获取任务管理列表
|
||||
const getManageList = () => {
|
||||
let obj = {
|
||||
name: "",
|
||||
// name: "",
|
||||
pageNo: state.pageNo,
|
||||
pageSize: state.pageSize,
|
||||
projectId: 27,
|
||||
// projectId: 27,
|
||||
projectTaskId: props.projectTaskId,
|
||||
status: -1,
|
||||
status: 0,
|
||||
};
|
||||
api
|
||||
.taskStudentList(obj)
|
||||
@@ -425,12 +426,12 @@ export default {
|
||||
//搜索任务列表
|
||||
const searchTaskList = () => {
|
||||
let objser = {
|
||||
name: "",
|
||||
// name: "",
|
||||
pageNo: state.pageNo,
|
||||
pageSize: state.pageSize,
|
||||
projectId: 27,
|
||||
// projectId: 27,
|
||||
projectTaskId: props.projectTaskId,
|
||||
status: -1,
|
||||
status: 0,
|
||||
};
|
||||
if (state.name !== "" || state.projectName !== "") {
|
||||
api
|
||||
|
||||
@@ -126,6 +126,8 @@
|
||||
<button class="btn2">确定</button>
|
||||
</div>
|
||||
</div>
|
||||
<!-- 查看答卷抽屉 -->
|
||||
<CQue v-model:CQvisible="CQvisible"/>
|
||||
</a-drawer>
|
||||
</template>
|
||||
|
||||
@@ -133,8 +135,12 @@
|
||||
import { toRefs, reactive } from "vue";
|
||||
import { message } from 'ant-design-vue';
|
||||
import * as api from "../../api/index";
|
||||
import CQue from './CheckQue.vue'
|
||||
export default {
|
||||
name: "TestManage",
|
||||
components: {
|
||||
CQue,
|
||||
},
|
||||
props: {
|
||||
TMvisible: {
|
||||
type: Boolean,
|
||||
@@ -158,6 +164,7 @@ export default {
|
||||
const state = reactive({
|
||||
name: null,
|
||||
open: false,
|
||||
CQvisible:false, //查看答卷抽屉
|
||||
pageNo: 1,
|
||||
pageSize: 10,
|
||||
currentPage: 1,
|
||||
@@ -180,18 +187,7 @@ export default {
|
||||
label: "已完成",
|
||||
},
|
||||
],
|
||||
tabledata: [
|
||||
{
|
||||
workNum:1,
|
||||
status:"已完成",
|
||||
operation:"",
|
||||
},
|
||||
{
|
||||
workNum:1,
|
||||
status:"未完成",
|
||||
operation:"",
|
||||
}
|
||||
],
|
||||
tabledata: [],
|
||||
selectedRowKeys:[],
|
||||
});
|
||||
const tableDataFunc = () => {
|
||||
@@ -325,15 +321,12 @@ export default {
|
||||
title: "操作",
|
||||
dataIndex: "operation",
|
||||
key: "operation",
|
||||
width: 60,
|
||||
width: 90,
|
||||
align: "center",
|
||||
className: "h",
|
||||
},
|
||||
]
|
||||
return columns;
|
||||
}
|
||||
|
||||
|
||||
};
|
||||
//考试管理列表操作
|
||||
const ListOpera = () => {
|
||||
@@ -354,7 +347,7 @@ export default {
|
||||
class="operation"
|
||||
style="cursor:pointer;margin-right:10px;"
|
||||
onClick={() => {
|
||||
console.log('123')
|
||||
state.CQvisible = true
|
||||
}}
|
||||
>
|
||||
查看
|
||||
@@ -434,16 +427,17 @@ export default {
|
||||
array.push(obj)
|
||||
})
|
||||
state.tabledata = array
|
||||
ListOpera();
|
||||
}
|
||||
//获取任务管理列表
|
||||
const getManageList = () => {
|
||||
let obj = {
|
||||
name: "",
|
||||
// name: "",
|
||||
pageNo: state.pageNo,
|
||||
pageSize: state.pageSize,
|
||||
projectId: 27,
|
||||
// projectId: 27,
|
||||
projectTaskId: props.projectTaskId,
|
||||
status: -1,
|
||||
status: 0,
|
||||
};
|
||||
api
|
||||
.taskStudentList(obj)
|
||||
@@ -461,12 +455,12 @@ export default {
|
||||
//搜索任务列表
|
||||
const searchTaskList = () => {
|
||||
let objser = {
|
||||
name: "",
|
||||
// name: "",
|
||||
pageNo: state.pageNo,
|
||||
pageSize: state.pageSize,
|
||||
projectId: 27,
|
||||
// projectId: 27,
|
||||
projectTaskId: props.projectTaskId,
|
||||
status: -1,
|
||||
status: 0,
|
||||
};
|
||||
if (state.name !== "" || state.projectName !== "") {
|
||||
api
|
||||
|
||||
@@ -364,36 +364,37 @@ export default {
|
||||
//获取任务管理列表
|
||||
const getManageList = () => {
|
||||
let obj = {
|
||||
name: "",
|
||||
// name: "",
|
||||
pageNo: state.pageNo,
|
||||
pageSize: state.pageSize,
|
||||
projectId: 27,
|
||||
// projectId: 27,
|
||||
projectTaskId: props.projectTaskId,
|
||||
status: -1,
|
||||
status: 0,
|
||||
};
|
||||
api
|
||||
.taskStudentList(obj)
|
||||
.then((res) => {
|
||||
state.pageNo = res.data.data.pageNo;
|
||||
state.pageSize = res.data.data.pageSize;
|
||||
state.pageSize = res.data.data.pageSize;
|
||||
for (let i = 0; i < res.data.data.rows.length; i++) {
|
||||
state.tabledata.push(res.data.data.rows[i].userInfoBo);
|
||||
}
|
||||
ListOpera();
|
||||
})
|
||||
.catch(() => {
|
||||
.catch((err) => {
|
||||
console.log(err,'sss');
|
||||
});
|
||||
};
|
||||
|
||||
//搜索任务列表
|
||||
const searchTaskList = () => {
|
||||
let objser = {
|
||||
name: "",
|
||||
// name: "",
|
||||
pageNo: state.pageNo,
|
||||
pageSize: state.pageSize,
|
||||
projectId: 27,
|
||||
// projectId: 27,
|
||||
projectTaskId: props.projectTaskId,
|
||||
status: -1,
|
||||
status: 0,
|
||||
};
|
||||
if (state.name !== "" || state.projectName !== "") {
|
||||
api
|
||||
|
||||
@@ -323,12 +323,12 @@ export default {
|
||||
//获取任务管理列表
|
||||
const getManageList = () => {
|
||||
let obj = {
|
||||
name: "",
|
||||
// name: "",
|
||||
pageNo: state.pageNo,
|
||||
pageSize: state.pageSize,
|
||||
projectId: 27,
|
||||
// projectId: 27,
|
||||
projectTaskId: props.projectTaskId,
|
||||
status: -1,
|
||||
status: 0,
|
||||
};
|
||||
api
|
||||
.taskStudentList(obj)
|
||||
@@ -339,6 +339,7 @@ export default {
|
||||
for (let i = 0; i < res.data.data.rows.length; i++) {
|
||||
state.tabledata.push(res.data.data.rows[i].userInfoBo);
|
||||
}
|
||||
ListOpera();
|
||||
})
|
||||
.catch(() => {
|
||||
});
|
||||
@@ -347,12 +348,12 @@ export default {
|
||||
//搜索任务列表
|
||||
const searchTaskList = () => {
|
||||
let objser = {
|
||||
name: "",
|
||||
// name: "",
|
||||
pageNo: state.pageNo,
|
||||
pageSize: state.pageSize,
|
||||
projectId: 27,
|
||||
// projectId: 27,
|
||||
projectTaskId: props.projectTaskId,
|
||||
status: -1,
|
||||
status: 0,
|
||||
};
|
||||
if (state.name !== "" || state.projectName !== "") {
|
||||
api
|
||||
|
||||
@@ -1039,7 +1039,7 @@ import { deleteStudyTask } from "../../api/indexStudy";
|
||||
import draggable from "vuedraggable";
|
||||
import { editTask } from "../../api/indexTaskadd";
|
||||
|
||||
import { RouterEditTask } from "@/api/indexTask";
|
||||
// import { RouterEditTask } from "@/api/indexTask";
|
||||
|
||||
import { toDate } from "../../api/method";
|
||||
import UnlockMode from "../../components/drawers/UnlockMode.vue";
|
||||
@@ -1165,51 +1165,9 @@ export default {
|
||||
},
|
||||
],
|
||||
//项目抽屉、列表参数
|
||||
drawertableData: [
|
||||
{
|
||||
key: 1,
|
||||
parentId: 1,
|
||||
name: "123",
|
||||
manager: "afssfa",
|
||||
children: [
|
||||
{
|
||||
key: 5,
|
||||
parentId: 1,
|
||||
name: "123",
|
||||
manager: "afssfa",
|
||||
},
|
||||
],
|
||||
},
|
||||
{
|
||||
key: 2,
|
||||
parentId: 2,
|
||||
name: "123",
|
||||
manager: "afssfa",
|
||||
children: [
|
||||
{
|
||||
key: 7,
|
||||
parentId: 1,
|
||||
name: "123",
|
||||
manager: "afssfa",
|
||||
children: [
|
||||
{
|
||||
key: 9,
|
||||
parentId: 1,
|
||||
name: "123",
|
||||
manager: "afssfa",
|
||||
},
|
||||
],
|
||||
},
|
||||
],
|
||||
},
|
||||
{
|
||||
key: 3,
|
||||
parentId: 3,
|
||||
name: "123",
|
||||
manager: "afssfa",
|
||||
},
|
||||
],
|
||||
selectedProjRowKeys: [],
|
||||
drawertableData: [],
|
||||
selectedProjRowKeys:[],
|
||||
projListData:[],
|
||||
currentPage: 1,
|
||||
tableDataTotal: 0,
|
||||
pageSize: 10,
|
||||
@@ -1421,6 +1379,7 @@ export default {
|
||||
state.addevalvisible = true;
|
||||
state.EditEvalId = id;
|
||||
state.routerTaskId = eleId;
|
||||
console.log('id我编辑的测评id',id);
|
||||
};
|
||||
//评估抽屉
|
||||
const showDrawerAddInvist = (id, eleId) => {
|
||||
@@ -1927,30 +1886,6 @@ export default {
|
||||
state.removeStageId = option.chapterId;
|
||||
};
|
||||
|
||||
//添加关卡项目
|
||||
const updateTask = () => {
|
||||
RouterEditTask({
|
||||
duration: 0,
|
||||
flag: true,
|
||||
chapterId: state.isactive,
|
||||
courseId: Number(state.projId),
|
||||
name: state.projName,
|
||||
routerId: state.routerId,
|
||||
routerTaskId: state.routerTaskId,
|
||||
type: 13,
|
||||
})
|
||||
.then(() => {
|
||||
message.success(`${state.editproj ? "编辑" : "新增"}关卡任务成功`);
|
||||
// ctx.emit("changeData", false);
|
||||
leaveProjDrawer();
|
||||
state.addLoading = false;
|
||||
})
|
||||
.catch(() => {
|
||||
message.destroy();
|
||||
message.error("添加关卡任务失败");
|
||||
});
|
||||
};
|
||||
|
||||
//显示切换模式抽屉
|
||||
const showModeVisible = () => {
|
||||
state.unlockModeVisible = true;
|
||||
@@ -2001,7 +1936,6 @@ export default {
|
||||
closeChangeModal,
|
||||
handleChangeStage,
|
||||
|
||||
updateTask,
|
||||
|
||||
showDeleteChapter,
|
||||
closeDeleteChapter,
|
||||
|
||||
Reference in New Issue
Block a user