xieyonghong 3 éve
szülő
commit
8241830638

+ 1 - 1
src/pages/media/SplitScreen/service.ts

@@ -14,7 +14,7 @@ export const ptzStart = (deviceId: string, channelId: string, type: string) =>
 
 // 云台控制-停止
 export const ptzStop = (deviceId: string, channelId: string) =>
-  request(`${url}/device/${deviceId}/${channelId}/_stop`, { method: 'POST' });
+  request(`${url}/device/${deviceId}/${channelId}/_ptz/STOP`, { method: 'POST' });
 
 // 云台控制-缩放、转向等
 export const ptzTool = (deviceId: string, channelId: string, direct: string, speed: number = 90) =>

+ 1 - 1
src/pages/notice/Config/index.tsx

@@ -49,7 +49,7 @@ const Config = observer(() => {
   const actionRef = useRef<ActionType>();
   // const location = useLocation<{ id: string }>();
 
-  const { permission: configPermission } = usePermissions('notice');
+  const { permission: configPermission } = usePermissions('notice/Template');
   // const id = (location as any).query?.id;
 
   const columns: ProColumns<ConfigItem>[] = [

+ 1 - 1
src/pages/notice/Template/index.tsx

@@ -49,7 +49,7 @@ const Template = observer(() => {
   // const id = (location as any).query?.id;
   const actionRef = useRef<ActionType>();
 
-  const { permission: templatePermission } = usePermissions('notice');
+  const { permission: templatePermission } = usePermissions('notice/Config');
 
   const columns: ProColumns<TemplateItem>[] = [
     {

+ 4 - 0
src/pages/system/Menu/Detail/buttons.tsx

@@ -290,6 +290,7 @@ export default (props: ButtonsProps) => {
             resetForm();
             setVisible(false);
           }}
+          bodyStyle={{ paddingBottom: 0 }}
           confirmLoading={loading}
         >
           <Form form={form} layout={'vertical'}>
@@ -340,6 +341,9 @@ export default (props: ButtonsProps) => {
                 defaultMessage: '权限',
               })}
               required={true}
+              style={{
+                marginBottom: 0,
+              }}
             >
               <Input
                 allowClear

+ 5 - 5
src/pages/system/Menu/Setting/baseMenu.ts

@@ -2768,11 +2768,11 @@ export default [
           { permission: 'media-channel', actions: ['query', 'save', 'delete'] },
         ],
         buttons: [
-          {
-            id: 'view',
-            name: '查看',
-            permissions: [{ permission: 'media-device', actions: ['query'] }],
-          },
+          // {
+          //   id: 'view',
+          //   name: '查看',
+          //   permissions: [{ permission: 'media-device', actions: ['query'] }],
+          // },
         ],
       },
       {

+ 1 - 1
src/pages/system/Menu/components/permission.less

@@ -11,7 +11,7 @@
   }
 
   .permission-content {
-    max-height: 400px;
+    max-height: 350px;
     overflow-y: auto;
 
     .permission-items {