diff --git a/src/app/plan-audit/basic-info/basic-info.component.html b/src/app/plan-audit/basic-info/basic-info.component.html new file mode 100644 index 0000000..971eeb4 --- /dev/null +++ b/src/app/plan-audit/basic-info/basic-info.component.html @@ -0,0 +1,90 @@ + +
+ +
+ + + + + 单位信息 + + +
+
+
+ * + 统一社会信用代码： + + + +
+
+ * + 单位类型： + + + 石油化工类 + + +
+
+ * + 联系人： + + + +
+
+ * + 联系电话： + + + +
+
+ * + 辖区中队： + + + +
+ +
+ * + 单位地址： + + + +
+
+ 单位照片： +
+ +
+ +
+
+
+ + + + +
+ +
diff --git a/src/app/plan-audit/basic-info/basic-info.component.scss b/src/app/plan-audit/basic-info/basic-info.component.scss new file mode 100644 index 0000000..cfab8c8 --- /dev/null +++ b/src/app/plan-audit/basic-info/basic-info.component.scss @@ -0,0 +1,106 @@ +.content{ + width: 100%; + height: 100%; + .tableContent{ + width: 100%; + } +} +.mainbox{ + height: 100%; + position: relative; + .mainleft{ + width:800px; + height: 100%; + // background-color: yellow; + float: left; + .inputbox{ + width: 343px; + height: 58px; + margin:2px 6px; + float: left; + text-align: end; + } + .organizationbox{ + width:538px; + height: 200px; + background: white; + position: absolute; + top: 164px; + left:166px; + z-index: 100; + border: 1px solid grey; + overflow: auto; + li{ + list-style: none; + + } + mat-tree-node{ + cursor: pointer; + } + mat-tree-node:hover{ + background: rgba(225, 225, 225, 0.8); + } + } + .addbtn{ + width: 695px; + position: absolute; + bottom: -495px; + text-align: center; + margin-bottom:20px; + button{ + margin: 0 4px; + } + } + .uploadimg{ + width: 400px; + height: 200px; + float: left; + margin-top:12px; + position: relative; + margin-left: 80px; + cursor: pointer; + span{ + float: left; + } + // img{ + // float: left; + // } + .uploadingimg{ + width: 299px; + height: 170px; + // background: url('../../../assets/images/upload2.png') no-repeat center center; + + position: absolute; + top: 0px; + left: 79px; + border: 1px dashed gray; + border-radius:3px; + } + + } + .image{ + // position: absolute; + // top: 199px; + // left: 160px; + // width: 299px; + // height: 170px; + input{ + // width: 299px; + // height: 170px; + width: 190px; + margin-top: 160px; + cursor: pointer; + } + // opacity:0; + + } + } + .mainright{ + float: left; + width: 600px; + height: 400px; + // position: absolute; + // right: 170px; + + } +} \ No newline at end of file diff --git a/src/app/plan-audit/basic-info/basic-info.component.spec.ts b/src/app/plan-audit/basic-info/basic-info.component.spec.ts new file mode 100644 index 0000000..9cfa89c --- /dev/null +++ b/src/app/plan-audit/basic-info/basic-info.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { BasicInfoComponent } from './basic-info.component'; + +describe('BasicInfoComponent', () => { + let component: BasicInfoComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ BasicInfoComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(BasicInfoComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/plan-audit/basic-info/basic-info.component.ts b/src/app/plan-audit/basic-info/basic-info.component.ts new file mode 100644 index 0000000..e24cc22 --- /dev/null +++ b/src/app/plan-audit/basic-info/basic-info.component.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-basic-info', + templateUrl: './basic-info.component.html', + styleUrls: ['./basic-info.component.scss'] +}) +export class BasicInfoComponent implements OnInit { + + constructor() { } + + ngOnInit(): void { + } + +} diff --git a/src/app/plan-audit/plan-audit-routing.module.ts b/src/app/plan-audit/plan-audit-routing.module.ts index 4069bfa..5612898 100644 --- a/src/app/plan-audit/plan-audit-routing.module.ts +++ b/src/app/plan-audit/plan-audit-routing.module.ts @@ -1,13 +1,25 @@ +/* + * @Descripttion: + * @version: + * @Author: sueRimn + * @Date: 2020-12-24 10:59:48 + * @LastEditors: sueRimn + * @LastEditTime: 2020-12-25 16:27:40 + */ import { NgModule } from '@angular/core'; import { Routes, RouterModule } from '@angular/router'; import {DetachmentLevelComponent} from './detachment-level/detachment-level.component' import { PlanAuditComponent } from './plan-audit/plan-audit.component'; import { PlanPassComponent } from './plan-pass/plan-pass.component'; +import { PlanRecordComponent } from './plan-record/plan-record.component'; +import { WaitExamineerComponent } from './wait-examineer/wait-examineer.component' const routes: Routes = [ { path: 'detachmentLevel', component: DetachmentLevelComponent }, { path: 'planaudit', component: PlanAuditComponent }, { path: 'planpass', component: PlanPassComponent }, + { path: 'planrecord', component: PlanRecordComponent }, + { path: 'waitexamineer', component: WaitExamineerComponent }, ]; @NgModule({ diff --git a/src/app/plan-audit/plan-audit.module.ts b/src/app/plan-audit/plan-audit.module.ts index c8bbc2a..0ee43c1 100644 --- a/src/app/plan-audit/plan-audit.module.ts +++ b/src/app/plan-audit/plan-audit.module.ts @@ -48,10 +48,13 @@ import { PlanAuditComponent, PlanOpen } from './plan-audit/plan-audit.component' import { FormsModule } from '@angular/forms'; import { PlanPassComponent } from './plan-pass/plan-pass.component'; import {ViewUnitDetailsPlanComponent} from '../key-unit/view-unit-details-plan/view-unit-details-plan.component' -import {KeyUnitModule} from '../key-unit/key-unit.module' +import {KeyUnitModule} from '../key-unit/key-unit.module'; +import { PlanRecordComponent } from './plan-record/plan-record.component'; +import { BasicInfoComponent } from './basic-info/basic-info.component'; +import { WaitExamineerComponent } from './wait-examineer/wait-examineer.component' @NgModule({ - declarations: [DetachmentLevelComponent, PlanAuditComponent, PlanPassComponent,PlanOpen,], + declarations: [DetachmentLevelComponent, PlanAuditComponent, PlanPassComponent,PlanOpen, PlanRecordComponent, BasicInfoComponent, WaitExamineerComponent,], imports: [ CommonModule, PlanAuditRoutingModule, diff --git a/src/app/plan-audit/plan-record/plan-record.component.html b/src/app/plan-audit/plan-record/plan-record.component.html new file mode 100644 index 0000000..82f5085 --- /dev/null +++ b/src/app/plan-audit/plan-record/plan-record.component.html @@ -0,0 +1,127 @@ + +
+
+
+
+ 操作类型： + 全部 + 更新 + 新增 + 删除 + 共计：80条 +
+
+ 审核状态： + 全部 + 已通过 + 已拒绝 +
+
+ 类型： + + + Ⅰ级 + Ⅱ级 + + + 所属组织： + + + Ⅰ级 + Ⅱ级 + + + 时间： + + + +
+
+ + + + + + + + + + + + + + + + + + + +
类型操作所属组织审核状态提交人提交时间
{{item.level}}{{item.option}}{{item.orgication}}{{item.unitstate}}{{item.addname}}{{item.addtime}}
+
+
+ +
+
+ + + + + + + + + + 平面图 + + + + + 四周毗邻 + + + + + 消防设施 + + + + + 重点部位 + + + + + 功能分区 + + + + + 实景图 + + + + + cad + + + + + +
+
diff --git a/src/app/plan-audit/plan-record/plan-record.component.scss b/src/app/plan-audit/plan-record/plan-record.component.scss new file mode 100644 index 0000000..67d555f --- /dev/null +++ b/src/app/plan-audit/plan-record/plan-record.component.scss @@ -0,0 +1,68 @@ +.box{ + height: 100%; + width: 100%; + display: flex; + .boxleft{ + height: 100%; + width: 45%; + background-color: #FFFFFF; + display: flex; + flex-direction: column; + .lefthead{ + display: flex; + flex-direction: column; + .headdiv{ + margin: 0 0 0 30px; + height: 40px; + span{ + font-size: 16px; + margin-left: 3px; + } + input{ + margin-left: 15px; + position: relative; + top: 1px; + } + } + .headthree{ + margin-left: 30px; + mat-form-field{ + width: 150px; + } + } + } + .tablediv{ + width: 95%; + table{ + margin: 20px 20px; + width: 100%; + + //border: 1px solid #2196F3; + thead{ + height:48px; + color: #FFFFFF; + background-color: #2196F3; + font-size: 16px; + + } + tr:nth-child(odd){ + background: #FAFAFA; + } + } + } + } + .boxright{ + height: 100%; + width: 55%; + background-color: #FFFFFF; + margin-left: 10px; + } +} +th,td{ + height:48px; + font-size: 16px; + text-align: center; +} +.green{color: #00C756;} +.red{color: #FF4D4D;} +.blue{color: #2196F3;} \ No newline at end of file diff --git a/src/app/plan-audit/plan-record/plan-record.component.spec.ts b/src/app/plan-audit/plan-record/plan-record.component.spec.ts new file mode 100644 index 0000000..e9b5edb --- /dev/null +++ b/src/app/plan-audit/plan-record/plan-record.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { PlanRecordComponent } from './plan-record.component'; + +describe('PlanRecordComponent', () => { + let component: PlanRecordComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ PlanRecordComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(PlanRecordComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/plan-audit/plan-record/plan-record.component.ts b/src/app/plan-audit/plan-record/plan-record.component.ts new file mode 100644 index 0000000..9ed4c77 --- /dev/null +++ b/src/app/plan-audit/plan-record/plan-record.component.ts @@ -0,0 +1,33 @@ +/* + * @Descripttion: + * @version: + * @Author: sueRimn + * @Date: 2020-12-25 10:19:31 + * @LastEditors: sueRimn + * @LastEditTime: 2020-12-25 14:53:46 + */ +import { Component, OnInit } from '@angular/core'; +import { FormControl } from '@angular/forms'; + +@Component({ + selector: 'app-plan-record', + templateUrl: './plan-record.component.html', + styleUrls: ['./plan-record.component.scss'] +}) +export class PlanRecordComponent implements OnInit { + + constructor() { } + + ngOnInit(): void { + } + selected = new FormControl(0); //选项卡 实例 + level//类型 + js//组织机构 + 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"} + ] + +} diff --git a/src/app/plan-audit/wait-examineer/wait-examineer.component.html b/src/app/plan-audit/wait-examineer/wait-examineer.component.html new file mode 100644 index 0000000..0b474e6 --- /dev/null +++ b/src/app/plan-audit/wait-examineer/wait-examineer.component.html @@ -0,0 +1,225 @@ +
+
+
+
+ 操作类型： + 全部 + 更新 + 新增 + 删除 + 共计：80条 +
+
+ 类型： + + + Ⅰ级 + Ⅱ级 + + + 编制级别： + + + Ⅰ级 + Ⅱ级 + + + +
+
+ + + + + + + + + + + + + + + + + + + +
类型操作所属组织审核状态提交人提交时间
{{item.level}}{{item.option}}{{item.orgication}}{{item.unitstate}}{{item.addname}}{{item.addtime}}
+
+
+ +
+
+
+
+ + +
+
+ + +
+ +
+ + + + + + + + + + 平面图 + + + + + 四周毗邻 + + + + + 消防设施 + + + + + 重点部位 + + + + + 功能分区 + + + + + 实景图 + + + + + cad + + + + + +
+ + + + + 基本信息 + + +
+ + + + + 修改-沃尔玛（上海）职业发展有限公司 + + + + + + + + + + + + + + + +
单位地址 ：由 上海市上海市黄浦区武胜路333号变更为 + 上海市上海市黄浦区金陵西路28号
联系电话 ：由15069853369变更为 + 13869877764
始建于（年）：由1991变更为 + 2003
+ + +
+ + + + + + + + + 四周毗邻 + + +
+ + + + + 一号建筑 + + +
+
+ 一号建筑： +
+
+ 由 + 变更为 +
+
+ + +
+ + + + + + + + 消防设施 + + +
+ + + + + 室内消火栓 + + + + + + + +
总数：由5变更为 + 8
+ + +
+ + + +
+ +
+
+ diff --git a/src/app/plan-audit/wait-examineer/wait-examineer.component.scss b/src/app/plan-audit/wait-examineer/wait-examineer.component.scss new file mode 100644 index 0000000..22fb4a5 --- /dev/null +++ b/src/app/plan-audit/wait-examineer/wait-examineer.component.scss @@ -0,0 +1,163 @@ +.box{ + height: 100%; + width: 100%; + display: flex; + .boxleft{ + height: 100%; + width: 45%; + background-color: #FFFFFF; + display: flex; + flex-direction: column; + .lefthead{ + display: flex; + flex-direction: column; + .headdiv{ + margin: 0 0 0 30px; + height: 40px; + span{ + font-size: 16px; + margin-left: 3px; + } + input{ + margin-left: 15px; + position: relative; + top: 1px; + } + } + .headthree{ + margin-left: 30px; + mat-form-field{ + width: 150px; + } + button{ + width: 80px; + height: 36px; + font-size: 16px; + } + img{ + height: 14px; + width: 14px; + } + } + } + .tablediv{ + width: 95%; + table{ + margin: 20px 20px; + width: 100%; + + //border: 1px solid #2196F3; + thead{ + height:48px; + color: #FFFFFF; + background-color: #2196F3; + font-size: 16px; + + } + tr:nth-child(odd){ + background: #FAFAFA; + } + } + } + } + .boxright{ + height: 100%; + width: 55%; + background-color: #FFFFFF; + margin-left: 10px; + .righthead{ + width: 100%; + display: flex; + button{ + margin-left: 10px; + font-size: 16px; + } + .rightheadone{ + width: 50%; + margin-top: 20px; + } + .rightheadtwo{ + width: 40%; + margin-top: 20px; + margin-left: 6%; + } + } + } +} +th,td{ + height:48px; + font-size: 16px; + text-align: center; +} +.green{color: #00C756;} +.red{color: #FF4D4D;} +.blue{color: #2196F3;} +.accordingin{ + margin: 5px; + .panelhead{ + background-color:#E8F4FE; + color: #2196F3; + font-size: 16px; + span{ + margin-left: 10px; + } + } + table{ + margin: 5px 0; + width: 100%; + th{ + background-color: #FAFAFA; + width: 30%; + font-size: 16px; + text-align: right; + } + td{ + text-align: left; + font-size: 16px; + margin-left: 3px; + } + } + .onebuilding{ + display: flex; + margin: 5px 0; + width: 100%; + .accordingleft{ + background-color: #FAFAFA; + width: 30%; + height: 120px; + font-size: 16px; + text-align: right; + } + .accordingright{ + margin: 7px; + height: 100px; + font-size: 16px; + img{ + margin-left: 10px; + //height: 80px; + } + span{ + margin-left: 10px; + position: relative; + bottom: 90px; + } + } + } +} +.echarts{ + width: 480px; + height: 304px; + display: flex; + background-color: #000000; + opacity: 0.6; + position: absolute; + top: 13%; + left: 55%; + z-index: 100; + .bar{ + height: 100%; + width: 40%; + opacity: 1; + //margin: 40px 30px; + } +} \ No newline at end of file diff --git a/src/app/plan-audit/wait-examineer/wait-examineer.component.spec.ts b/src/app/plan-audit/wait-examineer/wait-examineer.component.spec.ts new file mode 100644 index 0000000..4c96dc9 --- /dev/null +++ b/src/app/plan-audit/wait-examineer/wait-examineer.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { WaitExamineerComponent } from './wait-examineer.component'; + +describe('WaitExamineerComponent', () => { + let component: WaitExamineerComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ WaitExamineerComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(WaitExamineerComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/plan-audit/wait-examineer/wait-examineer.component.ts b/src/app/plan-audit/wait-examineer/wait-examineer.component.ts new file mode 100644 index 0000000..0c91ba1 --- /dev/null +++ b/src/app/plan-audit/wait-examineer/wait-examineer.component.ts @@ -0,0 +1,104 @@ +/* + * @Descripttion: + * @version: + * @Author: sueRimn + * @Date: 2020-12-25 16:13:50 + * @LastEditors: sueRimn + * @LastEditTime: 2020-12-26 15:17:14 + */ +import { Component, OnInit } from '@angular/core'; +import { FormControl } from '@angular/forms'; +declare var echarts: any; + +@Component({ + selector: 'app-wait-examineer', + templateUrl: './wait-examineer.component.html', + styleUrls: ['./wait-examineer.component.scss'] +}) +export class WaitExamineerComponent implements OnInit { + + constructor() { } + + ngOnInit(): void { + window.setTimeout(()=>{ + this.bar() + },0) + } + + selected = new FormControl(0); //选项卡 实例 + level//类型 + js//组织机构 + 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"} + ] + isallDate=true//是否显示完成数据，默认显示 + companyBuiltInGrouping=["基本信息","四周毗邻","消防设施"] + indexbar //饼状图实例 + //变更数据和全部数据切换按钮 + buttonChange(){ + this.isallDate=!this.isallDate + } + + //分数饼状图 + bar(){ + var ec = echarts as any; + this.indexbar=ec.init(document.getElementById('indexbar'),'light'); + var option = { + tooltip: { + trigger: 'item', + formatter: '{a}
{b}: {c} ({d}%)' + }, + title: { + text: '总分', + left: 'center', + bottom:70, + textStyle:{ + color:'#FFFFFF', + fontSize:16 + } + }, + series: [ + { + name: '分数', + type: 'pie', + radius: ['50%', '70%'], + bottom:60, + avoidLabelOverlap: false, + label: { + show: true, + position: 'center', + fontSize:16, + color:'#FFFFFF' + }, + + labelLine: { + show: false + }, + data: [ + {value: 93, name: '93分', itemStyle:{color:'#2196F3'}}, + {value:7, itemStyle:{color:'#FFFFFF'}} + ] + } + ] + }; + this.indexbar.setOption(option); + } + //分数柱状图 + zhu(){ + var ec = echarts as any; + this.indexbar=ec.init(document.getElementById('zhu'),'light'); + var option={ + xAxis: { + type: 'value' + }, + yAxis: { + type: 'category', + data: ['基本信息', '四周毗邻', '消防设施', '重点单位', '功能分区', '实景图', '上传CAD', '六熟悉记录', '实战演练记录'] + }, + } + } + +} diff --git a/src/app/plan-management/entry-plan/entry-plan.component.html b/src/app/plan-management/entry-plan/entry-plan.component.html index da2741e..f6e2d15 100644 --- a/src/app/plan-management/entry-plan/entry-plan.component.html +++ b/src/app/plan-management/entry-plan/entry-plan.component.html @@ -84,24 +84,7 @@ 包含下级 -
- - - - {{item.name}} - - - -
-
- - - - {{item.name}} - - - -
+
@@ -128,7 +111,7 @@ {{element.company.name}} - 信息完整度得分 + 信息完整度
@@ -243,6 +226,10 @@
+ + 预案级别 + Ⅲ(0)Ⅳ(0)Ⅴ(0) + 消防救援站 {{element.company.organizationName}} diff --git a/src/app/plan-management/entry-plan/entry-plan.component.ts b/src/app/plan-management/entry-plan/entry-plan.component.ts index f426354..4bf5c7a 100644 --- a/src/app/plan-management/entry-plan/entry-plan.component.ts +++ b/src/app/plan-management/entry-plan/entry-plan.component.ts @@ -43,50 +43,9 @@ export class EntryPlanComponent implements OnInit { pageSizeOptions: number[] = [10] //设置每页条数 PageNumber:any; //第几页 - //支队提示框 - tableDataZhi = [ - {name:"浦东支队",number:"156",zhanbi:"3%"}, - {name:"黄浦支队",number:"144",zhanbi:"2.8%"}, - {name:"徐汇支队",number:"133",zhanbi:"2.1%"}, - {name:"长宁支队",number:"122",zhanbi:"1.6%"}, - {name:"静安支队",number:"120",zhanbi:"1.3%"}, - {name:"普陀支队",number:"100",zhanbi:"1.1%"}, - {name:"虹口支队",number:"95",zhanbi:"1%"}, - {name:"杨浦支队",number:"90",zhanbi:"0.9%"}, - {name:"闵行支队",number:"88",zhanbi:"0.8%"}, - {name:"宝山支队",number:"83",zhanbi:"0.7%"}, - {name:"徐汇支队",number:"133",zhanbi:"2.1%"}, - {name:"长宁支队",number:"122",zhanbi:"1.6%"}, - {name:"嘉定支队",number:"78",zhanbi:"0.6%"}, - {name:"松江支队",number:"75",zhanbi:"0.5%"}, - {name:"金山支队",number:"65",zhanbi:"0.4%"}, - {name:"崇明支队",number:"55",zhanbi:"0.3%"}/* , - {name:"总计",number:"1356",zhanbi:"19%"} */ - ] - //建筑类型提示框 - buildingType = [ - {name:"高层",number:"156",zhanbi:"3%"}, - {name:"地下",number:"144",zhanbi:"2.8%"}, - {name:"轨道交通",number:"133",zhanbi:"2.1%"}, - {name:"化工生产",number:"122",zhanbi:"1.6%"}, - {name:"储罐类",number:"120",zhanbi:"1.3%"}, - {name:"厂房",number:"100",zhanbi:"1.1%"}, - {name:"古建筑",number:"95",zhanbi:"1%"}, - {name:"商市场",number:"90",zhanbi:"0.9%"}, - {name:"医院",number:"88",zhanbi:"0.8%"}, - {name:"学校",number:"83",zhanbi:"0.7%"}, - {name:"宾馆",number:"133",zhanbi:"2.1%"}, - {name:"娱乐场所",number:"122",zhanbi:"1.6%"}, - {name:"餐饮业",number:"78",zhanbi:"0.6%"}, - {name:"影剧院",number:"75",zhanbi:"0.5%"}, - {name:"展览建筑",number:"65",zhanbi:"0.4%"}, - {name:"隧道",number:"55",zhanbi:"0.3%"}/* , - {name:"总计",number:"1356",zhanbi:"19%"} */ - ] - - displayedColumns: string[] = ['unitname','integrity','jurisdictionsquadron', 'unittype','plantype', 'passstate','projectlevel','operation']; + displayedColumns: string[] = ['unitname','integrity','level','jurisdictionsquadron', 'unittype','plantype', 'passstate','projectlevel','operation']; allorganizations:any //所有组织机构 allunittype:any //所有单位类型 tabledataSource:any //表格数据 @@ -347,7 +306,8 @@ export class EntryPlanComponent implements OnInit { this.length = data.totalCount this.allPlanInfo = data - this.tabledataSource = data.items + this.tabledataSource = data.items + console.log(this.tabledataSource) }) } diff --git a/src/app/plan-management/onetwo-entry-plan/newunit.html b/src/app/plan-management/onetwo-entry-plan/newunit.html new file mode 100644 index 0000000..75063b7 --- /dev/null +++ b/src/app/plan-management/onetwo-entry-plan/newunit.html @@ -0,0 +1,42 @@ + +
+
+ 新增预案 +
+
+ + + + +
+
+ + + + +
+
+ + + + Ⅰ级 + Ⅱ级 + + +
+
+ + +
+
+ + +
+
\ No newline at end of file diff --git a/src/app/plan-management/onetwo-entry-plan/newunit.scss b/src/app/plan-management/onetwo-entry-plan/newunit.scss new file mode 100644 index 0000000..7e78e9c --- /dev/null +++ b/src/app/plan-management/onetwo-entry-plan/newunit.scss @@ -0,0 +1,35 @@ +.box{ + height: 100%; + width: 100%; + display: flex; + flex-direction: column; +} +.queryField { + margin: 3px 5px; + input { + width: 50px; + height: 18px; + line-height: 18px; + border-radius: 3px;} + button{ + width: 140px; + font-size: 16px; + } + } + .top{ + width: 100%; + margin-bottom: 20px; + span{ + color: #2196F3; + margin-left: 100px; + font-size: 18px; + } + } + .bottom{ + margin: 30px 30px; + button{ + width: 80px; + height: 36px; + font-size: 16px; + } + } \ No newline at end of file diff --git a/src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.html b/src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.html new file mode 100644 index 0000000..53e782b --- /dev/null +++ b/src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.html @@ -0,0 +1,136 @@ + +
+
+
+
+ +
+ + + + +
+ + +
+ + + + Ⅰ级 + Ⅱ级 + + +
+
+ + + + +
+
+ + + + +
+
+ + + + +
+
+ + + + 未提交审核 + 审核中 + 审核通过 + 审核退回 + + +
+
+ + + + + {{item.name}} + + + 包含下级 +
+ +
+
+ + +
+
+
+ +
+ +
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
预案名称预案级别添加人添加时间预案类型审核状态是否公开编制级别操作
+ + + + +
+
+
diff --git a/src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.scss b/src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.scss new file mode 100644 index 0000000..c5dac6a --- /dev/null +++ b/src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.scss @@ -0,0 +1,116 @@ +.header { + width: 100%; + padding: 12px 10px; + // margin-bottom: 10px; + box-sizing: border-box; + // border-bottom: 1px solid black; + .queryBox { + box-sizing: border-box; + padding: 5px 25px; + display: flex; + flex-direction: row; + flex-wrap: wrap; + align-items:center; + // justify-content:center; + .queryField { + margin: 3px 40px; + input { + width: 180px; + height: 22px; + line-height: 22px; + border-radius: 3px;} + } + + } //queryBox + .ordiv{ + position: relative; + + .organizationbox{ + width:450px; + height: 200px; + background: white; + position: absolute; + top: 48px; + left: 77px; + z-index: 999; + border: 1px solid grey; + overflow-y: auto; + background-color: #fafafa; + li{ + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + background-color: #fafafa; + } + mat-tree-node{ + cursor: pointer; + white-space:pre; + background-color: #fafafa; + } + mat-tree-node:hover{ + background: rgba(225, 225, 225, 0.8); + li{ + background: rgba(225, 225, 225, 0.8); + } + } + .closediv{ + z-index: 100; + position: absolute; + right: 0; + top: 0; + width: 30px; + height: 30px; + cursor: pointer; + line-height: 30px; + text-align: center; + } + .closediv:hover{ + background:rgba(225, 225, 225, 0.8); + } + } + + } + } + .newadd{ + margin-top: 10px; + margin-left: 70px; + button{ + font-size: 16px; + width: 100px; + height: 36px; + } + } + .body{ + .buttonbox{ + padding-left: 50px; + button{ + margin:0 10px + } + } + .tablebox{ + table{ + width: 100%; + margin-left: 0%; + margin-top:15px; + th{ + text-align: center; + } + } + mat-paginator{ + width: 100%; + margin-left: 0%; + } + .mat-column-unitname{ + width: 15%; + } + .mat-column-integrity{ + width: 13%; + } + .mat-column-operation{ + width: 5%; + } + .mat-column-jurisdictionsquadron{ + width: 10%; + } + } + } \ No newline at end of file diff --git a/src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.spec.ts b/src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.spec.ts new file mode 100644 index 0000000..e440b63 --- /dev/null +++ b/src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { OnetwoEntryPlanComponent } from './onetwo-entry-plan.component'; + +describe('OnetwoEntryPlanComponent', () => { + let component: OnetwoEntryPlanComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ OnetwoEntryPlanComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(OnetwoEntryPlanComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.ts b/src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.ts new file mode 100644 index 0000000..27cb5fe --- /dev/null +++ b/src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.ts @@ -0,0 +1,152 @@ +/* + * @Descripttion: + * @version: + * @Author: sueRimn + * @Date: 2020-12-24 14:15:10 + * @LastEditors: sueRimn + * @LastEditTime: 2020-12-25 10:29:54 + */ +import { Component, OnInit, ViewChild, Inject } from '@angular/core'; +import { HttpClient } from '@angular/common/http' +import { MatTreeFlatDataSource, MatTreeFlattener } from '@angular/material/tree'; +import { MatPaginator } from '@angular/material/paginator'; +import { FlatTreeControl } from '@angular/cdk/tree'; +import { FormControl } from '@angular/forms'; +import { Router,ActivatedRoute } from '@angular/router' +import { PageEvent } from '@angular/material/paginator'; +import { MatDialogRef, MatDialog, MAT_DIALOG_DATA } from '@angular/material/dialog'; +import { MatSnackBar, MatSnackBarConfig } from '@angular/material/snack-bar'; +import { TreeService } from '../../http-interceptors/tree.service' +import { ConstantPool } from '@angular/compiler'; +import { MatTableDataSource } from '@angular/material/table'; +export interface PeriodicElement { + unitname: string; + level: string; + addname: string; + addtime: string; + unittype: string; + unitstate: string; + isopen: string; + projectlevel: string; +} +const ELEMENT_DATA=[ + {name:"梧州市中恒制药有限公司",jibie:"Ⅰ级"}, + {name:"梧州市中恒制药有限公司",jibie:"Ⅰ级"} +] + +@Component({ + selector: 'app-onetwo-entry-plan', + templateUrl: './onetwo-entry-plan.component.html', + styleUrls: ['./onetwo-entry-plan.component.scss'] +}) +export class OnetwoEntryPlanComponent implements OnInit { + + constructor(private http:HttpClient,private router:Router,private route:ActivatedRoute,private tree: TreeService,public dialog: MatDialog,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"} + ] + } + if(level == "1"){//如果是支队 + this.preparelevels = [ + {name:"支队",value:"2"}, + {name:"大队",value:"4"}, + {name:"中队",value:"8"} + ] + } + if(level == "2"){//如果是大队 + this.preparelevels = [ + {name:"大队",value:"4"}, + {name:"中队",value:"8"} + ] + } + if(level == "3"){//如果是中队 + this.preparelevels = [ + {name:"中队",value:"8"} + ] + } + } + + preparelevels:any + plcheck:boolean //编制级别勾选框 + displayedColumns: string[] = ['unitname','level','addname','addtime', 'plantype', 'passstate','isopen','projectlevel','operation']; + tabledataSource + unitname//预案名称 + level//预案级别 + addname//添加人 + addtime//添加时间 + unittype//预案类型 + unitstate//审核状态 + projectlevel//编制级别 + //分页 + @ViewChild(MatPaginator, {static: true}) + pageEvent: PageEvent; + paginator: MatPaginator; + length:any; //共多少条数据 + pageSize:any; //每页条数 + pageSizeOptions: number[] = [10] //设置每页条数 + PageNumber:any; //第几页 + + //获得所有预案信息 + getAllPlanInfo(){ + let paramsdata:any = { + HasChildrenPlanLevel: this.plcheck || '', + PageNumber: this.PageNumber || '1', + PageSize: this.pageSizeOptions[0], + } + this.http.get("/api/Plans",{params:paramsdata}).subscribe((data:any)=>{ + + this.length = data.totalCount + //this.allPlanInfo = data + + this.tabledataSource = new MatTableDataSource(data.items) + console.log(this.tabledataSource) + }) + } + + //重置 + reset(){ + this.unitname='' + this.level='' + this.addname='' + this.addtime='' + this.unittype='' + this.unitstate='' + this.projectlevel='' + } + + //新增预案弹窗 + addunit(){ + const dialogRef = this.dialog.open(newunitComponent, { + width: '340px', + height:'430px' + //data: paperDataInfo + }); + } + +} + +@Component({ + selector: 'new-unit', + templateUrl: './newunit.html', + styleUrls: ['./newunit.scss'] +}) +export class newunitComponent{ + constructor(private router:Router,private http: HttpClient,public dialog: MatDialog,public snackBar: MatSnackBar,public dialogRef: MatDialogRef,@Inject(MAT_DIALOG_DATA) public data: any) {} + unitname//预案名称 + level//预案级别 + addname//添加人 + addtime//添加时间 + unittype//预案类型 + unitstate//审核状态 + projectlevel//编制级别 + close(){ + this.dialogRef.close(); + } +} diff --git a/src/app/plan-management/plan-management-routing.module.ts b/src/app/plan-management/plan-management-routing.module.ts index 7fa18ab..8e8a0cf 100644 --- a/src/app/plan-management/plan-management-routing.module.ts +++ b/src/app/plan-management/plan-management-routing.module.ts @@ -1,3 +1,11 @@ +/* + * @Descripttion: + * @version: + * @Author: sueRimn + * @Date: 2020-12-24 10:59:48 + * @LastEditors: sueRimn + * @LastEditTime: 2020-12-24 14:20:18 + */ import { NgModule } from '@angular/core'; import { Routes, RouterModule } from '@angular/router'; import {EntryPlanComponent} from './entry-plan/entry-plan.component' @@ -5,13 +13,15 @@ import { OpenPlanComponent } from './open-plan/open-plan.component'; import { PassPlanComponent } from './pass-plan/pass-plan.component'; import { EntryPlanLookComponent } from './entry-plan-look/entry-plan-look.component'; import { WebLookComponent } from './web-look/web-look.component'; +import {OnetwoEntryPlanComponent} from './onetwo-entry-plan/onetwo-entry-plan.component' const routes: Routes = [ { path: 'entryPlan', component: EntryPlanComponent}, { path: 'openPlan', component: OpenPlanComponent}, { path: 'passPlan', component: PassPlanComponent}, { path: 'entryPlandetail', component: EntryPlanLookComponent}, - { path: 'webLook', component: WebLookComponent} + { path: 'webLook', component: WebLookComponent}, + { path: 'OnetwoEntryPlan', component: OnetwoEntryPlanComponent} ]; @NgModule({ diff --git a/src/app/plan-management/plan-management.module.ts b/src/app/plan-management/plan-management.module.ts index 21a83f5..50bc886 100644 --- a/src/app/plan-management/plan-management.module.ts +++ b/src/app/plan-management/plan-management.module.ts @@ -50,11 +50,13 @@ import { OpenPlanComponent } from './open-plan/open-plan.component'; import { EntryPlanLookComponent, AddPlanone, DownloadFile, AuditResult, ChangeName } from './entry-plan-look/entry-plan-look.component'; import { PlanType, AuditSatus, PlanLevel } from '../pipes/boolean.pipe'; import { WebLookComponent } from './web-look/web-look.component'; +import { OnetwoEntryPlanComponent } from './onetwo-entry-plan/onetwo-entry-plan.component'; +import { newunitComponent} from './onetwo-entry-plan/onetwo-entry-plan.component' @NgModule({ - declarations: [EntryPlanComponent, PassPlanComponent, OpenPlanComponent, EntryPlanLookComponent,AddPlanone,PlanType,AuditSatus,PlanLevel,DownloadFile,AuditResult,ChangeName, WebLookComponent], + declarations: [EntryPlanComponent, PassPlanComponent, OpenPlanComponent, EntryPlanLookComponent,AddPlanone,PlanType,AuditSatus,PlanLevel,DownloadFile,AuditResult,ChangeName, WebLookComponent, OnetwoEntryPlanComponent,newunitComponent], imports: [ CommonModule, PlanManagementRoutingModule, diff --git a/src/assets/images/bendi.png b/src/assets/images/bendi.png new file mode 100644 index 0000000..fc0b4b0 Binary files /dev/null and b/src/assets/images/bendi.png differ diff --git a/src/assets/images/change.png b/src/assets/images/change.png new file mode 100644 index 0000000..872574f Binary files /dev/null and b/src/assets/images/change.png differ diff --git a/src/assets/images/chatchange.png b/src/assets/images/chatchange.png new file mode 100644 index 0000000..41a31bd Binary files /dev/null and b/src/assets/images/chatchange.png differ diff --git a/src/assets/images/newadd.png b/src/assets/images/newadd.png new file mode 100644 index 0000000..3d4db05 Binary files /dev/null and b/src/assets/images/newadd.png differ diff --git a/src/assets/images/preview.png b/src/assets/images/preview.png new file mode 100644 index 0000000..7bac36e Binary files /dev/null and b/src/assets/images/preview.png differ diff --git a/src/assets/images/refresh.png b/src/assets/images/refresh.png new file mode 100644 index 0000000..2de5735 Binary files /dev/null and b/src/assets/images/refresh.png differ diff --git a/src/assets/images/update.png b/src/assets/images/update.png new file mode 100644 index 0000000..860b806 Binary files /dev/null and b/src/assets/images/update.png differ