From a7b867ff09938d40fb54a616aac42827c011e582 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期二, 11 一月 2022 17:24:45 +0800
Subject: [PATCH] 适配 element plus 最新版本
---
src/views/index.vue | 6
src/views/system/config/index.vue | 19 -
src/views/system/role/index.vue | 62 ++--
src/views/system/user/profile/userAvatar.vue | 12
src/layout/components/Navbar.vue | 20 +
src/views/system/user/authRole.vue | 6
src/views/monitor/logininfor/index.vue | 14 -
src/views/monitor/operlog/index.vue | 18 -
src/assets/styles/ruoyi.scss | 9
src/views/register.vue | 24 +
src/views/system/menu/index.vue | 18 -
src/views/system/role/authUser.vue | 10
src/views/system/dict/data.vue | 16 -
src/views/system/role/selectUser.vue | 6
src/views/tool/gen/editTable.vue | 4
src/views/tool/gen/importTable.vue | 6
src/views/monitor/job/log.vue | 18 -
src/store/modules/app.js | 2
src/views/monitor/job/index.vue | 85 ++++---
src/views/system/dept/index.vue | 12
src/views/system/post/index.vue | 14 -
src/components/RightToolbar/index.vue | 7
src/views/monitor/online/index.vue | 8
src/components/SizeSelect/index.vue | 15
src/views/system/user/index.vue | 86 +++----
src/views/login.vue | 16
src/main.js | 3
src/views/system/user/profile/userInfo.vue | 4
src/views/tool/gen/index.vue | 94 ++++----
package.json | 2
src/views/system/user/profile/resetPwd.vue | 4
src/views/system/notice/index.vue | 12
src/components/FileUpload/index.vue | 2
src/layout/components/Settings/index.vue | 6
src/views/system/dict/index.vue | 18 -
35 files changed, 289 insertions(+), 369 deletions(-)
diff --git a/package.json b/package.json
index db85c52..8aabfeb 100644
--- a/package.json
+++ b/package.json
@@ -18,7 +18,7 @@
"@element-plus/icons-vue": "0.2.4",
"axios": "0.24.0",
"echarts": "5.2.2",
- "element-plus": "1.2.0-beta.6",
+ "element-plus": "1.3.0-beta.3",
"file-saver": "2.0.5",
"fuse.js": "6.4.6",
"js-cookie": "3.0.1",
diff --git a/src/assets/styles/ruoyi.scss b/src/assets/styles/ruoyi.scss
index aa2cdb4..3c243e9 100644
--- a/src/assets/styles/ruoyi.scss
+++ b/src/assets/styles/ruoyi.scss
@@ -112,6 +112,7 @@
border: 1px solid #e5e6e7;
background: #FFFFFF none;
border-radius:4px;
+ width: 100%;
}
.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-right: 0;
width: inherit;
@@ -138,7 +139,7 @@
.el-table .el-dropdown-link {
cursor: pointer;
color: #409EFF;
- margin-left: 5px;
+ margin-left: 10px;
}
.el-table .el-dropdown, .el-icon-arrow-down {
@@ -175,12 +176,12 @@
}
.el-card__header {
- padding: 14px 15px 7px;
+ padding: 14px 15px 7px !important;
min-height: 40px;
}
.el-card__body {
- padding: 15px 20px 20px 20px;
+ padding: 15px 20px 20px 20px !important;
}
.card-box {
diff --git a/src/components/FileUpload/index.vue b/src/components/FileUpload/index.vue
index 0bec834..706aa88 100644
--- a/src/components/FileUpload/index.vue
+++ b/src/components/FileUpload/index.vue
@@ -14,7 +14,7 @@
ref="upload"
>
<!-- 涓婁紶鎸夐挳 -->
- <el-button size="mini" type="primary">閫夊彇鏂囦欢</el-button>
+ <el-button type="primary">閫夊彇鏂囦欢</el-button>
<!-- 涓婁紶鎻愮ず -->
<div class="el-upload__tip" v-if="showTip">
璇蜂笂浼�
diff --git a/src/components/RightToolbar/index.vue b/src/components/RightToolbar/index.vue
index 78caa84..fcdd1a6 100644
--- a/src/components/RightToolbar/index.vue
+++ b/src/components/RightToolbar/index.vue
@@ -2,13 +2,13 @@
<div class="top-right-btn">
<el-row>
<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 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 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-row>
<el-dialog :title="title" v-model="open" append-to-body>
@@ -76,7 +76,6 @@
<style lang='scss' scoped>
:deep(.el-transfer__button) {
border-radius: 50%;
- padding: 12px;
display: block;
margin-left: 0px;
}
diff --git a/src/components/SizeSelect/index.vue b/src/components/SizeSelect/index.vue
index 8f85343..289d4a0 100644
--- a/src/components/SizeSelect/index.vue
+++ b/src/components/SizeSelect/index.vue
@@ -24,10 +24,9 @@
const router = useRouter();
const {proxy} = getCurrentInstance();
const sizeOptions = ref([
- { label: 'Large', value: 'large' },
- { label: 'Medium', value: 'medium' },
- { label: 'Small', value: 'small' },
- { label: 'Mini', value: 'mini' }
+ { label: '杈冨ぇ', value: 'large' },
+ { label: '榛樿', value: 'default' },
+ { label: '绋嶅皬', value: 'small' },
])
function refreshView() {
@@ -43,13 +42,9 @@
})
}
function handleSetSize(size) {
- proxy.$ELEMENT.size = size;
+ proxy.$modal.loading("姝ｅ湪璁剧疆甯冨眬澶у皬锛岃绋嶅��...");
store.dispatch('app/setSize', size)
- refreshView()
- ElMessage({
- message: 'Switch Size Success',
- type: 'success'
- })
+ setTimeout("window.location.reload()", 1000)
};
</script>
diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index 9e86bfe..c9f516c 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -23,7 +23,7 @@
</el-tooltip>
</template>
<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">
<img :src="getters.avatar" class="user-avatar" />
<el-icon><caret-bottom /></el-icon>
@@ -33,10 +33,10 @@
<router-link to="/user/profile">
<el-dropdown-item>涓汉涓績</el-dropdown-item>
</router-link>
- <el-dropdown-item @click="setLayout">
+ <el-dropdown-item command="setLayout">
<span>甯冨眬璁剧疆</span>
</el-dropdown-item>
- <el-dropdown-item divided @click="logout">
+ <el-dropdown-item divided command="logout">
<span>閫�鍑虹櫥褰�</span>
</el-dropdown-item>
</el-dropdown-menu>
@@ -59,12 +59,26 @@
import RuoYiDoc from '@/components/RuoYi/Doc'
const store = useStore();
+const router = useRouter();
const getters = computed(() => store.getters);
function toggleSideBar() {
store.dispatch('app/toggleSideBar')
}
+function handleCommand(command) {
+ switch (command) {
+ case "setLayout":
+ setLayout();
+ break;
+ case "logout":
+ logout();
+ break;
+ default:
+ break;
+ }
+}
+
function logout() {
ElMessageBox.confirm('纭畾娉ㄩ攢骞堕��鍑虹郴缁熷悧锛�', '鎻愮ず', {
confirmButtonText: '纭畾',
diff --git a/src/layout/components/Settings/index.vue b/src/layout/components/Settings/index.vue
index 3c39c64..a8c5132 100644
--- a/src/layout/components/Settings/index.vue
+++ b/src/layout/components/Settings/index.vue
@@ -28,7 +28,7 @@
<div class="drawer-item">
<span>涓婚棰滆壊</span>
<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>
</div>
<el-divider />
@@ -72,8 +72,8 @@
<el-divider />
- <el-button size="small" type="primary" plain icon="DocumentAdd" @click="saveSetting">淇濆瓨閰嶇疆</el-button>
- <el-button size="small" plain icon="Refresh" @click="resetSetting">閲嶇疆閰嶇疆</el-button>
+ <el-button type="primary" plain icon="DocumentAdd" @click="saveSetting">淇濆瓨閰嶇疆</el-button>
+ <el-button plain icon="Refresh" @click="resetSetting">閲嶇疆閰嶇疆</el-button>
</el-drawer>
</template>
diff --git a/src/main.js b/src/main.js
index 664a465..46c22ac 100644
--- a/src/main.js
+++ b/src/main.js
@@ -73,7 +73,8 @@
// 浣跨敤element-plus 骞朵笖璁剧疆鍏ㄥ眬鐨勫ぇ灏�
app.use(ElementPlus, {
locale: locale,
- size: Cookies.get('size') || 'medium'
+ // 鏀寔 large銆乨efault銆乻mall
+ size: Cookies.get('size') || 'default'
})
app.mount('#app')
diff --git a/src/store/modules/app.js b/src/store/modules/app.js
index c8d8ee9..38218c1 100644
--- a/src/store/modules/app.js
+++ b/src/store/modules/app.js
@@ -6,7 +6,7 @@
withoutAnimation: false
},
device: 'desktop',
- size: Cookies.get('size') || 'medium'
+ size: Cookies.get('size') || 'default'
}
const mutations = {
diff --git a/src/views/index.vue b/src/views/index.vue
index d8655a8..106a4e3 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -52,15 +52,13 @@
<p>
<el-button
type="primary"
- size="mini"
- icon="el-icon-cloudy"
+ icon="Cloudy"
plain
@click="goTarget('https://gitee.com/y_project/RuoYi-Vue')"
>璁块棶鐮佷簯</el-button
>
<el-button
- size="mini"
- icon="el-icon-s-home"
+ icon="HomeFilled"
plain
@click="goTarget('http://ruoyi.vip')"
>璁块棶涓婚〉</el-button
diff --git a/src/views/login.vue b/src/views/login.vue
index d69b165..a48c7cf 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -6,6 +6,7 @@
<el-input
v-model="loginForm.username"
type="text"
+ size="large"
auto-complete="off"
placeholder="璐﹀彿"
>
@@ -16,6 +17,7 @@
<el-input
v-model="loginForm.password"
type="password"
+ size="large"
auto-complete="off"
placeholder="瀵嗙爜"
@keyup.enter="handleLogin"
@@ -26,6 +28,7 @@
<el-form-item prop="code" v-if="captchaOnOff">
<el-input
v-model="loginForm.code"
+ size="large"
auto-complete="off"
placeholder="楠岃瘉鐮�"
style="width: 63%"
@@ -41,7 +44,7 @@
<el-form-item style="width:100%;">
<el-button
:loading="loading"
- size="medium"
+ size="large"
type="primary"
style="width:100%;"
@click.prevent="handleLogin"
@@ -167,15 +170,15 @@
width: 400px;
padding: 25px 25px 5px 25px;
.el-input {
- height: 38px;
+ height: 40px;
input {
- height: 38px;
+ height: 40px;
}
}
.input-icon {
height: 39px;
width: 14px;
- margin-left: 2px;
+ margin-left: 0px;
}
}
.login-tip {
@@ -185,7 +188,7 @@
}
.login-code {
width: 33%;
- height: 38px;
+ height: 40px;
float: right;
img {
cursor: pointer;
@@ -205,6 +208,7 @@
letter-spacing: 1px;
}
.login-code-img {
- height: 38px;
+ height: 40px;
+ padding-left: 12px;
}
</style>
\ No newline at end of file
diff --git a/src/views/monitor/job/index.vue b/src/views/monitor/job/index.vue
index cb008b7..50cea63 100644
--- a/src/views/monitor/job/index.vue
+++ b/src/views/monitor/job/index.vue
@@ -6,7 +6,6 @@
v-model="queryParams.jobName"
placeholder="璇疯緭鍏ヤ换鍔″悕绉�"
clearable
- size="small"
@keyup.enter="handleQuery"
/>
</el-form-item>
@@ -31,8 +30,8 @@
</el-select>
</el-form-item>
<el-form-item>
- <el-button type="primary" icon="Search" size="mini" @click="handleQuery">鎼滅储</el-button>
- <el-button icon="Refresh" size="mini" @click="resetQuery">閲嶇疆</el-button>
+ <el-button type="primary" icon="Search" @click="handleQuery">鎼滅储</el-button>
+ <el-button icon="Refresh" @click="resetQuery">閲嶇疆</el-button>
</el-form-item>
</el-form>
@@ -42,7 +41,6 @@
type="primary"
plain
icon="Plus"
- size="mini"
@click="handleAdd"
v-hasPermi="['monitor:job:add']"
>鏂板</el-button>
@@ -52,7 +50,6 @@
type="success"
plain
icon="Edit"
- size="mini"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['monitor:job:edit']"
@@ -63,7 +60,6 @@
type="danger"
plain
icon="Delete"
- size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['monitor:job:remove']"
@@ -74,7 +70,6 @@
type="warning"
plain
icon="Download"
- size="mini"
@click="handleExport"
v-hasPermi="['monitor:job:export']"
>瀵煎嚭</el-button>
@@ -84,7 +79,6 @@
type="info"
plain
icon="Operation"
- size="mini"
@click="handleJobLog"
v-hasPermi="['monitor:job:query']"
>鏃ュ織</el-button>
@@ -115,35 +109,46 @@
</el-table-column>
<el-table-column label="鎿嶄綔" align="center" width="200" class-name="small-padding fixed-width">
<template #default="scope">
- <el-button
- size="mini"
- type="text"
- icon="Edit"
- @click="handleUpdate(scope.row)"
- v-hasPermi="['monitor:job:edit']"
- >淇敼</el-button>
- <el-button
- size="mini"
- type="text"
- icon="Delete"
- @click="handleDelete(scope.row)"
- v-hasPermi="['monitor:job:remove']"
- >鍒犻櫎</el-button>
- <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)">
- <span class="el-dropdown-link" v-hasPermi="['monitor:job:changeStatus', 'monitor:job:query']">
- <i class="el-icon-d-arrow-right el-icon--right"></i>鏇村
- </span>
- <template #dropdown>
- <el-dropdown-menu>
- <el-dropdown-item command="handleRun" icon="CaretRight"
- v-hasPermi="['monitor:job:changeStatus']">鎵ц涓�娆�</el-dropdown-item>
- <el-dropdown-item command="handleView" icon="View"
- v-hasPermi="['monitor:job:query']">浠诲姟璇︾粏</el-dropdown-item>
- <el-dropdown-item command="handleJobLog" icon="Operation"
- v-hasPermi="['monitor:job:query']">璋冨害鏃ュ織</el-dropdown-item>
- </el-dropdown-menu>
- </template>
- </el-dropdown>
+ <el-tooltip content="淇敼" placement="top">
+ <el-button
+ type="text"
+ icon="Edit"
+ @click="handleUpdate(scope.row)"
+ v-hasPermi="['monitor:job:edit']"
+ ></el-button>
+ </el-tooltip>
+ <el-tooltip content="鍒犻櫎" placement="top">
+ <el-button
+ type="text"
+ icon="Delete"
+ @click="handleDelete(scope.row)"
+ v-hasPermi="['monitor:job:remove']"
+ ></el-button>
+ </el-tooltip>
+ <el-tooltip content="鎵ц涓�娆�" placement="top">
+ <el-button
+ type="text"
+ icon="CaretRight"
+ @click="handleRun(scope.row)"
+ v-hasPermi="['monitor:job:changeStatus']"
+ ></el-button>
+ </el-tooltip>
+ <el-tooltip content="浠诲姟璇︾粏" placement="top">
+ <el-button
+ type="text"
+ icon="View"
+ @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>
</el-table-column>
</el-table>
@@ -211,7 +216,7 @@
</el-col>
<el-col :span="24">
<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="2">鎵ц涓�娆�</el-radio-button>
<el-radio-button label="3">鏀惧純鎵ц</el-radio-button>
@@ -220,7 +225,7 @@
</el-col>
<el-col :span="12">
<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="1">绂佹</el-radio-button>
</el-radio-group>
@@ -249,7 +254,7 @@
<!-- 浠诲姟鏃ュ織璇︾粏 -->
<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-col :span="12">
<el-form-item label="浠诲姟缂栧彿锛�">{{ form.jobId }}</el-form-item>
diff --git a/src/views/monitor/job/log.vue b/src/views/monitor/job/log.vue
index 6bc0724..d057f1f 100644
--- a/src/views/monitor/job/log.vue
+++ b/src/views/monitor/job/log.vue
@@ -6,7 +6,6 @@
v-model="queryParams.jobName"
placeholder="璇疯緭鍏ヤ换鍔″悕绉�"
clearable
- size="small"
style="width: 240px"
@keyup.enter="handleQuery"
/>
@@ -16,7 +15,6 @@
v-model="queryParams.jobGroup"
placeholder="璇蜂换鍔＄粍鍚�"
clearable
- size="small"
style="width: 240px"
>
<el-option
@@ -32,7 +30,6 @@
v-model="queryParams.status"
placeholder="璇烽�夋嫨鎵ц鐘舵��"
clearable
- size="small"
style="width: 240px"
>
<el-option
@@ -43,11 +40,9 @@
/>
</el-select>
</el-form-item>
- <el-form-item label="鎵ц鏃堕棿">
+ <el-form-item label="鎵ц鏃堕棿" style="width: 308px">
<el-date-picker
v-model="dateRange"
- size="small"
- style="width: 240px"
value-format="YYYY-MM-DD"
type="daterange"
range-separator="-"
@@ -56,8 +51,8 @@
></el-date-picker>
</el-form-item>
<el-form-item>
- <el-button type="primary" icon="Search" size="mini" @click="handleQuery">鎼滅储</el-button>
- <el-button icon="Refresh" size="mini" @click="resetQuery">閲嶇疆</el-button>
+ <el-button type="primary" icon="Search" @click="handleQuery">鎼滅储</el-button>
+ <el-button icon="Refresh" @click="resetQuery">閲嶇疆</el-button>
</el-form-item>
</el-form>
@@ -67,7 +62,6 @@
type="danger"
plain
icon="Delete"
- size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['monitor:job:remove']"
@@ -78,7 +72,6 @@
type="danger"
plain
icon="Delete"
- size="mini"
@click="handleClean"
v-hasPermi="['monitor:job:remove']"
>娓呯┖</el-button>
@@ -88,7 +81,6 @@
type="warning"
plain
icon="Download"
- size="mini"
@click="handleExport"
v-hasPermi="['monitor:job:export']"
>瀵煎嚭</el-button>
@@ -98,7 +90,6 @@
type="warning"
plain
icon="Close"
- size="mini"
@click="handleClose"
>鍏抽棴</el-button>
</el-col>
@@ -129,7 +120,6 @@
<el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
<template #default="scope">
<el-button
- size="mini"
type="text"
icon="View"
@click="handleView(scope.row)"
@@ -149,7 +139,7 @@
<!-- 璋冨害鏃ュ織璇︾粏 -->
<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-col :span="12">
<el-form-item label="鏃ュ織搴忓彿锛�">{{ form.jobLogId }}</el-form-item>
diff --git a/src/views/monitor/logininfor/index.vue b/src/views/monitor/logininfor/index.vue
index 7b3beaf..43772fc 100644
--- a/src/views/monitor/logininfor/index.vue
+++ b/src/views/monitor/logininfor/index.vue
@@ -6,7 +6,6 @@
v-model="queryParams.ipaddr"
placeholder="璇疯緭鍏ョ櫥褰曞湴鍧�"
clearable
- size="small"
style="width: 240px;"
@keyup.enter="handleQuery"
/>
@@ -16,7 +15,6 @@
v-model="queryParams.userName"
placeholder="璇疯緭鍏ョ敤鎴峰悕绉�"
clearable
- size="small"
style="width: 240px;"
@keyup.enter="handleQuery"
/>
@@ -26,7 +24,6 @@
v-model="queryParams.status"
placeholder="鐧诲綍鐘舵��"
clearable
- size="small"
style="width: 240px"
>
<el-option
@@ -37,11 +34,9 @@
/>
</el-select>
</el-form-item>
- <el-form-item label="鐧诲綍鏃堕棿">
+ <el-form-item label="鐧诲綍鏃堕棿" style="width: 308px">
<el-date-picker
v-model="dateRange"
- size="small"
- style="width: 240px"
value-format="YYYY-MM-DD"
type="daterange"
range-separator="-"
@@ -50,8 +45,8 @@
></el-date-picker>
</el-form-item>
<el-form-item>
- <el-button type="primary" icon="Search" size="mini" @click="handleQuery">鎼滅储</el-button>
- <el-button icon="Refresh" size="mini" @click="resetQuery">閲嶇疆</el-button>
+ <el-button type="primary" icon="Search" @click="handleQuery">鎼滅储</el-button>
+ <el-button icon="Refresh" @click="resetQuery">閲嶇疆</el-button>
</el-form-item>
</el-form>
@@ -61,7 +56,6 @@
type="danger"
plain
icon="Delete"
- size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['system:logininfor:remove']"
@@ -72,7 +66,6 @@
type="danger"
plain
icon="Delete"
- size="mini"
@click="handleClean"
v-hasPermi="['system:logininfor:remove']"
>娓呯┖</el-button>
@@ -82,7 +75,6 @@
type="warning"
plain
icon="Download"
- size="mini"
@click="handleExport"
v-hasPermi="['system:logininfor:export']"
>瀵煎嚭</el-button>
diff --git a/src/views/monitor/online/index.vue b/src/views/monitor/online/index.vue
index d45db26..ca2d767 100644
--- a/src/views/monitor/online/index.vue
+++ b/src/views/monitor/online/index.vue
@@ -6,7 +6,6 @@
v-model="queryParams.ipaddr"
placeholder="璇疯緭鍏ョ櫥褰曞湴鍧�"
clearable
- size="small"
@keyup.enter="handleQuery"
/>
</el-form-item>
@@ -19,8 +18,8 @@
/>
</el-form-item>
<el-form-item>
- <el-button type="primary" icon="Search" size="mini" @click="handleQuery">鎼滅储</el-button>
- <el-button icon="Refresh" size="mini" @click="resetQuery">閲嶇疆</el-button>
+ <el-button type="primary" icon="Search" @click="handleQuery">鎼滅储</el-button>
+ <el-button icon="Refresh" @click="resetQuery">閲嶇疆</el-button>
</el-form-item>
</el-form>
<el-table
@@ -28,7 +27,7 @@
:data="onlineList.slice((pageNum - 1) * pageSize, pageNum * pageSize)"
style="width: 100%;"
>
- <el-table-column label="搴忓彿" type="index" align="center">
+ <el-table-column label="搴忓彿" width="50" type="index" align="center">
<template #default="scope">
<span>{{ (pageNum - 1) * pageSize + scope.$index + 1 }}</span>
</template>
@@ -48,7 +47,6 @@
<el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
<template #default="scope">
<el-button
- size="mini"
type="text"
icon="Delete"
@click="handleForceLogout(scope.row)"
diff --git a/src/views/monitor/operlog/index.vue b/src/views/monitor/operlog/index.vue
index d6501cd..5fe86e9 100644
--- a/src/views/monitor/operlog/index.vue
+++ b/src/views/monitor/operlog/index.vue
@@ -6,7 +6,6 @@
v-model="queryParams.title"
placeholder="璇疯緭鍏ョ郴缁熸ā鍧�"
clearable
- size="small"
style="width: 240px;"
@keyup.enter="handleQuery"
/>
@@ -16,7 +15,6 @@
v-model="queryParams.operName"
placeholder="璇疯緭鍏ユ搷浣滀汉鍛�"
clearable
- size="small"
style="width: 240px;"
@keyup.enter="handleQuery"
/>
@@ -26,7 +24,6 @@
v-model="queryParams.businessType"
placeholder="鎿嶄綔绫诲瀷"
clearable
- size="small"
style="width: 240px"
>
<el-option
@@ -42,7 +39,6 @@
v-model="queryParams.status"
placeholder="鎿嶄綔鐘舵��"
clearable
- size="small"
style="width: 240px"
>
<el-option
@@ -53,11 +49,9 @@
/>
</el-select>
</el-form-item>
- <el-form-item label="鎿嶄綔鏃堕棿">
+ <el-form-item label="鎿嶄綔鏃堕棿" style="width: 308px">
<el-date-picker
v-model="dateRange"
- size="small"
- style="width: 240px"
value-format="YYYY-MM-DD"
type="daterange"
range-separator="-"
@@ -66,8 +60,8 @@
></el-date-picker>
</el-form-item>
<el-form-item>
- <el-button type="primary" icon="Search" size="mini" @click="handleQuery">鎼滅储</el-button>
- <el-button icon="Refresh" size="mini" @click="resetQuery">閲嶇疆</el-button>
+ <el-button type="primary" icon="Search" @click="handleQuery">鎼滅储</el-button>
+ <el-button icon="Refresh" @click="resetQuery">閲嶇疆</el-button>
</el-form-item>
</el-form>
@@ -77,7 +71,6 @@
type="danger"
plain
icon="Delete"
- size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['system:operlog:remove']"
@@ -88,7 +81,6 @@
type="danger"
plain
icon="Delete"
- size="mini"
@click="handleClean"
v-hasPermi="['system:operlog:remove']"
>娓呯┖</el-button>
@@ -98,7 +90,6 @@
type="warning"
plain
icon="Download"
- size="mini"
@click="handleExport"
v-hasPermi="['system:operlog:export']"
>瀵煎嚭</el-button>
@@ -131,7 +122,6 @@
<el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
<template #default="scope">
<el-button
- size="mini"
type="text"
icon="View"
@click="handleView(scope.row, scope.index)"
@@ -151,7 +141,7 @@
<!-- 鎿嶄綔鏃ュ織璇︾粏 -->
<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-col :span="12">
<el-form-item label="鎿嶄綔妯″潡锛�">{{ form.title }} / {{ typeFormat(form) }}</el-form-item>
diff --git a/src/views/register.vue b/src/views/register.vue
index 0041d00..cdc5d74 100644
--- a/src/views/register.vue
+++ b/src/views/register.vue
@@ -3,7 +3,13 @@
<el-form ref="registerRef" :model="registerForm" :rules="registerRules" class="register-form">
<h3 class="title">鑻ヤ緷鍚庡彴绠＄悊绯荤粺</h3>
<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>
</el-input>
</el-form-item>
@@ -11,6 +17,7 @@
<el-input
v-model="registerForm.password"
type="password"
+ size="large"
auto-complete="off"
placeholder="瀵嗙爜"
@keyup.enter="handleRegister"
@@ -22,6 +29,7 @@
<el-input
v-model="registerForm.confirmPassword"
type="password"
+ size="large"
auto-complete="off"
placeholder="纭瀵嗙爜"
@keyup.enter="handleRegister"
@@ -31,6 +39,7 @@
</el-form-item>
<el-form-item prop="code" v-if="captchaOnOff">
<el-input
+ size="large"
v-model="registerForm.code"
auto-complete="off"
placeholder="楠岃瘉鐮�"
@@ -46,7 +55,7 @@
<el-form-item style="width:100%;">
<el-button
:loading="loading"
- size="medium"
+ size="large"
type="primary"
style="width:100%;"
@click.prevent="handleRegister"
@@ -165,15 +174,15 @@
width: 400px;
padding: 25px 25px 5px 25px;
.el-input {
- height: 38px;
+ height: 40px;
input {
- height: 38px;
+ height: 40px;
}
}
.input-icon {
height: 39px;
width: 14px;
- margin-left: 2px;
+ margin-left: 0px;
}
}
.register-tip {
@@ -183,7 +192,7 @@
}
.register-code {
width: 33%;
- height: 38px;
+ height: 40px;
float: right;
img {
cursor: pointer;
@@ -203,6 +212,7 @@
letter-spacing: 1px;
}
.register-code-img {
- height: 38px;
+ height: 40px;
+ padding-left: 12px;
}
</style>
diff --git a/src/views/system/config/index.vue b/src/views/system/config/index.vue
index 4fa79ac..9a05e6c 100644
--- a/src/views/system/config/index.vue
+++ b/src/views/system/config/index.vue
@@ -6,7 +6,6 @@
v-model="queryParams.configName"
placeholder="璇疯緭鍏ュ弬鏁板悕绉�"
clearable
- size="small"
style="width: 240px"
@keyup.enter="handleQuery"
/>
@@ -16,13 +15,12 @@
v-model="queryParams.configKey"
placeholder="璇疯緭鍏ュ弬鏁伴敭鍚�"
clearable
- size="small"
style="width: 240px"
@keyup.enter="handleQuery"
/>
</el-form-item>
<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
v-for="dict in sys_yes_no"
:key="dict.value"
@@ -31,11 +29,9 @@
/>
</el-select>
</el-form-item>
- <el-form-item label="鍒涘缓鏃堕棿">
+ <el-form-item label="鍒涘缓鏃堕棿" style="width: 308px;">
<el-date-picker
v-model="dateRange"
- size="small"
- style="width: 240px"
value-format="YYYY-MM-DD"
type="daterange"
range-separator="-"
@@ -44,8 +40,8 @@
></el-date-picker>
</el-form-item>
<el-form-item>
- <el-button type="primary" icon="Search" size="mini" @click="handleQuery">鎼滅储</el-button>
- <el-button icon="Refresh" size="mini" @click="resetQuery">閲嶇疆</el-button>
+ <el-button type="primary" icon="Search" @click="handleQuery">鎼滅储</el-button>
+ <el-button icon="Refresh" @click="resetQuery">閲嶇疆</el-button>
</el-form-item>
</el-form>
@@ -55,7 +51,6 @@
type="primary"
plain
icon="Plus"
- size="mini"
@click="handleAdd"
v-hasPermi="['system:config:add']"
>鏂板</el-button>
@@ -65,7 +60,6 @@
type="success"
plain
icon="Edit"
- size="mini"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['system:config:edit']"
@@ -76,7 +70,6 @@
type="danger"
plain
icon="Delete"
- size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['system:config:remove']"
@@ -87,7 +80,6 @@
type="warning"
plain
icon="Download"
- size="mini"
@click="handleExport"
v-hasPermi="['system:config:export']"
>瀵煎嚭</el-button>
@@ -97,7 +89,6 @@
type="danger"
plain
icon="Refresh"
- size="mini"
@click="handleRefreshCache"
v-hasPermi="['system:config:remove']"
>鍒锋柊缂撳瓨</el-button>
@@ -125,14 +116,12 @@
<el-table-column label="鎿嶄綔" align="center" width="150" class-name="small-padding fixed-width">
<template #default="scope">
<el-button
- size="mini"
type="text"
icon="Edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['system:config:edit']"
>淇敼</el-button>
<el-button
- size="mini"
type="text"
icon="Delete"
@click="handleDelete(scope.row)"
diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue
index ef63bd8..aed4301 100644
--- a/src/views/system/dept/index.vue
+++ b/src/views/system/dept/index.vue
@@ -6,12 +6,11 @@
v-model="queryParams.deptName"
placeholder="璇疯緭鍏ラ儴闂ㄥ悕绉�"
clearable
- size="small"
@keyup.enter="handleQuery"
/>
</el-form-item>
<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
v-for="dict in sys_normal_disable"
:key="dict.value"
@@ -21,8 +20,8 @@
</el-select>
</el-form-item>
<el-form-item>
- <el-button type="primary" icon="Search" size="mini" @click="handleQuery">鎼滅储</el-button>
- <el-button icon="Refresh" size="mini" @click="resetQuery">閲嶇疆</el-button>
+ <el-button type="primary" icon="Search" @click="handleQuery">鎼滅储</el-button>
+ <el-button icon="Refresh" @click="resetQuery">閲嶇疆</el-button>
</el-form-item>
</el-form>
@@ -32,7 +31,6 @@
type="primary"
plain
icon="Plus"
- size="mini"
@click="handleAdd"
v-hasPermi="['system:dept:add']"
>鏂板</el-button>
@@ -42,7 +40,6 @@
type="info"
plain
icon="Sort"
- size="mini"
@click="toggleExpandAll"
>灞曞紑/鎶樺彔</el-button>
</el-col>
@@ -72,14 +69,12 @@
<el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
<template #default="scope">
<el-button
- size="mini"
type="text"
icon="Edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['system:dept:edit']"
>淇敼</el-button>
<el-button
- size="mini"
type="text"
icon="Plus"
@click="handleAdd(scope.row)"
@@ -87,7 +82,6 @@
>鏂板</el-button>
<el-button
v-if="scope.row.parentId != 0"
- size="mini"
type="text"
icon="Delete"
@click="handleDelete(scope.row)"
diff --git a/src/views/system/dict/data.vue b/src/views/system/dict/data.vue
index 2a4c501..61711f8 100644
--- a/src/views/system/dict/data.vue
+++ b/src/views/system/dict/data.vue
@@ -2,7 +2,7 @@
<div class="app-container">
<el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="瀛楀吀鍚嶇О" prop="dictType">
- <el-select v-model="queryParams.dictType" size="small">
+ <el-select v-model="queryParams.dictType">
<el-option
v-for="item in typeOptions"
:key="item.dictId"
@@ -16,12 +16,11 @@
v-model="queryParams.dictLabel"
placeholder="璇疯緭鍏ュ瓧鍏告爣绛�"
clearable
- size="small"
@keyup.enter="handleQuery"
/>
</el-form-item>
<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
v-for="dict in sys_normal_disable"
:key="dict.value"
@@ -31,8 +30,8 @@
</el-select>
</el-form-item>
<el-form-item>
- <el-button type="primary" icon="Search" size="mini" @click="handleQuery">鎼滅储</el-button>
- <el-button icon="Refresh" size="mini" @click="resetQuery">閲嶇疆</el-button>
+ <el-button type="primary" icon="Search" @click="handleQuery">鎼滅储</el-button>
+ <el-button icon="Refresh" @click="resetQuery">閲嶇疆</el-button>
</el-form-item>
</el-form>
@@ -42,7 +41,6 @@
type="primary"
plain
icon="Plus"
- size="mini"
@click="handleAdd"
v-hasPermi="['system:dict:add']"
>鏂板</el-button>
@@ -52,7 +50,6 @@
type="success"
plain
icon="Edit"
- size="mini"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['system:dict:edit']"
@@ -63,7 +60,6 @@
type="danger"
plain
icon="Delete"
- size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['system:dict:remove']"
@@ -74,7 +70,6 @@
type="warning"
plain
icon="Download"
- size="mini"
@click="handleExport"
v-hasPermi="['system:dict:export']"
>瀵煎嚭</el-button>
@@ -84,7 +79,6 @@
type="warning"
plain
icon="Close"
- size="mini"
@click="handleClose"
>鍏抽棴</el-button>
</el-col>
@@ -116,14 +110,12 @@
<el-table-column label="鎿嶄綔" align="center" width="150" class-name="small-padding fixed-width">
<template #default="scope">
<el-button
- size="mini"
type="text"
icon="Edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['system:dict:edit']"
>淇敼</el-button>
<el-button
- size="mini"
type="text"
icon="Delete"
@click="handleDelete(scope.row)"
diff --git a/src/views/system/dict/index.vue b/src/views/system/dict/index.vue
index f4f2e6f..1e54c29 100644
--- a/src/views/system/dict/index.vue
+++ b/src/views/system/dict/index.vue
@@ -6,7 +6,6 @@
v-model="queryParams.dictName"
placeholder="璇疯緭鍏ュ瓧鍏稿悕绉�"
clearable
- size="small"
style="width: 240px"
@keyup.enter="handleQuery"
/>
@@ -16,7 +15,6 @@
v-model="queryParams.dictType"
placeholder="璇疯緭鍏ュ瓧鍏哥被鍨�"
clearable
- size="small"
style="width: 240px"
@keyup.enter="handleQuery"
/>
@@ -26,7 +24,6 @@
v-model="queryParams.status"
placeholder="瀛楀吀鐘舵��"
clearable
- size="small"
style="width: 240px"
>
<el-option
@@ -37,11 +34,9 @@
/>
</el-select>
</el-form-item>
- <el-form-item label="鍒涘缓鏃堕棿">
+ <el-form-item label="鍒涘缓鏃堕棿" style="width: 308px">
<el-date-picker
v-model="dateRange"
- size="small"
- style="width: 240px"
value-format="YYYY-MM-DD"
type="daterange"
range-separator="-"
@@ -50,8 +45,8 @@
></el-date-picker>
</el-form-item>
<el-form-item>
- <el-button type="primary" icon="Search" size="mini" @click="handleQuery">鎼滅储</el-button>
- <el-button icon="Refresh" size="mini" @click="resetQuery">閲嶇疆</el-button>
+ <el-button type="primary" icon="Search" @click="handleQuery">鎼滅储</el-button>
+ <el-button icon="Refresh" @click="resetQuery">閲嶇疆</el-button>
</el-form-item>
</el-form>
@@ -61,7 +56,6 @@
type="primary"
plain
icon="Plus"
- size="mini"
@click="handleAdd"
v-hasPermi="['system:dict:add']"
>鏂板</el-button>
@@ -71,7 +65,6 @@
type="success"
plain
icon="Edit"
- size="mini"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['system:dict:edit']"
@@ -82,7 +75,6 @@
type="danger"
plain
icon="Delete"
- size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['system:dict:remove']"
@@ -93,7 +85,6 @@
type="warning"
plain
icon="Download"
- size="mini"
@click="handleExport"
v-hasPermi="['system:dict:export']"
>瀵煎嚭</el-button>
@@ -103,7 +94,6 @@
type="danger"
plain
icon="Refresh"
- size="mini"
@click="handleRefreshCache"
v-hasPermi="['system:dict:remove']"
>鍒锋柊缂撳瓨</el-button>
@@ -136,14 +126,12 @@
<el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
<template #default="scope">
<el-button
- size="mini"
type="text"
icon="Edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['system:dict:edit']"
>淇敼</el-button>
<el-button
- size="mini"
type="text"
icon="Delete"
@click="handleDelete(scope.row)"
diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue
index 4bd2c03..c863463 100644
--- a/src/views/system/menu/index.vue
+++ b/src/views/system/menu/index.vue
@@ -6,12 +6,11 @@
v-model="queryParams.menuName"
placeholder="璇疯緭鍏ヨ彍鍗曞悕绉�"
clearable
- size="small"
@keyup.enter="handleQuery"
/>
</el-form-item>
<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
v-for="dict in sys_normal_disable"
:key="dict.value"
@@ -21,8 +20,8 @@
</el-select>
</el-form-item>
<el-form-item>
- <el-button type="primary" icon="Search" size="mini" @click="handleQuery">鎼滅储</el-button>
- <el-button icon="Refresh" size="mini" @click="resetQuery">閲嶇疆</el-button>
+ <el-button type="primary" icon="Search" @click="handleQuery">鎼滅储</el-button>
+ <el-button icon="Refresh" @click="resetQuery">閲嶇疆</el-button>
</el-form-item>
</el-form>
@@ -32,7 +31,6 @@
type="primary"
plain
icon="Plus"
- size="mini"
@click="handleAdd"
v-hasPermi="['system:menu:add']"
>鏂板</el-button>
@@ -42,7 +40,6 @@
type="info"
plain
icon="Sort"
- size="mini"
@click="toggleExpandAll"
>灞曞紑/鎶樺彔</el-button>
</el-col>
@@ -79,21 +76,18 @@
<el-table-column label="鎿嶄綔" align="center" width="200" class-name="small-padding fixed-width">
<template #default="scope">
<el-button
- size="mini"
type="text"
icon="Edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['system:menu:edit']"
>淇敼</el-button>
<el-button
- size="mini"
type="text"
icon="Plus"
@click="handleAdd(scope.row)"
v-hasPermi="['system:menu:add']"
>鏂板</el-button>
<el-button
- size="mini"
type="text"
icon="Delete"
@click="handleDelete(scope.row)"
@@ -135,9 +129,8 @@
trigger="click"
@show="showSelectIcon"
>
- <icon-select ref="iconSelectRef" @selected="selected" />
<template #reference>
- <el-input v-model="form.icon" placeholder="鐐瑰嚮閫夋嫨鍥炬爣" readonly>
+ <el-input v-model="form.icon" placeholder="鐐瑰嚮閫夋嫨鍥炬爣" @click="showSelectIcon" readonly>
<template #prefix>
<svg-icon
v-if="form.icon"
@@ -145,10 +138,11 @@
class="el-input__icon"
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>
</el-input>
</template>
+ <icon-select ref="iconSelectRef" @selected="selected" />
</el-popover>
</el-form-item>
</el-col>
diff --git a/src/views/system/notice/index.vue b/src/views/system/notice/index.vue
index d527eec..7780641 100644
--- a/src/views/system/notice/index.vue
+++ b/src/views/system/notice/index.vue
@@ -6,7 +6,6 @@
v-model="queryParams.noticeTitle"
placeholder="璇疯緭鍏ュ叕鍛婃爣棰�"
clearable
- size="small"
@keyup.enter="handleQuery"
/>
</el-form-item>
@@ -19,7 +18,7 @@
/>
</el-form-item>
<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
v-for="dict in sys_notice_type"
:key="dict.value"
@@ -29,8 +28,8 @@
</el-select>
</el-form-item>
<el-form-item>
- <el-button type="primary" icon="Search" size="mini" @click="handleQuery">鎼滅储</el-button>
- <el-button icon="Refresh" size="mini" @click="resetQuery">閲嶇疆</el-button>
+ <el-button type="primary" icon="Search" @click="handleQuery">鎼滅储</el-button>
+ <el-button icon="Refresh" @click="resetQuery">閲嶇疆</el-button>
</el-form-item>
</el-form>
@@ -40,7 +39,6 @@
type="primary"
plain
icon="Plus"
- size="mini"
@click="handleAdd"
v-hasPermi="['system:notice:add']"
>鏂板</el-button>
@@ -50,7 +48,6 @@
type="success"
plain
icon="Edit"
- size="mini"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['system:notice:edit']"
@@ -61,7 +58,6 @@
type="danger"
plain
icon="Delete"
- size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['system:notice:remove']"
@@ -98,14 +94,12 @@
<el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
<template #default="scope">
<el-button
- size="mini"
type="text"
icon="Edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['system:notice:edit']"
>淇敼</el-button>
<el-button
- size="mini"
type="text"
icon="Delete"
@click="handleDelete(scope.row)"
diff --git a/src/views/system/post/index.vue b/src/views/system/post/index.vue
index a988d65..265bfe5 100644
--- a/src/views/system/post/index.vue
+++ b/src/views/system/post/index.vue
@@ -6,7 +6,6 @@
v-model="queryParams.postCode"
placeholder="璇疯緭鍏ュ矖浣嶇紪鐮�"
clearable
- size="small"
@keyup.enter="handleQuery"
/>
</el-form-item>
@@ -15,12 +14,11 @@
v-model="queryParams.postName"
placeholder="璇疯緭鍏ュ矖浣嶅悕绉�"
clearable
- size="small"
@keyup.enter="handleQuery"
/>
</el-form-item>
<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
v-for="dict in sys_normal_disable"
:key="dict.value"
@@ -30,8 +28,8 @@
</el-select>
</el-form-item>
<el-form-item>
- <el-button type="primary" icon="Search" size="mini" @click="handleQuery">鎼滅储</el-button>
- <el-button icon="Refresh" size="mini" @click="resetQuery">閲嶇疆</el-button>
+ <el-button type="primary" icon="Search" @click="handleQuery">鎼滅储</el-button>
+ <el-button icon="Refresh" @click="resetQuery">閲嶇疆</el-button>
</el-form-item>
</el-form>
@@ -41,7 +39,6 @@
type="primary"
plain
icon="Plus"
- size="mini"
@click="handleAdd"
v-hasPermi="['system:post:add']"
>鏂板</el-button>
@@ -51,7 +48,6 @@
type="success"
plain
icon="Edit"
- size="mini"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['system:post:edit']"
@@ -62,7 +58,6 @@
type="danger"
plain
icon="Delete"
- size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['system:post:remove']"
@@ -73,7 +68,6 @@
type="warning"
plain
icon="Download"
- size="mini"
@click="handleExport"
v-hasPermi="['system:post:export']"
>瀵煎嚭</el-button>
@@ -100,14 +94,12 @@
<el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
<template #default="scope">
<el-button
- size="mini"
type="text"
icon="Edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['system:post:edit']"
>淇敼</el-button>
<el-button
- size="mini"
type="text"
icon="Delete"
@click="handleDelete(scope.row)"
diff --git a/src/views/system/role/authUser.vue b/src/views/system/role/authUser.vue
index 5e52e17..55ff5b2 100644
--- a/src/views/system/role/authUser.vue
+++ b/src/views/system/role/authUser.vue
@@ -7,7 +7,6 @@
v-model="queryParams.userName"
placeholder="璇疯緭鍏ョ敤鎴峰悕绉�"
clearable
- size="small"
style="width: 240px"
@keyup.enter="handleQuery"
/>
@@ -17,14 +16,13 @@
v-model="queryParams.phonenumber"
placeholder="璇疯緭鍏ユ墜鏈哄彿鐮�"
clearable
- size="small"
style="width: 240px"
@keyup.enter="handleQuery"
/>
</el-form-item>
<el-form-item>
- <el-button type="primary" icon="Search" size="mini" @click="handleQuery">鎼滅储</el-button>
- <el-button icon="Refresh" size="mini" @click="resetQuery">閲嶇疆</el-button>
+ <el-button type="primary" icon="Search" @click="handleQuery">鎼滅储</el-button>
+ <el-button icon="Refresh" @click="resetQuery">閲嶇疆</el-button>
</el-form-item>
</el-form>
@@ -34,7 +32,6 @@
type="primary"
plain
icon="Plus"
- size="mini"
@click="openSelectUser"
v-hasPermi="['system:role:add']"
>娣诲姞鐢ㄦ埛</el-button>
@@ -44,7 +41,6 @@
type="danger"
plain
icon="CircleClose"
- size="mini"
:disabled="multiple"
@click="cancelAuthUserAll"
v-hasPermi="['system:role:remove']"
@@ -55,7 +51,6 @@
type="warning"
plain
icon="Close"
- size="mini"
@click="handleClose"
>鍏抽棴</el-button>
</el-col>
@@ -81,7 +76,6 @@
<el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
<template #default="scope">
<el-button
- size="mini"
type="text"
icon="CircleClose"
@click="cancelAuthUser(scope.row)"
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index 7bd432b..bdc3810 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -6,7 +6,6 @@
v-model="queryParams.roleName"
placeholder="璇疯緭鍏ヨ鑹插悕绉�"
clearable
- size="small"
style="width: 240px"
@keyup.enter="handleQuery"
/>
@@ -16,7 +15,6 @@
v-model="queryParams.roleKey"
placeholder="璇疯緭鍏ユ潈闄愬瓧绗�"
clearable
- size="small"
style="width: 240px"
@keyup.enter="handleQuery"
/>
@@ -26,7 +24,6 @@
v-model="queryParams.status"
placeholder="瑙掕壊鐘舵��"
clearable
- size="small"
style="width: 240px"
>
<el-option
@@ -37,11 +34,9 @@
/>
</el-select>
</el-form-item>
- <el-form-item label="鍒涘缓鏃堕棿">
+ <el-form-item label="鍒涘缓鏃堕棿" style="width: 308px">
<el-date-picker
v-model="dateRange"
- size="small"
- style="width: 240px"
value-format="YYYY-MM-DD"
type="daterange"
range-separator="-"
@@ -50,8 +45,8 @@
></el-date-picker>
</el-form-item>
<el-form-item>
- <el-button type="primary" icon="Search" size="mini" @click="handleQuery">鎼滅储</el-button>
- <el-button icon="Refresh" size="mini" @click="resetQuery">閲嶇疆</el-button>
+ <el-button type="primary" icon="Search" @click="handleQuery">鎼滅储</el-button>
+ <el-button icon="Refresh" @click="resetQuery">閲嶇疆</el-button>
</el-form-item>
</el-form>
<el-row :gutter="10" class="mb8">
@@ -60,7 +55,6 @@
type="primary"
plain
icon="Plus"
- size="mini"
@click="handleAdd"
v-hasPermi="['system:role:add']"
>鏂板</el-button>
@@ -70,7 +64,6 @@
type="success"
plain
icon="Edit"
- size="mini"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['system:role:edit']"
@@ -81,7 +74,6 @@
type="danger"
plain
icon="Delete"
- size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['system:role:remove']"
@@ -92,7 +84,6 @@
type="warning"
plain
icon="Download"
- size="mini"
@click="handleExport"
v-hasPermi="['system:role:export']"
>瀵煎嚭</el-button>
@@ -117,42 +108,49 @@
></el-switch>
</template>
</el-table-column>
- <el-table-column label="鍒涘缓鏃堕棿" align="center" prop="createTime" width="180">
+ <el-table-column label="鍒涘缓鏃堕棿" align="center" prop="createTime">
<template #default="scope">
<span>{{ parseTime(scope.row.createTime) }}</span>
</template>
</el-table-column>
<el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
<template #default="scope">
- <el-button
- size="mini"
+ <el-tooltip content="淇敼" placement="top">
+ <el-button
v-if="scope.row.roleId !== 1"
type="text"
icon="Edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['system:role:edit']"
- >淇敼</el-button>
- <el-button
- size="mini"
+ ></el-button>
+ </el-tooltip>
+ <el-tooltip content="鍒犻櫎" placement="top">
+ <el-button
v-if="scope.row.roleId !== 1"
type="text"
icon="Delete"
@click="handleDelete(scope.row)"
v-hasPermi="['system:role:remove']"
- >鍒犻櫎</el-button>
- <el-dropdown size="mini" v-if="scope.row.roleId !== 1" @command="(command) => handleCommand(command, scope.row)">
- <span class="el-dropdown-link" v-hasPermi="['system:role:edit']">
- <el-icon><d-arrow-right /></el-icon>鏇村
- </span>
- <template #dropdown>
- <el-dropdown-menu>
- <el-dropdown-item command="handleDataScope" icon="CircleCheck"
- v-hasPermi="['system:role:edit']">鏁版嵁鏉冮檺</el-dropdown-item>
- <el-dropdown-item command="handleAuthUser" icon="User"
- v-hasPermi="['system:role:edit']">鍒嗛厤鐢ㄦ埛</el-dropdown-item>
- </el-dropdown-menu>
- </template>
- </el-dropdown>
+ ></el-button>
+ </el-tooltip>
+ <el-tooltip content="鏁版嵁鏉冮檺" placement="top">
+ <el-button
+ v-if="scope.row.roleId !== 1"
+ type="text"
+ icon="CircleCheck"
+ @click="handleDataScope(scope.row)"
+ v-hasPermi="['system:role:edit']"
+ ></el-button>
+ </el-tooltip>
+ <el-tooltip content="鍒嗛厤鐢ㄦ埛" placement="top">
+ <el-button
+ v-if="scope.row.roleId !== 1"
+ type="text"
+ icon="User"
+ @click="handleAuthUser(scope.row)"
+ v-hasPermi="['system:role:edit']"
+ ></el-button>
+ </el-tooltip>
</template>
</el-table-column>
</el-table>
diff --git a/src/views/system/role/selectUser.vue b/src/views/system/role/selectUser.vue
index 1671ac9..0a6a412 100644
--- a/src/views/system/role/selectUser.vue
+++ b/src/views/system/role/selectUser.vue
@@ -7,7 +7,6 @@
v-model="queryParams.userName"
placeholder="璇疯緭鍏ョ敤鎴峰悕绉�"
clearable
- size="small"
@keyup.enter="handleQuery"
/>
</el-form-item>
@@ -16,13 +15,12 @@
v-model="queryParams.phonenumber"
placeholder="璇疯緭鍏ユ墜鏈哄彿鐮�"
clearable
- size="small"
@keyup.enter="handleQuery"
/>
</el-form-item>
<el-form-item>
- <el-button type="primary" icon="Search" size="mini" @click="handleQuery">鎼滅储</el-button>
- <el-button icon="Refresh" size="mini" @click="resetQuery">閲嶇疆</el-button>
+ <el-button type="primary" icon="Search" @click="handleQuery">鎼滅储</el-button>
+ <el-button icon="Refresh" @click="resetQuery">閲嶇疆</el-button>
</el-form-item>
</el-form>
<el-row>
diff --git a/src/views/system/user/authRole.vue b/src/views/system/user/authRole.vue
index c3609cf..55a71f4 100644
--- a/src/views/system/user/authRole.vue
+++ b/src/views/system/user/authRole.vue
@@ -18,7 +18,7 @@
<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-column label="搴忓彿" type="index" align="center">
+ <el-table-column label="搴忓彿" width="55" type="index" align="center">
<template #default="scope">
<span>{{ (pageNum - 1) * pageSize + scope.$index + 1 }}</span>
</template>
@@ -37,10 +37,10 @@
<pagination v-show="total > 0" :total="total" v-model:page="pageNum" v-model:limit="pageSize" />
<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 @click="close()">杩斿洖</el-button>
- </el-form-item>
+ </div>
</el-form>
</div>
</template>
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index f738e91..367d147 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -8,7 +8,6 @@
v-model="deptName"
placeholder="璇疯緭鍏ラ儴闂ㄥ悕绉�"
clearable
- size="small"
prefix-icon="el-icon-search"
style="margin-bottom: 20px"
/>
@@ -33,7 +32,6 @@
v-model="queryParams.userName"
placeholder="璇疯緭鍏ョ敤鎴峰悕绉�"
clearable
- size="small"
style="width: 240px"
@keyup.enter="handleQuery"
/>
@@ -43,7 +41,6 @@
v-model="queryParams.phonenumber"
placeholder="璇疯緭鍏ユ墜鏈哄彿鐮�"
clearable
- size="small"
style="width: 240px"
@keyup.enter="handleQuery"
/>
@@ -53,7 +50,6 @@
v-model="queryParams.status"
placeholder="鐢ㄦ埛鐘舵��"
clearable
- size="small"
style="width: 240px"
>
<el-option
@@ -64,11 +60,9 @@
/>
</el-select>
</el-form-item>
- <el-form-item label="鍒涘缓鏃堕棿">
+ <el-form-item label="鍒涘缓鏃堕棿" style="width: 308px;">
<el-date-picker
v-model="dateRange"
- size="small"
- style="width: 240px"
value-format="YYYY-MM-DD"
type="daterange"
range-separator="-"
@@ -77,8 +71,8 @@
></el-date-picker>
</el-form-item>
<el-form-item>
- <el-button type="primary" icon="Search" size="mini" @click="handleQuery">鎼滅储</el-button>
- <el-button icon="Refresh" size="mini" @click="resetQuery">閲嶇疆</el-button>
+ <el-button type="primary" icon="Search" @click="handleQuery">鎼滅储</el-button>
+ <el-button icon="Refresh" @click="resetQuery">閲嶇疆</el-button>
</el-form-item>
</el-form>
@@ -88,7 +82,6 @@
type="primary"
plain
icon="Plus"
- size="mini"
@click="handleAdd"
v-hasPermi="['system:user:add']"
>鏂板</el-button>
@@ -98,7 +91,6 @@
type="success"
plain
icon="Edit"
- size="mini"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['system:user:edit']"
@@ -109,7 +101,6 @@
type="danger"
plain
icon="Delete"
- size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['system:user:remove']"
@@ -120,7 +111,6 @@
type="info"
plain
icon="Upload"
- size="mini"
@click="handleImport"
v-hasPermi="['system:user:import']"
>瀵煎叆</el-button>
@@ -130,7 +120,6 @@
type="warning"
plain
icon="Download"
- size="mini"
@click="handleExport"
v-hasPermi="['system:user:export']"
>瀵煎嚭</el-button>
@@ -155,42 +144,49 @@
></el-switch>
</template>
</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">
<span>{{ parseTime(scope.row.createTime) }}</span>
</template>
</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">
- <el-button
- size="mini"
- v-if="scope.row.userId !== 1"
- type="text"
- icon="Edit"
- @click="handleUpdate(scope.row)"
- v-hasPermi="['system:user:edit']"
- >淇敼</el-button>
- <el-button
- size="mini"
- v-if="scope.row.userId !== 1"
- type="text"
- icon="Delete"
- @click="handleDelete(scope.row)"
- v-hasPermi="['system:user:remove']"
- >鍒犻櫎</el-button>
- <el-dropdown v-if="scope.row.userId !== 1" @command="(command) => handleCommand(command, scope.row)">
- <span class="el-dropdown-link" v-hasPermi="['system:user:resetPwd', 'system:user:edit']">
- <el-icon><d-arrow-right /></el-icon>鏇村
- </span>
- <template #dropdown>
- <el-dropdown-menu>
- <el-dropdown-item command="handleResetPwd" icon="Key"
- v-hasPermi="['system:user:resetPwd']">閲嶇疆瀵嗙爜</el-dropdown-item>
- <el-dropdown-item command="handleAuthRole" icon="CircleCheck"
- v-hasPermi="['system:user:edit']">鍒嗛厤瑙掕壊</el-dropdown-item>
- </el-dropdown-menu>
- </template>
- </el-dropdown>
+ <el-tooltip content="淇敼" placement="top">
+ <el-button
+ v-if="scope.row.userId !== 1"
+ type="text"
+ icon="Edit"
+ @click="handleUpdate(scope.row)"
+ v-hasPermi="['system:user:edit']"
+ ></el-button>
+ </el-tooltip>
+ <el-tooltip content="鍒犻櫎" placement="top">
+ <el-button
+ v-if="scope.row.userId !== 1"
+ type="text"
+ icon="Delete"
+ @click="handleDelete(scope.row)"
+ v-hasPermi="['system:user:remove']"
+ ></el-button>
+ </el-tooltip>
+ <el-tooltip content="閲嶇疆瀵嗙爜" placement="top">
+ <el-button
+ v-if="scope.row.userId !== 1"
+ type="text"
+ icon="Key"
+ @click="handleResetPwd(scope.row)"
+ v-hasPermi="['system:user:resetPwd']"
+ ></el-button>
+ </el-tooltip>
+ <el-tooltip content="鍒嗛厤瑙掕壊" placement="top">
+ <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>
</el-table-column>
</el-table>
diff --git a/src/views/system/user/profile/resetPwd.vue b/src/views/system/user/profile/resetPwd.vue
index ef15e11..24717d4 100644
--- a/src/views/system/user/profile/resetPwd.vue
+++ b/src/views/system/user/profile/resetPwd.vue
@@ -10,8 +10,8 @@
<el-input v-model="user.confirmPassword" placeholder="璇风‘璁ゅ瘑鐮�" type="password" show-password/>
</el-form-item>
<el-form-item>
- <el-button type="primary" size="mini" @click="submit">淇濆瓨</el-button>
- <el-button type="danger" size="mini" @click="close">鍏抽棴</el-button>
+ <el-button type="primary" @click="submit">淇濆瓨</el-button>
+ <el-button type="danger" @click="close">鍏抽棴</el-button>
</el-form-item>
</el-form>
</template>
diff --git a/src/views/system/user/profile/userAvatar.vue b/src/views/system/user/profile/userAvatar.vue
index f8ceef9..383d9f2 100644
--- a/src/views/system/user/profile/userAvatar.vue
+++ b/src/views/system/user/profile/userAvatar.vue
@@ -25,26 +25,26 @@
<el-row>
<el-col :lg="2" :md="2">
<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-button>
</el-upload>
</el-col>
<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 :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 :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 :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 :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-row>
</el-dialog>
diff --git a/src/views/system/user/profile/userInfo.vue b/src/views/system/user/profile/userInfo.vue
index 994adb8..d6c981a 100644
--- a/src/views/system/user/profile/userInfo.vue
+++ b/src/views/system/user/profile/userInfo.vue
@@ -16,8 +16,8 @@
</el-radio-group>
</el-form-item>
<el-form-item>
- <el-button type="primary" size="mini" @click="submit">淇濆瓨</el-button>
- <el-button type="danger" size="mini" @click="close">鍏抽棴</el-button>
+ <el-button type="primary" @click="submit">淇濆瓨</el-button>
+ <el-button type="danger" @click="close">鍏抽棴</el-button>
</el-form-item>
</el-form>
</template>
diff --git a/src/views/tool/gen/editTable.vue b/src/views/tool/gen/editTable.vue
index 66201ea..b53a381 100644
--- a/src/views/tool/gen/editTable.vue
+++ b/src/views/tool/gen/editTable.vue
@@ -118,10 +118,10 @@
</el-tab-pane>
</el-tabs>
<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 @click="close()">杩斿洖</el-button>
- </el-form-item>
+ </div>
</el-form>
</el-card>
</template>
diff --git a/src/views/tool/gen/importTable.vue b/src/views/tool/gen/importTable.vue
index 8f987c1..67624e2 100644
--- a/src/views/tool/gen/importTable.vue
+++ b/src/views/tool/gen/importTable.vue
@@ -7,7 +7,6 @@
v-model="queryParams.tableName"
placeholder="璇疯緭鍏ヨ〃鍚嶇О"
clearable
- size="small"
@keyup.enter="handleQuery"
/>
</el-form-item>
@@ -16,13 +15,12 @@
v-model="queryParams.tableComment"
placeholder="璇疯緭鍏ヨ〃鎻忚堪"
clearable
- size="small"
@keyup.enter="handleQuery"
/>
</el-form-item>
<el-form-item>
- <el-button type="primary" icon="Search" size="mini" @click="handleQuery">鎼滅储</el-button>
- <el-button icon="Refresh" size="mini" @click="resetQuery">閲嶇疆</el-button>
+ <el-button type="primary" icon="Search" @click="handleQuery">鎼滅储</el-button>
+ <el-button icon="Refresh" @click="resetQuery">閲嶇疆</el-button>
</el-form-item>
</el-form>
<el-row>
diff --git a/src/views/tool/gen/index.vue b/src/views/tool/gen/index.vue
index 0a5b173..a500b9b 100644
--- a/src/views/tool/gen/index.vue
+++ b/src/views/tool/gen/index.vue
@@ -6,7 +6,6 @@
v-model="queryParams.tableName"
placeholder="璇疯緭鍏ヨ〃鍚嶇О"
clearable
- size="small"
@keyup.enter="handleQuery"
/>
</el-form-item>
@@ -15,15 +14,12 @@
v-model="queryParams.tableComment"
placeholder="璇疯緭鍏ヨ〃鎻忚堪"
clearable
- size="small"
@keyup.enter="handleQuery"
/>
</el-form-item>
- <el-form-item label="鍒涘缓鏃堕棿">
+ <el-form-item label="鍒涘缓鏃堕棿" style="width: 308px">
<el-date-picker
v-model="dateRange"
- size="small"
- style="width: 240px"
value-format="YYYY-MM-DD"
type="daterange"
range-separator="-"
@@ -32,8 +28,8 @@
></el-date-picker>
</el-form-item>
<el-form-item>
- <el-button type="primary" icon="Search" size="mini" @click="handleQuery">鎼滅储</el-button>
- <el-button icon="Refresh" size="mini" @click="resetQuery">閲嶇疆</el-button>
+ <el-button type="primary" icon="Search" @click="handleQuery">鎼滅储</el-button>
+ <el-button icon="Refresh" @click="resetQuery">閲嶇疆</el-button>
</el-form-item>
</el-form>
@@ -43,7 +39,6 @@
type="primary"
plain
icon="Download"
- size="mini"
@click="handleGenTable"
v-hasPermi="['tool:gen:code']"
>鐢熸垚</el-button>
@@ -53,7 +48,6 @@
type="info"
plain
icon="Upload"
- size="mini"
@click="openImportTable"
v-hasPermi="['tool:gen:import']"
>瀵煎叆</el-button>
@@ -63,7 +57,6 @@
type="success"
plain
icon="Edit"
- size="mini"
:disabled="single"
@click="handleEditTable"
v-hasPermi="['tool:gen:edit']"
@@ -74,7 +67,6 @@
type="danger"
plain
icon="Delete"
- size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['tool:gen:remove']"
@@ -108,45 +100,50 @@
prop="className"
:show-overflow-tooltip="true"
/>
- <el-table-column label="鍒涘缓鏃堕棿" align="center" prop="createTime" width="150" />
- <el-table-column label="鏇存柊鏃堕棿" align="center" prop="updateTime" width="150" />
+ <el-table-column label="鍒涘缓鏃堕棿" align="center" prop="createTime" width="160" />
+ <el-table-column label="鏇存柊鏃堕棿" align="center" prop="updateTime" width="160" />
<el-table-column label="鎿嶄綔" align="center" width="330" class-name="small-padding fixed-width">
<template #default="scope">
- <el-button
- type="text"
- size="small"
- icon="View"
- @click="handlePreview(scope.row)"
- v-hasPermi="['tool:gen:preview']"
- >棰勮</el-button>
- <el-button
- type="text"
- size="small"
- icon="Edit"
- @click="handleEditTable(scope.row)"
- v-hasPermi="['tool:gen:edit']"
- >缂栬緫</el-button>
- <el-button
- type="text"
- size="small"
- icon="Delete"
- @click="handleDelete(scope.row)"
- v-hasPermi="['tool:gen:remove']"
- >鍒犻櫎</el-button>
- <el-button
- type="text"
- size="small"
- icon="Refresh"
- @click="handleSynchDb(scope.row)"
- v-hasPermi="['tool:gen:edit']"
- >鍚屾</el-button>
- <el-button
- type="text"
- size="small"
- icon="Download"
- @click="handleGenTable(scope.row)"
- v-hasPermi="['tool:gen:code']"
- >鐢熸垚浠ｇ爜</el-button>
+ <el-tooltip content="棰勮" placement="top">
+ <el-button
+ type="text"
+ icon="View"
+ @click="handlePreview(scope.row)"
+ v-hasPermi="['tool:gen:preview']"
+ ></el-button>
+ </el-tooltip>
+ <el-tooltip content="缂栬緫" placement="top">
+ <el-button
+ type="text"
+ icon="Edit"
+ @click="handleEditTable(scope.row)"
+ v-hasPermi="['tool:gen:edit']"
+ ></el-button>
+ </el-tooltip>
+ <el-tooltip content="鍒犻櫎" placement="top">
+ <el-button
+ type="text"
+ icon="Delete"
+ @click="handleDelete(scope.row)"
+ v-hasPermi="['tool:gen:remove']"
+ ></el-button>
+ </el-tooltip>
+ <el-tooltip content="鍚屾" placement="top">
+ <el-button
+ type="text"
+ icon="Refresh"
+ @click="handleSynchDb(scope.row)"
+ v-hasPermi="['tool:gen:edit']"
+ ></el-button>
+ </el-tooltip>
+ <el-tooltip content="鐢熸垚浠ｇ爜" placement="top">
+ <el-button
+ type="text"
+ icon="Download"
+ @click="handleGenTable(scope.row)"
+ v-hasPermi="['tool:gen:code']"
+ ></el-button>
+ </el-tooltip>
</template>
</el-table-column>
</el-table>
@@ -179,7 +176,6 @@
import router from "@/router";
import importTable from "./importTable";
-const route = useRoute();
const { proxy } = getCurrentInstance();
const tableList = ref([]);
--
Gitblit v1.9.3