陈鹏飞 4 years ago
parent
commit
20b54cf5d0
  1. 1
      debug.log
  2. 8
      src/app/canvas-share-data.service.ts
  3. 4
      src/app/data-collection/data-collection.module.ts
  4. 23
      src/app/data-collection/fire-force/fire-force.component.html
  5. 16
      src/app/data-collection/fire-force/fire-force.component.scss
  6. 158
      src/app/data-collection/fire-force/fire-force.component.ts
  7. 1
      src/app/data-collection/fire-force/viewdetails.html
  8. 38
      src/app/interface.ts
  9. 32
      src/app/key-unit/basicinfo-look/basicinfo.component.html
  10. 40
      src/app/key-unit/basicinfo/basicinfo.component.html
  11. 11
      src/app/key-unit/key-unit-management/key-unit-management.component.html
  12. 14
      src/app/key-unit/key-unit-management/key-unit-management.component.ts
  13. 95
      src/app/plan-audit/plan-record/plan-record.component.html
  14. 25
      src/app/plan-audit/plan-record/plan-record.component.scss
  15. 98
      src/app/plan-audit/plan-record/plan-record.component.ts
  16. 6
      src/app/plan-audit/wait-examineer/wait-examineer.component.ts
  17. 6
      src/app/plan-management/entry-plan-look/AddPlanone.html
  18. 22
      src/app/plan-management/entry-plan-look/auditresult.html
  19. 12
      src/app/plan-management/entry-plan-look/entry-plan-look.component.html
  20. 4
      src/app/plan-management/entry-plan-look/entry-plan-look.component.ts
  21. 7
      src/app/plan-management/meet-plan/meet-plan.component.html
  22. 6
      src/app/plan-management/meet-plan/meet-plan.component.scss
  23. 39
      src/app/plan-management/meet-plan/meet-plan.component.ts
  24. 32
      src/app/plan-management/meet-plan/resultmeetPlan.html
  25. 11
      src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.html
  26. 7
      src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.scss
  27. 43
      src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.ts
  28. 32
      src/app/plan-management/onetwo-entry-plan/resultPlanonetwo.html
  29. 140
      src/app/plan-management/pass-plan/pass-plan.component.html
  30. 117
      src/app/plan-management/pass-plan/pass-plan.component.scss
  31. 121
      src/app/plan-management/pass-plan/pass-plan.component.ts
  32. 5
      src/app/plan-management/plan-management.module.ts
  33. 32
      src/app/plan-management/type-plan/resulttypePlan.html
  34. 9
      src/app/plan-management/type-plan/type-plan.component.html
  35. 6
      src/app/plan-management/type-plan/type-plan.component.scss
  36. 40
      src/app/plan-management/type-plan/type-plan.component.ts
  37. 4
      src/app/ui/collection-tools/collection-tools.component.html
  38. 21
      src/app/working-area/working-area.component.ts
  39. 2
      src/styles.scss

1
debug.log

@ -1,2 +1,3 @@
[1229/141605.754:ERROR:directory_reader_win.cc(43)] FindFirstFile: 系统找不到指定的路径。 (0x3)
[0104/100053.968:ERROR:directory_reader_win.cc(43)] FindFirstFile: 系统找不到指定的路径。 (0x3)
[0122/085819.900:ERROR:directory_reader_win.cc(43)] FindFirstFile: 系统找不到指定的路径。 (0x3)

8
src/app/canvas-share-data.service.ts

@ -586,6 +586,14 @@ export class DisposalNodeData {
*
*/
public Version: string;
/**
*
*/
public BackgroundImageUrl: string;
/**
*
*/
public BackgroundImageAngle: number;
/**
*
*/

4
src/app/data-collection/data-collection.module.ts

@ -44,12 +44,12 @@ import {MatTreeModule} from '@angular/material/tree';
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
import { DataCollectionRoutingModule } from './data-collection.routing';
import { AddWater, WaterCollectionComponent } from './water-collection/water-collection.component';
import { AddFireForce, FireForceComponent } from './fire-force/fire-force.component';
import { AddFireForce, FireForceComponent, ViewDetails } from './fire-force/fire-force.component';
import { LinkageForcesComponent } from './linkage-forces/linkage-forces.component';
import { NzTreeModule } from 'ng-zorro-antd/tree';
@NgModule({
declarations: [WaterCollectionComponent, FireForceComponent, LinkageForcesComponent,AddWater,AddFireForce],
declarations: [WaterCollectionComponent, FireForceComponent, LinkageForcesComponent,AddWater,AddFireForce,ViewDetails],
imports: [
CommonModule,
A11yModule,

23
src/app/data-collection/fire-force/fire-force.component.html

@ -108,7 +108,16 @@
<div class="detailsbox" *ngIf="selectedFireForceLevel != null">
<div class="masklayer" *ngIf="isMasklayer">
<mat-spinner [diameter]='30'></mat-spinner>
<span>上传中...</span>
<span>请等待...</span>
</div>
<div class="masklayer" *ngIf="isMasklayerUploading">
<mat-progress-bar class="progressbar" mode="determinate" [value]="progressBarValue"></mat-progress-bar>
<span>上传中...({{progressBarValue}}%)</span>
<button (click)="cancelUploading()" class="cancelbtn" mat-flat-button>取消上传</button>
</div>
<div class="masklayer" *ngIf="isMasklayerDownload">
<mat-progress-bar class="progressbar" mode="determinate" [value]="progressBarValue"></mat-progress-bar>
<span>下载中...({{progressBarValue}}%)</span>
</div>
<div class="tabsbox">
<div class="tabs">
@ -450,8 +459,8 @@
<span>
管辖单位:
</span>
<input disabled [(ngModel)]="selectedFireForce.name" class="smallwidth" type="text" placeholder="名称">
<input disabled [(ngModel)]="selectedFireForce.code" class="smallwidth" type="text" placeholder="编号">
<input disabled [(ngModel)]="superior.name" class="smallwidth" type="text" placeholder="名称">
<input disabled [(ngModel)]="superior.code" class="smallwidth" type="text" placeholder="编号">
</mat-grid-tile>
<mat-grid-tile colspan='3' rowspan='1'>
<span>
@ -537,9 +546,6 @@
</mat-grid-tile>
</mat-grid-list>
</div>
<div style="width: 100%;height: 22px;">
</div>
</div>
<!-- 车辆 -->
<!-- <div class="contant" *ngIf="tabIndex == 2">
@ -551,7 +557,8 @@
<mat-icon class="deleteFile" (click)="deleteFile(item,$event)">highlight_off</mat-icon>
<div class="imgbox">
<img *ngIf="item.fileName.split('.')[item.fileName.split('.').length-1] == 'png'
|| item.fileName.split('.')[item.fileName.split('.').length-1] == 'jpg'"
|| item.fileName.split('.')[item.fileName.split('.').length-1] == 'jpg'
|| item.fileName.split('.')[item.fileName.split('.').length-1] == 'JPG'"
class="thumbnailImg" src="/api/Objects/PlanPlatform/{{item.objectName}}" alt="">
<img *ngIf="item.fileName.split('.')[item.fileName.split('.').length-1] == 'docx'
|| item.fileName.split('.')[item.fileName.split('.').length-1] == 'doc'"
@ -565,7 +572,7 @@
</div>
<span [title]="item.fileName">{{item.fileName}}</span>
<button (click)="clickFile(item)" class="btn btn1" mat-flat-button color="primary">查看</button>
<button class="btn btn2" mat-flat-button color="primary">下载</button>
<button (click)="download (item)" class="btn btn2" mat-flat-button color="primary">下载</button>
</div>
</div>
</div>

16
src/app/data-collection/fire-force/fire-force.component.scss

@ -356,7 +356,7 @@
}
.contant{
width: 100%;
height:480px;
height:460px;
overflow-y: auto;
p{
color: #2196F3;
@ -443,6 +443,7 @@
white-space: nowrap;
text-overflow: ellipsis;
color: gray;
font-size: 14px;
}
.deleteFile{
position: absolute;
@ -461,10 +462,10 @@
display: none;
}
.btn1{
top: 35px;
top: 37px;
}
.btn2{
top: 75px;
top: 78px;
}
}
.fileDivBox:hover{
@ -497,6 +498,15 @@
font-size: 14px;
margin-top: 5px;
}
.progressbar{
width: 15%;
}
.cancelbtn{
height: 32px;
line-height: 32px;
font-size: 14px;
margin-top: 12px;
}
}
}
}

158
src/app/data-collection/fire-force/fire-force.component.ts

@ -19,7 +19,7 @@ declare var AMap: any;
export class FireForceComponent implements OnInit {
constructor(private tree: TreeService,public snackBar: MatSnackBar,private http:HttpClient,private elementRef: ElementRef,public renderer2: Renderer2,public dialog: MatDialog) { }
isMasklayer:boolean = false//遮罩层是否打开
isCheckedOfSearchDiv:boolean = true//列表过滤滑块
slideChange(e){
this.isCheckedOfSearchDiv = e.checked
@ -146,7 +146,6 @@ export class FireForceComponent implements OnInit {
this.isGisTopBox = false
if(this.selectedFireForceId != node.id){
this.clearData()
this.selectedFireForce = node
this.selectedFireForceId = node.id
if(node.forceType != 0){//如果是其他消防力量
@ -158,6 +157,7 @@ export class FireForceComponent implements OnInit {
if(this.newPositionMarker){
this.map.remove(this.newPositionMarker);
}
if(node.fireForceDetailId){
this.isPost = false//是否走post创建接口
let type
@ -166,7 +166,9 @@ export class FireForceComponent implements OnInit {
}else{
type = 1
}
this.isMasklayer = true
this.http.get(`/api/FireForceDetail/${type}/${node.id}`).subscribe((data:any) => {
this.isMasklayer = false
this.FireForceDetailInfo = data
if(data.location && data.location.x){//如果已经标注单位坐标
console.log('开始标注')
@ -207,6 +209,14 @@ export class FireForceComponent implements OnInit {
this.map.setCity('上海市');
}
//寻找管辖单位
this.allFireForceList.forEach(item => {
if(item.id == node.parentId){
this.superior.name = item.name
this.superior.code = item.code
}
})
}
}
//搜索
@ -270,7 +280,7 @@ export class FireForceComponent implements OnInit {
let isDelete = window.confirm(`确定要删除${item.name}`)
if(isDelete){
this.http.delete(`/api/CustomFireForce/${item.id}`).subscribe(data => {
const config = new MatSnackBarConfig();
let config = new MatSnackBarConfig();
config.verticalPosition = 'top';
config.duration = 3000
this.snackBar.open('删除成功','确定',config);
@ -363,10 +373,6 @@ export class FireForceComponent implements OnInit {
clearData(){
this.deletedFile = []//清空相关资料已删除缓存
this.AttachmentArr = []//清空相关资料
this.superior = {
name:'',
code:''
}
this.positionLngLat = {x:'',y:''}
this.FireForceDetailInfo = {
// id:'',//编号
@ -707,14 +713,19 @@ export class FireForceComponent implements OnInit {
AttachmentArr:any = []//上传附件地址集合
uploadId:any//分块上传id
objectName:any
progressBarValue:any = 0//分块上传进度
isMasklayer:boolean = false//圆圈遮罩层是否打开
isMasklayerUploading:boolean = false//上传进度条遮罩层是否打开
isMasklayerDownload:boolean = false//下载进度条遮罩层是否打开
uploadAttachment(e){
console.log('选择的文件',e)
this.file = e.target.files[0] || null //上传的文件
let file = e.target.files[0] || null //获取上传的文件
let fileSize = file.size || null //上传文件的总大小
let shardSize = 5 * 1024 * 1024 //5MB一个分片
this.isMasklayer = true
if (file && fileSize<=shardSize) { //上传文件<=5MB时
this.isMasklayer = true
console.log('file',this.file)
let formData = new FormData()
formData.append("file",file)
@ -729,8 +740,13 @@ export class FireForceComponent implements OnInit {
this.AttachmentArr.push(obj)
this.isMasklayer = false
console.log('上传成功',data)
let config = new MatSnackBarConfig();
config.verticalPosition = 'top';
config.duration = 3000
this.snackBar.open('上传成功','确定',config);
})
} else if (file && fileSize>shardSize) { //上传文件>5MB时,分块上传
this.isMasklayerUploading = true
let data = {filename: file.name}
this.http.post(`/api/NewMultipartUpload/PlanPlatform/FireForce/${this.selectedFireForce.id}`,{},{params:data}).subscribe((data:any)=>{ //初始化分段上传
console.log('初始化分块上传成功',data)
@ -741,14 +757,13 @@ export class FireForceComponent implements OnInit {
}
}
PartNumberETag:any=[]; //每次返回需要保存的信息
//开始分段上传
async subsectionUploading () {
let file = this.file || null //获取上传的文件
let fileSize = file.size || null //上传文件的总大小
let shardSize = 5 * 1024 * 1024 //5MB一个分片
let allSlice = Math.ceil(fileSize / shardSize) //总文件/5MB===共分多少段
for (let i = 0;i < allSlice;i++) { //循环分段上传
let start = i * shardSize //切割文件开始位置
let end = Math.min(fileSize, start + shardSize); //切割文件结束位置
@ -766,9 +781,10 @@ export class FireForceComponent implements OnInit {
})
});
this.PartNumberETag.push(result)
// this.uploadProgress = Number((i/allSlice).toFixed(2))*100
// this.progressBarValue = Number((i/allSlice).toFixed(2))*100
this.progressBarValue = this.accMul(Number((i/allSlice).toFixed(2))*100,1,0)
if (this.PartNumberETag.length === allSlice) {
// this.uploadProgress = 100
this.progressBarValue = 100
this.endUploading()}
}//for循环
@ -786,11 +802,90 @@ export class FireForceComponent implements OnInit {
fileLength:this.file.size
}
this.AttachmentArr.push(obj)
console.log('完成分块上传',data)
this.isMasklayer = false
this.isMasklayerUploading = false//关闭进度条遮罩层
this.progressBarValue = 0//重置进度数
let config = new MatSnackBarConfig();
config.verticalPosition = 'top';
config.duration = 3000
this.snackBar.open('上传成功','确定',config);
})
}
//取消分块上传
cancelUploading() {
this.http.delete(`/api/MultipartUpload/PlanPlatform/${this.objectName}?uploadId=${this.uploadId}`).subscribe(data=>{
this.progressBarValue = 0;
this.isMasklayerUploading= false
this.PartNumberETag =[] //清空保存返回的信息
const config = new MatSnackBarConfig();
config.verticalPosition = 'top';
config.duration = 3000
this.snackBar.open('取消上传成功','确定',config);
})
}
//下载
download (e) {
this.isMasklayerDownload = true //开启下载进度条
let file = e //传递过来的文件元数据
let fileSize = file.fileLength //下载文件的总大小
let shardSize = 3 * 1024 * 1024 //文件大小是否大于10MB
if (file && fileSize<=shardSize) { //<=3MB时直接下载
this.progressBarValue = 60
this.http.get(`/api/Objects/PlanPlatform/${e.objectName}`,{responseType: 'blob'},).subscribe(data=>{
let url = window.URL.createObjectURL(new Blob([data])); //createObjectURL创建一个下载Blob的url地址
let link = document.createElement("a");
link.style.display = "none";
link.href = url;
let fileName = e.fileName ? e.fileName : e.objectName.split('/')[e.objectName.split('/').length-1]
link.setAttribute("download", fileName);
document.body.appendChild(link);
link.click();
this.isMasklayerDownload = false //关闭下载进度条
this.progressBarValue = 0 //初始化进度条
})
} else if (file && fileSize>shardSize) { //>3MB时分块下载
this.blockingDownload(e) //分段下载
}
}
//分段下载并合并
async blockingDownload (e) {
let file = e //传递过来的文件元数据
let fileSize = file.fileLength //下载文件的总大小
let shardSize = 3 * 1024 * 1024 //3MB一个分片
let allSlice = Math.ceil(fileSize / shardSize) //总文件/3MB===共分多少段
let allFile:any = [] //所有的file分段
for (let i=0;i<allSlice;i++) {
let start = i * shardSize //每次下载文件开始位置
let end = Math.min(fileSize, start + shardSize-1); //每次下载文件结束为止
let result = await new Promise ((result,reject)=>{
this.http.get(`/api/Objects/PlanPlatform/${e.objectName}`,{headers:{'range':`bytes= ${start}-${end}`},responseType:'blob'}).subscribe(data=>{
result(data) })
})
allFile.push(result)
// this.progressBarValue = Number((i/allSlice).toFixed(2))*100 //文件进度数
this.progressBarValue = this.accMul(Number((i/allSlice).toFixed(2))*100,1,0)
if (allFile.length === allSlice) { //合并文件输出给浏览器
let url = window.URL.createObjectURL(new Blob(allFile)); //createObjectURL创建一个下载Blob的url地址
let link = document.createElement("a");
link.style.display = "none";
link.href = url;
let fileName = e.fileName ? e.fileName : e.objectName.split('/')[e.objectName.split('/').length-1]
link.setAttribute("download", fileName);
document.body.appendChild(link);
link.click();
this.isMasklayerDownload = false //关闭下载进度条
this.progressBarValue = 0 //初始化进度条
}
} //for循环结束
}
//删除图片
deletedFile:any = []
deleteFile(item,e){
@ -817,7 +912,7 @@ export class FireForceComponent implements OnInit {
clickFile(item){
console.log(item)
let suffix = item.fileName.split('.')[item.fileName.split('.').length-1]
if(suffix == 'png' || suffix == 'jpg'){
if(suffix == 'png' || suffix == 'jpg' || suffix == 'JPG'){
console.log('这是图片')
let dom = document.getElementById(`viewerjs`)
let pObjs = dom.childNodes;
@ -842,6 +937,13 @@ export class FireForceComponent implements OnInit {
config.duration = 3000
this.snackBar.open('暂不支持查看','确定',config);
}
if(suffix == 'mp4'){
const dialogRef = this.dialog.open(ViewDetails, {//调用open方法打开对话框并且携带参数过去
data: {item:item,type:"video"},
id:'videodialog'
});
dialogRef.afterClosed().subscribe();
}
}
}
@ -876,4 +978,28 @@ export class AddFireForce {
this.dialogRef.close(this.selectedFireForceTypeIndex)
}
}
}
//查看图片大图和视频
@Component({
selector: 'viewdetails',
templateUrl: './viewdetails.html',
styleUrls: ['./fire-force.component.scss']
})
export class ViewDetails {
// myControl = new FormControl();
//注入MatDialogRef,可以用来关闭对话框
//要访问对话框组件中的数据,必须使用MAT_DIALOG_DATA注入令牌
constructor(private http: HttpClient,public dialogRef: MatDialogRef<ViewDetails>,@Inject(MAT_DIALOG_DATA) public data) {}
Url:string
onNoClick(): void {
this.dialogRef.close();
}
ngOnInit(): void {
this.Url = '/api/Objects/PlanPlatform/' + this.data.item.objectName
}
closeDialog(){
this.dialogRef.close();
}
}

1
src/app/data-collection/fire-force/viewdetails.html

@ -0,0 +1 @@
<video autoplay controls *ngIf="data.type == 'video'" [src]="Url"></video>

38
src/app/interface.ts

@ -1,3 +1,11 @@
/*
* @Descripttion:
* @version:
* @Author: sueRimn
* @Date: 2020-12-24 10:59:48
* @LastEditors: sueRimn
* @LastEditTime: 2021-01-20 16:44:22
*/
export interface Data {
token:string,
refreshToken:string,
@ -30,12 +38,36 @@ export enum AuditStatusEnum {
"zero",
"审核中",
"审核通过",
"",
"审退回",
"two",
"审退回",
"five",
"six",
"seven",
"未提交审核"
"未提交审核",
"nine",
"ten",
"eleven",
"twelve",
"thieteen",
"fourteen",
"fifteen",
"待终审",
"shiqi",
"shiba",
"shijiu",
"ershi",
"ershiyi",
"ershier",
"ershis",
"t1",
"t2",
"t3",
"t4",
"t5",
"t6",
"t7",
"t8",
"初审退回",
}
export enum PlanLevelEnum {

32
src/app/key-unit/basicinfo-look/basicinfo.component.html

@ -167,14 +167,14 @@
<span>{{i.propertyName}}<span *ngIf="i.physicalUnit">({{i.physicalUnit}})</span></span>
<!-- 如果类型是文本 -->
<mat-form-field *ngIf="i.propertyType == 0">
<mat-form-field *ngIf="i.propertyType == 0 && i.propertyName != '耐火等级'">
<input readonly matInput name="{{i.propertyName}}{{www}}" type='text'
required="{{ i.required==true ? 'true' : 'false' }}"
[(ngModel)]="i.propertyValue">
</mat-form-field>
<!-- 如果类型是数字 -->
<mat-form-field *ngIf="i.propertyType == 2">
<mat-form-field *ngIf="i.propertyType == 2 && i.propertyName != '耐火等级'">
<input readonly matInput name="{{i.propertyName}}{{www}}" type='number'
required="{{ i.required==true ? 'true' : 'false' }}"
[(ngModel)]="i.propertyValue"
@ -182,9 +182,17 @@
>
<!-- <mat-error *ngIf="isshowrule">{{rulevalue}}</mat-error> -->
</mat-form-field>
<!-- 如果类型是耐火等级 -->
<mat-form-field *ngIf="i.propertyName == '耐火等级'">
<mat-select readonly name="{{i.propertyName}}{{www}}" required="{{ i.required==true ? 'true' : 'false' }}" placeholder="请选择耐火等级" [(ngModel)]="i.propertyValue">
<mat-option value="0">1级</mat-option>
<mat-option value="1">2级</mat-option>
<mat-option value="2">3级</mat-option>
<mat-option value="3">其他</mat-option>
</mat-select>
</mat-form-field>
<!-- 如果类型是多行文本 -->
<textarea readonly *ngIf="i.propertyType == 1" style="width: 180px;height: 60px;" required="{{ i.required==true ? 'true' : 'false' }}" [(ngModel)]="i.propertyValue" name="{{i.propertyName}}{{key}}"></textarea>
<textarea readonly *ngIf="i.propertyType == 1 && i.propertyName != '耐火等级'" style="width: 180px;height: 60px;" required="{{ i.required==true ? 'true' : 'false' }}" [(ngModel)]="i.propertyValue" name="{{i.propertyName}}{{key}}"></textarea>
<span style="color: red;" *ngIf="i.required">*</span>
<div *ngIf="i.isshowrule" style="position: absolute;
@ -249,14 +257,14 @@
<!-- 如果类型是文本 -->
<mat-form-field *ngIf="i.propertyType == 0">
<mat-form-field *ngIf="i.propertyType == 0 && i.propertyName != '耐火等级'">
<input readonly matInput name="{{i.propertyName}}" type='text'
required="{{ i.required==true ? 'true' : 'false' }}"
[(ngModel)]="i.propertyValue">
</mat-form-field>
<!-- 如果类型是数字 -->
<mat-form-field *ngIf="i.propertyType == 2">
<mat-form-field *ngIf="i.propertyType == 2 && i.propertyName != '耐火等级'">
<input readonly matInput name="{{i.propertyName}}" type='number'
required="{{ i.required==true ? 'true' : 'false' }}"
[(ngModel)]="i.propertyValue"
@ -264,9 +272,17 @@
>
<!-- <mat-error *ngIf="isshowrule">{{rulevalue}}</mat-error> -->
</mat-form-field>
<!-- 如果类型是耐火等级 -->
<mat-form-field *ngIf="i.propertyName == '耐火等级'">
<mat-select readonly name="{{i.propertyName}}" required="{{ i.required==true ? 'true' : 'false' }}" placeholder="请选择耐火等级" [(ngModel)]="i.propertyValue">
<mat-option value="0">1级</mat-option>
<mat-option value="1">2级</mat-option>
<mat-option value="2">3级</mat-option>
<mat-option value="3">其他</mat-option>
</mat-select>
</mat-form-field>
<!-- 如果类型是多行文本 -->
<textarea readonly *ngIf="i.propertyType == 1" style="width: 180px;height: 60px;" required="{{ i.required==true ? 'true' : 'false' }}" [(ngModel)]="i.propertyValue" name="{{i.propertyName}}"></textarea>
<textarea readonly *ngIf="i.propertyType == 1 && i.propertyName != '耐火等级'" style="width: 180px;height: 60px;" required="{{ i.required==true ? 'true' : 'false' }}" [(ngModel)]="i.propertyValue" name="{{i.propertyName}}"></textarea>
<span style="color: red;" *ngIf="i.required">*</span>
<div *ngIf="i.isshowrule" style=" position: absolute;
left: 205px;

40
src/app/key-unit/basicinfo/basicinfo.component.html

@ -196,14 +196,14 @@
<span>{{i.propertyName}}<span *ngIf="i.physicalUnit">({{i.physicalUnit}})</span></span>
<!-- 如果类型是文本 -->
<mat-form-field *ngIf="i.propertyType == 0">
<mat-form-field *ngIf="i.propertyType == 0 && i.propertyName != '耐火等级'">
<input matInput name="{{i.propertyName}}{{www}}" type='text'
required="{{ i.required==true ? 'true' : 'false' }}"
[(ngModel)]="i.propertyValue">
</mat-form-field>
<!-- 如果类型是数字 -->
<mat-form-field *ngIf="i.propertyType == 2">
<mat-form-field *ngIf="i.propertyType == 2 && i.propertyName != '耐火等级'">
<input matInput name="{{i.propertyName}}{{www}}" type='number'
required="{{ i.required==true ? 'true' : 'false' }}"
[(ngModel)]="i.propertyValue"
@ -211,16 +211,24 @@
>
<!-- <mat-error *ngIf="isshowrule">{{rulevalue}}</mat-error> -->
</mat-form-field>
<!-- 如果类型是耐火等级 -->
<mat-form-field *ngIf="i.propertyName == '耐火等级'">
<mat-select name="{{i.propertyName}}{{www}}" required="{{ i.required==true ? 'true' : 'false' }}" placeholder="请选择耐火等级" [(ngModel)]="i.propertyValue">
<mat-option value="0">1级</mat-option>
<mat-option value="1">2级</mat-option>
<mat-option value="2">3级</mat-option>
<mat-option value="3">其他</mat-option>
</mat-select>
</mat-form-field>
<!-- 如果类型是多行文本 -->
<textarea *ngIf="i.propertyType == 1" style="width: 180px;height: 60px;" required="{{ i.required==true ? 'true' : 'false' }}" [(ngModel)]="i.propertyValue" name="{{i.propertyName}}{{key}}"></textarea>
<textarea *ngIf="i.propertyType == 1 && i.propertyName != '耐火等级'" style="width: 180px;height: 60px;" required="{{ i.required==true ? 'true' : 'false' }}" [(ngModel)]="i.propertyValue" name="{{i.propertyName}}{{key}}"></textarea>
<span style="color: red;" *ngIf="i.required">*</span>
<div *ngIf="i.isshowrule" style="position: absolute;
left: 205px;
top: 45px;
font-size: 11px;
color: red;">
left: 205px;
top: 45px;
font-size: 11px;
color: red;">
<span>{{i.rulevalue}}</span>
</div>
</div>
@ -278,14 +286,14 @@
<!-- 如果类型是文本 -->
<mat-form-field *ngIf="i.propertyType == 0">
<mat-form-field *ngIf="i.propertyType == 0 && i.propertyName != '耐火等级'">
<input matInput name="{{i.propertyName}}" type='text'
required="{{ i.required==true ? 'true' : 'false' }}"
[(ngModel)]="i.propertyValue">
</mat-form-field>
<!-- 如果类型是数字 -->
<mat-form-field *ngIf="i.propertyType == 2">
<mat-form-field *ngIf="i.propertyType == 2 && i.propertyName != '耐火等级'">
<input matInput name="{{i.propertyName}}" type='number'
required="{{ i.required==true ? 'true' : 'false' }}"
[(ngModel)]="i.propertyValue"
@ -293,9 +301,17 @@
>
<!-- <mat-error *ngIf="isshowrule">{{rulevalue}}</mat-error> -->
</mat-form-field>
<!-- 如果类型是耐火等级 -->
<mat-form-field *ngIf="i.propertyName == '耐火等级'">
<mat-select name="{{i.propertyName}}" required="{{ i.required==true ? 'true' : 'false' }}" placeholder="请选择耐火等级" [(ngModel)]="i.propertyValue">
<mat-option value="0">1级</mat-option>
<mat-option value="1">2级</mat-option>
<mat-option value="2">3级</mat-option>
<mat-option value="3">其他</mat-option>
</mat-select>
</mat-form-field>
<!-- 如果类型是多行文本 -->
<textarea *ngIf="i.propertyType == 1" style="width: 180px;height: 60px;" required="{{ i.required==true ? 'true' : 'false' }}" [(ngModel)]="i.propertyValue" name="{{i.propertyName}}"></textarea>
<textarea *ngIf="i.propertyType == 1 && i.propertyName != '耐火等级'" style="width: 180px;height: 60px;" required="{{ i.required==true ? 'true' : 'false' }}" [(ngModel)]="i.propertyValue" name="{{i.propertyName}}"></textarea>
<span style="color: red;" *ngIf="i.required">*</span>
<div *ngIf="i.isshowrule" style=" position: absolute;
left: 205px;

11
src/app/key-unit/key-unit-management/key-unit-management.component.html

@ -72,6 +72,17 @@
</mat-select>
</mat-form-field>
</div>
<div class="queryField" style="margin-left: 100px;">
<label style="margin-right: 10px;">完整度查询:</label>
<mat-form-field class="example-full-width">
<input type="number" oninput="if(value>1)value=1;if(value<0)value=0" matInput placeholder="请输入完整度最小值" name="companyName" [(ngModel)]="integrityScoreMin" autocomplete="off">
</mat-form-field>
🠊
<mat-form-field class="example-full-width" style="margin-left: 5px;">
<input type="number" oninput="if(value>1)value=1;if(value<0)value=0" matInput placeholder="请输入完整度最大值" name="companyName" [(ngModel)]="integrityScoreMax" autocomplete="off">
</mat-form-field>
</div>
</div>
<div style="width: 100%;text-align: center;">
<button mat-raised-button color="primary">查询</button>

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

@ -54,6 +54,8 @@ export class KeyUnitManagementComponent implements OnInit {
tabledataSource:any
allorganizations:any
oldDataSource:any; //原始表格数据
integrityScoreMin//下界
integrityScoreMax//上界
//表头排序
sortData (e) {
let data = this.tabledataSource.filteredData;
@ -347,6 +349,8 @@ export class KeyUnitManagementComponent implements OnInit {
PageSize: this.pageSizeOptions[0],
Sort: this.integritySort ? 'integrityscore' : '',
SortType: this.integritySort || '',
IntegrityScoreMin:this.integrityScoreMin||0,
IntegrityScoreMax:this.integrityScoreMax||1
}
this.http.get("/api/Companies",{params:paramsdata}).subscribe((data:any)=>{
@ -573,7 +577,15 @@ export class KeyUnitManagementComponent implements OnInit {
onSubmit(value){
this.PageNumber = 1
this.pageEvent.pageIndex = 0
this.getAllKeyUnit();
const config = new MatSnackBarConfig();
config.verticalPosition = 'top';
config.duration = 3000
if(this.integrityScoreMax<this.integrityScoreMin){
this.snackBar.open('最大值不能小于最小值!','确定',config);
}else{
this.getAllKeyUnit();
}
}
bigclosediv(e){
this.isorganizationbox = false

95
src/app/plan-audit/plan-record/plan-record.component.html

@ -4,46 +4,65 @@
* @Author: sueRimn
* @Date: 2020-12-25 10:19:31
* @LastEditors: sueRimn
* @LastEditTime: 2020-12-25 15:31:29
* @LastEditTime: 2021-01-21 10:12:20
-->
<div class="box">
<div class="boxleft">
<div class="lefthead">
<form (ngSubmit)="onSubmit(form.value)" #form="ngForm">
<div class="headdiv" style="margin-top: 30px;">
<span>操作类型:</span>
<input type="radio" name="level"><span>全部</span>
<input type="radio" name="level" style="margin-left: 50px;"><span>更新</span>
<input type="radio" name="level" style="margin-left: 50px;"><span>新增</span>
<input type="radio" name="level" style="margin-left: 50px;"><span>删除</span>
<span style="margin-left: 100px;">共计:80</span>
<span>操作类型:</span>
<input type="radio" name="level" value="" [(ngModel)]="level"><span>全部</span>
<input type="radio" name="level" style="margin-left: 50px;" value="1" [(ngModel)]="level"><span>更新</span>
<input type="radio" name="level" style="margin-left: 50px;" value="0" [(ngModel)]="level"><span>新增</span>
<input type="radio" name="level" style="margin-left: 50px;" value="2" [(ngModel)]="level"><span>删除</span>
<span style="margin-left: 100px;">共计:{{count}}</span>
</div>
<div class="headdiv">
<span>审核状态:</span>
<input type="radio" name="passstate"><span>全部</span>
<input type="radio" name="passstate" style="margin-left: 50px;"><span>已通过</span>
<input type="radio" name="passstate" style="margin-left: 50px;"><span>已拒绝</span>
<input type="radio" name="passstate" [(ngModel)]="verifyState" value=""><span>全部</span>
<input type="radio" name="passstate" style="margin-left: 50px;" [(ngModel)]="verifyState" value="1"><span>初审通过</span>
<input type="radio" name="passstate" style="margin-left: 50px;" [(ngModel)]="verifyState" value="2"><span>初审驳回</span>
<input type="radio" name="passstate" style="margin-left: 50px;" [(ngModel)]="verifyState" value="4"><span>终审通过</span>
<input type="radio" name="passstate" style="margin-left: 50px;" [(ngModel)]="verifyState" value="5"><span>终审驳回</span>
</div>
<div class="headthree">
<span>类型:</span>
<mat-form-field>
<mat-select placeholder='请选择单位类型' name="unittype" [(ngModel)]="level">
<mat-option value="1">Ⅰ级</mat-option>
<mat-option value="2">Ⅱ级</mat-option>
</mat-select>
</mat-form-field>
<span style="margin-left: 30px;">所属组织:</span>
<mat-select placeholder='请选择单位类型' name="unittype" [(ngModel)]="projectlevel">
<mat-option value="1">Ⅰ级预案</mat-option>
<mat-option value="2">Ⅱ级预案</mat-option>
<mat-option value="3">Ⅲ级预案</mat-option>
<mat-option value="4">Ⅳ级预案</mat-option>
<mat-option value="5">Ⅴ级预案</mat-option>
<mat-option value="6">应急预案(国家级)</mat-option>
<mat-option value="7">应急预案(市级)</mat-option>
<mat-option value="8">类型预案</mat-option>
</mat-select>
</mat-form-field>
<span style="margin-left: 30px;">编制级别:</span>
<mat-form-field>
<mat-select placeholder='请选择组织机构' name="js" [(ngModel)]="js">
<mat-option value="1">Ⅰ级</mat-option>
<mat-option value="2">Ⅱ级</mat-option>
</mat-select>
<mat-select name="preparelevel" placeholder='请选择编制级别' [(ngModel)]="PlanLevel">
<mat-option *ngFor="let item of preparelevels" [value]="item.value">{{item.name}}</mat-option>
</mat-select>
</mat-form-field>
<span style="margin-left: 30px;">时间:</span>
</div>
<div class="headfour">
<span style="margin-left: 30px;">时间:</span>
<mat-form-field class="example-full-width">
<input type="date" matInput name="companyName" autocomplete="off" [(ngModel)]="addtime">
</mat-form-field>
<span style="margin-left: 10px;">🠊</span>
<mat-form-field class="example-full-width" style="margin-left: 10px;">
<input type="date" matInput name="companyName" autocomplete="off" [(ngModel)]="endtime">
</mat-form-field>
<button mat-raised-button color="primary" style="margin-left: 40px;" type="submit" >查询</button>
<button mat-raised-button color="primary" style="margin-left: 20px;" (click)='record()'><img src="../../../assets/images/refresh.png" > 刷新</button>
</div>
<div class="tablediv">
</form>
<!-- <div class="tablediv">
<table cellspacing="0" cellpadding="0">
<thead>
<th style="width: 15%;">类型</th>
@ -64,7 +83,37 @@
</tr>
</tbody>
</table>
</div>
</div> -->
<div class="tablediv">
<table cellspacing="0" cellpadding="0" style="margin-top: 10px;">
<thead>
<th style="width: 15%;">类型</th>
<th style="width: 15%;">操作</th>
<th style="width: 15%;">所属组织</th>
<th style="width: 15%;">审核状态</th>
<th style="width: 15%;">提交人</th>
<th style="width: 25%;">提交时间</th>
</thead>
</table>
<div class="tbodycss" id="tbodydiv" >
<table cellspacing="0" cellpadding="0" id="table" >
<tr *ngFor="let item of tableDate;let key = index" >
<td style="width: 15%;">
<!-- <input type="radio" name="yuan" value={{item.id}} [(ngModel)]="checked" (click)='radioClick(item)'> -->
{{item.contentType=='1'?'Ⅰ级预案':item.contentType=='2'?'Ⅱ级预案':item.contentType=='3'?'Ⅲ级预案':item.contentType=='4'?'Ⅳ级预案':item.contentType=='5'?
'Ⅴ级预案':item.contentType=='6'?'应急预案(国家级)':item.contentType=='7'?'应急预案(市级)':item.contentType=='8'?'类型预案':item.contentType=='11'?'重点单位':'消防车辆'}}</td>
<td style="width: 15%;" [ngClass]="{'green': item.operation == '1','red':item.operation == '2','blue':item.operation == '0'}">{{item.operation=='0'?'新增':item.operation=='1'?'更新':'删除'}}</td>
<td style="width: 15%;">{{item.verifyOrganizationName}}</td>
<td style="width: 15%;" [ngClass]="{'green': item.verifyState == '1'||item.verifyState == '4','red':item.verifyState == '2'||item.verifyState == '5'}">{{item.verifyState=='0'?'待初审':item.verifyState=='1'?
'初审通过':item.verifyState=='2'?'初审驳回':item.verifyState=='3'?'待终审':item.verifyState=='4'?'终审通过':'终审驳回'}}</td>
<td style="width: 15%;">{{item.creatorName}}</td>
<td style="width: 25%;">{{item.createTime|date:'yyyy-MM-dd'}}</td>
</tr>
</table>
</div>
</div>
</div>
</div>

25
src/app/plan-audit/plan-record/plan-record.component.scss

@ -32,10 +32,17 @@
}
}
.tablediv{
width: 95%;
table{
margin: 20px 20px;
width: 100%;
height: 70%;
.tbodycss{
overflow-y: auto;
height: 600px;
width: 100%;
}
table{
//margin: 20px 20px;
margin-left: 20px;
width: 97%;
//border: 1px solid #2196F3;
thead{
@ -45,6 +52,7 @@
font-size: 16px;
}
tr:nth-child(odd){
background: #FAFAFA;
}
@ -65,4 +73,13 @@ th,td{
}
.green{color: #00C756;}
.red{color: #FF4D4D;}
.blue{color: #2196F3;}
.blue{color: #2196F3;}
//滚动条样式
::-webkit-scrollbar{
width: 6px;
background-color: white;
}
::-webkit-scrollbar-thumb{
background-color: #2196F3;
}

98
src/app/plan-audit/plan-record/plan-record.component.ts

@ -4,10 +4,12 @@
* @Author: sueRimn
* @Date: 2020-12-25 10:19:31
* @LastEditors: sueRimn
* @LastEditTime: 2020-12-25 14:53:46
* @LastEditTime: 2021-01-21 10:15:50
*/
import { Component, OnInit } from '@angular/core';
import { FormControl } from '@angular/forms';
import { MatSnackBar, MatSnackBarConfig } from '@angular/material/snack-bar';
import { HttpClient } from '@angular/common/http'
@Component({
selector: 'app-plan-record',
@ -16,18 +18,96 @@ import { FormControl } from '@angular/forms';
})
export class PlanRecordComponent implements OnInit {
constructor() { }
constructor(private http:HttpClient,public snackBar: MatSnackBar) { }
ngOnInit(): void {
let level = sessionStorage.getItem("level");
if(level == "0"){//如果是总队
this.preparelevels = [
{name:"总队",value:"1"},
{name:"支队",value:"2"},
{name:"大队",value:"4"},
{name:"中队",value:"8"}
]
this.PlanLevel=0
}
if(level == "1"){//如果是支队
this.preparelevels = [
{name:"支队",value:"1"},
{name:"大队",value:"2"},
{name:"中队",value:"3"}
]
this.PlanLevel=1
}
if(level == "2"){//如果是大队
this.preparelevels = [
{name:"大队",value:"4"},
{name:"中队",value:"8"}
]
this.PlanLevel=2
}
if(level == "3"){//如果是中队
this.preparelevels = [
{name:"中队",value:"8"}
]
this.PlanLevel=3
}
this.getAlltabledate()
}
selected = new FormControl(0); //选项卡 实例
level//类型
js//组织机构
preparelevels:any
level=''//类型
verifyState=''//审核状态
projectlevel//组织机构
PlanLevel//编制级别
addtime//时间
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"},
{level:"天然取水点",option:"删除",orgication:"上海总队",unitstate:"已拒绝",addname:"王五",addtime:"2020-12-15 10:36:24"}
]
endtime//结束时间
count//一共多少条
tableDate
//获取表格数据
getAlltabledate(){
let paramsdata:any = {
Operation:this.level||[],
ContentType:Number(this.projectlevel)||[],
Level:this.PlanLevel||[],
verifyState:this.verifyState||[1,2,4,5],
QueryStartTime:this.addtime||'',
QueryEndTime:this.endtime||''
}
this.http.get("/api/ContentVerifies",{params:paramsdata}).subscribe((data:any)=>{
//console.log(data)
this.tableDate=data.items
this.count=data.totalCount
})
}
//提交查询
onSubmit(value){
//console.log(value)
this.getAlltabledate()
}
//刷新
record(){
this.verifyState=''
this.level=''
this.projectlevel=''
this.addtime=''
this.endtime=''
let level = sessionStorage.getItem("level");
if(level == "0"){//如果是总队
this.PlanLevel=0
}
if(level == "1"){//如果是支队
this.PlanLevel=1
}
if(level == "2"){//如果是大队
this.PlanLevel=2
}
if(level == "3"){//如果是中队
this.PlanLevel=3
}
this.getAlltabledate()
}
}

6
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: 2021-01-19 14:29:15
* @LastEditTime: 2021-01-21 11:17:39
*/
import { Component, OnInit } from '@angular/core';
import { FormControl } from '@angular/forms';
@ -165,6 +165,7 @@ export class WaitExamineerComponent implements OnInit {
this.getAlltabledate()
})
}
this.chuorzhong=undefined
}
//拒绝操作
refuse(){
@ -175,7 +176,7 @@ export class WaitExamineerComponent implements OnInit {
this.snackBar.open('审核未通过,请修改后再来审核!','确定',config);
}
if(this.chuorzhong==0){
this.http.put(`/api/PlanAudits/${this.radioid}/First`,{auditStatus:4}).subscribe(data=>{
this.http.put(`/api/PlanAudits/${this.radioid}/First`,{auditStatus:32}).subscribe(data=>{
this.snackBar.open('操作成功!','确定',config);
this.checked=''
this.getAlltabledate()
@ -188,6 +189,7 @@ this.http.put(`/api/PlanAudits/${this.radioid}`,{auditStatus:4}).subscribe(data=
this.getAlltabledate()
})
}
this.chuorzhong=undefined
}
//分数饼状图

6
src/app/plan-management/entry-plan-look/AddPlanone.html

@ -4,7 +4,7 @@
* @Author: sueRimn
* @Date: 2020-12-24 10:59:48
* @LastEditors: sueRimn
* @LastEditTime: 2021-01-13 10:45:42
* @LastEditTime: 2021-01-19 16:21:16
-->
<form (ngSubmit)="onSubmit(form.value)" #form="ngForm" class="example-container">
<div class="topbox" style="text-align: center;">
@ -36,8 +36,8 @@
<mat-form-field>
<mat-select name="reservePlanType" formControlName="firstCtrlthree" placeholder='请选择预案级别' required>
<mat-option value='3'>Ⅲ级预案</mat-option>
<mat-option value='4'>Ⅳ级预案</mat-option>
<mat-option value='5'>Ⅴ级预案</mat-option>
<mat-option value='4' *ngIf="levels!='1'&&levels!='2'">Ⅳ级预案</mat-option>
<mat-option value='5' *ngIf="levels!='1'&&levels!='2'">Ⅴ级预案</mat-option>
</mat-select>
</mat-form-field>
</div>

22
src/app/plan-management/entry-plan-look/auditresult.html

@ -1,15 +1,29 @@
<!--
* @Descripttion:
* @version:
* @Author: sueRimn
* @Date: 2020-12-24 10:59:48
* @LastEditors: sueRimn
* @LastEditTime: 2021-01-20 17:09:15
-->
<div style="text-align: center;">
<span mat-dialog-title>审批结果</span>
</div>
<div class="auditDiv">
<p>预案名称:{{planName}}</p>
<p>提交时间:{{commitTime| date:'yyyy-MM-dd HH:mm:ss'}}</p>
<p>提交时间:{{data.element.committedTime| date:'yyyy-MM-dd HH:mm:ss'}}</p>
<p>发起申请:{{commitOrganizationName }}</p>
<mat-divider></mat-divider>
<p>审批大队:{{auditOrganizationName}}</p>
<p>审批结果:{{auditResult | auditsatus}}</p>
<p>审批意见:{{auditOpinion}}</p>
<p>初审时间:{{data.element.firstAudittedTime| date:'yyyy-MM-dd HH:mm:ss'}}</p>
<p>初审机构:{{data.element.firstAuditorName}}</p>
<p>初审意见:{{data.element.firstAuditOpinion}}</p>
<p>初审结果:{{data.element.auditStatus==16?'待终审':data.element.auditStatus==32?'初审退回':''}}</p>
<mat-divider></mat-divider>
<p>终审时间:{{data.element.audittedTime| date:'yyyy-MM-dd HH:mm:ss'}}</p>
<p>终审机构:{{data.element.auditorOrganizationName}}</p>
<p>终审意见:{{data.element.auditOpinion}}</p>
<p>终审结果:{{data.element.auditStatus==2?'终审通过':data.element.auditStatus==4?'终审退回':''}}</p>
</div>

12
src/app/plan-management/entry-plan-look/entry-plan-look.component.html

@ -1,3 +1,11 @@
<!--
* @Descripttion:
* @version:
* @Author: sueRimn
* @Date: 2020-12-24 10:59:48
* @LastEditors: sueRimn
* @LastEditTime: 2021-01-21 15:10:08
-->
<!-- <p>录入预案</p> -->
<div class="header" style="position: relative;">
<div>
@ -52,7 +60,8 @@
<ng-container matColumnDef="auditstate">
<th mat-header-cell *matHeaderCellDef>审核状态</th>
<td mat-cell *matCellDef="let element">{{element.auditStatus | auditsatus}}</td>
<td mat-cell *matCellDef="let element">{{element.auditStatus=='8'?'未提交审核':element.auditStatus=='1'?'审核中':element.auditStatus=='2'?'审核通过':element.auditStatus=='4'?
'审核退回':element.auditStatus=='16'?'初审通过':'初审驳回'}}</td>
</ng-container>
<ng-container matColumnDef="isopen">
<th mat-header-cell *matHeaderCellDef>是否公开</th>
@ -71,7 +80,6 @@
<span (click)="readFile(element)" [ngClass]="{'grey': element.planMode == '1' || element.planMode == '2' || element.planMode == '3'}">下载</span>
<span (click)="deletePlan(element)">删除</span>
<span (click)="auditResult(element)">审批结果</span>
<span (click)="submitAudit(element)" *ngIf="element.auditStatus == 8 || element.auditStatus == 2 || element.auditStatus == 4" [ngClass]="{'grey': element.auditStatus == '2'}">提交审核</span>
<span (click)="cancelAudit(element)" *ngIf="element.auditStatus == 1">撤销审核</span>
</td>

4
src/app/plan-management/entry-plan-look/entry-plan-look.component.ts

@ -433,7 +433,7 @@ export class AddPlanone {
ngOnInit(): void {
this.levels=sessionStorage.getItem("level")
this.firstFormGroup = this._formBuilder.group({
firstCtrlone: ['', Validators.required],
firstCtrltwo: ['', Validators.required],
@ -447,6 +447,7 @@ export class AddPlanone {
onNoClick(): void {
this.dialogRef.close();
}
levels//
isup:boolean = true //上传input框是否显示
isweb:boolean = false //web输入框是否显示
isinput:boolean = false //导入是否显示
@ -810,6 +811,7 @@ export class AddPlanone {
name: this.selectedPLanName,
planType:Number(this.selectedPLanType),
planMode: Number(this.defaultisshow),
planCategory: Number(this.selectedPLanLevel),
planLevel: PlanLevel,
url: this.webaddress,
attachmentUrls: null

7
src/app/plan-management/meet-plan/meet-plan.component.html

@ -119,7 +119,8 @@
</ng-container>
<ng-container matColumnDef="passstate">
<th mat-header-cell *matHeaderCellDef style="width: 10%;">审核状态</th>
<td mat-cell *matCellDef="let element">{{element.auditStatus=='8'?'未提交审核':element.auditStatus=='1'?'审核中':element.auditStatus=='2'?'审核通过':'审核退回'}}</td>
<td mat-cell *matCellDef="let element">{{element.auditStatus=='8'?'未提交审核':element.auditStatus=='1'?'审核中':element.auditStatus=='2'?'审核通过':element.auditStatus=='4'?
'审核退回':element.auditStatus=='16'?'初审通过':'初审驳回'}}</td>
</ng-container>
<ng-container matColumnDef="isopen">
<th mat-header-cell *matHeaderCellDef style="width: 10%;">是否公开</th>
@ -135,6 +136,7 @@
<span style="color: blue;">查看预案</span>
<span style="color: blue;margin-left: 4px;" (click)="submitAudit(element)" *ngIf="element.auditStatus == 8 || element.auditStatus == 4" >提交审核</span>
<span style="color: blue;margin-left: 4px;" (click)="cancelAudit(element)" *ngIf="element.auditStatus == 1">撤销审核</span>
<span style="color: blue;margin-left: 4px;" (click)="auditResult(element)">审批结果</span>
<span style="color: blue;margin-left: 4px;" (click)='readFile(element)'>下载</span>
<span style="color: red;margin-left: 4px" (click)='deletePlan(element.id)' *ngIf="element.auditStatus == 8"> 删除</span>
</td>
@ -144,7 +146,8 @@
</table>
<mat-paginator pageEvent [length]="length"
[pageSize]="pageSize"
[pageSizeOptions]="pageSizeOptions">
[pageSizeOptions]="pageSizeOptions"
(page)="changePage($event)">
</mat-paginator>

6
src/app/plan-management/meet-plan/meet-plan.component.scss

@ -149,4 +149,10 @@
// margin-left: 160px;
}
}
.auditDiv{
p{
margin: 8px 0;
margin-left: 16px;
}
}

39
src/app/plan-management/meet-plan/meet-plan.component.ts

@ -100,6 +100,11 @@ export class MeetPlanComponent implements OnInit {
this.tabledataSource = data.items
})
}
//分页事件
changePage(e){
this.PageNumber = e.pageIndex+1
this.getAlltabledate()
}
//查询
onSubmit (value) {
@ -278,8 +283,20 @@ export class MeetPlanComponent implements OnInit {
}
);
}
//审核结果
auditResult(element){
// console.log(element)
const dialogRef = this.dialog.open(meetAuditResult, {
width:"400px",
//height:"300px",
data: {element:element}
});
}
}
//新建
@Component({
selector: 'new-unit',
templateUrl: './newunit.html',
@ -508,3 +525,25 @@ export class newunitMeet{
this.dialogRef.close();
}
}
//查看审核结果
@Component({
selector: 'resultmeet',
templateUrl: './resultmeetPlan.html',
styleUrls: ['./meet-plan.component.scss']
})
export class meetAuditResult{
constructor(private http: HttpClient,public dialogRef: MatDialogRef<meetAuditResult>,@Inject(MAT_DIALOG_DATA) public data,public snackBar: MatSnackBar) {}
planName:any = this.data.element.name
commitTime:any = this.data.element.committedTime
commitOrganizationName:any = this.data.element.committerOrganizationName
auditOrganizationName:any = this.data.element.auditorOrganizationName
auditResult:any = this.data.element.auditStatus
auditOpinion:any = this.data.element.auditOpinion
ngOnInit(): void {
}
onNoClick(): void {
this.dialogRef.close();
}
}

32
src/app/plan-management/meet-plan/resultmeetPlan.html

@ -0,0 +1,32 @@
<!--
* @Descripttion:
* @version:
* @Author: sueRimn
* @Date: 2021-01-20 09:31:24
* @LastEditors: sueRimn
* @LastEditTime: 2021-01-20 17:09:00
-->
<div style="text-align: center;">
<span mat-dialog-title>审批结果</span>
</div>
<div class="auditDiv">
<p>预案名称:{{planName}}</p>
<p>提交时间:{{data.element.committedTime| date:'yyyy-MM-dd HH:mm:ss'}}</p>
<p>发起申请:{{commitOrganizationName }}</p>
<mat-divider></mat-divider>
<p>初审时间:{{data.element.firstAudittedTime| date:'yyyy-MM-dd HH:mm:ss'}}</p>
<p>初审机构:{{data.element.firstAuditorName}}</p>
<p>初审意见:{{data.element.firstAuditOpinion}}</p>
<p>初审结果:{{data.element.auditStatus==16?'待终审':data.element.auditStatus==32?'初审退回':''}}</p>
<mat-divider></mat-divider>
<p>终审时间:{{data.element.audittedTime| date:'yyyy-MM-dd HH:mm:ss'}}</p>
<p>终审机构:{{data.element.auditorOrganizationName}}</p>
<p>终审意见:{{data.element.auditOpinion}}</p>
<p>终审结果:{{data.element.auditStatus==2?'终审通过':data.element.auditStatus==4?'终审退回':''}}</p>
</div>
<div style="text-align: center;margin-top: 18px; ">
<button mat-raised-button (click)="onNoClick()">关闭</button>
</div>

11
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: 2021-01-19 15:01:55
* @LastEditTime: 2021-01-21 15:02:25
-->
<div style="height: 100%;overflow-y: auto;">
<div class="header" >
@ -119,7 +119,8 @@
</ng-container>
<ng-container matColumnDef="passstate">
<th mat-header-cell *matHeaderCellDef style="width: 10%;">审核状态</th>
<td mat-cell *matCellDef="let element">{{element.auditStatus=='8'?'未提交审核':element.auditStatus=='1'?'审核中':element.auditStatus=='2'?'审核通过':'审核退回'}}</td>
<td mat-cell *matCellDef="let element">{{element.auditStatus=='8'?'未提交审核':element.auditStatus=='1'?'审核中':element.auditStatus=='2'?'审核通过':element.auditStatus=='4'?
'审核退回':element.auditStatus=='16'?'初审通过':'初审驳回'}}</td>
</ng-container>
<ng-container matColumnDef="isopen">
<th mat-header-cell *matHeaderCellDef style="width: 10%;">是否公开</th>
@ -133,8 +134,9 @@
<th mat-header-cell *matHeaderCellDef style="width: 20%;">操作</th>
<td mat-cell *matCellDef="let element" style="white-space: nowrap;cursor: pointer;">
<span style="color: blue;">查看预案</span>
<span style="color: blue;margin-left: 4px;" (click)="submitAudit(element)" *ngIf="element.auditStatus == 8 || element.auditStatus == 4" [ngClass]="{'grey': element.auditStatus == '2'}">提交审核</span>
<span style="color: blue;margin-left: 4px;" (click)="submitAudit(element)" *ngIf="element.auditStatus == 8 " >提交审核</span>
<span style="color: blue;margin-left: 4px;" (click)="cancelAudit(element)" *ngIf="element.auditStatus == 1">撤销审核</span>
<span style="color: blue;margin-left: 4px;" (click)="auditResult(element)">审批结果</span>
<!-- <span style="color: blue;margin-left: 4px;" *ngIf="element.auditStatus == 2">审核通过</span> -->
<span style="color: blue;margin-left: 4px;" (click)='readFile(element)'>下载</span>
<span style="color: red;margin-left: 4px" (click)='deletePlan(element.id)' *ngIf="element.auditStatus == 8"> 删除</span>
@ -145,7 +147,8 @@
</table>
<mat-paginator pageEvent [length]="length"
[pageSize]="pageSize"
[pageSizeOptions]="pageSizeOptions">
[pageSizeOptions]="pageSizeOptions"
(page)="changePage($event)">
</mat-paginator>

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

@ -149,4 +149,11 @@
// margin-left: 160px;
}
}
.auditDiv{
p{
margin: 8px 0;
margin-left: 16px;
}
}

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

@ -4,12 +4,13 @@
* @Author: sueRimn
* @Date: 2020-12-24 14:15:10
* @LastEditors: sueRimn
* @LastEditTime: 2021-01-19 14:55:16
* @LastEditTime: 2021-01-21 14:32:43
*/
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'
@ -108,9 +109,13 @@ export class OnetwoEntryPlanComponent implements OnInit {
this.http.get("/api/PlanComponentsMajor",{params:paramsdata}).subscribe((data:any)=>{
this.length = data.totalCount
this.tabledataSource = data.items
console.log(this.tabledataSource)
})
}
//分页事件
changePage(e){
this.PageNumber = e.pageIndex+1
this.getAlltabledate()
}
//重置
reset(){
@ -193,6 +198,17 @@ export class OnetwoEntryPlanComponent implements OnInit {
}
);
}
//审核结果
auditResult(element){
// console.log(element)
const dialogRef = this.dialog.open(onetwoAuditResult, {
width:"400px",
//height:"300px",
data: {element:element}
});
}
//下载↓
selectDownloadFile:any; //选择下载的文件
download:any; //下载文件元数据
@ -301,6 +317,7 @@ export class OnetwoEntryPlanComponent implements OnInit {
}
//新建
@Component({
selector: 'new-unit',
templateUrl: './newunit.html',
@ -526,3 +543,25 @@ export class newunitComponent{
this.dialogRef.close();
}
}
//查看审核结果
@Component({
selector: 'resultonetwo',
templateUrl: './resultPlanonetwo.html',
styleUrls: ['./onetwo-entry-plan.component.scss']
})
export class onetwoAuditResult{
constructor(private http: HttpClient,public dialogRef: MatDialogRef<onetwoAuditResult>,@Inject(MAT_DIALOG_DATA) public data,public snackBar: MatSnackBar) {}
planName:any = this.data.element.name
commitTime:any = this.data.element.committedTime
commitOrganizationName:any = this.data.element.committerOrganizationName
auditOrganizationName:any = this.data.element.auditorOrganizationName
auditResult:any = this.data.element.auditStatus
auditOpinion:any = this.data.element.auditOpinion
ngOnInit(): void {
}
onNoClick(): void {
this.dialogRef.close();
}
}

32
src/app/plan-management/onetwo-entry-plan/resultPlanonetwo.html

@ -0,0 +1,32 @@
<!--
* @Descripttion:
* @version:
* @Author: sueRimn
* @Date: 2021-01-20 09:31:24
* @LastEditors: sueRimn
* @LastEditTime: 2021-01-20 17:07:50
-->
<div style="text-align: center;">
<span mat-dialog-title>审批结果</span>
</div>
<div class="auditDiv">
<p>预案名称:{{planName}}</p>
<p>提交时间:{{data.element.committedTime| date:'yyyy-MM-dd HH:mm:ss'}}</p>
<p>发起申请:{{commitOrganizationName }}</p>
<mat-divider></mat-divider>
<p>初审时间:{{data.element.firstAudittedTime| date:'yyyy-MM-dd HH:mm:ss'}}</p>
<p>初审机构:{{data.element.firstAuditorName}}</p>
<p>初审意见:{{data.element.firstAuditOpinion}}</p>
<p>初审结果:{{data.element.auditStatus==16?'待终审':data.element.auditStatus==32?'初审退回':''}}</p>
<mat-divider></mat-divider>
<p>终审时间:{{data.element.audittedTime| date:'yyyy-MM-dd HH:mm:ss'}}</p>
<p>终审机构:{{data.element.auditorOrganizationName}}</p>
<p>终审意见:{{data.element.auditOpinion}}</p>
<p>终审结果:{{data.element.auditStatus==2?'终审通过':data.element.auditStatus==4?'终审退回':''}}</p>
</div>
<div style="text-align: center;margin-top: 18px; ">
<button mat-raised-button (click)="onNoClick()">关闭</button>
</div>

140
src/app/plan-management/pass-plan/pass-plan.component.html

@ -73,6 +73,26 @@
</mat-form-field>
<mat-checkbox style="margin-left: 6px;" [(ngModel)]="plcheck" name="plcheck">包含下级</mat-checkbox>
</div>
<div class="queryField">
<label style="margin-right: 10px;">添加时间:</label>
<mat-form-field class="example-full-width">
<input type="date" matInput name="addtime" autocomplete="off" [(ngModel)]="addtime">
</mat-form-field>
🠊
<mat-form-field class="example-full-width">
<input type="date" matInput name="endtime" autocomplete="off" [(ngModel)]="endtime">
</mat-form-field>
</div>
<div class="queryField" style="margin-left: 100px;">
<label style="margin-right: 10px;">完整度查询:</label>
<mat-form-field class="example-full-width">
<input type="number" oninput="if(value>1)value=1;if(value<0)value=0" matInput placeholder="请输入完整度最小值" name="companyName" [(ngModel)]="integrityScoreMin" autocomplete="off">
</mat-form-field>
🠊
<mat-form-field class="example-full-width" style="margin-left: 5px;">
<input type="number" oninput="if(value>1)value=1;if(value<0)value=0" matInput placeholder="请输入完整度最大值" name="companyName" [(ngModel)]="integrityScoreMax" autocomplete="off">
</mat-form-field>
</div>
</div>
<div style="width: 100%;text-align: center;">
@ -86,14 +106,130 @@
<div class="tablebox">
<table mat-table [dataSource]="tabledataSource" class="mat-elevation-z8">
<ng-container matColumnDef="unitname">
<!-- <ng-container matColumnDef="unitname">
<th mat-header-cell *matHeaderCellDef>单位名称</th>
<td mat-cell *matCellDef="let element">{{element.companyName}}</td>
</ng-container>
</ng-container> -->
<ng-container matColumnDef="planname">
<th mat-header-cell *matHeaderCellDef>预案名称</th>
<td mat-cell *matCellDef="let element">{{element.name}}</td>
</ng-container>
<!-- <ng-container matColumnDef="integrity" >
<th mat-header-cell *matHeaderCellDef style="text-align: center;">信息完整度得分</th>
<td mat-cell *matCellDef="let element;let i = index">
<div class="integrityDiv">
<span class="integrityNum">
{{(element.companyIntegrityScore.totalScore.toFixed(2) * 100).toFixed()}}分
</span>
<div class="integrityColorDiv" [style]="integrity((element.companyIntegrityScore.totalScore.toFixed(2) * 100).toFixed())">
</div>
<div class="integrityDetails" [ngClass]="{'bottomposition': i <= 5,'topposition': i > 5}">
<div class="integrityDetailsTop">
<span class="span1">分类名称</span>
<span class="span2">已得分</span>
<span class="span3">总分</span>
</div>
<div class="integrityDetailsBody">
<ul>
<li>
<div class="name">单位信息</div>
<div class="colorDiv">
<div class="colorDivBac">
<div class="colorDivCon" [style]="integrityDetails((element.companyIntegrityScore.basicInfoScore * 5).toFixed(1),5)"></div>
</div>
<span>{{(element.companyIntegrityScore.basicInfoScore * 5).toFixed(1)}}分</span>
</div>
<div class="number">5分</div>
</li>
<li>
<div class="name">建筑信息</div>
<div class="colorDiv">
<div class="colorDivBac">
<div class="colorDivCon" [style]="integrityDetails((element.companyIntegrityScore.buildingInfoScore * 10).toFixed(1),10)"></div>
</div>
<span>{{(element.companyIntegrityScore.buildingInfoScore * 10).toFixed(1)}}分</span>
</div>
<div class="number">10分</div>
</li>
<li>
<div class="name">平面图</div>
<div class="colorDiv">
<div class="colorDivBac">
<div class="colorDivCon" [style]="integrityDetails((element.companyIntegrityScore.planImageScore * 10).toFixed(1),10)"></div>
</div>
<span>{{(element.companyIntegrityScore.planImageScore * 10).toFixed(1)}}分</span>
</div>
<div class="number">10分</div>
</li>
<li>
<div class="name">四周毗邻</div>
<div class="colorDiv">
<div class="colorDivBac">
<div class="colorDivCon" [style]="integrityDetails((element.companyIntegrityScore.adjoinScore * 10).toFixed(1),10)"></div>
</div>
<span>{{(element.companyIntegrityScore.adjoinScore * 10).toFixed(1)}}分</span>
</div>
<div class="number">10分</div>
</li>
<li>
<div class="name">消防设施</div>
<div class="colorDiv">
<div class="colorDivBac">
<div class="colorDivCon" [style]="integrityDetails((element.companyIntegrityScore.facilityScore * 25).toFixed(1),25)"></div>
</div>
<span>{{(element.companyIntegrityScore.facilityScore * 25).toFixed(1)}}分</span>
</div>
<div class="number">25分</div>
</li>
<li>
<div class="name">重点部位</div>
<div class="colorDiv">
<div class="colorDivBac">
<div class="colorDivCon" [style]="integrityDetails((element.companyIntegrityScore.importantLocationScore * 10).toFixed(1),10)"></div>
</div>
<span>{{(element.companyIntegrityScore.importantLocationScore * 10).toFixed(1)}}分</span>
</div>
<div class="number">10分</div>
</li>
<li>
<div class="name">功能分区</div>
<div class="colorDiv">
<div class="colorDivBac">
<div class="colorDivCon" [style]="integrityDetails((element.companyIntegrityScore.functionalDivisionScore * 10).toFixed(1),10)"></div>
</div>
<span>{{(element.companyIntegrityScore.functionalDivisionScore * 10).toFixed(1)}}分</span>
</div>
<div class="number">10分</div>
</li>
<li>
<div class="name">实景图</div>
<div class="colorDiv">
<div class="colorDivBac">
<div class="colorDivCon" [style]="integrityDetails((element.companyIntegrityScore.realityImageScore * 10).toFixed(1),10)"></div>
</div>
<span>{{(element.companyIntegrityScore.realityImageScore * 10).toFixed(1)}}分</span>
</div>
<div class="number">10分</div>
</li>
<li>
<div class="name">CAD上传</div>
<div class="colorDiv">
<div class="colorDivBac">
<div class="colorDivCon" [style]="integrityDetails((element.companyIntegrityScore.cadScore * 10).toFixed(1),10)"></div>
</div>
<span>{{(element.companyIntegrityScore.cadScore * 10).toFixed(1)}}分</span>
</div>
<div class="number">10分</div>
</li>
</ul>
</div>
<div style="width: 100%;text-align: center;font-size: 13px;">
仅供参考
</div>
</div>
</div>
</td>
</ng-container> -->
<ng-container matColumnDef="addpeople">
<th mat-header-cell *matHeaderCellDef>添加人</th>
<td mat-cell *matCellDef="let element">{{element.creatorName}}</td>

117
src/app/plan-management/pass-plan/pass-plan.component.scss

@ -89,4 +89,121 @@
.mat-cell{
text-align: center;
}
//完整度
.integrityDiv{
width: 180px;
height: 30px;
background-color: #e2e7ee;
// background-image: linear-gradient(to right, #e2e7ee ,#FF4500, #FF8C00,#32cd32);
margin: 0 auto;
position: relative;
.integrityNum{
position: absolute;
left: 50%;
top: 50%;
transform: translate(-50%, -50%);
color: black;
font-weight: 800;
font-size: 15px;
cursor: default;
}
.integrityColorDiv{
height: 100%;
}
.integrityDetails{
position: absolute;
display: none;
width: 350px;
height:280px;
border: 1px solid rgba(0, 0, 0, 0.22);
background-color: white;
.integrityDetailsTop{
width: 100%;
height: 23px;
line-height:23px;
border-bottom: 1px solid rgba(0, 0, 0, 0.22);
margin-bottom: 1px;
font-size: 14px;
span{
display: inline-block;
text-align: center;
font-weight: 800;
}
.span1{
width: 25%;
}
.span2{
width: 60%;
}
.span3{
width: 15%;
}
}
.integrityDetailsBody{
ul{
li{
width: 100%;
height: 23px;
line-height: 23px;
margin: 3px 0;
div{
float: left;
font-size: 13px;
}
.name{
width: 25%;
height: 100%;
}
.colorDiv{
width: 60%;
height: 100%;
position: relative;
.colorDivBac{
width: 90%;
height: 100%;
position: absolute;
left: 50%;
top: 50%;
transform: translate(-50%,-50%);
background-color: #dfe5ec;
border-radius: 5px;
.colorDivCon{
border-radius: 5px;
height: 100%;
background-color: #2398f1;
}
}
span{
position: absolute;
left: 50%;
top: 50%;
transform: translate(-50%,-50%);
// color: white;
font-weight: 600;
}
}
.number{
width: 15%;
height: 100%;
}
}
}
}
}
.bottomposition{
top: 2px;
left: 188px;
}
.topposition{
top: -252px;
left: 188px;
}
}
.integrityDiv:hover{
.integrityDetails{
display: block;
}
}

121
src/app/plan-management/pass-plan/pass-plan.component.ts

@ -42,7 +42,7 @@ export class PassPlanComponent implements OnInit {
pageSizeOptions: number[] = [10] //设置每页条数
PageNumber:any; //第几页
displayedColumns: string[] = ['unitname', 'planname', 'addpeople','addtime','plantype','auditStatus','openRange','projectlevel','operation'];
displayedColumns: string[] = ['planname', 'addpeople','addtime','plantype','auditStatus','openRange','projectlevel','operation'];
allorganizations:any //所有组织机构
allunittype:any //所有单位类型
tabledataSource:any //表格数据
@ -108,6 +108,121 @@ export class PassPlanComponent implements OnInit {
})
}
colorRgb(sColor){
var reg = /^#([0-9a-fA-f]{3}|[0-9a-fA-f]{6})$/;
var sColor = sColor.toLowerCase();
if (sColor && reg.test(sColor)) {
if (sColor.length === 4) {
var sColorNew = "#";
for (var i = 1; i < 4; i += 1) {
sColorNew += sColor.slice(i, i + 1).concat(sColor.slice(i, i + 1));
}
sColor = sColorNew;
}
//处理六位的颜色值
var sColorChange = [];
for (var i = 1; i < 7; i += 2) {
sColorChange.push(parseInt("0x" + sColor.slice(i, i + 2)));
}
return sColorChange;
} else {
return sColor;
}
}
colorHex(rgb){
var _this = rgb;
var reg = /^#([0-9a-fA-f]{3}|[0-9a-fA-f]{6})$/;
if (/^(rgb|RGB)/.test(_this)) {
var aColor = _this.replace(/(?:(|)|rgb|RGB)*/g, "").split(",");
var strHex = "#";
for (var i = 0; i < aColor.length; i++) {
var hex:any = Number(aColor[i]).toString(16);
hex = hex < 10 ? 0 + '' + hex : hex;// 保证每个rgb的值为2位
if (hex === "0") {
hex += hex;
}
strHex += hex;
}
if (strHex.length !== 7) {
strHex = _this;
}
return strHex;
} else if (reg.test(_this)) {
var aNum = _this.replace(/#/, "").split("");
if (aNum.length === 6) {
return _this;
} else if (aNum.length === 3) {
var numHex = "#";
for (var i = 0; i < aNum.length; i += 1) {
numHex += (aNum[i] + aNum[i]);
}
return numHex;
}
} else {
return _this;
}
}
gradientColor(startColor, endColor, step) {
let _this = this
let startRGB = _this.colorRgb(startColor);//转换为rgb数组模式
let startR = startRGB[0];
let startG = startRGB[1];
let startB = startRGB[2];
let endRGB = _this.colorRgb(endColor);
let endR = endRGB[0];
let endG = endRGB[1];
let endB = endRGB[2];
let sR = (endR - startR) / step;//总差值
let sG = (endG - startG) / step;
let sB = (endB - startB) / step;
var colorArr = [];
for (var i = 0; i < step; i++) {
//计算每一步的hex值
var hex = _this.colorHex('rgb('+ parseInt((sR * i + startR))+ ',' + parseInt((sG * i + startG))+ ',' + parseInt((sB * i + startB)) + ')');
colorArr.push(hex);
}
return colorArr;
}
integrity(width){
let _this = this
let style:any = {}
style.width = width +'%';
if(width < 30){
let colorArr = this.gradientColor('#D50000', '#E53935', 30);
for(let i = 0; i < 30; i++){
if( i == width){
style.background = colorArr[i]
}
}
}
if(width >= 30 && width < 60){
let colorArr = this.gradientColor('#FF9800', '#E65100', 30);
for(let i = 30; i < 60; i++){
if( i == width){
style.background = colorArr[i-30]
}
}
}
if(width >= 60){
let colorArr = this.gradientColor('#81C784', '#2E7D32', 41);
for(let i = 60; i <= 100; i++){
if( i == width){
style.background = colorArr[i-60]
}
}
}
return style
}
integrityDetails(width,zong){
let style:any = {}
style.width = (width/zong)*100 +'%';
return style
}
@ -119,6 +234,10 @@ export class PassPlanComponent implements OnInit {
}
)
}
addtime//开始时间
endtime//结束时间
integrityScoreMin//完整度最小值
integrityScoreMax//完整度最大值
organizationName:any //当前单位组织机构名称
treedata:any //组织机构树型数据
newArr:any = []

5
src/app/plan-management/plan-management.module.ts

@ -57,12 +57,15 @@ import { newunitMeet }from './meet-plan/meet-plan.component';
import { TypePlanComponent } from './type-plan/type-plan.component';
import { newunitType }from './type-plan/type-plan.component';
import { PsViewer } from './entry-plan-look/entry-plan-look.component'
import { onetwoAuditResult } from './onetwo-entry-plan/onetwo-entry-plan.component';
import { meetAuditResult }from './meet-plan/meet-plan.component';
import { typeAuditResult } from './type-plan/type-plan.component'
@NgModule({
declarations: [EntryPlanComponent, PassPlanComponent, OpenPlanComponent, EntryPlanLookComponent,AddPlanone,PlanType,AuditSatus,PlanLevel,DownloadFile,AuditResult,ChangeName,
WebLookComponent, OnetwoEntryPlanComponent,newunitComponent, MeetPlanComponent,newunitMeet, TypePlanComponent,newunitType,PsViewer],
WebLookComponent, OnetwoEntryPlanComponent,newunitComponent, MeetPlanComponent,newunitMeet, TypePlanComponent,newunitType,PsViewer,onetwoAuditResult,meetAuditResult,typeAuditResult],
imports: [
CommonModule,
PlanManagementRoutingModule,

32
src/app/plan-management/type-plan/resulttypePlan.html

@ -0,0 +1,32 @@
<!--
* @Descripttion:
* @version:
* @Author: sueRimn
* @Date: 2021-01-20 09:31:24
* @LastEditors: sueRimn
* @LastEditTime: 2021-01-20 17:08:43
-->
<div style="text-align: center;">
<span mat-dialog-title>审批结果</span>
</div>
<div class="auditDiv">
<p>预案名称:{{planName}}</p>
<p>提交时间:{{data.element.committedTime| date:'yyyy-MM-dd HH:mm:ss'}}</p>
<p>发起申请:{{commitOrganizationName }}</p>
<mat-divider></mat-divider>
<p>初审时间:{{data.element.firstAudittedTime| date:'yyyy-MM-dd HH:mm:ss'}}</p>
<p>初审机构:{{data.element.firstAuditorName}}</p>
<p>初审意见:{{data.element.firstAuditOpinion}}</p>
<p>初审结果:{{data.element.auditStatus==16?'待终审':data.element.auditStatus==32?'初审退回':''}}</p>
<mat-divider></mat-divider>
<p>终审时间:{{data.element.audittedTime| date:'yyyy-MM-dd HH:mm:ss'}}</p>
<p>终审机构:{{data.element.auditorOrganizationName}}</p>
<p>终审意见:{{data.element.auditOpinion}}</p>
<p>终审结果:{{data.element.auditStatus==2?'终审通过':data.element.auditStatus==4?'终审退回':''}}</p>
</div>
<div style="text-align: center;margin-top: 18px; ">
<button mat-raised-button (click)="onNoClick()">关闭</button>
</div>

9
src/app/plan-management/type-plan/type-plan.component.html

@ -97,7 +97,8 @@
</ng-container>
<ng-container matColumnDef="passstate">
<th mat-header-cell *matHeaderCellDef style="width: 10%;">审核状态</th>
<td mat-cell *matCellDef="let element">{{element.auditStatus=='8'?'未提交审核':element.auditStatus=='1'?'审核中':element.auditStatus=='2'?'审核通过':'审核退回'}}</td>
<td mat-cell *matCellDef="let element">{{element.auditStatus=='8'?'未提交审核':element.auditStatus=='1'?'审核中':element.auditStatus=='2'?'审核通过':element.auditStatus=='4'?
'审核退回':element.auditStatus=='16'?'初审通过':'初审驳回'}}</td>
</ng-container>
<ng-container matColumnDef="isopen">
<th mat-header-cell *matHeaderCellDef style="width: 10%;">是否公开</th>
@ -111,8 +112,9 @@
<th mat-header-cell *matHeaderCellDef style="width: 20%;">操作</th>
<td mat-cell *matCellDef="let element" style="white-space: nowrap;cursor: pointer;">
<span style="color: blue;">查看预案</span>
<span style="color: blue;margin-left: 4px;" (click)="submitAudit(element)" *ngIf="element.auditStatus == 8 || element.auditStatus == 4" >提交审核</span>
<span style="color: blue;margin-left: 4px;" (click)="submitAudit(element)" *ngIf="element.auditStatus == 8 " >提交审核</span>
<span style="color: blue;margin-left: 4px;" (click)="cancelAudit(element)" *ngIf="element.auditStatus == 1">撤销审核</span>
<span style="color: blue;margin-left: 4px;" (click)="auditResult(element)">审批结果</span>
<span style="color: blue;margin-left: 4px;" (click)='readFile(element)'>下载</span>
<span style="color: red;margin-left: 4px" (click)='deletePlan(element.id)' *ngIf="element.auditStatus == 8"> 删除</span>
</td>
@ -122,7 +124,8 @@
</table>
<mat-paginator pageEvent [length]="length"
[pageSize]="pageSize"
[pageSizeOptions]="pageSizeOptions">
[pageSizeOptions]="pageSizeOptions"
(page)="changePage($event)">
</mat-paginator>

6
src/app/plan-management/type-plan/type-plan.component.scss

@ -149,4 +149,10 @@
// margin-left: 160px;
}
}
.auditDiv{
p{
margin: 8px 0;
margin-left: 16px;
}
}

40
src/app/plan-management/type-plan/type-plan.component.ts

@ -4,7 +4,7 @@
* @Author: sueRimn
* @Date: 2021-01-06 09:47:43
* @LastEditors: sueRimn
* @LastEditTime: 2021-01-15 15:15:49
* @LastEditTime: 2021-01-21 14:15:40
*/
import { Component, OnInit, ViewChild, Inject } from '@angular/core';
import { HttpClient } from '@angular/common/http'
@ -99,6 +99,11 @@ export class TypePlanComponent implements OnInit {
this.tabledataSource = data.items
})
}
//分页事件
changePage(e){
this.PageNumber = e.pageIndex+1
this.getAlltabledate()
}
//重置
reset(){
@ -179,6 +184,16 @@ export class TypePlanComponent implements OnInit {
}
);
}
//审核结果
auditResult(element){
// console.log(element)
const dialogRef = this.dialog.open(typeAuditResult, {
width:"400px",
//height:"300px",
data: {element:element}
});
}
//下载↓
@ -282,6 +297,7 @@ export class TypePlanComponent implements OnInit {
}
//新建
@Component({
selector: 'new-unit',
templateUrl: './newunit.html',
@ -500,3 +516,25 @@ export class newunitType{
this.dialogRef.close();
}
}
//查看审核结果
@Component({
selector: 'resultmeet',
templateUrl: './resulttypePlan.html',
styleUrls: ['./type-plan.component.scss']
})
export class typeAuditResult{
constructor(private http: HttpClient,public dialogRef: MatDialogRef<typeAuditResult>,@Inject(MAT_DIALOG_DATA) public data,public snackBar: MatSnackBar) {}
planName:any = this.data.element.name
commitTime:any = this.data.element.committedTime
commitOrganizationName:any = this.data.element.committerOrganizationName
auditOrganizationName:any = this.data.element.auditorOrganizationName
auditResult:any = this.data.element.auditStatus
auditOpinion:any = this.data.element.auditOpinion
ngOnInit(): void {
}
onNoClick(): void {
this.dialogRef.close();
}
}

4
src/app/ui/collection-tools/collection-tools.component.html

@ -284,7 +284,7 @@
[(ngModel)]="sliderValue" (change)="assetAngleIunput()" [disabled]="!isEditPattern || (canvasAssetObj.GameMode == 0 && !pattern)"></mat-slider>
</div>
</div>
<!-- 如果是多点连线 -->
<!-- 如果是多点连线 或者 矢量图-->
<div *ngIf="canvasAssetObj.InteractiveMode == 1 || canvasAssetObj.InteractiveMode == 3">
<p>厚度</p>
<div style="width: 100%;display: flex;vertical-align: top;height: 22px;">
@ -399,8 +399,8 @@
<option value ="4" [selected]="item.PropertyValue ==4">消防</option>
</select>
</div>
</div>
</div>
</div>
</div>
<!-- 消防要素 -->

21
src/app/working-area/working-area.component.ts

@ -971,6 +971,27 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV
this.createNodeShape(this.canvasData.selectPanelPoint.Data);
this.createAxLegend();
}
/**
*
* @data
*/
public async loadNoRelevantInformationDisposalPlan(data:DisposalNodeData): Promise<void> {
await this.refreshBackgroundImage(data.BackgroundImageUrl,data.BackgroundImageAngle);
// 清空所有图形
this.selection.deselectAll();
const itemList = [];
this.backgroundImage.children.forEach(item => {
if (item instanceof AxShape && item instanceof AxPreviewImageShape === false) {
itemList.push(item.name);
}
});
itemList.forEach(item => {
this.backgroundImage.getChildByName(item).destroy();
});
// 创建处置预案图形
this.createNodeShape(this.canvasData.selectPanelPoint.Data);
}
/**
*
*/

2
src/styles.scss

@ -129,7 +129,7 @@ table td.mat-footer-cell:last-of-type{
}
//弹出框样式取消padding
#shareDialog,#lookPlanDialog,#openPlanToolDialog,#addWater{
#shareDialog,#lookPlanDialog,#openPlanToolDialog,#addWater,#videodialog{
padding: 0;
}

Loading…
Cancel
Save