zhudie 2 年之前
父節點
當前提交
2aaeac33d4

+ 2 - 2
src/api/camera/camera-share.ts

@@ -68,7 +68,7 @@ export const editShareCameraList = (data: CameraShareType) => {
 /** 删除分享的相机*/
 export const delShareCameraList = (id: number) => {
   return http.request<CameraShareType[]>({
-    url: `cameraTenant/delete?cameraToTenantId=${id}`,
+    url: `/cameraTenant/delete?cameraToTenantId=${id}`,
     method: 'delete',
   });
 };
@@ -78,7 +78,7 @@ export const addShareCameraList = (data: CameraShareType) => {
   return http.request<CameraShareType[]>({
     url: '/cameraTenant/save',
     method: 'post',
-    data,
+    data: [data],
   });
 };
 

+ 15 - 2
src/views/cameras/overview/CamerasOverview.vue

@@ -67,9 +67,22 @@
   import { deleteCameraItem } from '@/api/camera/camera-overview';
   import { ElMessage, ElMessageBox } from 'element-plus';
   import useCameraShared from './stores/useSharedCamera';
+  import useCameraShare from './stores/useCameraShare';
 
-  const CameraShared = useCameraShared();
-  const { unAddlength } = storeToRefs(CameraShared);
+  const useShare = useCameraShare();
+  const { cameraShareList, queryName, queryAccount, isAddState, queryCameraId, conditionSearch } =
+    useShare;
+
+  const unAddlength = ref<number>();
+  onMounted(() => {
+    // isAddState.value = false;
+    // console.log('isAddState', isAddState.value);
+    // queryToTenantId.value = -10;
+    // conditionSearch();
+  });
+
+  // const CameraShared = useCameraShared();
+  // const { unAddlength } = storeToRefs(CameraShared);
 
   const cameraOverview = useCameraOverview();
   const { cameraItems, loading, total, page, size } = storeToRefs(cameraOverview);

+ 2 - 2
src/views/cameras/overview/components/ShareCameraDetail.vue

@@ -209,12 +209,12 @@
       // tenantCode: shareData.value.tenantCode,
       permission: shareData.value.permission,
       // tenantName: shareData.value.tenantName,
-      endTime: '2023-03-12 12:45:44',
+      endTime: '2023-03-12 11:45:44',
       isAdd: false,
       remark: shareData.value.remark,
       // ...props.formData,
     };
-
+    queryCameraId.value = props.formData?.id;
     handleAdd(addShareItem); //数据未调整
 
     // const addShareItem = {

+ 1 - 1
src/views/cameras/overview/constant.ts

@@ -353,7 +353,7 @@ export const getColumns = (edit: Function): BasicColumn[] => {
         return h(
           'img',
           {
-            src: record.row.networkingState ? connectedIcon : unConnectedIcon,
+            src: record.row.connected ? connectedIcon : unConnectedIcon,
             style:
               'width: 20px; height: 20px; object-fit: fill; display: inline-block; line-height: 20px; vertical-align: middle;',
           },