diff --git a/src/views/OperationalOverview/components/pileBarChart.vue b/src/views/OperationalOverview/components/pileBarChart.vue index f47aa0c1..e985d875 100644 --- a/src/views/OperationalOverview/components/pileBarChart.vue +++ b/src/views/OperationalOverview/components/pileBarChart.vue @@ -1,7 +1,7 @@ @@ -127,46 +127,6 @@ export default { ) : [] }; }); - // let series = [ - // { - // // 辅助系列 - // name: '良品', - // type: 'bar', - // stack: 'total', - // // silent: true, - // // itemStyle: { - // color: '#0fdedb', - // // }, - // // barCategoryGap: '10%', - // barWidth: 10, - // data: passRateList - // }, - // { - // type: 'bar', - // stack: 'total', - // name: '废品', - // // barCategoryGap: '10%', - // data: wasteList, - // // barWidth: 10, - // // barWidth: 15, - // // label: { - // // position: [10, 10], - // // normal: { - // // position: [800, -24], - // // show: true, - // // textStyle: { - // // color: '#2359ec', - // // fontSize: 16, - // // }, - // // }, - // // }, - // } - // ] - // for (i = 0; i < 5; i++) { - // series.push({ - - // }) - // } this.chart.setOption({ legend: { itemWidth: 12, diff --git a/src/views/login.vue b/src/views/login.vue index 61460fa4..83118239 100644 --- a/src/views/login.vue +++ b/src/views/login.vue @@ -297,16 +297,16 @@ export default { this.handleLogin({}); }, getCookie() { - // const username = getUsername(); - // const password = getPassword(); + const username = getUsername(); + const password = getPassword(); const rememberMe = getRememberMe() - // const tenantName = getTenantName(); + const tenantName = getTenantName(); this.loginForm = { ...this.loginForm, - username: this.loginForm.username, - password: this.loginForm.password, + username: username ? username : this.loginForm.username, + password: password ? password : this.loginForm.password, rememberMe: rememberMe ? getRememberMe() : false, - tenantName: this.loginForm.tenantName, + tenantName: tenantName ? tenantName : this.loginForm.tenantName, }; }, handleLogin(captchaParams) { diff --git a/src/views/socialLogin.vue b/src/views/socialLogin.vue index 53b4790e..8d9ffa5b 100644 --- a/src/views/socialLogin.vue +++ b/src/views/socialLogin.vue @@ -140,12 +140,12 @@ export default { this.$refs.verify.show() }, getCookie() { - // const username = getUsername(); - // const password = getPassword(); + const username = getUsername(); + const password = getPassword(); const rememberMe = getRememberMe(); this.loginForm = { - username: this.loginForm.username, - password: this.loginForm.password, + username: username ? username : this.loginForm.username, + password: password ? password : this.loginForm.password, rememberMe: rememberMe ? getRememberMe() : false, loginType: this.loginForm.loginType, };