From bb7e23a312ab846aeeb5214d04644c9995ddfeac Mon Sep 17 00:00:00 2001 From: anthonywj Date: Wed, 31 May 2023 16:30:47 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E8=AF=B7=E6=B1=82=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=AE=A2=E6=88=B7=E7=AB=AF=E6=A0=87=E8=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/request.js | 15 ++++++++------- src/views/basic/locUdi/UdiInfoDb.vue | 1 - 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/utils/request.js b/src/utils/request.js index ca9a410..78d965c 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -1,15 +1,15 @@ import axios from "axios"; -import { Notification, MessageBox, Message, Loading } from "element-ui"; +import {Notification, MessageBox, Message, Loading} from "element-ui"; import store from "@/store"; -import { getAdminId, getToken } from "@/utils/auth"; +import {getAdminId, getToken} from "@/utils/auth"; import errorCode from "@/utils/errorCode"; -import { tansParams, blobValidate } from "@/utils/ruoyi"; +import {tansParams, blobValidate} from "@/utils/ruoyi"; import cache from "@/plugins/cache"; -import { saveAs } from "file-saver"; +import {saveAs} from "file-saver"; let downloadLoadingInstance; // 是否显示重新登录 -export let isRelogin = { show: false }; +export let isRelogin = {show: false}; axios.defaults.headers["Content-Type"] = "application/json;charset=utf-8"; // 对应国际化资源文件后缀 @@ -32,6 +32,7 @@ service.interceptors.request.use( if (getToken() && !isToken) { // config.headers['ADMIN_TOKEN'] = getToken() // 让每个请求携带自定义token 请根据实际情况自行修改 config.headers = { + CLIENT_TYPE: "locWeb", ADMIN_ID: getAdminId(), ADMIN_TOKEN: getToken(), }; @@ -148,7 +149,7 @@ service.interceptors.response.use( */ (error) => { console.log("err" + error); - let { message } = error; + let {message} = error; if (message == "Network Error") { message = "后端接口连接异常"; } else if (message.includes("timeout")) { @@ -179,7 +180,7 @@ export function download(url, params, filename) { return tansParams(params); }, ], - headers: { "Content-Type": "application/x-www-form-urlencoded" }, + headers: {"Content-Type": "application/x-www-form-urlencoded"}, responseType: "blob", }) .then(async (data) => { diff --git a/src/views/basic/locUdi/UdiInfoDb.vue b/src/views/basic/locUdi/UdiInfoDb.vue index 33a7fc8..899e2c4 100644 --- a/src/views/basic/locUdi/UdiInfoDb.vue +++ b/src/views/basic/locUdi/UdiInfoDb.vue @@ -9,7 +9,6 @@ From 79fb5f3060314d2e9861a7835f808d23b55cd727 Mon Sep 17 00:00:00 2001 From: 1178634255 <1178634255@qq.com> Date: Wed, 31 May 2023 17:28:09 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=A4=87=E4=BB=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/udi/trace/history/index.vue | 177 +++++++++++++++++--------- 1 file changed, 120 insertions(+), 57 deletions(-) diff --git a/src/views/udi/trace/history/index.vue b/src/views/udi/trace/history/index.vue index caea9de..6540835 100644 --- a/src/views/udi/trace/history/index.vue +++ b/src/views/udi/trace/history/index.vue @@ -8,6 +8,7 @@ @@ -16,6 +17,7 @@ @@ -24,43 +26,48 @@ - - - - - - - - - 查询 - 重置 - - - + + - + - + + + + + + + + + + + + + + + + + +
- 显示/隐藏搜索栏 - + 显示/隐藏搜索栏 + 重置 查询 @@ -75,14 +82,24 @@ - + - + + + + + + +