提交 89f43f18 authored 作者: JaxBBLL's avatar JaxBBLL

feat: style update

上级 ed3bb71a
......@@ -38,7 +38,7 @@
},
"dependencies": {
"@riophae/vue-treeselect": "0.4.0",
"@taiyuan/ty-ui": "latest",
"@taiyuan/ty-ui": "^0.0.1",
"axios": "0.24.0",
"clipboard": "2.0.8",
"core-js": "3.25.3",
......@@ -70,16 +70,16 @@
"@vue/cli-service": "4.5.13",
"@vue/eslint-config-standard": "5.1.2",
"babel-eslint": "10.1.0",
"babel-plugin-dynamic-import-node": "2.3.3",
"chalk": "4.1.0",
"compression-webpack-plugin": "5.0.2",
"connect": "3.6.6",
"eslint": "7.13.0",
"eslint-plugin-import": "2.22.1",
"eslint-plugin-node": "11.1.0",
"eslint-plugin-promise": "4.2.1",
"eslint-plugin-standard": "4.1.0",
"eslint-plugin-vue": "7.1.0",
"babel-plugin-dynamic-import-node": "2.3.3",
"chalk": "4.1.0",
"compression-webpack-plugin": "5.0.2",
"connect": "3.6.6",
"lint-staged": "10.5.3",
"runjs": "4.4.2",
"sass": "1.32.13",
......@@ -96,4 +96,4 @@
"> 1%",
"last 2 versions"
]
}
\ No newline at end of file
}
/**
* I think element-ui's default theme color is too light for long-term use.
* So I modified the default color and you can modify it to your liking.
**/
/* 重新修改主色 */
// $s3: #ff6900;
// $--color-primary: $s3;
/* theme color */
$--color-primary: #1890ff;
$--color-success: #13ce66;
$--color-warning: #ffba00;
$--color-danger: #ff4949;
// $--color-info: #1E1E1E;
$--button-font-weight: 400;
// $--color-text-regular: #1f2d3d;
$--border-color-light: #dfe4ed;
$--border-color-lighter: #e6ebf5;
$--table-border: 1px solid #dfe6ec;
/* icon font path, required */
/* 这里必须这样设置*/
$--font-path: '~element-ui/lib/theme-chalk/fonts';
$--images-path: '~@taiyuan/ty-ui/packages/theme-chalk/src/images';
@import '~element-ui/packages/theme-chalk/src/index';
@import '~@taiyuan/ty-ui/packages/theme-chalk/src/index.scss';
// the :export directive is the magic sauce for webpack
// https://www.bluematador.com/blog/how-to-share-variables-between-js-and-sass
......
@import './variables.scss';
@import './mixin.scss';
@import './transition.scss';
// @import './element-ui.scss';
@import './sidebar.scss';
@import './btn.scss';
body {
height: 100%;
......@@ -131,10 +129,6 @@ aside {
position: relative;
}
.pagination-container {
margin-top: 30px;
}
.text-center {
text-align: center;
}
......@@ -188,3 +182,8 @@ aside {
margin-bottom: 10px;
}
}
.top-right-btn {
position: relative;
float: right;
}
......@@ -15,7 +15,7 @@
class="upload-file-uploader"
>
<!-- 上传按钮 -->
<el-button size="mini" type="primary">选取文件</el-button>
<el-button type="primary">选取文件</el-button>
<!-- 上传提示 -->
<div v-if="showTip" slot="tip" class="el-upload__tip">
请上传
......
......@@ -105,7 +105,8 @@ export default {
<style scoped>
.pagination-container {
background: #fff;
padding: 32px 16px;
padding: 10px;
text-align: right;
}
.pagination-container.hidden {
display: none;
......
......@@ -8,20 +8,10 @@
:content="showSearch ? '隐藏搜索' : '显示搜索'"
placement="top"
>
<el-button
size="mini"
circle
icon="el-icon-search"
@click="toggleSearch()"
/>
<el-button circle icon="el-icon-search" @click="toggleSearch()" />
</el-tooltip>
<el-tooltip class="item" effect="dark" content="刷新" placement="top">
<el-button
size="mini"
circle
icon="el-icon-refresh"
@click="refresh()"
/>
<el-button circle icon="el-icon-refresh" @click="refresh()" />
</el-tooltip>
<el-tooltip
v-if="columns"
......@@ -32,7 +22,6 @@
>
<el-button
v-if="showColumnsType == 'transfer'"
size="mini"
circle
icon="el-icon-menu"
@click="showColumn()"
......@@ -43,7 +32,7 @@
:hide-on-click="false"
style="padding-left: 12px"
>
<el-button size="mini" circle icon="el-icon-menu" />
<el-button circle icon="el-icon-menu" />
<el-dropdown-menu slot="dropdown">
<template v-for="item in columns">
<el-dropdown-item :key="item.key">
......
import Vue from 'vue';
import './assets/styles/element-variables.scss';
import '@/assets/styles/index.scss'; // global css
import Vue from 'vue';
import Cookies from 'js-cookie';
import Element from 'element-ui';
// import "./assets/styles/element-variables.scss";
import '@taiyuan/ty-ui/packages/theme-chalk/src/index.scss';
import '@/assets/styles/index.scss'; // global css
// import "@/assets/styles/ruoyi.scss"; // ruoyi css
// 引入tui的源码
import TyUI from '@taiyuan/ty-ui/packages/index';
......@@ -74,23 +70,11 @@ Vue.use(plugins);
Vue.use(VueMeta);
DictData.install();
/**
* If you don't want to use mock-server
* you want to use MockJs for mock api
* you can execute: mockXHR()
*
* Currently MockJs will be used in the production environment,
* please remove it before going online! ! !
*/
Vue.use(Element, {
size: Cookies.get('size') || 'small' // set element-ui default size
});
Vue.use(TyUI, {
// 可以自定义设置utils名称,this.$utils
utils: 'utils'
});
Vue.use(TyUI);
Vue.config.productionTip = false;
......
......@@ -44,7 +44,6 @@
>
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleClearCacheName(scope.row)"
......@@ -89,7 +88,6 @@
>
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleClearCacheKey(scope.row)"
......
......@@ -45,16 +45,10 @@
</el-select>
</el-form-item>
<el-form-item>
<el-button
type="primary"
icon="el-icon-search"
size="mini"
@click="handleQuery"
<el-button type="primary" icon="el-icon-search" @click="handleQuery"
>搜索</el-button
>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
>重置</el-button
>
<el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
......@@ -65,7 +59,6 @@
type="primary"
plain
icon="el-icon-plus"
size="mini"
@click="handleAdd"
>新增</el-button
>
......@@ -76,7 +69,6 @@
type="success"
plain
icon="el-icon-edit"
size="mini"
:disabled="single"
@click="handleUpdate"
>修改</el-button
......@@ -88,7 +80,6 @@
type="danger"
plain
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleDelete"
>删除</el-button
......@@ -100,7 +91,6 @@
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
>导出</el-button
>
......@@ -111,7 +101,6 @@
type="info"
plain
icon="el-icon-s-operation"
size="mini"
@click="handleJobLog"
>日志</el-button
>
......@@ -175,7 +164,6 @@
<template slot-scope="scope">
<el-button
v-hasPermi="['monitor:job:edit']"
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
......@@ -183,7 +171,6 @@
>
<el-button
v-hasPermi="['monitor:job:remove']"
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
......@@ -191,12 +178,9 @@
>
<el-dropdown
v-hasPermi="['monitor:job:changeStatus', 'monitor:job:query']"
size="mini"
@command="(command) => handleCommand(command, scope.row)"
>
<el-button size="mini" type="text" icon="el-icon-d-arrow-right"
>更多</el-button
>
<el-button type="text" icon="el-icon-d-arrow-right">更多</el-button>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item
v-hasPermi="['monitor:job:changeStatus']"
......@@ -343,7 +327,7 @@
width="700px"
append-to-body
>
<el-form ref="form" :model="form" label-width="120px" size="mini">
<el-form ref="form" :model="form" label-width="120px">
<el-row>
<el-col :span="12">
<el-form-item label="任务编号:">{{ form.jobId }}</el-form-item>
......
......@@ -59,16 +59,10 @@
/>
</el-form-item>
<el-form-item>
<el-button
type="primary"
icon="el-icon-search"
size="mini"
@click="handleQuery"
<el-button type="primary" icon="el-icon-search" @click="handleQuery"
>搜索</el-button
>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
>重置</el-button
>
<el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
......@@ -79,7 +73,6 @@
type="danger"
plain
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleDelete"
>删除</el-button
......@@ -91,7 +84,6 @@
type="danger"
plain
icon="el-icon-delete"
size="mini"
@click="handleClean"
>清空</el-button
>
......@@ -102,7 +94,6 @@
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
>导出</el-button
>
......@@ -112,7 +103,6 @@
type="warning"
plain
icon="el-icon-close"
size="mini"
@click="handleClose"
>关闭</el-button
>
......@@ -189,7 +179,6 @@
<template slot-scope="scope">
<el-button
v-hasPermi="['monitor:job:query']"
size="mini"
type="text"
icon="el-icon-view"
@click="handleView(scope.row)"
......@@ -214,7 +203,7 @@
width="700px"
append-to-body
>
<el-form ref="form" :model="form" label-width="100px" size="mini">
<el-form ref="form" :model="form" label-width="100px">
<el-row>
<el-col :span="12">
<el-form-item label="日志序号:">{{ form.jobLogId }}</el-form-item>
......
......@@ -54,16 +54,10 @@
/>
</el-form-item>
<el-form-item>
<el-button
type="primary"
icon="el-icon-search"
size="mini"
@click="handleQuery"
<el-button type="primary" icon="el-icon-search" @click="handleQuery"
>搜索</el-button
>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
>重置</el-button
>
<el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
......@@ -74,7 +68,6 @@
type="danger"
plain
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleDelete"
>删除</el-button
......@@ -86,7 +79,6 @@
type="danger"
plain
icon="el-icon-delete"
size="mini"
@click="handleClean"
>清空</el-button
>
......@@ -97,7 +89,6 @@
type="primary"
plain
icon="el-icon-unlock"
size="mini"
:disabled="single"
@click="handleUnlock"
>解锁</el-button
......@@ -109,7 +100,6 @@
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
>导出</el-button
>
......
......@@ -24,16 +24,10 @@
/>
</el-form-item>
<el-form-item>
<el-button
type="primary"
icon="el-icon-search"
size="mini"
@click="handleQuery"
<el-button type="primary" icon="el-icon-search" @click="handleQuery"
>搜索</el-button
>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
>重置</el-button
>
<el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
<el-table
......@@ -91,7 +85,6 @@
<template slot-scope="scope">
<el-button
v-hasPermi="['monitor:online:forceLogout']"
size="mini"
type="text"
icon="el-icon-delete"
@click="handleForceLogout(scope.row)"
......
......@@ -78,16 +78,10 @@
/>
</el-form-item>
<el-form-item>
<el-button
type="primary"
icon="el-icon-search"
size="mini"
@click="handleQuery"
<el-button type="primary" icon="el-icon-search" @click="handleQuery"
>搜索</el-button
>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
>重置</el-button
>
<el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
......@@ -98,7 +92,6 @@
type="danger"
plain
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleDelete"
>删除</el-button
......@@ -110,7 +103,6 @@
type="danger"
plain
icon="el-icon-delete"
size="mini"
@click="handleClean"
>清空</el-button
>
......@@ -121,7 +113,6 @@
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
>导出</el-button
>
......@@ -216,7 +207,6 @@
<template slot-scope="scope">
<el-button
v-hasPermi="['monitor:operlog:query']"
size="mini"
type="text"
icon="el-icon-view"
@click="handleView(scope.row, scope.index)"
......@@ -241,7 +231,7 @@
width="800px"
append-to-body
>
<el-form ref="form" :model="form" label-width="100px" size="mini">
<el-form ref="form" :model="form" label-width="100px">
<el-row>
<el-col :span="12">
<el-form-item label="操作模块:"
......
......@@ -52,16 +52,10 @@
/>
</el-form-item>
<el-form-item>
<el-button
type="primary"
icon="el-icon-search"
size="mini"
@click="handleQuery"
<el-button type="primary" icon="el-icon-search" @click="handleQuery"
>搜索</el-button
>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
>重置</el-button
>
<el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
......@@ -72,7 +66,6 @@
type="primary"
plain
icon="el-icon-plus"
size="mini"
@click="handleAdd"
>新增</el-button
>
......@@ -83,7 +76,6 @@
type="success"
plain
icon="el-icon-edit"
size="mini"
:disabled="single"
@click="handleUpdate"
>修改</el-button
......@@ -95,7 +87,6 @@
type="danger"
plain
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleDelete"
>删除</el-button
......@@ -107,7 +98,6 @@
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
>导出</el-button
>
......@@ -118,7 +108,6 @@
type="danger"
plain
icon="el-icon-refresh"
size="mini"
@click="handleRefreshCache"
>刷新缓存</el-button
>
......@@ -183,7 +172,6 @@
<template slot-scope="scope">
<el-button
v-hasPermi="['system:config:edit']"
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
......@@ -191,7 +179,6 @@
>
<el-button
v-hasPermi="['system:config:remove']"
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
......
......@@ -30,16 +30,10 @@
</el-select>
</el-form-item>
<el-form-item>
<el-button
type="primary"
icon="el-icon-search"
size="mini"
@click="handleQuery"
<el-button type="primary" icon="el-icon-search" @click="handleQuery"
>搜索</el-button
>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
>重置</el-button
>
<el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
......@@ -50,7 +44,6 @@
type="primary"
plain
icon="el-icon-plus"
size="mini"
@click="handleAdd"
>新增</el-button
>
......@@ -60,7 +53,6 @@
type="info"
plain
icon="el-icon-sort"
size="mini"
@click="toggleExpandAll"
>展开/折叠</el-button
>
......@@ -104,7 +96,6 @@
<template slot-scope="scope">
<el-button
v-hasPermi="['system:dept:edit']"
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
......@@ -112,7 +103,6 @@
>
<el-button
v-hasPermi="['system:dept:add']"
size="mini"
type="text"
icon="el-icon-plus"
@click="handleAdd(scope.row)"
......@@ -121,7 +111,6 @@
<el-button
v-if="scope.row.parentId != 0"
v-hasPermi="['system:dept:remove']"
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
......
......@@ -41,16 +41,10 @@
</el-select>
</el-form-item>
<el-form-item>
<el-button
type="primary"
icon="el-icon-search"
size="mini"
@click="handleQuery"
<el-button type="primary" icon="el-icon-search" @click="handleQuery"
>搜索</el-button
>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
>重置</el-button
>
<el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
......@@ -61,7 +55,6 @@
type="primary"
plain
icon="el-icon-plus"
size="mini"
@click="handleAdd"
>新增</el-button
>
......@@ -72,7 +65,6 @@
type="success"
plain
icon="el-icon-edit"
size="mini"
:disabled="single"
@click="handleUpdate"
>修改</el-button
......@@ -84,7 +76,6 @@
type="danger"
plain
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleDelete"
>删除</el-button
......@@ -96,7 +87,6 @@
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
>导出</el-button
>
......@@ -106,7 +96,6 @@
type="warning"
plain
icon="el-icon-close"
size="mini"
@click="handleClose"
>关闭</el-button
>
......@@ -172,7 +161,6 @@
<template slot-scope="scope">
<el-button
v-hasPermi="['system:dict:edit']"
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
......@@ -180,7 +168,6 @@
>
<el-button
v-hasPermi="['system:dict:remove']"
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
......
......@@ -53,16 +53,10 @@
/>
</el-form-item>
<el-form-item>
<el-button
type="primary"
icon="el-icon-search"
size="mini"
@click="handleQuery"
<el-button type="primary" icon="el-icon-search" @click="handleQuery"
>搜索</el-button
>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
>重置</el-button
>
<el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
......@@ -73,7 +67,6 @@
type="primary"
plain
icon="el-icon-plus"
size="mini"
@click="handleAdd"
>新增</el-button
>
......@@ -84,7 +77,6 @@
type="success"
plain
icon="el-icon-edit"
size="mini"
:disabled="single"
@click="handleUpdate"
>修改</el-button
......@@ -96,7 +88,6 @@
type="danger"
plain
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleDelete"
>删除</el-button
......@@ -108,7 +99,6 @@
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
>导出</el-button
>
......@@ -119,7 +109,6 @@
type="danger"
plain
icon="el-icon-refresh"
size="mini"
@click="handleRefreshCache"
>刷新缓存</el-button
>
......@@ -186,7 +175,6 @@
<template slot-scope="scope">
<el-button
v-hasPermi="['system:dict:edit']"
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
......@@ -194,7 +182,6 @@
>
<el-button
v-hasPermi="['system:dict:remove']"
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
......
......@@ -30,16 +30,10 @@
</el-select>
</el-form-item>
<el-form-item>
<el-button
type="primary"
icon="el-icon-search"
size="mini"
@click="handleQuery"
<el-button type="primary" icon="el-icon-search" @click="handleQuery"
>搜索</el-button
>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
>重置</el-button
>
<el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
......@@ -50,7 +44,6 @@
type="primary"
plain
icon="el-icon-plus"
size="mini"
@click="handleAdd"
>新增</el-button
>
......@@ -60,7 +53,6 @@
type="info"
plain
icon="el-icon-sort"
size="mini"
@click="toggleExpandAll"
>展开/折叠</el-button
>
......@@ -119,7 +111,6 @@
<template slot-scope="scope">
<el-button
v-hasPermi="['system:menu:edit']"
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
......@@ -127,7 +118,6 @@
>
<el-button
v-hasPermi="['system:menu:add']"
size="mini"
type="text"
icon="el-icon-plus"
@click="handleAdd(scope.row)"
......@@ -135,7 +125,6 @@
>
<el-button
v-hasPermi="['system:menu:remove']"
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
......
......@@ -39,16 +39,10 @@
</el-select>
</el-form-item>
<el-form-item>
<el-button
type="primary"
icon="el-icon-search"
size="mini"
@click="handleQuery"
<el-button type="primary" icon="el-icon-search" @click="handleQuery"
>搜索</el-button
>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
>重置</el-button
>
<el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
......@@ -59,7 +53,6 @@
type="primary"
plain
icon="el-icon-plus"
size="mini"
@click="handleAdd"
>新增</el-button
>
......@@ -70,7 +63,6 @@
type="success"
plain
icon="el-icon-edit"
size="mini"
:disabled="single"
@click="handleUpdate"
>修改</el-button
......@@ -82,7 +74,6 @@
type="danger"
plain
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleDelete"
>删除</el-button
......@@ -154,7 +145,6 @@
<template slot-scope="scope">
<el-button
v-hasPermi="['system:notice:edit']"
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
......@@ -162,7 +152,6 @@
>
<el-button
v-hasPermi="['system:notice:remove']"
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
......
......@@ -39,16 +39,10 @@
</el-select>
</el-form-item>
<el-form-item>
<el-button
type="primary"
icon="el-icon-search"
size="mini"
@click="handleQuery"
<el-button type="primary" icon="el-icon-search" @click="handleQuery"
>搜索</el-button
>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
>重置</el-button
>
<el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
......@@ -59,7 +53,6 @@
type="primary"
plain
icon="el-icon-plus"
size="mini"
@click="handleAdd"
>新增</el-button
>
......@@ -70,7 +63,6 @@
type="success"
plain
icon="el-icon-edit"
size="mini"
:disabled="single"
@click="handleUpdate"
>修改</el-button
......@@ -82,7 +74,6 @@
type="danger"
plain
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleDelete"
>删除</el-button
......@@ -94,7 +85,6 @@
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
>导出</el-button
>
......@@ -138,7 +128,6 @@
<template slot-scope="scope">
<el-button
v-hasPermi="['system:post:edit']"
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
......@@ -146,7 +135,6 @@
>
<el-button
v-hasPermi="['system:post:remove']"
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
......
......@@ -26,16 +26,10 @@
/>
</el-form-item>
<el-form-item>
<el-button
type="primary"
icon="el-icon-search"
size="mini"
@click="handleQuery"
<el-button type="primary" icon="el-icon-search" @click="handleQuery"
>搜索</el-button
>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
>重置</el-button
>
<el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
......@@ -46,7 +40,6 @@
type="primary"
plain
icon="el-icon-plus"
size="mini"
@click="openSelectUser"
>添加用户</el-button
>
......@@ -57,7 +50,6 @@
type="danger"
plain
icon="el-icon-circle-close"
size="mini"
:disabled="multiple"
@click="cancelAuthUserAll"
>批量取消授权</el-button
......@@ -68,7 +60,6 @@
type="warning"
plain
icon="el-icon-close"
size="mini"
@click="handleClose"
>关闭</el-button
>
......@@ -128,7 +119,6 @@
<template slot-scope="scope">
<el-button
v-hasPermi="['system:role:remove']"
size="mini"
type="text"
icon="el-icon-circle-close"
@click="cancelAuthUser(scope.row)"
......
......@@ -52,16 +52,10 @@
/>
</el-form-item>
<el-form-item>
<el-button
type="primary"
icon="el-icon-search"
size="mini"
@click="handleQuery"
<el-button type="primary" icon="el-icon-search" @click="handleQuery"
>搜索</el-button
>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
>重置</el-button
>
<el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
......@@ -72,7 +66,6 @@
type="primary"
plain
icon="el-icon-plus"
size="mini"
@click="handleAdd"
>新增</el-button
>
......@@ -83,7 +76,6 @@
type="success"
plain
icon="el-icon-edit"
size="mini"
:disabled="single"
@click="handleUpdate"
>修改</el-button
......@@ -95,7 +87,6 @@
type="danger"
plain
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleDelete"
>删除</el-button
......@@ -107,7 +98,6 @@
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
>导出</el-button
>
......@@ -163,7 +153,6 @@
<template v-if="scope.row.roleId !== 1" slot-scope="scope">
<el-button
v-hasPermi="['system:role:edit']"
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
......@@ -171,7 +160,6 @@
>
<el-button
v-hasPermi="['system:role:remove']"
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
......@@ -179,12 +167,9 @@
>
<el-dropdown
v-hasPermi="['system:role:edit']"
size="mini"
@command="(command) => handleCommand(command, scope.row)"
>
<el-button size="mini" type="text" icon="el-icon-d-arrow-right"
>更多</el-button
>
<el-button type="text" icon="el-icon-d-arrow-right">更多</el-button>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item
v-hasPermi="['system:role:edit']"
......
......@@ -25,16 +25,10 @@
/>
</el-form-item>
<el-form-item>
<el-button
type="primary"
icon="el-icon-search"
size="mini"
@click="handleQuery"
<el-button type="primary" icon="el-icon-search" @click="handleQuery"
>搜索</el-button
>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
>重置</el-button
>
<el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
<el-row>
......
......@@ -82,14 +82,10 @@
/>
</el-form-item>
<el-form-item>
<el-button
type="primary"
icon="el-icon-search"
size="mini"
@click="handleQuery"
<el-button type="primary" icon="el-icon-search" @click="handleQuery"
>搜索</el-button
>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
<el-button icon="el-icon-refresh" @click="resetQuery"
>重置</el-button
>
</el-form-item>
......@@ -102,7 +98,6 @@
type="primary"
plain
icon="el-icon-plus"
size="mini"
@click="handleAdd"
>新增</el-button
>
......@@ -113,7 +108,6 @@
type="success"
plain
icon="el-icon-edit"
size="mini"
:disabled="single"
@click="handleUpdate"
>修改</el-button
......@@ -125,7 +119,6 @@
type="danger"
plain
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleDelete"
>删除</el-button
......@@ -137,7 +130,6 @@
type="info"
plain
icon="el-icon-upload2"
size="mini"
@click="handleImport"
>导入</el-button
>
......@@ -148,7 +140,6 @@
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
>导出</el-button
>
......@@ -240,7 +231,6 @@
<template v-if="scope.row.userId !== 1" slot-scope="scope">
<el-button
v-hasPermi="['system:user:edit']"
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
......@@ -248,7 +238,6 @@
>
<el-button
v-hasPermi="['system:user:remove']"
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
......@@ -256,10 +245,9 @@
>
<el-dropdown
v-hasPermi="['system:user:resetPwd', 'system:user:edit']"
size="mini"
@command="(command) => handleCommand(command, scope.row)"
>
<el-button size="mini" type="text" icon="el-icon-d-arrow-right"
<el-button type="text" icon="el-icon-d-arrow-right"
>更多</el-button
>
<el-dropdown-menu slot="dropdown">
......
......@@ -25,8 +25,8 @@
/>
</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>
......
......@@ -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>
......
......@@ -12,7 +12,6 @@
选择图标
<el-input
v-model="key"
size="mini"
:style="{ width: '260px' }"
placeholder="请输入图标名称"
prefix-icon="el-icon-search"
......
......@@ -1076,7 +1076,7 @@ export default {
item.value = isNumberStr(val) ? +val : val;
},
setDefaultValue(val) {
if (Array.Array.isArray(val)) {
if (Array.isArray(val)) {
return val.join(',');
}
if (['string', 'number'].indexOf(val) > -1) {
......
......@@ -25,16 +25,10 @@
/>
</el-form-item>
<el-form-item>
<el-button
type="primary"
icon="el-icon-search"
size="mini"
@click="handleQuery"
<el-button type="primary" icon="el-icon-search" @click="handleQuery"
>搜索</el-button
>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
>重置</el-button
>
<el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
<el-row>
......
......@@ -36,16 +36,10 @@
/>
</el-form-item>
<el-form-item>
<el-button
type="primary"
icon="el-icon-search"
size="mini"
@click="handleQuery"
<el-button type="primary" icon="el-icon-search" @click="handleQuery"
>搜索</el-button
>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
>重置</el-button
>
<el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
......@@ -56,7 +50,6 @@
type="primary"
plain
icon="el-icon-download"
size="mini"
@click="handleGenTable"
>生成</el-button
>
......@@ -67,7 +60,6 @@
type="info"
plain
icon="el-icon-upload"
size="mini"
@click="openImportTable"
>导入</el-button
>
......@@ -78,7 +70,6 @@
type="success"
plain
icon="el-icon-edit"
size="mini"
:disabled="single"
@click="handleEditTable"
>修改</el-button
......@@ -90,7 +81,6 @@
type="danger"
plain
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleDelete"
>删除</el-button
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论