diff --git a/src/app/pages/system-management/role-management/role-management-modify/role-management-modify.component.scss b/src/app/pages/system-management/role-management/role-management-modify/role-management-modify.component.scss
index fbfdb37..e5cab96 100644
--- a/src/app/pages/system-management/role-management/role-management-modify/role-management-modify.component.scss
+++ b/src/app/pages/system-management/role-management/role-management-modify/role-management-modify.component.scss
@@ -1,10 +1,9 @@
@import "../../../main.scss";
.system-main-container{
- padding-top: 10px;
+ overflow-y:auto;
}
.user-modify-box{
position: relative;
- overflow-y:auto;
.user-footer{
text-align: center;
margin-top: -20px;
diff --git a/src/app/pages/system-management/role-management/role-management-modify/role-management-modify.component.ts b/src/app/pages/system-management/role-management/role-management-modify/role-management-modify.component.ts
index d14f70c..b9ebf22 100644
--- a/src/app/pages/system-management/role-management/role-management-modify/role-management-modify.component.ts
+++ b/src/app/pages/system-management/role-management/role-management-modify/role-management-modify.component.ts
@@ -103,7 +103,6 @@ export class RoleManagementModifyComponent implements OnInit {
permission:permission,
user:users,
})
- console.log(this.validateForm.value)
this.isLoadingSave=true;
if(this.modifyType==1){
this.http.post('/sysapi/setting/role/add/',this.validateForm.value).subscribe((json)=>{
@@ -132,8 +131,6 @@ export class RoleManagementModifyComponent implements OnInit {
queryUserById():void{
this.http.get('/sysapi/setting/role/users/'+this.roleId).subscribe((json)=>{
if(json.is_success){
- console.log(12121212)
- console.log(json.body)
json.body.forEach(item=>{
item.checked=true;
item.disabled=false;
@@ -161,8 +158,6 @@ export class RoleManagementModifyComponent implements OnInit {
status:item.status,
})
this.permissionChecked=item.permission;
- console.log(22211111)
- console.log(this.permissionChecked)
this.initTree();
}else{
this.statusParamsDetail=4;
@@ -176,7 +171,6 @@ export class RoleManagementModifyComponent implements OnInit {
}
//保存机构负责人
userSave(){
- console.log(this.userData);
this.userData.forEach(item=>{
if(item.checked&&!item.disabled){
// 增加数据
@@ -184,7 +178,6 @@ export class RoleManagementModifyComponent implements OnInit {
}
})
this.visibleUsers = false;
- console.log(this.userSelecteds)
}
//处理机构负责人选择和数据回填
userSelect(){
@@ -245,13 +238,9 @@ export class RoleManagementModifyComponent implements OnInit {
this.statusParamsUsers.status=4;
}
this.userData=data;
- console.log(5555)
- console.log(data)
}else{
this.statusParamsUsers.status=0;
}
- console.log(66666)
- console.log(this.userSelecteds)
})
}
@@ -333,7 +322,6 @@ export class RoleManagementModifyComponent implements OnInit {
setNode(node){
this.permissionChecked.forEach(item=>{
if(item.pid==node.id){
- console.log(node.name)
node.checked=true;
}
})
diff --git a/src/app/pages/system-management/role-management/role-management.component.html b/src/app/pages/system-management/role-management/role-management.component.html
index e4744c7..13889ea 100644
--- a/src/app/pages/system-management/role-management/role-management.component.html
+++ b/src/app/pages/system-management/role-management/role-management.component.html
@@ -1,16 +1,6 @@
-
-
-
- 角色管理
-
-
- 列表
-
-
-
-
+
diff --git a/src/app/pages/system-management/role-management/role-management.component.scss b/src/app/pages/system-management/role-management/role-management.component.scss
index 43471b9..faa4367 100644
--- a/src/app/pages/system-management/role-management/role-management.component.scss
+++ b/src/app/pages/system-management/role-management/role-management.component.scss
@@ -1,9 +1,9 @@
@import "../../main.scss";
.system-main-container{
- padding-top: 10px;
+ overflow-y:auto;
.user-manage{
.system-main-content{
- overflow-y:scroll;
+ min-height: 500px;
}
.card{
diff --git a/src/app/pages/system-management/role-management/role-management.component.ts b/src/app/pages/system-management/role-management/role-management.component.ts
index 9514dff..87ee944 100644
--- a/src/app/pages/system-management/role-management/role-management.component.ts
+++ b/src/app/pages/system-management/role-management/role-management.component.ts
@@ -35,11 +35,6 @@ export class RoleManagementComponent implements OnInit {
) { }
ngOnInit() {
- // 页面监听 动态改变表单高度
- $('#main-box').css('height',(document.documentElement.clientHeight-106+'px'));
- $(window).resize(function(){
- $('#main-box').css('height',(document.documentElement.clientHeight-106+'px'));
- })
this.queryTable();
}
//新增、修改 1新增 2修改
diff --git a/src/app/pages/system-management/user-management/user-management-modify/user-management-modify.component.html b/src/app/pages/system-management/user-management/user-management-modify/user-management-modify.component.html
index abcb59c..486eb33 100644
--- a/src/app/pages/system-management/user-management/user-management-modify/user-management-modify.component.html
+++ b/src/app/pages/system-management/user-management/user-management-modify/user-management-modify.component.html
@@ -1,15 +1,4 @@
-
-
-
- 用户管理
-
-
- 新增用户
- 修改用户
-
-
-
diff --git a/src/app/pages/system-management/user-management/user-management-modify/user-management-modify.component.scss b/src/app/pages/system-management/user-management/user-management-modify/user-management-modify.component.scss
index 72ed262..1ee62fd 100644
--- a/src/app/pages/system-management/user-management/user-management-modify/user-management-modify.component.scss
+++ b/src/app/pages/system-management/user-management/user-management-modify/user-management-modify.component.scss
@@ -1,6 +1,8 @@
+.system-main-container{
+ overflow-y:auto;
+}
.user-modify-box{
position: relative;
- overflow-y:scroll;
.user-footer{
text-align: center;
margin-top: -20px;
diff --git a/src/app/pages/system-management/user-management/user-management-modify/user-management-modify.component.ts b/src/app/pages/system-management/user-management/user-management-modify/user-management-modify.component.ts
index 0a48e7f..303fc1f 100644
--- a/src/app/pages/system-management/user-management/user-management-modify/user-management-modify.component.ts
+++ b/src/app/pages/system-management/user-management/user-management-modify/user-management-modify.component.ts
@@ -116,8 +116,6 @@ export class UserManagementModifyComponent implements OnInit {
}
//检验系统账号的唯一性
checkName(){
- console.log(this.validateForm.value.login_name.trim())
- console.log(this.oldLoginName)
if(this.modifyType==2&&this.validateForm.value.login_name.trim()==this.oldLoginName){
this.nameOnly = true;
this.checkNameStatus='success';
@@ -241,7 +239,6 @@ export class UserManagementModifyComponent implements OnInit {
params.orgList.push(option)
}
})
- console.log(params)
this.isLoadingSave=true;
if(type==1){
this.http.post('/sysapi/setting/user/add', params).subscribe((json) => {
diff --git a/src/app/pages/system-management/user-management/user-management.component.html b/src/app/pages/system-management/user-management/user-management.component.html
index a3e0501..ad95ddb 100644
--- a/src/app/pages/system-management/user-management/user-management.component.html
+++ b/src/app/pages/system-management/user-management/user-management.component.html
@@ -1,14 +1,4 @@
-
-
-
- 用户管理
-
-
- 列表
-
-
-
diff --git a/src/app/pages/system-management/user-management/user-management.component.scss b/src/app/pages/system-management/user-management/user-management.component.scss
index 43471b9..a42cc05 100644
--- a/src/app/pages/system-management/user-management/user-management.component.scss
+++ b/src/app/pages/system-management/user-management/user-management.component.scss
@@ -1,6 +1,5 @@
@import "../../main.scss";
.system-main-container{
- padding-top: 10px;
.user-manage{
.system-main-content{
overflow-y:scroll;
diff --git a/src/app/pages/system-management/user-management/user-management.component.ts b/src/app/pages/system-management/user-management/user-management.component.ts
index 8bdea13..6df9ba7 100644
--- a/src/app/pages/system-management/user-management/user-management.component.ts
+++ b/src/app/pages/system-management/user-management/user-management.component.ts
@@ -44,11 +44,11 @@ export class UserManagementComponent implements OnInit {
ngOnInit() {
// 页面监听 动态改变表单高度
- $('#tree-box').css('height',(document.documentElement.clientHeight-106+'px'));
- $('#main-box').css('height',(document.documentElement.clientHeight-106+'px'));
+ $('#tree-box').css('height',(document.documentElement.clientHeight-126+'px'));
+ $('#main-box').css('height',(document.documentElement.clientHeight-126+'px'));
$(window).resize(function(){
- $('#tree-box').css('height',(document.documentElement.clientHeight-106+'px'));
- $('#main-box').css('height',(document.documentElement.clientHeight-106+'px'));
+ $('#tree-box').css('height',(document.documentElement.clientHeight-126+'px'));
+ $('#main-box').css('height',(document.documentElement.clientHeight-126+'px'));
})
this.initTree();
this.queryTable();