From 0c779fb73aa2906abc8a5da3e84efe2cd971b789 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Wed, 16 Oct 2024 16:33:04 +0800
Subject: [PATCH] 页面加载后不显示结果
---
src/main.js | 7 +++----
src/utils/store.js | 25 +++++++++++++++++++++++++
src/views/device/addDevice.vue | 23 +++++++++++++++--------
3 files changed, 43 insertions(+), 12 deletions(-)
diff --git a/src/main.js b/src/main.js
index 613ae32..1095a5b 100644
--- a/src/main.js
+++ b/src/main.js
@@ -32,7 +32,8 @@
// 获取url中是否存在token
const urlParams = getUrlParams(window.location.href)
-if (urlParams?.token) {
+if (urlParams?.token && !localStorage.getItem("isReload")) {
+ localStorage.setItem("isReload", true)
// 设置cookie和localStorage
setStore('saber-token', urlParams.token)
setToken(urlParams.token)
@@ -46,9 +47,7 @@
obj = JSON.parse(obj).content
}
setStore({ name: 'userInfo', content: obj });
- router.push({
- path: '/login'
- })
+ location.reload()
}
diff --git a/src/utils/store.js b/src/utils/store.js
index d007dc9..b664d93 100644
--- a/src/utils/store.js
+++ b/src/utils/store.js
@@ -17,6 +17,31 @@
if (type) window.sessionStorage.setItem(name, JSON.stringify(obj));
else window.localStorage.setItem(name, JSON.stringify(obj));
};
+
+/**
+ * 存储localStorage
+ */
+export const setStoreSync = (params = {}) => {
+ return new Promise((resolve, reject) => {
+ let { name, content, type } = params;
+ name = keyName + name;
+ let obj = {
+ dataType: typeof content,
+ content: content,
+ type: type,
+ datetime: new Date().getTime(),
+ };
+ if (type) window.sessionStorage.setItem(name, JSON.stringify(obj));
+ else window.localStorage.setItem(name, JSON.stringify(obj));
+
+ let timer = setTimeout(() => {
+ resolve(true)
+ clearTimeout(timer)
+ }, 500)
+ })
+};
+
+
/**
* 获取localStorage
*/
diff --git a/src/views/device/addDevice.vue b/src/views/device/addDevice.vue
index 9f28bb9..224ed67 100644
--- a/src/views/device/addDevice.vue
+++ b/src/views/device/addDevice.vue
@@ -4,7 +4,7 @@
v-model="form" :permission="permissionList" @row-update="rowUpdate" @row-save="rowSave"
:before-open="beforeOpen" @search-change="searchChange" @search-reset="searchReset"
@selection-change="selectionChange" @current-change="currentChange" @size-change="sizeChange"
- @refresh-change="refreshChange" @on-load="onLoad" @tree-load="treeLoad">
+ @refresh-change="refreshChange" @on-load="onLoad">
<template #menu="scope">
<el-button type="primary" text icon="el-icon-copy-document" @click.stop="copyInfo(scope.row, scope.index)"
@@ -204,7 +204,14 @@
methods: {
copyInfo(row, index) {
- let params = `host: tcp://139.196.74.78:1883 账号：drone 密码：123456 组织id：${row.bing_id} 设备码：${row.bind_code} 机场名称：${row.workspace_name} aircrattName：${row.workspace_desc}`;
+ let params = `
+ host: tcp://139.196.74.78:1883
+ 账号：drone
+ 密码：123456
+ 组织id：${row.bing_id}
+ 设备码：${row.bind_code}
+ 机场名称：${row.workspace_name}
+ aircrattName：${row.workspace_desc}`;
$Clipboard({
text: params,
}).then(() => {
@@ -346,12 +353,12 @@
getList(page.currentPage, page.pageSize, values).then(res => {
const data = res.data.data;
this.page.total = data.total;
- data.records.forEach(e => {
- e['hasChildren'] = e.has_children;
- if (e.firmware_status == 4) {
- this.connectWebSocket(e);
- }
- });
+ // data.records.forEach(e => {
+ // e['hasChildren'] = e.has_children;
+ // if (e.firmware_status == 4) {
+ // this.connectWebSocket(e);
+ // }
+ // });
this.data = data.records;
this.loading = false;
this.selectionClear();
--
Gitblit v1.9.3