From 9b5b689e4523b87ada57363216df8af04e62ca74 Mon Sep 17 00:00:00 2001
From: jl-zhoujl2 <jl-zhoujl2@chinaunicom.cn>
Date: Tue, 15 Nov 2022 10:28:57 +0800
Subject: [PATCH] =?UTF-8?q?11.15=20=E7=94=B5=E5=AD=90=E8=AF=84=E6=A0=87?=
 =?UTF-8?q?=E5=AE=A4=E6=A8=A1=E5=9D=97=E5=A2=9E=E5=8A=A0=E6=9D=83=E9=99=90?=
 =?UTF-8?q?=E5=AD=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ElecEvaluation/AbnormalAlarm/index.tsx    |   5 +-
 .../AppointmentManage/index.tsx               |  13 +-
 .../ElecEvalReserve/MyReserve.tsx             |   5 +-
 .../ElecEvaluation/ElecEvalReserve/index.tsx  |   7 +-
 .../EvalSiteManage/PersonReport/index.tsx     |   3 +-
 .../SiteUser/components/GroupPermission.tsx   | 169 ++++++++---------
 .../SiteUser/components/UserPermission.tsx    | 175 +++++++++---------
 .../Online/components/OnlineSupervision.tsx   |   5 +-
 .../Online/components/ReservedItems.tsx       | 103 ++++++-----
 .../VideoMonitor/Post/index.tsx               |  11 +-
 10 files changed, 253 insertions(+), 243 deletions(-)

diff --git a/src/pages/ElecEvaluation/AbnormalAlarm/index.tsx b/src/pages/ElecEvaluation/AbnormalAlarm/index.tsx
index 5018166..6c1227b 100644
--- a/src/pages/ElecEvaluation/AbnormalAlarm/index.tsx
+++ b/src/pages/ElecEvaluation/AbnormalAlarm/index.tsx
@@ -3,6 +3,7 @@ import { message, PageHeader, Button, Spin } from 'antd';
 import ProTable, { ProColumns, ActionType } from '@ant-design/pro-table';
 import { getPage, handleAlarm } from './service';
 import ViewEvalAlarmUpdateModal from '../../Evaluation/BidControl/BidControlManager/components/ViewEvalAlarmUpdateModal';
+import { btnAuthority } from '@/utils/authority';
 
 
 interface alarmData {
@@ -82,10 +83,10 @@ const AbnormalAalarm: React.FC<{}> = () => {
       render: (_, record) => {
         if (record.type === "1") {
           if (record.status === "0") {
-            return <Button type="text" onClick={() => { handle(record); }}>处理</Button>
+            return !btnAuthority(["ebtp-site-supervision"]) && <Button type="text" onClick={() => { handle(record); }}>处理</Button>
           }
         } else {
-          return (<Button type='text' onClick={() => { EnvData(record); setViewDetailModalVisible(true); }}>查看详情</Button>
+          return (!btnAuthority(["ebtp-site-supervision"]) && <Button type='text' onClick={() => { EnvData(record); setViewDetailModalVisible(true); }}>查看详情</Button>
           )
         }
       }
diff --git a/src/pages/ElecEvaluation/AppointmentManage/index.tsx b/src/pages/ElecEvaluation/AppointmentManage/index.tsx
index e3a9a6a..b92e594 100644
--- a/src/pages/ElecEvaluation/AppointmentManage/index.tsx
+++ b/src/pages/ElecEvaluation/AppointmentManage/index.tsx
@@ -7,6 +7,7 @@ import MeetingReservation from '@/components/ElecBidEvaluation/MeetingReservatio
 import { getRecordData, getSiteList } from './service';
 import { isEmpty } from '@/utils/CommonUtils';
 import { getSessionRoleData } from '@/utils/session';
+import { btnAuthority } from '@/utils/authority';
 
 const orange_bg = { background: '#ffbc83', color: '#333333', cursor: 'pointer', width: '100%', overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap' };
 const light_orange_bg = { background: '#faf7e5' };
@@ -45,7 +46,7 @@ const ScreenTable = (props: { record: any, onCellClick: (id: any) => void, refre
                 onCell: (record) => {
                     return {
                         style: record[ite.id]?.iskssj ? orange_bg : light_orange_bg,
-                        onClick: record[ite.id]?.iskssj ? () => onCellClick(record[ite.id]) : void 0,
+                        onClick: !btnAuthority(["ebtp-appointment", "ebtp-site-admin"]) && record[ite.id]?.iskssj ? () => onCellClick(record[ite.id]) : void 0,
                     }
                 },
                 render: (_: any, record: any) => {
@@ -86,14 +87,14 @@ const ScreenTable = (props: { record: any, onCellClick: (id: any) => void, refre
         <div>
             {tableData.length > 0 && (
                 <div style={{ display: 'flex', justifyContent: 'space-between', alignItems: 'center', paddingBottom: 16 }}>
-                    <Space>
+                    {!btnAuthority(["ebtp-appointment", "ebtp-site-admin"]) && <Space>
                         <Button key="last-week" size='small' type="primary" onClick={() => weekChange("0")}>
                             上一周
                         </Button>
                         <Button key="after-week" size='small' type="primary" onClick={() => weekChange("1")}>
                             下一周
                         </Button>
-                    </Space>
+                    </Space>}
                     <Space size="middle">
                         <div style={align_middle}><Tag color="#faf7e5" style={tag_size}></Tag>可预约{roleCode == "ebtp-appointment" ? "会议室" : "电子评标室"}</div>
                         <div style={align_middle}><Tag color="#ffbc83" style={tag_size}></Tag>已预约{roleCode == "ebtp-appointment" ? "会议室" : "电子评标室"}</div>
@@ -172,15 +173,15 @@ export default () => {
         <Card title={roleCode == "ebtp-appointment" ? "会议室预约情况" : "评标室预约情况"} bodyStyle={{ padding: '16px 0px', height: window.innerHeight - 120, overflowY: 'auto' }}>
             <div style={{ display: 'flex', justifyContent: 'space-between', alignItems: 'center', padding: '0 36px 16px' }}>
                 <Space>
-                    <Button key="yuyue" type="primary" onClick={() => createMeet()}>
+                    {!btnAuthority(["ebtp-appointment", "ebtp-site-admin"]) && <Button key="yuyue" type="primary" onClick={() => createMeet()}>
                         预约
-                    </Button>
+                    </Button>}
                     {roleCode == "ebtp-appointment" ? (//预约人员
                         <Button key="myyuyue" onClick={() => MyReserveContent()}>
                             我的预约
                         </Button>
                     ) : (
-                        <Button key="yuyueconfirm" onClick={() => viewMeetContent()}>
+                        !btnAuthority(["ebtp-site-admin"]) && <Button key="yuyueconfirm" onClick={() => viewMeetContent()}>
                             查看预约详情
                         </Button>
                     )}
diff --git a/src/pages/ElecEvaluation/ElecEvalReserve/MyReserve.tsx b/src/pages/ElecEvaluation/ElecEvalReserve/MyReserve.tsx
index 4e8d0f2..56a5a61 100644
--- a/src/pages/ElecEvaluation/ElecEvalReserve/MyReserve.tsx
+++ b/src/pages/ElecEvaluation/ElecEvalReserve/MyReserve.tsx
@@ -7,6 +7,7 @@ import { getURLInformation, isNotEmpty } from '@/utils/CommonUtils';
 import MeetingReservation from '@/components/ElecBidEvaluation/MeetingReservation';
 import moment from 'moment';
 import { dateTimeFormatter } from '@/utils/DateUtils';
+import { btnAuthority } from '@/utils/authority';
 
 const MyReserve: React.FC<{}> = () => {
   const meetingRelationRef = useRef<ActionType>(); //操作数据后刷新列表
@@ -139,7 +140,7 @@ const MyReserve: React.FC<{}> = () => {
       search: false,
       render: (text: any, record: any) => {
         return (
-          <>
+          !btnAuthority(["ebtp-appointment"]) && <>
             <Button type="text" onClick={() => viewMeet(record)} danger>
               查看
             </Button>
@@ -211,7 +212,7 @@ const MyReserve: React.FC<{}> = () => {
                   >
                     {searchConfig?.searchText}
                   </Button>,
-                  <Button
+                  !btnAuthority(["ebtp-appointment"]) && <Button
                     key="addText"
                     type="primary"
                     onClick={() => createMeet()}
diff --git a/src/pages/ElecEvaluation/ElecEvalReserve/index.tsx b/src/pages/ElecEvaluation/ElecEvalReserve/index.tsx
index e7a5ed4..fd98438 100644
--- a/src/pages/ElecEvaluation/ElecEvalReserve/index.tsx
+++ b/src/pages/ElecEvaluation/ElecEvalReserve/index.tsx
@@ -7,6 +7,7 @@ import { getURLInformation, isNotEmpty } from '@/utils/CommonUtils';
 import MeetingReservation from '@/components/ElecBidEvaluation/MeetingReservation';
 import moment from 'moment';
 import { dateTimeFormatter } from '@/utils/DateUtils';
+import { btnAuthority } from '@/utils/authority';
 
 const { TabPane } = Tabs;
 const statusEnum = {
@@ -166,7 +167,7 @@ const Index: React.FC<{}> = () => {
       search: false,
       render: (text: any, record: any) => {
         return (
-          <>
+          !btnAuthority(["ebtp-site-admin"]) && <>
             <Button type="text" onClick={() => viewMeet(record)} danger>
               查看
             </Button>
@@ -254,7 +255,7 @@ const Index: React.FC<{}> = () => {
       search: false,
       render: (text: any, record: any) => {
         return (
-          <>
+          !btnAuthority(["ebtp-site-admin"]) && <>
             <Button type="text" onClick={() => viewMeet(record)} danger>
               查看
             </Button>
@@ -392,7 +393,7 @@ const Index: React.FC<{}> = () => {
                       >
                         {searchConfig?.searchText}
                       </Button>,
-                      <Button
+                      !btnAuthority(["ebtp-site-admin"]) && <Button
                         key="addText"
                         type="primary"
                         onClick={() => createMeet()}
diff --git a/src/pages/ElecEvaluation/EvalSiteManage/PersonReport/index.tsx b/src/pages/ElecEvaluation/EvalSiteManage/PersonReport/index.tsx
index 7aff0ed..2685a6c 100644
--- a/src/pages/ElecEvaluation/EvalSiteManage/PersonReport/index.tsx
+++ b/src/pages/ElecEvaluation/EvalSiteManage/PersonReport/index.tsx
@@ -3,6 +3,7 @@ import ProTable, { ActionType } from '@ant-design/pro-table';
 import { getList } from './service';
 import { Card, Spin } from 'antd';
 import PersonReportModal from './components/PersonReportModal';
+import { btnAuthority } from '@/utils/authority';
 
 const PersonReport: React.FC<{}> = () => {
   const checkRelationRef = useRef<ActionType>(); //操作数据后刷新列表
@@ -86,7 +87,7 @@ const PersonReport: React.FC<{}> = () => {
       width: 80,
       render: (text: any, record: any) => {
         return (
-          <>
+          !btnAuthority(["ebtp-site-admin"]) && <>
             <a onClick={() => setFormVals(record)}>查看详情</a>
           </>
         )
diff --git a/src/pages/ElecEvaluation/EvalSiteManage/SiteUser/components/GroupPermission.tsx b/src/pages/ElecEvaluation/EvalSiteManage/SiteUser/components/GroupPermission.tsx
index e3eaf7e..4e78980 100644
--- a/src/pages/ElecEvaluation/EvalSiteManage/SiteUser/components/GroupPermission.tsx
+++ b/src/pages/ElecEvaluation/EvalSiteManage/SiteUser/components/GroupPermission.tsx
@@ -4,6 +4,7 @@ import { getGroupPageList, saveSiteGroup, delSiteGroup } from '../service';
 import { Button, Form, message, Spin, Popconfirm } from 'antd';
 import SiteGroupModal from './SiteGroupModal';
 import AuthorizeModal from './AuthorizeModal';
+import { btnAuthority } from '@/utils/authority';
 
 
 const GroupPermission: React.FC<{}> = () => {
@@ -48,7 +49,7 @@ const GroupPermission: React.FC<{}> = () => {
       width: '30%',
       render: (text: any, record: any) => {
         return (
-          <>
+          !btnAuthority(["ebtp-site-admin"]) && <>
             <a onClick={() => setFormVals(record)}>编辑</a>
             <a onClick={() => setAuthorize(record)}>授权管理</a>
             <Popconfirm placement="topRight" title={"当前分组下所有人员将会同时删除，确定删除么？"} onConfirm={async () => { delPerson(record.id); }} okText="确定" cancelText="取消" ><a > 删除 </a></Popconfirm>
@@ -104,93 +105,93 @@ const GroupPermission: React.FC<{}> = () => {
 
   return (
     <>
-    <div className="confirm zjl-entrust" style={{ height: window.innerHeight - 169, overflowY: 'auto' }}>
-      <Spin spinning={spinning}>
-          
-      <ProTable
-        actionRef={checkRelationRef}
-        columns={columns}
-        options={false}
-        size='small'
-        search={{
-          labelWidth: 100,
-          // defaultCollapsed: false,//是否展开搜索条件
-          optionRender: (searchConfig, formProps, dom) => [
-            ...dom.reverse(),
-            <Button key="out" type="primary" onClick={() => insertSitePerson()}>
-              新增
-            </Button>,
-          ],
-        }}
+      <div className="confirm zjl-entrust" style={{ height: window.innerHeight - 169, overflowY: 'auto' }}>
+        <Spin spinning={spinning}>
 
-        request={(params) => {
-          let trueParams = {
-            ...params,
-            pageNo: params.current,
-          }
-          return new Promise<any>((resolve, reject) => {
-            getGroupPageList(trueParams).then(res => {
-              if (res.code === 200) {
-                resolve({
-                  data: res.data.records,
-                  success: res.success,
-                  total: res.data.total,
-                })
-              } else {
-                resolve({
-                  data: [],
-                  success: false,
-                  total: 0,
-                })
+          <ProTable
+            actionRef={checkRelationRef}
+            columns={columns}
+            options={false}
+            size='small'
+            search={{
+              labelWidth: 100,
+              // defaultCollapsed: false,//是否展开搜索条件
+              optionRender: (searchConfig, formProps, dom) => [
+                ...dom.reverse(),
+                !btnAuthority(["ebtp-site-admin"]) && <Button key="out" type="primary" onClick={() => insertSitePerson()}>
+                  新增
+                </Button>,
+              ],
+            }}
+
+            request={(params) => {
+              let trueParams = {
+                ...params,
+                pageNo: params.current,
               }
-            })
-          });
-        }}
-        pagination={{ defaultPageSize: 10, showSizeChanger: false }}//默认显示条数
-      />
-        {/* 新增及编辑Modal */}
-        {
-          isEditModalVisible ?
-            <SiteGroupModal
-              title={typename+"分组信息"}
-              type={type}
-              modalVisible={isEditModalVisible}
-              values={editForm}
-              onSubmit={async (value: any) => {
-                await saveSiteGroup(value).then((res: any) => {
-                  if (res.success === true) {
-                    message.success("保存成功！");
-                    setIsEditModalVisible(false);
-                    setEditForm({});
-                    checkRelationRef.current?.reload();
+              return new Promise<any>((resolve, reject) => {
+                getGroupPageList(trueParams).then(res => {
+                  if (res.code === 200) {
+                    resolve({
+                      data: res.data.records,
+                      success: res.success,
+                      total: res.data.total,
+                    })
+                  } else {
+                    resolve({
+                      data: [],
+                      success: false,
+                      total: 0,
+                    })
                   }
-                });
-              }}
-              onCancel={() => {
-                setIsEditModalVisible(!isEditModalVisible);
-                setEditForm({});
-              }}
-            ></SiteGroupModal>
-            : null
-        }
-        {/* 授权Modal */}
-        {
-          isAuthorizeModalVisible ?
-            <AuthorizeModal
-              title={"授权管理"}
-              modalVisible={isAuthorizeModalVisible}
-              values={editForm}
-              type={editForm.groupType}
-              level={"group"}
-              onCancel={() => {
-                setAuthorizeModalVisible(!isAuthorizeModalVisible);
-                setEditForm({});
-              }}
-            ></AuthorizeModal>
-            : null
-        }
+                })
+              });
+            }}
+            pagination={{ defaultPageSize: 10, showSizeChanger: false }}//默认显示条数
+          />
+          {/* 新增及编辑Modal */}
+          {
+            isEditModalVisible ?
+              <SiteGroupModal
+                title={typename + "分组信息"}
+                type={type}
+                modalVisible={isEditModalVisible}
+                values={editForm}
+                onSubmit={async (value: any) => {
+                  await saveSiteGroup(value).then((res: any) => {
+                    if (res.success === true) {
+                      message.success("保存成功！");
+                      setIsEditModalVisible(false);
+                      setEditForm({});
+                      checkRelationRef.current?.reload();
+                    }
+                  });
+                }}
+                onCancel={() => {
+                  setIsEditModalVisible(!isEditModalVisible);
+                  setEditForm({});
+                }}
+              ></SiteGroupModal>
+              : null
+          }
+          {/* 授权Modal */}
+          {
+            isAuthorizeModalVisible ?
+              <AuthorizeModal
+                title={"授权管理"}
+                modalVisible={isAuthorizeModalVisible}
+                values={editForm}
+                type={editForm.groupType}
+                level={"group"}
+                onCancel={() => {
+                  setAuthorizeModalVisible(!isAuthorizeModalVisible);
+                  setEditForm({});
+                }}
+              ></AuthorizeModal>
+              : null
+          }
 
-      </Spin>
+        </Spin>
       </div>
     </>
   );
diff --git a/src/pages/ElecEvaluation/EvalSiteManage/SiteUser/components/UserPermission.tsx b/src/pages/ElecEvaluation/EvalSiteManage/SiteUser/components/UserPermission.tsx
index f98e8ed..c81f220 100644
--- a/src/pages/ElecEvaluation/EvalSiteManage/SiteUser/components/UserPermission.tsx
+++ b/src/pages/ElecEvaluation/EvalSiteManage/SiteUser/components/UserPermission.tsx
@@ -4,6 +4,7 @@ import { getUserList, saveSiteUser, delSiteUser, getGroupList } from '../service
 import { Button, Form, message, Spin, Popconfirm } from 'antd';
 import SiteUserModal from './SiteUserModal';
 import AuthorizeModal from './AuthorizeModal';
+import { btnAuthority } from '@/utils/authority';
 
 
 const UserPermission: React.FC<{}> = () => {
@@ -65,7 +66,7 @@ const UserPermission: React.FC<{}> = () => {
         // 是否关联分组：0-否，1-是
         if (record.groupStatus == '0') {
           return (
-            <>
+            !btnAuthority(["ebtp-site-admin"]) && <>
               <a onClick={() => setFormVals(record)}>编辑</a>
               <a onClick={() => setAuthorize(record)}>授权管理</a>
               <Popconfirm placement="topRight" title={"确定删除么？"} onConfirm={async () => { delUser(record.id); }} okText="确定" cancelText="取消" ><a > 删除 </a></Popconfirm>
@@ -73,13 +74,13 @@ const UserPermission: React.FC<{}> = () => {
           )
         } else if (record.groupStatus == '1') {
           return (
-            <>
+            !btnAuthority(["ebtp-site-admin"]) && <>
               <a onClick={() => setFormVals(record)}>编辑</a>
               <Popconfirm placement="topRight" title={"确定删除么？"} onConfirm={async () => { delUser(record.id); }} okText="确定" cancelText="取消" ><a > 删除 </a></Popconfirm>
             </>
           )
         } else {
-          return(<></>)
+          return (<></>)
         }
       }
     },
@@ -142,94 +143,94 @@ const UserPermission: React.FC<{}> = () => {
 
   return (
     <>
-    <div className="confirm zjl-entrust" style={{ height: window.innerHeight - 169, overflowY: 'auto' }}>
-      <Spin spinning={spinning}>
-          
-      <ProTable
-        actionRef={checkRelationRef}
-        columns={columns}
-        options={false}
-        size='small'
-        search={{
-          labelWidth: 100,
-          // defaultCollapsed: false,//是否展开搜索条件
-          optionRender: (searchConfig, formProps, dom) => [
-            ...dom.reverse(),
-            <Button key="out" type="primary" onClick={() => insertSiteUser()}>
-              新增
-            </Button>,
-          ],
-        }}
+      <div className="confirm zjl-entrust" style={{ height: window.innerHeight - 169, overflowY: 'auto' }}>
+        <Spin spinning={spinning}>
 
-        request={(params) => {
-          let trueParams = {
-            ...params,
-            pageNo: params.current,
-          }
-          return new Promise<any>((resolve, reject) => {
-            getUserList(trueParams).then(res => {
-              if (res.code === 200) {
-                resolve({
-                  data: res.data.records,
-                  success: res.success,
-                  total: res.data.total,
-                })
-              } else {
-                resolve({
-                  data: [],
-                  success: false,
-                  total: 0,
-                })
+          <ProTable
+            actionRef={checkRelationRef}
+            columns={columns}
+            options={false}
+            size='small'
+            search={{
+              labelWidth: 100,
+              // defaultCollapsed: false,//是否展开搜索条件
+              optionRender: (searchConfig, formProps, dom) => [
+                ...dom.reverse(),
+                !btnAuthority(["ebtp-site-admin"]) && <Button key="out" type="primary" onClick={() => insertSiteUser()}>
+                  新增
+                </Button>,
+              ],
+            }}
+
+            request={(params) => {
+              let trueParams = {
+                ...params,
+                pageNo: params.current,
               }
-            })
-          });
-        }}
-        pagination={{ defaultPageSize: 10, showSizeChanger: false }}//默认显示条数
-      />
-        {/* 新增及编辑银行账号Modal */}
-        {
-          isEditModalVisible ?
-            <SiteUserModal
-              title={typename+"人员信息"}
-              type={type}
-              modalVisible={isEditModalVisible}
-              groupList={groupList}
-              values={editForm}
-              onSubmit={async (value: any) => {
-                await saveSiteUser(value).then((res: any) => {
-                  if (res.success === true) {
-                    message.success("保存成功！");
-                    setIsEditModalVisible(false);
-                    setEditForm({});
-                    checkRelationRef.current?.reload();
+              return new Promise<any>((resolve, reject) => {
+                getUserList(trueParams).then(res => {
+                  if (res.code === 200) {
+                    resolve({
+                      data: res.data.records,
+                      success: res.success,
+                      total: res.data.total,
+                    })
+                  } else {
+                    resolve({
+                      data: [],
+                      success: false,
+                      total: 0,
+                    })
                   }
-                });
-              }}
-              onCancel={() => {
-                setIsEditModalVisible(!isEditModalVisible);
-                setEditForm({});
-              }}
-            ></SiteUserModal>
-            : null
-        }
-        {/* 授权Modal */}
-        {
-          isAuthorizeModalVisible ?
-            <AuthorizeModal
-              title={"授权管理"}
-              modalVisible={isAuthorizeModalVisible}
-              values={editForm}
-              type={editForm.personType}
-              level={"user"}
-              onCancel={() => {
-                setAuthorizeModalVisible(!isAuthorizeModalVisible);
-                setEditForm({});
-              }}
-            ></AuthorizeModal>
-            : null
-        }
+                })
+              });
+            }}
+            pagination={{ defaultPageSize: 10, showSizeChanger: false }}//默认显示条数
+          />
+          {/* 新增及编辑银行账号Modal */}
+          {
+            isEditModalVisible ?
+              <SiteUserModal
+                title={typename + "人员信息"}
+                type={type}
+                modalVisible={isEditModalVisible}
+                groupList={groupList}
+                values={editForm}
+                onSubmit={async (value: any) => {
+                  await saveSiteUser(value).then((res: any) => {
+                    if (res.success === true) {
+                      message.success("保存成功！");
+                      setIsEditModalVisible(false);
+                      setEditForm({});
+                      checkRelationRef.current?.reload();
+                    }
+                  });
+                }}
+                onCancel={() => {
+                  setIsEditModalVisible(!isEditModalVisible);
+                  setEditForm({});
+                }}
+              ></SiteUserModal>
+              : null
+          }
+          {/* 授权Modal */}
+          {
+            isAuthorizeModalVisible ?
+              <AuthorizeModal
+                title={"授权管理"}
+                modalVisible={isAuthorizeModalVisible}
+                values={editForm}
+                type={editForm.personType}
+                level={"user"}
+                onCancel={() => {
+                  setAuthorizeModalVisible(!isAuthorizeModalVisible);
+                  setEditForm({});
+                }}
+              ></AuthorizeModal>
+              : null
+          }
 
-      </Spin>
+        </Spin>
       </div>
     </>
   );
diff --git a/src/pages/ElecEvaluation/VideoMonitor/Online/components/OnlineSupervision.tsx b/src/pages/ElecEvaluation/VideoMonitor/Online/components/OnlineSupervision.tsx
index 303313e..210d64b 100644
--- a/src/pages/ElecEvaluation/VideoMonitor/Online/components/OnlineSupervision.tsx
+++ b/src/pages/ElecEvaluation/VideoMonitor/Online/components/OnlineSupervision.tsx
@@ -5,6 +5,7 @@ import React, { useRef, useState } from 'react';
 import { useHistory } from 'umi';
 import ViewModal from '../../ViewModal';
 import { getPage } from '../../service';
+import { btnAuthority } from '@/utils/authority';
 
 /**
  * 在线监督列表
@@ -115,7 +116,7 @@ const OnlineSupervision: React.FC<{}> = () => {
             width: '9%',
             render: (_: any, record: any) =>
             (
-                <>
+                !btnAuthority(["ebtp-site-supervision"]) && <>
                     <Button
                         key="viewDetails"
                         type="text"
@@ -153,7 +154,7 @@ const OnlineSupervision: React.FC<{}> = () => {
                         spinSet(true);
                         return await getPage({
                             ...params,
-                            pageNo: pageData.pageNo, 
+                            pageNo: pageData.pageNo,
                             pageSize: pageData.pageSize,
                             queryType: 1,
                             areaRoomName: params.areaName
diff --git a/src/pages/ElecEvaluation/VideoMonitor/Online/components/ReservedItems.tsx b/src/pages/ElecEvaluation/VideoMonitor/Online/components/ReservedItems.tsx
index 250ecce..83c7055 100644
--- a/src/pages/ElecEvaluation/VideoMonitor/Online/components/ReservedItems.tsx
+++ b/src/pages/ElecEvaluation/VideoMonitor/Online/components/ReservedItems.tsx
@@ -5,6 +5,7 @@ import React, { useRef, useState } from 'react';
 import { useHistory } from 'umi';
 import ViewModal from '../../ViewModal';
 import { getPage } from '../../service';
+import { btnAuthority } from '@/utils/authority';
 
 /**
  * 预约项目列表
@@ -21,7 +22,7 @@ const ReservedItems: React.FC<{}> = () => {
     });
     const history = useHistory();
     const viewModalRef = useRef(null);
-    
+
     //查看详情
     const viewDetails = (record: any) => {
         setVisible(true);
@@ -34,51 +35,51 @@ const ReservedItems: React.FC<{}> = () => {
     }
 
     const columns: ProColumns<any>[] = [
-    {
-        valueType: 'index',
-        align: 'center',
-        hideInSearch: true,
-    },
-    {
-        title: '项目名称',
-        align: 'center',
-        dataIndex: 'projectName',
-        width: '20%',
-        hideInSearch: false,
-    },
-    {
-        title: '项目编号',
-        align: 'center',
-        dataIndex: 'projectNum',
-        hideInSearch: true,
-    },
-    {
-        title: '标段',
-        align: 'center',
-        dataIndex: 'packageNames',
-        hideInSearch: true,
-    },
-    {
-        title: '评审室名称',
-        align: 'center',
-        dataIndex: 'areaName',
-        hideInSearch: false,
-        width: '10%',
-    },
-    {
-        title: '预计评标开始时间',
-        align: 'center',
-        dataIndex: 'reserveStartDate',
-        hideInSearch: true,
-        width: '15%',
-    },
-    {
-        title: '预计评标结束时间',
-        align: 'center',
-        dataIndex: 'reserveEndDate',
-        hideInSearch: true,
-        width: '9.5%',
-    },
+        {
+            valueType: 'index',
+            align: 'center',
+            hideInSearch: true,
+        },
+        {
+            title: '项目名称',
+            align: 'center',
+            dataIndex: 'projectName',
+            width: '20%',
+            hideInSearch: false,
+        },
+        {
+            title: '项目编号',
+            align: 'center',
+            dataIndex: 'projectNum',
+            hideInSearch: true,
+        },
+        {
+            title: '标段',
+            align: 'center',
+            dataIndex: 'packageNames',
+            hideInSearch: true,
+        },
+        {
+            title: '评审室名称',
+            align: 'center',
+            dataIndex: 'areaName',
+            hideInSearch: false,
+            width: '10%',
+        },
+        {
+            title: '预计评标开始时间',
+            align: 'center',
+            dataIndex: 'reserveStartDate',
+            hideInSearch: true,
+            width: '15%',
+        },
+        {
+            title: '预计评标结束时间',
+            align: 'center',
+            dataIndex: 'reserveEndDate',
+            hideInSearch: true,
+            width: '9.5%',
+        },
         {
             title: '状态',
             align: 'center',
@@ -113,7 +114,7 @@ const ReservedItems: React.FC<{}> = () => {
             width: '4.5%',
             render: (_: any, record: any) =>
             (
-                <>
+                !btnAuthority(["ebtp-site-supervision"]) && <>
                     <Button
                         key="viewDetails"
                         type="text"
@@ -142,7 +143,7 @@ const ReservedItems: React.FC<{}> = () => {
                         spinSet(true);
                         return await getPage({
                             ...params,
-                            pageNo: pageData.pageNo, 
+                            pageNo: pageData.pageNo,
                             pageSize: pageData.pageSize,
                             queryType: 0,
                             areaRoomName: params.areaName
@@ -158,8 +159,8 @@ const ReservedItems: React.FC<{}> = () => {
                         }).finally(() => {
                             isNotEmpty(window.location.search) && history.push(window.location.pathname);
                             spinSet(false);
-                        })     
-                        }
+                        })
+                    }
                     }
                     pagination={{
                         defaultPageSize: 10,
@@ -174,7 +175,7 @@ const ReservedItems: React.FC<{}> = () => {
                     rowKey={"id"}
                 />
             </div>
-            <ViewModal modalVisible = {visible} showStatus={false} onCancel = {()=> closeViewDetails()} ref = {viewModalRef}/>
+            <ViewModal modalVisible={visible} showStatus={false} onCancel={() => closeViewDetails()} ref={viewModalRef} />
         </Spin>
     )
 }
diff --git a/src/pages/ElecEvaluation/VideoMonitor/Post/index.tsx b/src/pages/ElecEvaluation/VideoMonitor/Post/index.tsx
index de82073..f114adb 100644
--- a/src/pages/ElecEvaluation/VideoMonitor/Post/index.tsx
+++ b/src/pages/ElecEvaluation/VideoMonitor/Post/index.tsx
@@ -1,10 +1,11 @@
 import { isNotEmpty } from '@/utils/CommonUtils';
 import ProTable, { ProColumns } from '@ant-design/pro-table';
-import { Button, Spin, message } from 'antd';
+import { Button, Spin, message, Card } from 'antd';
 import React, { useRef, useState } from 'react';
 import { useHistory } from 'umi';
 import ViewModal from '../ViewModal';
 import { getPage } from '../service';
+import { btnAuthority } from '@/utils/authority';
 
 /**
  * 事后监督列表
@@ -117,7 +118,7 @@ const PostSupervision: React.FC<{}> = () => {
             width: '10%',
             render: (_: any, record: any) =>
             (
-                <>
+                !btnAuthority(["ebtp-after-supervision"]) && <>
                     <Button
                         key="viewDetails"
                         type="text"
@@ -143,7 +144,7 @@ const PostSupervision: React.FC<{}> = () => {
 
     return (
         <Spin spinning={spin}>
-            <div className="zjl-entrust confirm">
+            <Card className="zjl-entrust confirm">
                 <ProTable
                     columns={columns}
                     options={false}
@@ -155,7 +156,7 @@ const PostSupervision: React.FC<{}> = () => {
                         spinSet(true);
                         return await getPage({
                             ...params,
-                            pageNo: pageData.pageNo, 
+                            pageNo: pageData.pageNo,
                             pageSize: pageData.pageSize,
                             queryType: 2,
                             areaRoomName: params.areaName
@@ -186,7 +187,7 @@ const PostSupervision: React.FC<{}> = () => {
                     onReset={() => { pageDataSet({ pageNo: 1, pageSize: 10 }) }}
                     rowKey={"id"}
                 />
-            </div>
+            </Card>
             <ViewModal modalVisible={visible} showStatus={true} onCancel={() => closeViewDetails()} ref={viewModalRef} />
         </Spin>
     )