From b3142c517271b68cf879582cd712401630b1f43d Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Thu, 4 Nov 2021 20:18:57 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=B0=E5=A2=9E?=
=?UTF-8?q?=E6=8C=89=E9=92=AE=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/pages/assessment/list/index.vue | 2 +-
src/pages/course/list/courseManagement/index.vue | 2 +-
src/pages/evaluation/list/index.vue | 4 ++--
src/pages/information/columnManage/index.vue | 2 +-
src/pages/information/contentManage/contentList.vue | 2 +-
src/pages/match/list/index.vue | 2 +-
src/pages/project/list/index.vue | 2 +-
src/pages/student/list/index.vue | 2 +-
src/pages/system/list/role.vue | 2 +-
src/pages/system/list/staff.vue | 2 +-
src/styles/common.scss | 12 ++++++++++++
11 files changed, 23 insertions(+), 11 deletions(-)
diff --git a/src/pages/assessment/list/index.vue b/src/pages/assessment/list/index.vue
index e0c175a..ed6f420 100644
--- a/src/pages/assessment/list/index.vue
+++ b/src/pages/assessment/list/index.vue
@@ -44,7 +44,7 @@
diff --git a/src/pages/course/list/courseManagement/index.vue b/src/pages/course/list/courseManagement/index.vue
index 10b49d8..65b854d 100644
--- a/src/pages/course/list/courseManagement/index.vue
+++ b/src/pages/course/list/courseManagement/index.vue
@@ -16,7 +16,7 @@
- 新增
+ 新增
批量删除
diff --git a/src/pages/evaluation/list/index.vue b/src/pages/evaluation/list/index.vue
index 0ca59d8..425636b 100644
--- a/src/pages/evaluation/list/index.vue
+++ b/src/pages/evaluation/list/index.vue
@@ -19,8 +19,8 @@
- 测评设置
- 新增题目
+ 测评设置
+ 新增题目
批量上传
批量删除
diff --git a/src/pages/information/columnManage/index.vue b/src/pages/information/columnManage/index.vue
index 238bb97..8dbd8a0 100644
--- a/src/pages/information/columnManage/index.vue
+++ b/src/pages/information/columnManage/index.vue
@@ -14,7 +14,7 @@
更改排序
- 添加栏目
+ 添加栏目
diff --git a/src/pages/information/contentManage/contentList.vue b/src/pages/information/contentManage/contentList.vue
index 8f8f7c1..bfd0abb 100644
--- a/src/pages/information/contentManage/contentList.vue
+++ b/src/pages/information/contentManage/contentList.vue
@@ -6,7 +6,7 @@
保存排序
批量删除
- 新增文章
+ 新增文章
diff --git a/src/pages/match/list/index.vue b/src/pages/match/list/index.vue
index ef0cb32..b9d89aa 100644
--- a/src/pages/match/list/index.vue
+++ b/src/pages/match/list/index.vue
@@ -25,7 +25,7 @@
- 创建竞赛
+ 创建竞赛
diff --git a/src/pages/project/list/index.vue b/src/pages/project/list/index.vue
index da29f8e..8dcf2fa 100644
--- a/src/pages/project/list/index.vue
+++ b/src/pages/project/list/index.vue
@@ -56,7 +56,7 @@
- 新增项目
+ 新增项目
批量删除
diff --git a/src/pages/student/list/index.vue b/src/pages/student/list/index.vue
index 41bb18b..d2de664 100644
--- a/src/pages/student/list/index.vue
+++ b/src/pages/student/list/index.vue
@@ -99,7 +99,7 @@
- 新增学生
+ 新增学生
批量导入
批量删除
diff --git a/src/pages/system/list/role.vue b/src/pages/system/list/role.vue
index 815e994..02f3cac 100644
--- a/src/pages/system/list/role.vue
+++ b/src/pages/system/list/role.vue
@@ -8,7 +8,7 @@
- 新增角色
+ 新增角色
批量删除
diff --git a/src/pages/system/list/staff.vue b/src/pages/system/list/staff.vue
index 704cad2..575c724 100644
--- a/src/pages/system/list/staff.vue
+++ b/src/pages/system/list/staff.vue
@@ -13,7 +13,7 @@
- 新增员工
+ 新增员工
批量导入
批量删除
diff --git a/src/styles/common.scss b/src/styles/common.scss
index 118ff9b..acb436e 100644
--- a/src/styles/common.scss
+++ b/src/styles/common.scss
@@ -33,6 +33,13 @@
border-radius: 4px !important;
}
+.el-button--info.action-btn {
+ color: #fff !important;
+ font-size: 14px !important;
+ background-color: $--color-primary !important;
+ border-radius: 4px !important;
+}
+
.el-input {
.el-input__inner {
border-color: rgba(0, 0, 0, 0.15);
@@ -84,6 +91,10 @@
@extend .action-btn;
}
+ .el-button--info {
+ @extend .action-btn;
+ }
+
&.mul {
margin-bottom: 0;
@@ -253,6 +264,7 @@
background-color: #fae9e8;
}
}
+
}
}
From ed3ddcae85e27c492cc19577ba0e2f328796df0a Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Fri, 5 Nov 2021 11:50:19 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=8A=B6=E6=80=81?=
=?UTF-8?q?=E4=BC=9A=E8=B7=B3=E5=8A=A8bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/pages/assessment/add/index.vue | 4 ++--
src/pages/assessment/list/index.vue | 8 ++++++--
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/src/pages/assessment/add/index.vue b/src/pages/assessment/add/index.vue
index f7f37d1..3800366 100644
--- a/src/pages/assessment/add/index.vue
+++ b/src/pages/assessment/add/index.vue
@@ -311,7 +311,7 @@ export default {
this.allCheckedNodes = this.allCheckedNodes.filter(i => (i.level === 3 && i.id !== tag.id) || (i.level === 4 && i.parentId !== tag.id));
},
handleCheck(data, checked) { // 当复选框被点击的时候触发
- console.log(checked);
+ // console.log(checked);
// 全选和半选状态下的班级都显示在标签
let checkedClass = checked.checkedNodes.filter(i => i.level === 3);
@@ -355,7 +355,7 @@ export default {
i.nodeKey = `${i.id}-${new Date().getTime()}`;
i.leaf = false;
}
- console.log(JSON.stringify(i));
+ // console.log(JSON.stringify(i));
result.push(i);
});
this.$nextTick(() => {
diff --git a/src/pages/assessment/list/index.vue b/src/pages/assessment/list/index.vue
index ed6f420..76a1f3d 100644
--- a/src/pages/assessment/list/index.vue
+++ b/src/pages/assessment/list/index.vue
@@ -90,12 +90,12 @@
-
+
{{ status[scope.row.status] }}
-
+
启动
修改
@@ -252,15 +252,18 @@ export default {
if (item.status === 0 && item.type === 2) { // 待开始-定时发布
item.status = 1;
item.countDown = (new Date(item.stopTime).getTime() - new Date().getTime()) / 1000;
+ console.log(item.countDown);
} else if (item.status === 1) {
item.status = 2;
}
}
+ item.show = true;
this.$set(this.listData, i, item);
}
}, 1000);
},
getData() {
+ this.listData.splice(0);
if (this.ticker) {
clearInterval(this.ticker);
}
@@ -275,6 +278,7 @@ export default {
this.listData = res.list;
this.total = res.total;
this.listData.forEach(i => {
+ i.show = false;
if (i.status === 2) { // 已结束
i.countDown = 0;
} else {
From 6d08208a24e5e48380a67cca8b907590745e161a Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Fri, 5 Nov 2021 12:13:20 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=8A=A0=E5=BF=AB?=
=?UTF-8?q?=E5=80=92=E8=AE=A1=E6=97=B6bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/pages/assessment/list/index.vue | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/pages/assessment/list/index.vue b/src/pages/assessment/list/index.vue
index 76a1f3d..f119be2 100644
--- a/src/pages/assessment/list/index.vue
+++ b/src/pages/assessment/list/index.vue
@@ -5,7 +5,7 @@
-
-
+
{{ item.name }}
@@ -50,7 +50,7 @@
-
+
@@ -191,6 +191,7 @@ export default {
total: 0, // 总数
listData: [], // 表格数据
multipleSelection: [], // 多选
+ listLoading:false,// 列表加载
ticker: null // 倒计时定时器
};
},
@@ -252,7 +253,6 @@ export default {
if (item.status === 0 && item.type === 2) { // 待开始-定时发布
item.status = 1;
item.countDown = (new Date(item.stopTime).getTime() - new Date().getTime()) / 1000;
- console.log(item.countDown);
} else if (item.status === 1) {
item.status = 2;
}
@@ -263,6 +263,7 @@ export default {
}, 1000);
},
getData() {
+ this.listLoading = true;
this.listData.splice(0);
if (this.ticker) {
clearInterval(this.ticker);
@@ -302,8 +303,9 @@ export default {
}
});
this.beginTimer();
+ this.listLoading = false;
}).catch(err => {
- console.log(err);
+ this.listLoading = false;
});
},
initData() {