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

Merge branch 'zcwy_0712_bug' into master-0705

Browse Source
This commit is contained in:
nisen
2024-08-20 18:18:57 +08:00
parent 10f278f772 9b51db209f
commit 5508ec2798
8 changed files with 83 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/components/drawers/project/ProjectFaceTaskManage.vue
View File

@@ -62,6 +62,7 @@
placeholder="请选择"
:options="finishOptions"
allowClear
@change="changeStatus"
></a-select>
</div>
</div>
@@ -161,8 +162,13 @@ const finishOptions = ref([
value: 0,
label: "未完成",
},
// {
// id: 2,
// value: 2,
// label: "进行中",
// },
{
id: 2,
id: 3,
value: 1,
label: "已完成",
},
@@ -191,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(() => ({

10
src/components/drawers/project/ProjectHomeWorkManage.vue
View File

@@ -224,11 +224,11 @@ export default {
value: "0",
label: "未开始",
},
// {
// id: 2,
// value: "2",
// label: "进行中",
// },
{
id: 2,
value: "2",
label: "进行中",
},
{
id: 3,
value: "1",

24
src/components/drawers/project/ProjectOnlineManage.vue
View File

@@ -62,7 +62,7 @@
v-model:value="projectName"
style="width: 200px"
placeholder="请选择"
:options="projectNameList"
:options="datasource.type==3||datasource.type==8||datasource.type === 7?projectNameListNot:projectNameList"
@change="selectProjectName"
allowClear
></a-select>
@@ -190,17 +190,29 @@ export default {
currentPage: 1,
tableDataTotal: 0,
projectName: undefined,
projectNameListNot: [
{
id: 1,
value: "0",
label: "未开始",
},
{
id: 3,
value: "1",
label: "已完成",
},
],
projectNameList: [
{
id: 1,
value: "0",
label: "未开始",
},
// {
// id: 2,
// value: "2",
// label: "进行中",
// },
{
id: 2,
value: "2",
label: "进行中",
},
{
id: 3,
value: "1",

15
src/components/drawers/project/ProjectVoteManage.vue
View File

@@ -178,17 +178,22 @@
pageSize: 10,
currentPage: 1,
tableDataTotal: 0,
projectName: undefined,
projectName: null,
projectNameList: [
{
id: 1,
value: "1",
value: 3,
label: "未开始",
},
{
id: 2,
value: 2,
label: "进行中",
},
{
id: 3,
value: "3",
value: 1,
label: "已完成",
},
],
@@ -337,7 +342,7 @@
ctx.emit("update:ProjectVoteModelVisible", false);
state.currentPage = 1;
state.name = "";
state.projectName = undefined;
state.projectName = null;
state.tabledata = [];
};
const afterVisibleChange = (bol) => {
@@ -438,7 +443,7 @@
state.tableDataTotalLoading = true;
state.currentPage = 1;
state.name = "";
state.projectName = undefined;
state.projectName = null;
getData();
}

24
src/components/drawers/router/RouterCommonManage.vue
View File

@@ -62,7 +62,7 @@
v-model:value="projectName"
style="width: 200px"
placeholder="请选择"
:options="projectNameList"
:options="datasource.type==3||datasource.type==8||datasource.type === 7?projectNameListNot:projectNameList"
@change="selectProjectName"
></a-select>
@@ -193,6 +193,18 @@ export default {
currentPage: 1,
tableDataTotal: 0,
projectName: undefined,
projectNameListNot: [
{
id: 1,
value: "0",
label: "未开始",
},
{
id: 3,
value: "1",
label: "已完成",
},
],
projectNameList: [
{
@@ -200,11 +212,11 @@ export default {
value: "0",
label: "未开始",
},
//{
// id: 2,
// value: "2",
// label: "进行中",
// },
{
id: 2,
value: "2",
label: "进行中",
},
{
id: 3,
value: "1",

10
src/components/drawers/router/RouterEvaluationManage.vue
View File

@@ -174,11 +174,11 @@ export default {
value: "0",
label: "未开始",
},
//{
// id: 2,
// value: "2",
// label: "进行中",
// },
{
id: 2,
value: "2",
label: "进行中",
},
{
id: 3,
value: "1",

10
src/components/drawers/router/RouterHomeworkManage.vue
View File

@@ -167,11 +167,11 @@ export default {
value: "0",
label: "未开始",
},
// {
// id: 2,
// value: "2",
// label: "进行中",
//},
{
id: 2,
value: "2",
label: "进行中",
},
{
id: 3,
value: "1",

15
src/components/drawers/router/RouterVoteManage.vue
View File

@@ -182,17 +182,22 @@
pageSize: 10,
currentPage: 1,
tableDataTotal: 0,
projectName: undefined,
projectName: null,
projectNameList: [
{
id: 1,
value: "1",
value: 3,
label: "未开始",
},
{
id: 2,
value: 2,
label: "进行中",
},
{
id: 3,
value: "3",
value: 1,
label: "已完成",
}
],
@@ -357,7 +362,7 @@
ctx.emit("update:VoteModelVisible", false);
state.currentPage = 1;
state.name = "";
state.projectName = undefined;
state.projectName = null;
state.tabledata = [];
};
const afterVisibleChange = (bol) => {
@@ -459,7 +464,7 @@
state.tableDataTotalLoading = true;
state.currentPage = 1;
state.name = "";
state.projectName = undefined;
state.projectName = null;
getData();
}