自动登录

src/pinia/modules/user.js

@@ -5,6 +5,7 @@ import { ElLoading, ElMessage } from 'element-plus'
 import { defineStore } from 'pinia'
 import { ref, computed, watch } from 'vue'
 import { useRouterStore } from './router'
+import { getMachineMac } from "@/api/jixiaoguanli/jitairibaobiao";
 
 export const useUserStore = defineStore('user', () => {
   const loadingInstance = ref(null)
@@ -60,14 +61,13 @@ export const useUserStore = defineStore('user', () => {
 	  console.log(res)
       if (res.code === 0) {
         setUserInfo(res.data.user)
-        setToken(res.data.token)
+        setToken(res.data.token)		
         const routerStore = useRouterStore()
         await routerStore.SetAsyncRouter()
         const asyncRouters = routerStore.asyncRouters
         asyncRouters.forEach(asyncRouter => {
           router.addRoute(asyncRouter)
         })
-
         if (!router.hasRoute(userInfo.value.authority.defaultRouter)) {
           ElMessage.error('请联系管理员进行授权')
         } else {
@@ -75,7 +75,7 @@ export const useUserStore = defineStore('user', () => {
         }
 
         loadingInstance.value.close()
-
+        
         const isWin = ref(/windows/i.test(navigator.userAgent))
         if (isWin.value) {
           window.localStorage.setItem('osType', 'WIN')
@@ -89,7 +89,6 @@ export const useUserStore = defineStore('user', () => {
     }
     loadingInstance.value.close()
   }
-
   const LoginIn2 = async(loginInfo) => {
     loadingInstance.value = ElLoading.service({
       fullscreen: true,
@@ -108,28 +107,80 @@ export const useUserStore = defineStore('user', () => {
         asyncRouters.forEach(asyncRouter => {
           router.addRoute(asyncRouter)
         })
-
-        if (!router.hasRoute(userInfo.value.authority.defaultRouter)) {
-          ElMessage.error('请联系管理员进行授权')
-        } else {
-          await router.replace({ name: userInfo.value.authority.defaultRouter })
+		// A4-B1-C1-D4-74-02
+        const response = await getMachineMac({ addr:MAC});
+        console.log(response)
+        if(response.data===null){
+        	ElMessage.error('请输入账号密码')
+        }else{
+		if (!router.hasRoute(userInfo.value.authority.defaultRouter)) {
+		  ElMessage.error('请联系管理员进行授权')
+		} else {
+		  await router.replace({ name: userInfo.value.authority.defaultRouter })
+		}
+		
+		loadingInstance.value.close()
+		
+		const isWin = ref(/windows/i.test(navigator.userAgent))
+		if (isWin.value) {
+		  window.localStorage.setItem('osType', 'WIN')
+		} else {
+		  window.localStorage.setItem('osType', 'MAC')
+		}
+		
+		return true;
         }
-
-        loadingInstance.value.close()
-
-        const isWin = ref(/windows/i.test(navigator.userAgent))
-        if (isWin.value) {
-          window.localStorage.setItem('osType', 'WIN')
-        } else {
-          window.localStorage.setItem('osType', 'MAC')
-        }
-        return true
       }
     } catch (e) {
       loadingInstance.value.close()
     }
     loadingInstance.value.close()
   }
+  
+let MAC=ref()
+const GetAddr = () => {
+var xmlhttp = null;
+var res;
+if (window.XMLHttpRequest) {
+  xmlhttp = new XMLHttpRequest();
+} else if (window.ActiveXObject) {
+  xmlhttp = new ActiveXObject("Microsoft.XMLHTTP");
+}
+// 设置回调函数
+xmlhttp.onreadystatechange = function () {
+  if (xmlhttp.readyState == 4 && xmlhttp.status == 200) {
+	res = eval("(" + xmlhttp.response + ")");
+	let result = "";
+	for (let i = 0; i < res.macAddress.length; i++) {
+	  if (i % 2 === 0 && i !== 0) {
+		result += "-"; // 根据实际需求修改分隔符
+	  }
+	  result += res.macAddress[i];
+	}
+	MAC=result
+	// console.log(result);
+  // 68-ED-A4-26-5F-37
+  }
+};
+// 打开一个连接
+xmlhttp.open("get", "http://127.0.0.1:8090/init");
+// 发送请求
+xmlhttp.send();
+};
+GetAddr()  
+
+  
+const GetMachineMac = async (addr) => {
+const response = await getMachineMac({ addr: '68-ED-A4-26-5F-37' });
+console.log(response)
+if(response.data===null){
+	LoginOut()
+}else{
+	
+}
+// console.log(loginFormData2)
+}
+  
   /* 登出*/
   const LoginOut = async() => {
     const res = await jsonInBlacklist()
@@ -139,6 +190,7 @@ export const useUserStore = defineStore('user', () => {
       localStorage.clear()
       router.push({ name: 'Login', replace: true })
       window.location.reload()
+	  
     }
   }
   /* 清理数据 */

src/view/job/rewards/rewards.vue

@@ -59,6 +59,16 @@
                   icon="search"
                   @click="onSubmit"
                 >查询</el-button>
+				<el-button
+				  type="primary"
+				  icon="search"
+				  @click="onAdd"
+				>新增</el-button>
+				<el-button
+				  type="primary"
+				  icon="search"
+				  @click="onDel"
+				>删除</el-button>
                 <el-button
                   icon="refresh"
                   @click="onReset"

src/view/login/index.vue

@@ -122,6 +122,10 @@ import { reactive, ref } from "vue";
 import { ElMessage } from "element-plus";
 import { useRouter } from "vue-router";
 import { useUserStore } from "@/pinia/modules/user";
+import { getMachineMac } from "@/api/jixiaoguanli/jitairibaobiao";
+
+
+
 
 defineOptions({
   name: "Login",
@@ -240,19 +244,7 @@ const GetAddr = () => {
         }
         result += res.macAddress[i];
       }
-      console.log(result);
-	  if(result==='A4-B1-C1-D4-74-02'){
-		  userStore.LoginIn2({
-		    username: "JY01#",
-		    password: "123456",
-		    captcha: "443188",
-		    captchaId: "0FZfnUtAOrdXvTETkJRc",
-		    openCaptcha: false,
-		  });
-	  }else{
-		  
-	  }
-	  
+	   
     }
   };
   // 打开一个连接
@@ -260,27 +252,35 @@ const GetAddr = () => {
   // 发送请求
   xmlhttp.send();
 };
-
 // 在页面加载时获取MAC地址并进行自动登录
-GetAddr();
+// GetAddr();
+
 
+// const GetMachineMac = async (addr) => {
+// 	const response = await getMachineMac({ addr: '68-ED-A4-26-5F-37' });
+// 	console.log(response)
+// 	if (response.code === 0) {	
+// 		cosole.log(response.data['设备编号'])
+// 		// userStore.LoginIn2({
+// 		//   username: response.data['设备编号'],
+// 		//   password: "123456",
+// 		//   captcha: "443188",
+// 		//   captchaId: "0FZfnUtAOrdXvTETkJRc",
+// 		//   openCaptcha: false,
+// 		// });
+// 	}
+// 	// console.log(loginFormData2)
+// }
 
 
-const formdata=ref({
-	username: "JY01#",
-	password: "123456",
-	captcha: "443188",
-	captchaId: "0FZfnUtAOrdXvTETkJRc",
-	openCaptcha: false,
-})
 
-// userStore.LoginIn2({
-//   username: "JY01#",
-//   password: "123456",
-//   captcha: "443188",
-//   captchaId: "0FZfnUtAOrdXvTETkJRc",
-//   openCaptcha: false,
-// });
+userStore.LoginIn2({
+	   username: "admin",
+	   password: "123456",
+	   captcha: "443188",
+	   captchaId: "0FZfnUtAOrdXvTETkJRc",
+	   openCaptcha: false,	   
+	 }); 	
 </script>