适配 element plus 最新版本

master
RuoYi 3 years ago
parent b132d44489
commit a7b867ff09
  1. 2
      package.json
  2. 9
      src/assets/styles/ruoyi.scss
  3. 2
      src/components/FileUpload/index.vue
  4. 7
      src/components/RightToolbar/index.vue
  5. 15
      src/components/SizeSelect/index.vue
  6. 20
      src/layout/components/Navbar.vue
  7. 6
      src/layout/components/Settings/index.vue
  8. 3
      src/main.js
  9. 2
      src/store/modules/app.js
  10. 6
      src/views/index.vue
  11. 16
      src/views/login.vue
  12. 85
      src/views/monitor/job/index.vue
  13. 18
      src/views/monitor/job/log.vue
  14. 14
      src/views/monitor/logininfor/index.vue
  15. 8
      src/views/monitor/online/index.vue
  16. 18
      src/views/monitor/operlog/index.vue
  17. 24
      src/views/register.vue
  18. 19
      src/views/system/config/index.vue
  19. 12
      src/views/system/dept/index.vue
  20. 16
      src/views/system/dict/data.vue
  21. 18
      src/views/system/dict/index.vue
  22. 18
      src/views/system/menu/index.vue
  23. 12
      src/views/system/notice/index.vue
  24. 14
      src/views/system/post/index.vue
  25. 10
      src/views/system/role/authUser.vue
  26. 62
      src/views/system/role/index.vue
  27. 6
      src/views/system/role/selectUser.vue
  28. 6
      src/views/system/user/authRole.vue
  29. 86
      src/views/system/user/index.vue
  30. 4
      src/views/system/user/profile/resetPwd.vue
  31. 12
      src/views/system/user/profile/userAvatar.vue
  32. 4
      src/views/system/user/profile/userInfo.vue
  33. 4
      src/views/tool/gen/editTable.vue
  34. 6
      src/views/tool/gen/importTable.vue
  35. 94
      src/views/tool/gen/index.vue

@ -18,7 +18,7 @@
"@element-plus/icons-vue": "0.2.4", "@element-plus/icons-vue": "0.2.4",
"axios": "0.24.0", "axios": "0.24.0",
"echarts": "5.2.2", "echarts": "5.2.2",
"element-plus": "1.2.0-beta.6", "element-plus": "1.3.0-beta.3",
"file-saver": "2.0.5", "file-saver": "2.0.5",
"fuse.js": "6.4.6", "fuse.js": "6.4.6",
"js-cookie": "3.0.1", "js-cookie": "3.0.1",

@ -112,6 +112,7 @@
border: 1px solid #e5e6e7; border: 1px solid #e5e6e7;
background: #FFFFFF none; background: #FFFFFF none;
border-radius:4px; border-radius:4px;
width: 100%;
} }
.pagination-container .el-pagination { .pagination-container .el-pagination {
@ -128,7 +129,7 @@
} }
} }
.el-table .fixed-width .el-button--mini { .el-table .fixed-width .el-button--small {
padding-left: 0; padding-left: 0;
padding-right: 0; padding-right: 0;
width: inherit; width: inherit;
@ -138,7 +139,7 @@
.el-table .el-dropdown-link { .el-table .el-dropdown-link {
cursor: pointer; cursor: pointer;
color: #409EFF; color: #409EFF;
margin-left: 5px; margin-left: 10px;
} }
.el-table .el-dropdown, .el-icon-arrow-down { .el-table .el-dropdown, .el-icon-arrow-down {
@ -175,12 +176,12 @@
} }
.el-card__header { .el-card__header {
padding: 14px 15px 7px; padding: 14px 15px 7px !important;
min-height: 40px; min-height: 40px;
} }
.el-card__body { .el-card__body {
padding: 15px 20px 20px 20px; padding: 15px 20px 20px 20px !important;
} }
.card-box { .card-box {

@ -14,7 +14,7 @@
ref="upload" ref="upload"
> >
<!-- 上传按钮 --> <!-- 上传按钮 -->
<el-button size="mini" type="primary">选取文件</el-button> <el-button type="primary">选取文件</el-button>
<!-- 上传提示 --> <!-- 上传提示 -->
<div class="el-upload__tip" v-if="showTip"> <div class="el-upload__tip" v-if="showTip">
请上传 请上传

@ -2,13 +2,13 @@
<div class="top-right-btn"> <div class="top-right-btn">
<el-row> <el-row>
<el-tooltip class="item" effect="dark" :content="showSearch ? '隐藏搜索' : '显示搜索'" placement="top"> <el-tooltip class="item" effect="dark" :content="showSearch ? '隐藏搜索' : '显示搜索'" placement="top">
<el-button size="mini" circle icon="Search" @click="toggleSearch()" /> <el-button circle icon="Search" @click="toggleSearch()" />
</el-tooltip> </el-tooltip>
<el-tooltip class="item" effect="dark" content="刷新" placement="top"> <el-tooltip class="item" effect="dark" content="刷新" placement="top">
<el-button size="mini" circle icon="Refresh" @click="refresh()" /> <el-button circle icon="Refresh" @click="refresh()" />
</el-tooltip> </el-tooltip>
<el-tooltip class="item" effect="dark" content="显隐列" placement="top" v-if="columns"> <el-tooltip class="item" effect="dark" content="显隐列" placement="top" v-if="columns">
<el-button size="mini" circle icon="Menu" @click="showColumn()" /> <el-button circle icon="Menu" @click="showColumn()" />
</el-tooltip> </el-tooltip>
</el-row> </el-row>
<el-dialog :title="title" v-model="open" append-to-body> <el-dialog :title="title" v-model="open" append-to-body>
@ -76,7 +76,6 @@ for (let item in props.columns) {
<style lang='scss' scoped> <style lang='scss' scoped>
:deep(.el-transfer__button) { :deep(.el-transfer__button) {
border-radius: 50%; border-radius: 50%;
padding: 12px;
display: block; display: block;
margin-left: 0px; margin-left: 0px;
} }

@ -24,10 +24,9 @@ const route = useRoute();
const router = useRouter(); const router = useRouter();
const {proxy} = getCurrentInstance(); const {proxy} = getCurrentInstance();
const sizeOptions = ref([ const sizeOptions = ref([
{ label: 'Large', value: 'large' }, { label: '较大', value: 'large' },
{ label: 'Medium', value: 'medium' }, { label: '默认', value: 'default' },
{ label: 'Small', value: 'small' }, { label: '稍小', value: 'small' },
{ label: 'Mini', value: 'mini' }
]) ])
function refreshView() { function refreshView() {
@ -43,13 +42,9 @@ function refreshView() {
}) })
} }
function handleSetSize(size) { function handleSetSize(size) {
proxy.$ELEMENT.size = size; proxy.$modal.loading("正在设置布局大小,请稍候...");
store.dispatch('app/setSize', size) store.dispatch('app/setSize', size)
refreshView() setTimeout("window.location.reload()", 1000)
ElMessage({
message: 'Switch Size Success',
type: 'success'
})
}; };
</script> </script>

@ -23,7 +23,7 @@
</el-tooltip> </el-tooltip>
</template> </template>
<div class="avatar-container"> <div class="avatar-container">
<el-dropdown class="right-menu-item hover-effect" trigger="click"> <el-dropdown @command="handleCommand" class="right-menu-item hover-effect" trigger="click">
<div class="avatar-wrapper"> <div class="avatar-wrapper">
<img :src="getters.avatar" class="user-avatar" /> <img :src="getters.avatar" class="user-avatar" />
<el-icon><caret-bottom /></el-icon> <el-icon><caret-bottom /></el-icon>
@ -33,10 +33,10 @@
<router-link to="/user/profile"> <router-link to="/user/profile">
<el-dropdown-item>个人中心</el-dropdown-item> <el-dropdown-item>个人中心</el-dropdown-item>
</router-link> </router-link>
<el-dropdown-item @click="setLayout"> <el-dropdown-item command="setLayout">
<span>布局设置</span> <span>布局设置</span>
</el-dropdown-item> </el-dropdown-item>
<el-dropdown-item divided @click="logout"> <el-dropdown-item divided command="logout">
<span>退出登录</span> <span>退出登录</span>
</el-dropdown-item> </el-dropdown-item>
</el-dropdown-menu> </el-dropdown-menu>
@ -59,12 +59,26 @@ import RuoYiGit from '@/components/RuoYi/Git'
import RuoYiDoc from '@/components/RuoYi/Doc' import RuoYiDoc from '@/components/RuoYi/Doc'
const store = useStore(); const store = useStore();
const router = useRouter();
const getters = computed(() => store.getters); const getters = computed(() => store.getters);
function toggleSideBar() { function toggleSideBar() {
store.dispatch('app/toggleSideBar') store.dispatch('app/toggleSideBar')
} }
function handleCommand(command) {
switch (command) {
case "setLayout":
setLayout();
break;
case "logout":
logout();
break;
default:
break;
}
}
function logout() { function logout() {
ElMessageBox.confirm('确定注销并退出系统吗?', '提示', { ElMessageBox.confirm('确定注销并退出系统吗?', '提示', {
confirmButtonText: '确定', confirmButtonText: '确定',

@ -28,7 +28,7 @@
<div class="drawer-item"> <div class="drawer-item">
<span>主题颜色</span> <span>主题颜色</span>
<span class="comp-style"> <span class="comp-style">
<el-color-picker size="small" v-model="theme" :predefine="predefineColors" @change="themeChange"/> <el-color-picker v-model="theme" :predefine="predefineColors" @change="themeChange"/>
</span> </span>
</div> </div>
<el-divider /> <el-divider />
@ -72,8 +72,8 @@
<el-divider /> <el-divider />
<el-button size="small" type="primary" plain icon="DocumentAdd" @click="saveSetting"></el-button> <el-button type="primary" plain icon="DocumentAdd" @click="saveSetting"></el-button>
<el-button size="small" plain icon="Refresh" @click="resetSetting"></el-button> <el-button plain icon="Refresh" @click="resetSetting"></el-button>
</el-drawer> </el-drawer>
</template> </template>

@ -73,7 +73,8 @@ directive(app)
// 使用element-plus 并且设置全局的大小 // 使用element-plus 并且设置全局的大小
app.use(ElementPlus, { app.use(ElementPlus, {
locale: locale, locale: locale,
size: Cookies.get('size') || 'medium' // 支持 large、default、small
size: Cookies.get('size') || 'default'
}) })
app.mount('#app') app.mount('#app')

@ -6,7 +6,7 @@ const state = {
withoutAnimation: false withoutAnimation: false
}, },
device: 'desktop', device: 'desktop',
size: Cookies.get('size') || 'medium' size: Cookies.get('size') || 'default'
} }
const mutations = { const mutations = {

@ -52,15 +52,13 @@
<p> <p>
<el-button <el-button
type="primary" type="primary"
size="mini" icon="Cloudy"
icon="el-icon-cloudy"
plain plain
@click="goTarget('https://gitee.com/y_project/RuoYi-Vue')" @click="goTarget('https://gitee.com/y_project/RuoYi-Vue')"
>访问码云</el-button >访问码云</el-button
> >
<el-button <el-button
size="mini" icon="HomeFilled"
icon="el-icon-s-home"
plain plain
@click="goTarget('http://ruoyi.vip')" @click="goTarget('http://ruoyi.vip')"
>访问主页</el-button >访问主页</el-button

@ -6,6 +6,7 @@
<el-input <el-input
v-model="loginForm.username" v-model="loginForm.username"
type="text" type="text"
size="large"
auto-complete="off" auto-complete="off"
placeholder="账号" placeholder="账号"
> >
@ -16,6 +17,7 @@
<el-input <el-input
v-model="loginForm.password" v-model="loginForm.password"
type="password" type="password"
size="large"
auto-complete="off" auto-complete="off"
placeholder="密码" placeholder="密码"
@keyup.enter="handleLogin" @keyup.enter="handleLogin"
@ -26,6 +28,7 @@
<el-form-item prop="code" v-if="captchaOnOff"> <el-form-item prop="code" v-if="captchaOnOff">
<el-input <el-input
v-model="loginForm.code" v-model="loginForm.code"
size="large"
auto-complete="off" auto-complete="off"
placeholder="验证码" placeholder="验证码"
style="width: 63%" style="width: 63%"
@ -41,7 +44,7 @@
<el-form-item style="width:100%;"> <el-form-item style="width:100%;">
<el-button <el-button
:loading="loading" :loading="loading"
size="medium" size="large"
type="primary" type="primary"
style="width:100%;" style="width:100%;"
@click.prevent="handleLogin" @click.prevent="handleLogin"
@ -167,15 +170,15 @@ getCookie();
width: 400px; width: 400px;
padding: 25px 25px 5px 25px; padding: 25px 25px 5px 25px;
.el-input { .el-input {
height: 38px; height: 40px;
input { input {
height: 38px; height: 40px;
} }
} }
.input-icon { .input-icon {
height: 39px; height: 39px;
width: 14px; width: 14px;
margin-left: 2px; margin-left: 0px;
} }
} }
.login-tip { .login-tip {
@ -185,7 +188,7 @@ getCookie();
} }
.login-code { .login-code {
width: 33%; width: 33%;
height: 38px; height: 40px;
float: right; float: right;
img { img {
cursor: pointer; cursor: pointer;
@ -205,6 +208,7 @@ getCookie();
letter-spacing: 1px; letter-spacing: 1px;
} }
.login-code-img { .login-code-img {
height: 38px; height: 40px;
padding-left: 12px;
} }
</style> </style>

@ -6,7 +6,6 @@
v-model="queryParams.jobName" v-model="queryParams.jobName"
placeholder="请输入任务名称" placeholder="请输入任务名称"
clearable clearable
size="small"
@keyup.enter="handleQuery" @keyup.enter="handleQuery"
/> />
</el-form-item> </el-form-item>
@ -31,8 +30,8 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" icon="Search" size="mini" @click="handleQuery"></el-button> <el-button type="primary" icon="Search" @click="handleQuery"></el-button>
<el-button icon="Refresh" size="mini" @click="resetQuery"></el-button> <el-button icon="Refresh" @click="resetQuery"></el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
@ -42,7 +41,6 @@
type="primary" type="primary"
plain plain
icon="Plus" icon="Plus"
size="mini"
@click="handleAdd" @click="handleAdd"
v-hasPermi="['monitor:job:add']" v-hasPermi="['monitor:job:add']"
>新增</el-button> >新增</el-button>
@ -52,7 +50,6 @@
type="success" type="success"
plain plain
icon="Edit" icon="Edit"
size="mini"
:disabled="single" :disabled="single"
@click="handleUpdate" @click="handleUpdate"
v-hasPermi="['monitor:job:edit']" v-hasPermi="['monitor:job:edit']"
@ -63,7 +60,6 @@
type="danger" type="danger"
plain plain
icon="Delete" icon="Delete"
size="mini"
:disabled="multiple" :disabled="multiple"
@click="handleDelete" @click="handleDelete"
v-hasPermi="['monitor:job:remove']" v-hasPermi="['monitor:job:remove']"
@ -74,7 +70,6 @@
type="warning" type="warning"
plain plain
icon="Download" icon="Download"
size="mini"
@click="handleExport" @click="handleExport"
v-hasPermi="['monitor:job:export']" v-hasPermi="['monitor:job:export']"
>导出</el-button> >导出</el-button>
@ -84,7 +79,6 @@
type="info" type="info"
plain plain
icon="Operation" icon="Operation"
size="mini"
@click="handleJobLog" @click="handleJobLog"
v-hasPermi="['monitor:job:query']" v-hasPermi="['monitor:job:query']"
>日志</el-button> >日志</el-button>
@ -115,35 +109,46 @@
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" width="200" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" width="200" class-name="small-padding fixed-width">
<template #default="scope"> <template #default="scope">
<el-button <el-tooltip content="修改" placement="top">
size="mini" <el-button
type="text" type="text"
icon="Edit" icon="Edit"
@click="handleUpdate(scope.row)" @click="handleUpdate(scope.row)"
v-hasPermi="['monitor:job:edit']" v-hasPermi="['monitor:job:edit']"
>修改</el-button> ></el-button>
<el-button </el-tooltip>
size="mini" <el-tooltip content="删除" placement="top">
type="text" <el-button
icon="Delete" type="text"
@click="handleDelete(scope.row)" icon="Delete"
v-hasPermi="['monitor:job:remove']" @click="handleDelete(scope.row)"
>删除</el-button> v-hasPermi="['monitor:job:remove']"
<el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)"> ></el-button>
<span class="el-dropdown-link" v-hasPermi="['monitor:job:changeStatus', 'monitor:job:query']"> </el-tooltip>
<i class="el-icon-d-arrow-right el-icon--right"></i>更多 <el-tooltip content="执行一次" placement="top">
</span> <el-button
<template #dropdown> type="text"
<el-dropdown-menu> icon="CaretRight"
<el-dropdown-item command="handleRun" icon="CaretRight" @click="handleRun(scope.row)"
v-hasPermi="['monitor:job:changeStatus']">执行一次</el-dropdown-item> v-hasPermi="['monitor:job:changeStatus']"
<el-dropdown-item command="handleView" icon="View" ></el-button>
v-hasPermi="['monitor:job:query']">任务详细</el-dropdown-item> </el-tooltip>
<el-dropdown-item command="handleJobLog" icon="Operation" <el-tooltip content="任务详细" placement="top">
v-hasPermi="['monitor:job:query']">调度日志</el-dropdown-item> <el-button
</el-dropdown-menu> type="text"
</template> icon="View"
</el-dropdown> @click="handleView(scope.row)"
v-hasPermi="['monitor:job:query']"
></el-button>
</el-tooltip>
<el-tooltip content="调度日志" placement="top">
<el-button
type="text"
icon="Operation"
@click="handleJobLog(scope.row)"
v-hasPermi="['monitor:job:query']"
></el-button>
</el-tooltip>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -211,7 +216,7 @@
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="执行策略" prop="misfirePolicy"> <el-form-item label="执行策略" prop="misfirePolicy">
<el-radio-group v-model="form.misfirePolicy" size="small"> <el-radio-group v-model="form.misfirePolicy">
<el-radio-button label="1">立即执行</el-radio-button> <el-radio-button label="1">立即执行</el-radio-button>
<el-radio-button label="2">执行一次</el-radio-button> <el-radio-button label="2">执行一次</el-radio-button>
<el-radio-button label="3">放弃执行</el-radio-button> <el-radio-button label="3">放弃执行</el-radio-button>
@ -220,7 +225,7 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="是否并发" prop="concurrent"> <el-form-item label="是否并发" prop="concurrent">
<el-radio-group v-model="form.concurrent" size="small"> <el-radio-group v-model="form.concurrent">
<el-radio-button label="0">允许</el-radio-button> <el-radio-button label="0">允许</el-radio-button>
<el-radio-button label="1">禁止</el-radio-button> <el-radio-button label="1">禁止</el-radio-button>
</el-radio-group> </el-radio-group>
@ -249,7 +254,7 @@
<!-- 任务日志详细 --> <!-- 任务日志详细 -->
<el-dialog title="任务详细" v-model="openView" width="700px" append-to-body> <el-dialog title="任务详细" v-model="openView" width="700px" append-to-body>
<el-form :model="form" label-width="120px" size="mini"> <el-form :model="form" label-width="120px">
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="任务编号:">{{ form.jobId }}</el-form-item> <el-form-item label="任务编号:">{{ form.jobId }}</el-form-item>

@ -6,7 +6,6 @@
v-model="queryParams.jobName" v-model="queryParams.jobName"
placeholder="请输入任务名称" placeholder="请输入任务名称"
clearable clearable
size="small"
style="width: 240px" style="width: 240px"
@keyup.enter="handleQuery" @keyup.enter="handleQuery"
/> />
@ -16,7 +15,6 @@
v-model="queryParams.jobGroup" v-model="queryParams.jobGroup"
placeholder="请任务组名" placeholder="请任务组名"
clearable clearable
size="small"
style="width: 240px" style="width: 240px"
> >
<el-option <el-option
@ -32,7 +30,6 @@
v-model="queryParams.status" v-model="queryParams.status"
placeholder="请选择执行状态" placeholder="请选择执行状态"
clearable clearable
size="small"
style="width: 240px" style="width: 240px"
> >
<el-option <el-option
@ -43,11 +40,9 @@
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="执行时间"> <el-form-item label="执行时间" style="width: 308px">
<el-date-picker <el-date-picker
v-model="dateRange" v-model="dateRange"
size="small"
style="width: 240px"
value-format="YYYY-MM-DD" value-format="YYYY-MM-DD"
type="daterange" type="daterange"
range-separator="-" range-separator="-"
@ -56,8 +51,8 @@
></el-date-picker> ></el-date-picker>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" icon="Search" size="mini" @click="handleQuery"></el-button> <el-button type="primary" icon="Search" @click="handleQuery"></el-button>
<el-button icon="Refresh" size="mini" @click="resetQuery"></el-button> <el-button icon="Refresh" @click="resetQuery"></el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
@ -67,7 +62,6 @@
type="danger" type="danger"
plain plain
icon="Delete" icon="Delete"
size="mini"
:disabled="multiple" :disabled="multiple"
@click="handleDelete" @click="handleDelete"
v-hasPermi="['monitor:job:remove']" v-hasPermi="['monitor:job:remove']"
@ -78,7 +72,6 @@
type="danger" type="danger"
plain plain
icon="Delete" icon="Delete"
size="mini"
@click="handleClean" @click="handleClean"
v-hasPermi="['monitor:job:remove']" v-hasPermi="['monitor:job:remove']"
>清空</el-button> >清空</el-button>
@ -88,7 +81,6 @@
type="warning" type="warning"
plain plain
icon="Download" icon="Download"
size="mini"
@click="handleExport" @click="handleExport"
v-hasPermi="['monitor:job:export']" v-hasPermi="['monitor:job:export']"
>导出</el-button> >导出</el-button>
@ -98,7 +90,6 @@
type="warning" type="warning"
plain plain
icon="Close" icon="Close"
size="mini"
@click="handleClose" @click="handleClose"
>关闭</el-button> >关闭</el-button>
</el-col> </el-col>
@ -129,7 +120,6 @@
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template #default="scope"> <template #default="scope">
<el-button <el-button
size="mini"
type="text" type="text"
icon="View" icon="View"
@click="handleView(scope.row)" @click="handleView(scope.row)"
@ -149,7 +139,7 @@
<!-- 调度日志详细 --> <!-- 调度日志详细 -->
<el-dialog title="调度日志详细" v-model="open" width="700px" append-to-body> <el-dialog title="调度日志详细" v-model="open" width="700px" append-to-body>
<el-form :model="form" label-width="100px" size="mini"> <el-form :model="form" label-width="100px">
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="日志序号:">{{ form.jobLogId }}</el-form-item> <el-form-item label="日志序号:">{{ form.jobLogId }}</el-form-item>

@ -6,7 +6,6 @@
v-model="queryParams.ipaddr" v-model="queryParams.ipaddr"
placeholder="请输入登录地址" placeholder="请输入登录地址"
clearable clearable
size="small"
style="width: 240px;" style="width: 240px;"
@keyup.enter="handleQuery" @keyup.enter="handleQuery"
/> />
@ -16,7 +15,6 @@
v-model="queryParams.userName" v-model="queryParams.userName"
placeholder="请输入用户名称" placeholder="请输入用户名称"
clearable clearable
size="small"
style="width: 240px;" style="width: 240px;"
@keyup.enter="handleQuery" @keyup.enter="handleQuery"
/> />
@ -26,7 +24,6 @@
v-model="queryParams.status" v-model="queryParams.status"
placeholder="登录状态" placeholder="登录状态"
clearable clearable
size="small"
style="width: 240px" style="width: 240px"
> >
<el-option <el-option
@ -37,11 +34,9 @@
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="登录时间"> <el-form-item label="登录时间" style="width: 308px">
<el-date-picker <el-date-picker
v-model="dateRange" v-model="dateRange"
size="small"
style="width: 240px"
value-format="YYYY-MM-DD" value-format="YYYY-MM-DD"
type="daterange" type="daterange"
range-separator="-" range-separator="-"
@ -50,8 +45,8 @@
></el-date-picker> ></el-date-picker>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" icon="Search" size="mini" @click="handleQuery"></el-button> <el-button type="primary" icon="Search" @click="handleQuery"></el-button>
<el-button icon="Refresh" size="mini" @click="resetQuery"></el-button> <el-button icon="Refresh" @click="resetQuery"></el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
@ -61,7 +56,6 @@
type="danger" type="danger"
plain plain
icon="Delete" icon="Delete"
size="mini"
:disabled="multiple" :disabled="multiple"
@click="handleDelete" @click="handleDelete"
v-hasPermi="['system:logininfor:remove']" v-hasPermi="['system:logininfor:remove']"
@ -72,7 +66,6 @@
type="danger" type="danger"
plain plain
icon="Delete" icon="Delete"
size="mini"
@click="handleClean" @click="handleClean"
v-hasPermi="['system:logininfor:remove']" v-hasPermi="['system:logininfor:remove']"
>清空</el-button> >清空</el-button>
@ -82,7 +75,6 @@
type="warning" type="warning"
plain plain
icon="Download" icon="Download"
size="mini"
@click="handleExport" @click="handleExport"
v-hasPermi="['system:logininfor:export']" v-hasPermi="['system:logininfor:export']"
>导出</el-button> >导出</el-button>

@ -6,7 +6,6 @@
v-model="queryParams.ipaddr" v-model="queryParams.ipaddr"
placeholder="请输入登录地址" placeholder="请输入登录地址"
clearable clearable
size="small"
@keyup.enter="handleQuery" @keyup.enter="handleQuery"
/> />
</el-form-item> </el-form-item>
@ -19,8 +18,8 @@
/> />
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" icon="Search" size="mini" @click="handleQuery"></el-button> <el-button type="primary" icon="Search" @click="handleQuery"></el-button>
<el-button icon="Refresh" size="mini" @click="resetQuery"></el-button> <el-button icon="Refresh" @click="resetQuery"></el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-table <el-table
@ -28,7 +27,7 @@
:data="onlineList.slice((pageNum - 1) * pageSize, pageNum * pageSize)" :data="onlineList.slice((pageNum - 1) * pageSize, pageNum * pageSize)"
style="width: 100%;" style="width: 100%;"
> >
<el-table-column label="序号" type="index" align="center"> <el-table-column label="序号" width="50" type="index" align="center">
<template #default="scope"> <template #default="scope">
<span>{{ (pageNum - 1) * pageSize + scope.$index + 1 }}</span> <span>{{ (pageNum - 1) * pageSize + scope.$index + 1 }}</span>
</template> </template>
@ -48,7 +47,6 @@
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template #default="scope"> <template #default="scope">
<el-button <el-button
size="mini"
type="text" type="text"
icon="Delete" icon="Delete"
@click="handleForceLogout(scope.row)" @click="handleForceLogout(scope.row)"

@ -6,7 +6,6 @@
v-model="queryParams.title" v-model="queryParams.title"
placeholder="请输入系统模块" placeholder="请输入系统模块"
clearable clearable
size="small"
style="width: 240px;" style="width: 240px;"
@keyup.enter="handleQuery" @keyup.enter="handleQuery"
/> />
@ -16,7 +15,6 @@
v-model="queryParams.operName" v-model="queryParams.operName"
placeholder="请输入操作人员" placeholder="请输入操作人员"
clearable clearable
size="small"
style="width: 240px;" style="width: 240px;"
@keyup.enter="handleQuery" @keyup.enter="handleQuery"
/> />
@ -26,7 +24,6 @@
v-model="queryParams.businessType" v-model="queryParams.businessType"
placeholder="操作类型" placeholder="操作类型"
clearable clearable
size="small"
style="width: 240px" style="width: 240px"
> >
<el-option <el-option
@ -42,7 +39,6 @@
v-model="queryParams.status" v-model="queryParams.status"
placeholder="操作状态" placeholder="操作状态"
clearable clearable
size="small"
style="width: 240px" style="width: 240px"
> >
<el-option <el-option
@ -53,11 +49,9 @@
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="操作时间"> <el-form-item label="操作时间" style="width: 308px">
<el-date-picker <el-date-picker
v-model="dateRange" v-model="dateRange"
size="small"
style="width: 240px"
value-format="YYYY-MM-DD" value-format="YYYY-MM-DD"
type="daterange" type="daterange"
range-separator="-" range-separator="-"
@ -66,8 +60,8 @@
></el-date-picker> ></el-date-picker>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" icon="Search" size="mini" @click="handleQuery"></el-button> <el-button type="primary" icon="Search" @click="handleQuery"></el-button>
<el-button icon="Refresh" size="mini" @click="resetQuery"></el-button> <el-button icon="Refresh" @click="resetQuery"></el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
@ -77,7 +71,6 @@
type="danger" type="danger"
plain plain
icon="Delete" icon="Delete"
size="mini"
:disabled="multiple" :disabled="multiple"
@click="handleDelete" @click="handleDelete"
v-hasPermi="['system:operlog:remove']" v-hasPermi="['system:operlog:remove']"
@ -88,7 +81,6 @@
type="danger" type="danger"
plain plain
icon="Delete" icon="Delete"
size="mini"
@click="handleClean" @click="handleClean"
v-hasPermi="['system:operlog:remove']" v-hasPermi="['system:operlog:remove']"
>清空</el-button> >清空</el-button>
@ -98,7 +90,6 @@
type="warning" type="warning"
plain plain
icon="Download" icon="Download"
size="mini"
@click="handleExport" @click="handleExport"
v-hasPermi="['system:operlog:export']" v-hasPermi="['system:operlog:export']"
>导出</el-button> >导出</el-button>
@ -131,7 +122,6 @@
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template #default="scope"> <template #default="scope">
<el-button <el-button
size="mini"
type="text" type="text"
icon="View" icon="View"
@click="handleView(scope.row, scope.index)" @click="handleView(scope.row, scope.index)"
@ -151,7 +141,7 @@
<!-- 操作日志详细 --> <!-- 操作日志详细 -->
<el-dialog title="操作日志详细" v-model="open" width="700px" append-to-body> <el-dialog title="操作日志详细" v-model="open" width="700px" append-to-body>
<el-form :model="form" label-width="100px" size="mini"> <el-form :model="form" label-width="100px">
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="操作模块:">{{ form.title }} / {{ typeFormat(form) }}</el-form-item> <el-form-item label="操作模块:">{{ form.title }} / {{ typeFormat(form) }}</el-form-item>

@ -3,7 +3,13 @@
<el-form ref="registerRef" :model="registerForm" :rules="registerRules" class="register-form"> <el-form ref="registerRef" :model="registerForm" :rules="registerRules" class="register-form">
<h3 class="title">若依后台管理系统</h3> <h3 class="title">若依后台管理系统</h3>
<el-form-item prop="username"> <el-form-item prop="username">
<el-input v-model="registerForm.username" type="text" auto-complete="off" placeholder="账号"> <el-input
v-model="registerForm.username"
type="text"
size="large"
auto-complete="off"
placeholder="账号"
>
<template #prefix><svg-icon icon-class="user" class="el-input__icon input-icon" /></template> <template #prefix><svg-icon icon-class="user" class="el-input__icon input-icon" /></template>
</el-input> </el-input>
</el-form-item> </el-form-item>
@ -11,6 +17,7 @@
<el-input <el-input
v-model="registerForm.password" v-model="registerForm.password"
type="password" type="password"
size="large"
auto-complete="off" auto-complete="off"
placeholder="密码" placeholder="密码"
@keyup.enter="handleRegister" @keyup.enter="handleRegister"
@ -22,6 +29,7 @@
<el-input <el-input
v-model="registerForm.confirmPassword" v-model="registerForm.confirmPassword"
type="password" type="password"
size="large"
auto-complete="off" auto-complete="off"
placeholder="确认密码" placeholder="确认密码"
@keyup.enter="handleRegister" @keyup.enter="handleRegister"
@ -31,6 +39,7 @@
</el-form-item> </el-form-item>
<el-form-item prop="code" v-if="captchaOnOff"> <el-form-item prop="code" v-if="captchaOnOff">
<el-input <el-input
size="large"
v-model="registerForm.code" v-model="registerForm.code"
auto-complete="off" auto-complete="off"
placeholder="验证码" placeholder="验证码"
@ -46,7 +55,7 @@
<el-form-item style="width:100%;"> <el-form-item style="width:100%;">
<el-button <el-button
:loading="loading" :loading="loading"
size="medium" size="large"
type="primary" type="primary"
style="width:100%;" style="width:100%;"
@click.prevent="handleRegister" @click.prevent="handleRegister"
@ -165,15 +174,15 @@ getCode();
width: 400px; width: 400px;
padding: 25px 25px 5px 25px; padding: 25px 25px 5px 25px;
.el-input { .el-input {
height: 38px; height: 40px;
input { input {
height: 38px; height: 40px;
} }
} }
.input-icon { .input-icon {
height: 39px; height: 39px;
width: 14px; width: 14px;
margin-left: 2px; margin-left: 0px;
} }
} }
.register-tip { .register-tip {
@ -183,7 +192,7 @@ getCode();
} }
.register-code { .register-code {
width: 33%; width: 33%;
height: 38px; height: 40px;
float: right; float: right;
img { img {
cursor: pointer; cursor: pointer;
@ -203,6 +212,7 @@ getCode();
letter-spacing: 1px; letter-spacing: 1px;
} }
.register-code-img { .register-code-img {
height: 38px; height: 40px;
padding-left: 12px;
} }
</style> </style>

@ -6,7 +6,6 @@
v-model="queryParams.configName" v-model="queryParams.configName"
placeholder="请输入参数名称" placeholder="请输入参数名称"
clearable clearable
size="small"
style="width: 240px" style="width: 240px"
@keyup.enter="handleQuery" @keyup.enter="handleQuery"
/> />
@ -16,13 +15,12 @@
v-model="queryParams.configKey" v-model="queryParams.configKey"
placeholder="请输入参数键名" placeholder="请输入参数键名"
clearable clearable
size="small"
style="width: 240px" style="width: 240px"
@keyup.enter="handleQuery" @keyup.enter="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="系统内置" prop="configType"> <el-form-item label="系统内置" prop="configType">
<el-select v-model="queryParams.configType" placeholder="系统内置" clearable size="small"> <el-select v-model="queryParams.configType" placeholder="系统内置" clearable>
<el-option <el-option
v-for="dict in sys_yes_no" v-for="dict in sys_yes_no"
:key="dict.value" :key="dict.value"
@ -31,11 +29,9 @@
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="创建时间"> <el-form-item label="创建时间" style="width: 308px;">
<el-date-picker <el-date-picker
v-model="dateRange" v-model="dateRange"
size="small"
style="width: 240px"
value-format="YYYY-MM-DD" value-format="YYYY-MM-DD"
type="daterange" type="daterange"
range-separator="-" range-separator="-"
@ -44,8 +40,8 @@
></el-date-picker> ></el-date-picker>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" icon="Search" size="mini" @click="handleQuery"></el-button> <el-button type="primary" icon="Search" @click="handleQuery"></el-button>
<el-button icon="Refresh" size="mini" @click="resetQuery"></el-button> <el-button icon="Refresh" @click="resetQuery"></el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
@ -55,7 +51,6 @@
type="primary" type="primary"
plain plain
icon="Plus" icon="Plus"
size="mini"
@click="handleAdd" @click="handleAdd"
v-hasPermi="['system:config:add']" v-hasPermi="['system:config:add']"
>新增</el-button> >新增</el-button>
@ -65,7 +60,6 @@
type="success" type="success"
plain plain
icon="Edit" icon="Edit"
size="mini"
:disabled="single" :disabled="single"
@click="handleUpdate" @click="handleUpdate"
v-hasPermi="['system:config:edit']" v-hasPermi="['system:config:edit']"
@ -76,7 +70,6 @@
type="danger" type="danger"
plain plain
icon="Delete" icon="Delete"
size="mini"
:disabled="multiple" :disabled="multiple"
@click="handleDelete" @click="handleDelete"
v-hasPermi="['system:config:remove']" v-hasPermi="['system:config:remove']"
@ -87,7 +80,6 @@
type="warning" type="warning"
plain plain
icon="Download" icon="Download"
size="mini"
@click="handleExport" @click="handleExport"
v-hasPermi="['system:config:export']" v-hasPermi="['system:config:export']"
>导出</el-button> >导出</el-button>
@ -97,7 +89,6 @@
type="danger" type="danger"
plain plain
icon="Refresh" icon="Refresh"
size="mini"
@click="handleRefreshCache" @click="handleRefreshCache"
v-hasPermi="['system:config:remove']" v-hasPermi="['system:config:remove']"
>刷新缓存</el-button> >刷新缓存</el-button>
@ -125,14 +116,12 @@
<el-table-column label="操作" align="center" width="150" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" width="150" class-name="small-padding fixed-width">
<template #default="scope"> <template #default="scope">
<el-button <el-button
size="mini"
type="text" type="text"
icon="Edit" icon="Edit"
@click="handleUpdate(scope.row)" @click="handleUpdate(scope.row)"
v-hasPermi="['system:config:edit']" v-hasPermi="['system:config:edit']"
>修改</el-button> >修改</el-button>
<el-button <el-button
size="mini"
type="text" type="text"
icon="Delete" icon="Delete"
@click="handleDelete(scope.row)" @click="handleDelete(scope.row)"

@ -6,12 +6,11 @@
v-model="queryParams.deptName" v-model="queryParams.deptName"
placeholder="请输入部门名称" placeholder="请输入部门名称"
clearable clearable
size="small"
@keyup.enter="handleQuery" @keyup.enter="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="状态" prop="status"> <el-form-item label="状态" prop="status">
<el-select v-model="queryParams.status" placeholder="部门状态" clearable size="small"> <el-select v-model="queryParams.status" placeholder="部门状态" clearable>
<el-option <el-option
v-for="dict in sys_normal_disable" v-for="dict in sys_normal_disable"
:key="dict.value" :key="dict.value"
@ -21,8 +20,8 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" icon="Search" size="mini" @click="handleQuery"></el-button> <el-button type="primary" icon="Search" @click="handleQuery"></el-button>
<el-button icon="Refresh" size="mini" @click="resetQuery"></el-button> <el-button icon="Refresh" @click="resetQuery"></el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
@ -32,7 +31,6 @@
type="primary" type="primary"
plain plain
icon="Plus" icon="Plus"
size="mini"
@click="handleAdd" @click="handleAdd"
v-hasPermi="['system:dept:add']" v-hasPermi="['system:dept:add']"
>新增</el-button> >新增</el-button>
@ -42,7 +40,6 @@
type="info" type="info"
plain plain
icon="Sort" icon="Sort"
size="mini"
@click="toggleExpandAll" @click="toggleExpandAll"
>展开/折叠</el-button> >展开/折叠</el-button>
</el-col> </el-col>
@ -72,14 +69,12 @@
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template #default="scope"> <template #default="scope">
<el-button <el-button
size="mini"
type="text" type="text"
icon="Edit" icon="Edit"
@click="handleUpdate(scope.row)" @click="handleUpdate(scope.row)"
v-hasPermi="['system:dept:edit']" v-hasPermi="['system:dept:edit']"
>修改</el-button> >修改</el-button>
<el-button <el-button
size="mini"
type="text" type="text"
icon="Plus" icon="Plus"
@click="handleAdd(scope.row)" @click="handleAdd(scope.row)"
@ -87,7 +82,6 @@
>新增</el-button> >新增</el-button>
<el-button <el-button
v-if="scope.row.parentId != 0" v-if="scope.row.parentId != 0"
size="mini"
type="text" type="text"
icon="Delete" icon="Delete"
@click="handleDelete(scope.row)" @click="handleDelete(scope.row)"

@ -2,7 +2,7 @@
<div class="app-container"> <div class="app-container">
<el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px"> <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="字典名称" prop="dictType"> <el-form-item label="字典名称" prop="dictType">
<el-select v-model="queryParams.dictType" size="small"> <el-select v-model="queryParams.dictType">
<el-option <el-option
v-for="item in typeOptions" v-for="item in typeOptions"
:key="item.dictId" :key="item.dictId"
@ -16,12 +16,11 @@
v-model="queryParams.dictLabel" v-model="queryParams.dictLabel"
placeholder="请输入字典标签" placeholder="请输入字典标签"
clearable clearable
size="small"
@keyup.enter="handleQuery" @keyup.enter="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="状态" prop="status"> <el-form-item label="状态" prop="status">
<el-select v-model="queryParams.status" placeholder="数据状态" clearable size="small"> <el-select v-model="queryParams.status" placeholder="数据状态" clearable>
<el-option <el-option
v-for="dict in sys_normal_disable" v-for="dict in sys_normal_disable"
:key="dict.value" :key="dict.value"
@ -31,8 +30,8 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" icon="Search" size="mini" @click="handleQuery"></el-button> <el-button type="primary" icon="Search" @click="handleQuery"></el-button>
<el-button icon="Refresh" size="mini" @click="resetQuery"></el-button> <el-button icon="Refresh" @click="resetQuery"></el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
@ -42,7 +41,6 @@
type="primary" type="primary"
plain plain
icon="Plus" icon="Plus"
size="mini"
@click="handleAdd" @click="handleAdd"
v-hasPermi="['system:dict:add']" v-hasPermi="['system:dict:add']"
>新增</el-button> >新增</el-button>
@ -52,7 +50,6 @@
type="success" type="success"
plain plain
icon="Edit" icon="Edit"
size="mini"
:disabled="single" :disabled="single"
@click="handleUpdate" @click="handleUpdate"
v-hasPermi="['system:dict:edit']" v-hasPermi="['system:dict:edit']"
@ -63,7 +60,6 @@
type="danger" type="danger"
plain plain
icon="Delete" icon="Delete"
size="mini"
:disabled="multiple" :disabled="multiple"
@click="handleDelete" @click="handleDelete"
v-hasPermi="['system:dict:remove']" v-hasPermi="['system:dict:remove']"
@ -74,7 +70,6 @@
type="warning" type="warning"
plain plain
icon="Download" icon="Download"
size="mini"
@click="handleExport" @click="handleExport"
v-hasPermi="['system:dict:export']" v-hasPermi="['system:dict:export']"
>导出</el-button> >导出</el-button>
@ -84,7 +79,6 @@
type="warning" type="warning"
plain plain
icon="Close" icon="Close"
size="mini"
@click="handleClose" @click="handleClose"
>关闭</el-button> >关闭</el-button>
</el-col> </el-col>
@ -116,14 +110,12 @@
<el-table-column label="操作" align="center" width="150" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" width="150" class-name="small-padding fixed-width">
<template #default="scope"> <template #default="scope">
<el-button <el-button
size="mini"
type="text" type="text"
icon="Edit" icon="Edit"
@click="handleUpdate(scope.row)" @click="handleUpdate(scope.row)"
v-hasPermi="['system:dict:edit']" v-hasPermi="['system:dict:edit']"
>修改</el-button> >修改</el-button>
<el-button <el-button
size="mini"
type="text" type="text"
icon="Delete" icon="Delete"
@click="handleDelete(scope.row)" @click="handleDelete(scope.row)"

@ -6,7 +6,6 @@
v-model="queryParams.dictName" v-model="queryParams.dictName"
placeholder="请输入字典名称" placeholder="请输入字典名称"
clearable clearable
size="small"
style="width: 240px" style="width: 240px"
@keyup.enter="handleQuery" @keyup.enter="handleQuery"
/> />
@ -16,7 +15,6 @@
v-model="queryParams.dictType" v-model="queryParams.dictType"
placeholder="请输入字典类型" placeholder="请输入字典类型"
clearable clearable
size="small"
style="width: 240px" style="width: 240px"
@keyup.enter="handleQuery" @keyup.enter="handleQuery"
/> />
@ -26,7 +24,6 @@
v-model="queryParams.status" v-model="queryParams.status"
placeholder="字典状态" placeholder="字典状态"
clearable clearable
size="small"
style="width: 240px" style="width: 240px"
> >
<el-option <el-option
@ -37,11 +34,9 @@
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="创建时间"> <el-form-item label="创建时间" style="width: 308px">
<el-date-picker <el-date-picker
v-model="dateRange" v-model="dateRange"
size="small"
style="width: 240px"
value-format="YYYY-MM-DD" value-format="YYYY-MM-DD"
type="daterange" type="daterange"
range-separator="-" range-separator="-"
@ -50,8 +45,8 @@
></el-date-picker> ></el-date-picker>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" icon="Search" size="mini" @click="handleQuery"></el-button> <el-button type="primary" icon="Search" @click="handleQuery"></el-button>
<el-button icon="Refresh" size="mini" @click="resetQuery"></el-button> <el-button icon="Refresh" @click="resetQuery"></el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
@ -61,7 +56,6 @@
type="primary" type="primary"
plain plain
icon="Plus" icon="Plus"
size="mini"
@click="handleAdd" @click="handleAdd"
v-hasPermi="['system:dict:add']" v-hasPermi="['system:dict:add']"
>新增</el-button> >新增</el-button>
@ -71,7 +65,6 @@
type="success" type="success"
plain plain
icon="Edit" icon="Edit"
size="mini"
:disabled="single" :disabled="single"
@click="handleUpdate" @click="handleUpdate"
v-hasPermi="['system:dict:edit']" v-hasPermi="['system:dict:edit']"
@ -82,7 +75,6 @@
type="danger" type="danger"
plain plain
icon="Delete" icon="Delete"
size="mini"
:disabled="multiple" :disabled="multiple"
@click="handleDelete" @click="handleDelete"
v-hasPermi="['system:dict:remove']" v-hasPermi="['system:dict:remove']"
@ -93,7 +85,6 @@
type="warning" type="warning"
plain plain
icon="Download" icon="Download"
size="mini"
@click="handleExport" @click="handleExport"
v-hasPermi="['system:dict:export']" v-hasPermi="['system:dict:export']"
>导出</el-button> >导出</el-button>
@ -103,7 +94,6 @@
type="danger" type="danger"
plain plain
icon="Refresh" icon="Refresh"
size="mini"
@click="handleRefreshCache" @click="handleRefreshCache"
v-hasPermi="['system:dict:remove']" v-hasPermi="['system:dict:remove']"
>刷新缓存</el-button> >刷新缓存</el-button>
@ -136,14 +126,12 @@
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template #default="scope"> <template #default="scope">
<el-button <el-button
size="mini"
type="text" type="text"
icon="Edit" icon="Edit"
@click="handleUpdate(scope.row)" @click="handleUpdate(scope.row)"
v-hasPermi="['system:dict:edit']" v-hasPermi="['system:dict:edit']"
>修改</el-button> >修改</el-button>
<el-button <el-button
size="mini"
type="text" type="text"
icon="Delete" icon="Delete"
@click="handleDelete(scope.row)" @click="handleDelete(scope.row)"

@ -6,12 +6,11 @@
v-model="queryParams.menuName" v-model="queryParams.menuName"
placeholder="请输入菜单名称" placeholder="请输入菜单名称"
clearable clearable
size="small"
@keyup.enter="handleQuery" @keyup.enter="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="状态" prop="status"> <el-form-item label="状态" prop="status">
<el-select v-model="queryParams.status" placeholder="菜单状态" clearable size="small"> <el-select v-model="queryParams.status" placeholder="菜单状态" clearable>
<el-option <el-option
v-for="dict in sys_normal_disable" v-for="dict in sys_normal_disable"
:key="dict.value" :key="dict.value"
@ -21,8 +20,8 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" icon="Search" size="mini" @click="handleQuery"></el-button> <el-button type="primary" icon="Search" @click="handleQuery"></el-button>
<el-button icon="Refresh" size="mini" @click="resetQuery"></el-button> <el-button icon="Refresh" @click="resetQuery"></el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
@ -32,7 +31,6 @@
type="primary" type="primary"
plain plain
icon="Plus" icon="Plus"
size="mini"
@click="handleAdd" @click="handleAdd"
v-hasPermi="['system:menu:add']" v-hasPermi="['system:menu:add']"
>新增</el-button> >新增</el-button>
@ -42,7 +40,6 @@
type="info" type="info"
plain plain
icon="Sort" icon="Sort"
size="mini"
@click="toggleExpandAll" @click="toggleExpandAll"
>展开/折叠</el-button> >展开/折叠</el-button>
</el-col> </el-col>
@ -79,21 +76,18 @@
<el-table-column label="操作" align="center" width="200" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" width="200" class-name="small-padding fixed-width">
<template #default="scope"> <template #default="scope">
<el-button <el-button
size="mini"
type="text" type="text"
icon="Edit" icon="Edit"
@click="handleUpdate(scope.row)" @click="handleUpdate(scope.row)"
v-hasPermi="['system:menu:edit']" v-hasPermi="['system:menu:edit']"
>修改</el-button> >修改</el-button>
<el-button <el-button
size="mini"
type="text" type="text"
icon="Plus" icon="Plus"
@click="handleAdd(scope.row)" @click="handleAdd(scope.row)"
v-hasPermi="['system:menu:add']" v-hasPermi="['system:menu:add']"
>新增</el-button> >新增</el-button>
<el-button <el-button
size="mini"
type="text" type="text"
icon="Delete" icon="Delete"
@click="handleDelete(scope.row)" @click="handleDelete(scope.row)"
@ -135,9 +129,8 @@
trigger="click" trigger="click"
@show="showSelectIcon" @show="showSelectIcon"
> >
<icon-select ref="iconSelectRef" @selected="selected" />
<template #reference> <template #reference>
<el-input v-model="form.icon" placeholder="点击选择图标" readonly> <el-input v-model="form.icon" placeholder="点击选择图标" @click="showSelectIcon" readonly>
<template #prefix> <template #prefix>
<svg-icon <svg-icon
v-if="form.icon" v-if="form.icon"
@ -145,10 +138,11 @@
class="el-input__icon" class="el-input__icon"
style="height: 32px;width: 16px;" style="height: 32px;width: 16px;"
/> />
<i v-else class="el-icon-search el-input__icon" /> <el-icon v-else style="height: 32px;width: 16px;"><search /></el-icon>
</template> </template>
</el-input> </el-input>
</template> </template>
<icon-select ref="iconSelectRef" @selected="selected" />
</el-popover> </el-popover>
</el-form-item> </el-form-item>
</el-col> </el-col>

@ -6,7 +6,6 @@
v-model="queryParams.noticeTitle" v-model="queryParams.noticeTitle"
placeholder="请输入公告标题" placeholder="请输入公告标题"
clearable clearable
size="small"
@keyup.enter="handleQuery" @keyup.enter="handleQuery"
/> />
</el-form-item> </el-form-item>
@ -19,7 +18,7 @@
/> />
</el-form-item> </el-form-item>
<el-form-item label="类型" prop="noticeType"> <el-form-item label="类型" prop="noticeType">
<el-select v-model="queryParams.noticeType" placeholder="公告类型" clearable size="small"> <el-select v-model="queryParams.noticeType" placeholder="公告类型" clearable>
<el-option <el-option
v-for="dict in sys_notice_type" v-for="dict in sys_notice_type"
:key="dict.value" :key="dict.value"
@ -29,8 +28,8 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" icon="Search" size="mini" @click="handleQuery"></el-button> <el-button type="primary" icon="Search" @click="handleQuery"></el-button>
<el-button icon="Refresh" size="mini" @click="resetQuery"></el-button> <el-button icon="Refresh" @click="resetQuery"></el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
@ -40,7 +39,6 @@
type="primary" type="primary"
plain plain
icon="Plus" icon="Plus"
size="mini"
@click="handleAdd" @click="handleAdd"
v-hasPermi="['system:notice:add']" v-hasPermi="['system:notice:add']"
>新增</el-button> >新增</el-button>
@ -50,7 +48,6 @@
type="success" type="success"
plain plain
icon="Edit" icon="Edit"
size="mini"
:disabled="single" :disabled="single"
@click="handleUpdate" @click="handleUpdate"
v-hasPermi="['system:notice:edit']" v-hasPermi="['system:notice:edit']"
@ -61,7 +58,6 @@
type="danger" type="danger"
plain plain
icon="Delete" icon="Delete"
size="mini"
:disabled="multiple" :disabled="multiple"
@click="handleDelete" @click="handleDelete"
v-hasPermi="['system:notice:remove']" v-hasPermi="['system:notice:remove']"
@ -98,14 +94,12 @@
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template #default="scope"> <template #default="scope">
<el-button <el-button
size="mini"
type="text" type="text"
icon="Edit" icon="Edit"
@click="handleUpdate(scope.row)" @click="handleUpdate(scope.row)"
v-hasPermi="['system:notice:edit']" v-hasPermi="['system:notice:edit']"
>修改</el-button> >修改</el-button>
<el-button <el-button
size="mini"
type="text" type="text"
icon="Delete" icon="Delete"
@click="handleDelete(scope.row)" @click="handleDelete(scope.row)"

@ -6,7 +6,6 @@
v-model="queryParams.postCode" v-model="queryParams.postCode"
placeholder="请输入岗位编码" placeholder="请输入岗位编码"
clearable clearable
size="small"
@keyup.enter="handleQuery" @keyup.enter="handleQuery"
/> />
</el-form-item> </el-form-item>
@ -15,12 +14,11 @@
v-model="queryParams.postName" v-model="queryParams.postName"
placeholder="请输入岗位名称" placeholder="请输入岗位名称"
clearable clearable
size="small"
@keyup.enter="handleQuery" @keyup.enter="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="状态" prop="status"> <el-form-item label="状态" prop="status">
<el-select v-model="queryParams.status" placeholder="岗位状态" clearable size="small"> <el-select v-model="queryParams.status" placeholder="岗位状态" clearable>
<el-option <el-option
v-for="dict in sys_normal_disable" v-for="dict in sys_normal_disable"
:key="dict.value" :key="dict.value"
@ -30,8 +28,8 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" icon="Search" size="mini" @click="handleQuery"></el-button> <el-button type="primary" icon="Search" @click="handleQuery"></el-button>
<el-button icon="Refresh" size="mini" @click="resetQuery"></el-button> <el-button icon="Refresh" @click="resetQuery"></el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
@ -41,7 +39,6 @@
type="primary" type="primary"
plain plain
icon="Plus" icon="Plus"
size="mini"
@click="handleAdd" @click="handleAdd"
v-hasPermi="['system:post:add']" v-hasPermi="['system:post:add']"
>新增</el-button> >新增</el-button>
@ -51,7 +48,6 @@
type="success" type="success"
plain plain
icon="Edit" icon="Edit"
size="mini"
:disabled="single" :disabled="single"
@click="handleUpdate" @click="handleUpdate"
v-hasPermi="['system:post:edit']" v-hasPermi="['system:post:edit']"
@ -62,7 +58,6 @@
type="danger" type="danger"
plain plain
icon="Delete" icon="Delete"
size="mini"
:disabled="multiple" :disabled="multiple"
@click="handleDelete" @click="handleDelete"
v-hasPermi="['system:post:remove']" v-hasPermi="['system:post:remove']"
@ -73,7 +68,6 @@
type="warning" type="warning"
plain plain
icon="Download" icon="Download"
size="mini"
@click="handleExport" @click="handleExport"
v-hasPermi="['system:post:export']" v-hasPermi="['system:post:export']"
>导出</el-button> >导出</el-button>
@ -100,14 +94,12 @@
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template #default="scope"> <template #default="scope">
<el-button <el-button
size="mini"
type="text" type="text"
icon="Edit" icon="Edit"
@click="handleUpdate(scope.row)" @click="handleUpdate(scope.row)"
v-hasPermi="['system:post:edit']" v-hasPermi="['system:post:edit']"
>修改</el-button> >修改</el-button>
<el-button <el-button
size="mini"
type="text" type="text"
icon="Delete" icon="Delete"
@click="handleDelete(scope.row)" @click="handleDelete(scope.row)"

@ -7,7 +7,6 @@
v-model="queryParams.userName" v-model="queryParams.userName"
placeholder="请输入用户名称" placeholder="请输入用户名称"
clearable clearable
size="small"
style="width: 240px" style="width: 240px"
@keyup.enter="handleQuery" @keyup.enter="handleQuery"
/> />
@ -17,14 +16,13 @@
v-model="queryParams.phonenumber" v-model="queryParams.phonenumber"
placeholder="请输入手机号码" placeholder="请输入手机号码"
clearable clearable
size="small"
style="width: 240px" style="width: 240px"
@keyup.enter="handleQuery" @keyup.enter="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" icon="Search" size="mini" @click="handleQuery"></el-button> <el-button type="primary" icon="Search" @click="handleQuery"></el-button>
<el-button icon="Refresh" size="mini" @click="resetQuery"></el-button> <el-button icon="Refresh" @click="resetQuery"></el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
@ -34,7 +32,6 @@
type="primary" type="primary"
plain plain
icon="Plus" icon="Plus"
size="mini"
@click="openSelectUser" @click="openSelectUser"
v-hasPermi="['system:role:add']" v-hasPermi="['system:role:add']"
>添加用户</el-button> >添加用户</el-button>
@ -44,7 +41,6 @@
type="danger" type="danger"
plain plain
icon="CircleClose" icon="CircleClose"
size="mini"
:disabled="multiple" :disabled="multiple"
@click="cancelAuthUserAll" @click="cancelAuthUserAll"
v-hasPermi="['system:role:remove']" v-hasPermi="['system:role:remove']"
@ -55,7 +51,6 @@
type="warning" type="warning"
plain plain
icon="Close" icon="Close"
size="mini"
@click="handleClose" @click="handleClose"
>关闭</el-button> >关闭</el-button>
</el-col> </el-col>
@ -81,7 +76,6 @@
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template #default="scope"> <template #default="scope">
<el-button <el-button
size="mini"
type="text" type="text"
icon="CircleClose" icon="CircleClose"
@click="cancelAuthUser(scope.row)" @click="cancelAuthUser(scope.row)"

@ -6,7 +6,6 @@
v-model="queryParams.roleName" v-model="queryParams.roleName"
placeholder="请输入角色名称" placeholder="请输入角色名称"
clearable clearable
size="small"
style="width: 240px" style="width: 240px"
@keyup.enter="handleQuery" @keyup.enter="handleQuery"
/> />
@ -16,7 +15,6 @@
v-model="queryParams.roleKey" v-model="queryParams.roleKey"
placeholder="请输入权限字符" placeholder="请输入权限字符"
clearable clearable
size="small"
style="width: 240px" style="width: 240px"
@keyup.enter="handleQuery" @keyup.enter="handleQuery"
/> />
@ -26,7 +24,6 @@
v-model="queryParams.status" v-model="queryParams.status"
placeholder="角色状态" placeholder="角色状态"
clearable clearable
size="small"
style="width: 240px" style="width: 240px"
> >
<el-option <el-option
@ -37,11 +34,9 @@
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="创建时间"> <el-form-item label="创建时间" style="width: 308px">
<el-date-picker <el-date-picker
v-model="dateRange" v-model="dateRange"
size="small"
style="width: 240px"
value-format="YYYY-MM-DD" value-format="YYYY-MM-DD"
type="daterange" type="daterange"
range-separator="-" range-separator="-"
@ -50,8 +45,8 @@
></el-date-picker> ></el-date-picker>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" icon="Search" size="mini" @click="handleQuery"></el-button> <el-button type="primary" icon="Search" @click="handleQuery"></el-button>
<el-button icon="Refresh" size="mini" @click="resetQuery"></el-button> <el-button icon="Refresh" @click="resetQuery"></el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
@ -60,7 +55,6 @@
type="primary" type="primary"
plain plain
icon="Plus" icon="Plus"
size="mini"
@click="handleAdd" @click="handleAdd"
v-hasPermi="['system:role:add']" v-hasPermi="['system:role:add']"
>新增</el-button> >新增</el-button>
@ -70,7 +64,6 @@
type="success" type="success"
plain plain
icon="Edit" icon="Edit"
size="mini"
:disabled="single" :disabled="single"
@click="handleUpdate" @click="handleUpdate"
v-hasPermi="['system:role:edit']" v-hasPermi="['system:role:edit']"
@ -81,7 +74,6 @@
type="danger" type="danger"
plain plain
icon="Delete" icon="Delete"
size="mini"
:disabled="multiple" :disabled="multiple"
@click="handleDelete" @click="handleDelete"
v-hasPermi="['system:role:remove']" v-hasPermi="['system:role:remove']"
@ -92,7 +84,6 @@
type="warning" type="warning"
plain plain
icon="Download" icon="Download"
size="mini"
@click="handleExport" @click="handleExport"
v-hasPermi="['system:role:export']" v-hasPermi="['system:role:export']"
>导出</el-button> >导出</el-button>
@ -117,42 +108,49 @@
></el-switch> ></el-switch>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="创建时间" align="center" prop="createTime" width="180"> <el-table-column label="创建时间" align="center" prop="createTime">
<template #default="scope"> <template #default="scope">
<span>{{ parseTime(scope.row.createTime) }}</span> <span>{{ parseTime(scope.row.createTime) }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template #default="scope"> <template #default="scope">
<el-button <el-tooltip content="修改" placement="top">
size="mini" <el-button
v-if="scope.row.roleId !== 1" v-if="scope.row.roleId !== 1"
type="text" type="text"
icon="Edit" icon="Edit"
@click="handleUpdate(scope.row)" @click="handleUpdate(scope.row)"
v-hasPermi="['system:role:edit']" v-hasPermi="['system:role:edit']"
>修改</el-button> ></el-button>
<el-button </el-tooltip>
size="mini" <el-tooltip content="删除" placement="top">
<el-button
v-if="scope.row.roleId !== 1" v-if="scope.row.roleId !== 1"
type="text" type="text"
icon="Delete" icon="Delete"
@click="handleDelete(scope.row)" @click="handleDelete(scope.row)"
v-hasPermi="['system:role:remove']" v-hasPermi="['system:role:remove']"
>删除</el-button> ></el-button>
<el-dropdown size="mini" v-if="scope.row.roleId !== 1" @command="(command) => handleCommand(command, scope.row)"> </el-tooltip>
<span class="el-dropdown-link" v-hasPermi="['system:role:edit']"> <el-tooltip content="数据权限" placement="top">
<el-icon><d-arrow-right /></el-icon> <el-button
</span> v-if="scope.row.roleId !== 1"
<template #dropdown> type="text"
<el-dropdown-menu> icon="CircleCheck"
<el-dropdown-item command="handleDataScope" icon="CircleCheck" @click="handleDataScope(scope.row)"
v-hasPermi="['system:role:edit']">数据权限</el-dropdown-item> v-hasPermi="['system:role:edit']"
<el-dropdown-item command="handleAuthUser" icon="User" ></el-button>
v-hasPermi="['system:role:edit']">分配用户</el-dropdown-item> </el-tooltip>
</el-dropdown-menu> <el-tooltip content="分配用户" placement="top">
</template> <el-button
</el-dropdown> v-if="scope.row.roleId !== 1"
type="text"
icon="User"
@click="handleAuthUser(scope.row)"
v-hasPermi="['system:role:edit']"
></el-button>
</el-tooltip>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>

@ -7,7 +7,6 @@
v-model="queryParams.userName" v-model="queryParams.userName"
placeholder="请输入用户名称" placeholder="请输入用户名称"
clearable clearable
size="small"
@keyup.enter="handleQuery" @keyup.enter="handleQuery"
/> />
</el-form-item> </el-form-item>
@ -16,13 +15,12 @@
v-model="queryParams.phonenumber" v-model="queryParams.phonenumber"
placeholder="请输入手机号码" placeholder="请输入手机号码"
clearable clearable
size="small"
@keyup.enter="handleQuery" @keyup.enter="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" icon="Search" size="mini" @click="handleQuery"></el-button> <el-button type="primary" icon="Search" @click="handleQuery"></el-button>
<el-button icon="Refresh" size="mini" @click="resetQuery"></el-button> <el-button icon="Refresh" @click="resetQuery"></el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-row> <el-row>

@ -18,7 +18,7 @@
<h4 class="form-header h4">角色信息</h4> <h4 class="form-header h4">角色信息</h4>
<el-table v-loading="loading" :row-key="getRowKey" @row-click="clickRow" ref="roleRef" @selection-change="handleSelectionChange" :data="roles.slice((pageNum - 1) * pageSize, pageNum * pageSize)"> <el-table v-loading="loading" :row-key="getRowKey" @row-click="clickRow" ref="roleRef" @selection-change="handleSelectionChange" :data="roles.slice((pageNum - 1) * pageSize, pageNum * pageSize)">
<el-table-column label="序号" type="index" align="center"> <el-table-column label="序号" width="55" type="index" align="center">
<template #default="scope"> <template #default="scope">
<span>{{ (pageNum - 1) * pageSize + scope.$index + 1 }}</span> <span>{{ (pageNum - 1) * pageSize + scope.$index + 1 }}</span>
</template> </template>
@ -37,10 +37,10 @@
<pagination v-show="total > 0" :total="total" v-model:page="pageNum" v-model:limit="pageSize" /> <pagination v-show="total > 0" :total="total" v-model:page="pageNum" v-model:limit="pageSize" />
<el-form label-width="100px"> <el-form label-width="100px">
<el-form-item style="text-align: center;margin-left:-120px;margin-top:30px;"> <div style="text-align: center;margin-left:-120px;margin-top:30px;">
<el-button type="primary" @click="submitForm()"></el-button> <el-button type="primary" @click="submitForm()"></el-button>
<el-button @click="close()"></el-button> <el-button @click="close()"></el-button>
</el-form-item> </div>
</el-form> </el-form>
</div> </div>
</template> </template>

@ -8,7 +8,6 @@
v-model="deptName" v-model="deptName"
placeholder="请输入部门名称" placeholder="请输入部门名称"
clearable clearable
size="small"
prefix-icon="el-icon-search" prefix-icon="el-icon-search"
style="margin-bottom: 20px" style="margin-bottom: 20px"
/> />
@ -33,7 +32,6 @@
v-model="queryParams.userName" v-model="queryParams.userName"
placeholder="请输入用户名称" placeholder="请输入用户名称"
clearable clearable
size="small"
style="width: 240px" style="width: 240px"
@keyup.enter="handleQuery" @keyup.enter="handleQuery"
/> />
@ -43,7 +41,6 @@
v-model="queryParams.phonenumber" v-model="queryParams.phonenumber"
placeholder="请输入手机号码" placeholder="请输入手机号码"
clearable clearable
size="small"
style="width: 240px" style="width: 240px"
@keyup.enter="handleQuery" @keyup.enter="handleQuery"
/> />
@ -53,7 +50,6 @@
v-model="queryParams.status" v-model="queryParams.status"
placeholder="用户状态" placeholder="用户状态"
clearable clearable
size="small"
style="width: 240px" style="width: 240px"
> >
<el-option <el-option
@ -64,11 +60,9 @@
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="创建时间"> <el-form-item label="创建时间" style="width: 308px;">
<el-date-picker <el-date-picker
v-model="dateRange" v-model="dateRange"
size="small"
style="width: 240px"
value-format="YYYY-MM-DD" value-format="YYYY-MM-DD"
type="daterange" type="daterange"
range-separator="-" range-separator="-"
@ -77,8 +71,8 @@
></el-date-picker> ></el-date-picker>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" icon="Search" size="mini" @click="handleQuery"></el-button> <el-button type="primary" icon="Search" @click="handleQuery"></el-button>
<el-button icon="Refresh" size="mini" @click="resetQuery"></el-button> <el-button icon="Refresh" @click="resetQuery"></el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
@ -88,7 +82,6 @@
type="primary" type="primary"
plain plain
icon="Plus" icon="Plus"
size="mini"
@click="handleAdd" @click="handleAdd"
v-hasPermi="['system:user:add']" v-hasPermi="['system:user:add']"
>新增</el-button> >新增</el-button>
@ -98,7 +91,6 @@
type="success" type="success"
plain plain
icon="Edit" icon="Edit"
size="mini"
:disabled="single" :disabled="single"
@click="handleUpdate" @click="handleUpdate"
v-hasPermi="['system:user:edit']" v-hasPermi="['system:user:edit']"
@ -109,7 +101,6 @@
type="danger" type="danger"
plain plain
icon="Delete" icon="Delete"
size="mini"
:disabled="multiple" :disabled="multiple"
@click="handleDelete" @click="handleDelete"
v-hasPermi="['system:user:remove']" v-hasPermi="['system:user:remove']"
@ -120,7 +111,6 @@
type="info" type="info"
plain plain
icon="Upload" icon="Upload"
size="mini"
@click="handleImport" @click="handleImport"
v-hasPermi="['system:user:import']" v-hasPermi="['system:user:import']"
>导入</el-button> >导入</el-button>
@ -130,7 +120,6 @@
type="warning" type="warning"
plain plain
icon="Download" icon="Download"
size="mini"
@click="handleExport" @click="handleExport"
v-hasPermi="['system:user:export']" v-hasPermi="['system:user:export']"
>导出</el-button> >导出</el-button>
@ -155,42 +144,49 @@
></el-switch> ></el-switch>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="创建时间" align="center" prop="createTime" v-if="columns[6].visible" width="150"> <el-table-column label="创建时间" align="center" prop="createTime" v-if="columns[6].visible" width="160">
<template #default="scope"> <template #default="scope">
<span>{{ parseTime(scope.row.createTime) }}</span> <span>{{ parseTime(scope.row.createTime) }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" width="180" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" width="150" class-name="small-padding fixed-width">
<template #default="scope"> <template #default="scope">
<el-button <el-tooltip content="修改" placement="top">
size="mini" <el-button
v-if="scope.row.userId !== 1" v-if="scope.row.userId !== 1"
type="text" type="text"
icon="Edit" icon="Edit"
@click="handleUpdate(scope.row)" @click="handleUpdate(scope.row)"
v-hasPermi="['system:user:edit']" v-hasPermi="['system:user:edit']"
>修改</el-button> ></el-button>
<el-button </el-tooltip>
size="mini" <el-tooltip content="删除" placement="top">
v-if="scope.row.userId !== 1" <el-button
type="text" v-if="scope.row.userId !== 1"
icon="Delete" type="text"
@click="handleDelete(scope.row)" icon="Delete"
v-hasPermi="['system:user:remove']" @click="handleDelete(scope.row)"
>删除</el-button> v-hasPermi="['system:user:remove']"
<el-dropdown v-if="scope.row.userId !== 1" @command="(command) => handleCommand(command, scope.row)"> ></el-button>
<span class="el-dropdown-link" v-hasPermi="['system:user:resetPwd', 'system:user:edit']"> </el-tooltip>
<el-icon><d-arrow-right /></el-icon> <el-tooltip content="重置密码" placement="top">
</span> <el-button
<template #dropdown> v-if="scope.row.userId !== 1"
<el-dropdown-menu> type="text"
<el-dropdown-item command="handleResetPwd" icon="Key" icon="Key"
v-hasPermi="['system:user:resetPwd']">重置密码</el-dropdown-item> @click="handleResetPwd(scope.row)"
<el-dropdown-item command="handleAuthRole" icon="CircleCheck" v-hasPermi="['system:user:resetPwd']"
v-hasPermi="['system:user:edit']">分配角色</el-dropdown-item> ></el-button>
</el-dropdown-menu> </el-tooltip>
</template> <el-tooltip content="分配角色" placement="top">
</el-dropdown> <el-button
v-if="scope.row.userId !== 1"
type="text"
icon="CircleCheck"
@click="handleAuthRole(scope.row)"
v-hasPermi="['system:user:edit']"
></el-button>
</el-tooltip>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>

@ -10,8 +10,8 @@
<el-input v-model="user.confirmPassword" placeholder="请确认密码" type="password" show-password/> <el-input v-model="user.confirmPassword" placeholder="请确认密码" type="password" show-password/>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" size="mini" @click="submit"></el-button> <el-button type="primary" @click="submit"></el-button>
<el-button type="danger" size="mini" @click="close"></el-button> <el-button type="danger" @click="close"></el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
</template> </template>

@ -25,26 +25,26 @@
<el-row> <el-row>
<el-col :lg="2" :md="2"> <el-col :lg="2" :md="2">
<el-upload action="#" :http-request="requestUpload" :show-file-list="false" :before-upload="beforeUpload"> <el-upload action="#" :http-request="requestUpload" :show-file-list="false" :before-upload="beforeUpload">
<el-button size="small"> <el-button>
选择 选择
<el-icon class="el-icon--right"><Upload /></el-icon> <el-icon class="el-icon--right"><Upload /></el-icon>
</el-button> </el-button>
</el-upload> </el-upload>
</el-col> </el-col>
<el-col :lg="{span: 1, offset: 2}" :md="2"> <el-col :lg="{span: 1, offset: 2}" :md="2">
<el-button icon="Plus" size="small" @click="changeScale(1)"></el-button> <el-button icon="Plus" @click="changeScale(1)"></el-button>
</el-col> </el-col>
<el-col :lg="{span: 1, offset: 1}" :md="2"> <el-col :lg="{span: 1, offset: 1}" :md="2">
<el-button icon="Minus" size="small" @click="changeScale(-1)"></el-button> <el-button icon="Minus" @click="changeScale(-1)"></el-button>
</el-col> </el-col>
<el-col :lg="{span: 1, offset: 1}" :md="2"> <el-col :lg="{span: 1, offset: 1}" :md="2">
<el-button icon="RefreshLeft" size="small" @click="rotateLeft()"></el-button> <el-button icon="RefreshLeft" @click="rotateLeft()"></el-button>
</el-col> </el-col>
<el-col :lg="{span: 1, offset: 1}" :md="2"> <el-col :lg="{span: 1, offset: 1}" :md="2">
<el-button icon="RefreshRight" size="small" @click="rotateRight()"></el-button> <el-button icon="RefreshRight" @click="rotateRight()"></el-button>
</el-col> </el-col>
<el-col :lg="{span: 2, offset: 6}" :md="2"> <el-col :lg="{span: 2, offset: 6}" :md="2">
<el-button type="primary" size="small" @click="uploadImg()"> </el-button> <el-button type="primary" @click="uploadImg()"> </el-button>
</el-col> </el-col>
</el-row> </el-row>
</el-dialog> </el-dialog>

@ -16,8 +16,8 @@
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" size="mini" @click="submit"></el-button> <el-button type="primary" @click="submit"></el-button>
<el-button type="danger" size="mini" @click="close"></el-button> <el-button type="danger" @click="close"></el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
</template> </template>

@ -118,10 +118,10 @@
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
<el-form label-width="100px"> <el-form label-width="100px">
<el-form-item style="text-align: center;margin-left:-100px;margin-top:10px;"> <div style="text-align: center;margin-left:-100px;margin-top:10px;">
<el-button type="primary" @click="submitForm()"></el-button> <el-button type="primary" @click="submitForm()"></el-button>
<el-button @click="close()"></el-button> <el-button @click="close()"></el-button>
</el-form-item> </div>
</el-form> </el-form>
</el-card> </el-card>
</template> </template>

@ -7,7 +7,6 @@
v-model="queryParams.tableName" v-model="queryParams.tableName"
placeholder="请输入表名称" placeholder="请输入表名称"
clearable clearable
size="small"
@keyup.enter="handleQuery" @keyup.enter="handleQuery"
/> />
</el-form-item> </el-form-item>
@ -16,13 +15,12 @@
v-model="queryParams.tableComment" v-model="queryParams.tableComment"
placeholder="请输入表描述" placeholder="请输入表描述"
clearable clearable
size="small"
@keyup.enter="handleQuery" @keyup.enter="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" icon="Search" size="mini" @click="handleQuery"></el-button> <el-button type="primary" icon="Search" @click="handleQuery"></el-button>
<el-button icon="Refresh" size="mini" @click="resetQuery"></el-button> <el-button icon="Refresh" @click="resetQuery"></el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-row> <el-row>

@ -6,7 +6,6 @@
v-model="queryParams.tableName" v-model="queryParams.tableName"
placeholder="请输入表名称" placeholder="请输入表名称"
clearable clearable
size="small"
@keyup.enter="handleQuery" @keyup.enter="handleQuery"
/> />
</el-form-item> </el-form-item>
@ -15,15 +14,12 @@
v-model="queryParams.tableComment" v-model="queryParams.tableComment"
placeholder="请输入表描述" placeholder="请输入表描述"
clearable clearable
size="small"
@keyup.enter="handleQuery" @keyup.enter="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="创建时间"> <el-form-item label="创建时间" style="width: 308px">
<el-date-picker <el-date-picker
v-model="dateRange" v-model="dateRange"
size="small"
style="width: 240px"
value-format="YYYY-MM-DD" value-format="YYYY-MM-DD"
type="daterange" type="daterange"
range-separator="-" range-separator="-"
@ -32,8 +28,8 @@
></el-date-picker> ></el-date-picker>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" icon="Search" size="mini" @click="handleQuery"></el-button> <el-button type="primary" icon="Search" @click="handleQuery"></el-button>
<el-button icon="Refresh" size="mini" @click="resetQuery"></el-button> <el-button icon="Refresh" @click="resetQuery"></el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
@ -43,7 +39,6 @@
type="primary" type="primary"
plain plain
icon="Download" icon="Download"
size="mini"
@click="handleGenTable" @click="handleGenTable"
v-hasPermi="['tool:gen:code']" v-hasPermi="['tool:gen:code']"
>生成</el-button> >生成</el-button>
@ -53,7 +48,6 @@
type="info" type="info"
plain plain
icon="Upload" icon="Upload"
size="mini"
@click="openImportTable" @click="openImportTable"
v-hasPermi="['tool:gen:import']" v-hasPermi="['tool:gen:import']"
>导入</el-button> >导入</el-button>
@ -63,7 +57,6 @@
type="success" type="success"
plain plain
icon="Edit" icon="Edit"
size="mini"
:disabled="single" :disabled="single"
@click="handleEditTable" @click="handleEditTable"
v-hasPermi="['tool:gen:edit']" v-hasPermi="['tool:gen:edit']"
@ -74,7 +67,6 @@
type="danger" type="danger"
plain plain
icon="Delete" icon="Delete"
size="mini"
:disabled="multiple" :disabled="multiple"
@click="handleDelete" @click="handleDelete"
v-hasPermi="['tool:gen:remove']" v-hasPermi="['tool:gen:remove']"
@ -108,45 +100,50 @@
prop="className" prop="className"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
/> />
<el-table-column label="创建时间" align="center" prop="createTime" width="150" /> <el-table-column label="创建时间" align="center" prop="createTime" width="160" />
<el-table-column label="更新时间" align="center" prop="updateTime" width="150" /> <el-table-column label="更新时间" align="center" prop="updateTime" width="160" />
<el-table-column label="操作" align="center" width="330" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" width="330" class-name="small-padding fixed-width">
<template #default="scope"> <template #default="scope">
<el-button <el-tooltip content="预览" placement="top">
type="text" <el-button
size="small" type="text"
icon="View" icon="View"
@click="handlePreview(scope.row)" @click="handlePreview(scope.row)"
v-hasPermi="['tool:gen:preview']" v-hasPermi="['tool:gen:preview']"
>预览</el-button> ></el-button>
<el-button </el-tooltip>
type="text" <el-tooltip content="编辑" placement="top">
size="small" <el-button
icon="Edit" type="text"
@click="handleEditTable(scope.row)" icon="Edit"
v-hasPermi="['tool:gen:edit']" @click="handleEditTable(scope.row)"
>编辑</el-button> v-hasPermi="['tool:gen:edit']"
<el-button ></el-button>
type="text" </el-tooltip>
size="small" <el-tooltip content="删除" placement="top">
icon="Delete" <el-button
@click="handleDelete(scope.row)" type="text"
v-hasPermi="['tool:gen:remove']" icon="Delete"
>删除</el-button> @click="handleDelete(scope.row)"
<el-button v-hasPermi="['tool:gen:remove']"
type="text" ></el-button>
size="small" </el-tooltip>
icon="Refresh" <el-tooltip content="同步" placement="top">
@click="handleSynchDb(scope.row)" <el-button
v-hasPermi="['tool:gen:edit']" type="text"
>同步</el-button> icon="Refresh"
<el-button @click="handleSynchDb(scope.row)"
type="text" v-hasPermi="['tool:gen:edit']"
size="small" ></el-button>
icon="Download" </el-tooltip>
@click="handleGenTable(scope.row)" <el-tooltip content="生成代码" placement="top">
v-hasPermi="['tool:gen:code']" <el-button
>生成代码</el-button> type="text"
icon="Download"
@click="handleGenTable(scope.row)"
v-hasPermi="['tool:gen:code']"
></el-button>
</el-tooltip>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -179,7 +176,6 @@ import { listTable, previewTable, delTable, genCode, synchDb } from "@/api/tool/
import router from "@/router"; import router from "@/router";
import importTable from "./importTable"; import importTable from "./importTable";
const route = useRoute();
const { proxy } = getCurrentInstance(); const { proxy } = getCurrentInstance();
const tableList = ref([]); const tableList = ref([]);

Loading…
Cancel
Save