From 9660afd3e2ed1b9bd87c9316f8b24c63ad4c9a4e Mon Sep 17 00:00:00 2001
From: 584911253@qq.com <584911253@qq.com>
Date: 星期六, 25 二月 2023 17:28:22 +0800
Subject: [PATCH] 运维管理样式修改
---
src/views/maintenance/eventlogManage.vue | 38 +-
src/views/maintenance/tokentool.vue | 45 ++-
src/views/AuthorizationManagement/userRoleAuthorization.vue | 24 +
src/views/AuthorizationManagement/roleResAuthorization.vue | 19
src/views/userManage/templateManage.vue | 35 +-
src/views/AuthorizationManagement/roleMenuAuthorization.vue | 20
src/views/userManage/authorityManage.vue | 37 +-
src/assets/lang/zh.js | 49 ++++
src/views/AuthorizationManagement/menuRoleAuthorization.vue | 14
src/views/maintenance/parameterConfiguration.vue | 8
src/assets/css/global.css | 5
src/views/maintenance/blackwhiteList.vue | 76 +++--
src/views/userManage/orgManage.vue | 44 ++-
src/views/maintenance/operationLog.vue | 25 +
src/assets/lang/en.js | 51 ++++
src/views/maintenance/downlog.vue | 27 +
src/views/maintenance/menuSettings.vue | 90 ++++---
src/views/userManage/resourceManage.vue | 39 +-
src/views/userManage/roleManage.vue | 29 +
src/views/maintenance/logLog.vue | 28 +
20 files changed, 438 insertions(+), 265 deletions(-)
diff --git a/src/assets/css/global.css b/src/assets/css/global.css
index 4b74a8b..8ae28ee 100644
--- a/src/assets/css/global.css
+++ b/src/assets/css/global.css
@@ -82,3 +82,8 @@
.BoxFlexinput {
flex: 1;
}
+
+/*鍙栨秷鍒嗛〉绮椾綋*/
+.el-pagination{
+ font-weight: normal;
+}
diff --git a/src/assets/lang/en.js b/src/assets/lang/en.js
index 71770e3..b01bca9 100644
--- a/src/assets/lang/en.js
+++ b/src/assets/lang/en.js
@@ -279,13 +279,31 @@
menuSettings: 'Menu Management',
menuSetObj: {
enName: 'EnName',
+ enNameHolder: 'Please enter EnName',
cnName: 'CnName',
+ cnNameHolder: 'Please enter CnName',
+ iconHolder: 'Please enter an icon name',
icon: 'Icon',
isShow: 'DisPlay',
menuUrl: 'Menu Url',
+ menuUrlHolder: 'Please enter menu Url',
type: 'Type',
bak: 'Remarks',
authorize: 'Authorize',
+ permsHolder:'Please enter authorization',
+ bakHolder: 'Please enter authorization',
+ insert: 'Add sibling',
+ subInsert: 'Add child',
+ delete:'Delete',
+ moveUp:'Move up',
+ moveDown:'Move Downward',
+ show:'Please choose whether to display',
+ typeHolder:'Please select a node type',
+ hiddeen:'Hide',
+ isshow:'Display',
+ rootpath:'Root directory',
+ menu:'Menu',
+ button:'Button'
},
parameterConfiguration: 'parameterConfiguration',
rests: 'Rests',
@@ -374,6 +392,8 @@
creationTime: 'creationTime',
update: 'update',
UpdateTime: 'UpdateTime',
+ blackListIPHolder: 'Please enter the blacklist IP',
+ whiteListIPHolder: 'Please enter the whitelist IP',
},
tokentool: 'Token Tool',
tokentoolObj: {
@@ -399,6 +419,8 @@
editToken: 'Modify token information',
temporary: 'Temporary',
fixed: 'Fixed',
+ tokenHolder: 'Please enter Token',
+ tokenStatusHolder: 'Please select Token type',
},
operationLogObj: {
queryRegion: 'QueryRegion',
@@ -413,7 +435,7 @@
username: 'username',
systematicName: 'systematicName',
IP: ' IP',
- pleaseInput: 'pleaseInput',
+ pleaseInput: 'Please input username',
pleaseSelect: 'please select',
optionDate: 'optionDate',
selectTime: 'selectTime',
@@ -431,7 +453,10 @@
uploading: 'uploading',
download: 'download',
otherOne: 'other one',
- status: 'status'
+ status: 'status',
+ operationTypeHolder: 'Please select operation type',
+ startTimeHolder: 'Please select start time',
+ endTimeHolder: 'Please select end time',
},
},
synthesis: {
@@ -607,6 +632,7 @@
sex: 'gender',
status: 'status',
uname: 'username',
+ unamePlaceholder: 'please enter username',
depid: 'department',
chineseName: 'Chinese Name [User Name]',
affiliatedUnit: 'Affiliated unit [on-the-job]',
@@ -710,6 +736,16 @@
website: 'website',
cmpanyAddress: 'Address',
companyIntroduction: 'companyIntroduction',
+ nameHolder: 'Please enter name',
+ abbreviationHolder:'Please enter abbreviation',
+ organizationCodeHolder:'Please enter the organization code',
+ cmpanyAddressHolder:'Please enter the address',
+ continformationHolder:'Please enter your contact information',
+ faxHolder:'Please enter fax',
+ EMailHolder:'Please enter the E-Mail address',
+ postalCodeHolder: 'Please enter the zip code',
+ WebsiteAddressHolder:'Please enter the website address',
+ remarksHolder:'Please enter remarks'
},
userAuditing: 'User Auditing',
UA: {
@@ -754,6 +790,8 @@
insertRole: 'Add role information',
updateRole: 'Update role information',
isAdmin: 'isAdmin',
+ roleNameHolder: 'Please enter role',
+ ownedSystemHolder: 'Please select unit',
},
groupManage: 'groupManage',
GM: {
@@ -784,6 +822,15 @@
updateUser: 'Updater ID',
updateTime: 'Update Time',
bak: 'Remarks',
+ nameHolder:'Please enter name',
+ },
+ authorityM:{
+ name: 'name',
+ nameHolder: 'Please enter name',
+ },
+ roleMenuAuth:{
+ name: 'unit',
+ nameHolder: 'Please select unit name...',
},
},
shuJuGuanLi: {
diff --git a/src/assets/lang/zh.js b/src/assets/lang/zh.js
index 7896b4a..7065e84 100644
--- a/src/assets/lang/zh.js
+++ b/src/assets/lang/zh.js
@@ -279,13 +279,31 @@
menuSettings: '鑿滃崟绠＄悊',
menuSetObj: {
enName: '鑻辨枃鍚嶇О',
+ enNameHolder: '璇疯緭鍏ヨ嫳鏂囧悕绉�',
cnName: '涓枃鍚嶇О',
+ cnNameHolder: '璇疯緭鍏ヤ腑鏂囧悕绉�',
icon: '鍥炬爣',
+ iconHolder: '璇疯緭鍏ュ浘鏍囧悕绉�',
isShow: '鏄惁鏄剧ず',
menuUrl: '鑿滃崟Url',
+ menuUrlHolder: '璇疯緭鍏ヨ彍鍗昒rl',
type: '绫诲瀷',
bak: '澶囨敞',
authorize: '鎺堟潈',
+ permsHolder:'璇疯緭鍏ユ巿鏉�',
+ bakHolder: '璇疯緭鍏ユ巿鏉�',
+ insert: '鏂板鍚岀骇',
+ subInsert: '鏂板瀛愮骇',
+ delete:'鍒犻櫎',
+ moveUp:'鍚戜笂绉诲姩',
+ moveDown:'鍚戜笅绉诲姩',
+ show:'璇烽�夋嫨鏄惁鏄剧ず',
+ typeHolder:'璇烽�夋嫨鑺傜偣绫诲瀷',
+ hiddeen:'闅愯棌',
+ isshow:'鏄剧ず',
+ rootpath:'鏍圭洰褰�',
+ menu:'鑿滃崟',
+ button:'鎸夐挳'
},
parameterConfiguration: '鍙傛暟閰嶇疆',
rests: '鍏朵粬',
@@ -372,6 +390,8 @@
creationTime: '鍒涘缓鏃堕棿',
update: '鏇存柊浜�',
UpdateTime: '鏇存柊鏃堕棿',
+ blackListIPHolder: '璇疯緭鍏ラ粦鍚嶅崟IP',
+ whiteListIPHolder: '璇疯緭鍏ョ櫧鍚嶅崟IP',
},
tokentool: 'Token宸ュ叿',
tokentoolObj: {
@@ -397,6 +417,8 @@
editToken: '淇敼 Token 淇℃伅',
temporary: '涓存椂',
fixed: '鍥哄畾',
+ tokenHolder: '璇疯緭鍏oken',
+ tokenStatusHolder: '璇烽�夋嫨Token绫诲瀷',
},
operationLogObj: {
queryRegion: '鏌ヨ鍖�',
@@ -411,7 +433,7 @@
username: '鐢ㄦ埛鍚�',
systematicName: '绯荤粺鍚嶇О',
IP: ' IP',
- pleaseInput: '璇疯緭鍏�',
+ pleaseInput: '璇疯緭鍏ョ敤鎴峰悕',
pleaseSelect: '璇烽�夋嫨',
optionDate: '閫夋嫨鏃ユ湡鍜屾椂闂�',
selectTime: '閫夋嫨鏃堕棿',
@@ -429,6 +451,9 @@
download: '涓嬭浇',
otherOne: '鍏跺畠',
status: '鐘舵��',
+ operationTypeHolder: '璇烽�夋嫨鎿嶄綔绫诲瀷',
+ startTimeHolder: '璇烽�夋嫨寮�濮嬫椂闂�',
+ endTimeHolder: '璇烽�夋嫨缁撴潫鏃堕棿',
},
},
synthesis: {
@@ -599,6 +624,7 @@
userinput: 'Excel鐢ㄦ埛瀵煎叆',
userStatus: '鐢ㄦ埛鐘舵��',
uname: '鐢ㄦ埛鍚�',
+ unamePlaceholder: '璇疯緭鍏ョ敤鎴峰悕',
pwd: '瀵嗙爜',
confirmPassword: '纭瀵嗙爜',
origpassword: '鍘熷瘑鐮�',
@@ -716,6 +742,16 @@
website: '缃戝潃',
cmpanyAddress: '鍦板潃',
companyIntroduction: '鍗曚綅浠嬬粛',
+ nameHolder: '璇疯緭鍏ュ悕绉�',
+ abbreviationHolder:'璇疯緭鍏ョ畝绉�',
+ organizationCodeHolder:'璇疯緭鍏ユ満鏋勪唬鐮�',
+ cmpanyAddressHolder:'璇疯緭鍏ュ湴鍧�',
+ continformationHolder:'璇疯緭鍏ヨ仈绯绘柟寮�',
+ faxHolder:'璇疯緭鍏ヤ紶鐪�',
+ EMailHolder:'璇疯緭鍏-Mail鍦板潃',
+ postalCodeHolder: '璇疯緭鍏ラ偖鏀跨紪鐮�',
+ WebsiteAddressHolder:'璇疯緭鍏ョ綉绔欏湴鍧�',
+ remarksHolder:'璇疯緭鍏ュ娉�'
},
userAuditing: '鐢ㄦ埛瀹℃牳',
UA: {
@@ -762,6 +798,8 @@
insertRole: '娣诲姞瑙掕壊淇℃伅',
updateRole: '淇敼瑙掕壊淇℃伅',
isAdmin: '鏄惁涓虹鐞嗗憳',
+ roleNameHolder: '璇疯緭鍏ヨ鑹插悕绉�',
+ ownedSystemHolder: '璇烽�夋嫨鎵�灞炲崟浣�',
},
groupManage: '缇ょ粍绠＄悊',
GM: {
@@ -792,7 +830,16 @@
updateUser: '鏇存柊浜篒D',
updateTime: '鏇存柊鏃堕棿',
bak: '澶囨敞',
+ nameHolder:'璇疯緭鍏ヨ祫婧愬悕绉�',
},
+ authorityM:{
+ name: '鍚嶇О',
+ nameHolder: '璇疯緭鍏ュ悕绉�',
+ },
+ roleMenuAuth:{
+ name: '鍗曚綅',
+ nameHolder: '璇烽�夋嫨鍗曚綅鍚嶇О...',
+ }
},
shuJuGuanLi: {
language: "zh",
diff --git a/src/views/AuthorizationManagement/menuRoleAuthorization.vue b/src/views/AuthorizationManagement/menuRoleAuthorization.vue
index c99cc57..ca5c2b9 100644
--- a/src/views/AuthorizationManagement/menuRoleAuthorization.vue
+++ b/src/views/AuthorizationManagement/menuRoleAuthorization.vue
@@ -35,7 +35,7 @@
</div>
</div>
<!-- <div class="menuRoleAuthorization_resize" title="鏀剁缉渚ц竟鏍�">鈰�</div> -->
-
+
<!-- <div class="left_tree subpage_Div">
<el-tree
:data="depList"
@@ -97,7 +97,7 @@
<el-table
:data="tableData"
style="width: 100%"
- height="calc(100% - 124px)"
+ height="calc(100% - 80px)"
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" width="55"> </el-table-column>
@@ -114,7 +114,7 @@
</el-table-column>
</el-table>
- <div class="pagination_box">
+ <div class="pagination_box" style="margin-top: 10px">
<el-pagination
@size-change="userhandleSizeChange"
@current-change="userhandleCurrentChange"
@@ -523,9 +523,10 @@
<style lang="less" scoped>
//@import url(); 寮曞叆鍏叡css绫�
.menuSettings_box {
- height: 96%;
+ //height: 96%;
+ height: 100%;
width: 98%;
- padding: 1%;
+ padding:0 1%;
border-radius: 10px;
position: relative;
display: flex;
@@ -551,7 +552,7 @@
border-radius: 10px;
float: right;
}
-
+
.divider {
margin-top: 8px;
@@ -569,4 +570,3 @@
background-color: transparent !important;
}
</style>
-
\ No newline at end of file
diff --git a/src/views/AuthorizationManagement/roleMenuAuthorization.vue b/src/views/AuthorizationManagement/roleMenuAuthorization.vue
index 7e2ba21..18fdfb4 100644
--- a/src/views/AuthorizationManagement/roleMenuAuthorization.vue
+++ b/src/views/AuthorizationManagement/roleMenuAuthorization.vue
@@ -12,13 +12,14 @@
ref="form"
:model="selFrom"
>
- <el-form-item label="鍗曚綅">
+ <el-form-item :label="$t('userManage.roleMenuAuth.name')">
<el-select
:popper-append-to-body="false"
ref="multiSelect"
style="width: 300px;"
v-model="selFrom.name"
- placeholder="璇烽�夋嫨鍗曚綅鍚嶇О..."
+ size="small"
+ :placeholder="$t('userManage.roleMenuAuth.nameHolder')"
@change="chooseCustom('multiSelect')"
>
<el-option
@@ -148,9 +149,8 @@
<el-divider class="divider" />
<el-table
:data="menuTableData"
-
style="width: 100%"
- height="calc(100% - 124px)"
+ height="calc(100% - 85px)"
@selection-change="handleSelectionChange"
>
<el-table-column
@@ -170,7 +170,7 @@
</el-table>
<div
- style="margin-top: 20px; text-align: center"
+ style="margin-top: 10px; text-align: center"
class="pagination_box"
>
<el-pagination
@@ -547,9 +547,10 @@
<style lang="less" scoped>
//@import url(); 寮曞叆鍏叡css绫�
.menuSettings_box {
- height: 98%;
+ //height: 98%;
+ height: 100%;
width: 98%;
- padding: 1%;
+ padding: 0 0.5%;
.menuSettings_tree {
display: flex;
@@ -559,7 +560,8 @@
.content_box {
padding: 10px;
width: 30%;
- height: 94%;
+ height: calc(100% - 20px);
+ //height: 94%;
overflow-y: auto;
overflow-x: hidden;
border-radius: 5px;
@@ -577,6 +579,6 @@
.el-table /deep/ th,
.el-table /deep/ tr {
background-color: transparent !important;
-}
+}
</style>
diff --git a/src/views/AuthorizationManagement/roleResAuthorization.vue b/src/views/AuthorizationManagement/roleResAuthorization.vue
index 99adf19..1a39627 100644
--- a/src/views/AuthorizationManagement/roleResAuthorization.vue
+++ b/src/views/AuthorizationManagement/roleResAuthorization.vue
@@ -40,7 +40,7 @@
style="width: 100%"
@row-click="singleElection"
highlight-current-row
- height="calc(100% - 124px)"
+ height="calc(100% - 50px)"
>
<el-table-column
align="center"
@@ -66,7 +66,7 @@
</el-table-column>
</el-table>
<div
- style="text-align: center; margin-top: 20px"
+ style="text-align: center; margin-top: 10px"
class="pagination_box"
>
<el-pagination
@@ -125,9 +125,9 @@
<el-table
:data="usertableData"
-
+
style="width: 100%"
- height="calc(100% - 124px)"
+ height="calc(100% - 50px)"
@selection-change="handleSelectionChange"
>
<el-table-column
@@ -152,7 +152,7 @@
</el-table>
<div
- style="margin-top: 20px; text-align: center"
+ style="margin-top: 10px; text-align: center"
class="pagination_box"
>
<el-pagination
@@ -682,9 +682,10 @@
<style lang="less" scoped>
//@import url(); 寮曞叆鍏叡css绫�
.menuSettings_box {
- height: 98%;
+ height: 100%;
+ //height: 98%;
width: 98%;
- padding: 1%;
+ padding:0 1%;
.menuSettings_tree {
width: 100%;
@@ -695,7 +696,7 @@
padding: 10px;
width: 31%;
height: 94%;
-
+
border-radius: 5px;
}
.divider {
@@ -710,6 +711,6 @@
.el-table /deep/ th,
.el-table /deep/ tr {
background-color: transparent !important;
-}
+}
</style>
diff --git a/src/views/AuthorizationManagement/userRoleAuthorization.vue b/src/views/AuthorizationManagement/userRoleAuthorization.vue
index b38f9c8..79b9a3b 100644
--- a/src/views/AuthorizationManagement/userRoleAuthorization.vue
+++ b/src/views/AuthorizationManagement/userRoleAuthorization.vue
@@ -52,7 +52,7 @@
:data="tableData"
style="width: 100%"
@row-click="singleElection"
- height="calc(100% - 124px)"
+ height="calc(100% - 80px)"
>
<el-table-column align="center" width="55">
<template slot-scope="scope">
@@ -77,7 +77,7 @@
>
</el-table-column>
</el-table>
- <div style="text-align: center; margin-top: 20px" class="pagination_box">
+ <div style="text-align: center; margin-top: 10px" class="pagination_box">
<el-pagination
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
@@ -135,7 +135,7 @@
<el-table
:data="usertableData"
style="width: 100%"
- height="calc(100% - 124px)"
+ height="calc(100% - 80px)"
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" width="55"> </el-table-column>
@@ -151,7 +151,7 @@
</el-table-column>
</el-table>
- <div style="margin-top: 20px; text-align: center" class="pagination_box">
+ <div style="margin-top: 10px; text-align: center" class="pagination_box">
<el-pagination
@size-change="userhandleSizeChange"
@current-change="userhandleCurrentChange"
@@ -337,12 +337,12 @@
resize[i].left = resize[i].offsetLeft;
// 榧犳爣鎷栧姩浜嬩欢
document.onmousemove = function (e) {
-
+
let endX = e.clientX;
console.log(endX ,startX)
let moveLen = resize[i].left + (endX - startX) - left1[i].offsetWidth ; // 锛坋ndx-startx锛�=绉诲姩鐨勮窛绂汇�俽esize[i].left+绉诲姩鐨勮窛绂�=宸﹁竟鍖哄煙鏈�鍚庣殑瀹藉害
let maxT = box[i].clientWidth - resize[i].offsetWidth; // 瀹瑰櫒瀹藉害 - 宸﹁竟鍖哄煙鐨勫搴� = 鍙宠竟鍖哄煙鐨勫搴�
-
+
if (moveLen < 205) moveLen = 205; // 宸﹁竟鍖哄煙鐨勬渶灏忓搴︿负32px
if (moveLen > maxT - 300) moveLen = maxT - 300; //鍙宠竟鍖哄煙鏈�灏忓搴︿负150px
@@ -585,16 +585,18 @@
<style lang="less" scoped>
//@import url(); 寮曞叆鍏叡css绫�
.menuSettings_box {
- height: 98%;
+ //height: 98%;
+ height: 100%;
width: 98%;
- padding: 1%;
+ padding: 0 1%;
// position: relative;
display: flex;
justify-content: space-between;
.menuSettings_tree {
width: 33%;
- height: 98%;
+ //height: 98%;
+ height: 100%;
position: relative;
padding: 10px;
border-radius: 10px;
@@ -621,6 +623,6 @@
.el-table /deep/ th,
.el-table /deep/ tr {
background-color: transparent !important;
-}
+}
</style>
-
+
diff --git a/src/views/maintenance/blackwhiteList.vue b/src/views/maintenance/blackwhiteList.vue
index 897260a..b6f440a 100644
--- a/src/views/maintenance/blackwhiteList.vue
+++ b/src/views/maintenance/blackwhiteList.vue
@@ -18,21 +18,23 @@
prop="blackListIP"
>
<el-input
+ size="small"
style="width: 200px"
v-model="queryInfo.ip"
- :placeholder="$t('operatManage.BWL.listIPInfo')"
+ :placeholder="$t('operatManage.BWL.blackListIPHolder')"
/>
</el-form-item>
- <el-form-item
- :label="$t('operatManage.BWL.interceptionNumber')"
- prop="visit"
- >
- <el-input
- style="width: 200px"
- v-model="queryInfo.visit"
- :placeholder="$t('operatManage.BWL.interceptionNumber')"
- />
- </el-form-item>
+<!-- <el-form-item-->
+<!-- :label="$t('operatManage.BWL.interceptionNumber')"-->
+<!-- prop="visit"-->
+<!-- >-->
+<!-- <el-input-->
+<!-- size="small"-->
+<!-- style="width: 200px"-->
+<!-- v-model="queryInfo.visit"-->
+<!-- :placeholder="$t('operatManage.BWL.interceptionNumber')"-->
+<!-- />-->
+<!-- </el-form-item>-->
</div>
<div>
<el-form-item>
@@ -82,7 +84,7 @@
:data="BTableData"
@selection-change="blackSelectionChange"
style="width: 100%"
- height="calc(100% - 57px)"
+ height="calc(100% - 45px)"
>
<el-table-column type="selection" width="55" />
<el-table-column
@@ -138,7 +140,7 @@
</template>
</el-table-column>
</el-table>
- <div class="pagination_box">
+ <div class="pagination_box" style="margin-top: 10px">
<el-pagination
@size-change="BhandleSizeChange"
@current-change="BhandleCurrentChange"
@@ -162,21 +164,23 @@
prop="ip"
>
<el-input
+ size="small"
style="width: 200px"
v-model="queryInfo.ip"
- :placeholder="$t('operatManage.BWL.listIPInfo')"
+ :placeholder="$t('operatManage.BWL.whiteListIPHolder')"
/>
</el-form-item>
- <el-form-item
- :label="$t('operatManage.BWL.interceptionNumber')"
- prop="visit"
- >
- <el-input
- style="width: 200px"
- v-model="queryInfo.visit"
- :placeholder="$t('operatManage.BWL.interceptionNumber')"
- />
- </el-form-item>
+<!-- <el-form-item-->
+<!-- :label="$t('operatManage.BWL.interceptionNumber')"-->
+<!-- prop="visit"-->
+<!-- >-->
+<!-- <el-input-->
+<!-- size="small"-->
+<!-- style="width: 200px"-->
+<!-- v-model="queryInfo.visit"-->
+<!-- :placeholder="$t('operatManage.BWL.interceptionNumber')"-->
+<!-- />-->
+<!-- </el-form-item>-->
</div>
<div>
<el-form-item>
@@ -225,7 +229,7 @@
:data="WTableData"
@selection-change="blackSelectionChange"
style="width: 100%"
- height="calc(100% - 57px)"
+ height="calc(100% - 45px)"
>
<el-table-column type="selection" width="55" />
<el-table-column
@@ -282,7 +286,7 @@
</el-table-column>
</el-table>
- <div class="pagination_box">
+ <div class="pagination_box" style="margin-top: 10px">
<el-pagination
@size-change="WhandleSizeChange"
@current-change="WhandleCurrentChange"
@@ -302,7 +306,7 @@
:visible.sync="InsertFormdialog"
top="2vh"
>
-
+
<el-form ref="insertform" :model="insertform" label-position="top">
<el-form-item
:label-width="formLabelWidth"
@@ -335,7 +339,7 @@
/>
</el-form-item>
</el-form>
-
+
<div slot="footer" class="dialog-footer">
<el-button size="small" @click="insertFromDataClose">{{
$t("common.close")
@@ -459,7 +463,7 @@
this.$nextTick(() => {
const rect = this.$refs.container.getBoundingClientRect();
this.tableHeight = `${rect.height + 40}px`;
- this.styleVar["height"] = `calc(100% - ${rect.height + 40}px)`;
+ this.styleVar["height"] = `calc(100% - ${rect.height + 0}px)`;
});
},
editFromDataClose() {
@@ -730,26 +734,28 @@
.logLog_box {
height: 98%;
width: 98%;
- padding: 1%;
+ padding: 0.5% 1%;
.el-input {
width: 300px;
}
.inquire {
- padding: 8px;
- margin-top: 20px;
+ padding:0 8px;
+ //margin-top: 20px;
border-radius: 5px;
- margin-bottom: 20px;
+ //margin-bottom: 20px;
.el-form-item {
margin: 5px;
}
}
.el-tabs {
- height: calc(100% - 70px);
+ //height: calc(100% - 70px);
+ height: calc(100% - 30px);
}
/deep/ .el-tabs__content {
- height: calc(100% - 49px);
+ height: calc(100% - 54px);
+ //height: calc(100% - 49px);
}
/deep/ .el-tab-pane {
height: 100%;
diff --git a/src/views/maintenance/downlog.vue b/src/views/maintenance/downlog.vue
index 3a3743b..0bbda3d 100644
--- a/src/views/maintenance/downlog.vue
+++ b/src/views/maintenance/downlog.vue
@@ -22,6 +22,7 @@
>
<el-input
style="width: 200px"
+ size="small"
v-model="sizeForm.uname"
:placeholder="$t('operatManage.operationLogObj.pleaseInput')"
/>
@@ -32,9 +33,10 @@
>
<el-select
style="width: 200px"
+ size="small"
:popper-append-to-body="false"
v-model="sizeForm.type"
- :placeholder="$t('operatManage.operationLogObj.pleaseSelect')"
+ :placeholder="$t('operatManage.operationLogObj.operationTypeHolder')"
>
<el-option
:label="$t('downlog.type1')"
@@ -67,13 +69,14 @@
:label="$t('operatManage.operationLogObj.startTime')"
>
<el-date-picker
+ size="small"
format="yyyy-MM-dd HH:mm:ss"
value-format="yyyy-MM-dd HH:mm:ss"
v-model="sizeForm.start"
style="width: 200px"
type="datetime"
:popper-class="popperclass"
- :placeholder="$t('operatManage.operationLogObj.optionDate')"
+ :placeholder="$t('operatManage.operationLogObj.startTimeHolder')"
></el-date-picker>
</el-form-item>
<el-form-item
@@ -84,9 +87,10 @@
format="yyyy-MM-dd HH:mm:ss"
value-format="yyyy-MM-dd HH:mm:ss"
v-model="sizeForm.end"
+ size="small"
style="width: 200px"
type="datetime"
- :placeholder="$t('operatManage.operationLogObj.optionDate')"
+ :placeholder="$t('operatManage.operationLogObj.endTimeHolder')"
>
</el-date-picker>
</el-form-item>
@@ -110,6 +114,7 @@
</div>
</el-form>
</div>
+ <div class="dividing-line"></div>
<div
class="table_box subpage_Div"
:style="styleVar"
@@ -117,7 +122,7 @@
<el-table
:data="tableData"
style="width: 100%"
- height="calc(100% - 57px)"
+ height="calc(100% - 45px)"
>
<el-table-column
align="center"
@@ -161,7 +166,7 @@
/>
</el-table>
<div
- style="margin-top: 25px"
+ style="margin-top: 10px"
class="pagination_box"
>
<el-pagination
@@ -225,7 +230,8 @@
this.$nextTick(() => {
const rect = this.$refs.container.getBoundingClientRect();
this.tableHeight = `${rect.height + 97}px`;
- this.styleVar["height"] = `calc(100% - ${rect.height + 97}px)`;
+ // this.styleVar["height"] = `calc(100% - ${rect.height + 97}px)`;
+ this.styleVar["height"] = `calc(100% - ${rect.height + 30}px)`;
});
},
formatSize(row, column) {
@@ -366,18 +372,17 @@
.logLog_box {
height: 98%;
width: 98%;
- padding: 1%;
-
+ padding: 0.5% 1%;
.el-input {
width: 300px;
}
.inquire {
- padding: 8px;
- margin-top: 20px;
+ padding: 0 8px;
+ //margin-top: 20px;
border-radius: 5px;
- margin-bottom: 20px;
+ //margin-bottom: 20px;
.el-form-item {
margin: 5px;
}
diff --git a/src/views/maintenance/eventlogManage.vue b/src/views/maintenance/eventlogManage.vue
index d1f71e0..044e909 100644
--- a/src/views/maintenance/eventlogManage.vue
+++ b/src/views/maintenance/eventlogManage.vue
@@ -19,6 +19,7 @@
>
<el-input
style="width:200px"
+ size="small"
v-model="sizeForm.uname"
:placeholder="$t('operatManage.operationLogObj.pleaseInput')"
/>
@@ -29,10 +30,11 @@
>
<el-select
style="width:200px"
+ size="small"
:popper-append-to-body="false"
clearable
v-model="sizeForm.type"
- :placeholder="$t('operatManage.operationLogObj.pleaseSelect')"
+ :placeholder="$t('operatManage.operationLogObj.operationTypeHolder')"
>
<el-option
:label="$t('operatManage.operationLogObj.check')"
@@ -65,12 +67,13 @@
:label="$t('operatManage.operationLogObj.startTime')"
>
<el-date-picker
+ size="small"
format="yyyy-MM-dd HH:mm:ss"
value-format="yyyy-MM-dd HH:mm:ss"
v-model="sizeForm.start"
style="width:200px"
type="datetime"
- :placeholder="$t('operatManage.operationLogObj.optionDate')"
+ :placeholder="$t('operatManage.operationLogObj.startTimeHolder')"
></el-date-picker>
</el-form-item>
<el-form-item
@@ -78,12 +81,13 @@
:label="$t('operatManage.operationLogObj.endTime')"
>
<el-date-picker
+ size="small"
format="yyyy-MM-dd HH:mm:ss"
value-format="yyyy-MM-dd HH:mm:ss"
v-model="sizeForm.end"
style="width:200px"
type="datetime"
- :placeholder="$t('operatManage.operationLogObj.optionDate')"
+ :placeholder="$t('operatManage.operationLogObj.endTimeHolder')"
>
</el-date-picker>
</el-form-item>
@@ -105,16 +109,17 @@
</el-form-item>
</div>
</div>
-
-
+
+
</el-form>
</div>
+ <div class="dividing-line"></div>
<div class="table_box subpage_Div" :style="styleVar">
<el-table
:data="tableData"
style="width: 100%"
- height="calc(100% - 57px)"
+ height="calc(100% - 45px)"
>
<el-table-column
align="center"
@@ -151,10 +156,7 @@
:label="$t('operatManage.ELM.operationType')"
/>
</el-table>
- <div
-
- class="pagination_box"
- >
+ <div class="pagination_box" style="margin-top: 10px">
<el-pagination
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
@@ -212,7 +214,7 @@
this.$nextTick(() => {
const rect = this.$refs.container.getBoundingClientRect();
this.tableHeight = `${rect.height + 97}px`;
- this.styleVar["height"] = `calc(100% - ${rect.height + 97}px)`;
+ this.styleVar["height"] = `calc(100% - ${rect.height + 30}px)`;
});
},
//鏍煎紡鍖栨椂闂�
@@ -320,23 +322,23 @@
.logLog_box {
height: 98%;
width: 98%;
- padding: 1%;
-
+ padding: 0.5% 1%;
+
.el-input {
width: 300px;
}
.inquire {
-
- padding: 8px;
- margin-top: 20px;
+
+ padding: 0 8px;
+ //margin-top: 20px;
border-radius: 5px;
- margin-bottom: 20px;
+ //margin-bottom: 20px;
.el-form-item {
margin: 5px;
}
-
+
}
.text-center {
diff --git a/src/views/maintenance/logLog.vue b/src/views/maintenance/logLog.vue
index 560cfc8..244374c 100644
--- a/src/views/maintenance/logLog.vue
+++ b/src/views/maintenance/logLog.vue
@@ -16,6 +16,7 @@
:label="$t('operatManage.operationLogObj.username')"
>
<el-input
+ size="small"
style="width: 200px"
v-model="sizeForm.uname"
:placeholder="$t('operatManage.operationLogObj.pleaseInput')"
@@ -26,10 +27,11 @@
:label="$t('operatManage.operationLogObj.operationType')"
>
<el-select
+ size="small"
style="width: 200px"
:popper-append-to-body="false"
v-model="sizeForm.type"
- :placeholder="$t('operatManage.operationLogObj.pleaseSelect')"
+ :placeholder="$t('operatManage.operationLogObj.operationTypeHolder')"
>
<el-option :label="$t('loglog.login')" value="1" />
<el-option :label="$t('loglog.checkout')" value="2" />
@@ -41,12 +43,13 @@
:label="$t('operatManage.operationLogObj.startTime')"
>
<el-date-picker
+ size="small"
format="yyyy-MM-dd HH:mm:ss"
value-format="yyyy-MM-dd HH:mm:ss"
v-model="sizeForm.start"
style="width: 200px"
type="datetime"
- :placeholder="$t('operatManage.operationLogObj.optionDate')"
+ :placeholder="$t('operatManage.operationLogObj.startTimeHolder')"
></el-date-picker>
</el-form-item>
<el-form-item
@@ -54,12 +57,13 @@
:label="$t('operatManage.operationLogObj.endTime')"
>
<el-date-picker
+ size="small"
format="yyyy-MM-dd HH:mm:ss"
value-format="yyyy-MM-dd HH:mm:ss"
v-model="sizeForm.end"
style="width: 200px"
type="datetime"
- :placeholder="$t('operatManage.operationLogObj.optionDate')"
+ :placeholder="$t('operatManage.operationLogObj.endTimeHolder')"
>
</el-date-picker>
</el-form-item>
@@ -85,9 +89,10 @@
</div>
</el-form>
</div>
+ <div class="dividing-line"></div>
<!-- 琛ㄦ牸鏄剧ず -->
<div class="table_box subpage_Div" :style="styleVar">
- <el-table :data="tableData" style="width: 100%" height="calc(100% - 57px)">
+ <el-table :data="tableData" style="width: 100%" height="calc(100% - 45px)">
<el-table-column
width="150"
type="index"
@@ -118,7 +123,7 @@
/>
</el-table>
<!-- 鍒嗛〉 -->
- <div style="margin-top: 25px" class="pagination_box">
+ <div style="margin-top: 10px" class="pagination_box">
<el-pagination
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
@@ -180,7 +185,8 @@
this.$nextTick(() => {
const rect = this.$refs.container.getBoundingClientRect();
this.tableHeight = `${rect.height + 97}px`;
- this.styleVar["height"] = `calc(100% - ${rect.height + 97}px)`;
+ this.styleVar["height"] = `calc(100% - ${rect.height + 30}px)`;
+ // this.styleVar["height"] = `calc(100% - ${rect.height + 97}px)`;
});
},
//鏍煎紡鍖栧垪琛�
@@ -305,16 +311,16 @@
.logLog_box {
height: 98%;
width: 98%;
- padding: 1%;
+ padding: 0.5% 1%;
.inquire {
-
- padding: 8px;
- margin-top: 20px;
+
+ padding: 0 8px;
+ //margin-top: 20px;
border-radius: 5px;
- margin-bottom: 20px;
+ //margin-bottom: 20px;
.el-form-item {
margin-bottom: 5px;
}
diff --git a/src/views/maintenance/menuSettings.vue b/src/views/maintenance/menuSettings.vue
index 5563ae1..1875e40 100644
--- a/src/views/maintenance/menuSettings.vue
+++ b/src/views/maintenance/menuSettings.vue
@@ -26,7 +26,7 @@
</div>
<div class="right_menu subpage_Div">
- <div style="display:flex;justify-content:space-between">
+ <div style="display:flex;justify-content:space-between;align-items: center;padding-bottom: 14px">
<el-breadcrumb separator="/">
<el-breadcrumb-item :to="{ path: '/' }">{{
$t('dataManage.dictionaryManageObj.particulars')
@@ -41,7 +41,7 @@
type="success"
icon="el-icon-plus"
size="small"
- >鏂板鍚岀骇</el-button>
+ >{{$t('operatManage.menuSetObj.insert')}}</el-button>
<el-button
v-if="menuStatus.insert"
:disabled="itemdetail.pid == null ? true : false"
@@ -49,7 +49,7 @@
type="success"
icon="el-icon-plus"
size="small"
- >鏂板瀛愮骇</el-button>
+ >{{$t('operatManage.menuSetObj.subInsert')}}</el-button>
<el-button
v-if="menuStatus.delete"
@click="setDelNode()"
@@ -57,7 +57,7 @@
type="danger"
icon="el-icon-delete"
size="small"
- >鍒犻櫎</el-button>
+ >{{$t('operatManage.menuSetObj.delete')}}</el-button>
<el-button
v-if="menuStatus.update"
:disabled="itemdetail.pid == null ? true : false"
@@ -65,7 +65,7 @@
type="info"
icon="el-icon-top"
size="small"
- >鍚戜笂绉诲姩</el-button>
+ >{{$t('operatManage.menuSetObj.moveUp')}}</el-button>
<el-button
v-if="menuStatus.update"
:disabled="itemdetail.pid == null ? true : false"
@@ -73,11 +73,12 @@
type="info"
icon="el-icon-bottom"
size="small"
- >鍚戜笅绉诲姩</el-button>
+ >{{$t('operatManage.menuSetObj.moveDown')}}</el-button>
</div>
</div>
- <el-divider />
+ <div class="dividing-line"></div>
+<!-- <el-divider />-->
<div class="form_box">
<el-form
:model="itemdetail"
@@ -93,6 +94,7 @@
<el-input
clear="el_input"
v-model="itemdetail.enName"
+ :placeholder="$t('operatManage.menuSetObj.enNameHolder')"
autocomplete="off"
></el-input>
</el-form-item>
@@ -103,6 +105,7 @@
>
<el-input
v-model="itemdetail.cnName"
+ :placeholder="$t('operatManage.menuSetObj.cnNameHolder')"
autocomplete="off"
></el-input>
</el-form-item>
@@ -112,6 +115,7 @@
>
<el-input
v-model="itemdetail.icon"
+ :placeholder="$t('operatManage.menuSetObj.iconHolder')"
autocomplete="off"
></el-input>
</el-form-item>
@@ -124,14 +128,16 @@
style="width: 400px"
:popper-append-to-body="false"
v-model="itemdetail.isShow"
- placeholder=""
+ :placeholder="$t('operatManage.menuSetObj.show')"
>
- <el-option
- v-for="item in options1"
- :key="item.value"
- :label="item.label"
- :value="item.value"
- >
+ <el-option :label="$t('operatManage.menuSetObj.hiddeen')" value="0" />
+ <el-option :label="$t('operatManage.menuSetObj.isshow')" value="1" />
+<!-- <el-option-->
+<!-- v-for="item in options1"-->
+<!-- :key="item.value"-->
+<!-- :label="item.label"-->
+<!-- :value="item.value"-->
+<!-- >-->
</el-option>
</el-select>
</el-form-item>
@@ -141,6 +147,7 @@
>
<el-input
v-model="itemdetail.url"
+ :placeholder="$t('operatManage.menuSetObj.menuUrlHolder')"
autocomplete="off"
></el-input>
</el-form-item>
@@ -150,6 +157,7 @@
>
<el-input
v-model="itemdetail.perms"
+ :placeholder="$t('operatManage.menuSetObj.permsHolder')"
autocomplete="off"
></el-input>
</el-form-item>
@@ -162,15 +170,18 @@
style="width: 400px"
:popper-append-to-body="false"
v-model="itemdetail.type"
- :placeholder="$t('common.choose')"
+ :placeholder="$t('operatManage.menuSetObj.typeHolder')"
>
- <el-option
- v-for="item in options2"
- :key="item.value"
- :label="item.label"
- :value="item.value"
- >
- </el-option>
+ <el-option :label="$t('operatManage.menuSetObj.rootpath')" value="0" />
+ <el-option :label="$t('operatManage.menuSetObj.menu')" value="1" />
+ <el-option :label="$t('operatManage.menuSetObj.button')" value="2" />
+<!-- <el-option-->
+<!-- v-for="item in options2"-->
+<!-- :key="item.value"-->
+<!-- :label="item.label"-->
+<!-- :value="item.value"-->
+<!-- >-->
+<!-- </el-option>-->
</el-select>
</el-form-item>
<el-form-item
@@ -180,10 +191,11 @@
<el-input
v-model="itemdetail.bak"
autocomplete="off"
+ :placeholder="$t('operatManage.menuSetObj.bakHolder')"
></el-input>
</el-form-item>
<div
- class="btnBox"
+ style="margin-left: 100px"
v-if="menuStatus.update"
>
<el-button
@@ -398,53 +410,54 @@
type: null,
bak: '',
},
- rules: {
+ rules : {
enName: [
- { required: true, message: '璇疯緭鍏ヨ嫳鏂囧悕绉�', trigger: 'blur' },
+ { required: true, message: this.$t('operatManage.menuSetObj.enNameHolder'), trigger: 'blur' },
],
cnName: [
- { required: true, message: '璇疯緭鍏ヤ腑鏂囧悕绉�', trigger: 'blur' },
+ { required: true, message: this.$t('operatManage.menuSetObj.cnNameHolder'), trigger: 'blur' },
],
isShow: [
{
required: true,
- message: '璇烽�夋嫨鏄惁鏄剧ず',
+ message: this.$t('operatManage.menuSetObj.show'),
trigger: 'change',
},
],
type: [
{
required: true,
- message: '璇烽�夋嫨鑺傜偣绫诲瀷',
+ message: this.$t('operatManage.menuSetObj.typeHolder'),
trigger: 'change',
},
],
},
- // 涓嬫媺鐨刼ption閲岄潰鐨剉alue瀹氫箟鎴�0,1锛屼笉鑳藉畾涔夋垚鈥�0鈥�,'1鈥欏瓧绗︿覆锛�
- // 濡傛灉瑕佸畾涔夋垚瀛楃涓诧紝鍚庡彴闇�瑕佽繑鍥炵殑涔熸槸瀛楃涓�
options1: [
{
value: 0,
- label: '闅愯棌',
+ label:this.$t('operatManage.menuSetObj.hiddeen')
},
{
value: 1,
- label: '鏄剧ず',
+ label:this.$t('operatManage.menuSetObj.isshow')
},
],
options2: [
{
value: 0,
- label: '鏍圭洰褰�',
+ label:this.$t('operatManage.menuSetObj.rootpath')
+ // label: '鏍圭洰褰�',
},
{
value: 1,
- label: '鑿滃崟',
+ label:this.$t('operatManage.menuSetObj.menu')
+ // label: '鑿滃崟',
},
{
value: 2,
- label: '鎸夐挳',
+ label:this.$t('operatManage.menuSetObj.button')
+ // label: '鎸夐挳',
},
],
newNode: null,
@@ -860,7 +873,7 @@
.menuSettings_box {
height: 98%;
width: 98%;
- padding: 1%;
+ padding: 0.5% 1%;
.cataLogContent {
width: 100%;
@@ -869,7 +882,8 @@
justify-content: space-between;
.left_Tree {
width: 15%;
- height: 91%;
+ //height: 91%;
+ height: 100%;
border-radius: 5px;
padding: 1%;
overflow-y: auto;
@@ -882,6 +896,7 @@
overflow: auto;
.form_box {
box-sizing: border-box;
+ padding-top: 20px;
width: 100%;
.el-input {
width: 400px;
@@ -897,4 +912,3 @@
right: 0;
}
</style>
-
\ No newline at end of file
diff --git a/src/views/maintenance/operationLog.vue b/src/views/maintenance/operationLog.vue
index d6b86c7..669de72 100644
--- a/src/views/maintenance/operationLog.vue
+++ b/src/views/maintenance/operationLog.vue
@@ -17,6 +17,7 @@
>
<el-input
style="width: 200px"
+ size="small"
v-model="sizeForm.uname"
:placeholder="$t('operatManage.operationLogObj.pleaseInput')"
/>
@@ -27,10 +28,11 @@
>
<el-select
style="width: 200px"
+ size="small"
:popper-append-to-body="false"
clearable
v-model="sizeForm.type"
- :placeholder="$t('operatManage.operationLogObj.pleaseSelect')"
+ :placeholder="$t('operatManage.operationLogObj.operationTypeHolder')"
>
<el-option
:label="$t('operatManage.operationLogObj.check')"
@@ -67,12 +69,13 @@
:label="$t('operatManage.operationLogObj.startTime')"
>
<el-date-picker
+ size="small"
format="yyyy-MM-dd HH:mm:ss"
value-format="yyyy-MM-dd HH:mm:ss"
v-model="sizeForm.start"
style="width: 200px"
type="datetime"
- :placeholder="$t('operatManage.operationLogObj.optionDate')"
+ :placeholder="$t('operatManage.operationLogObj.startTimeHolder')"
></el-date-picker>
</el-form-item>
<el-form-item
@@ -80,12 +83,13 @@
:label="$t('operatManage.operationLogObj.endTime')"
>
<el-date-picker
+ size="small"
format="yyyy-MM-dd HH:mm:ss"
value-format="yyyy-MM-dd HH:mm:ss"
v-model="sizeForm.end"
style="width: 200px"
type="datetime"
- :placeholder="$t('operatManage.operationLogObj.optionDate')"
+ :placeholder="$t('operatManage.operationLogObj.endTimeHolder')"
>
</el-date-picker>
</el-form-item>
@@ -111,11 +115,12 @@
</div>
</el-form>
</div>
+ <div class="dividing-line"></div>
<div class="table_box subpage_Div" :style="styleVar">
<el-table
:data="tableData"
style="width: 100%"
- height="calc(100% - 57px)"
+ height="calc(100% - 45px)"
>
<!-- <el-table-column type="selection" width="55" /> -->
<el-table-column
@@ -174,7 +179,7 @@
</template>
</el-table-column> -->
</el-table>
- <div class="pagination_box">
+ <div class="pagination_box" style="margin-top: 10px">
<el-pagination
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
@@ -232,7 +237,7 @@
this.$nextTick(() => {
const rect = this.$refs.container.getBoundingClientRect();
this.tableHeight = `${rect.height + 97}px`;
- this.styleVar["height"] = `calc(100% - ${rect.height + 97}px)`;
+ this.styleVar["height"] = `calc(100% - ${rect.height + 30}px)`;
});
},
//鏍煎紡鍖栨椂闂�
@@ -340,15 +345,15 @@
.operationLog_box {
height: 98%;
width: 98%;
- padding: 1%;
+ padding: 0.5% 1%;
.inquire {
- padding: 8px;
- margin-top: 20px;
+ padding: 0 8px;
+ //margin-top: 20px;
border-radius: 5px;
- margin-bottom: 20px;
+ //margin-bottom: 20px;
.el-form-item {
margin: 5px;
}
diff --git a/src/views/maintenance/parameterConfiguration.vue b/src/views/maintenance/parameterConfiguration.vue
index c1fd404..06ed014 100644
--- a/src/views/maintenance/parameterConfiguration.vue
+++ b/src/views/maintenance/parameterConfiguration.vue
@@ -12,7 +12,7 @@
ref="filterTable"
:data="tableData"
style="width: 100%"
- height="calc(100% - 57px)"
+ height="calc(100% - 45px)"
>
<el-table-column
align="center"
@@ -67,7 +67,7 @@
</template>
</el-table-column>
</el-table>
- <div class="pagination_box">
+ <div class="pagination_box" style="margin-top: 10px">
<el-pagination
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
@@ -168,7 +168,7 @@
tableHeight: 0,
timer: 0,
styleVar: {
- height: "calc(100% - 75px)",
+ height: "calc(100% - 30px)",
},
};
},
@@ -262,7 +262,7 @@
.parameterConfiguration_box {
height: 98%;
width: 98%;
- padding: 1%;
+ padding: 0.5% 1%;
.parameterConfiguration {
padding-top: 10px;
diff --git a/src/views/maintenance/tokentool.vue b/src/views/maintenance/tokentool.vue
index 1232b8e..f21ed35 100644
--- a/src/views/maintenance/tokentool.vue
+++ b/src/views/maintenance/tokentool.vue
@@ -17,17 +17,19 @@
>
<el-input
style="width: 200px"
+ size="small"
v-model="ruleForm.name"
- :placeholder="$t('common.pleaseInput')"
+ :placeholder="$t('operatManage.tokentoolObj.tokenHolder')"
/>
</el-form-item>
<el-form-item :label="$t('operatManage.tokentoolObj.tokenStatus')">
<el-select
style="width: 200px"
+ size="small"
:popper-append-to-body="false"
v-model="ruleForm.value"
- :placeholder="$t('common.choose')"
+ :placeholder="$t('operatManage.tokentoolObj.tokenStatusHolder')"
>
<el-option
value="0"
@@ -78,39 +80,40 @@
</div>
</el-form>
</div>
+ <div class="dividing-line"></div>
<div class="table_box" :style="styleVar">
<el-table
ref="filterTable"
:data="tableData"
style="width: 100%"
- height="calc(100% - 57px)"
+ height="calc(100% - 45px)"
>
<el-table-column type="selection" width="55" />
<el-table-column
width="70"
-
+
type="index"
:label="$t('operatManage.tokentoolObj.index')"
/>
<el-table-column
prop="token"
-
+
:label="$t('operatManage.tokentoolObj.token')"
/>
<el-table-column
prop="duration"
-
+
:label="$t('operatManage.tokentoolObj.duration')"
/>
<el-table-column
prop="expire"
-
+
:label="$t('operatManage.tokentoolObj.expire')"
:formatter="formatTime"
/>
<el-table-column
prop="type"
-
+
:label="$t('operatManage.tokentoolObj.type')"
>
<template slot-scope="scope">
@@ -120,28 +123,28 @@
</el-table-column>
<el-table-column
prop="ip"
-
+
:label="$t('operatManage.tokentoolObj.ip')"
/>
<el-table-column
prop="createUser"
-
+
:label="$t('operatManage.tokentoolObj.createUser')"
/>
<el-table-column
prop="createTime"
-
+
:label="$t('operatManage.tokentoolObj.createTime')"
:formatter="formatTime"
/>
<el-table-column
prop="updateUser"
-
+
:label="$t('operatManage.tokentoolObj.updateUser')"
/>
<el-table-column
prop="updateTime"
-
+
:label="$t('operatManage.tokentoolObj.updateTime')"
:formatter="formatTime"
/>
@@ -149,7 +152,7 @@
fixed="right"
:label="$t('operatManage.tokentoolObj.operation')"
width="220"
-
+
>
<template slot-scope="scope">
<el-button type="danger" size="small" plain>{{
@@ -169,7 +172,7 @@
</template>
</el-table-column>
</el-table>
- <div style="margin-top: 25px">
+ <div style="margin-top: 10px">
<el-pagination
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
@@ -399,7 +402,7 @@
this.$nextTick(() => {
const rect = this.$refs.container.getBoundingClientRect();
this.tableHeight = `${rect.height + 97}px`;
- this.styleVar["height"] = `calc(100% - ${rect.height + 97}px)`;
+ this.styleVar["height"] = `calc(100% - ${rect.height + 30}px)`;
});
},
showPermsMenu(res) {
@@ -645,26 +648,26 @@
},
};
</script>
-
+
<style lang="less" scoped>
//@import url(); 寮曞叆鍏叡css绫�
.tokentool_box {
height: 98%;
width: 98%;
- padding: 1%;
+ padding: 0.5% 1%;
.el-input {
width: 300px;
}
.inquire {
- padding: 8px;
- margin-top: 20px;
+ padding: 0 8px;
+ //margin-top: 20px;
border-radius: 5px;
- margin-bottom: 20px;
+ //margin-bottom: 20px;
.el-form-item {
margin: 5px;
}
diff --git a/src/views/userManage/authorityManage.vue b/src/views/userManage/authorityManage.vue
index 3dbbfcb..31908d0 100644
--- a/src/views/userManage/authorityManage.vue
+++ b/src/views/userManage/authorityManage.vue
@@ -13,8 +13,10 @@
>
<div class="flex_box">
<div style="margin-right: auto">
- <el-form-item label="鍚嶇О">
- <el-input v-model="ruleForm.name" style="width:200px"></el-input>
+ <el-form-item :label="$t('userManage.authorityM.name')">
+ <el-input v-model="ruleForm.name" style="width:200px" size="small" :placeholder="$t('userManage.authorityM.nameHolder')">
+ <i slot="suffix" class="el-icon-search" @click="submitForm"></i>
+ </el-input>
</el-form-item>
</div>
<div>
@@ -46,17 +48,18 @@
</el-form-item>
</div>
</div>
-
-
-
+
+
+
</el-form>
</div>
+ <div class="dividing-line"></div>
<div class="table_box subpage_Div" :style="styleVar">
<el-table
:data="tableData"
style="width: 100%"
fit
- height="calc(100% - 57px)"
+ height="calc(100% - 45px)"
@selection-change="handleSelectionChange"
>
<el-table-column
@@ -114,7 +117,7 @@
>
</el-table-column>
<el-table-column
-
+
:label="$t('common.operate')"
width="170px"
>
@@ -135,7 +138,7 @@
</template>
</el-table-column>
</el-table>
- <div class="pagination_box">
+ <div class="pagination_box" style="margin-top: 10px">
<el-pagination
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
@@ -151,7 +154,7 @@
<div class="infoBox_box" v-show="showinfoBox">
<div
class="infoBox subpage_Div box_div"
-
+
>
<el-card class="box-card">
<div
@@ -241,7 +244,7 @@
:visible.sync="InsertFormdialog"
top="2vh"
>
-
+
<el-form :model="insertform" label-position="top">
<el-form-item
:label="$t('userManage.userInfoObj.name')"
@@ -274,7 +277,7 @@
></el-input>
</el-form-item>
</el-form>
-
+
<div
slot="footer"
class="dialog-footer"
@@ -413,7 +416,8 @@
this.$nextTick(() => {
const rect = this.$refs.container.getBoundingClientRect();
this.tableHeight = `${rect.height + 97}px`;
- this.styleVar["height"] = `calc(100% - ${rect.height + 97}px)`;
+ // this.styleVar["height"] = `calc(100% - ${rect.height + 97}px)`;
+ this.styleVar["height"] = `calc(100% - ${rect.height + 30}px)`;
});
},
showPermsMenu(res) {
@@ -583,22 +587,21 @@
.power_box {
height: 98%;
width: 98%;
- padding: 1%;
+ padding: 0.5%;
.el-input {
width: 300px;
}
.power_quire {
- padding: 8px;
- margin-top: 20px;
+ //padding: 10px;
+ //margin-top: 20px;
border-radius: 5px;
- margin-bottom: 20px;
+ //margin-bottom: 20px;
.el-form-item {
margin: 5px;
}
}
}
</style>
-
\ No newline at end of file
diff --git a/src/views/userManage/orgManage.vue b/src/views/userManage/orgManage.vue
index c755796..89735f7 100644
--- a/src/views/userManage/orgManage.vue
+++ b/src/views/userManage/orgManage.vue
@@ -20,13 +20,13 @@
</el-tree>
</div>
</div>
- <div style="width: 80%;border: 1px solid #dcdfe6;
+ <div style="width: 80%;
width: 80%;
- height: 91%;
+ height: 100%;
border-radius: 5px;
padding: 1%;
overflow: auto;">
- <div style="display:flex;justify-content:space-between">
+ <div style="display:flex;justify-content:space-between;align-items: center">
<el-breadcrumb separator="/">
<el-breadcrumb-item :to="{ path: '/' }">{{
$t('dataManage.dictionaryManageObj.particulars')
@@ -41,7 +41,7 @@
type="success"
icon="el-icon-plus"
size="small"
- >鏂板鍚岀骇</el-button>
+ >{{$t('operatManage.menuSetObj.insert')}}</el-button>
<el-button
v-if="menuStatus.insert"
:disabled="itemdetail.pid == null ? true : false"
@@ -49,7 +49,7 @@
type="success"
icon="el-icon-plus"
size="small"
- >鏂板瀛愮骇</el-button>
+ >{{$t('operatManage.menuSetObj.subInsert')}}</el-button>
<el-button
v-if="menuStatus.delete"
@click="setDelNode()"
@@ -57,7 +57,7 @@
type="danger"
icon="el-icon-delete"
size="small"
- >鍒犻櫎</el-button>
+ >{{$t('operatManage.menuSetObj.delete')}}</el-button>
<el-button
v-if="menuStatus.update"
:disabled="itemdetail.pid == null ? true : false"
@@ -65,7 +65,7 @@
type="info"
icon="el-icon-top"
size="small"
- >鍚戜笂绉诲姩</el-button>
+ >{{$t('operatManage.menuSetObj.moveUp')}}</el-button>
<el-button
v-if="menuStatus.update"
:disabled="itemdetail.pid == null ? true : false"
@@ -73,11 +73,12 @@
type="info"
icon="el-icon-bottom"
size="small"
- >鍚戜笅绉诲姩</el-button>
+ >{{$t('operatManage.menuSetObj.moveDown')}}</el-button>
</div>
</div>
+ <div class="dividing-line" style="margin-top: 20px"></div>
<div class="form_box">
- <el-divider class="eldivider" />
+<!-- <el-divider class="eldivider" />-->
<el-form
style="margin-top: 25px; position: relative;"
:model="itemdetail"
@@ -92,6 +93,7 @@
v-model="itemdetail.name"
autocomplete="off"
style="max-width: 400px;"
+ :placeholder="$t('userManage.orgManageObj.nameHolder')"
></el-input>
</el-form-item>
<el-form-item
@@ -101,6 +103,7 @@
<el-input
v-model="itemdetail.sname"
autocomplete="off"
+ :placeholder="$t('userManage.orgManageObj.abbreviationHolder')"
style="max-width: 400px;"
></el-input>
</el-form-item>
@@ -120,9 +123,9 @@
:label-width="formLabelWidth"
>
<el-input
-
v-model="itemdetail.uncode"
autocomplete="off"
+ :placeholder="$t('userManage.orgManageObj.organizationCodeHolder')"
style="max-width: 400px;"
></el-input>
</el-form-item>
@@ -133,6 +136,7 @@
<el-input
v-model="itemdetail.addr"
autocomplete="off"
+ :placeholder="$t('userManage.orgManageObj.cmpanyAddressHolder')"
style="max-width: 400px;"
></el-input>
</el-form-item>
@@ -143,6 +147,7 @@
<el-input
v-model="itemdetail.contact"
autocomplete="off"
+ :placeholder="$t('userManage.orgManageObj.continformationHolder')"
style="max-width: 400px;"
></el-input>
</el-form-item>
@@ -152,6 +157,7 @@
>
<el-input
v-model="itemdetail.fax"
+ :placeholder="$t('userManage.orgManageObj.faxHolder')"
autocomplete="off"
style="max-width: 400px;"
></el-input>
@@ -162,6 +168,7 @@
>
<el-input
v-model="itemdetail.email"
+ :placeholder="$t('userManage.orgManageObj.EMailHolder')"
autocomplete="off"
style="max-width: 400px;"
></el-input>
@@ -172,6 +179,7 @@
>
<el-input
v-model="itemdetail.post"
+ :placeholder="$t('userManage.orgManageObj.postalCodeHolder')"
autocomplete="off"
style="max-width: 400px;"
></el-input>
@@ -182,6 +190,7 @@
>
<el-input
v-model="itemdetail.website"
+ :placeholder="$t('userManage.orgManageObj.WebsiteAddressHolder')"
autocomplete="off"
style="max-width: 400px;"
></el-input>
@@ -193,6 +202,7 @@
<el-input
v-model="itemdetail.bak"
autocomplete="off"
+ :placeholder="$t('userManage.orgManageObj.remarksHolder')"
style="max-width: 400px;"
></el-input>
</el-form-item>
@@ -219,7 +229,7 @@
</div>
<el-dialog
-
+
top="2vh"
:title="$t('common.append')"
:visible.sync="dialogFormVisible"
@@ -461,7 +471,7 @@
this.$refs.tree.setCurrentKey(this.itemdetail.id);
});
}
-
+
} else {
this.$notify.error({
title: res.code,
@@ -874,7 +884,7 @@
.menuSettings_box {
height: 98%;
width: 98%;
- padding: 1%;
+ padding:0.5% 1%;
.cataLogContent {
width: 100%;
@@ -904,9 +914,9 @@
}
}
.btnBox{
-
- position: absolute;
- bottom: 0;
- right: 0;
+ margin-left: 150px;
+ //position: absolute;
+ //bottom: 0;
+ //right: 0;
}
</style>
diff --git a/src/views/userManage/resourceManage.vue b/src/views/userManage/resourceManage.vue
index 3b083e2..af175d2 100644
--- a/src/views/userManage/resourceManage.vue
+++ b/src/views/userManage/resourceManage.vue
@@ -13,7 +13,9 @@
>
<div class="flex_box">
<el-form-item :label="$t('userManage.resManageObj.name')" style="margin-right: auto">
- <el-input v-model="ruleForm.name" style="width:200px"></el-input>
+ <el-input v-model="ruleForm.name" size="small" style="width:200px" :placeholder="$t('userManage.resManageObj.nameHolder')">
+ <i slot="suffix" class="el-icon-search" @click="submitForm"></i>
+ </el-input>
</el-form-item>
<el-form-item>
<el-button
@@ -45,16 +47,17 @@
>{{ $t('common.empty') }}</el-button>
</el-form-item>
</div>
-
+
</el-form>
</div>
+ <div class="dividing-line"></div>
<div class="table_box" :style="styleVar">
<el-table
:data="tableData"
style="width: 100%"
fit
@selection-change="handleSelectionChange"
- height="calc(100% - 57px)"
+ height="calc(100% - 45px)"
>
<el-table-column
type="selection"
@@ -110,7 +113,7 @@
>
</el-table-column>
<el-table-column
-
+
:label="$t('common.operate')"
width="170px"
>
@@ -131,7 +134,7 @@
</template>
</el-table-column>
</el-table>
- <div class="pagination_box">
+ <div class="pagination_box" style="margin-top: 10px">
<el-pagination
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
@@ -147,7 +150,7 @@
<div class="infoBox_box" v-show="showinfoBox">
<div
class="infoBox box_div "
-
+
>
<div
slot="header"
@@ -384,9 +387,9 @@
autocomplete="off"
style="width:100%"
></el-input>
-
+
</div>
-
+
<div class="BoxFlexbutton">
<input
name="file1"
@@ -410,8 +413,8 @@
><i class="el-icon-upload2"></i></el-link>
</div>
</div>
-
-
+
+
</el-form-item>
<el-form-item
:label="$t('userManage.resManageObj.bak')"
@@ -447,7 +450,7 @@
</el-dialog>
<el-dialog
:title="$t('userManage.userInfoObj.editPermission')"
-
+
:visible.sync="EditFormdialog"
:before-close="EditFromDataClose"
top="2vh"
@@ -576,7 +579,7 @@
disabled
autocomplete="off"
style="width:100%"
-
+
></el-input>
</div>
<div class="BoxFlexbutton">
@@ -791,7 +794,8 @@
this.$nextTick(() => {
const rect = this.$refs.container.getBoundingClientRect();
this.tableHeight = `${rect.height + 97}px`;
- this.styleVar["height"] = `calc(100% - ${rect.height + 97}px)`;
+ // this.styleVar["height"] = `calc(100% - ${rect.height + 97}px)`;
+ this.styleVar["height"] = `calc(100% - ${rect.height + 30}px)`;
});
},
handleEditDepList(data, node, nodeData) {
@@ -1118,20 +1122,20 @@
.power_box {
height: 98%;
width: 98%;
- padding: 1%;
+ padding: 0.5%;
.el-input {
width: 730px;
}
.power_quire {
- padding: 8px;
+ //padding: 10px;
- margin-top: 20px;
+ //margin-top: 20px;
border-radius: 5px;
- margin-bottom: 20px;
+ //margin-bottom: 20px;
.el-form-item {
margin: 5px;
}
@@ -1161,4 +1165,3 @@
}
}
</style>
-
\ No newline at end of file
diff --git a/src/views/userManage/roleManage.vue b/src/views/userManage/roleManage.vue
index ff9bb64..3b1d366 100644
--- a/src/views/userManage/roleManage.vue
+++ b/src/views/userManage/roleManage.vue
@@ -22,8 +22,12 @@
>
<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')"
@@ -31,8 +35,9 @@
>
<el-select
:popper-append-to-body="false"
+ size="small"
v-model="roleForm.depValue"
- placeholder="璇烽�夋嫨"
+ :placeholder="$t('userManage.RM.ownedSystemHolder')"
style="width: 200px"
>
<el-option
@@ -145,6 +150,7 @@
</el-form-item> -->
</el-form>
</div>
+ <div class="dividing-line"></div>
<div
class="table_box subpage_Div"
:style="styleVar"
@@ -152,7 +158,7 @@
<el-table
:data="tableData"
style="width: 100%"
- height="calc(100% - 57px)"
+ height="calc(100% - 45px)"
@selection-change="handleSelectionChange"
>
<el-table-column
@@ -244,12 +250,12 @@
size="small"
plain
>{{ $t("common.update") }}</el-button>
-
+
</template>
</el-table-column>
</el-table>
<div
- style="margin-top: 25px"
+ style="margin-top: 10px"
class="pagination_box"
>
<el-pagination
@@ -509,7 +515,7 @@
<div class="infoBox_box" v-show="showinfoBox">
<div
class="infoBox box_div subpage_Div"
-
+
>
<div
slot="header"
@@ -660,7 +666,8 @@
this.$nextTick(() => {
const rect = this.$refs.container.getBoundingClientRect();
this.tableHeight = `${rect.height + 97}px`;
- this.styleVar["height"] = `calc(100% - ${rect.height + 97}px)`;
+ // this.styleVar["height"] = `calc(100% - ${rect.height + 97}px)`;
+ this.styleVar["height"] = `calc(100% - ${rect.height + 30}px)`;
});
},
handleRouleDepList(data, node, nodeData) {
@@ -945,7 +952,7 @@
.logLog_box {
height: 98%;
width: 98%;
- padding: 1%;
+ padding: 0.5%;
.el-input {
width: 300px;
@@ -971,12 +978,12 @@
.inquire {
height: auto;
- padding: 8px;
- margin-top: 20px;
+ //padding: 8px;
+ //margin-top: 20px;
border-radius: 5px;
- margin-bottom: 20px;
+ //margin-bottom: 20px;
// width: calc(100% - 22px);
.el-form-item {
diff --git a/src/views/userManage/templateManage.vue b/src/views/userManage/templateManage.vue
index 44e3b77..3414cb9 100644
--- a/src/views/userManage/templateManage.vue
+++ b/src/views/userManage/templateManage.vue
@@ -13,12 +13,15 @@
>
<div class="flex_box">
<div style="margin-right: auto">
- <el-form-item label="鍚嶇О">
+ <el-form-item :label="$t('userManage.authorityM.name')">
<el-input
style="width:200px"
- v-model="ruleForm.name"
-
- />
+ size="small"
+ v-model="ruleForm.name"
+ :placeholder="$t('userManage.authorityM.nameHolder')"
+ >
+ <i slot="suffix" class="el-icon-search" @click="setRefreshTable"></i>
+ </el-input>
</el-form-item>
</div>
<div>
@@ -58,17 +61,18 @@
</el-form-item>
</div>
</div>
-
-
-
+
+
+
</el-form>
</div>
+ <div class="dividing-line"></div>
<div class="table_box" :style="styleVar">
<el-table
:data="tableData"
style="width: 100%"
@selection-change="handleSelectionChange"
- height="calc(100% - 57px)"
+ height="calc(100% - 45px)"
>
<el-table-column
type="selection"
@@ -151,7 +155,7 @@
</template>
</el-table-column>
</el-table>
- <div style="margin-top:25px">
+ <div style="margin-top:10px">
<el-pagination
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
@@ -305,7 +309,7 @@
<div class="infoBox_box" v-show="showinfoBox">
<div
class="infoBox subpage_Div box_div"
-
+
>
<div
@@ -472,7 +476,8 @@
this.$nextTick(() => {
const rect = this.$refs.container.getBoundingClientRect();
this.tableHeight = `${rect.height + 97}px`;
- this.styleVar["height"] = `calc(100% - ${rect.height + 97}px)`;
+ this.styleVar["height"] = `calc(100% - ${rect.height + 30}px)`;
+ // this.styleVar["height"] = `calc(100% - ${rect.height + 97}px)`;
});
},
//淇敼鍙栨秷
@@ -758,19 +763,19 @@
.authorityManagement_box {
height: 98%;
width: 98%;
- padding: 1%;
+ padding: 0.5%;
.el-input {
width: 730px;
}
.searchComp {
- padding: 8px;
- margin-top: 20px;
+ //padding: 8px;
+ //margin-top: 20px;
border-radius: 5px;
- margin-bottom: 20px;
+ //margin-bottom: 20px;
.el-form-item {
margin: 5px;
--
Gitblit v1.9.3