Merge branch 'dataDel' of ssh://172.16.23.188:9022/tian-group/skyeye-admin-fe into dataDel

src/api/camera/camera-share.ts

@@ -49,11 +49,14 @@ export interface ReturnType {
 
 /** 查询分享的相机*/
 export const getShareCameraList = (params: CameraShareQueryType) => {
-  return http.request<ReturnType>({
-    url: '/cameraTenant/getList',
-    method: 'GET',
-    params,
-  });
+  return http.request<ReturnType>(
+    {
+      url: '/cameraTenant/getList',
+      method: 'GET',
+      params,
+    },
+    { isShowErrorMessage: false },
+  );
 };
 
 /** 编辑分享的相机*/

src/utils/http/axios/index.ts

@@ -17,6 +17,7 @@ import { setObjToUrlParams } from '@/utils/urlUtils';
 import { RequestOptions, Result, CreateAxiosOptions } from './types';
 
 import { useUserStoreWidthOut } from '@/store/modules/user';
+import urlJoin from 'url-join';
 
 const globSetting = useGlobSetting();
 const urlPrefix = globSetting.urlPrefix || '';
@@ -140,7 +141,8 @@ const transform: AxiosTransform = {
     const isUrlStr = isUrl(config.url as string);
 
     if (!isUrlStr && joinPrefix) {
-      config.url = `${urlPrefix}${config.url}`;
+      // 这里做兼容
+      config.url = urlJoin(urlPrefix || '', config.url as string);
     }
 
     if (!isUrlStr && apiUrl && isString(apiUrl)) {

src/views/cameras/overview/components/SharedTable.vue

@@ -124,7 +124,7 @@
 
   const handleDelete = (row) => {
     console.log('row', row);
-    handleDel(row.id);
+    handleDel(row.cameraId);
   };
 
   //操作列