From 462782f4b2ce653e84260ca586a58c8627c4ac9c Mon Sep 17 00:00:00 2001
From: Surpriseplus <845948745@qq.com>
Date: 星期五, 18 十一月 2022 13:55:22 +0800
Subject: [PATCH] 1
---
src/views/maintenance/eventlogManage.vue | 18 +
src/views/maintenance/tokentool.vue | 44 ++-
src/store/index.js | 8
src/views/AuthorizationManagement/userRoleAuthorization.vue | 10
src/views/AuthorizationManagement/roleResAuthorization.vue | 17 +
src/views/maintenance/userManagement.vue | 81 +++++--
src/views/AuthorizationManagement/roleMenuAuthorization.vue | 24 +
src/views/userManage/authorityManage.vue | 18 +
src/api/api.js | 2
src/assets/lang/zh.js | 8
src/views/AuthorizationManagement/menuRoleAuthorization.vue | 16 +
src/views/maintenance/parameterConfiguration.vue | 10
src/views/maintenance/blackwhiteList.vue | 20 +-
public/config/config.js | 1
src/views/userManage/orgManage.vue | 45 +---
src/views/maintenance/operationLog.vue | 18 +
src/assets/lang/en.js | 8
src/views/maintenance/menuSettings.vue | 39 +--
src/components/navMenu.vue | 17 +
src/views/userManage/resourceManage.vue | 31 +-
src/views/userManage/roleManage.vue | 90 ++++++--
src/views/maintenance/logLog.vue | 18 +
22 files changed, 331 insertions(+), 212 deletions(-)
diff --git a/public/config/config.js b/public/config/config.js
index 5dbf376..f71ceb2 100644
--- a/public/config/config.js
+++ b/public/config/config.js
@@ -1,6 +1,7 @@
//const BASE_URL = 'http://192.168.20.55:12316';
//var socketUrl = 'ws://192.168.20.55:12316/ws/select';
const BASE_URL = 'http://192.168.20.39:12316';
+// const BASE_URL = 'http://192.168.20.106:12316';
//webSocket 鏈嶅姟鍦板潃
var socketUrl = 'ws://192.168.20.39:12316/ws/select';
diff --git a/src/api/api.js b/src/api/api.js
index d4bc4de..18b44c2 100644
--- a/src/api/api.js
+++ b/src/api/api.js
@@ -381,7 +381,7 @@
}
//浠ょ墝绠＄悊鍒犻櫎
export function deleteTokens(params) {
- return request.get(' /token/deleteTokens', { params: params });
+ return request.get('/token/deleteTokens', { params: params });
}
//浠ょ墝绠＄悊淇敼
export function updateToken(params) {
diff --git a/src/assets/lang/en.js b/src/assets/lang/en.js
index fcebd65..ac00e23 100644
--- a/src/assets/lang/en.js
+++ b/src/assets/lang/en.js
@@ -24,6 +24,11 @@
changepassWord: 'Batch password modification',
reset: 'Reset',
submit: 'Submit',
+ logout: 'logout',
+ NPassword: 'New Password',
+ SPassword: 'Confirm Password',
+
+ AdminPassword: 'Administrator Password',
},
dataManage: {
dataManage: 'Data Manage',
@@ -132,6 +137,7 @@
delete: 'delete',
serialNumber: 'serial Number',
name: 'name',
+ menuTable: 'Menu Table',
PermissionTable: 'Permission table',
server: 'Service Address',
ResTable: 'Resource table',
@@ -281,7 +287,7 @@
invalid: 'Invalid',
index: 'Index',
token: 'Token',
- duration: 'Usage time',
+ duration: 'Usage time (min)',
expire: 'Expiration time',
type: 'Type',
ip: 'IP address',
diff --git a/src/assets/lang/zh.js b/src/assets/lang/zh.js
index 48b011e..32e1ea0 100644
--- a/src/assets/lang/zh.js
+++ b/src/assets/lang/zh.js
@@ -24,6 +24,11 @@
changepassWord: '鎵归噺淇敼瀵嗙爜',
reset: '閲嶇疆',
submit: '鎻愪氦',
+ logout: '娉ㄩ攢',
+
+ NPassword: '鏂板瘑鐮�',
+ SPassword: '纭瀵嗙爜',
+ AdminPassword: '绠＄悊鍛樺瘑鐮�',
},
dataManage: {
dataManage: '鏁版嵁绠＄悊',
@@ -135,6 +140,7 @@
serialNumber: '缂栧彿',
name: '鍚嶇О',
PermissionTable: '鏉冮檺琛�',
+ menuTable: '鑿滃崟琛�',
server: '鏈嶅姟鍦板潃',
ResTable: '璧勬簮琛�',
},
@@ -280,7 +286,7 @@
invalid: '澶辨晥',
index: '搴忓彿',
token: '浠ょ墝',
- duration: '浣跨敤鏃堕棿',
+ duration: '浣跨敤鏃堕棿(鍒嗛挓)',
expire: '澶辨晥鏃堕棿',
type: '绫诲瀷',
ip: 'IP鍦板潃',
diff --git a/src/components/navMenu.vue b/src/components/navMenu.vue
index d8f3837..72dd61a 100644
--- a/src/components/navMenu.vue
+++ b/src/components/navMenu.vue
@@ -29,7 +29,10 @@
<div class="rightUser">
<div @click="logOut" class="topdiv topUser">
<div class="userImage user1"></div>
- <div class="userText"><span>admin</span>娉ㄩ攢</div>
+ <div class="userText">
+ <span>{{ this.$store.state.uname }}</span>
+ <el-link class="elLink">{{ $t('common.logout') }}</el-link>
+ </div>
</div>
<div @click="switchLang" class="topdiv botLingo">
<div class="userImage user2"></div>
@@ -414,6 +417,7 @@
}
.userText {
font-size: 15px;
+ width: 150px;
font-family: Microsoft YaHei;
font-weight: 400;
color: #ffffff;
@@ -466,5 +470,16 @@
-webkit-text-fill-color: transparent;
}
}
+ .elLink {
+ margin-left: 5px;
+ font-size: 15px;
+ margin-bottom: 4px;
+ }
+ /deep/.el-link.el-link--default:hover {
+ color: #409eff !important;
+ }
+ /deep/ .el-link.el-link--default {
+ color: white !important;
+ }
}
</style>
diff --git a/src/store/index.js b/src/store/index.js
index 12d743c..dce886f 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -40,6 +40,8 @@
//涓婚鍒囨崲
theme: variables.theme,
+ //鐧诲綍鐢ㄦ埛鍚�
+ uname: null,
},
mutations: {
//鑾峰彇鏉冮檺鍚堥泦
@@ -105,10 +107,12 @@
}
}
},
+ SET_UNAME(state, name) {
+ state.uname = name;
+ },
SET_TOKEN(state, token) {
state.token = token;
},
-
SET_KEY(state, key) {
state.key = key;
},
@@ -137,6 +141,8 @@
duration: 5 * 1000,
});
}
+
+ commit('SET_UNAME', data.result.uname);
commit('SET_TOKEN', data.result.token);
setToken(data.result.token);
resolve(data);
diff --git a/src/views/AuthorizationManagement/menuRoleAuthorization.vue b/src/views/AuthorizationManagement/menuRoleAuthorization.vue
index 36f9d76..663a27a 100644
--- a/src/views/AuthorizationManagement/menuRoleAuthorization.vue
+++ b/src/views/AuthorizationManagement/menuRoleAuthorization.vue
@@ -13,7 +13,7 @@
<el-tree
:data="depList"
:props="defaultProps"
- :show-checkbox="true"
+ :show-checkbox="false"
:check-on-click-node="true"
:check-strictly="true"
node-key="id"
@@ -72,7 +72,7 @@
<el-table
:data="tableData"
style="width: 100%"
- height="80%"
+ height="84%"
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" width="55"> </el-table-column>
@@ -80,6 +80,7 @@
align="center"
type="index"
:label="$t('dataManage.styleObj.index')"
+ width="55"
/>
<el-table-column
prop="authName"
@@ -189,9 +190,11 @@
<el-button @click="dialogTableVisible = false">{{
$t('dataManage.dictionaryManageObj.cancel')
}}</el-button>
- <el-button type="primary" @click="addConfirm">{{
- $t('dataManage.dictionaryManageObj.confirm')
- }}</el-button>
+ <el-button
+ style="background: #409eff; border: 1px solid #409eff; color: white"
+ @click="addConfirm"
+ >{{ $t('dataManage.dictionaryManageObj.confirm') }}</el-button
+ >
</div>
</el-dialog>
</div>
@@ -588,6 +591,9 @@
background-color: #216fe6;
}
}
+ .divider {
+ margin-top: 8px;
+ }
}
</style>
<style>
diff --git a/src/views/AuthorizationManagement/roleMenuAuthorization.vue b/src/views/AuthorizationManagement/roleMenuAuthorization.vue
index 85c69ce..3e59c8a 100644
--- a/src/views/AuthorizationManagement/roleMenuAuthorization.vue
+++ b/src/views/AuthorizationManagement/roleMenuAuthorization.vue
@@ -83,9 +83,7 @@
"
>
<span>
- {{
- $t('operatManage.UserRoleAuthorizationObj.PermissionTable')
- }}</span
+ {{ $t('operatManage.UserRoleAuthorizationObj.menuTable') }}</span
>
</div>
<el-divider />
@@ -93,7 +91,7 @@
<el-tree
:data="menuList"
:props="defaultMenuProps"
- :show-checkbox="true"
+ :show-checkbox="false"
:check-on-click-node="true"
:check-strictly="true"
node-key="id"
@@ -154,7 +152,7 @@
:data="menuTableData"
stripe
style="width: 100%"
- height="80%"
+ height="84%"
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" width="55"> </el-table-column>
@@ -391,9 +389,11 @@
<el-button @click="dialogTableVisible = false">{{
$t('dataManage.dictionaryManageObj.cancel')
}}</el-button>
- <el-button type="primary" @click="addConfirm">{{
- $t('dataManage.dictionaryManageObj.confirm')
- }}</el-button>
+ <el-button
+ style="background: #409eff; border: 1px solid #409eff; color: white"
+ @click="addConfirm"
+ >{{ $t('dataManage.dictionaryManageObj.confirm') }}</el-button
+ >
</div>
</el-dialog>
</div>
@@ -500,6 +500,7 @@
},
menuTreeCheck(node, list) {
if (list.checkedNodes.length > 0) {
+ if (this.roleid == null) return;
this.rolMenuListData.menuid = node.id;
this.menuid = node.id;
this.rolMenuListData.roleid = this.roleid;
@@ -540,8 +541,12 @@
this.addcount = data.count;
},
singleElection(row) {
+ this.getMenuTree();
+ this.menuTableData = [];
+ this.roleMenuCount = 0;
this.templateSelection = row.id;
this.roleid = row.id;
+
this.roleDepCheckList = this.tableData.filter(
(item) => item.id === row.id
);
@@ -847,6 +852,9 @@
/deep/.el-dialog__title {
color: white;
}
+ .divider {
+ margin-top: 8px;
+ }
}
</style>
<style>
diff --git a/src/views/AuthorizationManagement/roleResAuthorization.vue b/src/views/AuthorizationManagement/roleResAuthorization.vue
index 276282a..7cb2d88 100644
--- a/src/views/AuthorizationManagement/roleResAuthorization.vue
+++ b/src/views/AuthorizationManagement/roleResAuthorization.vue
@@ -13,7 +13,7 @@
<el-tree
:data="depList"
:props="defaultProps"
- :show-checkbox="true"
+ :show-checkbox="false"
:check-on-click-node="true"
:check-strictly="true"
node-key="id"
@@ -126,13 +126,13 @@
>
</div>
</div>
- <el-divider />
+ <el-divider class="divider" />
<el-table
:data="usertableData"
stripe
style="width: 100%"
- height="82%"
+ height="84%"
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" width="55"> </el-table-column>
@@ -381,9 +381,11 @@
<el-button @click="dialogTableVisible = false">{{
$t('dataManage.dictionaryManageObj.cancel')
}}</el-button>
- <el-button type="primary" @click="addConfirm">{{
- $t('dataManage.dictionaryManageObj.confirm')
- }}</el-button>
+ <el-button
+ style="background: #409eff; border: 1px solid #409eff; color: white"
+ @click="addConfirm"
+ >{{ $t('dataManage.dictionaryManageObj.confirm') }}</el-button
+ >
</div>
</el-dialog>
</div>
@@ -725,6 +727,9 @@
}
}
}
+ .divider {
+ margin-top: 8px;
+ }
}
/deep/ .el-table {
background-color: transparent;
diff --git a/src/views/AuthorizationManagement/userRoleAuthorization.vue b/src/views/AuthorizationManagement/userRoleAuthorization.vue
index 9fa62a3..57dcb91 100644
--- a/src/views/AuthorizationManagement/userRoleAuthorization.vue
+++ b/src/views/AuthorizationManagement/userRoleAuthorization.vue
@@ -15,7 +15,7 @@
<el-tree
:data="depList"
:props="defaultProps"
- :show-checkbox="true"
+ :show-checkbox="false"
:check-on-click-node="true"
:check-strictly="true"
node-key="id"
@@ -201,9 +201,11 @@
<el-button @click="dialogTableVisible = false">{{
$t('dataManage.dictionaryManageObj.cancel')
}}</el-button>
- <el-button type="primary" @click="addConfirm">{{
- $t('dataManage.dictionaryManageObj.confirm')
- }}</el-button>
+ <el-button
+ style="background: #409eff; border: 1px solid #409eff; color: white"
+ @click="addConfirm"
+ >{{ $t('dataManage.dictionaryManageObj.confirm') }}</el-button
+ >
</div>
</el-dialog>
</div>
diff --git a/src/views/maintenance/blackwhiteList.vue b/src/views/maintenance/blackwhiteList.vue
index 1be111c..aece871 100644
--- a/src/views/maintenance/blackwhiteList.vue
+++ b/src/views/maintenance/blackwhiteList.vue
@@ -61,26 +61,26 @@
</el-form-item>
<el-form-item>
- <el-button
+ <el-button style="background: #409eff; border: 1px solid #409eff; color: white"
><i class="el-icon-search"></i> {{
$t('operatManage.BWL.search')
}}</el-button
>
</el-form-item>
<el-form-item>
- <el-button
+ <el-button type="info"
><i class="el-icon-delete"></i> {{
$t('operatManage.BWL.reset')
}}</el-button
>
</el-form-item>
<el-form-item>
- <el-button v-if="menuStatus.insert" @click="showInsertdialog(1)">{{
+ <el-button icon="el-icon-edit" v-if="menuStatus.insert" type="success" @click="showInsertdialog(1)">{{
$t('common.append')
}}</el-button>
</el-form-item>
<el-form-item>
- <el-button v-if="menuStatus.delete" @click="delBWList">{{
+ <el-button icon="el-icon-delete" v-if="menuStatus.delete" type="danger" @click="delBWList">{{
$t('common.delete')
}}</el-button>
</el-form-item>
@@ -89,7 +89,7 @@
<div class="table_box">
<el-table
:data="BTableData"
- stripe
+
@selection-change="blackSelectionChange"
style="width: 100%"
height="85%"
@@ -188,33 +188,33 @@
</el-select>
</el-form-item>
<el-form-item>
- <el-button @click="onSubmit"
+ <el-button style="background: #409eff; border: 1px solid #409eff; color: white" @click="onSubmit"
><i class="el-icon-search"></i> {{
$t('operatManage.BWL.search')
}}</el-button
>
</el-form-item>
<el-form-item>
- <el-button @click="onSubmit"
+ <el-button @click="onSubmit" type="info"
><i class="el-icon-delete"></i> {{
$t('operatManage.BWL.reset')
}}</el-button
>
</el-form-item>
<el-form-item>
- <el-button v-if="menuStatus.insert" @click="showInsertdialog(2)">{{
+ <el-button type="success" icon="el-icon-edit" v-if="menuStatus.insert" @click="showInsertdialog(2)">{{
$t('common.append')
}}</el-button>
</el-form-item>
<el-form-item>
- <el-button v-if="menuStatus.delete" @click="delBWList">{{
+ <el-button type="danger" icon="el-icon-delete" v-if="menuStatus.delete" @click="delBWList">{{
$t('common.delete')
}}</el-button>
</el-form-item>
</el-form>
</div>
<div class="table_box1">
- <el-table :data="WTableData" stripe @selection-change="blackSelectionChange" style="width: 100%" height="85%">
+ <el-table :data="WTableData" @selection-change="blackSelectionChange" style="width: 100%" height="85%">
<el-table-column type="selection" width="55" />
<el-table-column
align="center"
diff --git a/src/views/maintenance/eventlogManage.vue b/src/views/maintenance/eventlogManage.vue
index 25d7c0d..098c33d 100644
--- a/src/views/maintenance/eventlogManage.vue
+++ b/src/views/maintenance/eventlogManage.vue
@@ -83,12 +83,18 @@
</el-date-picker>
</el-form-item>
<el-form-item>
- <el-button @click="onSubmit" icon="el-icon-search">{{
- $t('operatManage.operationLogObj.inquire')
- }}</el-button>
- <el-button @click="onEmpty('formData2')" icon="el-icon-delete">{{
- $t('operatManage.operationLogObj.empty')
- }}</el-button>
+ <el-button
+ @click="onSubmit"
+ icon="el-icon-search"
+ style="background: #409eff; border: 1px solid #409eff; color: white"
+ >{{ $t('operatManage.operationLogObj.inquire') }}</el-button
+ >
+ <el-button
+ @click="onEmpty('formData2')"
+ icon="el-icon-delete"
+ type="info"
+ >{{ $t('operatManage.operationLogObj.empty') }}</el-button
+ >
</el-form-item>
</el-form>
</div>
diff --git a/src/views/maintenance/logLog.vue b/src/views/maintenance/logLog.vue
index 4978d67..d27419a 100644
--- a/src/views/maintenance/logLog.vue
+++ b/src/views/maintenance/logLog.vue
@@ -65,12 +65,18 @@
</el-date-picker>
</el-form-item>
<el-form-item>
- <el-button @click="onSubmit" icon="el-icon-search">{{
- $t('operatManage.operationLogObj.inquire')
- }}</el-button>
- <el-button @click="onEmpty('formData1')" icon="el-icon-delete">{{
- $t('operatManage.operationLogObj.empty')
- }}</el-button>
+ <el-button
+ @click="onSubmit"
+ icon="el-icon-search"
+ style="background: #409eff; border: 1px solid #409eff; color: white"
+ >{{ $t('operatManage.operationLogObj.inquire') }}</el-button
+ >
+ <el-button
+ @click="onEmpty('formData1')"
+ icon="el-icon-delete"
+ type="info"
+ >{{ $t('operatManage.operationLogObj.empty') }}</el-button
+ >
</el-form-item>
</el-form>
</div>
diff --git a/src/views/maintenance/menuSettings.vue b/src/views/maintenance/menuSettings.vue
index e8f8b49..06b295b 100644
--- a/src/views/maintenance/menuSettings.vue
+++ b/src/views/maintenance/menuSettings.vue
@@ -148,17 +148,17 @@
</el-form-item>
<div class="btnBox" v-if="menuStatus.update">
<el-button
- class="el-button-sure"
- type="primary"
+ style="
+ background: #409eff;
+ color: white;
+ border: 1px solid #409eff;
+ "
@click="updMenu('itemdetail')"
>{{ $t('common.confirm') }}</el-button
>
- <el-button
- class="el-button-remove"
- type="primary"
- @click="reset('itemdetail')"
- >{{ $t('common.cancel') }}</el-button
- >
+ <el-button @click="reset('itemdetail')">{{
+ $t('common.cancel')
+ }}</el-button>
</div>
</el-form>
</div>
@@ -236,12 +236,11 @@
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
- <el-button class="el-button-sure" @click="resetForm('ruleForm')">{{
+ <el-button @click="resetForm('ruleForm')">{{
$t('common.cancel')
}}</el-button>
<el-button
- class="el-button-remove"
- type="primary"
+ style="background: #409eff; color: white; border: 1px solid #409eff"
@click="submitForm('ruleForm')"
v-loading.fullscreen.lock="fullscreenLoading"
>{{ $t('common.confirm') }}</el-button
@@ -737,23 +736,7 @@
/deep/.el-form-item__label {
color: white;
}
- .el-button-sure {
- width: 116px;
- height: 40px;
- background: linear-gradient(180deg, #002992, #080472);
- border: 1px solid #000000;
- box-shadow: 0px 3px 5px 0px rgba(0, 0, 0, 0.21);
- border-radius: 3px;
- }
- .el-button-remove {
- width: 116px;
- height: 40px;
- background: linear-gradient(180deg, #002992, #080472);
- border: 1px solid #000000;
- box-shadow: 0px 3px 5px 0px rgba(0, 0, 0, 0.21);
- opacity: 0.5;
- border-radius: 3px;
- }
+
/*閲岄潰鐨勪唬鐮佸彲浠ユ牴鎹嚜宸遍渶姹傚幓杩涜鏇存敼*/
/* 璁剧疆婊氬姩鏉＄殑鏍峰紡 */
::-webkit-scrollbar {
diff --git a/src/views/maintenance/operationLog.vue b/src/views/maintenance/operationLog.vue
index 952b642..1d97e43 100644
--- a/src/views/maintenance/operationLog.vue
+++ b/src/views/maintenance/operationLog.vue
@@ -90,12 +90,18 @@
</el-date-picker>
</el-form-item>
<el-form-item>
- <el-button @click="onSubmit" icon="el-icon-search">{{
- $t('operatManage.operationLogObj.inquire')
- }}</el-button>
- <el-button @click="onEmpty('formData3')" icon="el-icon-delete">{{
- $t('operatManage.operationLogObj.empty')
- }}</el-button>
+ <el-button
+ @click="onSubmit"
+ icon="el-icon-search"
+ style="background: #409eff; border: 1px solid #409eff; color: white"
+ >{{ $t('operatManage.operationLogObj.inquire') }}</el-button
+ >
+ <el-button
+ @click="onEmpty('formData3')"
+ type="info"
+ icon="el-icon-delete"
+ >{{ $t('operatManage.operationLogObj.empty') }}</el-button
+ >
</el-form-item>
</el-form>
</div>
diff --git a/src/views/maintenance/parameterConfiguration.vue b/src/views/maintenance/parameterConfiguration.vue
index c9291f9..0c326fc 100644
--- a/src/views/maintenance/parameterConfiguration.vue
+++ b/src/views/maintenance/parameterConfiguration.vue
@@ -54,7 +54,7 @@
<template slot-scope="scope">
<el-button
@click="showDetail(scope.$index, scope.row)"
- type="primary"
+ type="warning"
plain
size="small"
>{{ $t('common.edit') }}</el-button
@@ -123,9 +123,11 @@
<el-button @click="EditFromDataClose">{{
$t('common.close')
}}</el-button>
- <el-button @click="EditFromData" type="primary">{{
- $t('common.confirm')
- }}</el-button>
+ <el-button
+ @click="EditFromData"
+ style="background: #409eff; border: 1px solid #409eff; color: white"
+ >{{ $t('common.confirm') }}</el-button
+ >
</div>
</el-dialog>
</div>
diff --git a/src/views/maintenance/tokentool.vue b/src/views/maintenance/tokentool.vue
index ed58bc4..bc20eea 100644
--- a/src/views/maintenance/tokentool.vue
+++ b/src/views/maintenance/tokentool.vue
@@ -8,9 +8,6 @@
></My-bread>
<el-divider />
<div class="inquire">
- <div class="herder_box">
- {{ $t('operatManage.operationLogObj.queryRegion') }}
- </div>
<el-form ref="formData" :model="ruleForm" :inline="true">
<el-form-item
:label="$t('operatManage.tokentoolObj.tokenQuery')"
@@ -41,22 +38,30 @@
<!-- 鏌ヨ 娓呯┖ -->
<el-form-item>
- <el-button icon="el-icon-search" @click="onSubmit">{{
- $t('common.iquery')
- }}</el-button>
- <el-button icon="el-icon-delete" @click="onEmpty('formData1')">{{
- $t('common.empty')
- }}</el-button>
+ <el-button
+ icon="el-icon-search"
+ style="background: #409eff; border: 1px solid #409eff; color: white"
+ @click="onSubmit"
+ >{{ $t('common.iquery') }}</el-button
+ >
+ <el-button
+ icon="el-icon-delete"
+ type="info"
+ @click="onEmpty('formData1')"
+ >{{ $t('common.empty') }}</el-button
+ >
<el-button
v-if="menuStatus.insert"
@click="InsertFormdialog = true"
icon="el-icon-edit"
+ type="success"
>{{ $t('common.append') }}</el-button
>
<el-button
v-if="menuStatus.delete"
@click="delTokenData"
icon="el-icon-delete"
+ type="danger"
>{{ $t('common.delete') }}</el-button
>
</el-form-item>
@@ -65,7 +70,7 @@
<div class="table_box">
<el-table
:data="tableData"
- height="99%"
+ height="102.1%"
style="width: 100%"
@selection-change="handleSelectionChange"
>
@@ -224,9 +229,11 @@
<el-button @click="insertFromDataClose">{{
$t('common.close')
}}</el-button>
- <el-button type="primary" @click="insertFromData">{{
- $t('common.confirm')
- }}</el-button>
+ <el-button
+ style="background: #409eff; border: 1px solid #409eff; color: white"
+ @click="insertFromData"
+ >{{ $t('common.confirm') }}</el-button
+ >
</div>
</el-dialog>
<!-- 淇敼寮圭獥 -->
@@ -288,9 +295,11 @@
<el-button @click="editFromDataClose">{{
$t('common.close')
}}</el-button>
- <el-button type="primary" @click="editFromData">{{
- $t('common.confirm')
- }}</el-button>
+ <el-button
+ style="background: #409eff; border: 1px solid #409eff; color: white"
+ @click="editFromData"
+ >{{ $t('common.confirm') }}</el-button
+ >
</div>
</el-dialog>
</div>
@@ -608,8 +617,7 @@
}
.table_box {
padding: 10px;
-
- height: 450px;
+ height: 500px;
border-radius: 5px;
border: 1px solid rgb(202, 201, 204);
margin-bottom: 10px;
diff --git a/src/views/maintenance/userManagement.vue b/src/views/maintenance/userManagement.vue
index 516c75d..dc9bcfb 100644
--- a/src/views/maintenance/userManagement.vue
+++ b/src/views/maintenance/userManagement.vue
@@ -35,15 +35,15 @@
<el-form-item>
<el-button
size="small"
- type="primary"
@click="queryInfo()"
icon="el-icon-search"
- style="background: #1890ff"
+ style="background: #409eff; border: 1px solid #409eff; color: white"
>{{ $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"
@@ -74,10 +74,9 @@
</el-form-item>
<el-form-item v-show="setbatchFlag">
<el-button
- type="primary"
size="small"
@click="editPwd"
- style="background: #1890ff"
+ type="warning"
icon="el-icon-unlock"
>{{ $t('common.changepassWord') }}
</el-button>
@@ -203,6 +202,7 @@
<!-- <el-button type="primary" size="small">淇敼</el-button> -->
<el-button
type="warning"
+ plain
@click="editInfo(scope.row)"
size="mini"
>{{ $t('common.edit') }}</el-button
@@ -226,7 +226,11 @@
<el-dialog
width="910px"
top="15vh"
- :title="behavior"
+ :title="
+ behavior == '鏂板鐢ㄦ埛'
+ ? `${$t('common.append')}`
+ : `${$t('common.update')}`
+ "
:visible.sync="dialogFormVisible"
:before-close="handleClose"
>
@@ -260,7 +264,7 @@
disabled
></el-input>
</el-form-item>
- <el-form-item
+ <!-- <el-form-item
v-if="behavior == '淇敼淇℃伅'"
prop="oldPwd"
:label="$t('userManage.userInfoObj.origpassword')"
@@ -272,9 +276,10 @@
autocomplete="off"
show-password
></el-input>
- </el-form-item>
+ </el-form-item> -->
<el-form-item
prop="pwd"
+ v-if="behavior == '鏂板鐢ㄦ埛'"
:label="$t('userManage.userInfoObj.pwd')"
:label-width="formLabelWidth"
>
@@ -287,6 +292,7 @@
</el-form-item>
<el-form-item
prop="checkPass"
+ v-if="behavior == '鏂板鐢ㄦ埛'"
:label="$t('userManage.userInfoObj.confirmPassword')"
:label-width="formLabelWidth"
>
@@ -425,24 +431,24 @@
</div>
</el-form>
<div v-if="behavior == '淇敼淇℃伅'" slot="footer" class="dialog-footer">
- <el-button size="medium" @click="cancelEdit()">{{
+ <el-button size="medium" type="info" @click="cancelEdit()">{{
$t('common.reset')
}}</el-button>
<el-button
size="medium"
- type="primary"
+ style="background: #409eff; border: 1px solid #409eff; color: white"
@click="sendEdit('editForm')"
v-loading.fullscreen.lock="fullscreenLoading"
>{{ $t('common.submit') }}</el-button
>
</div>
<div v-else slot="footer" class="dialog-footer">
- <el-button size="medium" @click="cancelAdd('editForm')">{{
+ <el-button size="medium" type="info" @click="cancelAdd('editForm')">{{
$t('common.reset')
}}</el-button>
<el-button
size="medium"
- type="primary"
+ style="background: #409eff; border: 1px solid #409eff; color: white"
@click="sendAdd('editForm')"
v-loading.fullscreen.lock="fullscreenLoading"
>{{ $t('common.submit') }}</el-button
@@ -452,12 +458,16 @@
<el-dialog
width="520px"
top="30vh"
- title="鎵归噺閲嶇疆瀵嗙爜"
+ :title="$t('common.changepassWord')"
:visible.sync="resetPwd"
:before-close="handleClose"
>
<el-form :model="pwdForm" ref="pwdForm" :rules="rules">
- <el-form-item prop="adminPwd" label="绠＄悊鍛樺瘑鐮�" label-width="140px">
+ <el-form-item
+ prop="adminPwd"
+ :label="$t('common.AdminPassword')"
+ label-width="140px"
+ >
<el-input
type="password"
v-model="pwdForm.adminPwd"
@@ -465,7 +475,11 @@
show-password
></el-input>
</el-form-item>
- <el-form-item prop="newPwd" label="鏂板瘑鐮�" label-width="140px">
+ <el-form-item
+ prop="newPwd"
+ :label="$t('common.NPassword')"
+ label-width="140px"
+ >
<el-input
type="password"
v-model="pwdForm.newPwd"
@@ -473,7 +487,11 @@
show-password
></el-input>
</el-form-item>
- <el-form-item prop="checkPwd" label="纭瀵嗙爜" label-width="140px">
+ <el-form-item
+ prop="checkPwd"
+ :label="$t('common.SPassword')"
+ label-width="140px"
+ >
<el-input
type="password"
v-model="pwdForm.checkPwd"
@@ -483,15 +501,15 @@
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
- <el-button size="medium" @click="cancelReset - 'pwdForm'"
- >閲嶇疆</el-button
- >
+ <el-button size="medium" type="info" @click="cancelReset - 'pwdForm'">{{
+ $t('common.reset')
+ }}</el-button>
<el-button
size="medium"
- type="primary"
+ style="background: #409eff; border: 1px solid #409eff; color: white"
@click="sendReset('pwdForm')"
v-loading.fullscreen.lock="fullscreenLoading"
- >鎻愪氦</el-button
+ >{{ $t('common.submit') }}</el-button
>
</div>
</el-dialog>
@@ -954,10 +972,11 @@
editInfo(row) {
delete row.updateTime;
delete row.updateUser;
- row.pwd = '';
+ // row.pwd = '';
this.initialForm = JSON.stringify(row);
this.behavior = '淇敼淇℃伅';
this.editForm = JSON.parse(JSON.stringify(row));
+
this.dialogFormVisible = true;
},
//缂栬緫閫夋嫨鍗曚綅
@@ -1002,13 +1021,17 @@
sendEdit(formName) {
this.$refs[formName].validate((valid) => {
if (valid) {
- encrypt.setPublicKey(this.$store.state.key);
- this.editForm.uid = encrypt.encrypt(this.editForm.uid);
- this.editForm.salt = encrypt.encrypt(this.editForm.pwd);
- this.editForm.pwd = encrypt.encrypt(this.editForm.oldPwd);
- this.fullscreenLoading = true;
- delete this.editForm.checkPass;
- delete this.editForm.oldPwd;
+ // encrypt.setPublicKey(this.$store.state.key);
+ // this.editForm.uid = this.editForm.uid;
+ // this.editForm.salt = null;
+ // this.editForm.pwd = null;
+ // this.editForm.salt = encrypt.encrypt(this.editForm.pwd);
+ // // this.editForm.pwd = encrypt.encrypt(this.editForm.oldPwd);
+ // this.fullscreenLoading = true;
+ // delete this.editForm.checkPass;
+ // delete this.editForm.oldPwd;
+ // this.editForm.salt = this.editForm.pwd;
+ debugger;
updateUser(this.editForm)
.then((res) => {
setTimeout(() => {
@@ -1241,7 +1264,7 @@
color: white;
}
/deep/.el-pager li.active {
- color: #1890ff;
+ color: #409eff;
}
/deep/.el-pager li {
color: white;
diff --git a/src/views/userManage/authorityManage.vue b/src/views/userManage/authorityManage.vue
index aa44fc5..cb9c0e4 100644
--- a/src/views/userManage/authorityManage.vue
+++ b/src/views/userManage/authorityManage.vue
@@ -13,7 +13,7 @@
<el-input v-model="ruleForm.name"></el-input>
</el-form-item>
<el-form-item>
- <el-button @click="submitForm('ruleForm')" icon="el-icon-search" type="primary">{{
+ <el-button @click="submitForm('ruleForm')" icon="el-icon-search" style="background: #409eff; border: 1px solid #409eff; color: white">{{
$t('common.iquery')
}}</el-button>
<el-button
@@ -230,7 +230,7 @@
<el-button @click="insertFromDataClose">{{
$t('common.close')
}}</el-button>
- <el-button type="primary" @click="insertFromData">{{
+ <el-button style="background: #409eff; border: 1px solid #409eff; color: white" @click="insertFromData">{{
$t('common.confirm')
}}</el-button>
</div>
@@ -266,7 +266,7 @@
<el-button @click="EditFromDataClose" >{{
$t('common.close')
}}</el-button>
- <el-button @click="EditFromData" type="primary" >{{
+ <el-button @click="EditFromData" style="background: #409eff; border: 1px solid #409eff; color: white" >{{
$t('common.confirm')
}}</el-button>
</div>
@@ -583,17 +583,20 @@
}
.infoBox {
width: 500px;
- border: 1px solid #eee;
position: absolute;
z-index: 100;
- top: 25%;
+ top: 15%;
right: 12%;
- background-color: #fff;
+ background-color: #303030;
+ .el-icon-close {
+ color: white;
+ }
.el-card {
background-color: transparent;
span {
font-size: 16px;
font-weight: 600;
+ color: white;
}
}
.contentBox {
@@ -601,8 +604,7 @@
height: 485px;
overflow: auto;
p {
- // background-color: #bfa;
- // margin-bottom: 10px;
+ color: white;
font-size: 14px;
}
.boxlabel {
diff --git a/src/views/userManage/orgManage.vue b/src/views/userManage/orgManage.vue
index 3b0e144..5509134 100644
--- a/src/views/userManage/orgManage.vue
+++ b/src/views/userManage/orgManage.vue
@@ -141,17 +141,17 @@
</el-form-item>
<div class="btnBox" v-if="menuStatus.update">
<el-button
- class="el-button-sure"
- type="primary"
+ style="
+ background: #409eff;
+ border: 1px solid #409eff;
+ color: white;
+ "
@click="updDep('itemdetail')"
>{{ $t('common.submit') }}</el-button
>
- <el-button
- class="el-button-sure"
- type="primary"
- @click="reset('itemdetail')"
- >{{ $t('common.cancel') }}</el-button
- >
+ <el-button @click="reset('itemdetail')">{{
+ $t('common.cancel')
+ }}</el-button>
</div>
</el-form>
</div>
@@ -233,12 +233,11 @@
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
- <el-button class="el-button-sure" @click="resetForm('ruleForm')">{{
+ <el-button @click="resetForm('ruleForm')">{{
$t('common.cancel')
}}</el-button>
<el-button
- class="el-button-remove"
- type="primary"
+ style="background: #409eff; border: 1px solid #409eff; color: white"
@click="submitForm('ruleForm')"
v-loading.fullscreen.lock="fullscreenLoading"
>{{ $t('common.submit') }}</el-button
@@ -326,7 +325,7 @@
};
},
methods: {
- getDepTree() {
+ getMenuTree() {
//鑾峰彇鐩綍鏍戞渶澶D锛屾柊寤鸿妭鐐逛娇鐢�
// queryMaxId().then((res) => {
// this.id = res.data;
@@ -382,11 +381,12 @@
message: '娣诲姞鎴愬姛',
type: 'success',
});
- this.getMenuTree();
+
this.itemdetail = {};
this.ruleForm = {};
this.dialogFormVisible = false;
this.$refs[formName].resetFields();
+ this.getMenuTree();
}
}, 500);
})
@@ -606,7 +606,7 @@
},
},
mounted() {
- this.getDepTree();
+ this.getMenuTree();
},
created() {
var val = this.$store.state.currentPerms;
@@ -798,23 +798,6 @@
}
/deep/.el-form-item__label {
color: white;
- }
- .el-button-sure {
- width: 116px;
- height: 40px;
- background: linear-gradient(180deg, #002992, #080472);
- border: 1px solid #000000;
- box-shadow: 0px 3px 5px 0px rgba(0, 0, 0, 0.21);
- border-radius: 3px;
- }
- .el-button-remove {
- width: 116px;
- height: 40px;
- background: linear-gradient(180deg, #002992, #080472);
- border: 1px solid #000000;
- box-shadow: 0px 3px 5px 0px rgba(0, 0, 0, 0.21);
- opacity: 0.5;
- border-radius: 3px;
}
}
</style>
diff --git a/src/views/userManage/resourceManage.vue b/src/views/userManage/resourceManage.vue
index e0d833b..8f4e35a 100644
--- a/src/views/userManage/resourceManage.vue
+++ b/src/views/userManage/resourceManage.vue
@@ -334,7 +334,7 @@
<el-button @click="insertFromDataClose">{{
$t('common.close')
}}</el-button>
- <el-button type="primary" @click="insertFromData">{{
+ <el-button type="primary" style="background: #409eff; border: 1px solid #409eff; color: white" @click="insertFromData">{{
$t('common.confirm')
}}</el-button>
</div>
@@ -434,7 +434,7 @@
<el-button @click="EditFromDataClose" >{{
$t('common.close')
}}</el-button>
- <el-button @click="EditFromData" type="primary" >{{
+ <el-button @click="EditFromData" style="background: #409eff; border: 1px solid #409eff; color: white" >{{
$t('common.confirm')
}}</el-button>
</div>
@@ -444,10 +444,10 @@
<style-dir-tree></style-dir-tree>
</div>
<div class="btnBox">
- <el-button type="primary" size="small" @click="selectDirCataName">{{
+ <el-button style="background: #409eff; border: 1px solid #409eff; color: white" size="small" @click="selectDirCataName">{{
$t('common.confirm')
}}</el-button>
- <el-button type="primary" size="small" @click="showDirCata = false">{{
+ <el-button type="info" size="small" @click="showDirCata = false">{{
$t('common.close')
}}</el-button>
</div>
@@ -457,10 +457,10 @@
<style-dep-tree></style-dep-tree>
</div>
<div class="btnBox">
- <el-button type="primary" size="small" @click="selectDepCataName">{{
+ <el-button style="background: #409eff; border: 1px solid #409eff; color: white" @click="selectDepCataName">{{
$t('common.confirm')
}}</el-button>
- <el-button type="primary" size="small" @click="showDepCata = false">{{
+ <el-button size="small" @click="showDepCata = false">{{
$t('common.close')
}}</el-button>
</div>
@@ -688,14 +688,16 @@
this.showinfoBox = true;
var token = getToken();
this.itemdetail = row;
+
this.itemdetail.createTime = this.formomentTime(
this.itemdetail.createTime
);
this.itemdetail.updateTime = this.formomentTime(
this.itemdetail.updateTime
);
- this.itemdetail.imageFile =
- BASE_URL + '/res/download?guid=' + row.img + '&token=' + token;
+
+ this.itemdetail.imageFile = BASE_URL + '/res/download?guid=' + row.img + '&token=' + token;
+ console.log( this.itemdetail.imageFile)
},
handleEdit(index, row) {
this.EditFormdialog = true;
@@ -755,11 +757,9 @@
}
this.listData.name = this.ruleForm.name;
const data = await select_Res_ByPageAndCount(this.listData);
-
if (data.code != 200) {
this.$message.error('鍒楄〃璋冪敤澶辫触');
}
-
this.tableData = data.result;
this.count = data.count;
},
@@ -914,7 +914,7 @@
left: 800px;
width: 400px;
height: 600px;
- background: #f0f2f5;
+ background: #303030;
border: 1px solid #000;
.treeBox {
height: 550px;
@@ -931,17 +931,21 @@
}
.infoBox {
width: 500px;
- border: 1px solid #eee;
+
position: absolute;
z-index: 100;
top: 25%;
right: 12%;
- background-color: #fff;
+ .el-icon-close{
+ color: white;
+ }
+ background-color: #303030;
.el-card {
background-color: transparent;
span {
font-size: 16px;
font-weight: 600;
+ color: white;
}
}
.contentBox {
@@ -951,6 +955,7 @@
p {
// background-color: #bfa;
// margin-bottom: 10px;
+ color: white;
font-size: 14px;
}
.boxlabel {
diff --git a/src/views/userManage/roleManage.vue b/src/views/userManage/roleManage.vue
index 760cc30..bbe9d2d 100644
--- a/src/views/userManage/roleManage.vue
+++ b/src/views/userManage/roleManage.vue
@@ -21,34 +21,49 @@
:disabled="true"
:placeholder="$t('common.pleaseInput')"
/>
- <el-button style="margin-left: 20px" @click="showDepTree(1)">{{
- $t('common.choose')
- }}</el-button>
+ <el-button
+ style="
+ margin-left: 20px;
+ background: #409eff;
+ border: 1px solid #409eff;
+ color: white;
+ "
+ @click="showDepTree(1)"
+ >{{ $t('common.choose') }}</el-button
+ >
</el-form-item>
<br />
<el-form-item>
- <el-button @click="InsertFormdialog = true" v-if="menuStatus.insert"
+ <el-button
+ type="success"
+ @click="InsertFormdialog = true"
+ v-if="menuStatus.insert"
><i class="el-icon-circle-plus-outline"></i> {{
$t('userManage.RM.add')
}}</el-button
>
</el-form-item>
<el-form-item>
- <el-button @click="onSubmit('ruleForm')"
+ <el-button
+ style="background: #409eff; border: 1px solid #409eff; color: white"
+ @click="onSubmit('ruleForm')"
><i class="el-icon-search"></i> {{
$t('userManage.RM.query')
}}</el-button
>
</el-form-item>
<el-form-item>
- <el-button @click="resetForm('ruleForm')"
+ <el-button type="info" @click="resetForm('ruleForm')"
><i class="el-icon-delete"></i> {{
$t('userManage.RM.reset')
}}</el-button
>
</el-form-item>
<el-form-item>
- <el-button @click="handleDelete()" v-if="menuStatus.delete"
+ <el-button
+ type="danger"
+ @click="handleDelete()"
+ v-if="menuStatus.delete"
><i class="el-icon-delete"></i> {{
$t('common.delete')
}}</el-button
@@ -141,7 +156,6 @@
>
<el-button
@click="showDetail(scope.$index, scope.row)"
- type="primary"
size="small"
>{{ $t('common.see') }}</el-button
>
@@ -187,9 +201,16 @@
:disabled="true"
:placeholder="$t('common.pleaseInput')"
/>
- <el-button style="margin-left: 20px" @click="showDepTree(2)">{{
- $t('common.choose')
- }}</el-button>
+ <el-button
+ style="
+ margin-left: 20px;
+ background: #409eff;
+ border: 1px solid #409eff;
+ color: white;
+ "
+ @click="showDepTree(2)"
+ >{{ $t('common.choose') }}</el-button
+ >
</el-form-item>
<el-form-item
:label="$t('userManage.RM.describe')"
@@ -213,9 +234,11 @@
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="insertFromClose">{{ $t('common.close') }}</el-button>
- <el-button type="primary" @click="insertFromData">{{
- $t('common.confirm')
- }}</el-button>
+ <el-button
+ style="background: #409eff; border: 1px solid #409eff; color: white"
+ @click="insertFromData"
+ >{{ $t('common.confirm') }}</el-button
+ >
</div>
</el-dialog>
<el-dialog
@@ -243,9 +266,16 @@
:disabled="true"
:placeholder="$t('common.pleaseInput')"
/>
- <el-button style="margin-left: 20px" @click="showDepTree(3)">{{
- $t('common.choose')
- }}</el-button>
+ <el-button
+ style="
+ margin-left: 20px;
+ background: #409eff;
+ border: 1px solid #409eff;
+ color: white;
+ "
+ @click="showDepTree(3)"
+ >{{ $t('common.choose') }}</el-button
+ >
</el-form-item>
<el-form-item
:label="$t('userManage.RM.isAdmin')"
@@ -269,9 +299,11 @@
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="updateFromClose">{{ $t('common.close') }}</el-button>
- <el-button type="primary" @click="updateFromData">{{
- $t('common.confirm')
- }}</el-button>
+ <el-button
+ style="background: #409eff; border: 1px solid #409eff; color: white"
+ @click="updateFromData"
+ >{{ $t('common.confirm') }}</el-button
+ >
</div>
</el-dialog>
<div class="leftTree" v-if="showCata">
@@ -279,10 +311,13 @@
<role-dep-tree></role-dep-tree>
</div>
<div class="btnBox">
- <el-button type="primary" size="small" @click="selectCataName"
+ <el-button
+ style="background: #409eff; border: 1px solid #409eff; color: white"
+ size="small"
+ @click="selectCataName"
>纭畾</el-button
>
- <el-button type="primary" size="small" @click="showCata = false"
+ <el-button type="info" size="small" @click="showCata = false"
>鍙栨秷</el-button
>
</div>
@@ -772,17 +807,21 @@
}
.infoBox {
width: 500px;
- border: 1px solid #eee;
+
position: absolute;
z-index: 100;
- top: 25%;
+ top: 15%;
right: 12%;
- background-color: #fff;
+ background-color: #303030;
+ .el-icon-close {
+ color: white;
+ }
.el-card {
background-color: transparent;
span {
font-size: 16px;
font-weight: 600;
+ color: white;
}
}
.contentBox {
@@ -793,6 +832,7 @@
// background-color: #bfa;
// margin-bottom: 10px;
font-size: 14px;
+ color: white;
}
.boxlabel {
margin-left: 10px;
--
Gitblit v1.9.3