From 531b6d25d21474f8df88bd484b901111e048837d Mon Sep 17 00:00:00 2001
From: Surpriseplus <845948745@qq.com>
Date: 星期一, 06 二月 2023 18:40:41 +0800
Subject: [PATCH] 接口请求时间判断
---
src/utils/request.js | 21 ++++++++++++---------
src/assets/img/systemMonitoring/图层 40.png | 0
src/views/datamanage/catalogueManage.vue | 23 ++++++++++++++++-------
src/assets/img/systemMonitoring/图层 38.png | 0
src/assets/img/systemMonitoring/图层 37.png | 0
src/views/datamanage/SpatialData.vue | 7 ++++++-
6 files changed, 34 insertions(+), 17 deletions(-)
diff --git "a/src/assets/img/systemMonitoring/\345\233\276\345\261\202 37.png" "b/src/assets/img/systemMonitoring/\345\233\276\345\261\202 37.png"
index ea77706..2304e3f 100644
--- "a/src/assets/img/systemMonitoring/\345\233\276\345\261\202 37.png"
+++ "b/src/assets/img/systemMonitoring/\345\233\276\345\261\202 37.png"
Binary files differ
diff --git "a/src/assets/img/systemMonitoring/\345\233\276\345\261\202 38.png" "b/src/assets/img/systemMonitoring/\345\233\276\345\261\202 38.png"
index 88b6f26..0f6d814 100644
--- "a/src/assets/img/systemMonitoring/\345\233\276\345\261\202 38.png"
+++ "b/src/assets/img/systemMonitoring/\345\233\276\345\261\202 38.png"
Binary files differ
diff --git "a/src/assets/img/systemMonitoring/\345\233\276\345\261\202 40.png" "b/src/assets/img/systemMonitoring/\345\233\276\345\261\202 40.png"
index f66c5e1..edcad47 100644
--- "a/src/assets/img/systemMonitoring/\345\233\276\345\261\202 40.png"
+++ "b/src/assets/img/systemMonitoring/\345\233\276\345\261\202 40.png"
Binary files differ
diff --git a/src/utils/request.js b/src/utils/request.js
index 685670d..d5b579c 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -9,7 +9,7 @@
import { Message } from "element-ui";
import store from "@/store";
import { getToken } from "@/utils/auth";
-
+import router from "../router"
// create an axios instance
const service = axios.create({
baseURL: BASE_URL, // api鐨刡ase_url
@@ -29,14 +29,7 @@
config.headers["token"] = token;
}
- if (config.url.indexOf("logout") != -1 && config.url.indexOf("login") != -1) {
- var expire = JSON.parse(window.localStorage.getItem("LFToken")).expire;
- var timeire = new Date().getTime();
- if (timeire >= expire) {
-
- this.$router.push("logout")
- }
- }
+
//鍔犺浇loading
store.commit("UPDATE_API_COUNT", "add");
@@ -50,6 +43,16 @@
}
); service.interceptors.response.use(
(response) => {
+ if (window.localStorage.getItem("LFToken") != null) {
+ var expire = JSON.parse(window.localStorage.getItem("LFToken")).expire;
+ var timeire = new Date().getTime();
+ if (timeire >= expire) {
+
+ router.push('/login')
+ localStorage.removeItem("LFToken");
+ }
+ }
+
store.commit("UPDATE_API_COUNT", "sub");
//console.log(response)
//杩斿洖鍥犳湁ResponeType===Blob ,鍒嗗紑澶勭悊
diff --git a/src/views/datamanage/SpatialData.vue b/src/views/datamanage/SpatialData.vue
index 92a9dc0..09bee04 100644
--- a/src/views/datamanage/SpatialData.vue
+++ b/src/views/datamanage/SpatialData.vue
@@ -401,6 +401,12 @@
label: '涓氬姟鏁版嵁',
value: 'BS',
children: [],
+ }, {
+ id: 3,
+ tabDesc: '鍏冩暟鎹�',
+ label: '鍏冩暟鎹�',
+ value: 'MD',
+ children: [],
},
],
tableAttach: [],
@@ -776,7 +782,6 @@
var val;
if (this.formSql.type == "long" || this.formSql.type == "integer") {
-
val = parseInt(this.formSql.value);
} else if (this.formSql.type == 'double') {
diff --git a/src/views/datamanage/catalogueManage.vue b/src/views/datamanage/catalogueManage.vue
index 2dc5485..1a79c33 100644
--- a/src/views/datamanage/catalogueManage.vue
+++ b/src/views/datamanage/catalogueManage.vue
@@ -237,6 +237,7 @@
old_dirDat: [], //el鏍戞暟鎹�(鎷栧姩鍓�)
newData: [], //鎷栧姩鍚庡師濮嬫暟鎹�
itemdetail: {},
+ itemaName: null,
backUpData: '',
formLabelWidth: '150px',
delChildID: '',
@@ -271,13 +272,18 @@
this.oriData = res.result;
this.newData = res.result;
this.dirList = this.treeData(res.result);
+ // this.$nextTick(() => {
- if (this.itemdetail.id != null) {
+ // this.expandData=[15]
+ // this.$refs.tree.setCurrentKey(15);
+
+ // });
+ if (this.itemaName != null) {
this.$nextTick(() => {
- // this.expandData=[1]
- // this.$refs.tree.setCurrentKey(this.itemdetail.id);
- // document.getElementById(this.itemdetail.id).click();
+ this.expandData = [this.itemaName]
+ this.$refs.tree.setCurrentKey(this.itemaName);
+
});
}
@@ -378,12 +384,10 @@
if (res == 1) {//鏂板鍚岀骇
id = this.itemdetail.pid;
orderNum = this.getMaxOrderNum(this.newNode.parent.childNodes)
-
lever = this.itemdetail.level;
} else if (res == 2) {//鏂板瀛愮骇
id = this.itemdetail.id;
orderNum = this.getMaxOrderNum(this.newNode.childNodes)
-
lever = this.itemdetail.level + 1;
}
@@ -428,12 +432,13 @@
.then((res) => {
setTimeout(() => {
this.fullscreenLoading = false;
+
if (res.code == 200) {
this.$message({
message: '娣诲姞鎴愬姛',
type: 'success',
});
-
+ this.itemaName = res.result;
this.itemdetail = {};
this.ruleForm = {};
this.dialogFormVisible = false;
@@ -456,6 +461,8 @@
});
},
remove(node, data) {
+ this.itemaName =node.parent.data.id;
+
this.$confirm('姝ゆ搷浣滃皢鍒犻櫎璇ヨ妭鐐�, 鏄惁缁х画?', '鎻愮ず', {
confirmButtonText: '纭畾',
cancelButtonText: '鍙栨秷',
@@ -484,6 +491,7 @@
message: '鍒犻櫎鎴愬姛!',
});
this.itemdetail = {};
+
this.getDirTree();
} else if (res[0].code == 200) {
this.$message.error('鍒犻櫎鎴愬姛锛屼綅缃皟鏁村け璐�');
@@ -601,6 +609,7 @@
},
handleNodeClick(data, node) {
// console.log(data);
+
this.newNode = node;
this.backUpData = JSON.stringify(data);
this.itemdetail = JSON.parse(JSON.stringify(data));
--
Gitblit v1.9.3