diff --git a/src/pages/assessment/list/index.vue b/src/pages/assessment/list/index.vue
index 5e20733..eea10df 100644
--- a/src/pages/assessment/list/index.vue
+++ b/src/pages/assessment/list/index.vue
@@ -97,7 +97,7 @@
-
+
启动
修改
@@ -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..651e096 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),
@@ -292,13 +293,14 @@ 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"
}).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 d42a9e9..01822b4 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: "竞赛"
}
@@ -170,12 +167,10 @@ export default {
{
value: 2,
label: "全部"
- },
- {
+ }, {
value: 0,
label: "系统"
- },
- {
+ }, {
value: 1,
label: "老师"
}
@@ -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.$route.query.founder != 'undefined'){
+ this.queryData.founder = +this.$route.query.founder
+ }else{
+ this.queryData.founder = 2
+ }
},
methods: {
...mapActions("project", [
@@ -289,11 +287,11 @@ 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);
- 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;