Merge branch 'dev' of http://192.168.0.75:3000/bonus/gz-att-web-new into dev

src/views/system/userInfo/index.vue

@@ -99,21 +99,26 @@
               @click="handleResetPwd(scope.row)"
             >重置密码</el-button>
 
-            <el-button
-              size="mini"
-              type="warning"
-              v-if="scope.row.isFace ==0 "
-              v-hasPermi="['system:user:isFace']"
-              @click="handleResetIsFace(scope.row)"
-            >人脸权限录入权限</el-button>
+            <el-tooltip content="授予用户更新人脸权限" placement="top">
+              <el-button
+                size="mini"
+                type="warning"
+                v-if="scope.row.isFace ==0 || (scope.row.isCheck =='1' && scope.row.isFace ==1)"
+                v-hasPermi="['system:user:isFace']"
+                @click="handleResetIsFace(scope.row)"
+              >授权</el-button>
+            </el-tooltip>
 
-            <el-button
+            <el-tooltip content="审核用户更新的人脸" placement="top">
+              <el-button
               size="mini"
               type="warning"
               v-if="scope.row.isCheck =='0' "
               v-hasPermi="['system:user:examine']"
               @click="handleExamine(scope.row)"
             >审核</el-button>
+            </el-tooltip>
+        
 
           </template>
         </el-table-column>