From 2f3376a2d5568826b0b801fde94bac55499a84e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=98937886381=E2=80=99?= <‘937886381@qq.com’>
Date: Tue, 26 Mar 2024 12:33:47 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/pileBarChart.vue               | 42 +------------------
 src/views/login.vue                           | 12 +++---
 src/views/socialLogin.vue                     |  8 ++--
 3 files changed, 11 insertions(+), 51 deletions(-)

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