diff --git a/src/utils/request.js b/src/utils/request.js index d83a43d..eb90c14 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -19,8 +19,7 @@ request.interceptors.response.use( return result.data; }else{ alert(result.data.message ? result.data.message : "请求失败,请稍后重试!"); - - return Promise.reject(result.data.message); + router.push("/login"); } }, error => { diff --git a/src/views/DeviceList.vue b/src/views/DeviceList.vue index 083d614..c1fab19 100644 --- a/src/views/DeviceList.vue +++ b/src/views/DeviceList.vue @@ -104,6 +104,9 @@ export default { console.error(error); } }, + handleMenuSelect(val) { + router.push(val); + }, toVideoList() { router.push("/videoList"); }, @@ -135,6 +138,22 @@ export default { @@ -110,6 +111,8 @@ const globalData = inject("globalData"); // 创建一个响应式引用来存储定时器ID const intervalId = ref(null); var uuid = ""; + +const qr_status = ref("未被扫描"); //表单数据 var loginData = ref({ username: "", @@ -240,7 +243,6 @@ const getUUID = async () => { const response = await getUUIDService({ device: "windows" }); uuid = response.data.toString(); let uid = uuid.toString(); - console.log("uuid=", uuid); //await creatQrCode(uid); generateQRCode(uuid); } catch (error) { @@ -253,7 +255,7 @@ const getQRStatus = async () => { if (result.code === 0) { if (result.data === "0") { } else if (result.data === "1") { - alert("等待确认"); + qr_status.value="等待确认"; } else { globalData.token = result.data; localStorage.setItem("token", result.data.token); diff --git a/src/views/VideoList.vue b/src/views/VideoList.vue index a96bb55..a8ddfb6 100644 --- a/src/views/VideoList.vue +++ b/src/views/VideoList.vue @@ -55,11 +55,14 @@ export default { console.log("file_size", this.file_sum_size, "len=", len); this.tableData = data; }, - logout(){ + logout() { //退出登录 localStorage.clear(); router.push("/login"); }, + handleMenuSelect(val) { + router.push(val); + }, onSubmit() { getVideoList({ token: token }); }, @@ -128,8 +131,8 @@ export default { var days = 15; var delay_data = { id: id, - option:"one", - ip:this.ip, + option: "one", + ip: this.ip, delay: days, userId: this.tokenData.userId, token: this.tokenData.token, @@ -149,8 +152,8 @@ export default { var days = 15; var delay_data = { id: -1, - option:"all", - ip:this.ip, + option: "all", + ip: this.ip, delay: days, userId: this.tokenData.userId, token: this.tokenData.token, @@ -169,14 +172,14 @@ export default { async getIpClient() { try { const response = await axios.get("https://ipinfo.io/json"); - this.ip=response.data.ip; + this.ip = response.data.ip; localStorage.setItem("ip", this.ip); //console.log(response); } catch (error) { console.error(error); } }, - toDeviceM(){ + toDeviceM() { router.push("/device"); }, // 修改条纹颜色 @@ -194,8 +197,8 @@ export default { // 生命周期钩子会在组件生命周期的各个不同阶段被调用 // 例如这个函数就会在组件挂载完成后被调用 async mounted() { - let now=new Date(); - if (localStorage.getItem("token") === null ) { + let now = new Date(); + if (localStorage.getItem("token") === null) { router.push("/login"); } // console.log("mounted"); @@ -207,6 +210,22 @@ export default {