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

fix:补齐合并丢失代码

Browse Source
This commit is contained in:
Ggysh-7
2022-11-25 22:37:54 +08:00
parent 80f8f3bc6a
commit e0e134004c
3 changed files with 16 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/api/config.js
View File

@@ -34,7 +34,7 @@ http.interceptors.request.use(
// 此处测试默认配置token // 此处测试默认配置token
config.headers.token = "123456"; config.headers.token = "123456";
// config.headers.token = "eyJ0eXBlIjoidG9rZW4iLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC91LmJvZS5jb20iLCJpYXQiOjE2NjkzMDA4MDksImV4cCI6MTY2OTMwODAwOSwiR2l2ZW5OYW1lIjoiYm9ldSIsInVzZXJJZCI6IjZCMDQ5RkFGLUMzMTQtN0NDRi0wRDI4LTBEMjNGNEM0MjUzMSIsInVJZCI6Ijk2NTM0MjAyNzQ5NzYwNzE2OCIsInBlcm1pc3Npb24iOiIifQ==.bb3e0e031513761003d5c3bfeaf16e364bdf8fe7bc4cf691a05a74dc454afbfb"; // config.headers.token = "eyJ0eXBlIjoidG9rZW4iLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC91LmJvZS5jb20iLCJpYXQiOjE2NjkzODQ5MTgsImV4cCI6MTY2OTM5MjExOCwiR2l2ZW5OYW1lIjoiYm9ldSIsInVzZXJJZCI6IjZCMDQ5RkFGLUMzMTQtN0NDRi0wRDI4LTBEMjNGNEM0MjUzMSIsInVJZCI6Ijk2NTM0MjAyNzQ5NzYwNzE2OCIsInBlcm1pc3Npb24iOiIifQ==.7c3af587cbacf68180e86681442e06ffd33c65a78fc835aaac34d0c773752d99";
} }
return config; return config;
}, },

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

@@ -173,8 +173,10 @@ export default {
// addLoading:false, // addLoading:false,
}); });
const checkFinish = (value)=> { const checkFinish = (value)=> {
console.log('父亲');
state.evaluationTypeId = value.quiz_kid ? value.quiz_kid : null state.evaluationTypeId = value.quiz_kid ? value.quiz_kid : null
state.evaluationTypeName = value.title ? value.title : "" state.evaluationTypeName = value.title ? value.title : ""
console.log(value,state.evaluationTypeName ,'state.evaluationTypeName state.evaluationTypeName ');
} }
const closeDrawer = () => { const closeDrawer = () => {
ctx.emit("update:addevalVisible", false); ctx.emit("update:addevalVisible", false);
@@ -182,9 +184,9 @@ export default {
state.inputV1 = ""; state.inputV1 = "";
state.time = undefined; state.time = undefined;
state.description = ""; state.description = "";
(state.evaluationTypeId = 0), state.evaluationTypeId = 0,
(state.evaluationTypeName = ""), state.evaluationTypeName = "",
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) => {
@@ -232,9 +234,11 @@ export default {
type: 10, type: 10,
}) })
.then(() => { .then(() => {
message.destroy()
message.success(`${props.edit ? "编辑" : "新增"}阶段任务成功`); message.success(`${props.edit ? "编辑" : "新增"}阶段任务成功`);
}) })
.catch(() => { .catch(() => {
message.destroy()
message.error(`${props.edit ? "编辑" : "新增"}阶段任务失败`); message.error(`${props.edit ? "编辑" : "新增"}阶段任务失败`);
}); });
} else if (props.isLevel == 3) { } else if (props.isLevel == 3) {
@@ -347,12 +351,10 @@ export default {
.createEvaluation(obj) .createEvaluation(obj)
.then((res) => { .then((res) => {
updateTask(res.data.data); updateTask(res.data.data);
message.success("创建成功");
closeDrawer(); closeDrawer();
ctx.emit("changeData", false); ctx.emit("changeData", false);
}) })
.catch(() => { .catch(() => {
message.error("创建失败");
}); });
}; };

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

@@ -148,16 +148,12 @@ import { reactive, toRefs } from "vue";
}, },
] ]
}); });
// 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.evListData = selectedRows[0] ? selectedRows[0] : [] state.evListData = selectedRows[0] ? selectedRows[0] : {}
} }
const closeDrawer = () => { const closeDrawer = () => {
ctx.emit("update:EvalListVisible", false); ctx.emit("update:EvalListVisible", false);
@@ -171,11 +167,8 @@ import { reactive, toRefs } from "vue";
} }
}; };
const checkFinish =() =>{ const checkFinish =() =>{
let EvListDate = { ctx.emit("getEvListData", state.evListData);
Id : state.evaluationTypeId, console.log('儿子',state.evListData);
Name : state.evaluationTypeName,
}
ctx.emit("getEvListDate", EvListDate);
closeDrawer(); closeDrawer();
} }
const changePagination = (page) => { const changePagination = (page) => {
@@ -230,6 +223,7 @@ import { reactive, toRefs } from "vue";
key:index+1, key:index+1,
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,
@@ -245,7 +239,7 @@ import { reactive, toRefs } from "vue";
const getAllEvalText = ()=> { const getAllEvalText = ()=> {
let objael = { let objael = {
"keyword": "", "keyword": "",
"user_id": 965341999643234304, "user_id": "965341999643234304",
} }
api api
.choiceEvaluation(objael) .choiceEvaluation(objael)
@@ -255,7 +249,7 @@ import { reactive, toRefs } from "vue";
.catch(()=>{ .catch(()=>{
}) })
} }
// //搜索测评列表
const searchList = ()=> { const searchList = ()=> {
state.searching = true state.searching = true
getAllEvalText() getAllEvalText()