fix

src/router/index.js

@@ -221,7 +221,7 @@ export const constantRoutes = [
         component: () => import('@/views/visitors_list/index'),
         meta: {
           title: '访客列表',
-          role: [1, 2, 3, 4, 5, 99],
+          role: [2, 3, 4, 5, 99],
           visitorType: ['2'],
           icon: 'el-icon-user'
         }
@@ -236,7 +236,7 @@ export const constantRoutes = [
         path: 'index',
         name: 'visitors_record',
         component: () => import('@/views/visitors_record/index'),
-        meta: { title: '访客记录', role: [1, 5, 99], icon: 'el-icon-date' }
+        meta: { title: '访客记录', role: [5, 99], icon: 'el-icon-date' }
       }
     ]
   },
@@ -367,7 +367,7 @@ export const constantRoutes = [
   {
     path: '/monitor_management',
     component: Layout,
-    meta: { title: '布控管理', role: [1, 2, 3, 4, 5], icon: 'el-icon-s-help' },
+    meta: { title: '布控管理', role: [2, 3, 4, 5], icon: 'el-icon-s-help' },
     children: [
       {
         path: 'monitor_management',
@@ -375,7 +375,7 @@ export const constantRoutes = [
         component: () => import('@/views/monitor_management'),
         meta: {
           title: '布控名单',
-          role: [1, 2, 3, 4, 5],
+          role: [2, 3, 4, 5],
           icon: 'el-icon-bangzhu'
         }
       },
@@ -385,7 +385,7 @@ export const constantRoutes = [
         component: () => import('@/views/warning_record'),
         meta: {
           title: '预警记录',
-          role: [1, 2, 3, 4, 5],
+          role: [2, 3, 4, 5],
           icon: 'el-icon-message-solid'
         }
       }
@@ -420,23 +420,23 @@ export const constantRoutes = [
     ]
   },
 
-  {
-    path: '/QRCode',
-    component: Layout,
-    children: [
-      {
-        path: 'index',
-        name: 'QRCode',
-        component: () => import('@/views/QRCode/index'),
-        meta: {
-          title: '二维码',
-          role: [5, 99],
-          visitorType: ['1', '2'],
-          icon: 'el-icon-s-grid'
-        }
-      }
-    ]
-  },
+  // {
+  //   path: '/QRCode',
+  //   component: Layout,
+  //   children: [
+  //     {
+  //       path: 'index',
+  //       name: 'QRCode',
+  //       component: () => import('@/views/QRCode/index'),
+  //       meta: {
+  //         title: '二维码',
+  //         role: [5, 99],
+  //         visitorType: ['1', '2'],
+  //         icon: 'el-icon-s-grid'
+  //       }
+  //     }
+  //   ]
+  // },
   {
     path: '/common_functions',
     component: Layout,
@@ -513,7 +513,7 @@ export const constantRoutes = [
         component: () => import('@/views/visitee_list/index'),
         meta: {
           title: '受访人列表',
-          role: [1, 2, 3, 4, 5, 99],
+          role: [2, 3, 4, 5, 99],
           visitorType: ['2'],
           icon: 'el-icon-user-solid'
         }

src/views/white_list/index.vue

@@ -8,6 +8,12 @@
         class="margin-left button-last"
         @click="create(2)"
       >人工录入</el-button>
+      <el-button
+        type="primary"
+        plain
+        class="margin-left"
+        @click="clickBulkRegistration"
+      >批量注册人员</el-button>
       <!--      <el-button
         type="primary"
         icon="el-icon-plus"
@@ -29,12 +35,6 @@
         name="file"
         @change="uploadFun($event)"
       ></a>
-      <el-button
-        type="primary"
-        plain
-        class="margin-left"
-        @click="clickBulkRegistration"
-      >批量注册人员</el-button>
       <el-button
         v-if="checkRole([5])"
         plain
@@ -116,8 +116,8 @@
       />
     </el-select>
     <el-input
-      v-model="page.data.deptName"
-      placeholder="请输入部门"
+      v-model="page.data.phone"
+      placeholder="请输入手机号"
       class="margin-left input"
     />
     <el-input
@@ -126,28 +126,28 @@
       class="margin-left input"
     />
     <el-input
-      v-model="page.data.phone"
-      placeholder="请输入手机号"
+      v-model="page.data.cardIdEx"
+      placeholder="请输入定位卡号"
       class="margin-left input"
     />
     <el-input
-      v-model="page.data.jobNumber"
-      placeholder="请输入工号"
+      v-model="page.data.deptName"
+      placeholder="请输入部门名称"
       class="margin-left input"
     />
     <el-input
-      v-model="page.data.cardIdEx"
-      placeholder="请输入定位卡号"
+      v-model="page.data.dutyName"
+      placeholder="请输入职务名称"
       class="margin-left input"
     />
     <el-input
-      v-model="page.data.dutyName"
-      placeholder="请输入职务"
+      v-model="page.data.workName"
+      placeholder="请输入工种名称"
       class="margin-left input"
     />
     <el-input
-      v-model="page.data.workName"
-      placeholder="请输入工种"
+      v-model="page.data.jobNumber"
+      placeholder="请输入工号"
       class="margin-left input"
     />
     <el-select
@@ -300,10 +300,11 @@
       class="margin-left"
       @click="multipleChoice = !multipleChoice"
     >多选编辑</el-button>
-    <div v-if="multipleChoice" class="m-t">
+    <div v-if="multipleChoice" class="choose-btn-box">
       <el-button
         type="primary"
         plain
+        class="margin-left"
         @click="multipleFun(1)"
       >编辑用户信息</el-button>
       <el-button
@@ -318,6 +319,9 @@
         class="margin-left"
         @click="multipleFun(3)"
       >删除选中员工</el-button>-->
+      <div class="choose-span margin-left">
+        【已选中：{{(multipleCheckedList||[]).length || 0}}&nbsp;人】
+      </div>
     </div>
     <!--主表格-->
     <el-table
@@ -379,9 +383,9 @@
           {{ scope.row.sex | matchSexNull }}
         </template>
       </el-table-column>
-      <el-table-column key="deptName" label="部门" align="center">
+      <el-table-column key="phone" label="手机号" align="center">
         <template slot-scope="scope">
-          {{ scope.row.deptName | matchNull }}
+          {{ scope.row.phone | matchNull }}
         </template>
       </el-table-column>
       <el-table-column key="ooo" label="身份证号" align="center">
@@ -389,47 +393,46 @@
           {{ scope.row.idNumber | matchNull }}
         </template>
       </el-table-column>
-      <el-table-column key="phone" label="手机号" align="center">
+      <el-table-column key="uuu" label="定位卡号" align="center">
         <template slot-scope="scope">
-          {{ scope.row.phone | matchNull }}
+          {{ scope.row.cardIdEx | matchNull }}
         </template>
       </el-table-column>
-      <el-table-column key="jobNumber" label="工号" align="center">
+      <el-table-column key="deptName" label="部门名称" align="center">
         <template slot-scope="scope">
-          {{ scope.row.jobNumber | matchNull }}
+          {{ scope.row.deptName | matchNull }}
         </template>
       </el-table-column>
-      <el-table-column key="ggg" label="有效期开始时间" align="center">
+      <el-table-column key="dutyName" label="职务名称" align="center">
         <template slot-scope="scope">
-          {{ scope.row.startTime | matchNull }}
+          {{ scope.row.dutyName | matchNull }}
         </template>
       </el-table-column>
-      <el-table-column key="hhh" label="有效期结束时间" align="center">
+      <el-table-column key="workName" label="工种名称" align="center">
         <template slot-scope="scope">
-          {{ scope.row.endTime | matchNull }}
+          {{ scope.row.workName | matchNull }}
         </template>
       </el-table-column>
-      <el-table-column key="uuu" label="定位卡号" align="center">
+      <el-table-column key="homeAddress" label="家庭住址" align="center">
         <template slot-scope="scope">
-          {{ scope.row.cardIdEx | matchNull }}
+          {{ scope.row.homeAddress | matchNull }}
         </template>
       </el-table-column>
-      <el-table-column key="dutyName" label="职务" align="center">
+      <el-table-column key="jobNumber" label="工号" align="center">
         <template slot-scope="scope">
-          {{ scope.row.dutyName | matchNull }}
+          {{ scope.row.jobNumber | matchNull }}
         </template>
       </el-table-column>
-      <el-table-column key="workName" label="工种" align="center">
+      <el-table-column key="ggg" label="有效期开始时间" align="center">
         <template slot-scope="scope">
-          {{ scope.row.workName | matchNull }}
+          {{ scope.row.startTime | matchNull }}
         </template>
       </el-table-column>
-      <el-table-column key="homeAddress" label="家庭住址" align="center">
+      <el-table-column key="hhh" label="有效期结束时间" align="center">
         <template slot-scope="scope">
-          {{ scope.row.homeAddress | matchNull }}
+          {{ scope.row.endTime | matchNull }}
         </template>
       </el-table-column>
-
       <el-table-column key="jjj" label="所属区域" align="center">
         <template slot-scope="scope">
           <span v-if="scope.row.zoneDeviceRLessVOList.length > 0">
@@ -607,7 +610,7 @@
               effect="dark"
               :manual="false"
               :value="showTooltip"
-              content="填写微信绑定手机号,用户可通过小程序实名认证(手机号/身份证号/卡号必须选填一项)"
+              content="填写微信绑定手机号,用户可通过小程序实名认证(手机号/身份证号/定位卡号必须选填一项)"
               placement="right"
             >
               <el-form-item
@@ -632,7 +635,7 @@
               effect="dark"
               :manual="false"
               :value="showTooltip"
-              content="填写身份证号,用户可通过在人脸终端刷身份证号或小程序实名认证(手机号/身份证号/卡号必须选填一项)"
+              content="填写身份证号,用户可通过在人脸终端刷身份证号或小程序实名认证(手机号/身份证号/定位卡号必须选填一项)"
               placement="right"
             >
               <el-form-item label="证件号" prop="idNumber">
@@ -660,7 +663,7 @@
             class="wrap-content__item"
           >
             <el-form-item
-              label="卡号"
+              label="定位卡号"
               prop="cardIdEx"
             >
               <el-tooltip
@@ -668,12 +671,12 @@
                 effect="dark"
                 :manual="false"
                 :value="showTooltip"
-                content="填写卡号,用户可通过在人脸终端刷卡号(手机号/身份证号/卡号必须选填一项)"
+                content="填写定位卡号,用户可通过在人脸终端刷定位卡号(手机号/身份证号/定位卡号必须选填一项)"
                 placement="right"
               >
                 <el-input
                   v-model="user_form.cardIdEx"
-                  placeholder="请输入卡号"
+                  placeholder="请输入定位卡号"
                 />
               </el-tooltip>
             </el-form-item>
@@ -2850,6 +2853,14 @@ export default {
 </script>
 
 <style scoped lang="scss">
+.choose-btn-box {
+  display: flex;
+  align-items: center;
+  .choose-span {
+    color: #2F394E;
+    font-size: 15px;
+  }
+}
 .table {
   margin-top: 15px;
 }