diff --git a/src/pages/index/index.js b/src/pages/index/index.js index f61a7a44..cac83173 100644 --- a/src/pages/index/index.js +++ b/src/pages/index/index.js @@ -114,7 +114,7 @@ if (COMPANY == 'xingxuan') { } -function 沙悟净(data, sn) { +function handler(data, sn) { console.log(data, 'dllmhjc'); window._paq.push(['trackEvent', '点击', '登录', '登录账号']) axios.defaults.headers.common['Authorization'] = 'Bearer' + ' ' + data.token @@ -234,19 +234,19 @@ router.beforeEach((to, form, next) => { const direction = to.query.direction if (direction) { const info = JSON.parse(decode(direction)) - const 孙悟空 = { account: info.acount, password: info.pwd } + const account = { account: info.acount, password: info.pwd } - const 猪八戒 = res => { - 沙悟净(res.result, info.projectSn) + const tentative = res => { + handler(res.result, info.projectSn) return next({ path: to.path }) } if (LOGINTYPE == 1) { - loginApi(孙悟空).then(猪八戒) + loginApi(account).then(tentative) } else if (LOGINTYPE == 2) { - companyLoginApi(孙悟空).then(猪八戒) + companyLoginApi(account).then(tentative) } else if (LOGINTYPE == 3) { - projectLoginApi(孙悟空).then(猪八戒) + projectLoginApi(account).then(tentative) } } else { diff --git a/src/views/projectAdmin/zjsj/command/center.vue b/src/views/projectAdmin/zjsj/command/center.vue index 37313fc7..50ef48b8 100644 --- a/src/views/projectAdmin/zjsj/command/center.vue +++ b/src/views/projectAdmin/zjsj/command/center.vue @@ -102,6 +102,7 @@ export default { font-weight: bold; .label { margin-right: 10px; + white-space: nowrap; color: #002636; } diff --git a/src/views/projectAdmin/zjsj/command/leftFour.vue b/src/views/projectAdmin/zjsj/command/leftFour.vue index 236eef0d..90f9de73 100644 --- a/src/views/projectAdmin/zjsj/command/leftFour.vue +++ b/src/views/projectAdmin/zjsj/command/leftFour.vue @@ -342,24 +342,23 @@ export default { width: 100%; height: 100%; white-space: nowrap; - // transform: translateY(-15px); .item { display: inline-block; width: calc(100% / 2); - height: 100%; + height: 120%; color: transparent; &:nth-child(1) { - transform: translate(-24%, 0%); + transform: translate(-24%, -6%); } &:nth-child(2) { - transform: translate(-48%, 0%); + transform: translate(-48%, -6%); } &:nth-child(3) { - transform: translate(-75%, 0%); + transform: translate(-75%, -6%); } } } diff --git a/src/views/projectAdmin/zjsj/command/rightFour.vue b/src/views/projectAdmin/zjsj/command/rightFour.vue index 2f1daf5f..1fa3dfa6 100644 --- a/src/views/projectAdmin/zjsj/command/rightFour.vue +++ b/src/views/projectAdmin/zjsj/command/rightFour.vue @@ -99,7 +99,7 @@ export default { box-sizing: border-box; border-left: 4px solid #66d3d8; margin-bottom: 5px; - padding: 6px 0; + padding: 10px 0; width: 100%; background-image: linear-gradient(to right, #3b7589, #212c3e); font-size: 12px; diff --git a/src/views/projectAdmin/zjsj/command/rightThree.vue b/src/views/projectAdmin/zjsj/command/rightThree.vue index 7a8ec834..fc8db1da 100644 --- a/src/views/projectAdmin/zjsj/command/rightThree.vue +++ b/src/views/projectAdmin/zjsj/command/rightThree.vue @@ -15,7 +15,7 @@