diff --git a/src/app/ui/plan-template/addKeyname.html b/src/app/ui/plan-template/addKeyname.html index 4a542da..4257d6d 100644 --- a/src/app/ui/plan-template/addKeyname.html +++ b/src/app/ui/plan-template/addKeyname.html @@ -4,7 +4,7 @@ * @Author: sueRimn * @Date: 2021-05-20 16:11:57 * @LastEditors: sueRimn - * @LastEditTime: 2021-05-29 10:30:48 + * @LastEditTime: 2021-06-15 09:56:11 -->
@@ -23,7 +23,7 @@ Ⅲ级 - Ⅳ级 + Ⅴ级 diff --git a/src/app/ui/plan-template/plan-template.component.html b/src/app/ui/plan-template/plan-template.component.html index f7e5712..c9c3d76 100644 --- a/src/app/ui/plan-template/plan-template.component.html +++ b/src/app/ui/plan-template/plan-template.component.html @@ -4,7 +4,7 @@ * @Author: sueRimn * @Date: 2021-05-19 15:50:20 * @LastEditors: sueRimn - * @LastEditTime: 2021-06-10 14:52:05 + * @LastEditTime: 2021-06-15 10:20:06 -->
@@ -53,7 +53,7 @@ {{item.groupName}}
-
+
编辑
diff --git a/src/app/ui/plan-template/plan-template.component.scss b/src/app/ui/plan-template/plan-template.component.scss index 48a18c3..45d550c 100644 --- a/src/app/ui/plan-template/plan-template.component.scss +++ b/src/app/ui/plan-template/plan-template.component.scss @@ -4,7 +4,7 @@ * @Author: sueRimn * @Date: 2021-05-19 15:50:20 * @LastEditors: sueRimn - * @LastEditTime: 2021-06-10 14:53:43 + * @LastEditTime: 2021-06-15 10:44:55 */ .box{ height: 97%; @@ -308,8 +308,10 @@ .attackRight{ width: 30%; .rightButton{ + float: right; margin-top: 20px; - margin-left: 40%; + margin-right: 8%; + //margin-left: 40%; } } } diff --git a/src/app/ui/plan-template/plan-template.component.ts b/src/app/ui/plan-template/plan-template.component.ts index 688164f..6045a7e 100644 --- a/src/app/ui/plan-template/plan-template.component.ts +++ b/src/app/ui/plan-template/plan-template.component.ts @@ -4,7 +4,7 @@ * @Author: sueRimn * @Date: 2021-05-31 10:40:01 * @LastEditors: sueRimn - * @LastEditTime: 2021-06-09 16:45:09 + * @LastEditTime: 2021-06-15 10:33:44 */ import { Component, Inject, OnInit,ViewEncapsulation } from '@angular/core'; @@ -193,7 +193,7 @@ export class PlanTemplateComponent implements OnInit { }) */ const dialogRef = this.dialog.open(addGroup, {//调用open方法打开对话框并且携带参数过去 width: '240px', - height:'590px', + height:'620px', disableClose:true, data:this.group==null?null:this.group.length==0?null:this.group }); @@ -640,7 +640,8 @@ export class addGroup{ {groupName:'单位概况',completed:false},{groupName:'灾情设定',completed:false},{groupName:'力量调集',completed:false}, {groupName:'组织指挥',completed:false},{groupName:'作战行动',completed:false},{groupName:'社会联动',completed:false}, {groupName:'勤务保障',completed:false},{groupName:'特别警示',completed:false},{groupName:'辅助决策',completed:false}, - {groupName:'交通水源',completed:false},{groupName:'重点图示',completed:false},{groupName:'预案附件',completed:false} + {groupName:'交通水源',completed:false},{groupName:'重点图示',completed:false},{groupName:'特别警示',completed:false}, + {groupName:'预案附件',completed:false} ] groupName=[] ngOnInit(): void{ diff --git a/src/app/ui/plan-template/upPlan.html b/src/app/ui/plan-template/upPlan.html index 16b22b9..8370896 100644 --- a/src/app/ui/plan-template/upPlan.html +++ b/src/app/ui/plan-template/upPlan.html @@ -4,7 +4,7 @@ * @Author: sueRimn * @Date: 2021-05-21 10:43:28 * @LastEditors: sueRimn - * @LastEditTime: 2021-05-29 10:52:11 + * @LastEditTime: 2021-06-15 10:47:09 --> Ⅴ级