From 1d34e328e3b552514a3a667b98452e67eb1f4d39 Mon Sep 17 00:00:00 2001 From: Sjh <55341701@qq.com> Date: Mon, 27 May 2024 16:31:09 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=AE=8C=E5=96=84]=E5=A4=9A=E4=B8=AA=E9=A1=B6?= =?UTF-8?q?=E7=BA=A7=E7=BB=84=E7=BB=87=E6=9C=BA=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- proxy.config.json | 2 +- .../reinforce-plan.component.ts | 404 ++++---- .../organization/organization.component.html | 3 +- .../organization/organization.component.scss | 5 + .../ui/organization/organization.component.ts | 92 +- .../usermanagement.component.ts | 887 ++++++++++-------- src/index.html | 4 +- 7 files changed, 774 insertions(+), 623 deletions(-) diff --git a/proxy.config.json b/proxy.config.json index e61e510..8129e12 100644 --- a/proxy.config.json +++ b/proxy.config.json @@ -1,6 +1,6 @@ { "/api": { - "target": "http://10.81.73.39:8000/", + "target": "http://121.36.37.70:8201/", "生产": "http://10.81.73.39:8000/", "测试": "http://121.36.37.70:8201/", "生产2": "http://183.194.244.232:8088/", diff --git a/src/app/plan-management/reinforce-plan/reinforce-plan.component.ts b/src/app/plan-management/reinforce-plan/reinforce-plan.component.ts index 52a8603..582c543 100644 --- a/src/app/plan-management/reinforce-plan/reinforce-plan.component.ts +++ b/src/app/plan-management/reinforce-plan/reinforce-plan.component.ts @@ -1,251 +1,297 @@ -import { Component, OnInit, ViewChild, Inject } from '@angular/core'; -import { HttpClient } from '@angular/common/http' -import { MatTreeFlatDataSource, MatTreeFlattener } from '@angular/material/tree'; -import { MatPaginator } from '@angular/material/paginator'; -import { FlatTreeControl } from '@angular/cdk/tree'; -import { FormControl } from '@angular/forms'; -import { Router,ActivatedRoute } from '@angular/router' -import { PageEvent } from '@angular/material/paginator'; -import { MatDialogRef, MatDialog, MAT_DIALOG_DATA } from '@angular/material/dialog'; -import { MatSnackBar, MatSnackBarConfig } from '@angular/material/snack-bar'; -import { TreeService } from '../../http-interceptors/tree.service' -import { Viewer } from 'photo-sphere-viewer'; -declare var CryptoJS +import { Component, OnInit, ViewChild, Inject } from "@angular/core"; +import { HttpClient } from "@angular/common/http"; +import { + MatTreeFlatDataSource, + MatTreeFlattener, +} from "@angular/material/tree"; +import { MatPaginator } from "@angular/material/paginator"; +import { FlatTreeControl } from "@angular/cdk/tree"; +import { FormControl } from "@angular/forms"; +import { Router, ActivatedRoute } from "@angular/router"; +import { PageEvent } from "@angular/material/paginator"; +import { + MatDialogRef, + MatDialog, + MAT_DIALOG_DATA, +} from "@angular/material/dialog"; +import { MatSnackBar, MatSnackBarConfig } from "@angular/material/snack-bar"; +import { TreeService } from "../../http-interceptors/tree.service"; +import { Viewer } from "photo-sphere-viewer"; +declare var CryptoJS; @Component({ - selector: 'app-reinforce-plan', - templateUrl: './reinforce-plan.component.html', - styleUrls: ['./reinforce-plan.component.scss'] + selector: "app-reinforce-plan", + templateUrl: "./reinforce-plan.component.html", + styleUrls: ["./reinforce-plan.component.scss"], }) export class ReinforcePlanComponent implements OnInit { + constructor( + private http: HttpClient, + private router: Router, + private route: ActivatedRoute, + private tree: TreeService, + public dialog: MatDialog, + public snackBar: MatSnackBar + ) {} - constructor(private http:HttpClient,private router:Router,private route:ActivatedRoute,private tree: TreeService,public dialog: MatDialog,public snackBar: MatSnackBar) { } - - private _transformer = (node, level: number) => { //初始化tree + private _transformer = (node, level: number) => { + //初始化tree return { expandable: !!node.children && node.children.length > 0, name: node.name, level: level, id: node.id, parentId: node.parentId, - children: node.children + children: node.children, }; - } - treeControl = new FlatTreeControl(node => node.level, node => node.expandable); - treeFlattener = new MatTreeFlattener(this._transformer, node => node.level, node => node.expandable, node => node.children); + }; + treeControl = new FlatTreeControl( + (node) => node.level, + (node) => node.expandable + ); + treeFlattener = new MatTreeFlattener( + this._transformer, + (node) => node.level, + (node) => node.expandable, + (node) => node.children + ); dataSource = new MatTreeFlatDataSource(this.treeControl, this.treeFlattener); myControl = new FormControl(); hasChild = (_: number, node: any) => node.expandable; - //分页 - @ViewChild(MatPaginator, {static: true}) + //分页 + @ViewChild(MatPaginator, { static: true }) pageEvent: PageEvent; paginator: MatPaginator; - length:any; //共多少条数据 - pageSize:any; //每页条数 - pageSizeOptions: number[] = [10] //设置每页条数 - PageNumber:any; //第几页 + length: any; //共多少条数据 + pageSize: any; //每页条数 + pageSizeOptions: number[] = [10]; //设置每页条数 + PageNumber: any; //第几页 - displayedColumns: string[] = ['state','unitname','planname', 'addpeople','level','addtime','plantype','auditStatus','weihuStatus','openRange','projectlevel','operation']; - allorganizations:any //所有组织机构 - allunittype:any //所有单位类型 - tabledataSource:any //表格数据 - IsNewData='' //维护更新活新增 + displayedColumns: string[] = [ + "state", + "unitname", + "planname", + "addpeople", + "level", + "addtime", + "plantype", + "auditStatus", + "weihuStatus", + "openRange", + "projectlevel", + "operation", + ]; + allorganizations: any; //所有组织机构 + allunittype: any; //所有单位类型 + tabledataSource: any; //表格数据 + IsNewData = ""; //维护更新活新增 - preparelevels:any - ngOnInit(): void { - if(window.matchMedia("(max-width: 1400px)").matches){ - this.pcMore=false - this.padMore=true - this.pcfind=false - this.padjt=true - }else{ - this.pcfind=true - this.pcMore=true - this.padMore=false - this.padjt=false + preparelevels: any; + async ngOnInit(): Promise { + if (window.matchMedia("(max-width: 1400px)").matches) { + this.pcMore = false; + this.padMore = true; + this.pcfind = false; + this.padjt = true; + } else { + this.pcfind = true; + this.pcMore = true; + this.padMore = false; + this.padjt = false; } this.getunitdata(); - this.getOrganizations(); + await this.getOrganizations(); + this.jsId = this.dataSource.data[0].id; this.getUnittype(); this.getAllPlanInfo(); let level = sessionStorage.getItem("level"); - if(level == "0"){//如果是总队 + if (level == "0") { + //如果是总队 this.preparelevels = [ - {name:"总队",value:"1"}, - {name:"支队",value:"2"}, - {name:"大队",value:"4"}, - {name:"中队",value:"8"} - ] + { name: "总队", value: "1" }, + { name: "支队", value: "2" }, + { name: "大队", value: "4" }, + { name: "中队", value: "8" }, + ]; } - if(level == "1"){//如果是支队 + if (level == "1") { + //如果是支队 this.preparelevels = [ - {name:"支队",value:"2"}, - {name:"大队",value:"4"}, - {name:"中队",value:"8"} - ] + { name: "支队", value: "2" }, + { name: "大队", value: "4" }, + { name: "中队", value: "8" }, + ]; } - if(level == "2"){//如果是大队 + if (level == "2") { + //如果是大队 this.preparelevels = [ - {name:"大队",value:"4"}, - {name:"中队",value:"8"} - ] + { name: "大队", value: "4" }, + { name: "中队", value: "8" }, + ]; } - if(level == "3"){//如果是中队 - this.preparelevels = [ - {name:"中队",value:"8"} - ] + if (level == "3") { + //如果是中队 + this.preparelevels = [{ name: "中队", value: "8" }]; } } - pcMore//pc更多 - pcput=false//pc收起 - pcfind//pc查询 - padjt=false - padMore=true//pad收缩控制 - padput=false//pad收起按钮 - imgsrcopen="../../../assets/images/routdown2.png" - imgsrcdown="../../../assets/images/routup2.png" - pcInfo(){ - this.pcMore=!this.pcMore - this.pcput=!this.pcput + pcMore; //pc更多 + pcput = false; //pc收起 + pcfind; //pc查询 + padjt = false; + padMore = true; //pad收缩控制 + padput = false; //pad收起按钮 + imgsrcopen = "../../../assets/images/routdown2.png"; + imgsrcdown = "../../../assets/images/routup2.png"; + pcInfo() { + this.pcMore = !this.pcMore; + this.pcput = !this.pcput; } - padInfo(){ - this.padMore=!this.padMore - this.padput=!this.padput + padInfo() { + this.padMore = !this.padMore; + this.padput = !this.padput; } - allPlanInfo:any //存储所有预案信息 + allPlanInfo: any; //存储所有预案信息 //获得所有预案信息 - IsNewCompanyData=''//单位维护更新或者新增 - getAllPlanInfo(){ - let paramsdata:any = { - CompanyName: this.companyName || '', - OrganizationId: this.jsId || '', - HasChildrenOrganization:this.jscheck || '', - BuildingTypeId: this.unittype || '', - PlanType: this.reservePlanType || '', - AuditStatus:'', //审核状态 - PlanLevel: this.preparelevel || '', - HasChildrenPlanLevel: this.plcheck || '', - CreationTimeRangeStart:this.addtime||'', - CreationTimeRangeEnd:this.endtime||'', - PageNumber: this.PageNumber || '1', - PageSize: this.pageSizeOptions[0], - Sort: '', - IsNewData:this.IsNewData, - IsNewCompanyData:this.IsNewCompanyData - } - this.http.get("/api/ApprovedPlans/GetReinforcementPlanComponents",{params:paramsdata}).subscribe((data:any)=>{ - // console.log('增援预案列表',data) - this.length = data.totalCount - this.allPlanInfo = data - this.tabledataSource = data.items - }) + IsNewCompanyData = ""; //单位维护更新或者新增 + getAllPlanInfo() { + let paramsdata: any = { + CompanyName: this.companyName || "", + OrganizationId: this.jsId || "", + HasChildrenOrganization: this.jscheck || "", + BuildingTypeId: this.unittype || "", + PlanType: this.reservePlanType || "", + AuditStatus: "", //审核状态 + PlanLevel: this.preparelevel || "", + HasChildrenPlanLevel: this.plcheck || "", + CreationTimeRangeStart: this.addtime || "", + CreationTimeRangeEnd: this.endtime || "", + PageNumber: this.PageNumber || "1", + PageSize: this.pageSizeOptions[0], + Sort: "", + IsNewData: this.IsNewData, + IsNewCompanyData: this.IsNewCompanyData, + }; + this.http + .get("/api/ApprovedPlans/GetReinforcementPlanComponents", { + params: paramsdata, + }) + .subscribe((data: any) => { + // console.log('增援预案列表',data) + this.length = data.totalCount; + this.allPlanInfo = data; + this.tabledataSource = data.items; + }); } //得到当前单位信息 - getunitdata(){ - this.http.get("/api/Account/Profiles").subscribe( - (data:any)=>{ - this.organizationName = data.organizationName - } - ) + getunitdata() { + this.http.get("/api/Account/Profiles").subscribe((data: any) => { + this.organizationName = data.organizationName; + }); } - addtime//开始时间 - endtime//结束时间 - integrityScoreMin//完整度最小值 - integrityScoreMax//完整度最大值 - organizationName:any //当前单位组织机构名称 - treedata:any //组织机构树型数据 - newArr:any = [] - newallorganizations:any //用于存储在原始数据基础上的每个机构增加children字段 + addtime; //开始时间 + endtime; //结束时间 + integrityScoreMin; //完整度最小值 + integrityScoreMax; //完整度最大值 + organizationName: any; //当前单位组织机构名称 + treedata: any; //组织机构树型数据 + newArr: any = []; + newallorganizations: any; //用于存储在原始数据基础上的每个机构增加children字段 //获得所有组织机构 - getOrganizations(){ - this.http.get('/api/Organizations').subscribe( - (data:any)=>{ - this.allorganizations = data - this.dataSource.data = this.tree.toTree(data); - } - ) + getOrganizations() { + return new Promise((resolve, reject) => { + this.http + .get("/api/Organizations", { + params: { + strict: "true", + }, + }) + .subscribe((data: any) => { + this.allorganizations = data; + this.dataSource.data = this.tree.toTree(data); + resolve(); + }); + }); } //获得所有单位类型 - getUnittype(){ - this.http.get('/api/BuildingTypes/Simple').subscribe( - data=>{ - this.allunittype = data - } - ) + getUnittype() { + this.http.get("/api/BuildingTypes/Simple").subscribe((data) => { + this.allunittype = data; + }); } //分页事件 - chagePage(e){ - this.PageNumber = e.pageIndex+1 + chagePage(e) { + this.PageNumber = e.pageIndex + 1; this.getAllPlanInfo(); } //辖区中队div是否显示 - isorganizationbox:boolean = false + isorganizationbox: boolean = false; //点击辖区中队树，将选择的辖区中队添加到变量 add(node) { - this.isorganizationbox = false - this.js = node.name - this.jsId = node.id + this.isorganizationbox = false; + this.js = node.name; + this.jsId = node.id; } //关闭辖区中队隐藏框 closeorganizationbox() { - this.isorganizationbox = false + this.isorganizationbox = false; } //打开辖区中队隐藏框 openorganizationbox() { - this.isorganizationbox = true + this.isorganizationbox = true; } //关闭出现的组织机构div - closediv(){ - this.isorganizationbox = false + closediv() { + this.isorganizationbox = false; } //查询 - onSubmit (e) { - this.PageNumber = 1 - this.pageEvent.pageIndex = 0 - this.getAllPlanInfo() + onSubmit(e) { + this.PageNumber = 1; + this.pageEvent.pageIndex = 0; + this.getAllPlanInfo(); } - companyName:any //单位名称 - js:any //所选组织机构 - jsId:any //所选组织机构的id - jscheck:boolean //所选组织机构勾选框 - unittype:any //单位类型 - reservePlanType:any //预案类型 - preparelevel:any //编制级别 - plcheck:boolean //编制级别勾选框 + companyName: any; //单位名称 + js: any; //所选组织机构 + jsId: any; //所选组织机构的id + jscheck: boolean; //所选组织机构勾选框 + unittype: any; //单位类型 + reservePlanType: any; //预案类型 + preparelevel: any; //编制级别 + plcheck: boolean; //编制级别勾选框 //重置 - reset(){ - this.IsNewData='' - this.IsNewCompanyData='' - this.companyName = '' - this.js = '' - this.jsId = '' - this.jscheck = false - this.unittype = '' - this.reservePlanType = '' - this.preparelevel = '' - this.addtime='' - this.endtime='' - this.plcheck = false + reset() { + this.IsNewData = ""; + this.IsNewCompanyData = ""; + this.companyName = ""; + this.js = ""; + this.jsId = ""; + this.jscheck = false; + this.unittype = ""; + this.reservePlanType = ""; + this.preparelevel = ""; + this.addtime = ""; + this.endtime = ""; + this.plcheck = false; //重新获取初始化列表 - this.pageEvent.pageIndex = 0 - this.PageNumber = 1 + this.pageEvent.pageIndex = 0; + this.PageNumber = 1; this.getAllPlanInfo(); - } //查看预案 - openPlan(e){ + openPlan(e) { // console.log(e) - let id = e.id - sessionStorage.setItem("planId",id) - sessionStorage.setItem("companyId",e.companyId) + let id = e.id; + sessionStorage.setItem("planId", id); + sessionStorage.setItem("companyId", e.companyId); //sessionStorage.setItem("buildingTypeId",this.unittypeId) - sessionStorage.setItem("editable","0") - sessionStorage.setItem("planName",e.name) - let companyId = sessionStorage.getItem("companyId") - window.open(`/keyUnit/viewunitinfoplan?id=${companyId}&orName=${e.company.organizationName}&orId=${e.company.organizationId}`); + sessionStorage.setItem("editable", "0"); + sessionStorage.setItem("planName", e.name); + let companyId = sessionStorage.getItem("companyId"); + window.open( + `/keyUnit/viewunitinfoplan?id=${companyId}&orName=${e.company.organizationName}&orId=${e.company.organizationId}` + ); } } diff --git a/src/app/ui/organization/organization.component.html b/src/app/ui/organization/organization.component.html index 4c25dcd..cd89b0e 100644 --- a/src/app/ui/organization/organization.component.html +++ b/src/app/ui/organization/organization.component.html @@ -1,5 +1,6 @@ -
+
+ diff --git a/src/app/ui/organization/organization.component.scss b/src/app/ui/organization/organization.component.scss index f766456..f39e5f1 100644 --- a/src/app/ui/organization/organization.component.scss +++ b/src/app/ui/organization/organization.component.scss @@ -70,6 +70,11 @@ form { } .box { + box-sizing: border-box; + padding: 12px; + height: 100%; + overflow-y: auto; + position: relative; div { float: left; } diff --git a/src/app/ui/organization/organization.component.ts b/src/app/ui/organization/organization.component.ts index 3182318..306731b 100644 --- a/src/app/ui/organization/organization.component.ts +++ b/src/app/ui/organization/organization.component.ts @@ -60,46 +60,66 @@ export class OrganizationComponent implements OnInit { isloading: any = false; //loading效果 //重新获取列表并且展开到上次位置的方法 getlist = (): void => { - this.http.get("/api/Organizations").subscribe((data: any) => { - this.data = data; - this.newdata = this.tree.toTree(data); + this.http + .get("/api/Organizations", { + params: { + strict: "true", + }, + }) + .subscribe((data: any) => { + this.data = data; + this.newdata = this.tree.toTree(data); - const nodes = this.treeControl.dataNodes; - const expandNodes = []; - nodes.forEach((item) => { - if (item.expandable && this.treeControl.isExpanded(item)) { - expandNodes.push(item.id); - } - }); + const nodes = this.treeControl.dataNodes; + const expandNodes = []; + nodes.forEach((item) => { + if (item.expandable && this.treeControl.isExpanded(item)) { + expandNodes.push(item.id); + } + }); - console.log("tree", this.newdata); - this.dataSource.data = this.newdata; - let newNodes = this.treeControl.dataNodes; - newNodes = newNodes.filter((n) => { - return expandNodes.indexOf(n.id) >= 0; - }); - newNodes.forEach((item) => { - this.treeControl.expand(item); + console.log("tree", this.newdata); + this.dataSource.data = this.newdata; + let newNodes = this.treeControl.dataNodes; + newNodes = newNodes.filter((n) => { + return expandNodes.indexOf(n.id) >= 0; + }); + newNodes.forEach((item) => { + this.treeControl.expand(item); + }); + this.isloading = false; }); - this.isloading = false; - }); }; //初始化视图 ngOnInit() { - this.http.get("/api/Organizations").subscribe((data: any) => { - this.data = data; - this.dataSource.data = this.tree.toTree(data); - this.treeControl.expand(this.treeControl.dataNodes[0]); - }); + this.http + .get("/api/Organizations", { + params: { + strict: "true", + }, + }) + .subscribe((data: any) => { + this.data = data; + this.dataSource.data = this.tree.toTree(data); + this.treeControl.expand(this.treeControl.dataNodes[0]); + }); } hasChild = (_: number, node: any) => node.expandable; //创建组织按钮 create(value) { + let data = null; + value + ? (data = { + id: value.id, + childlength: value.children, + level: value.level, + }) + : (data = null); const dialogRef = this.dialog.open(CreateOrganization, { //调用open方法打开对话框并且携带参数过去 width: "260px", - data: { id: value.id, childlength: value.children, level: value.level }, + data: data, }); dialogRef.afterClosed().subscribe((data) => { if (data) { @@ -342,6 +362,26 @@ export class CreateOrganization { } onSubmit(value) { + if (!this.data) { + this.http + .post("/api/Organizations", { + code: value.number, + division: value.division, + name: value.name, + level: 0, + enabled: true, + parentId: null, + }) + .subscribe((data) => { + this.dialogRef.close(data); + const config = new MatSnackBarConfig(); + config.verticalPosition = "top"; + config.duration = 3000; + this.snackBar.open("创建组织成功", "确定", config); + }); + return; + } + if (this.data.childlength) { //如果点击节点存在children this.http diff --git a/src/app/ui/usermanagement/usermanagement.component.ts b/src/app/ui/usermanagement/usermanagement.component.ts index 481b59a..f9d2d46 100644 --- a/src/app/ui/usermanagement/usermanagement.component.ts +++ b/src/app/ui/usermanagement/usermanagement.component.ts @@ -1,290 +1,309 @@ -import { Component, OnInit, ViewChild, Inject } from '@angular/core'; -import {HttpClient} from '@angular/common/http' -import { MatDialogRef, MatDialog, MAT_DIALOG_DATA } from '@angular/material/dialog'; -import { MatPaginator } from '@angular/material/paginator'; -import { MatTableDataSource } from '@angular/material/table'; -import { FlatTreeControl } from '@angular/cdk/tree'; -import { MatTreeFlattener, MatTreeFlatDataSource } from '@angular/material/tree'; -import { PageEvent } from '@angular/material/paginator'; -import { MatSnackBar, MatSnackBarConfig } from '@angular/material/snack-bar'; -import { TreeService } from '../../http-interceptors/tree.service' -import { FormControl } from '@angular/forms'; - - +import { Component, OnInit, ViewChild, Inject } from "@angular/core"; +import { HttpClient } from "@angular/common/http"; +import { + MatDialogRef, + MatDialog, + MAT_DIALOG_DATA, +} from "@angular/material/dialog"; +import { MatPaginator } from "@angular/material/paginator"; +import { MatTableDataSource } from "@angular/material/table"; +import { FlatTreeControl } from "@angular/cdk/tree"; +import { + MatTreeFlattener, + MatTreeFlatDataSource, +} from "@angular/material/tree"; +import { PageEvent } from "@angular/material/paginator"; +import { MatSnackBar, MatSnackBarConfig } from "@angular/material/snack-bar"; +import { TreeService } from "../../http-interceptors/tree.service"; +import { FormControl } from "@angular/forms"; @Component({ - selector: 'app-usermanagement', - templateUrl: './usermanagement.component.html', - styleUrls: ['./usermanagement.component.scss'] + selector: "app-usermanagement", + templateUrl: "./usermanagement.component.html", + styleUrls: ["./usermanagement.component.scss"], }) export class UsermanagementComponent implements OnInit { - - constructor(public http: HttpClient,public dialog: MatDialog,public snackBar: MatSnackBar,private tree: TreeService) { } - private _transformer = (node, level: number) => { //初始化tree + constructor( + public http: HttpClient, + public dialog: MatDialog, + public snackBar: MatSnackBar, + private tree: TreeService + ) {} + private _transformer = (node, level: number) => { + //初始化tree return { expandable: !!node.children && node.children.length > 0, name: node.name, level: level, id: node.id, parentId: node.parentId, - children: node.children + children: node.children, }; - } - treeControl = new FlatTreeControl(node => node.level, node => node.expandable); - treeFlattener = new MatTreeFlattener(this._transformer, node => node.level, node => node.expandable, node => node.children); - treedataSource = new MatTreeFlatDataSource(this.treeControl, this.treeFlattener); + }; + treeControl = new FlatTreeControl( + (node) => node.level, + (node) => node.expandable + ); + treeFlattener = new MatTreeFlattener( + this._transformer, + (node) => node.level, + (node) => node.expandable, + (node) => node.children + ); + treedataSource = new MatTreeFlatDataSource( + this.treeControl, + this.treeFlattener + ); myControl = new FormControl(); hasChild = (_: number, node: any) => node.expandable; - ngOnInit() { - this.initData() - this.getAllMechanism() - } - + async ngOnInit() { + await this.getAllMechanism(); + console.log(88888, this.treedata); + this.userMechanism = this.treedata[0].id; - displayedColumns: string[] = ['loginName', 'realName', 'mechanism','office','role','time', 'operation']; - dataSource:any; //所有用户 - allMechanism:any; //所有机构 + this.initData(); + } - userLogin:string; //搜索账号 - userName:string; //搜索名称 - userMechanism:string //搜索机构 + displayedColumns: string[] = [ + "loginName", + "realName", + "mechanism", + "office", + "role", + "time", + "operation", + ]; + dataSource: any; //所有用户 + allMechanism: any; //所有机构 + + userLogin: string; //搜索账号 + userName: string; //搜索名称 + userMechanism: string; //搜索机构 //分页 - @ViewChild(MatPaginator, {static: true}) + @ViewChild(MatPaginator, { static: true }) pageEvent: PageEvent; paginator: MatPaginator; - length:any; //共多少条数据 - pageSize:any; //每页条数 - pageSizeOptions: number[] = [10] //设置每页条数 - pageNumber:number = 1; //第几页 + length: any; //共多少条数据 + pageSize: any; //每页条数 + pageSizeOptions: number[] = [10]; //设置每页条数 + pageNumber: number = 1; //第几页 //分页切换 - chagePage (e) { - this.pageNumber = e.pageIndex+1 + chagePage(e) { + this.pageNumber = e.pageIndex + 1; let data = { - Name: this.userLogin ||'', - RealName:this.userName ||'', - OrganizationId:this.userMechanism ||'', + Name: this.userLogin || "", + RealName: this.userName || "", + OrganizationId: this.userMechanism || "", PageNumber: String(this.pageNumber), - } - this.http.get('/api/Users',{params:data}).subscribe( - (data:any[])=> { - this.length = data['totalCount'] - this.pageSize = data['pageSize'] - this.dataSource = new MatTableDataSource(data['items']); - } - ) + }; + this.http.get("/api/Users", { params: data }).subscribe((data: any[]) => { + this.length = data["totalCount"]; + this.pageSize = data["pageSize"]; + this.dataSource = new MatTableDataSource(data["items"]); + }); } - isorganizationbox:any = false - stopclose(e){ + isorganizationbox: any = false; + stopclose(e) { e.stopPropagation(); } - js:any + js: any; // jsId:any //点击辖区中队树，将选择的辖区中队添加到变量 add(node) { - this.isorganizationbox = false - this.js = node.name + this.isorganizationbox = false; + this.js = node.name; // console.log(this.js) - this.userMechanism = node.id + this.userMechanism = node.id; } //打开辖区中队隐藏框 openorganizationbox() { - this.isorganizationbox = true + this.isorganizationbox = true; } //关闭出现的组织机构div - closediv(){ - this.isorganizationbox = false + closediv() { + this.isorganizationbox = false; } - + //页面初始化 + 查询 + 重置 - initData () { + initData() { let data = { - Name: this.userLogin ||'', - RealName:this.userName ||'', - OrganizationId:this.userMechanism ||'', - PageNumber: '1', - } - this.http.get('/api/Users',{params:data}).subscribe( - (data:any[])=> { - this.length = data['totalCount'] - this.pageSize = data['pageSize'] - this.pageEvent.pageIndex = 0 - this.dataSource = new MatTableDataSource(data['items']); - } - ) + Name: this.userLogin || "", + RealName: this.userName || "", + OrganizationId: this.userMechanism || "", + PageNumber: "1", + }; + this.http.get("/api/Users", { params: data }).subscribe((data: any[]) => { + this.length = data["totalCount"]; + this.pageSize = data["pageSize"]; + this.pageEvent.pageIndex = 0; + this.dataSource = new MatTableDataSource(data["items"]); + }); } //更新当前页数据 - getUsers () { + getUsers() { let data = { - Name: this.userLogin ||'', - RealName:this.userName ||'', - OrganizationId:this.userMechanism ||'', + Name: this.userLogin || "", + RealName: this.userName || "", + OrganizationId: this.userMechanism || "", PageNumber: String(this.pageNumber), - } - this.http.get('/api/Users',{params:data}).subscribe( - (data:any[])=> { - this.length = data['totalCount'] - this.pageSize = data['pageSize'] - this.dataSource = new MatTableDataSource(data['items']); - } - ) - + }; + this.http.get("/api/Users", { params: data }).subscribe((data: any[]) => { + this.length = data["totalCount"]; + this.pageSize = data["pageSize"]; + this.dataSource = new MatTableDataSource(data["items"]); + }); } //清空自动搜索 - empty () { - this.userLogin='' - this.userName='' - this.userMechanism='' - this.js = '' - this.isorganizationbox = false - this.initData() - } - allorganizations:any//所有组织机构 - treedata:any//所有组织机构变成树 - newallorganizations:any + empty() { + this.userLogin = ""; + this.userName = ""; + this.userMechanism = this.treedata[0].id; + this.js = ""; + this.isorganizationbox = false; + this.initData(); + } + allorganizations: any; //所有组织机构 + treedata: any; //所有组织机构变成树 + newallorganizations: any; //获取所有机构 getAllMechanism() { - this.http.get('/api/Organizations').subscribe(data=>{ - this.allorganizations = data - this.treedata = this.tree.toTree(data); - this.treedataSource.data = this.treedata - }) + return new Promise((resolve, reject) => { + this.http + .get("/api/Organizations", { + params: { + strict: "true", + }, + }) + .subscribe((data) => { + this.allorganizations = data; + this.treedata = this.tree.toTree(data); + this.treedataSource.data = this.treedata; + resolve(); + }); + }); } //打开创建用户窗口 open() { - let dialogRef = this.dialog.open(CreateNewUser,{ - width: '850px', + let dialogRef = this.dialog.open(CreateNewUser, { + width: "850px", + }); + dialogRef.afterClosed().subscribe((data) => { + if (data) { + this.getUsers(); + } }); - dialogRef.afterClosed().subscribe( - (data)=>{ - if (data) {this.getUsers()} - } - ); } - + //打开分配角色窗口 - openuser (e) { - let dialogRef = this.dialog.open(allRoles, - { - width:'600px', - data: {e} - }); - dialogRef.afterClosed().subscribe( - (data)=>{ - if (data) {this.getUsers()} + openuser(e) { + let dialogRef = this.dialog.open(allRoles, { + width: "600px", + data: { e }, + }); + dialogRef.afterClosed().subscribe((data) => { + if (data) { + this.getUsers(); } - ); + }); } //启用 - enable (e) { - this.http.put(`/api/Users/${e.name}`,{ - name: e.name, - realName:e.realName, - post: e.post, - phone: e.phone, - enabled: true, - creationTime:e.creationTime, - organizationId:e.organizationId - }).subscribe( - data=> { - this.getUsers() - } - ) + enable(e) { + this.http + .put(`/api/Users/${e.name}`, { + name: e.name, + realName: e.realName, + post: e.post, + phone: e.phone, + enabled: true, + creationTime: e.creationTime, + organizationId: e.organizationId, + }) + .subscribe((data) => { + this.getUsers(); + }); } //禁用 - prohibit (e) { - this.http.put(`/api/Users/${e.name}`,{ - name: e.name, - realName:e.realName, - post: e.post, - phone: e.phone, - enabled: false, - creationTime:e.creationTime, - organizationId:e.organizationId - }).subscribe( - data=> { - this.getUsers() - } - ) + prohibit(e) { + this.http + .put(`/api/Users/${e.name}`, { + name: e.name, + realName: e.realName, + post: e.post, + phone: e.phone, + enabled: false, + creationTime: e.creationTime, + organizationId: e.organizationId, + }) + .subscribe((data) => { + this.getUsers(); + }); } //编辑 - edit (e) { - let allMechanism=this.allMechanism - let dialogRef = this.dialog.open(EditNewUser, - { - data: {e,allMechanism} - }); + edit(e) { + let allMechanism = this.allMechanism; + let dialogRef = this.dialog.open(EditNewUser, { + data: { e, allMechanism }, + }); - dialogRef.afterClosed().subscribe( - (data)=>{ - if (data) {this.getUsers()} + dialogRef.afterClosed().subscribe((data) => { + if (data) { + this.getUsers(); } - ); + }); } //查看 - see (e) { - this.http.get(`/api/Users/${e}`).subscribe( - data=> { - let dialogRef = this.dialog.open(seeInformation, - { - width:'600px', - data - }); - dialogRef.afterClosed().subscribe(); - } - - ) + see(e) { + this.http.get(`/api/Users/${e}`).subscribe((data) => { + let dialogRef = this.dialog.open(seeInformation, { + width: "600px", + data, + }); + dialogRef.afterClosed().subscribe(); + }); } //重置密码 - reset (e) { - this.http.put(`/api/Users/${e}/ResetPassword`,{}).subscribe( - data=> { - const config = new MatSnackBarConfig(); - config.verticalPosition = 'top'; - config.duration = 3000 - this.snackBar.open('重置密码成功!','确定',config); - } - ) + reset(e) { + this.http.put(`/api/Users/${e}/ResetPassword`, {}).subscribe((data) => { + const config = new MatSnackBarConfig(); + config.verticalPosition = "top"; + config.duration = 3000; + this.snackBar.open("重置密码成功!", "确定", config); + }); } - + //删除 - delete (e) { - let isTrue = confirm('您确定要删除吗') + delete(e) { + let isTrue = confirm("您确定要删除吗"); if (isTrue) { - this.http.delete(`/api/Users/${e}`).subscribe( - data=>{ - this.getUsers() - } - ) + this.http.delete(`/api/Users/${e}`).subscribe((data) => { + this.getUsers(); + }); } } - - - } //创建用户组件 @Component({ - selector: 'app-createUser', - templateUrl: './createUser.html', - styleUrls: ['./usermanagement.component.scss'] + selector: "app-createUser", + templateUrl: "./createUser.html", + styleUrls: ["./usermanagement.component.scss"], }) export class CreateNewUser { - newdata = []; private _transformer = (node, level: number) => { @@ -294,132 +313,151 @@ export class CreateNewUser { level: level, id: node.id, parentId: node.parentId, - enabled:node.enabled, - order:node.order, + enabled: node.enabled, + order: node.order, }; - } - treeControl = new FlatTreeControl(node => node.level, node => node.expandable); - treeFlattener = new MatTreeFlattener(this._transformer, node => node.level, node => node.expandable, node => node.children); + }; + treeControl = new FlatTreeControl( + (node) => node.level, + (node) => node.expandable + ); + treeFlattener = new MatTreeFlattener( + this._transformer, + (node) => node.level, + (node) => node.expandable, + (node) => node.children + ); dataSource = new MatTreeFlatDataSource(this.treeControl, this.treeFlattener); - - constructor(public http: HttpClient,public snackBar: MatSnackBar, - public dialogRef: MatDialogRef) {} - organizationId:any=''; //所属机构id - organizationName:any; //所属机构name + constructor( + public http: HttpClient, + public snackBar: MatSnackBar, + public dialogRef: MatDialogRef + ) {} + + organizationId: any = ""; //所属机构id + organizationName: any; //所属机构name ngOnInit() { - this.tree() + this.tree(); } //渲染Tree - tree () { - this.newdata=[] - this.http.get('/api/Organizations').subscribe( - (data:any)=>{ - function getparentNode(parentId){ - return data.find((item)=>{ - return item.id == parentId - }) + tree() { + this.newdata = []; + this.http + .get("/api/Organizations", { + params: { + strict: "true", + }, + }) + .subscribe((data: any) => { + function getparentNode(parentId) { + return data.find((item) => { + return item.id == parentId; + }); } - data.forEach(item => { - var parentNode = getparentNode(item.parentId); - if(parentNode){ - if(!parentNode.children){ - parentNode.children = [] + data.forEach((item) => { + var parentNode = getparentNode(item.parentId); + if (parentNode) { + if (!parentNode.children) { + parentNode.children = []; } - parentNode.children.push(item) - }else{ - if(!item.parentId){ - this.newdata.push(item) + parentNode.children.push(item); + } else { + if (!item.parentId) { + this.newdata.push(item); } } }); this.dataSource.data = this.newdata; - } - ) - + }); } hasChild = (_: number, node: any) => node.expandable; //选择机构 - add (e) { - this.organizationId = e.id - this.organizationName = e.name - this.selectedOffices = {} - this.getOffices(e) - } - selectedOrg:any//当前选择的组织机构 - OfficesList:any //获得的下级列表 + add(e) { + this.organizationId = e.id; + this.organizationName = e.name; + this.selectedOffices = {}; + this.getOffices(e); + } + selectedOrg: any; //当前选择的组织机构 + OfficesList: any; //获得的下级列表 //获得点击组织机构的下级机关单位 - getOffices(node){ + getOffices(node) { // console.log(node) - this.selectedOrg = node - this.http.get(`/api/OrganizationsOffices/${node.id}`).subscribe(data => { + this.selectedOrg = node; + this.http.get(`/api/OrganizationsOffices/${node.id}`).subscribe((data) => { // console.log("获取成功",data) - this.OfficesList = data - }) + this.OfficesList = data; + }); } //选择机关 - selectedOffices:any = {} - selectOffice(item){ - this.selectedOffices = item + selectedOffices: any = {}; + selectOffice(item) { + this.selectedOffices = item; // console.log(item) } - errmsg:any; //捕获错误信息 + errmsg: any; //捕获错误信息 //新增用户 onSubmit(e) { - let time =new Date() - if(this.organizationId) { - this.http.post('/api/Users',{ - name:e.name, - realName:e.user, - post:e.post, - identityCard:e.identityCard, - phone:e.phone, - enabled:true, - creationTime:time, - organizationId:this.organizationId, - organizationOfficeId:this.selectedOffices.id - }).subscribe(data=> { - this.dialogRef.close('success')}, - error=>{this.errmsg = error} - ) - }else{ + let time = new Date(); + if (this.organizationId) { + this.http + .post("/api/Users", { + name: e.name, + realName: e.user, + post: e.post, + identityCard: e.identityCard, + phone: e.phone, + enabled: true, + creationTime: time, + organizationId: this.organizationId, + organizationOfficeId: this.selectedOffices.id, + }) + .subscribe( + (data) => { + this.dialogRef.close("success"); + }, + (error) => { + this.errmsg = error; + } + ); + } else { const config = new MatSnackBarConfig(); - config.verticalPosition = 'top'; - config.duration = 3000 - this.snackBar.open('请选择机构','确定',config); + config.verticalPosition = "top"; + config.duration = 3000; + this.snackBar.open("请选择机构", "确定", config); } } - - - } - - //编辑用户组件 @Component({ - selector: 'app-editUser', - templateUrl: './editUser.html', - styleUrls: ['./usermanagement.component.scss'] + selector: "app-editUser", + templateUrl: "./editUser.html", + styleUrls: ["./usermanagement.component.scss"], }) export class EditNewUser { - constructor(public http: HttpClient,public snackBar: MatSnackBar, - public dialogRef: MatDialogRef,@Inject(MAT_DIALOG_DATA) public data) {} + constructor( + public http: HttpClient, + public snackBar: MatSnackBar, + public dialogRef: MatDialogRef, + @Inject(MAT_DIALOG_DATA) public data + ) {} ngOnInit() { - this.getTreeData() - this.name=this.data.e.name - this.realName=this.data.e.realName - this.identityCard = this.data.e.identityCard - this.post=this.data.e.post, - this.phone=this.data.e.phone, - this.affiliate=this.data.e.organizationId - this.affiliateName=this.data.e.organizationName - this.selectedOffices.officeName = this.data.e.organizationOfficeName - this.selectedOffices.id = this.data.e.organizationOfficeId + this.getTreeData(); + this.name = this.data.e.name; + this.realName = this.data.e.realName; + this.identityCard = this.data.e.identityCard; + (this.post = this.data.e.post), + (this.phone = this.data.e.phone), + (this.affiliate = this.data.e.organizationId); + this.affiliateName = this.data.e.organizationName; + this.selectedOffices.officeName = this.data.e.organizationOfficeName; + this.selectedOffices.id = this.data.e.organizationOfficeId; // console.log(this.data) } @@ -430,165 +468,186 @@ export class EditNewUser { level: level, id: node.id, parentId: node.parentId, - enabled:node.enabled, - order:node.order, + enabled: node.enabled, + order: node.order, }; - } - treeControl = new FlatTreeControl(node => node.level, node => node.expandable); - treeFlattener = new MatTreeFlattener(this._transformer, node => node.level, node => node.expandable, node => node.children); + }; + treeControl = new FlatTreeControl( + (node) => node.level, + (node) => node.expandable + ); + treeFlattener = new MatTreeFlattener( + this._transformer, + (node) => node.level, + (node) => node.expandable, + (node) => node.children + ); dataSource = new MatTreeFlatDataSource(this.treeControl, this.treeFlattener); hasChild = (_: number, node: any) => node.expandable; - name:any; //登录账号 - realName:any; //真实姓名 - post:any; //职务 - phone:any; //联系电话 - affiliate:any; //所属机构id - affiliateName:any; //所属机构name + name: any; //登录账号 + realName: any; //真实姓名 + post: any; //职务 + phone: any; //联系电话 + affiliate: any; //所属机构id + affiliateName: any; //所属机构name //获取tree数据 - getTreeData () { - this.http.get('/api/Organizations').subscribe((data:any)=>{ - let treeData = [] - data.forEach(element => { - element.children = [] - data.forEach(item => { if (item.parentId==element.id) {element.children.push(item)} }); - if(!element.parentId) {treeData.push(element)} - }); //forEach - this.dataSource.data = treeData - - }) + getTreeData() { + this.http + .get("/api/Organizations", { + params: { + strict: "true", + }, + }) + .subscribe((data: any) => { + let treeData = []; + data.forEach((element) => { + element.children = []; + data.forEach((item) => { + if (item.parentId == element.id) { + element.children.push(item); + } + }); + if (!element.parentId) { + treeData.push(element); + } + }); //forEach + this.dataSource.data = treeData; + }); } //选择组织机构 - add (e) { - this.affiliate = e.id - this.affiliateName = e.name - this.selectedOffices = {} - this.getOffices(e) - } - selectedOrg:any//当前选择的组织机构 - OfficesList:any //获得的下级列表 - //获得点击组织机构的下级机关单位 - getOffices(node){ - // console.log(node) - this.selectedOrg = node - this.http.get(`/api/OrganizationsOffices/${node.id}`).subscribe(data => { - // console.log("获取成功",data) - this.OfficesList = data - }) - } - //选择机关 - selectedOffices:any = {} - selectOffice(item){ - this.selectedOffices = item - // console.log(item) - } + add(e) { + this.affiliate = e.id; + this.affiliateName = e.name; + this.selectedOffices = {}; + this.getOffices(e); + } + selectedOrg: any; //当前选择的组织机构 + OfficesList: any; //获得的下级列表 + //获得点击组织机构的下级机关单位 + getOffices(node) { + // console.log(node) + this.selectedOrg = node; + this.http.get(`/api/OrganizationsOffices/${node.id}`).subscribe((data) => { + // console.log("获取成功",data) + this.OfficesList = data; + }); + } + //选择机关 + selectedOffices: any = {}; + selectOffice(item) { + this.selectedOffices = item; + // console.log(item) + } //编辑 - identityCard:any//身份证 - onSubmit (e) { - this.http.put(`/api/Users/${this.data.e.name}`,{ - name:this.data.e.name, - realName:this.realName, - post:this.post, - identityCard:this.identityCard, - phone:this.phone, - roleNames:this.data.e.roleNames, - enabled: this.data.e.enabled, - creationTime:this.data.e.creationTime, - organizationId:this.affiliate, - organizationOfficeId:this.selectedOffices.id - }).subscribe(data=>{ - this.dialogRef.close('success') - }) - + identityCard: any; //身份证 + onSubmit(e) { + this.http + .put(`/api/Users/${this.data.e.name}`, { + name: this.data.e.name, + realName: this.realName, + post: this.post, + identityCard: this.identityCard, + phone: this.phone, + roleNames: this.data.e.roleNames, + enabled: this.data.e.enabled, + creationTime: this.data.e.creationTime, + organizationId: this.affiliate, + organizationOfficeId: this.selectedOffices.id, + }) + .subscribe((data) => { + this.dialogRef.close("success"); + }); } - - - } - - //分配角色组件 @Component({ - selector: 'app-allRoles', - templateUrl: './allRoles.html', - styleUrls: ['./usermanagement.component.scss'] + selector: "app-allRoles", + templateUrl: "./allRoles.html", + styleUrls: ["./usermanagement.component.scss"], }) export class allRoles { - - constructor(public http: HttpClient,public snackBar: MatSnackBar, + constructor( + public http: HttpClient, + public snackBar: MatSnackBar, public dialogRef: MatDialogRef, - @Inject(MAT_DIALOG_DATA) public data) {} + @Inject(MAT_DIALOG_DATA) public data + ) {} - ngOnInit() { - this.getUsers() - } + ngOnInit() { + this.getUsers(); + } - allRoles:any; //所有角色 - checked:any=[]; //选中的角色 - - //获取所有角色 - getUsers () { - this.http.get('/api/Roles').subscribe( data=>{ - this.allRoles=data - this.allRoles.forEach(element => { //所有角色 - element.checked = false - this.data.e.roleNames.forEach(elements=> { //当前账号已有角色 - if (element.name == elements) { - element.checked = true - this.checked.push(element)} }); + allRoles: any; //所有角色 + checked: any = []; //选中的角色 + + //获取所有角色 + getUsers() { + this.http.get("/api/Roles").subscribe((data) => { + this.allRoles = data; + this.allRoles.forEach((element) => { + //所有角色 + element.checked = false; + this.data.e.roleNames.forEach((elements) => { + //当前账号已有角色 + if (element.name == elements) { + element.checked = true; + this.checked.push(element); + } }); + }); + }); + } - }) - } - - //check框change事件 - fill (e) { - e.checked = !e.checked - if (e.checked) { - this.checked.push(e) - } else { - this.checked.splice(this.checked.findIndex(item => item==e), 1) - } + //check框change事件 + fill(e) { + e.checked = !e.checked; + if (e.checked) { + this.checked.push(e); + } else { + this.checked.splice( + this.checked.findIndex((item) => item == e), + 1 + ); } + } - //分配角色 - onSubmit () { - if (this.checked.length) { - let data:any=[] - this.checked.forEach(item=>{ - data.push(item.id) - }) - this.http.post(`/api/Users/${this.data.e.name}/Roles`,data).subscribe( data=> { - this.dialogRef.close('success') - }) - } else { - const config = new MatSnackBarConfig(); - config.verticalPosition = 'top'; - config.duration = 3000 - this.snackBar.open('请选择分配角色','确定',config); - } + //分配角色 + onSubmit() { + if (this.checked.length) { + let data: any = []; + this.checked.forEach((item) => { + data.push(item.id); + }); + this.http + .post(`/api/Users/${this.data.e.name}/Roles`, data) + .subscribe((data) => { + this.dialogRef.close("success"); + }); + } else { + const config = new MatSnackBarConfig(); + config.verticalPosition = "top"; + config.duration = 3000; + this.snackBar.open("请选择分配角色", "确定", config); } - - - + } } - //查看用户组件 @Component({ - selector: 'app-seeInformation', - templateUrl: './seeInformation.html', - styleUrls: ['./usermanagement.component.scss'] + selector: "app-seeInformation", + templateUrl: "./seeInformation.html", + styleUrls: ["./usermanagement.component.scss"], }) export class seeInformation { - constructor(public http: HttpClient, + constructor( + public http: HttpClient, public dialogRef: MatDialogRef, - @Inject(MAT_DIALOG_DATA) public data) {} - - ngOnInit() { - } + @Inject(MAT_DIALOG_DATA) public data + ) {} + ngOnInit() {} } diff --git a/src/index.html b/src/index.html index d0aa01d..a6899a6 100644 --- a/src/index.html +++ b/src/index.html @@ -24,9 +24,9 @@ securityJsCode: 'dca2583973d0448116433fd64f97f8f8' } - - + -->