From 6ecc8e01fdf6c5f34f6316e503e1cf016953181c Mon Sep 17 00:00:00 2001 From: Ggysh-7 <102372376+Ggysh-7@users.noreply.github.com> Date: Tue, 22 Nov 2022 18:25:24 +0800 Subject: [PATCH] =?UTF-8?q?fit:=E6=B7=BB=E5=8A=A0=E6=A1=88=E4=BE=8B=20?= =?UTF-8?q?=E9=80=89=E6=8B=A9=E6=B5=8B=E8=AF=84=E3=80=81=E8=AF=95=E5=8D=B7?= =?UTF-8?q?=20=E3=80=81=E5=9B=9B=E4=B8=AA=E7=AE=A1=E7=90=86=E7=9A=84?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3=E8=AF=B7?= =?UTF-8?q?=E6=B1=82=E6=9D=A1=E4=BB=B6=20=E6=B7=BB=E5=8A=A0=E6=A1=88?= =?UTF-8?q?=E4=BE=8B=E6=9C=80=E5=A4=9A=E9=80=89=E6=8B=A9=E4=B8=A4=E6=9D=A1?= =?UTF-8?q?=20=E9=80=89=E6=8B=A9=E8=AF=95=E5=8D=B7=E3=80=81=E6=B5=8B?= =?UTF-8?q?=E8=AF=84=E6=9C=80=E5=A4=9A=E9=80=89=E6=8B=A9=E4=B8=80=E6=9D=A1?= =?UTF-8?q?=E5=8F=AF=E5=8F=8D=E9=80=89=E5=88=9B=E5=BB=BA=E6=B5=8B=E8=AF=84?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=8E=A5=E5=8F=A3=E8=AF=B7=E6=B1=82=E5=8F=82?= =?UTF-8?q?=E6=95=B0=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/drawers/AddCase.vue | 24 ++++++++---------- src/components/drawers/AddEval.vue | 4 +++ src/components/drawers/AddTest.vue | 33 ++++++++++++++---------- src/components/drawers/EvList.vue | 36 +++++++++++++++++++-------- src/components/drawers/FaceManage.vue | 28 +++++++++++++-------- src/components/drawers/SelectTest.vue | 24 ++++++++++++++---- src/components/drawers/TestManage.vue | 5 +++- src/components/drawers/TimeManage.vue | 4 ++- src/components/drawers/WorkManage.vue | 6 +++-- 9 files changed, 108 insertions(+), 56 deletions(-) diff --git a/src/components/drawers/AddCase.vue b/src/components/drawers/AddCase.vue index 293ac1e7..22c806dc 100644 --- a/src/components/drawers/AddCase.vue +++ b/src/components/drawers/AddCase.vue @@ -150,8 +150,10 @@ export default { localStorage.setItem("stageId", props.chooseStageId); localStorage.setItem("chapterId", props.isactive); }; - const afterVisibleChange = () => { - getAllCaseText() + const afterVisibleChange = (bol) => { + if ( bol == true ) { + getAllCaseText() + } }; const tableDataFunc = () => { const columns = [ @@ -182,6 +184,9 @@ export default { return columns; }; const onSelectChange = (selectedRowKeys,selectedRows)=> { + if(selectedRowKeys.length>2){ + return + } state.selectedRowKeys = selectedRowKeys; state.apiTaskList = selectedRows; }; @@ -251,18 +256,6 @@ export default { }); } else if (props.isLevel == 2) { if(state.apiTaskList.length > 1){ - // for((item,index) in state.apiTaskList){ - // apiTask - // .addTask({ - // "courseId": item.caseId, - // "duration": 0, - // "flag": true, - // "name": item.caseName, - // "projectId": props.projectId, - // "projectTaskId": props.projectTaskId, - // "stageId": props.chooseStageId, - // "type": 3, - // }) for(let i = 0;i <= state.apiTaskList.length;i++){ apiTask .addTask({ @@ -455,6 +448,9 @@ export default { .ant-table-selection-column { padding: 0px !important; padding-left: 15px !important; + .ant-table-selection{ + display: none; + } } .ant-table-thead > tr > th { background-color: rgba(239, 244, 252, 1); diff --git a/src/components/drawers/AddEval.vue b/src/components/drawers/AddEval.vue index 0a58aef2..2f3ece39 100644 --- a/src/components/drawers/AddEval.vue +++ b/src/components/drawers/AddEval.vue @@ -215,6 +215,8 @@ export default { projectId: props.projectId, projectTaskId: props.projectTaskId || 0, stageId: props.chooseStageId, + evaluationTypeId: state.evaluationTypeId, + evaluationTypeName: state.evaluationTypeName, type: 10, }) .then(( ) => { @@ -230,6 +232,8 @@ export default { name: res.data.data.evaluationName, routerId: props.routerId, routerTaskId: props.routerTaskId || 0, + evaluationTypeId: state.evaluationTypeId, + evaluationTypeName: state.evaluationTypeName, type: 10, }) .then(( ) => { diff --git a/src/components/drawers/AddTest.vue b/src/components/drawers/AddTest.vue index 82c24cf7..e16ef4d4 100644 --- a/src/components/drawers/AddTest.vue +++ b/src/components/drawers/AddTest.vue @@ -78,15 +78,16 @@
- - + + 选择试卷 + + {{ paperName }} +
@@ -709,8 +716,8 @@ export default { .catch(() => { message.error(`${props.EditTestId ? "编辑" : "新增"}阶段任务失败`); }); - } else if (props.isLevel == 3) { - console.log(""); + } else if (props.isLevel == 3) { + console.log(""); } }; diff --git a/src/components/drawers/EvList.vue b/src/components/drawers/EvList.vue index 5bb04782..257dbd95 100644 --- a/src/components/drawers/EvList.vue +++ b/src/components/drawers/EvList.vue @@ -36,7 +36,7 @@
搜索
-
+
重置
@@ -50,7 +50,7 @@ :data-source="tableData" :loading="tableDataTotal === -1 ? true : false" :pagination="false" - :row-selection="{ selectedRowKeys:selectedRowKeys,onSelect:onSelect,onChange:onSelectChange}" + :row-selection="{ selectedRowKeys:selectedRowKeys,onChange:onSelectChange}" />
{ - state.evaluationTypeName = record.title - state.evaluationTypeId = record.quiz_code - }; - const onSelectChange = (selectedRowKeys)=> { + // const onSelect = (record)=> { + // state.evaluationTypeName = record.title + // state.evaluationTypeId = record.quiz_code + // }; + const onSelectChange = (selectedRowKeys,selectedRows)=> { + if(state.selectedRowKeys.length>1){ + return + } state.selectedRowKeys = selectedRowKeys + state.evaluationTypeName = selectedRows[0].record.title + state.evaluationTypeId = selectedRows[0].quiz_code } const closeDrawer = () => { ctx.emit("update:EvalListVisible", false); }; - const afterVisibleChange = () => { - getAllEvalText(); + const afterVisibleChange = (bol) => { + if ( bol == true ) { + getAllEvalText(); + } }; const checkFinish =() =>{ let EvListDate = { @@ -204,15 +211,24 @@ .catch(()=>{ }) } + //重置测评列表 + const resetData = ()=> { + state.currentPage = 1; + state.tableData = []; + state.selectedRowKeys = []; + state.evaluationTypeId = null; + state.evaluationTypeName = ""; + getAllEvalText(); + } return { ...toRefs(state), afterVisibleChange, closeDrawer, onSelectChange, - onSelect, getTableDataList, checkFinish, changePagination, + resetData, }; }, }; diff --git a/src/components/drawers/FaceManage.vue b/src/components/drawers/FaceManage.vue index c87e5671..c9040848 100644 --- a/src/components/drawers/FaceManage.vue +++ b/src/components/drawers/FaceManage.vue @@ -98,7 +98,6 @@ :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange, - onSelect: onSelect, }" />
@@ -194,12 +193,20 @@ export default { selectedRowKeys: [], tabledata: [ { + key:1, workNum:1, status:"已完成", operation:"", }, { - workNum:1, + key:2, + workNum:2, + status:"未完成", + operation:"", + }, + { + key:3, + workNum:2, status:"未完成", operation:"", } @@ -341,18 +348,21 @@ export default { const closeDrawer = () => { ctx.emit("update:Fvisible", false); }; - const afterVisibleChange = () => { - getManageList() + const afterVisibleChange = (bol) => { + if ( bol == true ) { + getManageList() + } + }; const selectProjectName = (value) => { state.projectName = value; }; const onSelectChange = (selectedRowKeys) => { - state.selectedRowKeys = selectedRowKeys; + if(selectedRowKeys.length > 2){ + return + } + state.selectedRowKeys = selectedRowKeys; }; - const onSelect = (record) => { - console.log(record); - } const allStuOver = ()=> { state.ASOvervisible = true @@ -457,7 +467,6 @@ export default { closeDrawer, afterVisibleChange, onSelectChange, - onSelect, allStuOver, showEntryScore, godie, @@ -672,7 +681,6 @@ export default { .tableBox { .ant-table-selection-column { padding: 0px !important; - // padding-left: 45px !important; } .ant-pagination-item, .ant-pagination-prev, diff --git a/src/components/drawers/SelectTest.vue b/src/components/drawers/SelectTest.vue index 74cdee07..5141cb5b 100644 --- a/src/components/drawers/SelectTest.vue +++ b/src/components/drawers/SelectTest.vue @@ -126,8 +126,10 @@ ctx.emit("update:STvisible", false); }; - const afterVisibleChange = () => { + const afterVisibleChange = (bol) => { + if (bol == true) { getManageList() + } }; const tableDataFunc = ()=> { @@ -186,6 +188,9 @@ state.SelectTestData = record }; const onSelectChange = (selectedRowKeys) => { + if(selectedRowKeys.length>1){ + return + } state.selectedRowKeys = selectedRowKeys; } @@ -232,7 +237,7 @@ }); }; - //搜索任务列表 + //搜索任务列表 没接口 const searchTaskList = () => { let objser = { name: "", @@ -264,9 +269,12 @@ //重置任务列表 const resetTaskList = () => { - state.name = ""; - state.projectName = ""; - state.tabledata = []; + state.inputPname = ""; + state.inputCname = ""; + state.tableData = []; + state.selectedRowKeys = []; + state.SelectTestData = []; + state.currentPage = 1; getManageList(); }; return { @@ -398,6 +406,12 @@ } } .tab { + + .ant-table-selection-column { + .ant-table-selection{ + display: none; + } + } th.h { background-color: #eff4fc !important; } diff --git a/src/components/drawers/TestManage.vue b/src/components/drawers/TestManage.vue index 6d753120..54cf82fd 100644 --- a/src/components/drawers/TestManage.vue +++ b/src/components/drawers/TestManage.vue @@ -394,8 +394,11 @@ export default { const closeDrawer = () => { ctx.emit("update:TMvisible", false); }; - const afterVisibleChange = () => { + const afterVisibleChange = (bol) => { + if ( bol == true ) { getManageList(); + } + }; const selectProjectName = (value, index) => { console.log("value", value, index); diff --git a/src/components/drawers/TimeManage.vue b/src/components/drawers/TimeManage.vue index 4dfb6a1c..c4a18e21 100644 --- a/src/components/drawers/TimeManage.vue +++ b/src/components/drawers/TimeManage.vue @@ -345,8 +345,10 @@ export default { const closeDrawer = () => { ctx.emit("update:Tvisible", false); }; - const afterVisibleChange = () => { + const afterVisibleChange = (bol) => { + if ( bol == true ) { getManageList(); + } }; const selectProjectName = (value) => { state.projectName = value; diff --git a/src/components/drawers/WorkManage.vue b/src/components/drawers/WorkManage.vue index cf404496..8916b350 100644 --- a/src/components/drawers/WorkManage.vue +++ b/src/components/drawers/WorkManage.vue @@ -299,8 +299,10 @@ export default { const closeDrawer = () => { ctx.emit("update:Wvisible", false); }; - const afterVisibleChange = () => { - getManageList(); + const afterVisibleChange = (bol) => { + if ( bol == true ) { + getManageList(); + } }; const selectProjectName = (value) => { state.projectName = value;