权限BUG

START
鹿和sa0ChunLuyu 2 years ago
parent 541a6ab531
commit 0ec16be416

@ -167,7 +167,7 @@ const updateSelfShowClose = () => {
<div> <div>
<div class="input_line_wrapper"> <div class="input_line_wrapper">
<div class="input_line_tag_wrapper"> <div class="input_line_tag_wrapper">
<el-tag w-full type="info">头像</el-tag> <el-tag disable-transitions w-full type="info">头像</el-tag>
</div> </div>
<div ml-2> <div ml-2>
<el-upload :auto-upload="false" :show-file-list="false" @change="fileChange"> <el-upload :auto-upload="false" :show-file-list="false" @change="fileChange">
@ -179,7 +179,7 @@ const updateSelfShowClose = () => {
</div> </div>
<div mt-2 class="input_line_wrapper"> <div mt-2 class="input_line_wrapper">
<div class="input_line_tag_wrapper"> <div class="input_line_tag_wrapper">
<el-tag w-full type="info">昵称</el-tag> <el-tag disable-transitions w-full type="info">昵称</el-tag>
</div> </div>
<div ml-2> <div ml-2>
<el-input class="input_line_input_wrapper" v-model="update_self_data.nickname" <el-input class="input_line_input_wrapper" v-model="update_self_data.nickname"
@ -206,7 +206,7 @@ const updateSelfShowClose = () => {
<div class="input_line_wrapper" <div class="input_line_wrapper"
:class="[$store.info.initial_password === 1 ? 'mt-2' : '']"> :class="[$store.info.initial_password === 1 ? 'mt-2' : '']">
<div class="input_line_tag_wrapper"> <div class="input_line_tag_wrapper">
<el-tag w-full type="info">旧密码</el-tag> <el-tag disable-transitions w-full type="info">旧密码</el-tag>
</div> </div>
<div ml-2> <div ml-2>
<el-input class="input_line_input_wrapper" v-model="change_password_data.old_password" <el-input class="input_line_input_wrapper" v-model="change_password_data.old_password"
@ -215,7 +215,7 @@ const updateSelfShowClose = () => {
</div> </div>
<div mt-2 class="input_line_wrapper"> <div mt-2 class="input_line_wrapper">
<div class="input_line_tag_wrapper"> <div class="input_line_tag_wrapper">
<el-tag w-full type="info">新密码</el-tag> <el-tag disable-transitions w-full type="info">新密码</el-tag>
</div> </div>
<div ml-2> <div ml-2>
<el-input class="input_line_input_wrapper" v-model="change_password_data.password" <el-input class="input_line_input_wrapper" v-model="change_password_data.password"
@ -224,7 +224,7 @@ const updateSelfShowClose = () => {
</div> </div>
<div mt-2 class="input_line_wrapper"> <div mt-2 class="input_line_wrapper">
<div class="input_line_tag_wrapper"> <div class="input_line_tag_wrapper">
<el-tag w-full type="info">确认密码</el-tag> <el-tag disable-transitions w-full type="info">确认密码</el-tag>
</div> </div>
<div ml-2> <div ml-2>
<el-input class="input_line_input_wrapper" v-model="change_password_data.check_password" <el-input class="input_line_input_wrapper" v-model="change_password_data.check_password"
@ -233,7 +233,7 @@ const updateSelfShowClose = () => {
</div> </div>
<div mt-2 class="input_line_wrapper"> <div mt-2 class="input_line_wrapper">
<div class="input_line_tag_wrapper"> <div class="input_line_tag_wrapper">
<el-tag w-full type="info">验证码</el-tag> <el-tag disable-transitions w-full type="info">验证码</el-tag>
</div> </div>
<div ml-2> <div ml-2>
<el-input class="input_line_input_wrapper" v-model="change_password_data.code" <el-input class="input_line_input_wrapper" v-model="change_password_data.code"

@ -172,7 +172,7 @@ onMounted(() => {
<div> <div>
<div class="input_line_wrapper"> <div class="input_line_wrapper">
<div class="input_line_tag_wrapper"> <div class="input_line_tag_wrapper">
<el-tag w-full type="info">名称</el-tag> <el-tag disable-transitions w-full type="info">名称</el-tag>
</div> </div>
<div ml-2> <div ml-2>
<el-input class="input_line_input_wrapper" v-model="edit_data.name" <el-input class="input_line_input_wrapper" v-model="edit_data.name"
@ -181,7 +181,7 @@ onMounted(() => {
</div> </div>
<div mt-2 class="input_line_wrapper"> <div mt-2 class="input_line_wrapper">
<div class="input_line_tag_wrapper"> <div class="input_line_tag_wrapper">
<el-tag w-full type="info">备注</el-tag> <el-tag disable-transitions w-full type="info">备注</el-tag>
</div> </div>
<div ml-2> <div ml-2>
<el-input class="input_line_input_wrapper" v-model="edit_data.remark" <el-input class="input_line_input_wrapper" v-model="edit_data.remark"
@ -190,7 +190,7 @@ onMounted(() => {
</div> </div>
<div mt-2 class="input_line_wrapper"> <div mt-2 class="input_line_wrapper">
<div class="input_line_tag_wrapper"> <div class="input_line_tag_wrapper">
<el-tag w-full type="info">状态</el-tag> <el-tag disable-transitions w-full type="info">状态</el-tag>
</div> </div>
<div ml-2> <div ml-2>
<el-select class="input_line_input_wrapper" v-model="edit_data.status" placeholder="请选择状态"> <el-select class="input_line_input_wrapper" v-model="edit_data.status" placeholder="请选择状态">
@ -201,7 +201,7 @@ onMounted(() => {
</div> </div>
<div mt-2 class="input_line_wrapper"> <div mt-2 class="input_line_wrapper">
<div class="input_line_tag_wrapper"> <div class="input_line_tag_wrapper">
<el-tag w-full type="info">权限</el-tag> <el-tag disable-transitions w-full type="info">权限</el-tag>
</div> </div>
<div ml-2> <div ml-2>
<el-button size="small" @click="AdminAuthChoose()" type="primary">刷新</el-button> <el-button size="small" @click="AdminAuthChoose()" type="primary">刷新</el-button>

@ -229,13 +229,13 @@ const AdminResetPassword = async () => {
<div> <div>
<div class="input_line_wrapper"> <div class="input_line_wrapper">
<div class="input_line_tag_wrapper"> <div class="input_line_tag_wrapper">
<el-tag w-full type="info">账号</el-tag> <el-tag disable-transitions w-full type="info">账号</el-tag>
</div> </div>
<div ml-2>{{ copy_data.account }}</div> <div ml-2>{{ copy_data.account }}</div>
</div> </div>
<div mt-2 class="input_line_wrapper"> <div mt-2 class="input_line_wrapper">
<div class="input_line_tag_wrapper"> <div class="input_line_tag_wrapper">
<el-tag w-full type="info">密码</el-tag> <el-tag disable-transitions w-full type="info">密码</el-tag>
</div> </div>
<div ml-2>{{ copy_data.password }}</div> <div ml-2>{{ copy_data.password }}</div>
</div> </div>
@ -255,7 +255,7 @@ const AdminResetPassword = async () => {
<div> <div>
<div class="input_line_wrapper"> <div class="input_line_wrapper">
<div class="input_line_tag_wrapper"> <div class="input_line_tag_wrapper">
<el-tag w-full type="info">账号</el-tag> <el-tag disable-transitions w-full type="info">账号</el-tag>
</div> </div>
<div ml-2> <div ml-2>
<el-input class="input_line_input_wrapper" v-model="edit_data.account" <el-input class="input_line_input_wrapper" v-model="edit_data.account"
@ -264,7 +264,7 @@ const AdminResetPassword = async () => {
</div> </div>
<div mt-2 class="input_line_wrapper"> <div mt-2 class="input_line_wrapper">
<div class="input_line_tag_wrapper"> <div class="input_line_tag_wrapper">
<el-tag w-full type="info">昵称</el-tag> <el-tag disable-transitions w-full type="info">昵称</el-tag>
</div> </div>
<div ml-2> <div ml-2>
<el-input class="input_line_input_wrapper" v-model="edit_data.nickname" <el-input class="input_line_input_wrapper" v-model="edit_data.nickname"
@ -273,7 +273,7 @@ const AdminResetPassword = async () => {
</div> </div>
<div mt-2 class="input_line_wrapper"> <div mt-2 class="input_line_wrapper">
<div class="input_line_tag_wrapper"> <div class="input_line_tag_wrapper">
<el-tag w-full type="info">头像</el-tag> <el-tag disable-transitions w-full type="info">头像</el-tag>
</div> </div>
<div ml-2> <div ml-2>
<el-upload :auto-upload="false" :show-file-list="false" @change="fileChange"> <el-upload :auto-upload="false" :show-file-list="false" @change="fileChange">
@ -284,7 +284,7 @@ const AdminResetPassword = async () => {
</div> </div>
<div mt-2 class="input_line_wrapper"> <div mt-2 class="input_line_wrapper">
<div class="input_line_tag_wrapper"> <div class="input_line_tag_wrapper">
<el-tag w-full type="info">权限组</el-tag> <el-tag disable-transitions w-full type="info">权限组</el-tag>
</div> </div>
<div ml-2> <div ml-2>
<el-select :disabled="edit_data.id === 1" v-model="edit_data.admin_auth_group" <el-select :disabled="edit_data.id === 1" v-model="edit_data.admin_auth_group"
@ -301,7 +301,7 @@ const AdminResetPassword = async () => {
</div> </div>
<div v-if="edit_data.id === 0" mt-2 class="input_line_wrapper"> <div v-if="edit_data.id === 0" mt-2 class="input_line_wrapper">
<div class="input_line_tag_wrapper"> <div class="input_line_tag_wrapper">
<el-tag w-full type="info">密码</el-tag> <el-tag disable-transitions w-full type="info">密码</el-tag>
</div> </div>
<div ml-2> <div ml-2>
<el-input class="input_line_input_wrapper" v-model="edit_data.password" <el-input class="input_line_input_wrapper" v-model="edit_data.password"
@ -311,7 +311,7 @@ const AdminResetPassword = async () => {
</div> </div>
<div mt-2 class="input_line_wrapper"> <div mt-2 class="input_line_wrapper">
<div class="input_line_tag_wrapper"> <div class="input_line_tag_wrapper">
<el-tag w-full type="info">下次登录修改密码</el-tag> <el-tag disable-transitions w-full type="info">下次登录修改密码</el-tag>
</div> </div>
<div ml-2> <div ml-2>
<el-select v-model="edit_data.initial_password" class="input_line_input_wrapper" <el-select v-model="edit_data.initial_password" class="input_line_input_wrapper"
@ -323,7 +323,7 @@ const AdminResetPassword = async () => {
</div> </div>
<div mt-2 class="input_line_wrapper"> <div mt-2 class="input_line_wrapper">
<div class="input_line_tag_wrapper"> <div class="input_line_tag_wrapper">
<el-tag w-full type="info">状态</el-tag> <el-tag disable-transitions w-full type="info">状态</el-tag>
</div> </div>
<div ml-2> <div ml-2>
<el-select class="input_line_input_wrapper" v-model="edit_data.status" placeholder="请选择状态"> <el-select class="input_line_input_wrapper" v-model="edit_data.status" placeholder="请选择状态">
@ -346,14 +346,14 @@ const AdminResetPassword = async () => {
<div> <div>
<div class="input_line_wrapper"> <div class="input_line_wrapper">
<div my-1 class="input_line_tag_wrapper"> <div my-1 class="input_line_tag_wrapper">
<el-tag w-full type="info">昵称</el-tag> <el-tag disable-transitions w-full type="info">昵称</el-tag>
</div> </div>
<div ml-2 my-1> <div ml-2 my-1>
<el-input @keydown.enter="searchClick()" class="input_line_input_wrapper" v-model="page_options.search" <el-input @keydown.enter="searchClick()" class="input_line_input_wrapper" v-model="page_options.search"
placeholder="请输入昵称"></el-input> placeholder="请输入昵称"></el-input>
</div> </div>
<div ml-2 my-1 class="input_line_tag_wrapper"> <div ml-2 my-1 class="input_line_tag_wrapper">
<el-tag w-full type="info">权限组</el-tag> <el-tag disable-transitions w-full type="info">权限组</el-tag>
</div> </div>
<div ml-2 my-1> <div ml-2 my-1>
<el-select v-model="page_options.admin_auth_group" class="input_line_input_wrapper" <el-select v-model="page_options.admin_auth_group" class="input_line_input_wrapper"
@ -365,7 +365,7 @@ const AdminResetPassword = async () => {
</el-select> </el-select>
</div> </div>
<div ml-2 my-1 class="input_line_tag_wrapper"> <div ml-2 my-1 class="input_line_tag_wrapper">
<el-tag w-full type="info">状态</el-tag> <el-tag disable-transitions w-full type="info">状态</el-tag>
</div> </div>
<div ml-2 my-1> <div ml-2 my-1>
<el-select v-model="page_options.status" class="input_line_input_wrapper" <el-select v-model="page_options.status" class="input_line_input_wrapper"
@ -378,7 +378,7 @@ const AdminResetPassword = async () => {
</el-select> </el-select>
</div> </div>
<div ml-2 my-1 class="input_line_tag_wrapper"> <div ml-2 my-1 class="input_line_tag_wrapper">
<el-tag w-full type="info">密码</el-tag> <el-tag disable-transitions w-full type="info">密码</el-tag>
</div> </div>
<div ml-2 my-1> <div ml-2 my-1>
<el-select v-model="page_options.initial_password" class="input_line_input_wrapper" <el-select v-model="page_options.initial_password" class="input_line_input_wrapper"

@ -188,7 +188,7 @@ onMounted(() => {
<div> <div>
<div class="input_line_wrapper"> <div class="input_line_wrapper">
<div class="input_line_tag_wrapper"> <div class="input_line_tag_wrapper">
<el-tag w-full type="info">名称</el-tag> <el-tag disable-transitions w-full type="info">名称</el-tag>
</div> </div>
<div ml-2> <div ml-2>
<el-input class="input_line_input_wrapper" v-model="edit_data.name" <el-input class="input_line_input_wrapper" v-model="edit_data.name"
@ -197,7 +197,7 @@ onMounted(() => {
</div> </div>
<div mt-2 class="input_line_wrapper"> <div mt-2 class="input_line_wrapper">
<div class="input_line_tag_wrapper"> <div class="input_line_tag_wrapper">
<el-tag w-full type="info">类型</el-tag> <el-tag disable-transitions w-full type="info">类型</el-tag>
</div> </div>
<div ml-2> <div ml-2>
<el-select v-model="edit_data.type" <el-select v-model="edit_data.type"
@ -214,7 +214,7 @@ onMounted(() => {
</div> </div>
<div mt-2 class="input_line_wrapper"> <div mt-2 class="input_line_wrapper">
<div class="input_line_tag_wrapper"> <div class="input_line_tag_wrapper">
<el-tag w-full type="info">内容</el-tag> <el-tag disable-transitions w-full type="info">内容</el-tag>
</div> </div>
<div v-if="edit_data.type === 1" ml-2> <div v-if="edit_data.type === 1" ml-2>
<el-input class="input_line_input_wrapper" v-model="edit_data.value" <el-input class="input_line_input_wrapper" v-model="edit_data.value"
@ -334,7 +334,7 @@ onMounted(() => {
</div> </div>
<div mt-2 class="input_line_wrapper"> <div mt-2 class="input_line_wrapper">
<div class="input_line_tag_wrapper"> <div class="input_line_tag_wrapper">
<el-tag w-full type="info">归属类型</el-tag> <el-tag disable-transitions w-full type="info">归属类型</el-tag>
</div> </div>
<div ml-2> <div ml-2>
<el-select v-model="edit_data.client" <el-select v-model="edit_data.client"
@ -349,7 +349,7 @@ onMounted(() => {
</div> </div>
<div mt-2 class="input_line_wrapper"> <div mt-2 class="input_line_wrapper">
<div class="input_line_tag_wrapper"> <div class="input_line_tag_wrapper">
<el-tag w-full type="info">登录类型</el-tag> <el-tag disable-transitions w-full type="info">登录类型</el-tag>
</div> </div>
<div ml-2> <div ml-2>
<el-select v-model="edit_data.login" <el-select v-model="edit_data.login"
@ -362,7 +362,7 @@ onMounted(() => {
</div> </div>
<div mt-2 class="input_line_wrapper"> <div mt-2 class="input_line_wrapper">
<div class="input_line_tag_wrapper"> <div class="input_line_tag_wrapper">
<el-tag w-full type="info">备注</el-tag> <el-tag disable-transitions w-full type="info">备注</el-tag>
</div> </div>
<div ml-2> <div ml-2>
<el-input class="input_line_input_wrapper" v-model="edit_data.remark" <el-input class="input_line_input_wrapper" v-model="edit_data.remark"

@ -104,21 +104,21 @@ const txtShowClick = async (data) => {
<div> <div>
<div class="input_line_wrapper"> <div class="input_line_wrapper">
<div my-1 class="input_line_tag_wrapper"> <div my-1 class="input_line_tag_wrapper">
<el-tag w-full type="info">搜索</el-tag> <el-tag disable-transitions w-full type="info">搜索</el-tag>
</div> </div>
<div ml-2 my-1> <div ml-2 my-1>
<el-input @keydown.enter="searchClick()" class="input_line_input_wrapper" v-model="page_options.search" <el-input @keydown.enter="searchClick()" class="input_line_input_wrapper" v-model="page_options.search"
placeholder="请输入搜索"></el-input> placeholder="请输入搜索"></el-input>
</div> </div>
<div ml-2 my-1 class="input_line_tag_wrapper"> <div ml-2 my-1 class="input_line_tag_wrapper">
<el-tag w-full type="info">时间范围</el-tag> <el-tag disable-transitions w-full type="info">时间范围</el-tag>
</div> </div>
<div ml-2 my-1> <div ml-2 my-1>
<el-date-picker v-model="page_options.time" type="daterange" range-separator="" <el-date-picker v-model="page_options.time" type="daterange" range-separator=""
start-placeholder="开始时间" end-placeholder="结束时间" value-format="YYYY-MM-DD"/> start-placeholder="开始时间" end-placeholder="结束时间" value-format="YYYY-MM-DD"/>
</div> </div>
<div ml-2 my-1 class="input_line_tag_wrapper"> <div ml-2 my-1 class="input_line_tag_wrapper">
<el-tag w-full type="info">类型</el-tag> <el-tag disable-transitions w-full type="info">类型</el-tag>
</div> </div>
<div ml-2 my-1> <div ml-2 my-1>
<el-select v-model="page_options.method" class="input_line_input_wrapper" <el-select v-model="page_options.method" class="input_line_input_wrapper"
@ -129,7 +129,7 @@ const txtShowClick = async (data) => {
</el-select> </el-select>
</div> </div>
<div ml-2 my-1 class="input_line_tag_wrapper"> <div ml-2 my-1 class="input_line_tag_wrapper">
<el-tag w-full type="info">返回码</el-tag> <el-tag disable-transitions w-full type="info">返回码</el-tag>
</div> </div>
<div ml-2 my-1> <div ml-2 my-1>
<el-input @keydown.enter="searchClick()" class="input_line_input_wrapper" v-model="page_options.code" <el-input @keydown.enter="searchClick()" class="input_line_input_wrapper" v-model="page_options.code"
@ -143,19 +143,19 @@ const txtShowClick = async (data) => {
<template #default="scope"> <template #default="scope">
<div my-1 class="input_line_wrapper"> <div my-1 class="input_line_wrapper">
<div class="input_line_tag_wrapper"> <div class="input_line_tag_wrapper">
<el-tag w-full type="info">UUID</el-tag> <el-tag disable-transitions w-full type="info">UUID</el-tag>
</div> </div>
<div ml-2>{{ scope.row.uuid }}</div> <div ml-2>{{ scope.row.uuid }}</div>
</div> </div>
<div my-1 class="input_line_wrapper"> <div my-1 class="input_line_wrapper">
<div class="input_line_tag_wrapper"> <div class="input_line_tag_wrapper">
<el-tag w-full type="info">Token</el-tag> <el-tag disable-transitions w-full type="info">Token</el-tag>
</div> </div>
<div ml-2>{{ scope.row.token }}</div> <div ml-2>{{ scope.row.token }}</div>
</div> </div>
<div my-1 class="input_line_wrapper"> <div my-1 class="input_line_wrapper">
<div class="input_line_tag_wrapper"> <div class="input_line_tag_wrapper">
<el-tag w-full type="info">IP</el-tag> <el-tag disable-transitions w-full type="info">IP</el-tag>
</div> </div>
<div ml-2>{{ scope.row.ip }}</div> <div ml-2>{{ scope.row.ip }}</div>
</div> </div>
@ -165,13 +165,13 @@ const txtShowClick = async (data) => {
<template #default="scope"> <template #default="scope">
<div my-1 class="input_line_wrapper"> <div my-1 class="input_line_wrapper">
<div class="input_line_tag_wrapper"> <div class="input_line_tag_wrapper">
<el-tag w-full type="info">Url</el-tag> <el-tag disable-transitions w-full type="info">Url</el-tag>
</div> </div>
<div ml-2>{{ scope.row.url }}</div> <div ml-2>{{ scope.row.url }}</div>
</div> </div>
<div my-1 class="input_line_wrapper"> <div my-1 class="input_line_wrapper">
<div class="input_line_tag_wrapper"> <div class="input_line_tag_wrapper">
<el-tag w-full type="info">类型</el-tag> <el-tag disable-transitions w-full type="info">类型</el-tag>
</div> </div>
<div ml-2> <div ml-2>
<el-tag v-if="scope.row.method === 'GET'" type="success">GET</el-tag> <el-tag v-if="scope.row.method === 'GET'" type="success">GET</el-tag>
@ -181,7 +181,7 @@ const txtShowClick = async (data) => {
</div> </div>
<div my-1 class="input_line_wrapper"> <div my-1 class="input_line_wrapper">
<div class="input_line_tag_wrapper"> <div class="input_line_tag_wrapper">
<el-tag w-full type="info">参数</el-tag> <el-tag disable-transitions w-full type="info">参数</el-tag>
</div> </div>
<div ml-2> <div ml-2>
<el-button v-if="scope.row.type === 1" :disabled="!scope.row.result" <el-button v-if="scope.row.type === 1" :disabled="!scope.row.result"
@ -206,7 +206,7 @@ const txtShowClick = async (data) => {
<template #default="scope"> <template #default="scope">
<div my-1 class="input_line_wrapper"> <div my-1 class="input_line_wrapper">
<div class="input_line_tag_wrapper"> <div class="input_line_tag_wrapper">
<el-tag w-full type="info">存储类型</el-tag> <el-tag disable-transitions w-full type="info">存储类型</el-tag>
</div> </div>
<div ml-2> <div ml-2>
<el-tag :type="scope.row.type === 1 ? '' : 'success'">{{ <el-tag :type="scope.row.type === 1 ? '' : 'success'">{{
@ -217,7 +217,7 @@ const txtShowClick = async (data) => {
</div> </div>
<div my-1 class="input_line_wrapper"> <div my-1 class="input_line_wrapper">
<div class="input_line_tag_wrapper"> <div class="input_line_tag_wrapper">
<el-tag w-full type="info">返回码</el-tag> <el-tag disable-transitions w-full type="info">返回码</el-tag>
</div> </div>
<div ml-2> <div ml-2>
<el-tag :type="Number(scope.row.code) === 200 ? 'success' : 'warning'"> <el-tag :type="Number(scope.row.code) === 200 ? 'success' : 'warning'">
@ -227,7 +227,7 @@ const txtShowClick = async (data) => {
</div> </div>
<div my-1 class="input_line_wrapper"> <div my-1 class="input_line_wrapper">
<div class="input_line_tag_wrapper"> <div class="input_line_tag_wrapper">
<el-tag w-full type="info">返回</el-tag> <el-tag disable-transitions w-full type="info">返回</el-tag>
</div> </div>
<div ml-2> <div ml-2>
<el-button v-if="scope.row.type === 1" :disabled="!scope.row.result" <el-button v-if="scope.row.type === 1" :disabled="!scope.row.result"
@ -249,19 +249,19 @@ const txtShowClick = async (data) => {
<template #default="scope"> <template #default="scope">
<div my-1 class="input_line_wrapper"> <div my-1 class="input_line_wrapper">
<div class="input_line_tag_wrapper"> <div class="input_line_tag_wrapper">
<el-tag w-full type="info">请求时间</el-tag> <el-tag disable-transitions w-full type="info">请求时间</el-tag>
</div> </div>
<div ml-2>{{ scope.row.created_at }}</div> <div ml-2>{{ scope.row.created_at }}</div>
</div> </div>
<div my-1 class="input_line_wrapper"> <div my-1 class="input_line_wrapper">
<div class="input_line_tag_wrapper"> <div class="input_line_tag_wrapper">
<el-tag w-full type="info">返回时间</el-tag> <el-tag disable-transitions w-full type="info">返回时间</el-tag>
</div> </div>
<div ml-2>{{ scope.row.updated_at }}</div> <div ml-2>{{ scope.row.updated_at }}</div>
</div> </div>
<div my-1 class="input_line_wrapper"> <div my-1 class="input_line_wrapper">
<div class="input_line_tag_wrapper"> <div class="input_line_tag_wrapper">
<el-tag w-full type="info">执行速度</el-tag> <el-tag disable-transitions w-full type="info">执行速度</el-tag>
</div> </div>
<div ml-2>{{ !!scope.row.spend ? `${scope.row.spend}` : '0' }}s</div> <div ml-2>{{ !!scope.row.spend ? `${scope.row.spend}` : '0' }}s</div>
</div> </div>

@ -249,7 +249,7 @@ const iconClick = () => {
<div> <div>
<div class="input_line_wrapper"> <div class="input_line_wrapper">
<div class="input_line_tag_wrapper"> <div class="input_line_tag_wrapper">
<el-tag w-full type="info">搜索</el-tag> <el-tag disable-transitions w-full type="info">搜索</el-tag>
</div> </div>
<div ml-2> <div ml-2>
<el-input class="input_line_input_wrapper" v-model="icons_search" <el-input class="input_line_input_wrapper" v-model="icons_search"
@ -281,7 +281,7 @@ const iconClick = () => {
<div> <div>
<div class="input_line_wrapper"> <div class="input_line_wrapper">
<div class="input_line_tag_wrapper"> <div class="input_line_tag_wrapper">
<el-tag w-full type="info">名称</el-tag> <el-tag disable-transitions w-full type="info">名称</el-tag>
</div> </div>
<div ml-2> <div ml-2>
<el-input class="input_line_input_wrapper" v-model="edit_data.title" <el-input class="input_line_input_wrapper" v-model="edit_data.title"
@ -290,7 +290,7 @@ const iconClick = () => {
</div> </div>
<div mt-2 class="input_line_wrapper"> <div mt-2 class="input_line_wrapper">
<div class="input_line_tag_wrapper"> <div class="input_line_tag_wrapper">
<el-tag w-full type="info">路由</el-tag> <el-tag disable-transitions w-full type="info">路由</el-tag>
</div> </div>
<div ml-2> <div ml-2>
<el-input class="input_line_input_wrapper" v-model="edit_data.name" <el-input class="input_line_input_wrapper" v-model="edit_data.name"
@ -299,7 +299,7 @@ const iconClick = () => {
</div> </div>
<div mt-2 class="input_line_wrapper"> <div mt-2 class="input_line_wrapper">
<div class="input_line_tag_wrapper"> <div class="input_line_tag_wrapper">
<el-tag w-full type="info">图标</el-tag> <el-tag disable-transitions w-full type="info">图标</el-tag>
</div> </div>
<div ml-2> <div ml-2>
<div @click="iconClick()" cursor-pointer class="input_line_input_wrapper icon_wrapper" text-center> <div @click="iconClick()" cursor-pointer class="input_line_input_wrapper icon_wrapper" text-center>
@ -314,7 +314,7 @@ const iconClick = () => {
</div> </div>
<div mt-2 class="input_line_wrapper"> <div mt-2 class="input_line_wrapper">
<div class="input_line_tag_wrapper"> <div class="input_line_tag_wrapper">
<el-tag w-full type="info">分组</el-tag> <el-tag disable-transitions w-full type="info">分组</el-tag>
</div> </div>
<div ml-2> <div ml-2>
<el-select v-model="edit_data.pid" <el-select v-model="edit_data.pid"
@ -330,7 +330,7 @@ const iconClick = () => {
</div> </div>
<div mt-2 class="input_line_wrapper"> <div mt-2 class="input_line_wrapper">
<div class="input_line_tag_wrapper"> <div class="input_line_tag_wrapper">
<el-tag w-full type="info">类型</el-tag> <el-tag disable-transitions w-full type="info">类型</el-tag>
</div> </div>
<div ml-2> <div ml-2>
<el-select v-model="edit_data.type" class="input_line_input_wrapper" <el-select v-model="edit_data.type" class="input_line_input_wrapper"
@ -342,7 +342,7 @@ const iconClick = () => {
</div> </div>
<div mt-2 class="input_line_wrapper"> <div mt-2 class="input_line_wrapper">
<div class="input_line_tag_wrapper"> <div class="input_line_tag_wrapper">
<el-tag w-full type="info">检查类型</el-tag> <el-tag disable-transitions w-full type="info">检查类型</el-tag>
</div> </div>
<div ml-2> <div ml-2>
<el-select v-model="edit_data.check" class="input_line_input_wrapper" <el-select v-model="edit_data.check" class="input_line_input_wrapper"
@ -354,7 +354,7 @@ const iconClick = () => {
</div> </div>
<div mt-2 class="input_line_wrapper"> <div mt-2 class="input_line_wrapper">
<div class="input_line_tag_wrapper"> <div class="input_line_tag_wrapper">
<el-tag w-full type="info">显示/隐藏</el-tag> <el-tag disable-transitions w-full type="info">显示/隐藏</el-tag>
</div> </div>
<div ml-2> <div ml-2>
<el-select v-model="edit_data.show" class="input_line_input_wrapper" <el-select v-model="edit_data.show" class="input_line_input_wrapper"
@ -366,7 +366,7 @@ const iconClick = () => {
</div> </div>
<div mt-2 class="input_line_wrapper"> <div mt-2 class="input_line_wrapper">
<div class="input_line_tag_wrapper"> <div class="input_line_tag_wrapper">
<el-tag w-full type="info">验证失败提示</el-tag> <el-tag disable-transitions w-full type="info">验证失败提示</el-tag>
</div> </div>
<div ml-2> <div ml-2>
<el-input class="input_line_input_wrapper" v-model="edit_data.message" <el-input class="input_line_input_wrapper" v-model="edit_data.message"
@ -375,7 +375,7 @@ const iconClick = () => {
</div> </div>
<div mt-2 class="input_line_wrapper"> <div mt-2 class="input_line_wrapper">
<div class="input_line_tag_wrapper"> <div class="input_line_tag_wrapper">
<el-tag w-full type="info">排序</el-tag> <el-tag disable-transitions w-full type="info">排序</el-tag>
</div> </div>
<div ml-2> <div ml-2>
<el-input-number class="input_line_input_wrapper" v-model="edit_data.order" <el-input-number class="input_line_input_wrapper" v-model="edit_data.order"
@ -384,7 +384,7 @@ const iconClick = () => {
</div> </div>
<div mt-2 class="input_line_wrapper"> <div mt-2 class="input_line_wrapper">
<div class="input_line_tag_wrapper"> <div class="input_line_tag_wrapper">
<el-tag w-full type="info">状态</el-tag> <el-tag disable-transitions w-full type="info">状态</el-tag>
</div> </div>
<div ml-2> <div ml-2>
<el-select class="input_line_input_wrapper" v-model="edit_data.status" placeholder="请选择状态"> <el-select class="input_line_input_wrapper" v-model="edit_data.status" placeholder="请选择状态">
@ -427,28 +427,28 @@ const iconClick = () => {
</el-table-column> </el-table-column>
<el-table-column label="类型" width="120"> <el-table-column label="类型" width="120">
<template #default="scope"> <template #default="scope">
<el-tag w-full :type="scope.row.type === 1 ? '' : 'success'"> <el-tag disable-transitions w-full :type="scope.row.type === 1 ? '' : 'success'">
{{ scope.row.type === 1 ? '分组' : '页面/接口' }} {{ scope.row.type === 1 ? '分组' : '页面/接口' }}
</el-tag> </el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="检查类型" width="120"> <el-table-column label="检查类型" width="120">
<template #default="scope"> <template #default="scope">
<el-tag w-full :type="scope.row.check === 1 ? 'warning' : 'success'"> <el-tag disable-transitions w-full :type="scope.row.check === 1 ? 'warning' : 'success'">
{{ scope.row.check === 1 ? '需要验证' : '不需要验证' }} {{ scope.row.check === 1 ? '需要验证' : '不需要验证' }}
</el-tag> </el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="显示/隐藏" width="100"> <el-table-column label="显示/隐藏" width="100">
<template #default="scope"> <template #default="scope">
<el-tag w-full :type="scope.row.show === 1 ? '' : 'warning'"> <el-tag disable-transitions w-full :type="scope.row.show === 1 ? '' : 'warning'">
{{ scope.row.show === 1 ? '显示' : '隐藏' }} {{ scope.row.show === 1 ? '显示' : '隐藏' }}
</el-tag> </el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="状态" width="80"> <el-table-column label="状态" width="80">
<template #default="scope"> <template #default="scope">
<el-tag w-full :type="scope.row.status === 1 ? '' : 'danger'"> <el-tag disable-transitions w-full :type="scope.row.status === 1 ? '' : 'danger'">
{{ scope.row.status === 1 ? '可用' : '停用' }} {{ scope.row.status === 1 ? '可用' : '停用' }}
</el-tag> </el-tag>
</template> </template>

@ -123,21 +123,21 @@ const image_arr = ['png', 'jpeg', 'jpg', 'gif']
<div> <div>
<div class="input_line_wrapper"> <div class="input_line_wrapper">
<div my-1 class="input_line_tag_wrapper"> <div my-1 class="input_line_tag_wrapper">
<el-tag w-full type="info">搜索</el-tag> <el-tag disable-transitions w-full type="info">搜索</el-tag>
</div> </div>
<div ml-2 my-1> <div ml-2 my-1>
<el-input @keydown.enter="searchClick()" class="input_line_input_wrapper" v-model="page_options.search" <el-input @keydown.enter="searchClick()" class="input_line_input_wrapper" v-model="page_options.search"
placeholder="请输入搜索"></el-input> placeholder="请输入搜索"></el-input>
</div> </div>
<div ml-2 my-1 class="input_line_tag_wrapper"> <div ml-2 my-1 class="input_line_tag_wrapper">
<el-tag w-full type="info">时间范围</el-tag> <el-tag disable-transitions w-full type="info">时间范围</el-tag>
</div> </div>
<div ml-2 my-1> <div ml-2 my-1>
<el-date-picker v-model="page_options.time" type="daterange" range-separator="" <el-date-picker v-model="page_options.time" type="daterange" range-separator=""
start-placeholder="开始时间" end-placeholder="结束时间" value-format="YYYY-MM-DD"/> start-placeholder="开始时间" end-placeholder="结束时间" value-format="YYYY-MM-DD"/>
</div> </div>
<div ml-2 my-1 class="input_line_tag_wrapper"> <div ml-2 my-1 class="input_line_tag_wrapper">
<el-tag w-full type="info">类型</el-tag> <el-tag disable-transitions w-full type="info">类型</el-tag>
</div> </div>
<div ml-2 my-1> <div ml-2 my-1>
<el-select v-model="page_options.ext" class="input_line_input_wrapper" <el-select v-model="page_options.ext" class="input_line_input_wrapper"
@ -147,7 +147,7 @@ const image_arr = ['png', 'jpeg', 'jpg', 'gif']
</el-select> </el-select>
</div> </div>
<div ml-2 my-1 class="input_line_tag_wrapper"> <div ml-2 my-1 class="input_line_tag_wrapper">
<el-tag w-full type="info">来源</el-tag> <el-tag disable-transitions w-full type="info">来源</el-tag>
</div> </div>
<div ml-2 my-1> <div ml-2 my-1>
<el-select v-model="page_options.from" class="input_line_input_wrapper" <el-select v-model="page_options.from" class="input_line_input_wrapper"

@ -4,6 +4,7 @@ namespace App\Http\Controllers;
use App\Http\Request\EditAdminAuth; use App\Http\Request\EditAdminAuth;
use App\Models\AdminAuth; use App\Models\AdminAuth;
use App\Models\AdminAuthGroup;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use Login; use Login;
use Yo; use Yo;
@ -166,14 +167,14 @@ class AdminAuthController extends Controller
->orderBy('order', 'desc')->get(); ->orderBy('order', 'desc')->get();
break; break;
default: default:
$admin_auth = AdminAuth::find(Login::$info->admin_auth_group); $admin_auth = AdminAuthGroup::find(Login::$info->admin_auth_group);
$auths = json_decode($admin_auth->auths, true); $auths = json_decode($admin_auth->admin_auths, true);
$auth_list = AdminAuth::select('id', 'name', 'title', 'icon', 'status') $auth_list = AdminAuth::select('id', 'name', 'title', 'icon', 'status')
->where(function ($query) use ($auths, $item) { ->where(function ($query) use ($auths, $item) {
$query->whereIn('id', $auths)->where('pid', $item->id)->where('type', 2)->where('check_type', 2)->where('show', 1)->where('status', 1)->where('del', 2); $query->whereIn('id', $auths)->where('pid', $item->id)->where('type', 2)->where('check', 1)->where('show', 1)->where('status', 1)->where('del', 2);
}) })
->orWhere(function ($query) use ($auths, $item) { ->orWhere(function ($query) use ($auths, $item) {
$query->where('type', 2)->where('pid', $item->id)->where('check_type', 1)->where('show', 1)->where('status', 1)->where('del', 2); $query->where('type', 2)->where('pid', $item->id)->where('check', 2)->where('show', 1)->where('status', 1)->where('del', 2);
}) })
->orderBy('order', 'desc')->get(); ->orderBy('order', 'desc')->get();
} }

Loading…
Cancel
Save