mt-fe-group/yudao-dev
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request 'projects/mesxc-zhp' (#276) from projects/mesxc-zhp into projects/mesxc-test

Browse Source 
Reviewed-on: #276
This commit is contained in:
朱菊兰 2024-03-26 13:43:38 +08:00
commit 9d6ee5c158
3 changed files with 11 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/views/OperationalOverview/components/pileBarChart.vue
View File

@ -1,7 +1,7 @@
<!--
* @Author: zhp
* @Date: 2023-12-27 13:54:52
* @LastEditTime: 2024-03-26 10:46:47
* @LastEditTime: 2024-03-26 10:50:30
* @LastEditors: zhp
* @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({
legend: {
itemWidth: 12,

12
src/views/login.vue
View File

@ -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) {

8
src/views/socialLogin.vue
View File

@ -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,
};