Browse Source

fix: 访客去掉访问状态&指挥中心添加菜单权限判断

wyf 6 months ago
parent
commit
81e0287e3f

+ 2 - 0
src/hooks/useUserInfoHook.ts

@@ -12,10 +12,12 @@ export const useUserInfoHook = () => {
   const staffNo = userInfo.staffNo;
   const staffNo = userInfo.staffNo;
   const realname = userInfo.realname;
   const realname = userInfo.realname;
   const permissions = userInfo.permissions;
   const permissions = userInfo.permissions;
+  const menus = userInfo.menus;
   return {
   return {
     id,
     id,
     realname,
     realname,
     permissions,
     permissions,
     staffNo,
     staffNo,
+    menus,
   };
   };
 };
 };

+ 11 - 2
src/views/emergency/emergency-procedure/PageProcedure.vue

@@ -125,10 +125,11 @@
 
 
   const router = useRouter();
   const router = useRouter();
 
 
-  const { permissions } = useUserInfoHook();
+  const { permissions, menus } = useUserInfoHook();
   const emergencyProcedureManagePermission = ref<Boolean>(false);
   const emergencyProcedureManagePermission = ref<Boolean>(false);
   const emergencyProcedureCompletePermission = ref<Boolean>(false);
   const emergencyProcedureCompletePermission = ref<Boolean>(false);
   const emergencyCommandCenterManagePermission = ref<Boolean>(false);
   const emergencyCommandCenterManagePermission = ref<Boolean>(false);
+  const commandCenterMenuPermission = ref<Boolean>(false);
 
 
   const searchData = reactive({
   const searchData = reactive({
     emergencyType: '',
     emergencyType: '',
@@ -207,6 +208,13 @@
 
 
   // 打开指挥中心
   // 打开指挥中心
   const handleOpenCommandCenter = (row) => {
   const handleOpenCommandCenter = (row) => {
+    if (!commandCenterMenuPermission.value) {
+      ElMessage({
+        message: '请添加应急指挥中心页面菜单权限',
+        type: 'warning',
+      });
+      return;
+    }
     const routerUrl = router.resolve({
     const routerUrl = router.resolve({
       name: 'command-center',
       name: 'command-center',
       params: {
       params: {
@@ -214,7 +222,6 @@
       },
       },
     });
     });
     window.open(routerUrl.href, '_blank');
     window.open(routerUrl.href, '_blank');
-    // window.open(`#/large-screen/command-center/${row.id}`, '_blank');
   };
   };
 
 
   // 修改
   // 修改
@@ -293,6 +300,8 @@
     emergencyCommandCenterManagePermission.value = Boolean(
     emergencyCommandCenterManagePermission.value = Boolean(
       permissions.find((item: { code: string }) => item.code === EMERGENCY_PERMISSIONS.EMERGENCY_COMMAND_CENTER_MANAGE),
       permissions.find((item: { code: string }) => item.code === EMERGENCY_PERMISSIONS.EMERGENCY_COMMAND_CENTER_MANAGE),
     );
     );
+    // 指挥中心菜单权限
+    commandCenterMenuPermission.value = Boolean(menus.find((item) => item.name === '应急指挥中心页面'));
 
 
     tableConfig.maxHeight = emergencyProcedureManagePermission.value
     tableConfig.maxHeight = emergencyProcedureManagePermission.value
       ? PROCEDURE_LIST_TABLE_MAX_HEIGHT_PERMISSION
       ? PROCEDURE_LIST_TABLE_MAX_HEIGHT_PERMISSION

+ 4 - 4
src/views/security-confidentiality/person-management/outer-person/components/Visitor.vue

@@ -22,7 +22,7 @@
               />
               />
             </el-select>
             </el-select>
           </div>
           </div>
-          <div class="select-box--item">
+          <!-- <div class="select-box--item">
             <span>访问状态:</span>
             <span>访问状态:</span>
             <el-select
             <el-select
               style="width: 100px"
               style="width: 100px"
@@ -39,7 +39,7 @@
                 :disabled="item.disabled"
                 :disabled="item.disabled"
               />
               />
             </el-select>
             </el-select>
-          </div>
+          </div> -->
           <div class="select-box--item">
           <div class="select-box--item">
             <span>到访时间:</span>
             <span>到访时间:</span>
             <el-date-picker
             <el-date-picker
@@ -104,9 +104,9 @@
             : '--'
             : '--'
         }}</span>
         }}</span>
       </template>
       </template>
-      <template #visitState="scope">
+      <!-- <template #visitState="scope">
         <span>{{ VISIT_STATE_TYPE_LABEL[scope.row.visitState] || '--' }}</span>
         <span>{{ VISIT_STATE_TYPE_LABEL[scope.row.visitState] || '--' }}</span>
-      </template>
+      </template> -->
       <template #visitTime="scope">
       <template #visitTime="scope">
         <span>{{ scope.row.visitTime || '--' }}</span>
         <span>{{ scope.row.visitTime || '--' }}</span>
       </template>
       </template>

+ 7 - 7
src/views/security-confidentiality/person-management/outer-person/configs/table.ts

@@ -101,13 +101,13 @@ export const OUTER_PERSON_VISITOR_TABEL_COLUMNS: TableColumnProps[] = [
     prop: 'respondentName',
     prop: 'respondentName',
     slot: 'respondentName',
     slot: 'respondentName',
   },
   },
-  {
-    label: '访问状态',
-    align: 'center',
-    minWidth: '120px',
-    prop: 'visitState',
-    slot: 'visitState',
-  },
+  // {
+  //   label: '访问状态',
+  //   align: 'center',
+  //   minWidth: '120px',
+  //   prop: 'visitState',
+  //   slot: 'visitState',
+  // },
 
 
   {
   {
     label: '到访时间',
     label: '到访时间',

+ 3 - 3
src/views/security-confidentiality/person-management/outer-person/types.ts

@@ -36,9 +36,9 @@ export interface VisitorTableData {
   visitReason: string;
   visitReason: string;
   respondentName: string;
   respondentName: string;
   respondentNo: string;
   respondentNo: string;
-  visitState: number;
-  visitTime: string;
-  leaveTime: string;
+  visitState?: number | null;
+  visitTime?: string | null;
+  leaveTime?: string | null;
 }
 }
 
 
 export interface BreakPushConfig {
 export interface BreakPushConfig {