Browse Source

[新建]预案审核模块新建

dev
chenjingyu 4 years ago
parent
commit
772d50c439
  1. 60
      src/app/key-unit/key-unit-management/key-unit-management.component.ts
  2. 27
      src/app/key-unit/key-unit-management/upname.html
  3. 38
      src/app/key-unit/key-unit-management/upname.scss
  4. 3
      src/app/key-unit/key-unit.module.ts
  5. 4
      src/app/plan-audit/basic-info/basic-info.component.html
  6. 6
      src/app/plan-audit/plan-audit-routing.module.ts
  7. 8
      src/app/plan-audit/wait-examineer/wait-examineer.component.html
  8. 9
      src/app/plan-audit/wait-examineer/wait-examineer.component.scss
  9. 98
      src/app/plan-audit/wait-examineer/wait-examineer.component.ts
  10. 4
      src/app/plan-management/onetwo-entry-plan/newunit.html
  11. 22
      src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.html
  12. 4
      src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.scss
  13. 10
      src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.ts
  14. 4
      src/app/plan-management/plan-management-routing.module.ts

60
src/app/key-unit/key-unit-management/key-unit-management.component.ts

@ -548,8 +548,18 @@ export class KeyUnitManagementComponent implements OnInit {
}
//编辑单位名称
editUnitName(element){
console.log(element)
//console.log(element)
const dialogRef = this.dialog.open(upname, {
width: '340px',
height:'280px',
data: element
});
dialogRef.afterClosed().subscribe(result => {
//console.log(result);
element.name=result
});
}
//跳转查看基本信息页面
unitdetails(element){
console.log(element)
@ -695,3 +705,51 @@ export class CreateUnit {
})
}
}
//修改单位名称
@Component({
selector: 'upname',
templateUrl: './upname.html',
styleUrls: ['./upname.scss']
})
export class upname{
constructor(private router:Router,private http: HttpClient,public dialog: MatDialog,public snackBar: MatSnackBar,public dialogRef: MatDialogRef<upname>,@Inject(MAT_DIALOG_DATA) public data: any) {}
unitname//修改后的名称
oldname=this.data.name//原名
oldid=this.data.id
//取消
close(){
this.dialogRef.close(this.oldname);
}
//确定
updateName(){
//console.log(this.unitname)
const config = new MatSnackBarConfig();
config.verticalPosition = 'top';
config.duration = 3000
if(this.unitname==''||this.unitname==undefined){
this.snackBar.open('请填写新单位名称','确定',config);
}else if(this.unitname==this.oldname){
this.snackBar.open('新单位名称不能和旧单位名称一样','确定',config);
}
else{
let paramsdata:any = {
id:this.oldid,
name: this.unitname,
buildingTypes:[{
id:this.data.buildingTypes[0].id,
name:this.data.buildingTypes[0].name
}]
}
this.http.put(`/api/Companies/${this.oldid}`,paramsdata).subscribe((data:any)=>{
this.snackBar.open("修改名字成功",'确定',config);
},err => {
this.snackBar.open(err,'确定',config);
})
this.dialogRef.close(this.unitname);
}
}
}

27
src/app/key-unit/key-unit-management/upname.html

@ -0,0 +1,27 @@
<!--
* @Descripttion:
* @version:
* @Author: sueRimn
* @Date: 2020-12-26 15:26:00
* @LastEditors: sueRimn
* @LastEditTime: 2020-12-28 13:52:04
-->
<div class="box">
<div class="top">
<span>修改预案名称</span>
</div>
<div class="queryField">
<label style="margin-right: 10px;">原预案名称:</label>
<label style="margin-right: 10px;" >{{oldname}}</label>
</div>
<div class="queryField">
<label style="margin-right: 10px;">新预案名称:</label>
<mat-form-field class="example-full-width">
<input matInput placeholder="请输入新预案名称" required name="companyName" autocomplete="off" [(ngModel)]="unitname">
</mat-form-field>
</div>
<div class="bottom">
<button mat-raised-button color="primary" (click)="updateName()">确定</button>
<button mat-raised-button style="margin-left: 50px;" (click)="close()">取消</button>
</div>
</div>

38
src/app/key-unit/key-unit-management/upname.scss

@ -0,0 +1,38 @@
.box{
height: 100%;
width: 100%;
display: flex;
flex-direction: column;
}
.queryField {
margin: 6px 5px;
input {
//width: 50px;
height: 18px;
line-height: 18px;
border-radius: 3px;}
button{
width: 140px;
font-size: 16px;
}
label{
font-size: 16px;
}
}
.top{
width: 100%;
margin-bottom: 20px;
span{
color: #2196F3;
margin-left: 10px;
font-size: 18px;
}
}
.bottom{
margin: 15px 35px;
button{
width: 80px;
height: 36px;
font-size: 16px;
}
}

3
src/app/key-unit/key-unit.module.ts

@ -84,9 +84,10 @@ import { EditText, WaterRoadComponent } from './water-road/water-road.component'
import { PhotoofthesceneComponent } from './photoofthescene/photoofthescene.component';
import { KnowRouteComponent } from './know-route/know-route.component';
import { FindProblemComponent } from './find-problem/find-problem.component';
import { upname } from './key-unit-management/key-unit-management.component'
@NgModule({
declarations: [KeyUnitManagementComponent, EditUnitInfoComponent, ViewUnitDetailsComponent,CreateUnit,BasicinfoComponent,LookMaster,AddHouseInfo, EditPlanInfoComponent,BasicinfoLookComponent, ViewUnitDetailsPlanComponent,FunctionDivisionComponent,addPartition,addPartitionAttribute,AllaroundComponent,ImgDetails,RealisticPictureComponent,previewImg,addRealPicture,editRealPicture,KeySiteComponent,KeyImgDetail,KeySiteImgs,UploadingCADComponent,readFile,editFile,KeySiteLookComponent,KeySiteImgs2,FunctionDivisionLookComponent,RealisticPictureLookComponent,previewImg3,UploadingCADLookComponent,FireFightingDeviceComponent,ImagesData,previewBigImg,ImgsDataDetail,FireFightingDeviceLookComponent,ImagesData2,ImgsDataDetail2,previewBigImg2,LookMaster2,addPartitionAttribute2, SixFamiliarityComponent, ActualCombatDrillComponent,routerMapComponent, SixFamiliarListComponent,TrainingRecordinfoComponent,RouterGISComponent,WaterRoadComponent,EditText,PhotoofthesceneComponent,KnowRouteComponent,FindProblemComponent],
declarations: [KeyUnitManagementComponent, EditUnitInfoComponent, ViewUnitDetailsComponent,CreateUnit,BasicinfoComponent,LookMaster,AddHouseInfo, EditPlanInfoComponent,BasicinfoLookComponent, ViewUnitDetailsPlanComponent,FunctionDivisionComponent,addPartition,addPartitionAttribute,AllaroundComponent,ImgDetails,RealisticPictureComponent,previewImg,addRealPicture,editRealPicture,KeySiteComponent,KeyImgDetail,KeySiteImgs,UploadingCADComponent,readFile,editFile,KeySiteLookComponent,KeySiteImgs2,FunctionDivisionLookComponent,RealisticPictureLookComponent,previewImg3,UploadingCADLookComponent,FireFightingDeviceComponent,ImagesData,previewBigImg,ImgsDataDetail,FireFightingDeviceLookComponent,ImagesData2,ImgsDataDetail2,previewBigImg2,LookMaster2,addPartitionAttribute2, SixFamiliarityComponent, ActualCombatDrillComponent,routerMapComponent, SixFamiliarListComponent,TrainingRecordinfoComponent,RouterGISComponent,WaterRoadComponent,EditText,PhotoofthesceneComponent,KnowRouteComponent,FindProblemComponent,upname],
exports:[ViewUnitDetailsPlanComponent],
imports: [
CommonModule,

4
src/app/plan-audit/basic-info/basic-info.component.html

@ -4,13 +4,13 @@
* @Author: sueRimn
* @Date: 2020-12-25 15:29:42
* @LastEditors: sueRimn
* @LastEditTime: 2020-12-25 15:59:18
* @LastEditTime: 2020-12-27 14:10:41
-->
<div class="content">
<div id="firefacilities" style="margin: 10px;">
<mat-accordion class="tableContent" >
<mat-expansion-panel style="box-shadow: 0 0 black;border: 1px solid #EEF1F5;">
<mat-expansion-panel expanded style="box-shadow: 0 0 black;border: 1px solid #EEF1F5;">
<mat-expansion-panel-header collapsedHeight ='40px' expandedHeight='40px' class="panelhead" style="background-color: #2196F3;">
<mat-panel-title style="font-size: 16px;color: #FFFFFF;" >
单位信息

6
src/app/plan-audit/plan-audit-routing.module.ts

@ -4,7 +4,7 @@
* @Author: sueRimn
* @Date: 2020-12-24 10:59:48
* @LastEditors: sueRimn
* @LastEditTime: 2020-12-25 16:27:40
* @LastEditTime: 2020-12-28 09:11:45
*/
import { NgModule } from '@angular/core';
import { Routes, RouterModule } from '@angular/router';
@ -18,8 +18,8 @@ const routes: Routes = [
{ path: 'detachmentLevel', component: DetachmentLevelComponent },
{ path: 'planaudit', component: PlanAuditComponent },
{ path: 'planpass', component: PlanPassComponent },
{ path: 'planrecord', component: PlanRecordComponent },
{ path: 'waitexamineer', component: WaitExamineerComponent },
{ path: 'planrecord', component: PlanRecordComponent },//预案审核记录
{ path: 'waitexamineer', component: WaitExamineerComponent },//预案待审核
];
@NgModule({

8
src/app/plan-audit/wait-examineer/wait-examineer.component.html

@ -55,7 +55,7 @@
<div class="righthead">
<div class="rightheadone">
<button mat-raised-button color="primary" (click)="buttonChange()"><img src="../../../assets/images/preview.png" style="margin-right: 3px;margin-bottom: 3px;">{{isallDate?'显示变更数据':'显示完整数据'}} </button>
<button mat-raised-button *ngIf="isallDate" style="background-color: #FFCC00; color: #FFFFFF;"><img src="../../../assets/images/change.png" style="margin-bottom: 2px;"> 预览得分</button>
<button mat-raised-button *ngIf="isallDate" style="background-color: #FFCC00; color: #FFFFFF;" (click)="preview()"><img src="../../../assets/images/change.png" style="margin-bottom: 2px;" > 预览得分</button>
</div>
<div class="rightheadtwo">
<button mat-raised-button style="color: #FFFFFF;background-color: #FF7161;float: right;">拒绝</button>
@ -119,7 +119,7 @@
</mat-tab-group>
<div id="firefacilities" *ngIf="!isallDate" style="margin: 10px;">
<mat-accordion class="tableContent" >
<mat-expansion-panel style="box-shadow: 0 0 black;border: 1px solid #EEF1F5;">
<mat-expansion-panel expanded style="box-shadow: 0 0 black;border: 1px solid #EEF1F5;">
<mat-expansion-panel-header collapsedHeight ='40px' expandedHeight='40px' class="panelhead" style="background-color: #2196F3;">
<mat-panel-title style="font-size: 16px;color: #FFFFFF;" >
基本信息
@ -127,7 +127,7 @@
</mat-expansion-panel-header >
<div class="accordingin">
<mat-accordion>
<mat-expansion-panel style="box-shadow: 0 0 black;border: 1px solid #EEF1F5;">
<mat-expansion-panel expanded style="box-shadow: 0 0 black;border: 1px solid #EEF1F5;">
<mat-expansion-panel-header collapsedHeight ='30px' expandedHeight='30px' class="panelhead" >
<mat-panel-title style="font-size: 16px;color:#2196F3;" >
<img src="../../../assets/images/update.png"><span>修改-沃尔玛(上海)职业发展有限公司</span>
@ -219,7 +219,7 @@
</div>
</div>
<div class="echarts" style="display: none;">
<div class="echarts" *ngIf="previewshow" ><!-- [style.display]="previewshow==true?'block':'none'" -->
<div class="bar" id="indexbar" ></div>
<div class="zhu" id="zhu" ></div>
</div>

9
src/app/plan-audit/wait-examineer/wait-examineer.component.scss

@ -149,7 +149,7 @@ th,td{
height: 304px;
display: flex;
background-color: #000000;
opacity: 0.6;
opacity: 0.7;
position: absolute;
top: 13%;
left: 55%;
@ -160,4 +160,11 @@ th,td{
opacity: 1;
//margin: 40px 30px;
}
.zhu{
margin-bottom: 100px;
margin-right: 20px;
height: 95%;
width: 60%;
opacity: 1;
}
}

98
src/app/plan-audit/wait-examineer/wait-examineer.component.ts

@ -4,7 +4,7 @@
* @Author: sueRimn
* @Date: 2020-12-25 16:13:50
* @LastEditors: sueRimn
* @LastEditTime: 2020-12-26 15:17:14
* @LastEditTime: 2020-12-28 16:14:25
*/
import { Component, OnInit } from '@angular/core';
import { FormControl } from '@angular/forms';
@ -20,15 +20,17 @@ export class WaitExamineerComponent implements OnInit {
constructor() { }
ngOnInit(): void {
window.setTimeout(()=>{
this.bar()
},0)
}
ngOnDestroy () {
/* this.indexbar.clear()
this.indexbar.dispose() */
}
selected = new FormControl(0); //选项卡 实例
level//类型
js//组织机构
addtime//时间
previewshow=false//预览得分是否显示
tableDate=[
{level:"Ⅰ级预案",option:"更新",orgication:"浦东支队",unitstate:"已通过",addname:"赵信",addtime:"2020-12-15 10:36:24"},
{level:"消火栓",option:"新增",orgication:"闵行支队",unitstate:"已拒绝",addname:"张三",addtime:"2020-12-15 10:36:24"},
@ -37,9 +39,11 @@ export class WaitExamineerComponent implements OnInit {
isallDate=true//是否显示完成数据,默认显示
companyBuiltInGrouping=["基本信息","四周毗邻","消防设施"]
indexbar //饼状图实例
indexzhu
//变更数据和全部数据切换按钮
buttonChange(){
this.isallDate=!this.isallDate
this.previewshow=false
}
//分数饼状图
@ -65,7 +69,7 @@ export class WaitExamineerComponent implements OnInit {
name: '分数',
type: 'pie',
radius: ['50%', '70%'],
bottom:60,
bottom:50,
avoidLabelOverlap: false,
label: {
show: true,
@ -89,15 +93,93 @@ export class WaitExamineerComponent implements OnInit {
//分数柱状图
zhu(){
var ec = echarts as any;
this.indexbar=ec.init(document.getElementById('zhu'),'light');
this.indexzhu=ec.init(document.getElementById('zhu'),'light');
var option={
grid: {
left: '3%',
right: '4%',
bottom: '3%',
containLabel: true
},
xAxis: {
type: 'value'
type: 'value',
show:false,
axisLine:{
show:false
},
splitLine:{
show:false
},
axisTick:{
show:false
},
},
yAxis: {
type: 'category',
data: ['基本信息', '四周毗邻', '消防设施', '重点单位', '功能分区', '实景图', '上传CAD', '六熟悉记录', '实战演练记录']
axisTick:{
show:false
},
axisLine:{
show:false
},
axisLabel:{
color:"#FFFFFF",
fontSize:16
},
data: ['实战演练记录', '六熟悉记录', '上传CAD', '实景图', '功能分区', '重点单位', '消防设施','四周毗邻','基本信息']
},
series: [
{
type: 'bar',
stack: '总量',
showBackground: true,
backgroundStyle: {
color: '#FFFFFF'
},
label: {
show: true,
position: 'inside',
fontSize:14,
formatter: '{c}分'
},
data: [
{value:18, itemStyle:{color:'#58D091'}},
{value:16, itemStyle:{color:'#58D091'}},
{value:19, itemStyle:{color:'#58D091'}},
{value:16, itemStyle:{color:'#58D091'}},
{value:16, itemStyle:{color:'#58D091'}},
{value:13, itemStyle:{color:'#FFCC00'}},
{value:6, itemStyle:{color:'#FF4D4D'}},
{value:19, itemStyle:{color:'#58D091'}},
{value:16, itemStyle:{color:'#58D091'}},
]
},
{
type: 'bar',
stack: '总量',
label: {
show: false,
position: 'insideRight'
},
data: [2, 4, 1, 4, 4, 7, 14,1,4],
itemStyle:{
color:"#FFFFFF",
},
},
]
}
this.indexzhu.setOption(option);
}
preview(){
this.previewshow=!this.previewshow
if(this.previewshow){
window.setTimeout(()=>{
this.bar()
this.zhu()
},0)
}
}

4
src/app/plan-management/onetwo-entry-plan/newunit.html

@ -4,11 +4,11 @@
* @Author: sueRimn
* @Date: 2020-12-24 16:26:16
* @LastEditors: sueRimn
* @LastEditTime: 2020-12-24 17:29:48
* @LastEditTime: 2020-12-28 11:47:01
-->
<div class="box">
<div class="top">
<span>新增预案</span>
<span style="font-size: 20px;">新增预案</span>
</div>
<div class="queryField">
<label style="margin-right: 10px;">预案名称:</label>

22
src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.html

@ -4,7 +4,7 @@
* @Author: sueRimn
* @Date: 2020-12-24 14:15:10
* @LastEditors: sueRimn
* @LastEditTime: 2020-12-25 10:12:02
* @LastEditTime: 2020-12-28 11:10:30
-->
<div style="height: 100%;overflow-y: auto;">
<div class="header" >
@ -84,43 +84,45 @@
</div>
<div class="body">
<div class="tablebox">
<table mat-table class="mat-elevation-z8">
<table mat-table [dataSource]="tabledataSource" class="mat-elevation-z8">
<ng-container matColumnDef="unitname">
<th mat-header-cell *matHeaderCellDef>预案名称</th>
<!-- <td mat-cell *matCellDef="let element">{{element.company.name}}</td> -->
<td mat-cell *matCellDef="let element">{{element.unitname}}</td>
</ng-container>
<ng-container matColumnDef="level">
<th mat-header-cell *matHeaderCellDef>预案级别</th>
<!-- <td mat-cell *matCellDef="let element">Ⅲ(0)Ⅳ(0)Ⅴ(0)</td> -->
<td mat-cell *matCellDef="let element">{{element.level}}</td>
</ng-container>
<ng-container matColumnDef="addname">
<th mat-header-cell *matHeaderCellDef>添加人</th>
<td mat-cell *matCellDef="let element">{{element.addname}}</td>
</ng-container>
<ng-container matColumnDef="addtime">
<th mat-header-cell *matHeaderCellDef>添加时间</th>
<td mat-cell *matCellDef="let element">{{element.addtime}}</td>
</ng-container>
<ng-container matColumnDef="plantype">
<th mat-header-cell *matHeaderCellDef>预案类型</th>
<!-- <td mat-cell *matCellDef="let element">{{element.planType}}</td> -->
<td mat-cell *matCellDef="let element">{{element.plantype}}</td>
</ng-container>
<ng-container matColumnDef="passstate">
<th mat-header-cell *matHeaderCellDef>审核状态</th>
<!-- <td mat-cell *matCellDef="let element">{{element.auditStatus}}</td> -->
<td mat-cell *matCellDef="let element">{{element.passstate}}</td>
</ng-container>
<ng-container matColumnDef="isopen">
<th mat-header-cell *matHeaderCellDef>是否公开</th>
<!-- <td mat-cell *matCellDef="let element">{{element.planLevel}}</td> -->
<td mat-cell *matCellDef="let element">{{element.isopen}}</td>
</ng-container>
<ng-container matColumnDef="projectlevel">
<th mat-header-cell *matHeaderCellDef>编制级别</th>
<!-- <td mat-cell *matCellDef="let element">{{element.planLevel}}</td> -->
<td mat-cell *matCellDef="let element">{{element.projectlevel}}</td>
</ng-container>
<ng-container matColumnDef="operation">
<th mat-header-cell *matHeaderCellDef>操作</th>
<!-- <td mat-cell *matCellDef="let element">
<td mat-cell *matCellDef="let element">
<span style="color: blue;">查看预案</span>
</td> -->
</td>
</ng-container>
<tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
<tr mat-row *matRowDef="let row; columns: displayedColumns;"></tr>

4
src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.scss

@ -92,8 +92,10 @@
width: 100%;
margin-left: 0%;
margin-top:15px;
th{
th,td{
text-align: center;
font-size: 15px;
color: #000000;
}
}
mat-paginator{

10
src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.ts

@ -4,7 +4,7 @@
* @Author: sueRimn
* @Date: 2020-12-24 14:15:10
* @LastEditors: sueRimn
* @LastEditTime: 2020-12-25 10:29:54
* @LastEditTime: 2020-12-28 11:14:53
*/
import { Component, OnInit, ViewChild, Inject } from '@angular/core';
import { HttpClient } from '@angular/common/http'
@ -30,8 +30,8 @@ export interface PeriodicElement {
projectlevel: string;
}
const ELEMENT_DATA=[
{name:"梧州市中恒制药有限公司",jibie:"Ⅰ级"},
{name:"梧州市中恒制药有限公司",jibie:"Ⅰ级"}
{unitname:"梧州市中恒制药有限公司",level:"Ⅰ级",addname:"张三",addtime:"2020-12-16",plantype:"洪涝",passstate:"审核通过",isopen:"未公开",projectlevel:"总队"},
{unitname:"贵州油港",level:"Ⅱ级",addname:"韩信",addtime:"2020-12-16",plantype:"泥石流",passstate:"审核中",isopen:"未公开",projectlevel:"支队"}
]
@Component({
@ -76,7 +76,7 @@ export class OnetwoEntryPlanComponent implements OnInit {
preparelevels:any
plcheck:boolean //编制级别勾选框
displayedColumns: string[] = ['unitname','level','addname','addtime', 'plantype', 'passstate','isopen','projectlevel','operation'];
tabledataSource
tabledataSource=ELEMENT_DATA
unitname//预案名称
level//预案级别
addname//添加人
@ -105,7 +105,7 @@ export class OnetwoEntryPlanComponent implements OnInit {
this.length = data.totalCount
//this.allPlanInfo = data
this.tabledataSource = new MatTableDataSource(data.items)
//this.tabledataSource = new MatTableDataSource(data.items)
console.log(this.tabledataSource)
})
}

4
src/app/plan-management/plan-management-routing.module.ts

@ -4,7 +4,7 @@
* @Author: sueRimn
* @Date: 2020-12-24 10:59:48
* @LastEditors: sueRimn
* @LastEditTime: 2020-12-24 14:20:18
* @LastEditTime: 2020-12-28 09:10:49
*/
import { NgModule } from '@angular/core';
import { Routes, RouterModule } from '@angular/router';
@ -21,7 +21,7 @@ const routes: Routes = [
{ path: 'passPlan', component: PassPlanComponent},
{ path: 'entryPlandetail', component: EntryPlanLookComponent},
{ path: 'webLook', component: WebLookComponent},
{ path: 'OnetwoEntryPlan', component: OnetwoEntryPlanComponent}
{ path: 'OnetwoEntryPlan', component: OnetwoEntryPlanComponent}//一二级预案录入
];
@NgModule({

Loading…
Cancel
Save