From 9e5a041508e57e0987ec0d39d3092855e884b8f2 Mon Sep 17 00:00:00 2001 From: "jialong.yu" Date: Tue, 28 Dec 2021 09:21:50 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=8C=89=E9=92=AEhover?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/TestPanel.vue | 7 ++++--- src/styles/theme/theme10.scss | 2 +- src/styles/theme/theme4.scss | 2 +- src/styles/theme/theme5.scss | 2 +- src/styles/theme/theme6.scss | 2 +- src/styles/theme/theme7.scss | 2 +- src/styles/theme/theme8.scss | 2 +- src/styles/theme/theme9.scss | 2 +- 8 files changed, 11 insertions(+), 10 deletions(-) diff --git a/src/components/TestPanel.vue b/src/components/TestPanel.vue index f96c19c..afda6f4 100644 --- a/src/components/TestPanel.vue +++ b/src/components/TestPanel.vue @@ -265,6 +265,7 @@ export default { }, 1500) } }) + // 如果该考核没有提交过,则取获取项目列表进行考核 if (!done) { this.getList().then(() => { this.getCache() @@ -273,8 +274,6 @@ export default { this.statusTimer = setInterval(_ => { this.getStatus() }, 1000) - } else { - this.closeLoad() } }).catch(res => {}) }, @@ -327,7 +326,9 @@ export default { }).then(res => {}).catch(() => {}) }) } - }).catch(res => {}) + }).catch(res => { + this.closeLoad() + }) }, // 定时查询考核状态(只有考核才需要定时查,查到考核如果结束后,直接提交考核) getStatus() { diff --git a/src/styles/theme/theme10.scss b/src/styles/theme/theme10.scss index 2755b22..064de54 100644 --- a/src/styles/theme/theme10.scss +++ b/src/styles/theme/theme10.scss @@ -26,7 +26,7 @@ $--font-path: '~element-ui/lib/theme-chalk/fonts'; color: $--color-primary; } .submit { - background: $--color-primary url(../../assets/images/system/10/btn.png) 0 0/100% 100% no-repeat; + background: $--color-primary url(../../assets/images/system/10/btn.png) 0 0/100% 100% no-repeat !important; } .el-table th { background-color: $--color-primary !important; diff --git a/src/styles/theme/theme4.scss b/src/styles/theme/theme4.scss index 47bc594..364d2ef 100644 --- a/src/styles/theme/theme4.scss +++ b/src/styles/theme/theme4.scss @@ -26,7 +26,7 @@ $--font-path: '~element-ui/lib/theme-chalk/fonts'; color: $--color-primary; } .submit { - background: $--color-primary url(../../assets/images/system/4/btn.png) 0 0/100% 100% no-repeat; + background: $--color-primary url(../../assets/images/system/4/btn.png) 0 0/100% 100% no-repeat !important; } .el-table th { background-color: $--color-primary !important; diff --git a/src/styles/theme/theme5.scss b/src/styles/theme/theme5.scss index 2b3ef36..21ac56d 100644 --- a/src/styles/theme/theme5.scss +++ b/src/styles/theme/theme5.scss @@ -26,7 +26,7 @@ $--font-path: '~element-ui/lib/theme-chalk/fonts'; color: $--color-primary; } .submit { - background: $--color-primary url(../../assets/images/system/5/btn.png) 0 0/100% 100% no-repeat; + background: $--color-primary url(../../assets/images/system/5/btn.png) 0 0/100% 100% no-repeat !important; } .el-table { th { diff --git a/src/styles/theme/theme6.scss b/src/styles/theme/theme6.scss index 8697693..130ee52 100644 --- a/src/styles/theme/theme6.scss +++ b/src/styles/theme/theme6.scss @@ -26,7 +26,7 @@ $--font-path: '~element-ui/lib/theme-chalk/fonts'; color: $--color-primary; } .submit { - background: $--color-primary url(../../assets/images/system/6/btn.png) 0 0/100% 100% no-repeat; + background: $--color-primary url(../../assets/images/system/6/btn.png) 0 0/100% 100% no-repeat !important; } .el-table { th { diff --git a/src/styles/theme/theme7.scss b/src/styles/theme/theme7.scss index 80f4fe6..2379c91 100644 --- a/src/styles/theme/theme7.scss +++ b/src/styles/theme/theme7.scss @@ -26,7 +26,7 @@ $--font-path: '~element-ui/lib/theme-chalk/fonts'; color: $--color-primary; } .submit { - background: $--color-primary url(../../assets/images/system/7/btn.png) 0 0/100% 100% no-repeat; + background: $--color-primary url(../../assets/images/system/7/btn.png) 0 0/100% 100% no-repeat !important; } .el-table { th { diff --git a/src/styles/theme/theme8.scss b/src/styles/theme/theme8.scss index b6df034..8bbf6f5 100644 --- a/src/styles/theme/theme8.scss +++ b/src/styles/theme/theme8.scss @@ -26,7 +26,7 @@ $--font-path: '~element-ui/lib/theme-chalk/fonts'; color: $--color-primary; } .submit { - background: $--color-primary url(../../assets/images/system/8/btn.png) 0 0/100% 100% no-repeat; + background: $--color-primary url(../../assets/images/system/8/btn.png) 0 0/100% 100% no-repeat !important; } .el-table { th { diff --git a/src/styles/theme/theme9.scss b/src/styles/theme/theme9.scss index d363096..f94cc57 100644 --- a/src/styles/theme/theme9.scss +++ b/src/styles/theme/theme9.scss @@ -26,7 +26,7 @@ $--font-path: '~element-ui/lib/theme-chalk/fonts'; color: $--color-primary; } .submit { - background: $--color-primary url(../../assets/images/system/9/btn.png) 0 0/100% 100% no-repeat; + background: $--color-primary url(../../assets/images/system/9/btn.png) 0 0/100% 100% no-repeat !important; } .el-table { th {