Merge remote-tracking branch 'origin/master'

attendance-performance-manager-ui/admin/src/views/Home.vue

@@ -16,7 +16,7 @@
                   <div>{{ homeStat.totalPersonNum }}</div>
                 </div>
                 <div class="item">
-                  <div>部门人数</div>
+                  <div>部门数量</div>
                   <div>{{ homeStat.totalDeptNum }}</div>
                 </div>
               </div>

attendance-performance-manager-ui/admin/src/views/attendance/record/hik/list.vue

@@ -28,14 +28,15 @@
         @click="lookexportHis"
         >导出记录</el-button
       >
-      <!-- <el-button
+      <el-button
         type="primary"
         size="mini"
         slot="table-head-left2"
+        v-if="showBtn"
         style="margin-left: 10px"
         @click="formatData"
         >生成打卡记录</el-button
-      > -->
+      >
     </LayoutTable>
     <dialog-show ref="dialogform" @ok="getData" />
     <el-dialog
@@ -134,7 +135,11 @@ export default {
     dialogShow,
   },
   mixins: [table],
-  created() {},
+  created() {
+    JSON.parse(sessionStorage.getItem("userData")).id == 1
+      ? (this.showBtn = true)
+      : (this.showBtn = false);
+  },
   methods: {
     // 生成打卡记录
     formatData() {
@@ -258,6 +263,7 @@ export default {
   },
   data() {
     return {
+      showBtn: false,
       upload: {
         headers: {
           Authorization: window.sessionStorage.getItem("token") || "",