diff --git a/src/api/configz.js b/src/api/configz.js index c8aec5ad..165fb064 100644 --- a/src/api/configz.js +++ b/src/api/configz.js @@ -25,7 +25,6 @@ http.interceptors.request.use( config.headers.token = token; //测试1111 } else{ message.error('未获取到登录信息,请先登录') - return window.location.href='https://u-pre.boe.com/web/'; } return config; }, @@ -50,7 +49,6 @@ http.interceptors.response.use( } if(code==601){ message.error('token过期请重新登陆'); - return window.location.href='https://u-pre.boe.com/web/'; } if (code === 1000) { (process.env.NODE_ENV === 'development' || process.env.NODE_ENV === 'alpine') ? router.push({path: 'login'}) : (window.location.href = process.env.VUE_APP_LOGIN_URL) diff --git a/src/views/report/Employeelearning.vue b/src/views/report/Employeelearning.vue index a2febd14..1b565bcc 100644 --- a/src/views/report/Employeelearning.vue +++ b/src/views/report/Employeelearning.vue @@ -56,11 +56,11 @@
-
+
导出全部
-
+
导出
@@ -449,10 +449,14 @@ export default { } .btn2 { + background: #4ea6ff; .search { width: 16px; height: 18px; - background-image: url("../../assets/images/courseManage/reset1.png"); + background-image: url("../../assets/images/courseManage/reset0.png"); + } + .btnText{ + color: #ffffff; } } @@ -473,11 +477,11 @@ export default { } .btn2:hover { - background: rgba(64, 158, 255, 0.1); + background: rgba(64, 158, 255, 0.76); } .btn2:active { - background: rgba(64, 158, 255, 0.2); + background: #0982ff; } } .tableBox { @@ -519,22 +523,25 @@ export default { .btn3 { margin-right: 0px; - + background: #4ea6ff; .search { width: 17px; height: 18px; background-image: url("../../assets/images/courseManage/add0.png"); } + .btnText { + color: #ffffff; + } } .btn3:hover { // background: rgba(64, 158, 255, 0.76); - background: rgba(64, 158, 255, 0.2); + background: rgba(64, 158, 255, 0.76); } - // .btn3:active { - // background: #0982ff; - // } + .btn3:active { + background: #0982ff; + } } .tableBox { diff --git a/src/views/report/Learningpathmap.vue b/src/views/report/Learningpathmap.vue index 5bb10d79..97f70a64 100644 --- a/src/views/report/Learningpathmap.vue +++ b/src/views/report/Learningpathmap.vue @@ -51,11 +51,11 @@
-
+
导出列表信息
-
+
导出详细信息
@@ -369,12 +369,15 @@ export default { .btn3 { margin-right: 0px; - + background: #4ea6ff; .search { width: 17px; height: 18px; background-image: url("../../assets/images/courseManage/add0.png"); } + .btnText { + color: #ffffff; + } } .btn3:hover { diff --git a/src/views/report/Overvoew.vue b/src/views/report/Overvoew.vue index 07355a4d..f00cb183 100644 --- a/src/views/report/Overvoew.vue +++ b/src/views/report/Overvoew.vue @@ -62,13 +62,19 @@ style="margin-right: 15px" >
- +
全部导出
- +
导出
@@ -485,7 +491,7 @@ export default { axios({ method: "post", url: "/report/boeu/project/exportAll", - data:{ + data: { name: state.name, organizationId: state.orgId, createName: state.creator, @@ -1430,10 +1436,15 @@ export default { .btn2 { margin-right: 0px !important; + background: #4ea6ff; .search { width: 16px; height: 18px; - background-image: url("../../assets/images/courseManage/reset1.png"); + + background-image: url("../../assets/images/courseManage/reset0.png"); + } + .btnText { + color: white; } } @@ -1448,18 +1459,29 @@ export default { color: #ffffff; } } + .btn2:hover { + background: rgba(64, 158, 255, 0.76); - .btn1:active { + .search { + background-image: url("../../assets/images/courseManage/reset0.png"); + } + + .btnText { + color: #ffffff; + } + } + .btn1:active, + .btn2:active { background: #0982ff; } - .btn2:hover { - background: rgba(64, 158, 255, 0.1); - } + // .btn2:hover { + // background: rgba(64, 158, 255, 0.1); + // } - .btn2:active { - background: rgba(64, 158, 255, 0.2); - } + // .btn2:active { + // background: rgba(64, 158, 255, 0.2); + // } } .tabBtn { width: 100%; @@ -1519,16 +1541,20 @@ export default { .btn3 { margin-right: 0px; + background: #4ea6ff; .search { width: 17px; height: 18px; background-image: url("../../assets/images/courseManage/add0.png"); } + .btnText { + color: #ffffff; + } } .btn3:hover { // background: rgba(64, 158, 255, 0.76); - background: rgba(64, 158, 255, 0.2); + background: rgba(64, 158, 255, 0.76); } } }