Sfoglia il codice sorgente

将获取header统一从getHeaders中获取

louhangfei 1 anno fa
parent
commit
06754d62d9

+ 1 - 6
src/views/datamanager/alertformdata/components/common/QuestionFormBase.vue

@@ -182,7 +182,7 @@
   import { IssueState, sourceOptions, issueStateOptionsAdd } from './constant.question';
   import { useIssueType } from '../../hooks/useIssueType';
   import { useWorkLocation } from '../../hooks/useWorkLocation';
-  import { useUserStore } from '@/store/modules/user';
+  import { getHeaders } from '@/utils/http/axios';
   import urlJoin from 'url-join';
   import { useGlobSetting } from '@/hooks/setting';
 
@@ -321,11 +321,6 @@
     });
   };
 
-  // 图片上传
-  const userStore = useUserStore();
-  const getHeaders = () => {
-    return { Satoken: userStore.getToken, Tenantid: userStore.getTenantId };
-  };
   const handleAvatarSuccess = (res) => {
     if (!formData.pictures) formData.pictures = [];
     formData.pictures.push(res.data.url);

+ 2 - 5
src/views/datamanager/alertformdata/components/default/Default.vue

@@ -105,6 +105,7 @@
   import { useUserStore } from '@/store/modules/user';
   import { useGlobSetting } from '@/hooks/setting';
   import urlJoin from 'url-join';
+  import { getHeaders } from '@/utils/http/axios';
 
   const userStore = useUserStore();
   // const { aiOptions, manualOptions, getAIOptions, getManualOptions } = useIssueType();
@@ -112,10 +113,6 @@
   const { aiMainOptions, manualMainOptions, getAIMainOptions, getManualMainOptions } =
     useIssueMainType();
 
-  const headers = {
-    Satoken: userStore.getToken,
-    Tenantid: userStore.getTenantId,
-  };
   const { urlPrefix } = useGlobSetting();
 
   const alertTableRef = ref<typeof AlertTable>();
@@ -182,7 +179,7 @@
       };
 
       const config: AxiosRequestConfig = {
-        headers,
+        headers: getHeaders(),
         responseType: 'blob',
       };
       const response = await axios.post(urlPrefix + '/issue/export', requestBody, config);

+ 1 - 6
src/views/map-config/mini-map/MiniMapConfig.vue

@@ -144,20 +144,15 @@
   import { computed } from 'vue';
   import { Search, Refresh, ArrowLeft } from '@element-plus/icons-vue';
   import KonvaMap from './MapBase/KonvaMap.vue';
-  import { useUserStore } from '@/store/modules/user';
   import useCameraStatus from '@/views/cameras/preview/store/useCameraStatus';
   import { onBeforeRouteLeave } from 'vue-router';
   import urlJoin from 'url-join';
   import { useGlobSetting } from '@/hooks/setting';
+  import { getHeaders } from '@/utils/http/axios';
 
   const cameraStatus = useCameraStatus();
   const { openInterval, closeInterval } = cameraStatus;
 
-  const userStore = useUserStore();
-  const getHeaders = () => {
-    return { Satoken: userStore.getToken, Tenantid: userStore.getTenantId };
-  };
-
   const miniMap = useMiniMap();
   const { scenesTree, shopCameraList, selectedShopCode, selectedShopDetail } = storeToRefs(miniMap);
   const { getScenesTree, getShowCameras, getMapLayout } = miniMap;

+ 1 - 6
src/views/page-config/ConfigEdit.vue

@@ -165,14 +165,9 @@
   import { uploadCompanyLayout, updateCompanyLayout, getCompanyLayoutApi } from '@/api/scene/scene';
   import safeParse from '@/utils/safeParse';
   import { useRouter } from 'vue-router';
-  import { useUserStore } from '@/store/modules/user';
   import urlJoin from 'url-join';
   import { useGlobSetting } from '@/hooks/setting';
-
-  const userStore = useUserStore();
-  const getHeaders = () => {
-    return { Satoken: userStore.getToken, Tenantid: userStore.getTenantId };
-  };
+  import { getHeaders } from '@/utils/http/axios';
 
   const mapEditor = useMapEditor();
   const { bgImg, addedShops, activeShopId, showShops } = storeToRefs(mapEditor);

+ 1 - 6
src/views/page-config/component/ConfigDrawer.vue

@@ -141,12 +141,7 @@
   import { cloneDeep } from 'lodash-es';
   import { useGlobSetting } from '@/hooks/setting';
   import urlJoin from 'url-join';
-  import { useUserStore } from '@/store/modules/user';
-
-  const userStore = useUserStore();
-  const getHeaders = () => {
-    return { Satoken: userStore.getToken, Tenantid: userStore.getTenantId };
-  };
+  import { getHeaders } from '@/utils/http/axios';
 
   const mapEditor = useMapEditor();
   const { addedShops, showShops, activeShopId } = storeToRefs(mapEditor);

+ 4 - 8
src/views/system/user/component/AddUser.vue

@@ -15,7 +15,7 @@
           :limit="1"
           drag
           :action="importUrl"
-          :headers="headers"
+          :headers="getHeaders()"
           :with-credentials="true"
           :auto-upload="false"
           :on-exceed="handleExceed"
@@ -169,6 +169,7 @@
   import axios, { AxiosRequestConfig } from 'axios';
   import { useGlobSetting } from '@/hooks/setting';
   import urlJoin from 'url-join';
+  import { getHeaders } from '@/utils/http/axios';
 
   const userStore = useUserStore();
 
@@ -180,11 +181,6 @@
     cardVisible.value = props.modelValue;
   });
 
-  const headers = {
-    Satoken: userStore.getToken,
-    Tenantid: userStore.getTenantId,
-  };
-
   const cardVisible = ref<boolean>(true);
 
   //对话框
@@ -221,7 +217,7 @@
     //调用后端接口
     try {
       const config: AxiosRequestConfig = {
-        headers,
+        headers: getHeaders(),
         responseType: 'blob',
       };
       const response = await axios.get(
@@ -249,7 +245,7 @@
     //调用后端接口
     try {
       const config: AxiosRequestConfig = {
-        headers,
+        headers: getHeaders(),
         responseType: 'blob',
       };
       const response = await axios.get(urlPrefix + '/user/downloadInfoForm', config);