Merge remote-tracking branch 'origin/master'

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

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

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 = ''

ah-jjzhgd-web/src/views/log/abnormalLog/index.vue

@@ -87,7 +87,7 @@
         </template>
       </el-table-column>
       <el-table-column label="操作参数" align="center" prop="params" />
-      <el-table-column label="操作方法" align="center" prop="method`" /> -->
+      <el-table-column label="操作方法" align="center" prop="method" /> -->
       <el-table-column label="操作路径" align="center" prop="operUri" />
       <!-- <el-table-column label="执行时间(ms)" align="center" prop="times" /> -->
     </el-table>

ah-jjzhgd-web/src/views/log/businessLog/index.vue

@@ -70,13 +70,13 @@
         <el-table-column label="操作类型" align="center" prop="operType" />
         <el-table-column label="操作详情" align="center" prop="operateDetail" />
        
-        <el-table-column label="操作结果" align="center" prop="result">
+        <el-table-column label="操作结果" align="center" prop="fruit">
           <template slot-scope="{ row }">
-            {{ getStatus(row.result) }}
+            {{ row.fruit }}
           </template>
         </el-table-column>
         <el-table-column label="操作参数" align="center" prop="params" />
-        <el-table-column label="操作方法" align="center" prop="method`" />
+        <el-table-column label="操作方法" align="center" prop="method" />
         <el-table-column label="操作路径" align="center" prop="operUri" />
         <el-table-column label="执行时间(ms)" align="center" prop="times" />
       </el-table>

ah-jjzhgd-web/src/views/log/systemLog/index.vue

@@ -70,13 +70,13 @@
       <el-table-column label="操作类型" align="center" prop="operType" />
       <el-table-column label="操作详情" align="center" prop="operateDetail" />
      
-      <el-table-column label="操作结果" align="center" prop="result">
+      <el-table-column label="操作结果" align="center" prop="fruit">
         <template slot-scope="{ row }">
-          {{ getStatus(row.result) }}
+          {{ row.fruit }}
         </template>
       </el-table-column>
       <el-table-column label="操作参数" align="center" prop="params" />
-      <el-table-column label="操作方法" align="center" prop="method`" />
+      <el-table-column label="操作方法" align="center" prop="method" />
       <el-table-column label="操作路径" align="center" prop="operUri" />
       <el-table-column label="执行时间(ms)" align="center" prop="times" />
     </el-table>