projects/mesxc-zhp
into projects/mesxc-test
5 months ago
@@ -1,7 +1,7 @@ | |||||
<!-- | <!-- | ||||
* @Author: zhp | * @Author: zhp | ||||
* @Date: 2023-12-27 13:54:52 | * @Date: 2023-12-27 13:54:52 | ||||
* @LastEditTime: 2024-03-26 10:46:47 | |||||
* @LastEditTime: 2024-03-26 10:50:30 | |||||
* @LastEditors: zhp | * @LastEditors: zhp | ||||
* @Description: | * @Description: | ||||
--> | --> | ||||
@@ -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({ | this.chart.setOption({ | ||||
legend: { | legend: { | ||||
itemWidth: 12, | itemWidth: 12, | ||||
@@ -297,16 +297,16 @@ export default { | |||||
this.handleLogin({}); | this.handleLogin({}); | ||||
}, | }, | ||||
getCookie() { | getCookie() { | ||||
// const username = getUsername(); | |||||
// const password = getPassword(); | |||||
const username = getUsername(); | |||||
const password = getPassword(); | |||||
const rememberMe = getRememberMe() | const rememberMe = getRememberMe() | ||||
// const tenantName = getTenantName(); | |||||
const tenantName = getTenantName(); | |||||
this.loginForm = { | this.loginForm = { | ||||
...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, | rememberMe: rememberMe ? getRememberMe() : false, | ||||
tenantName: this.loginForm.tenantName, | |||||
tenantName: tenantName ? tenantName : this.loginForm.tenantName, | |||||
}; | }; | ||||
}, | }, | ||||
handleLogin(captchaParams) { | handleLogin(captchaParams) { | ||||
@@ -140,12 +140,12 @@ export default { | |||||
this.$refs.verify.show() | this.$refs.verify.show() | ||||
}, | }, | ||||
getCookie() { | getCookie() { | ||||
// const username = getUsername(); | |||||
// const password = getPassword(); | |||||
const username = getUsername(); | |||||
const password = getPassword(); | |||||
const rememberMe = getRememberMe(); | const rememberMe = getRememberMe(); | ||||
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, | rememberMe: rememberMe ? getRememberMe() : false, | ||||
loginType: this.loginForm.loginType, | loginType: this.loginForm.loginType, | ||||
}; | }; | ||||