From ba5e65e7bda57e18bd0dcf65d1d9596f967e0ae0 Mon Sep 17 00:00:00 2001
From: xing <xingjs@qq.com>
Date: 星期日, 26 二月 2023 12:25:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/maintenance/tokentool.vue | 14
src/views/AuthorizationManagement/userRoleAuthorization.vue | 29 ++
src/views/AuthorizationManagement/roleResAuthorization.vue | 25 +-
src/views/maintenance/userManagement.vue | 68 +++---
src/views/userManage/templateManage.vue | 69 +++---
src/assets/css/content.css | 6
src/views/AuthorizationManagement/roleMenuAuthorization.vue | 13
src/views/userManage/authorityManage.vue | 14
src/views/AuthorizationManagement/menuRoleAuthorization.vue | 10
src/assets/css/global.css | 6
src/views/maintenance/blackwhiteList.vue | 30 +-
src/views/userManage/orgManage.vue | 67 +++----
src/views/maintenance/menuSettings.vue | 62 +++---
src/views/userManage/resourceManage.vue | 14
src/views/userManage/roleManage.vue | 66 +++---
15 files changed, 256 insertions(+), 237 deletions(-)
diff --git a/src/assets/css/content.css b/src/assets/css/content.css
index 9391c26..04e4e8f 100644
--- a/src/assets/css/content.css
+++ b/src/assets/css/content.css
@@ -15,7 +15,7 @@
/*宸︿晶div鏍峰紡*/
.left {
- width: calc(17% - 10px);
+ width: calc(14% - 10px);
/*宸︿晶鍒濆鍖栧搴�*/
height: 100%;
overflow: auto;
@@ -60,7 +60,7 @@
/*鍙充晶div'鏍峰紡*/
.mid {
float: left;
- width: 83%;
+ width: 86%;
/*鍙充晶鍒濆鍖栧搴�*/
height: 100%;
@@ -210,4 +210,4 @@
.infoBox p {
font-size: 14px;
-}
\ No newline at end of file
+}
diff --git a/src/assets/css/global.css b/src/assets/css/global.css
index 8ae28ee..24a4eeb 100644
--- a/src/assets/css/global.css
+++ b/src/assets/css/global.css
@@ -87,3 +87,9 @@
.el-pagination{
font-weight: normal;
}
+.el-input__suffix{
+ right: 10px;
+}
+.content-border{
+ border: 1px solid #dcdfe6
+}
diff --git a/src/views/AuthorizationManagement/menuRoleAuthorization.vue b/src/views/AuthorizationManagement/menuRoleAuthorization.vue
index 7747db9..71ce6b7 100644
--- a/src/views/AuthorizationManagement/menuRoleAuthorization.vue
+++ b/src/views/AuthorizationManagement/menuRoleAuthorization.vue
@@ -8,7 +8,7 @@
]"
></My-bread>
<el-divider /> -->
- <div class="menuSettings_tree subpage_Div menuRoleAuthorization_left" style="padding-top:10px;width: 23%;overflow-y: auto;">
+ <div class="menuSettings_tree subpage_Div menuRoleAuthorization_left content-border" style="padding-top:10px;width: 20%;overflow-y: auto;">
<My-bread
:list="[
`${$t('operatManage.operatManage')}`,
@@ -50,7 +50,7 @@
>
</el-tree>
</div> -->
- <div class="right_menu subpage_Div">
+ <div class="right_menu subpage_Div content-border">
<div
style="
font-size: 14px;
@@ -523,9 +523,9 @@
//@import url(); 寮曞叆鍏叡css绫�
.menuSettings_box {
//height: 96%;
- height: 100%;
+ height: calc(100% - 20px);
width: 98%;
- padding:0 1%;
+ padding:10px;
border-radius: 10px;
position: relative;
display: flex;
@@ -544,7 +544,7 @@
}
.right_menu {
border-radius: 10px;
- width: 75%;
+ width: 77.5%;
// height: 92%;
padding: 10px;
// padding-top:0;
diff --git a/src/views/AuthorizationManagement/roleMenuAuthorization.vue b/src/views/AuthorizationManagement/roleMenuAuthorization.vue
index 4931ecb..488dc3b 100644
--- a/src/views/AuthorizationManagement/roleMenuAuthorization.vue
+++ b/src/views/AuthorizationManagement/roleMenuAuthorization.vue
@@ -2,7 +2,7 @@
<div class="menuSettings_box">
<!-- 瑙掕壊锛屽崟浣� -->
<div class="menuSettings_tree">
- <div class="content_box subpage_Div">
+ <div class="content_box subpage_Div content-border">
<My-bread :list="[
`${$t('operatManage.operatManage')}`,
`${$t('operatManage.RoleMenuAuthorization')}`,
@@ -73,7 +73,7 @@
</el-table-column>
</el-table>
</div>
- <div class="content_box subpage_Div">
+ <div class="content_box subpage_Div content-border">
<div style="
font-size: 14px;
color: #216fe6;
@@ -104,14 +104,14 @@
</el-tree>
</div>
- <div class="content_box subpage_Div">
+ <div class="content_box subpage_Div content-border">
<div style="
font-size: 14px;
color: #216fe6;
line-height: 1;
cursor: text;
position: relative;
- top: 5px;
+ top: 0px;
margin-left: 10px;
display: flex;
align-items: center;
@@ -547,9 +547,10 @@
//@import url(); 寮曞叆鍏叡css绫�
.menuSettings_box {
//height: 98%;
- height: 100%;
+
+ height: calc(100% - 20px);
width: 98%;
- padding: 0 0.5%;
+ padding: 10px 0.5%;
.menuSettings_tree {
display: flex;
diff --git a/src/views/AuthorizationManagement/roleResAuthorization.vue b/src/views/AuthorizationManagement/roleResAuthorization.vue
index e1fe9f6..c7e3af6 100644
--- a/src/views/AuthorizationManagement/roleResAuthorization.vue
+++ b/src/views/AuthorizationManagement/roleResAuthorization.vue
@@ -1,7 +1,7 @@
<template>
<div class="menuSettings_box">
<div class="menuSettings_tree">
- <div class="content_box subpage_Div">
+ <div class="content_left_box subpage_Div content-border">
<My-bread :list="[
`${$t('operatManage.operatManage')}`,
`${$t('operatManage.RoleResAuthorization')}`,
@@ -22,7 +22,7 @@
</el-tree>
</div>
</div>
- <div class="content_box subpage_Div">
+ <div class="content_box subpage_Div content-border">
<div style="
font-size: 14px;
color: #216fe6;
@@ -40,7 +40,7 @@
style="width: 100%"
@row-click="singleElection"
highlight-current-row
- height="calc(100% - 50px)"
+ height="calc(100% - 80px)"
>
<el-table-column
align="center"
@@ -81,14 +81,14 @@
</el-pagination>
</div>
</div>
- <div class="content_box subpage_Div">
+ <div class="content_box subpage_Div content-border">
<div style="
font-size: 14px;
color: #216fe6;
line-height: 1;
cursor: text;
position: relative;
- top: 5px;
+ top: 0px;
margin-left: 10px;
display: flex;
align-items: center;
@@ -127,7 +127,7 @@
:data="usertableData"
style="width: 100%"
- height="calc(100% - 50px)"
+ height="calc(100% - 80px)"
@selection-change="handleSelectionChange"
>
<el-table-column
@@ -681,21 +681,26 @@
<style lang="less" scoped>
//@import url(); 寮曞叆鍏叡css绫�
.menuSettings_box {
- height: 100%;
+ height: calc(100% - 20px);
//height: 98%;
width: 98%;
- padding:0 1%;
+ padding:10px 1%;
.menuSettings_tree {
width: 100%;
height: 100%;
display: flex;
justify-content: space-around;
+ .content_left_box{
+ padding: 10px;
+ width: 20%;
+ height: 94%;
+ border-radius: 5px;
+ }
.content_box {
padding: 10px;
- width: 31%;
+ width: 36%;
height: 94%;
-
border-radius: 5px;
}
.divider {
diff --git a/src/views/AuthorizationManagement/userRoleAuthorization.vue b/src/views/AuthorizationManagement/userRoleAuthorization.vue
index da29669..f714432 100644
--- a/src/views/AuthorizationManagement/userRoleAuthorization.vue
+++ b/src/views/AuthorizationManagement/userRoleAuthorization.vue
@@ -1,6 +1,6 @@
<template>
<div class="menuSettings_box userRoleAuthorization userRoleAuthorization1">
- <div class="menuSettings_tree subpage_Div userRoleAuthorization_left">
+ <div class="menuSettings_left_tree subpage_Div userRoleAuthorization_left content-border">
<My-bread
:list="[
`${$t('operatManage.operatManage')}`,
@@ -32,6 +32,7 @@
menuSettings_tree
subpage_Div
userRoleAuthorization_mid userRoleAuthorization_left1
+ content-border
"
>
<div
@@ -91,7 +92,7 @@
</div>
</div>
<!-- <div class="userRoleAuthorization_resize1" title="鏀剁缉渚ц竟鏍�">鈰�</div> -->
- <div class="menuSettings_tree subpage_Div userRoleAuthorization_mid1">
+ <div class="menuSettings_tree subpage_Div userRoleAuthorization_mid1 content-border">
<div
style="
font-size: 14px;
@@ -99,7 +100,7 @@
line-height: 1;
cursor: text;
position: relative;
- top: 5px;
+ top: 0px;
margin-left: 10px;
display: flex;
align-items: center;
@@ -109,7 +110,7 @@
<span>
{{ $t("operatManage.UserRoleAuthorizationObj.userTable") }}</span
>
- <div class="btn" style="margin-left: auto">
+ <div class="btn" style="margin-left: auto;">
<el-button
v-if="menuStatus.insert"
type="success"
@@ -592,14 +593,26 @@
display: flex;
justify-content: space-between;
- .menuSettings_tree {
- width: 33%;
- //height: 98%;
- height: 100%;
+ .menuSettings_left_tree{
+ width: 20%;
+ height: 98%;
+ margin-top: 10px;
position: relative;
padding: 10px;
border-radius: 10px;
box-sizing: border-box;
+ overflow-y: auto;
+ }
+ .menuSettings_tree {
+ width: 39%;
+ height: 98%;
+ margin-top: 10px;
+ //height: 100%;
+ position: relative;
+ //padding: 1%;
+ padding: 10px;
+ border-radius: 10px;
+ box-sizing: border-box;
.saveBtn {
position: absolute;
left: 250px;
diff --git a/src/views/maintenance/blackwhiteList.vue b/src/views/maintenance/blackwhiteList.vue
index df5d411..3a3419d 100644
--- a/src/views/maintenance/blackwhiteList.vue
+++ b/src/views/maintenance/blackwhiteList.vue
@@ -39,21 +39,22 @@
<div>
<el-form-item>
<el-button
- type="info"
- @click="resetInfo('queryInfo')"
- icon="el-icon-refresh"
- size="small"
- >{{ $t("operatManage.BWL.reset") }}</el-button
- >
- </el-form-item>
- <el-form-item>
- <el-button
type="primary"
@click="queryBlackInfo()"
size="small"
icon="el-icon-search"
>{{ $t("operatManage.BWL.search") }}
</el-button>
+ </el-form-item>
+ <el-form-item>
+ <el-button
+ icon="el-icon-edit"
+ v-if="menuStatus.insert"
+ type="success"
+ size="small"
+ @click="showInsertdialog(1)"
+ >{{ $t("common.append") }}</el-button
+ >
</el-form-item>
<el-form-item>
<el-button
@@ -67,12 +68,11 @@
</el-form-item>
<el-form-item>
<el-button
- icon="el-icon-edit"
- v-if="menuStatus.insert"
- type="success"
- size="small"
- @click="showInsertdialog(1)"
- >{{ $t("common.append") }}</el-button
+ type="info"
+ @click="resetInfo('queryInfo')"
+ icon="el-icon-refresh"
+ size="small"
+ >{{ $t("operatManage.BWL.reset") }}</el-button
>
</el-form-item>
</div>
diff --git a/src/views/maintenance/menuSettings.vue b/src/views/maintenance/menuSettings.vue
index c5ce763..005b9d5 100644
--- a/src/views/maintenance/menuSettings.vue
+++ b/src/views/maintenance/menuSettings.vue
@@ -22,12 +22,10 @@
>
</el-tree>
</div>
-
</div>
<div class="right_menu subpage_Div">
-
- <div style="display:flex;justify-content:space-between;align-items: center;padding-bottom: 14px">
- <el-breadcrumb separator="/">
+ <div style="display:flex;justify-content:right;align-items: center;padding-bottom: 14px">
+ <el-breadcrumb separator="/" style="display: none">
<el-breadcrumb-item :to="{ path: '/' }">{{
$t('dataManage.dictionaryManageObj.particulars')
}}</el-breadcrumb-item>
@@ -84,7 +82,7 @@
:model="itemdetail"
ref="itemdetail"
:rules="rules"
- style="position: relative;"
+ label-width="130px"
>
<el-form-item
prop="enName"
@@ -109,16 +107,16 @@
autocomplete="off"
></el-input>
</el-form-item>
- <el-form-item
- :label="$t('operatManage.menuSetObj.icon')"
- :label-width="formLabelWidth"
- >
- <el-input
- v-model="itemdetail.icon"
- :placeholder="$t('operatManage.menuSetObj.iconHolder')"
- autocomplete="off"
- ></el-input>
- </el-form-item>
+<!-- <el-form-item-->
+<!-- :label="$t('operatManage.menuSetObj.icon')"-->
+<!-- :label-width="formLabelWidth"-->
+<!-- >-->
+<!-- <el-input-->
+<!-- v-model="itemdetail.icon"-->
+<!-- :placeholder="$t('operatManage.menuSetObj.iconHolder')"-->
+<!-- autocomplete="off"-->
+<!-- ></el-input>-->
+<!-- </el-form-item>-->
<el-form-item
prop="isShow"
:label="$t('operatManage.menuSetObj.isShow')"
@@ -194,22 +192,21 @@
:placeholder="$t('operatManage.menuSetObj.bakHolder')"
></el-input>
</el-form-item>
- <div
- style="margin-left: 100px"
- v-if="menuStatus.update"
- >
- <el-button
- size="small"
- type="primary"
- @click="updMenu('itemdetail')"
- >{{ $t('common.confirm') }}</el-button>
- <el-button
- size="small"
- type="info"
- @click="reset('itemdetail')"
- >{{
- $t('common.cancel')
- }}</el-button>
+ <div v-if="menuStatus.update">
+ <el-form-item>
+ <el-button
+ size="small"
+ type="primary"
+ @click="updMenu('itemdetail')"
+ >{{ $t('common.confirm') }}</el-button>
+ <el-button
+ size="small"
+ type="info"
+ @click="reset('itemdetail')"
+ >{{
+ $t('common.cancel')
+ }}</el-button>
+ </el-form-item>
</div>
</el-form>
</div>
@@ -888,6 +885,7 @@
border-radius: 5px;
padding: 1%;
overflow-y: auto;
+ border-right: 1px solid #dcdfe6;
}
.right_menu {
width: 80%;
@@ -897,7 +895,7 @@
overflow: auto;
.form_box {
box-sizing: border-box;
- padding-top: 20px;
+ padding-top: 22px;
width: 100%;
.el-input {
width: 400px;
diff --git a/src/views/maintenance/tokentool.vue b/src/views/maintenance/tokentool.vue
index b7318ef..6ffdefd 100644
--- a/src/views/maintenance/tokentool.vue
+++ b/src/views/maintenance/tokentool.vue
@@ -46,6 +46,13 @@
<!-- 鏌ヨ 娓呯┖ -->
<el-form-item>
<el-button
+ icon="el-icon-search"
+ size="small"
+ type="primary"
+ @click="onSubmit"
+ >{{ $t("common.iquery") }}</el-button
+ >
+ <el-button
v-if="menuStatus.insert"
@click="InsertFormdialog = true"
icon="el-icon-edit"
@@ -60,13 +67,6 @@
type="danger"
size="small"
>{{ $t("common.delete") }}</el-button
- >
- <el-button
- icon="el-icon-search"
- size="small"
- type="primary"
- @click="onSubmit"
- >{{ $t("common.iquery") }}</el-button
>
<el-button
icon="el-icon-delete"
diff --git a/src/views/maintenance/userManagement.vue b/src/views/maintenance/userManagement.vue
index 7bde53f..4843c53 100644
--- a/src/views/maintenance/userManagement.vue
+++ b/src/views/maintenance/userManagement.vue
@@ -18,19 +18,6 @@
<div class="flex_box">
<div style="margin-right: auto">
<el-form-item
- prop="uname"
- :label="$t('userManage.userInfoObj.uname')"
- >
- <el-input
- v-model="queryForm.uname"
- size="small"
- :placeholder="$t('userManage.userInfoObj.unamePlaceholder')"
- style="width: 200px"
- >
- <i slot="suffix" class="el-icon-search" @click="queryInfo"></i>
- </el-input>
- </el-form-item>
- <el-form-item
prop="depid"
:label="$t('userManage.userInfoObj.depName')"
>
@@ -56,26 +43,40 @@
</el-option>
</el-select>
</el-form-item>
+ <el-form-item
+ prop="uname"
+ :label="$t('userManage.userInfoObj.uname')"
+ >
+ <el-input
+ v-model="queryForm.uname"
+ size="small"
+ :placeholder="$t('userManage.userInfoObj.unamePlaceholder')"
+ style="width: 200px"
+ >
+ <i slot="suffix" class="el-icon-search" @click="queryInfo"></i>
+ </el-input>
+ </el-form-item>
</div>
<div>
+<!-- <el-form-item>-->
+<!-- <el-button-->
+<!-- type="primary"-->
+<!-- size="small"-->
+<!-- @click="queryInfo('queryForm')"-->
+<!-- icon="el-icon-search"-->
+<!-- >-->
+<!-- {{ $t("operatManage.ELM.search") }}-->
+<!-- </el-button>-->
+<!-- </el-form-item>-->
<el-form-item>
<el-button
- type="primary"
- size="small"
- @click="queryInfo('queryForm')"
- icon="el-icon-search"
+ v-if="menuStatus.insert"
+ type="success"
+ size="small"
+ @click="showAddDialog"
+ icon="el-icon-plus"
>
- {{ $t("operatManage.ELM.search") }}
- </el-button>
- </el-form-item>
- <el-form-item>
- <el-button
- type="info"
- size="small"
- @click="resetInfo('queryForm')"
- icon="el-icon-refresh"
- >
- {{ $t("operatManage.ELM.reset") }}
+ {{ $t("common.append") }}
</el-button>
</el-form-item>
<el-form-item v-show="setbatchFlag">
@@ -101,13 +102,12 @@
</el-form-item>
<el-form-item>
<el-button
- v-if="menuStatus.insert"
- type="success"
- size="small"
- @click="showAddDialog"
- icon="el-icon-plus"
+ type="info"
+ size="small"
+ @click="resetInfo('queryForm')"
+ icon="el-icon-refresh"
>
- {{ $t("common.append") }}
+ {{ $t("operatManage.ELM.reset") }}
</el-button>
</el-form-item>
</div>
diff --git a/src/views/userManage/authorityManage.vue b/src/views/userManage/authorityManage.vue
index c32f52e..194c48c 100644
--- a/src/views/userManage/authorityManage.vue
+++ b/src/views/userManage/authorityManage.vue
@@ -33,13 +33,13 @@
icon="el-icon-delete"
type="danger" size="small"
>{{ $t('common.delete') }}</el-button>
- <el-button
- @click="submitForm('ruleForm')"
- icon="el-icon-search" size="small"
- type="primary"
- >{{
- $t('common.iquery')
- }}</el-button>
+<!-- <el-button-->
+<!-- @click="submitForm('ruleForm')"-->
+<!-- icon="el-icon-search" size="small"-->
+<!-- type="primary"-->
+<!-- >{{-->
+<!-- $t('common.iquery')-->
+<!-- }}</el-button>-->
<el-button
@click="resetForm('ruleForm')"
icon="el-icon-refresh"
diff --git a/src/views/userManage/orgManage.vue b/src/views/userManage/orgManage.vue
index 514bc0a..0454a02 100644
--- a/src/views/userManage/orgManage.vue
+++ b/src/views/userManage/orgManage.vue
@@ -20,19 +20,13 @@
</el-tree>
</div>
</div>
- <div style="width: 80%;
- width: 80%;
- height: 100%;
- border-radius: 5px;
- padding: 1%;
- overflow: auto;">
- <div style="display:flex;justify-content:space-between;align-items: center">
- <el-breadcrumb separator="/">
+ <div class="right_menu subpage_Div">
+ <div style="display:flex;justify-content:right;align-items: center;padding-bottom: 14px">
+ <el-breadcrumb separator="/" style="display: none">
<el-breadcrumb-item :to="{ path: '/' }">{{
$t('dataManage.dictionaryManageObj.particulars')
}}</el-breadcrumb-item>
</el-breadcrumb>
-
<div>
<el-button
v-if="menuStatus.insert"
@@ -76,11 +70,10 @@
>{{$t('operatManage.menuSetObj.moveDown')}}</el-button>
</div>
</div>
- <div class="dividing-line" style="margin-top: 20px"></div>
+ <div class="dividing-line"></div>
<div class="form_box">
<!-- <el-divider class="eldivider" />-->
- <el-form
- style="margin-top: 25px; position: relative;"
+ <el-form label-width="130px"
:model="itemdetail"
ref="itemdetail"
:rules="rules"
@@ -206,21 +199,20 @@
style="max-width: 400px;"
></el-input>
</el-form-item>
- <div
- class="btnBox"
- v-if="menuStatus.update"
- >
- <el-button
- type="primary"
- size="small"
- @click="updDep('itemdetail')"
- >{{ $t('common.submit') }}</el-button>
- <el-button
- size="small"
- @click="reset('itemdetail')"
- >{{
- $t('common.cancel')
- }}</el-button>
+ <div v-if="menuStatus.update">
+ <el-form-item>
+ <el-button
+ type="primary"
+ size="small"
+ @click="updDep('itemdetail')"
+ >{{ $t('common.submit') }}</el-button>
+ <el-button
+ size="small"
+ @click="reset('itemdetail')"
+ >{{
+ $t('common.cancel')
+ }}</el-button>
+ </el-form-item>
</div>
</el-form>
</div>
@@ -229,7 +221,6 @@
</div>
<el-dialog
-
:title="$t('common.append')"
:visible.sync="dialogFormVisible"
>
@@ -893,27 +884,31 @@
}
.left_Tree {
width: 15%;
- height: 91%;
-
+ //height: 94%;
+ height: 100%;
border-radius: 5px;
padding: 1%;
overflow-y: auto;
+ border-right: 1px solid #dcdfe6;
}
.right_menu {
width: 80%;
- height: 91%;
-
+ //height: 91%;
+ height: 98%;
border-radius: 5px;
padding: 1%;
overflow: auto;
-
- .el-input {
- width: 400px;
+ .form_box {
+ box-sizing: border-box;
+ padding-top: 22px;
+ width: 100%;
+ .el-input {
+ width: 400px;
+ }
}
}
}
.btnBox{
- margin-left: 150px;
//position: absolute;
//bottom: 0;
//right: 0;
diff --git a/src/views/userManage/resourceManage.vue b/src/views/userManage/resourceManage.vue
index dc77556..31205aa 100644
--- a/src/views/userManage/resourceManage.vue
+++ b/src/views/userManage/resourceManage.vue
@@ -32,13 +32,13 @@
type="danger"
size="small"
>{{ $t('common.delete') }}</el-button>
- <el-button
- @click="submitForm('ruleForm')"
- icon="el-icon-search"
- size="small"
- type="primary"
- style="background: #1890ff"
- >{{ $t('common.iquery') }}</el-button>
+<!-- <el-button-->
+<!-- @click="submitForm('ruleForm')"-->
+<!-- icon="el-icon-search"-->
+<!-- size="small"-->
+<!-- type="primary"-->
+<!-- style="background: #1890ff"-->
+<!-- >{{ $t('common.iquery') }}</el-button>-->
<el-button
@click="resetForm('ruleForm')"
icon="el-icon-refresh"
diff --git a/src/views/userManage/roleManage.vue b/src/views/userManage/roleManage.vue
index d445fcb..10a3907 100644
--- a/src/views/userManage/roleManage.vue
+++ b/src/views/userManage/roleManage.vue
@@ -17,19 +17,6 @@
<div class="flex_box">
<div style="margin-right: auto">
<el-form-item
- :label="$t('userManage.RM.roleName')"
- prop="username"
- >
- <el-input
- v-model="roleForm.username"
- :placeholder="$t('userManage.RM.roleNameHolder')"
- size="small"
- style="width: 200px"
- >
- <i slot="suffix" class="el-icon-search" @click="onSubmit"></i>
- </el-input>
- </el-form-item>
- <el-form-item
:label="$t('userManage.RM.ownedSystem')"
prop="ownedSystem"
>
@@ -60,24 +47,38 @@
:placeholder="$t('common.pleaseInput')"
/> -->
</el-form-item>
+ <el-form-item
+ :label="$t('userManage.RM.roleName')"
+ prop="username"
+ >
+ <el-input
+ v-model="roleForm.username"
+ :placeholder="$t('userManage.RM.roleNameHolder')"
+ size="small"
+ style="width: 200px"
+ >
+ <i slot="suffix" class="el-icon-search" @click="onSubmit"></i>
+ </el-input>
+ </el-form-item>
</div>
<div>
+<!-- <el-form-item>-->
+<!-- <el-button-->
+<!-- size="small"-->
+<!-- type="primary"-->
+<!-- @click="onSubmit('ruleForm')"-->
+<!-- ><i class="el-icon-search"></i> {{-->
+<!-- $t("userManage.RM.query")-->
+<!-- }}</el-button>-->
+<!-- </el-form-item>-->
<el-form-item>
<el-button
- type="info"
- size="small"
- @click="resetForm('ruleForm')"
- ><i class="el-icon-delete"></i> {{
- $t("userManage.RM.reset")
- }}</el-button>
- </el-form-item>
- <el-form-item>
- <el-button
- size="small"
- type="primary"
- @click="onSubmit('ruleForm')"
- ><i class="el-icon-search"></i> {{
- $t("userManage.RM.query")
+ type="success"
+ size="small"
+ @click="setInsertFormdialog"
+ v-if="menuStatus.insert"
+ ><i class="el-icon-circle-plus-outline"></i> {{
+ $t("userManage.RM.add")
}}</el-button>
</el-form-item>
<el-form-item>
@@ -92,12 +93,11 @@
</el-form-item>
<el-form-item>
<el-button
- type="success"
- size="small"
- @click="setInsertFormdialog"
- v-if="menuStatus.insert"
- ><i class="el-icon-circle-plus-outline"></i> {{
- $t("userManage.RM.add")
+ type="info"
+ size="small"
+ @click="resetForm('ruleForm')"
+ ><i class="el-icon-delete"></i> {{
+ $t("userManage.RM.reset")
}}</el-button>
</el-form-item>
</div>
diff --git a/src/views/userManage/templateManage.vue b/src/views/userManage/templateManage.vue
index 247c733..a51df43 100644
--- a/src/views/userManage/templateManage.vue
+++ b/src/views/userManage/templateManage.vue
@@ -25,40 +25,41 @@
</el-form-item>
</div>
<div>
- <el-form-item>
- <el-button
- icon="el-icon-refresh"
- @click="restRefreshTable"
- type="info"
- size="small"
- >{{ $t('common.empty') }}</el-button>
- </el-form-item>
- <el-form-item>
- <el-button
- icon="el-icon-search"
- @click="setRefreshTable"
- type="primary"
- size="small"
- >{{ $t('common.iquery') }}</el-button>
- </el-form-item>
- <el-form-item>
- <el-button
- v-if="btnStatus.delete"
- icon="el-icon-delete"
- @click="delTableData"
- type="danger"
- size="small"
- >{{ $t('common.delete') }}</el-button>
- </el-form-item>
- <el-form-item>
- <el-button
- v-if="btnStatus.insert"
- @click="setTableInsert"
- icon="el-icon-edit"
- type="success"
- size="small"
- >{{ $t('common.append') }}</el-button>
- </el-form-item>
+
+<!-- <el-form-item>-->
+<!-- <el-button-->
+<!-- icon="el-icon-search"-->
+<!-- @click="setRefreshTable"-->
+<!-- type="primary"-->
+<!-- size="small"-->
+<!-- >{{ $t('common.iquery') }}</el-button>-->
+<!-- </el-form-item>-->
+ <el-form-item>
+ <el-button
+ v-if="btnStatus.insert"
+ @click="setTableInsert"
+ icon="el-icon-edit"
+ type="success"
+ size="small"
+ >{{ $t('common.append') }}</el-button>
+ </el-form-item>
+ <el-form-item>
+ <el-button
+ v-if="btnStatus.delete"
+ icon="el-icon-delete"
+ @click="delTableData"
+ type="danger"
+ size="small"
+ >{{ $t('common.delete') }}</el-button>
+ </el-form-item>
+ <el-form-item>
+ <el-button
+ icon="el-icon-refresh"
+ @click="restRefreshTable"
+ type="info"
+ size="small"
+ >{{ $t('common.empty') }}</el-button>
+ </el-form-item>
</div>
</div>
--
Gitblit v1.9.3