Merge branch 'dev' into 'master'

Dev

See merge request !182

src/api/axios.ts

@@ -3,7 +3,13 @@ import Axios from 'axios'
 import { showError } from '@/utils/ui.ts'
 import { showError } from '@/utils/ui.ts'
 import { v4 as uuidv4 } from 'uuid'
 import { v4 as uuidv4 } from 'uuid'
 import dayjs from 'dayjs'
 import dayjs from 'dayjs'
-import {findRequestItemByUUID,deleteRequestByUUID,addRequestItem,getTimeDifferenceInMilliseconds} from './requestLog.ts'
+import {
+  findRequestItemByUUID,
+  deleteRequestByUUID,
+  addRequestItem,
+  getTimeDifferenceInMilliseconds,
+  UserJson,
+} from './requestLog.ts'
 const axios = Axios.create({
 const axios = Axios.create({
   baseURL: import.meta.env.VITE_API_BASE,
   baseURL: import.meta.env.VITE_API_BASE,
   timeout: 60 * 60 * 1000, //半小时
   timeout: 60 * 60 * 1000, //半小时
@@ -30,7 +36,7 @@ axios.interceptors.request.use(
     addRequestItem({
     addRequestItem({
       url: config.url || '',
       url: config.url || '',
       method: config.method || '',
       method: config.method || '',
-      startTime: dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss'),
+      startTime: dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss.SSS'),
       uuid: config.headers.uuid
       uuid: config.headers.uuid
     })
     })
     return config
     return config
@@ -48,10 +54,15 @@ axios.interceptors.response.use(
     item.url = `${import.meta.env.VITE_API_BASE}${response.config?.url}`
     item.url = `${import.meta.env.VITE_API_BASE}${response.config?.url}`
     const fm = new FormData()
     const fm = new FormData()
     const processTime = response.headers['processtime']
     const processTime = response.headers['processtime']
-    const endTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
+    const endTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss.SSS')
     const clientResponseTime = getTimeDifferenceInMilliseconds(item.startTime, endTime)
     const clientResponseTime = getTimeDifferenceInMilliseconds(item.startTime, endTime)
     console.log(item)
     console.log(item)
     if((clientResponseTime as number)>=3000){
     if((clientResponseTime as number)>=3000){
+      const user = localStorage.getItem('user')
+      if (user) {
+        const userJson:UserJson = JSON.parse(user)
+        fm.append('factoryCode', userJson?.factoryCode)
+      }
       fm.append('processTime', processTime)
       fm.append('processTime', processTime)
       fm.append('url', item.url)
       fm.append('url', item.url)
       fm.append('method', item.method)
       fm.append('method', item.method)

src/api/requestLog.ts

@@ -4,7 +4,9 @@ export interface ApiRequestItem {
   startTime: string;
   startTime: string;
   uuid: string;
   uuid: string;
 }
 }
-
+export interface UserJson{
+  factoryCode:string
+}
 const apiRequestKey = 'apiRequestStorage'
 const apiRequestKey = 'apiRequestStorage'
 
 
 export const getRequestData = () => {
 export const getRequestData = () => {