From f87aa65901406719a637cde1d96a8ca7c40d476a Mon Sep 17 00:00:00 2001
From: e <2432808546@qq.com>
Date: Thu, 9 Dec 2021 12:03:54 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=9E=E9=AA=8C?=
=?UTF-8?q?=E7=AE=A1=E7=90=86=E9=80=89=E6=8B=A9=E5=A5=BD=E6=9F=A5=E8=AF=A2?=
=?UTF-8?q?=E7=9A=84=E5=88=9B=E5=BB=BA=E4=BA=BA=E5=90=8E=E7=82=B9=E5=87=BB?=
=?UTF-8?q?=E7=BC=96=E8=BE=91=E6=88=96=E6=9F=A5=E7=9C=8B=EF=BC=8C=E8=BF=94?=
=?UTF-8?q?=E5=9B=9E=E6=97=B6=E9=BB=98=E8=AE=A4=E9=80=89=E4=B8=AD=E4=B8=8A?=
=?UTF-8?q?=E6=AC=A1=E9=80=89=E6=8B=A9=E7=9A=84=E5=88=9B=E5=BB=BA=E4=BA=BA?=
=?UTF-8?q?=E8=BF=9B=E8=A1=8C=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/pages/assessment/list/index.vue | 1 -
src/pages/project/add/index.vue | 4 +++-
src/pages/project/list/index.vue | 36 ++++++++++++++---------------
3 files changed, 20 insertions(+), 21 deletions(-)
diff --git a/src/pages/assessment/list/index.vue b/src/pages/assessment/list/index.vue
index 5e20733..269ca3a 100644
--- a/src/pages/assessment/list/index.vue
+++ b/src/pages/assessment/list/index.vue
@@ -236,7 +236,6 @@ export default {
beginTimer() {
this.ticker = setInterval(() => {
if(this.sss == 0){
-
clearInterval(this.ticker);
this.ticker = null;
}else{
diff --git a/src/pages/project/add/index.vue b/src/pages/project/add/index.vue
index 54b1715..adba6bd 100644
--- a/src/pages/project/add/index.vue
+++ b/src/pages/project/add/index.vue
@@ -194,6 +194,7 @@ export default {
return {
projectId: this.$route.query.projectId,
item: this.$route.query.item,
+ founder: this.$route.query.founder,
systemList: [],
token: util.local.get(Setting.tokenKey),
isDetail: Boolean(this.$route.query.show),
@@ -298,7 +299,8 @@ export default {
this.$confirm("确定返回？未更新的信息将不会保存。", "提示", {
type: "warning"
}).then(() => {
- this.$router.back();
+ this.$router.push(`/project/list?founder=${this.founder}`);
+ // this.$router.back();
}).catch(() => {
});
}
diff --git a/src/pages/project/list/index.vue b/src/pages/project/list/index.vue
index 5e351fa..cdccf24 100644
--- a/src/pages/project/list/index.vue
+++ b/src/pages/project/list/index.vue
@@ -86,8 +86,8 @@
- 查看
- 编辑
+ 查看
+ 编辑
删除
复制
@@ -147,16 +147,13 @@ export default {
{
value: "",
label: "不限"
- },
- {
+ }, {
value: 0,
label: "练习"
- },
- {
+ }, {
value: 1,
label: "考核"
- },
- {
+ }, {
value: 2,
label: "竞赛"
}
@@ -168,17 +165,15 @@ export default {
},
founderList: [
{
+ value: 2,
+ label: "全部"
+ }, {
value: 0,
label: "系统"
- },
- {
+ }, {
value: 1,
label: "老师"
},
- {
- value: 2,
- label: "全部"
- }
],
founderKeys: {
0: "系统",
@@ -188,12 +183,10 @@ export default {
{
value: "",
label: "不限"
- },
- {
+ }, {
value: 0,
label: "草稿箱"
- },
- {
+ }, {
value: 1,
label: "已发布"
}
@@ -243,6 +236,11 @@ export default {
if(this.queryDataStatus.platformId) {
this.queryData = this.queryDataStatus
}
+ if(this.$route.query.founder){
+ this.queryData.founder = +this.$route.query.founder
+ }else{
+ this.queryData.founder = 2
+ }
},
methods: {
...mapActions("project", [
@@ -293,7 +291,7 @@ export default {
},
edit(row,item) { // 编辑
this.setSystemId(row.systemId);
- this.$router.push(`/project/add?projectId=${row.projectId}&item=${item}`);
+ this.$router.push(`/project/add?projectId=${row.projectId}&item=${item}&founder=${this.queryData.founder}`);
},
handleSelectionChange(val) { // 处理多选
this.multipleSelection = val;
From ccc20e0acde245e1fcfe8011e6a6b4a6ea6839f2 Mon Sep 17 00:00:00 2001
From: e <2432808546@qq.com>
Date: Thu, 9 Dec 2021 14:41:08 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=A5=E7=9C=8B?=
=?UTF-8?q?=E8=80=83=E6=A0=B8=E5=88=97=E8=A1=A8=E6=93=8D=E4=BD=9C=E6=8C=89?=
=?UTF-8?q?=E9=92=AE=E5=BB=B6=E6=97=B6=E5=B1=95=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/pages/assessment/list/index.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/pages/assessment/list/index.vue b/src/pages/assessment/list/index.vue
index 269ca3a..eea10df 100644
--- a/src/pages/assessment/list/index.vue
+++ b/src/pages/assessment/list/index.vue
@@ -97,7 +97,7 @@
-
+
启动
修改
From 8b01ffc71cf5525ba09af6d07edae1dac06cda45 Mon Sep 17 00:00:00 2001
From: e <2432808546@qq.com>
Date: Thu, 9 Dec 2021 15:52:49 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=A1=B9=E7=9B=AE?=
=?UTF-8?q?=E6=97=B6=E5=80=99=E8=BF=94=E5=9B=9E=E5=88=97=E8=A1=A8=E9=BB=98?=
=?UTF-8?q?=E8=AE=A4=E4=B8=8A=E6=AC=A1=E9=80=89=E6=8B=A9=E5=88=9B=E5=BB=BA?=
=?UTF-8?q?=E4=BA=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/pages/project/add/index.vue | 4 ++--
src/pages/project/list/index.vue | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/pages/project/add/index.vue b/src/pages/project/add/index.vue
index adba6bd..651e096 100644
--- a/src/pages/project/add/index.vue
+++ b/src/pages/project/add/index.vue
@@ -293,8 +293,8 @@ export default {
"setSystemId", "setProject"
]),
goBack() { // 返回
- if (this.isDetail) {
- this.$router.back();
+ if (this.isDetail || this.item == 0) {
+ this.$router.push(`/project/list?founder=${this.founder}`);
} else {
this.$confirm("确定返回？未更新的信息将不会保存。", "提示", {
type: "warning"
diff --git a/src/pages/project/list/index.vue b/src/pages/project/list/index.vue
index cdccf24..46d7c55 100644
--- a/src/pages/project/list/index.vue
+++ b/src/pages/project/list/index.vue
@@ -236,7 +236,7 @@ export default {
if(this.queryDataStatus.platformId) {
this.queryData = this.queryDataStatus
}
- if(this.$route.query.founder){
+ if(this.$route.query.founder && this.$route.query.founder != 'undefined'){
this.queryData.founder = +this.$route.query.founder
}else{
this.queryData.founder = 2
@@ -287,7 +287,7 @@ export default {
},
add() { // 新增项目
this.setSystemId(this.systemId);
- this.$router.push("/project/add");
+ this.$router.push(`/project/add?founder=${this.queryData.founder}`);
},
edit(row,item) { // 编辑
this.setSystemId(row.systemId);