From a4cddab95f7c36505cc66b4c7d353a2f99871c9f Mon Sep 17 00:00:00 2001 From: zhangsir Date: Tue, 13 Aug 2024 10:09:51 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E6=96=B0=E5=A2=9E=E8=BF=9B=E8=A1=8C=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../drawers/project/ProjectHomeWorkManage.vue | 10 +++++----- src/components/drawers/router/RouterHomeworkManage.vue | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/components/drawers/project/ProjectHomeWorkManage.vue b/src/components/drawers/project/ProjectHomeWorkManage.vue index 5a499dd4..98a6c2aa 100644 --- a/src/components/drawers/project/ProjectHomeWorkManage.vue +++ b/src/components/drawers/project/ProjectHomeWorkManage.vue @@ -224,11 +224,11 @@ export default { value: "0", label: "未开始", }, - // { - // id: 2, - // value: "2", - // label: "进行中", - // }, + { + id: 2, + value: "2", + label: "进行中", + }, { id: 3, value: "1", diff --git a/src/components/drawers/router/RouterHomeworkManage.vue b/src/components/drawers/router/RouterHomeworkManage.vue index 292fa987..b1e2bc9b 100644 --- a/src/components/drawers/router/RouterHomeworkManage.vue +++ b/src/components/drawers/router/RouterHomeworkManage.vue @@ -167,11 +167,11 @@ export default { value: "0", label: "未开始", }, - // { - // id: 2, - // value: "2", - // label: "进行中", - //}, + { + id: 2, + value: "2", + label: "进行中", + }, { id: 3, value: "1", From c8db86a10d016b9e6ce819fa4c4fca2f427d0d21 Mon Sep 17 00:00:00 2001 From: zhangsir Date: Tue, 13 Aug 2024 17:01:35 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E6=90=9C=E7=B4=A2=E7=BB=9F=E4=B8=80=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E8=BF=9B=E8=A1=8C=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../drawers/project/ProjectFaceTaskManage.vue | 5 +++++ src/components/drawers/project/ProjectOnlineManage.vue | 10 +++++----- src/components/drawers/project/ProjectVoteManage.vue | 5 +++++ src/components/drawers/router/RouterCommonManage.vue | 10 +++++----- .../drawers/router/RouterEvaluationManage.vue | 10 +++++----- src/components/drawers/router/RouterVoteManage.vue | 5 +++++ 6 files changed, 30 insertions(+), 15 deletions(-) diff --git a/src/components/drawers/project/ProjectFaceTaskManage.vue b/src/components/drawers/project/ProjectFaceTaskManage.vue index 2f5ae877..e52f59eb 100644 --- a/src/components/drawers/project/ProjectFaceTaskManage.vue +++ b/src/components/drawers/project/ProjectFaceTaskManage.vue @@ -163,6 +163,11 @@ const finishOptions = ref([ }, { id: 2, + value: 2, + label: "进行中", + }, + { + id: 3, value: 1, label: "已完成", }, diff --git a/src/components/drawers/project/ProjectOnlineManage.vue b/src/components/drawers/project/ProjectOnlineManage.vue index c79f3dfa..0c30d3fb 100644 --- a/src/components/drawers/project/ProjectOnlineManage.vue +++ b/src/components/drawers/project/ProjectOnlineManage.vue @@ -196,11 +196,11 @@ export default { value: "0", label: "未开始", }, - // { - // id: 2, - // value: "2", - // label: "进行中", - // }, + { + id: 2, + value: "2", + label: "进行中", + }, { id: 3, value: "1", diff --git a/src/components/drawers/project/ProjectVoteManage.vue b/src/components/drawers/project/ProjectVoteManage.vue index dde44b71..48211f4a 100644 --- a/src/components/drawers/project/ProjectVoteManage.vue +++ b/src/components/drawers/project/ProjectVoteManage.vue @@ -186,6 +186,11 @@ value: "1", label: "未开始", }, + { + id: 2, + value: "2", + label: "进行中", + }, { id: 3, value: "3", diff --git a/src/components/drawers/router/RouterCommonManage.vue b/src/components/drawers/router/RouterCommonManage.vue index c11fea4e..91aad1c4 100644 --- a/src/components/drawers/router/RouterCommonManage.vue +++ b/src/components/drawers/router/RouterCommonManage.vue @@ -200,11 +200,11 @@ export default { value: "0", label: "未开始", }, - //{ - // id: 2, - // value: "2", - // label: "进行中", - // }, + { + id: 2, + value: "2", + label: "进行中", + }, { id: 3, value: "1", diff --git a/src/components/drawers/router/RouterEvaluationManage.vue b/src/components/drawers/router/RouterEvaluationManage.vue index 70ceb39c..bc394788 100644 --- a/src/components/drawers/router/RouterEvaluationManage.vue +++ b/src/components/drawers/router/RouterEvaluationManage.vue @@ -174,11 +174,11 @@ export default { value: "0", label: "未开始", }, - //{ - // id: 2, - // value: "2", - // label: "进行中", - // }, + { + id: 2, + value: "2", + label: "进行中", + }, { id: 3, value: "1", diff --git a/src/components/drawers/router/RouterVoteManage.vue b/src/components/drawers/router/RouterVoteManage.vue index f3c60456..b38a02dc 100644 --- a/src/components/drawers/router/RouterVoteManage.vue +++ b/src/components/drawers/router/RouterVoteManage.vue @@ -190,6 +190,11 @@ value: "1", label: "未开始", }, + { + id: 2, + value: "2", + label: "进行中", + }, { id: 3, value: "3", From e69f42a1adf2e0e6fb6c04de7aa7fbf894208d36 Mon Sep 17 00:00:00 2001 From: zhangsir Date: Wed, 14 Aug 2024 16:06:58 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E9=9D=A2=E6=8E=88=E6=A1=88=E4=BE=8B?= =?UTF-8?q?=E8=AE=A8=E8=AE=BA=E5=8F=96=E6=B6=88=E8=BF=9B=E8=A1=8C=E4=B8=AD?= =?UTF-8?q?=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../drawers/project/ProjectFaceTaskManage.vue | 10 +++++----- .../drawers/project/ProjectOnlineManage.vue | 14 +++++++++++++- .../drawers/router/RouterCommonManage.vue | 14 +++++++++++++- 3 files changed, 31 insertions(+), 7 deletions(-) diff --git a/src/components/drawers/project/ProjectFaceTaskManage.vue b/src/components/drawers/project/ProjectFaceTaskManage.vue index e52f59eb..3177a055 100644 --- a/src/components/drawers/project/ProjectFaceTaskManage.vue +++ b/src/components/drawers/project/ProjectFaceTaskManage.vue @@ -161,11 +161,11 @@ const finishOptions = ref([ value: 0, label: "未完成", }, - { - id: 2, - value: 2, - label: "进行中", - }, + // { + // id: 2, + // value: 2, + // label: "进行中", + // }, { id: 3, value: 1, diff --git a/src/components/drawers/project/ProjectOnlineManage.vue b/src/components/drawers/project/ProjectOnlineManage.vue index 0c30d3fb..c1a149d7 100644 --- a/src/components/drawers/project/ProjectOnlineManage.vue +++ b/src/components/drawers/project/ProjectOnlineManage.vue @@ -62,7 +62,7 @@ v-model:value="projectName" style="width: 200px" placeholder="请选择" - :options="projectNameList" + :options="datasource.type==3||datasource.type==8?projectNameListNot:projectNameList" @change="selectProjectName" allowClear > @@ -190,6 +190,18 @@ export default { currentPage: 1, tableDataTotal: 0, projectName: undefined, + projectNameListNot: [ + { + id: 1, + value: "0", + label: "未开始", + }, + { + id: 3, + value: "1", + label: "已完成", + }, + ], projectNameList: [ { id: 1, diff --git a/src/components/drawers/router/RouterCommonManage.vue b/src/components/drawers/router/RouterCommonManage.vue index 91aad1c4..fa013894 100644 --- a/src/components/drawers/router/RouterCommonManage.vue +++ b/src/components/drawers/router/RouterCommonManage.vue @@ -62,7 +62,7 @@ v-model:value="projectName" style="width: 200px" placeholder="请选择" - :options="projectNameList" + :options="datasource.type==3||datasource.type==8?projectNameListNot:projectNameList" @change="selectProjectName" > @@ -193,6 +193,18 @@ export default { currentPage: 1, tableDataTotal: 0, projectName: undefined, + projectNameListNot: [ + { + id: 1, + value: "0", + label: "未开始", + }, + { + id: 3, + value: "1", + label: "已完成", + }, + ], projectNameList: [ { From 2b971fda010b0bccb2570aabf4cc1b97b49f24d6 Mon Sep 17 00:00:00 2001 From: zhangsir Date: Wed, 14 Aug 2024 16:18:57 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E5=A4=96=E9=93=BE=E4=B9=9F=E5=8F=96?= =?UTF-8?q?=E6=B6=88=E8=BF=9B=E8=A1=8C=E4=B8=AD=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/drawers/project/ProjectOnlineManage.vue | 2 +- src/components/drawers/router/RouterCommonManage.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/drawers/project/ProjectOnlineManage.vue b/src/components/drawers/project/ProjectOnlineManage.vue index c1a149d7..88ba7427 100644 --- a/src/components/drawers/project/ProjectOnlineManage.vue +++ b/src/components/drawers/project/ProjectOnlineManage.vue @@ -62,7 +62,7 @@ v-model:value="projectName" style="width: 200px" placeholder="请选择" - :options="datasource.type==3||datasource.type==8?projectNameListNot:projectNameList" + :options="datasource.type==3||datasource.type==8||datasource.type === 7?projectNameListNot:projectNameList" @change="selectProjectName" allowClear > diff --git a/src/components/drawers/router/RouterCommonManage.vue b/src/components/drawers/router/RouterCommonManage.vue index fa013894..4a4778c3 100644 --- a/src/components/drawers/router/RouterCommonManage.vue +++ b/src/components/drawers/router/RouterCommonManage.vue @@ -62,7 +62,7 @@ v-model:value="projectName" style="width: 200px" placeholder="请选择" - :options="datasource.type==3||datasource.type==8?projectNameListNot:projectNameList" + :options="datasource.type==3||datasource.type==8||datasource.type === 7?projectNameListNot:projectNameList" @change="selectProjectName" > From 714425ac9940a1384e303c39cb3661c4e40c62a3 Mon Sep 17 00:00:00 2001 From: zhangsir Date: Fri, 16 Aug 2024 16:15:02 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E6=8A=95=E7=A5=A8=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E6=90=9C=E7=B4=A2=E5=80=BC=E5=8F=98=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/drawers/project/ProjectVoteManage.vue | 10 +++++----- src/components/drawers/router/RouterVoteManage.vue | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/components/drawers/project/ProjectVoteManage.vue b/src/components/drawers/project/ProjectVoteManage.vue index 48211f4a..0263fd8b 100644 --- a/src/components/drawers/project/ProjectVoteManage.vue +++ b/src/components/drawers/project/ProjectVoteManage.vue @@ -178,12 +178,12 @@ pageSize: 10, currentPage: 1, tableDataTotal: 0, - projectName: undefined, + projectName: '', projectNameList: [ { id: 1, - value: "1", + value: "0", label: "未开始", }, { @@ -193,7 +193,7 @@ }, { id: 3, - value: "3", + value: "1", label: "已完成", }, ], @@ -342,7 +342,7 @@ ctx.emit("update:ProjectVoteModelVisible", false); state.currentPage = 1; state.name = ""; - state.projectName = undefined; + state.projectName = ''; state.tabledata = []; }; const afterVisibleChange = (bol) => { @@ -443,7 +443,7 @@ state.tableDataTotalLoading = true; state.currentPage = 1; state.name = ""; - state.projectName = undefined; + state.projectName = ''; getData(); } diff --git a/src/components/drawers/router/RouterVoteManage.vue b/src/components/drawers/router/RouterVoteManage.vue index b38a02dc..694a4ab1 100644 --- a/src/components/drawers/router/RouterVoteManage.vue +++ b/src/components/drawers/router/RouterVoteManage.vue @@ -182,12 +182,12 @@ pageSize: 10, currentPage: 1, tableDataTotal: 0, - projectName: undefined, + projectName: '', projectNameList: [ { id: 1, - value: "1", + value: "0", label: "未开始", }, { @@ -197,7 +197,7 @@ }, { id: 3, - value: "3", + value: "1", label: "已完成", } ], @@ -362,7 +362,7 @@ ctx.emit("update:VoteModelVisible", false); state.currentPage = 1; state.name = ""; - state.projectName = undefined; + state.projectName = ''; state.tabledata = []; }; const afterVisibleChange = (bol) => { @@ -464,7 +464,7 @@ state.tableDataTotalLoading = true; state.currentPage = 1; state.name = ""; - state.projectName = undefined; + state.projectName = ''; getData(); } From 7b051c205df2082bd594d55f4645e0f820042d3d Mon Sep 17 00:00:00 2001 From: zhangsir Date: Mon, 19 Aug 2024 11:39:28 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E6=8A=95=E7=A5=A8=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E6=90=9C=E7=B4=A2=E4=BF=AE=E6=94=B9=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/drawers/project/ProjectVoteManage.vue | 12 ++++++------ src/components/drawers/router/RouterVoteManage.vue | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/components/drawers/project/ProjectVoteManage.vue b/src/components/drawers/project/ProjectVoteManage.vue index 0263fd8b..8e915ea9 100644 --- a/src/components/drawers/project/ProjectVoteManage.vue +++ b/src/components/drawers/project/ProjectVoteManage.vue @@ -178,22 +178,22 @@ pageSize: 10, currentPage: 1, tableDataTotal: 0, - projectName: '', + projectName: null, projectNameList: [ { id: 1, - value: "0", + value: 0, label: "未开始", }, { id: 2, - value: "2", + value: 2, label: "进行中", }, { id: 3, - value: "1", + value: 1, label: "已完成", }, ], @@ -342,7 +342,7 @@ ctx.emit("update:ProjectVoteModelVisible", false); state.currentPage = 1; state.name = ""; - state.projectName = ''; + state.projectName = null; state.tabledata = []; }; const afterVisibleChange = (bol) => { @@ -443,7 +443,7 @@ state.tableDataTotalLoading = true; state.currentPage = 1; state.name = ""; - state.projectName = ''; + state.projectName = null; getData(); } diff --git a/src/components/drawers/router/RouterVoteManage.vue b/src/components/drawers/router/RouterVoteManage.vue index 694a4ab1..a3b3c60a 100644 --- a/src/components/drawers/router/RouterVoteManage.vue +++ b/src/components/drawers/router/RouterVoteManage.vue @@ -182,22 +182,22 @@ pageSize: 10, currentPage: 1, tableDataTotal: 0, - projectName: '', + projectName: null, projectNameList: [ { id: 1, - value: "0", + value: 0, label: "未开始", }, { id: 2, - value: "2", + value: 2, label: "进行中", }, { id: 3, - value: "1", + value: 1, label: "已完成", } ], @@ -362,7 +362,7 @@ ctx.emit("update:VoteModelVisible", false); state.currentPage = 1; state.name = ""; - state.projectName = ''; + state.projectName = null; state.tabledata = []; }; const afterVisibleChange = (bol) => { @@ -464,7 +464,7 @@ state.tableDataTotalLoading = true; state.currentPage = 1; state.name = ""; - state.projectName = ''; + state.projectName = null; getData(); } From f411747407bedd59ea65c44940b703b485f29c1b Mon Sep 17 00:00:00 2001 From: zhangsir Date: Mon, 19 Aug 2024 14:13:42 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E6=8A=95=E7=A5=A8=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E6=90=9C=E7=B4=A2=E4=BF=AE=E6=94=B9=E5=8F=82=E6=95=B0=EF=BC=8C?= =?UTF-8?q?=E6=9C=AA=E5=BC=80=E5=A7=8B=E6=94=B9=E4=B8=BA3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/drawers/project/ProjectVoteManage.vue | 2 +- src/components/drawers/router/RouterVoteManage.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/drawers/project/ProjectVoteManage.vue b/src/components/drawers/project/ProjectVoteManage.vue index 8e915ea9..807f133e 100644 --- a/src/components/drawers/project/ProjectVoteManage.vue +++ b/src/components/drawers/project/ProjectVoteManage.vue @@ -183,7 +183,7 @@ { id: 1, - value: 0, + value: 3, label: "未开始", }, { diff --git a/src/components/drawers/router/RouterVoteManage.vue b/src/components/drawers/router/RouterVoteManage.vue index a3b3c60a..05688fa9 100644 --- a/src/components/drawers/router/RouterVoteManage.vue +++ b/src/components/drawers/router/RouterVoteManage.vue @@ -187,7 +187,7 @@ { id: 1, - value: 0, + value: 3, label: "未开始", }, { From 9b51db209f221adf58732b7026cf87e6656787b8 Mon Sep 17 00:00:00 2001 From: zhangsir Date: Tue, 20 Aug 2024 09:28:36 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E9=9D=A2=E6=8E=88=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E6=B8=85=E7=A9=BA=E7=8A=B6=E6=80=81=E6=9F=A5=E8=AF=A2=E6=97=B6?= =?UTF-8?q?=E5=88=A0=E9=99=A4status=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/drawers/project/ProjectFaceTaskManage.vue | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/components/drawers/project/ProjectFaceTaskManage.vue b/src/components/drawers/project/ProjectFaceTaskManage.vue index 3177a055..85ddfd21 100644 --- a/src/components/drawers/project/ProjectFaceTaskManage.vue +++ b/src/components/drawers/project/ProjectFaceTaskManage.vue @@ -62,6 +62,7 @@ placeholder="请选择" :options="finishOptions" allowClear + @change="changeStatus" > @@ -196,6 +197,11 @@ const props = defineProps({ }, }, }); +const changeStatus = (e) => { + if(e === undefined){ + delete params.value.status; + } +} const params = ref({ pid: 0, type: 3 }); const courseSelectRows = ref([]); const planParams = computed(() => ({