Browse Source

[新增]待审核页面新增预案类型

tangshan
chenjingyu 4 years ago
parent
commit
3dad410b3a
  1. 40
      src/app/plan-audit/plan-record/plan-record.component.html
  2. 10
      src/app/plan-audit/plan-record/plan-record.component.scss
  3. 7
      src/app/plan-audit/plan-record/plan-record.component.ts
  4. 6
      src/app/plan-audit/wait-examineer/wait-examineer.component.html
  5. 7
      src/app/plan-audit/wait-examineer/wait-examineer.component.ts
  6. 4
      src/app/plan-management/entry-plan-look/entry-plan-look.component.html
  7. 2
      src/app/plan-management/meet-plan/meet-plan.component.html
  8. 4
      src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.html
  9. 2
      src/app/plan-management/type-plan/type-plan.component.html
  10. 19
      src/app/statistic-analysis/state/page-there-year/page-there-year.component.ts
  11. 12
      src/app/statistic-analysis/state/page-two-time/page-two-time.component.ts
  12. 10
      src/index.html

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

@ -4,7 +4,7 @@
* @Author: sueRimn
* @Date: 2020-12-25 10:19:31
* @LastEditors: sueRimn
* @LastEditTime: 2021-07-08 09:25:11
* @LastEditTime: 2021-07-24 09:30:42
-->
<div class="box">
<div class="boxleft">
@ -53,6 +53,7 @@
</mat-select>
</mat-form-field>
</div>
<div class="headfour">
<span>时间:</span>
@ -64,6 +65,15 @@
<mat-form-field class="example-full-width" style="margin-left: 10px;margin-bottom: 0;">
<input type="date" matInput name="companyName" autocomplete="off" [(ngModel)]="endtime">
</mat-form-field>
<span style="margin-left: 10px;" >预案类型:</span>
<mat-form-field>
<mat-select placeholder='请选择预案类型' name="unittype" [(ngModel)]="plantypes" [multiple]="true">
<mat-option value="1">二维预案</mat-option>
<mat-option value="2">三维预案</mat-option>
<mat-option value="4">其他预案</mat-option>
<mat-option value="16">文本预案</mat-option>
</mat-select>
</mat-form-field>
<button mat-raised-button color="primary" type="submit" >查询</button>
<button mat-raised-button color="primary" (click)='record()'><img src="../../../assets/images/refresh.png" > 重置</button>
</div>
@ -94,13 +104,14 @@
<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: 10%;">操作</th>
<th style="width: 15%;">所属组织</th>
<th style="width: 15%;">审核状态</th>
<th style="width: 15%;">提交人</th>
<th style="width: 25%;">提交时间</th>
<th style="width: 15%;">类型</th>
<th style="width: 10%;">预案类型</th>
<th style="width: 15%;">名称</th>
<th style="width: 5%;">操作</th>
<th style="width: 20%;">所属组织</th>
<th style="width: 10%;">审核状态</th>
<th style="width: 10%;">提交人</th>
<th style="width: 15%;">提交时间</th>
</thead>
</table>
<div class="tbodycss" id="tbodydiv" >
@ -110,13 +121,16 @@
<!-- <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'?'重点单位':item.contentType=='12'?'水源':item.contentType=='13'?'消防力量':item.contentType=='14'?'联动力量':'未知'}}</td>
<td style="width: 10%;">
{{item.planType=='1'?'二维预案':item.planType=='2'?'三维预案':item.planType=='4'?'其它预案':item.planType=='16'?'文本预案':''}}
</td>
<td style="width: 15%;">{{item.title}}</td>
<td style="width: 10%;" [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.organizationName}}</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'?
<td style="width: 5%;" [ngClass]="{'green': item.operation == '1','red':item.operation == '2','blue':item.operation == '0'}">{{item.operation=='0'?'新增':item.operation=='1'?'更新':'删除'}}</td>
<td style="width: 20%;">{{item.organizationName}}</td>
<td style="width: 10%;" [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>
<td style="width: 10%;">{{item.creatorName}}</td>
<td style="width: 15%;">{{item.createTime|date:'yyyy-MM-dd'}}</td>
</tr>
</table>
</div>

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

@ -136,21 +136,25 @@
}
}
.headfour{
@media screen and (max-device-width:1200px){
font-size: 13px;
mat-form-field{
width: 150px;
width: 80px;
}
}
@media screen and (max-device-width:1400px) and (min-device-width:1200px){
margin-left: 15px;
mat-form-field{
width: 150px;
width: 80px;
}
}
@media screen and (min-device-width:1400px){
margin-left: 30px;
}
span{
@media screen and (min-device-width:1400px){
margin-left: 30px;
//margin-left: 30px;
}
}
button{

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

@ -4,7 +4,7 @@
* @Author: sueRimn
* @Date: 2020-12-25 10:19:31
* @LastEditors: sueRimn
* @LastEditTime: 2021-07-08 09:35:53
* @LastEditTime: 2021-07-24 14:36:27
*/
import { Component, OnInit, Inject } from '@angular/core';
import { FormControl } from '@angular/forms';
@ -92,6 +92,7 @@ export class PlanRecordComponent implements OnInit {
companyId
fetchUrl
companyName
plantypes
//获取表格数据
getAlltabledate() {
@ -102,7 +103,8 @@ export class PlanRecordComponent implements OnInit {
Level: this.PlanLevel || [],
verifyState: this.verifyState || [1, 2, 4, 5],
QueryStartTime: this.addtime || '',
QueryEndTime: this.endtime || ''
QueryEndTime: this.endtime || '',
PlanType:this.plantypes||[]
}
this.http.get("/api/ContentVerifies", { params: paramsdata }).subscribe((data: any) => {
//console.log(data)
@ -124,6 +126,7 @@ export class PlanRecordComponent implements OnInit {
this.endtime = ''
let level = sessionStorage.getItem("level");
this.PlanLevel = ''
this.plantypes=[]
this.getAlltabledate()
}
//表格点击事件

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

@ -41,7 +41,7 @@
<div class="headthreetwo">
<span >预案类型:</span>
<mat-form-field>
<mat-select placeholder='请选择预案类型' name="unittype" [(ngModel)]="projectlevel">
<mat-select placeholder='请选择预案类型' name="unittype" [(ngModel)]="plantypes" [multiple]="true">
<mat-option value="1">二维预案</mat-option>
<mat-option value="2">三维预案</mat-option>
<mat-option value="4">其他预案</mat-option>
@ -79,7 +79,9 @@
{{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'?'重点单位':item.contentType=='12'?'水源':item.contentType=='13'?'消防力量':item.contentType=='14'?'联动力量':'未知'}}
</td>
<td style="width: 10%;">二维预案</td>
<td style="width: 10%;">
{{item.planType=='1'?'二维预案':item.planType=='2'?'三维预案':item.planType=='4'?'其它预案':item.planType=='16'?'文本预案':''}}
</td>
<td style="width: 15%;">{{item.title}}</td>
<td style="width: 5%;"
[ngClass]="{'green': item.operation == '1','red':item.operation == '2','blue':item.operation == '0'}">

7
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-07-08 09:32:41
* @LastEditTime: 2021-07-24 14:34:24
*/
import { Component, Inject, OnInit } from '@angular/core';
import { FormControl } from '@angular/forms';
@ -106,6 +106,7 @@ export class WaitExamineerComponent implements OnInit {
companyId
fetchUrl
companyName
plantypes
//获取表格数据
getAlltabledate() {
@ -113,7 +114,8 @@ export class WaitExamineerComponent implements OnInit {
Operation: this.level || [],
ContentType: Number(this.projectlevel) || [],
Level: this.PlanLevel || [],
verifyState: [0, 3]
verifyState: [0, 3],
PlanType:this.plantypes||[]
}
this.http.get("/api/ContentVerifies", { params: paramsdata }).subscribe((data: any) => {
this.tableDate = data.items
@ -129,6 +131,7 @@ export class WaitExamineerComponent implements OnInit {
this.level = ''
this.projectlevel = ''
this.PlanLevel = ''
this.plantypes=[]
let level = sessionStorage.getItem("level");
this.getAlltabledate()
}

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

@ -4,7 +4,7 @@
* @Author: sueRimn
* @Date: 2020-12-24 10:59:48
* @LastEditors: sueRimn
* @LastEditTime: 2021-06-28 11:29:21
* @LastEditTime: 2021-07-24 16:58:31
-->
<!-- <p>录入预案</p> -->
<div style="overflow: auto;height: 100%;">
@ -87,7 +87,7 @@
<span (click)="auditResult(element)">审批结果</span>
<span (click)="submitAudit(element)"
*ngIf="element.auditStatus!=1&&element.auditStatus!=16">提交审核</span>
<span (click)="cancelAudit(element)" *ngIf="element.auditStatus == 1">撤销审核</span>
<span (click)="cancelAudit(element)" *ngIf="element.auditStatus == 1||element.auditStatus == 16">撤销审核</span>
</td>
</ng-container>
<ng-container *ngIf="isoperation == 'false'" matColumnDef="operation">

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

@ -149,7 +149,7 @@
<td mat-cell *matCellDef="let element" style="white-space: nowrap;cursor: pointer;">
<span style="color: blue;" (click)='openPlan(element)'>查看预案</span>
<span style="color: blue;margin-left: 4px;" (click)="submitAudit(element)" *ngIf="element.auditStatus!=1&&element.auditStatus!=16">提交审核</span>
<span style="color: blue;margin-left: 4px;" (click)="cancelAudit(element)" *ngIf="element.auditStatus == 1">撤销审核</span>
<span style="color: blue;margin-left: 4px;" (click)="cancelAudit(element)" *ngIf="element.auditStatus == 1||element.auditStatus == 16">撤销审核</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>

4
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-04-01 14:35:30
* @LastEditTime: 2021-07-24 16:59:38
-->
<div style="height: 100%;overflow-y: auto;">
<div class="header" >
@ -141,7 +141,7 @@
<td mat-cell *matCellDef="let element" style="white-space: nowrap;cursor: pointer;">
<span style="color: blue;" (click)='openPlan(element)'>查看预案</span>
<span style="color: blue;margin-left: 4px;" (click)="submitAudit(element)" *ngIf="element.auditStatus!=1&&element.auditStatus!=16">提交审核</span>
<span style="color: blue;margin-left: 4px;" (click)="cancelAudit(element)" *ngIf="element.auditStatus == 1">撤销审核</span>
<span style="color: blue;margin-left: 4px;" (click)="cancelAudit(element)" *ngIf="element.auditStatus == 1||element.auditStatus == 16">撤销审核</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>

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

@ -125,7 +125,7 @@
<td mat-cell *matCellDef="let element" style="white-space: nowrap;cursor: pointer;">
<span style="color: blue;" (click)='openPlan(element)'>查看预案</span>
<span style="color: blue;margin-left: 4px;" (click)="submitAudit(element)" *ngIf="element.auditStatus!=1&&element.auditStatus!=16">提交审核</span>
<span style="color: blue;margin-left: 4px;" (click)="cancelAudit(element)" *ngIf="element.auditStatus == 1">撤销审核</span>
<span style="color: blue;margin-left: 4px;" (click)="cancelAudit(element)" *ngIf="element.auditStatus == 1||element.auditStatus == 16">撤销审核</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>

19
src/app/statistic-analysis/state/page-there-year/page-there-year.component.ts

@ -24,6 +24,8 @@ export class PageThereYearComponent implements OnInit {
tabledata//获取所有数据
lastyears//上个页面传过来的年份
count=0//总数
pieonetype//判断是级别还是类型,上个页面传过来的参数
planType//预案类型
ngOnInit(): void {
this.dateInit ()
this.route.queryParams.subscribe(params => {
@ -32,8 +34,17 @@ export class PageThereYearComponent implements OnInit {
this.type=params['type']
//this.lastyears=params['years']
this.tid=params.tid
this.pieonetype=params.pieonetype
});
if(this.year=='二维预案'){
this.planType=1
}else if(this.year=='三维预案'){
this.planType=2
}else if(this.year=='其他预案'){
this.planType=4
}else if(this.year=='文本预案'){
this.planType=16
}
this.setTimeoutObj = window.setTimeout(()=>{
this.getechartsData()
})
@ -46,9 +57,9 @@ export class PageThereYearComponent implements OnInit {
async getechartsData(){
let paramdata={
planStatus:this.tid=='pieone'?'': this.type,
PlanCategory:this.tid=='pieone'?this.type:'',
PlanCategory:this.tid=='pieone'&&this.pieonetype=='true'?this.type:'',
objectType:this.tid=='pieone'&&this.pieonetype=='true'?2:this.tid=='pieone'&&this.pieonetype=='false'?5: 1,
TrendYear:this.lastyears||'',
objectType:this.tid=='pieone'?2: 1,
TrendType:0
}
await this.serviceData.getData(paramdata,`/api/StatisticsAnalysis/Trends`)
@ -216,7 +227,7 @@ export class PageThereYearComponent implements OnInit {
if(this.serviceData.level=='0'||this.serviceData.level=='1'||this.serviceData.level=='2'){
this.serviceData.isQuery=true
//this.router.navigate(['/statisticanalysis/statePageOne/time'],{queryParams:{'level':this.option.xAxis.data[xIndex],'headtext':this.buildingTypeName,'zhong':'1','type':this.type}});
this.router.navigate(['/statisticanalysis/statePageOne/time'],{queryParams:{'level':this.year,'headtext':this.buildingTypeName,'zhong':'1','type':this.type}});
this.router.navigate(['/statisticanalysis/statePageOne/time'],{queryParams:{'level':this.year,'headtext':this.buildingTypeName,'zhong':'1','type':this.type,'pieonetype':this.pieonetype,'tid':this.tid}});
}
else if(this.serviceData.level=='3'){
//中队跳转

12
src/app/statistic-analysis/state/page-two-time/page-two-time.component.ts

@ -249,9 +249,9 @@ export class echartsComponent implements OnInit {
this.echartsData.selectType=2
this.zongcount=0
let paramdata={
objectType:this.tid=='pieone'?2: 1,
planStatus:this.tid=='pieone'?'': this.type,
PlanCategory:this.tid=='pieone'?this.type:'',
PlanCategory:this.tid=='pieone'&&this.pieonetype=='true'?this.type:'',
objectType:this.tid=='pieone'&&this.pieonetype=='true'?2:this.tid=='pieone'&&this.pieonetype=='false'?5: 1,
TrendType:this.echartsData.selectType
}
await this.echartsData.getData(paramdata,`/api/StatisticsAnalysis/Trends`)
@ -289,9 +289,9 @@ export class echartsComponent implements OnInit {
this.datayuex=[]
this.datayuey=[]
let paramdata={
objectType:this.tid=='pieone'?2: 1,
planStatus:this.tid=='pieone'?'': this.type,
PlanCategory:this.tid=='pieone'?this.type:'',
PlanCategory:this.tid=='pieone'&&this.pieonetype=='true'?this.type:'',
objectType:this.tid=='pieone'&&this.pieonetype=='true'?2:this.tid=='pieone'&&this.pieonetype=='false'?5: 1,
TrendType:this.echartsData.selectType
}
await this.echartsData.getData(paramdata,`/api/StatisticsAnalysis/Trends`)
@ -314,9 +314,9 @@ export class echartsComponent implements OnInit {
this.dataYearX=[]
this.dataYearY=[]
let paramdata={
objectType:this.tid=='pieone'?2: 1,
planStatus:this.tid=='pieone'?'': this.type,
PlanCategory:this.tid=='pieone'?this.type:'',
PlanCategory:this.tid=='pieone'&&this.pieonetype=='true'?this.type:'',
objectType:this.tid=='pieone'&&this.pieonetype=='true'?2:this.tid=='pieone'&&this.pieonetype=='false'?5: 1,
TrendType:this.echartsData.selectType
}
await this.echartsData.getData(paramdata,`/api/StatisticsAnalysis/Trends`)

10
src/index.html

@ -4,7 +4,7 @@
* @Author: sueRimn
* @Date: 2020-11-25 15:44:29
* @LastEditors: sueRimn
* @LastEditTime: 2021-04-25 09:50:54
* @LastEditTime: 2021-07-23 14:02:42
-->
<!doctype html>
<html lang="zh-CN">
@ -23,10 +23,10 @@
</body>
<!-- <script type="text/javascript" src="./assets/kmap/kmap-service-main-kd.js"></script> -->
<script src="http://10.81.73.39:8000/webapi/maps?v=2.0&key=e4b359dc7b03f9418b7497f807131346&plugin=AMap.Driving,AMap.MouseTool,AMap.RangingTool"></script>
<script src="http://10.81.73.39:8000/webapi/ui/1.1/main.js"></script>
<!-- <script src="https://webapi.amap.com/maps?v=2.0&key=e4b359dc7b03f9418b7497f807131346&plugin=AMap.Driving,AMap.MouseTool,AMap.RangingTool"></script>
<script src="https://webapi.amap.com/ui/1.1/main.js"></script> -->
<!-- <script src="http://10.81.73.39:8000/webapi/maps?v=2.0&key=e4b359dc7b03f9418b7497f807131346&plugin=AMap.Driving,AMap.MouseTool,AMap.RangingTool"></script>
<script src="http://10.81.73.39:8000/webapi/ui/1.1/main.js"></script> -->
<script src="https://webapi.amap.com/maps?v=2.0&key=e4b359dc7b03f9418b7497f807131346&plugin=AMap.Driving,AMap.MouseTool,AMap.RangingTool"></script>
<script src="https://webapi.amap.com/ui/1.1/main.js"></script>
<script src="/assets/html2canvas.js"></script>
<script type="text/javascript" src="/assets/wordexport/jquery.js"></script>
<script type="text/javascript" src="/assets/wordexport/FileSaver.js"></script>

Loading…
Cancel
Save