From 9f8a171ad06dba121a55d00b5c619c29ed489a47 Mon Sep 17 00:00:00 2001
From: zzyuan <781948537@qq.com>
Date: Wed, 17 Apr 2024 17:03:20 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=B8=8A=E4=BC=A0=E4=B8=8D?=
=?UTF-8?q?=E5=8A=A0=E5=AF=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
ah-jjzhgd-web/src/api/basic/3dFile.js | 6 ++++++
ah-jjzhgd-web/src/api/basic/project.js | 3 +++
ah-jjzhgd-web/src/utils/request.js | 9 ++++++---
ah-jjzhgd-web/src/views/log/abnormalLog/index.vue | 2 +-
ah-jjzhgd-web/src/views/log/businessLog/index.vue | 6 +++---
ah-jjzhgd-web/src/views/log/systemLog/index.vue | 6 +++---
6 files changed, 22 insertions(+), 10 deletions(-)
diff --git a/ah-jjzhgd-web/src/api/basic/3dFile.js b/ah-jjzhgd-web/src/api/basic/3dFile.js
index 7418861..14612cf 100644
--- a/ah-jjzhgd-web/src/api/basic/3dFile.js
+++ b/ah-jjzhgd-web/src/api/basic/3dFile.js
@@ -12,6 +12,9 @@ export function get3dFileList(data) {
// 新增三维文件列表
export function add3dFileItem(data) {
return request({
+ headers: { // 修改请求头
+ 'decrypt': 'decrypt'
+ },
url: '/background/back/area/addSwFile',
method: 'post',
data
@@ -21,6 +24,9 @@ export function add3dFileItem(data) {
// 编辑三维文件列表
export function update3dFileItem(data) {
return request({
+ headers: { // 修改请求头
+ 'decrypt': 'decrypt'
+ },
url: '/system/sys/pro/editPro',
method: 'post',
data
diff --git a/ah-jjzhgd-web/src/api/basic/project.js b/ah-jjzhgd-web/src/api/basic/project.js
index b7c7214..230e3fa 100644
--- a/ah-jjzhgd-web/src/api/basic/project.js
+++ b/ah-jjzhgd-web/src/api/basic/project.js
@@ -21,6 +21,9 @@ export function addProjectItem(data) {
// 编辑工程
export function updateProjectItem(data) {
return request({
+ headers: { // 修改请求头
+ 'Content-Type': 'multipart/form-data'
+ },
url: '/system/sys/pro/editPro',
method: 'post',
data
diff --git a/ah-jjzhgd-web/src/utils/request.js b/ah-jjzhgd-web/src/utils/request.js
index 3bf41fd..a5d1912 100644
--- a/ah-jjzhgd-web/src/utils/request.js
+++ b/ah-jjzhgd-web/src/utils/request.js
@@ -42,13 +42,16 @@ service.interceptors.request.use(config => {
if (getToken() && !isToken) {
config.headers['Authorization'] = getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
}
- config.headers['Content-Type']='application/json'
+
//参数加密
if (config.method === 'post' && config.data) {
- if(aqEnnable){
- config.data = encryptCBC(JSON.stringify(config.data))
+ if(config.headers['decrypt']!='decrypt'){
+ if(aqEnnable){
+ config.data = encryptCBC(JSON.stringify(config.data))
+ }
}
}
+ config.headers['Content-Type']='application/json'
// get请求映射params参数
if (config.method === 'get' && config.params) {
let url = ''
diff --git a/ah-jjzhgd-web/src/views/log/abnormalLog/index.vue b/ah-jjzhgd-web/src/views/log/abnormalLog/index.vue
index df969fb..547587e 100644
--- a/ah-jjzhgd-web/src/views/log/abnormalLog/index.vue
+++ b/ah-jjzhgd-web/src/views/log/abnormalLog/index.vue
@@ -87,7 +87,7 @@
- -->
+ -->
diff --git a/ah-jjzhgd-web/src/views/log/businessLog/index.vue b/ah-jjzhgd-web/src/views/log/businessLog/index.vue
index 5180097..4163364 100644
--- a/ah-jjzhgd-web/src/views/log/businessLog/index.vue
+++ b/ah-jjzhgd-web/src/views/log/businessLog/index.vue
@@ -70,13 +70,13 @@
-
+
- {{ getStatus(row.result) }}
+ {{ row.fruit }}
-
+
diff --git a/ah-jjzhgd-web/src/views/log/systemLog/index.vue b/ah-jjzhgd-web/src/views/log/systemLog/index.vue
index 952576a..062bb66 100644
--- a/ah-jjzhgd-web/src/views/log/systemLog/index.vue
+++ b/ah-jjzhgd-web/src/views/log/systemLog/index.vue
@@ -70,13 +70,13 @@
-
+
- {{ getStatus(row.result) }}
+ {{ row.fruit }}
-
+