From 3ad4f9c04e402f76a0aacb01e16c89601f995f87 Mon Sep 17 00:00:00 2001
From: junleea <354425203@qq.com>
Date: Fri, 14 Jun 2024 11:15:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=8E=B7=E5=8F=96=E9=AA=8C?=
 =?UTF-8?q?=E8=AF=81=E7=A0=81=E5=8F=8A=E9=94=99=E8=AF=AF=E7=A0=81=E8=B7=B3?=
 =?UTF-8?q?=E8=BD=AC=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/request.js     | 11 ++++----
 src/views/DeviceList.vue | 55 +++++++++++++++++++++-------------------
 src/views/Login.vue      | 15 ++++++-----
 src/views/VideoList.vue  | 22 +++++-----------
 4 files changed, 49 insertions(+), 54 deletions(-)

diff --git a/src/utils/request.js b/src/utils/request.js
index eb90c14..c585237 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -11,15 +11,16 @@ request.interceptors.response.use(
         if(result.status!==200 ){
             router.push("/login")
         }
-        if(result.data.message==="NOT_LOGIN" || result.data.message.includes("The Token has expired on") || result.data.code ===3 ||result.data.code ===4){
+        if(result.data.message==="NOT_LOGIN"||result.data.code==2 || result.data.code ===3 ||result.data.code ===4){
+            alert("登录失效，请重新登录！")
             localStorage.removeItem("token");
             router.push("/login")
+            return
         }
-        if(result.data.code===0){
-            return result.data;
+        if(result.data.code == 1){
+            alert("请求失败，请稍后重试！");
         }else{
-            alert(result.data.message ? result.data.message : "请求失败，请稍后重试！");
-            router.push("/login");
+            return result.data
         }
     },
     error => {
diff --git a/src/views/DeviceList.vue b/src/views/DeviceList.vue
index c1fab19..7c81116 100644
--- a/src/views/DeviceList.vue
+++ b/src/views/DeviceList.vue
@@ -34,15 +34,15 @@ export default {
         console.log(e);
       }
       let data = result.data;
-      
-    //   for(let d in data){
-    //     let res = JSON.parse(d);
-    //     console.log("res=",res);
-    //     this.tableData.push(res);
-    //   }
-    //   console.log(this.tableData);
 
-      this.tableData=data;
+      //   for(let d in data){
+      //     let res = JSON.parse(d);
+      //     console.log("res=",res);
+      //     this.tableData.push(res);
+      //   }
+      //   console.log(this.tableData);
+
+      this.tableData = data;
     },
     onSubmit() {
       getDeviceList({ token: token });
@@ -138,22 +138,18 @@ export default {
 
 <template>
   <div>
-      <el-menu
-    default-active="2"
-    class="el-menu-vertical-demo"
-    background-color="#545c64"
-    text-color="#fff"
-    active-text-color="#ffd04b"
-    mode="vertical"
-    @select="handleMenuSelect"
-  >
-    <el-menu-item index="/videoList">
-      <template>视频列表</template>
-    </el-menu-item>
-    <el-menu-item index="/device">
-      <template>设备管理</template>
-    </el-menu-item>
-  </el-menu>
+    <el-button
+      type="primary"
+      size="mini"
+      @click.prevent="handleMenuSelect('/videoList')"
+      >视频列表</el-button
+    >
+    <el-button
+      type="primary"
+      size="mini"
+      @click.prevent="handleMenuSelect('/device')"
+      >设备管理</el-button
+    >
     <el-container style="height: 700px; border: 1px solid #eee">
       <el-header style="font-size: 40px; background-color: rgb(238, 241, 246)"
         >监控设备列表</el-header
@@ -163,13 +159,20 @@ export default {
           <!-- 表单 -->
           <el-form :inline="true" :model="tokenData" class="demo-form-inline">
             <el-form-item>
-              <el-button class="el-button--danger" type="primary" @click="getDeviceList()">查询</el-button>
+              <el-button
+                class="el-button--danger"
+                type="primary"
+                @click="getDeviceList()"
+                >查询</el-button
+              >
             </el-form-item>
             <el-form-item>
               <el-button type="primary" @click="logout()">退出登录</el-button>
             </el-form-item>
             <el-form-item>
-              <el-button type="primary" @click="toVideoList()">返回监控视频</el-button>
+              <el-button type="primary" @click="toVideoList()"
+                >返回监控视频</el-button
+              >
             </el-form-item>
             <el-form-item>
               <el-button type="primary" @click="restartAllDevice('all')"
diff --git a/src/views/Login.vue b/src/views/Login.vue
index a9f5e60..1938564 100644
--- a/src/views/Login.vue
+++ b/src/views/Login.vue
@@ -170,7 +170,7 @@ const startInterval = () => {
     // 如果定时器已经开启，则不执行任何操作  
     return;  
   }  
-  intervalId.value = setInterval(getQRStatus, 1000);  
+  intervalId.value = setInterval(getQRStatus, 2000);  
 };
 
 // 关闭定时器  
@@ -240,7 +240,7 @@ const generateQRCode = () => {
 
 const getUUID = async () => {
   try {
-    const response = await getUUIDService({ device: "windows" });
+    const response = await getUUIDService({ device: "windows" ,"address": localStorage.getItem("address"),"ip": localStorage.getItem("ip")});
     uuid = response.data.toString();
     let uid = uuid.toString();
     //await creatQrCode(uid);
@@ -273,10 +273,11 @@ const getQRStatus = async () => {
 
 const getIpClient = async () => {
   try {
-    const response = await axios.get("https://ipinfo.io/json");
-    loginData.value.ip = response.data.ip;
-    localStorage.setItem("ip", response.data.ip);
-    localStorage.setItem("city", response.data.city);
+    const response = await axios.get("https://ip.zxinc.org/api.php?type=json");
+    loginData.value.ip = response.data.data.myip;
+    localStorage.setItem("ip", response.data.data.myip);
+    localStorage.setItem("city", response.data.data.country);
+    localStorage.setItem("address", response.data.data.location);
     // console.log("ip:",response.data.ip);
     // console.log("login ip:",loginData.ip);
     // console.log(response.data);
@@ -287,7 +288,7 @@ const getIpClient = async () => {
 };
 const init = async () => {
   getIpClient();
-  getUUID();
+  await getUUID();
 };
 const register = async () => {
   let result = registerService(registerData.value);
diff --git a/src/views/VideoList.vue b/src/views/VideoList.vue
index a8ddfb6..bdc22a4 100644
--- a/src/views/VideoList.vue
+++ b/src/views/VideoList.vue
@@ -210,22 +210,12 @@ export default {
 
 <template>
   <div>
-      <el-menu
-    default-active="2"
-    class="el-menu-vertical-demo"
-    background-color="#545c64"
-    text-color="#fff"
-    active-text-color="#ffd04b"
-    mode="vertical"
-    @select="handleMenuSelect"
-  >
-    <el-menu-item index="/videoList">
-      <template>视频列表</template>
-    </el-menu-item>
-    <el-menu-item index="/device">
-      <template>设备管理</template>
-    </el-menu-item>
-  </el-menu>
+    <el-button type="primary" size="mini" @click.prevent="handleMenuSelect('/videoList')"
+      >视频列表</el-button
+    >
+    <el-button type="primary" size="mini" @click.prevent="handleMenuSelect('/device')"
+      >设备管理</el-button
+    >
     <el-container style="height: 700px; border: 1px solid #eee">
       <el-header style="font-size: 40px; background-color: rgb(238, 241, 246)"
         >监控视频列表</el-header