From 36ae9a559cf6290de16116f0a403fae8b9b56cac Mon Sep 17 00:00:00 2001
From: cjp <3096114695@qq.com>
Date: Wed, 1 May 2024 17:19:25 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E6=96=B0=E5=A2=9E=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=E6=9D=83=E9=99=90-17:19?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/index/index.js                      |  2 +-
 .../projectFront/carManage/realTimeData.vue   |  4 ++--
 .../personModule/administration.vue           | 19 +++++++++++++++----
 .../personModule/laborComponent.vue           |  6 +++++-
 .../laborManage/personModule/temporary.vue    |  5 ++++-
 .../projectFront/laborManage/visitRecord.vue  |  5 ++---
 6 files changed, 29 insertions(+), 12 deletions(-)

diff --git a/src/pages/index/index.js b/src/pages/index/index.js
index a53bcefc..f6f126a9 100644
--- a/src/pages/index/index.js
+++ b/src/pages/index/index.js
@@ -293,7 +293,7 @@ function checkPermission(permission) {
   permissions = permissions.filter(
     (x) => x.menuName == permission.moduleName
   )[0];
-  console.log(permissions,'666777')
+  // console.log(permissions,'666777')
   if(!permissions.actionList){
     return false;
   }
diff --git a/src/views/projectFront/carManage/realTimeData.vue b/src/views/projectFront/carManage/realTimeData.vue
index b33e0026..cdc42a63 100644
--- a/src/views/projectFront/carManage/realTimeData.vue
+++ b/src/views/projectFront/carManage/realTimeData.vue
@@ -41,9 +41,9 @@
         </el-form-item>
 
         <el-form-item>
-          <el-button v-permission="{key: 'clgl_synchronizeVchicleTrafficData', moduleName: '实时数据'}" type="primary" plain @click="onSubmit">{{$t('message.deviceManage.query')}}</el-button>
+          <el-button v-permission="{key: 'clgl_query', moduleName: '实时数据'}" type="primary" plain @click="onSubmit">{{$t('message.deviceManage.query')}}</el-button>
           <el-button
-            v-permission="{key: 'clgl_query', moduleName: '实时数据'}"
+            v-permission="{key: 'clgl_synchronizeVchicleTrafficData', moduleName: '实时数据'}"
             size="medium"
             @click="updatePassData()"
             type="primary"
diff --git a/src/views/projectFront/laborManage/personModule/administration.vue b/src/views/projectFront/laborManage/personModule/administration.vue
index 5219849b..a1fe888c 100644
--- a/src/views/projectFront/laborManage/personModule/administration.vue
+++ b/src/views/projectFront/laborManage/personModule/administration.vue
@@ -53,16 +53,17 @@
             >
               {{ item.enterpriseName }}
             </div>
+            <!-- 编辑和删除企业 -->
           <div class="flex2" v-if="checkedId == item.id">
               <img
-                v-permission="{key: 'rygl_editDepartment', moduleName: '人员管理'}"
+                v-permission="{key: 'rygl_editCompany', moduleName: '人员管理'}"
                 src="@/assets/images/icon-edit.png"
                 style="margin-right: 16px"
                 class="icon"
                 @click="editEnterpriseInfo(item)"
               />
               <img
-                v-permission="{key: 'rygl_deleteDepartment', moduleName: '人员管理'}"
+                v-permission="{key: 'rygl_deleteCompany', moduleName: '人员管理'}"
                 src="@/assets/images/icon-delete.png"
                 class="icon"
                 @click="deleteEnterpriseInfo(item)"
@@ -141,6 +142,7 @@
         </div>
       </div> -->
       <div class="team_list whiteBlock flex2">
+        <!-- 新增部门 -->
         <el-button
           v-permission="{key: 'rygl_addDepartment', moduleName: '人员管理'}"
           type="primary"
@@ -188,7 +190,9 @@
             <div style="margin: 4px 0">（{{ item.workerNum }}）</div>
             <el-popover placement="bottom" min-width="80" trigger="hover">
               <div style="margin: 0; text-align: center">
+                <!-- 编辑部门 -->
                 <div
+                  v-permission="{key: 'rygl_editDepartment', moduleName: '人员管理'}"
                   style="cursor: pointer; margin-bottom: 5px"
                   @click="editTeamInfo(item)"
                 >
@@ -198,7 +202,8 @@
                   />
                   <span>{{ $t("message.laborMange.edit") }}</span>
                 </div>
-                <div style="cursor: pointer" @click="deleteTeamInfo(item)">
+                <!-- 删除部门 -->
+                <div v-permission="{key: 'rygl_deleteDepartment', moduleName: '人员管理'}" style="cursor: pointer" @click="deleteTeamInfo(item)">
                   <img
                     src="@/assets/images/icon-delete.png"
                     style="margin-right: 5px"
@@ -221,6 +226,7 @@
       </div>
       <div class="laborComponent_table_wrap whiteBlock">
         <div class="search_wrap" :class="{ flex: COMPANY != 'nanchang' }">
+          <!-- 人员导入 -->
           <el-button
             v-permission="{key: 'rygl_inputPerson', moduleName: '人员管理'}"
             type="primary"
@@ -229,6 +235,7 @@
             :disabled="checkedTeamId == 0"
             >{{ $t("message.laborMange.personnelEntry") }}</el-button
           >
+          <!-- 导出模板 -->
           <el-button v-permission="{key: 'rygl_exportTemplate', moduleName: '人员管理'}" type="primary" size="medium" @click="exportM">{{
             $t("message.laborMange.export") + $t("message.laborMange.template")
           }}</el-button>
@@ -249,10 +256,12 @@
             accept="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet,application/vnd.ms-excel"
             :auto-upload="true"
           >
+            <!-- 批量导入 -->
             <el-button v-permission="{key: 'rygl_input_pl', moduleName: '人员管理'}" size="medium" type="primary">{{
               $t("message.laborMange.bulkImport")
             }}</el-button>
           </el-upload>
+          <!-- 导入图片 -->
           <el-button
             v-permission="{key: 'rygl_ImportPhotos', moduleName: '人员管理'}"
             size="medium"
@@ -347,13 +356,15 @@
               </el-date-picker>
             </el-form-item>
             <el-form-item>
+              <!-- 查询 -->
               <el-button v-permission="{key: 'rygl_query', moduleName: '人员管理'}" type="primary" @click="inquireBtn" plain>{{
                 $t("message.laborMange.inquire")
               }}</el-button>
+              <!-- 刷新 -->
               <el-button v-permission="{key: 'rygl_refresh', moduleName: '人员管理'}" type="warning" @click="refreshBtn" plain>{{
                 $t("message.laborMange.refresh")
               }}</el-button>
-              <el-button type="primary" @click="exportFn">{{
+              <el-button v-permission="{key: 'rygl_drive', moduleName: '人员管理'}" type="primary" @click="exportFn">{{
                 $t("message.laborMange.export")
               }}</el-button>
               <el-button
diff --git a/src/views/projectFront/laborManage/personModule/laborComponent.vue b/src/views/projectFront/laborManage/personModule/laborComponent.vue
index 01746c1a..f4219ae5 100644
--- a/src/views/projectFront/laborManage/personModule/laborComponent.vue
+++ b/src/views/projectFront/laborManage/personModule/laborComponent.vue
@@ -179,6 +179,7 @@
       </div>
       <div class="laborComponent_table_wrap whiteBlock">
         <div class="search_wrap" :class="{ flex: COMPANY != 'nanchang' }">
+          <!-- 人员录入 -->
           <el-button
             v-permission="{key: 'rygl_inputPerson', moduleName: '人员管理'}"
             type="primary"
@@ -187,6 +188,7 @@
             :disabled="checkedTeamId === 0"
             >{{ $t("message.laborMange.personnelEntry") }}</el-button
           >
+          <!-- 导入模板 -->
           <el-button v-permission="{key: 'rygl_exportTemplate', moduleName: '人员管理'}" type="primary" size="medium" @click="exportM">{{
             $t("message.laborMange.export") + $t("message.laborMange.template")
           }}</el-button>
@@ -207,10 +209,12 @@
             accept="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet,application/vnd.ms-excel"
             :auto-upload="true"
           >
+            <!-- 批量导入 -->
             <el-button v-permission="{key: 'rygl_input_pl', moduleName: '人员管理'}" size="medium" type="primary">{{
               $t("message.laborMange.bulkImport")
             }}</el-button>
           </el-upload>
+          <!-- 导入图片 -->
           <el-button
             v-permission="{key: 'rygl_ImportPhotos', moduleName: '人员管理'}"
             size="medium"
@@ -318,7 +322,7 @@
                 $t("message.laborMange.refresh")
               }}</el-button>
               <!-- 导出 -->
-              <el-button type="primary" @click="exportFn">{{
+              <el-button v-permission="{key: 'rygl_drive', moduleName: '人员管理'}" type="primary" @click="exportFn">{{
                 $t("message.laborMange.export")
               }}</el-button>
               <el-button
diff --git a/src/views/projectFront/laborManage/personModule/temporary.vue b/src/views/projectFront/laborManage/personModule/temporary.vue
index 92288894..422e53f1 100644
--- a/src/views/projectFront/laborManage/personModule/temporary.vue
+++ b/src/views/projectFront/laborManage/personModule/temporary.vue
@@ -6,6 +6,7 @@
         <el-form :inline="true" class="demo-form-inline" size="medium">
           <el-form-item>
             <!-- icon="el-icon-plus" -->
+            <!-- 人员录入 -->
             <el-button v-permission="{key: 'rygl_inputPerson', moduleName: '人员管理'}" type="primary" @click="addTemporary">{{
               $t("message.laborMange.personnelEntry")
             }}</el-button>
@@ -40,9 +41,11 @@
             </el-date-picker>
           </el-form-item>
           <el-form-item>
+            <!-- 查询 -->
             <el-button v-permission="{key: 'rygl_query', moduleName: '人员管理'}" type="primary" @click="getInfoList" plain>{{
               $t("message.laborMange.inquire")
             }}</el-button>
+            <!-- 刷新 -->
             <el-button
               v-permission="{key: 'rygl_refresh', moduleName: '人员管理'}"
               type="warning"
@@ -56,7 +59,7 @@
               plain
               >{{ $t("message.laborMange.refresh") }}</el-button
             >
-            <el-button type="primary" @click="exportFn">{{$t('message.laborMange.export')}}</el-button>
+            <el-button v-permission="{key: 'rygl_drive', moduleName: '人员管理'}" type="primary" @click="exportFn">{{$t('message.laborMange.export')}}</el-button>
           </el-form-item>
         </el-form>
       </div>
diff --git a/src/views/projectFront/laborManage/visitRecord.vue b/src/views/projectFront/laborManage/visitRecord.vue
index 3c98b209..a20e076b 100644
--- a/src/views/projectFront/laborManage/visitRecord.vue
+++ b/src/views/projectFront/laborManage/visitRecord.vue
@@ -71,10 +71,10 @@
             </el-form-item>
             <span style="width: 400px;">
             <el-form-item>
-              <el-button type="primary" plain @click="loadCardData">
+              <el-button v-permission="{key: 'fkyyjl_inquiry', moduleName: '访客预约记录'}" type="primary" plain @click="loadCardData">
                 {{ $t('message.personnelPosition.beaconManage.query') }}
               </el-button>
-              <el-button type="warning" plain @click="resetForm">
+              <el-button v-permission="{key: 'fkyyjl_delete', moduleName: '访客预约记录'}" type="warning" plain @click="resetForm">
                 {{ $t('message.personnelPosition.beaconManage.refresh') }}
               </el-button>
               <!-- <el-button type="primary" @click="addPoint">
@@ -244,7 +244,6 @@
               >{{ $t('message.personnelPosition.cancel') }}
             </el-button>
             <el-button
-            v-permission="{key: 'fkyyjl_delete', moduleName: '访客预约记录'}"
               type="primary"
               icon="el-icon-circle-check"
               @click="saveCardFn"