1

src/api/operate/index.ts

@@ -35,6 +35,7 @@ enum Api {
 
   operateSceneList = '/service/manage/scene/list',
   sceneMove = '/service/manage/scene/move',
+  sceneRestStore = '/service/manage/scene/restStore',
   sceneDelete = '/service/manage/scene/delete',
   qjsceneDelete = '/service/manage/overall/delete',
   sceneDownload = '/service/manage/scene/downScene',
@@ -51,134 +52,134 @@ enum Api {
   sceneApplyHandle = '/service/manage/sceneApply/handle',
   getInfoMail = '/service/manage/getInfo',
   updateMail = '/service/manage/update',
-  caseaddOrUpdate='/service/manage/case/addOrUpdate',
+  caseaddOrUpdate = '/service/manage/case/addOrUpdate',
   caseList = '/service/manage/case/list',
-  caseDel='/service/manage/case/del',
-  caseRelease='/service/manage/case/isShow',
-  caseWithdraw='/service/manage/case/release',
+  caseDel = '/service/manage/case/del',
+  caseRelease = '/service/manage/case/isShow',
+  caseWithdraw = '/service/manage/case/release',
   //房间管理
-  roomList='/service/manage/takeLook/roomList',
-  updateRoomShow='/service/manage/takeLook/updateRoomShow',
-  deleteRoom='/service/manage/takeLook/deleteRoom',
+  roomList = '/service/manage/takeLook/roomList',
+  updateRoomShow = '/service/manage/takeLook/updateRoomShow',
+  deleteRoom = '/service/manage/takeLook/deleteRoom',
 }
 
 /**
  * @description: Get sample list value
  */
 
- export const agentAuditList = (params: PageParams) =>
- defHttp.post<RentListGetResultModel>({
-   url: Api.agentAuditList,
-   params: params,
-   // data: params,
-   headers: {
-     // @ts-ignore
-     ignoreCancelToken: true,
-   },
- });
- export const agentAuditHandle = (params: PageParams) =>
- defHttp.post<RentListGetResultModel>({
-   url: Api.agentAuditHandle,
-   params: params,
-   // data: params,
-   headers: {
-     // @ts-ignore
-     ignoreCancelToken: true,
-   },
- });
- export const sendEmail = (params: PageParams) =>
- defHttp.post<RentListGetResultModel>({
-   url: Api.sendEmail,
-   params: params,
-   // data: params,
-   headers: {
-     // @ts-ignore
-     ignoreCancelToken: true,
-   },
- });
- export const sceneApplyList = (params: PageParams) =>
- defHttp.post<RentListGetResultModel>({
-   url: Api.sceneApplyList,
-   params: params,
-   // data: params,
-   headers: {
-     // @ts-ignore
-     ignoreCancelToken: true,
-   },
- });
- export const sceneApplyHandle = (params: PageParams) =>
- defHttp.post<RentListGetResultModel>({
-   url: Api.sceneApplyHandle,
-   params: params,
-   // data: params,
-   headers: {
-     // @ts-ignore
-     ignoreCancelToken: true,
-   },
- });
- 
- export const caseListApi = (params: PageParams) =>
- defHttp.post<RentListGetResultModel>({
-   url: Api.caseList,
-   params: params,
-   // data: params,
-   headers: {
-     // @ts-ignore
-     ignoreCancelToken: true,
-   },
- });
- 
- export const caseaddOrUpdateApi = (params: PageParams) =>
- defHttp.post<RentListGetResultModel>({
-   url: Api.caseaddOrUpdate,
-   params: params,
-   // data: params,
-   headers: {
-     // @ts-ignore
-     ignoreCancelToken: true,
-   },
- });
-  
- export const casePublicApi = (params: PageParams) =>
- defHttp.get<RentListGetResultModel>({
-   url: Api.caseWithdraw,
-   params: params,
-   // data: params,
-   headers: {
-     // @ts-ignore
-     ignoreCancelToken: true,
-   },
- });
- export const caseReleaseApi = (params: PageParams) =>
- defHttp.get<RentListGetResultModel>({
-   url: Api.caseRelease,
-   params: params,
-   // data: params,
-   headers: {
-     // @ts-ignore
-     ignoreCancelToken: true,
-   },
- });
- export const caseDelApi = (params: PageParams) =>
- defHttp.post<RentListGetResultModel>({
-   url: Api.caseDel,
-   params: params,
-   // data: params,
-   headers: {
-     // @ts-ignore
-     ignoreCancelToken: true,
-   },
- });
- export const ListApi = (params: PageParams) =>
- defHttp.post<RentListGetResultModel>({
-   url: Api.pageList,
-   params: params,
-   // data: params,
-   headers: {
-     // @ts-ignore
-     ignoreCancelToken: true,
-   },
- });
+export const agentAuditList = (params: PageParams) =>
+  defHttp.post<RentListGetResultModel>({
+    url: Api.agentAuditList,
+    params: params,
+    // data: params,
+    headers: {
+      // @ts-ignore
+      ignoreCancelToken: true,
+    },
+  });
+export const agentAuditHandle = (params: PageParams) =>
+  defHttp.post<RentListGetResultModel>({
+    url: Api.agentAuditHandle,
+    params: params,
+    // data: params,
+    headers: {
+      // @ts-ignore
+      ignoreCancelToken: true,
+    },
+  });
+export const sendEmail = (params: PageParams) =>
+  defHttp.post<RentListGetResultModel>({
+    url: Api.sendEmail,
+    params: params,
+    // data: params,
+    headers: {
+      // @ts-ignore
+      ignoreCancelToken: true,
+    },
+  });
+export const sceneApplyList = (params: PageParams) =>
+  defHttp.post<RentListGetResultModel>({
+    url: Api.sceneApplyList,
+    params: params,
+    // data: params,
+    headers: {
+      // @ts-ignore
+      ignoreCancelToken: true,
+    },
+  });
+export const sceneApplyHandle = (params: PageParams) =>
+  defHttp.post<RentListGetResultModel>({
+    url: Api.sceneApplyHandle,
+    params: params,
+    // data: params,
+    headers: {
+      // @ts-ignore
+      ignoreCancelToken: true,
+    },
+  });
+
+export const caseListApi = (params: PageParams) =>
+  defHttp.post<RentListGetResultModel>({
+    url: Api.caseList,
+    params: params,
+    // data: params,
+    headers: {
+      // @ts-ignore
+      ignoreCancelToken: true,
+    },
+  });
+
+export const caseaddOrUpdateApi = (params: PageParams) =>
+  defHttp.post<RentListGetResultModel>({
+    url: Api.caseaddOrUpdate,
+    params: params,
+    // data: params,
+    headers: {
+      // @ts-ignore
+      ignoreCancelToken: true,
+    },
+  });
+
+export const casePublicApi = (params: PageParams) =>
+  defHttp.get<RentListGetResultModel>({
+    url: Api.caseWithdraw,
+    params: params,
+    // data: params,
+    headers: {
+      // @ts-ignore
+      ignoreCancelToken: true,
+    },
+  });
+export const caseReleaseApi = (params: PageParams) =>
+  defHttp.get<RentListGetResultModel>({
+    url: Api.caseRelease,
+    params: params,
+    // data: params,
+    headers: {
+      // @ts-ignore
+      ignoreCancelToken: true,
+    },
+  });
+export const caseDelApi = (params: PageParams) =>
+  defHttp.post<RentListGetResultModel>({
+    url: Api.caseDel,
+    params: params,
+    // data: params,
+    headers: {
+      // @ts-ignore
+      ignoreCancelToken: true,
+    },
+  });
+export const ListApi = (params: PageParams) =>
+  defHttp.post<RentListGetResultModel>({
+    url: Api.pageList,
+    params: params,
+    // data: params,
+    headers: {
+      // @ts-ignore
+      ignoreCancelToken: true,
+    },
+  });
 //显示隐藏
 export const NewDisplay = (params: PageParams) =>
   defHttp.post<RentListGetResultModel>({
@@ -325,6 +326,16 @@ export const sceneMove = (params: sceneMoveParams) =>
       ignoreCancelToken: true,
     },
   });
+export const sceneRestStore = (params: sceneControlParams) =>
+  defHttp.get<Result>({
+    url: Api.sceneRestStore,
+    params: params,
+    // data: params,
+    headers: {
+      // @ts-ignore
+      ignoreCancelToken: true,
+    },
+  });
 export const rebuildScene = (params: sceneControlParams) =>
   defHttp.get<Result>({
     url: Api.rebuildScene,
@@ -345,17 +356,17 @@ export const sceneDelete = (params: sceneControlParams) =>
       ignoreCancelToken: true,
     },
   });
-  
+
 export const qjsceneDelete = (params: overallDelete) =>
-defHttp.post<Result>({
-  url: Api.qjsceneDelete,
-  params: params,
-  // data: params,
-  headers: {
-    // @ts-ignore
-    ignoreCancelToken: true,
-  },
-});
+  defHttp.post<Result>({
+    url: Api.qjsceneDelete,
+    params: params,
+    // data: params,
+    headers: {
+      // @ts-ignore
+      ignoreCancelToken: true,
+    },
+  });
 export const checkDownLoad = (params: sceneControlParams) =>
   defHttp.get<checkDownLoadResult>({
     url: Api.checkDownLoad,
@@ -467,32 +478,32 @@ export const intercomMessageHandle = (params: updateParams) =>
       ignoreCancelToken: true,
     },
   });
-  
+
 // 房间管理/列表
 export const roomList = (params) =>
-defHttp.post<Result>({
-  url: Api.roomList,
-  params,
-  headers: {
-    // @ts-ignore
-    ignoreCancelToken: true,
-  },
-});
+  defHttp.post<Result>({
+    url: Api.roomList,
+    params,
+    headers: {
+      // @ts-ignore
+      ignoreCancelToken: true,
+    },
+  });
 export const updateRoomShow = (params) =>
-defHttp.post<Result>({
-  url: Api.updateRoomShow,
-  params,
-  headers: {
-    // @ts-ignore
-    ignoreCancelToken: true,
-  },
-});
+  defHttp.post<Result>({
+    url: Api.updateRoomShow,
+    params,
+    headers: {
+      // @ts-ignore
+      ignoreCancelToken: true,
+    },
+  });
 export const deleteRoom = (params) =>
-defHttp.post<Result>({
-  url: Api.deleteRoom,
-  params,
-  headers: {
-    // @ts-ignore
-    ignoreCancelToken: true,
-  },
-});
+  defHttp.post<Result>({
+    url: Api.deleteRoom,
+    params,
+    headers: {
+      // @ts-ignore
+      ignoreCancelToken: true,
+    },
+  });

src/views/account/product/data.tsx

@@ -131,7 +131,7 @@ export const columns: BasicColumn[] = [
     ifShow: true,
     fixed: 'right',
     flag: 'ACTION',
-    width: 250,
+    width: 260,
   },
 ];
 

src/views/account/product/index.vue

@@ -44,6 +44,12 @@
                 onClick: handleMove.bind(null, record),
               },
               {
+                label: '解冻',
+                disabled: !record.isColdStorage || !(record.status == 1 || record.status == -2),
+                ifShow: getTypeCheckPerm('scenes-thaw') && tableType != 3,
+                onClick: handleColdStorage.bind(null, record),
+              },
+              {
                 label: '下载',
                 disabled:!(record.status == 1 || (record.status == -2 && record.payStatus == 1)),
                 ifShow:getTypeCheckPerm('account-productDownload'),
@@ -117,6 +123,7 @@
     sceneDelete,
     qjsceneDelete,
     sceneReset,
+    sceneRestStore,
     sceneDownload,
     checkDownLoad,
     downloadProcess,
@@ -244,6 +251,21 @@
             reload();
           })
       }
+      async function handleColdStorage(record: Recordable) {
+        createConfirm({
+          title: '删除',
+          content: '确定要解冻场景吗？',
+          onOk: async () => {
+            sceneRestStore({ num: record.num }).then(() => {
+              message.success({
+                content: '删除成功',
+              });
+
+              reload();
+            });
+          },
+        });
+      }
       async function handleMove(record: Recordable) {
         openMoveModal(true, {
           ...record,
@@ -329,6 +351,7 @@
         timer,
         canDownload,
         downloadOption,
+        handleColdStorage,
         cancelDownload,
         ViewReload,
         getTypeCheckPerm,

src/views/customer/scene.vue

@@ -42,6 +42,12 @@
                 onClick: handleMove.bind(null, record),
               },
               {
+                label: '解冻',
+                disabled: !record.isColdStorage || !(record.status == 1 || record.status == -2),
+                ifShow: getTypeCheckPerm('scenes-move') && tableType != 3,
+                onClick: handleColdStorage.bind(null, record),
+              },
+              {
                 label: '下载',
                 disabled:!(record.status == 1 || (record.status == -2 && record.payStatus == 1)),
                 ifShow:getTypeCheckPerm('customer-scenes-download') && tableType != 3,
@@ -123,6 +129,7 @@
     sceneDelete,
     sceneReset,
     sceneDownload,
+    sceneRestStore,
     checkDownLoad,
     downloadProcess,
     sceneCopy,
@@ -255,7 +262,7 @@
           ifShow: true,
           fixed: 'right',
           flag: 'ACTION',
-          width: 250,
+          width: 260,
         },
       ];
       const searchForm: Partial<FormProps> = {
@@ -349,6 +356,21 @@
           },
         });
       }
+      async function handleColdStorage(record: Recordable) {
+        createConfirm({
+          title: '删除',
+          content: '确定要解冻场景吗？',
+          onOk: async () => {
+            sceneRestStore({ num: record.num }).then(() => {
+              message.success({
+                content: '删除成功',
+              });
+
+              reload();
+            });
+          },
+        });
+      }
       async function handleDelete(record: Recordable) {
         console.log('handleDelete', record);
         // createConfirm({
@@ -457,6 +479,7 @@
         tableType,
         loading,
         changeTable,
+        handleColdStorage,
         t,
         openDownModal,
         registerDownModal,

src/views/empower/AddCameraModal.vue

@@ -150,7 +150,7 @@
           createSuccessModal({
             title: t('layout.setting.operatingTitle'),
             content: h('div', {}, [
-              h('p', `安装Key：${res.authorizeKey || fileFlow.key}`),
+              h('p', `授权Key：${res.authorizeKey || fileFlow.key}`),
               h('p', `授权相机数量：${count.length}`),
             ]),
             okText: '复制授权Key',

src/views/empower/install.vue

@@ -105,13 +105,13 @@
           dataIndex: 'machineUuid',
           width: 120,
         },
-        {
-          title: '设备名称',
-          ellipsis: true,
-          slots: { customRender: 'copy' },
-          dataIndex: 'machineName',
-          width: 120,
-        },
+        // {
+        //   title: '设备名称',
+        //   ellipsis: true,
+        //   slots: { customRender: 'copy' },
+        //   dataIndex: 'machineName',
+        //   width: 120,
+        // },
         {
           title: '安装Key',
           ellipsis: true,

src/views/empower/uploadModal.vue

@@ -105,7 +105,7 @@
           resetFields();
           createSuccessModal({
             title: t('layout.setting.operatingTitle'),
-            content: `安装Key：${res.updateAuthorizeKey}`,
+            content: `授权Key：${res.updateAuthorizeKey}`,
             okText: '复制',
             onOk: async () => {
               // 双击复制

src/views/productOperation/cameraScene.vue

@@ -52,6 +52,12 @@
                 onClick: handleMove.bind(null, record),
               },
               {
+                label: '解冻',
+                disabled: !record.isColdStorage || !(record.status == 1 || record.status == -2),
+                ifShow: getTypeCheckPerm('scenes-move') && tableType != 3,
+                onClick: handleColdStorage.bind(null, record),
+              },
+              {
                 label: '下载',
                 ifShow: getTypeCheckPerm('scenes-download') && tableType != 3,
                 disabled: !(record.status == 1 || (record.status == -2 && record.payStatus == 1)),
@@ -129,6 +135,7 @@
     sceneMove,
     sceneDelete,
     sceneReset,
+    sceneRestStore,
     sceneDownload,
     checkDownLoad,
     downloadProcess,
@@ -291,7 +298,7 @@
             ifShow: true,
             fixed: 'right',
             flag: 'ACTION',
-            width: 250,
+            width: 260,
           },
         ];
       }
@@ -486,21 +493,25 @@
         //   },
         // });
       }
+      async function handleColdStorage(record: Recordable) {
+        createConfirm({
+          title: '删除',
+          content: '确定要解冻场景吗？',
+          onOk: async () => {
+            sceneRestStore({ num: record.num }).then(() => {
+              message.success({
+                content: '删除成功',
+              });
+
+              reload();
+            });
+          },
+        });
+      }
       async function handleMove(record: Recordable) {
         openMoveModal(true, {
           ...record,
         });
-        // sceneMove({ snCode: record.snCode, num: record.num })
-        //   .then(() => {
-        //     message.success({
-        //       content: '迁移成功',
-        //     });
-        //   })
-        //   .catch(() => {
-        //     message.success({
-        //       content: '迁移失败',
-        //     });
-        //   });
       }
       let timer: null = ref(null);
       const downloadOption = ref<Object>({});
@@ -573,6 +584,7 @@
         handleMove,
         handleDownload,
         handleReset,
+        handleColdStorage,
         tableType,
         loading,
         reload,