上传代码

src/views/HomeView.vue

@@ -24,10 +24,9 @@
 				<div class="center-line" style="margin-top: 40px;">
 					<!-- logo -->
 					<div class="logo">
-						<div class="center-justify" style="height: 80px; width: 300px;">
-							<!-- <img style="margin-right: 20px;height: 100%;" src="@/assets/logo.png"> -->
+						<!-- <div class="center-justify" style="height: 80px; width: 300px;">
 							<img style="height: 100%;" src="@/assets/logotext.png">
-						</div>
+						</div> -->
 					</div>
 
 					<!-- From -->
@@ -38,6 +37,7 @@
 
 						<div class="from-input">
 							<el-form label-position="left" label-width="100px" :model="formData">
+								
 								<div class="from-input-item1">
 									<img src="@/assets/username.png" alt="">
 									<el-input style="height: 25px;" v-model="formData.tenantName" placeholder="租户名称"
@@ -74,7 +74,7 @@
 <script setup>
 import { ref, reactive, onMounted } from 'vue';
 import { useRouter } from 'vue-router';
-import { login, getIdByName } from '@/api/account';
+import { login, rentgetloginID } from '@/api/account';
 import { getToken, setToken, setUser, setUserPass, getUserPass } from '@/utils/storage';
 import { ElLoading } from 'element-plus';
 import { usePythonBridge } from '@/utils/pythonBridge'
@@ -82,16 +82,39 @@ import { usePythonBridge } from '@/utils/pythonBridge'
 
 const { getVersion } = usePythonBridge();
 let version = ref('0.0.0');
+
+// 测试 localStorage
+const testLocalStorage = () => {
+  try {
+    // 尝试设置一个测试项
+    localStorage.setItem('testKey', 'testValue');
+    // 尝试获取这个测试项
+    const testValue = localStorage.getItem('testKey');
+    if (testValue === 'testValue') {
+    } else {
+      console.error('localStorage is not working');
+      ElMessage.error('localStorage 被禁用');
+    }
+  } catch (error) {
+    console.error('localStorage is not available:', error);
+    ElMessage.error('localStorage 不可用');
+  }
+};
+
 onMounted(() => {
+
 	setTimeout(() => {
 		getVersion().then((res) => {
 			version.value = res;
 		})
+		// 测试localStorage;
+		testLocalStorage();
 	}, 500);
 
 })
 
 
+
 const router = useRouter();
 
 const formData = ref({
@@ -109,11 +132,14 @@ const onSubmit = () => {
 		background: 'rgba(0, 0, 0, 0.7)',
 	});
 	setUserPass(formData.value);
-	getIdByName(formData.value.tenantName).then((tenantId) => {
-		console.log(tenantId)
+	rentgetloginID({
+		name: formData.value.tenantName,
+	}).then((res) => {
+		console.log(res);
+
 		login({
-			tenantId: Number(tenantId),
 			username: formData.value.userId,
+			tenantId: res,
 			password: formData.value.password,
 		}).then((res) => {
 			loading.close();
@@ -124,9 +150,11 @@ const onSubmit = () => {
 		}).catch((err) => {
 			loading.close();
 		});
-	})
-
 
+	}).catch((err) => {
+		loading.close();
+		console.log(err)
+	});
 };
 </script>
 
@@ -203,6 +231,7 @@ const onSubmit = () => {
 
 			.logo {
 				padding: 20px 0;
+				height: 80px;
 			}
 
 			.from {