From 6684e138329462d94c690624d99160c33cf157a7 Mon Sep 17 00:00:00 2001 From: chenjingyu Date: Mon, 6 Sep 2021 17:15:04 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=96=B0=E5=A2=9E]=E5=9B=9B=E7=BA=A7=E9=A2=84?= =?UTF-8?q?=E6=A1=88=E5=9C=A8=E7=BA=BF=E7=BC=96=E5=88=B6=E8=87=AA=E5=AE=9A?= =?UTF-8?q?=E4=B9=89=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../create-plan-online-five/Disaster.html | 46 ++++ .../create-plan-online-five/addKeyname.scss | 80 +++++++ .../create-plan-online-five.component.html | 107 ++++++++- .../create-plan-online-five.component.scss | 161 ++++++++++++- .../create-plan-online-five.component.ts | 220 +++++++++++++++++- .../create-plan-online-five/newTitle.html | 27 +++ .../plan-management/plan-management.module.ts | 5 +- .../plan-template.component.html | 2 +- 8 files changed, 636 insertions(+), 12 deletions(-) create mode 100644 src/app/plan-management/create-plan-online-five/Disaster.html create mode 100644 src/app/plan-management/create-plan-online-five/addKeyname.scss create mode 100644 src/app/plan-management/create-plan-online-five/newTitle.html diff --git a/src/app/plan-management/create-plan-online-five/Disaster.html b/src/app/plan-management/create-plan-online-five/Disaster.html new file mode 100644 index 0000000..a82bacd --- /dev/null +++ b/src/app/plan-management/create-plan-online-five/Disaster.html @@ -0,0 +1,46 @@ + +
+
+ 新增内容 +
+
+ + + + 表格 + 输入框 + 文本区域 + 图片 + + +
+
+ + + + +
+
+ + + + +
+
+ + + + +
+
+ + +
+
\ No newline at end of file diff --git a/src/app/plan-management/create-plan-online-five/addKeyname.scss b/src/app/plan-management/create-plan-online-five/addKeyname.scss new file mode 100644 index 0000000..149a11a --- /dev/null +++ b/src/app/plan-management/create-plan-online-five/addKeyname.scss @@ -0,0 +1,80 @@ +.box{ + height: 100%; + width: 100%; + display: flex; + flex-direction: column; +} +.queryField { + margin: 3px 5px; + input { + width: 100%; + 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: 10% 30px; + /* margin-bottom: 10%; + margin-left: 30px; + margin-right: 30px; */ + button{ + width: 80px; + height: 36px; + font-size: 16px; + } + } + .fileinput-button { + width: 148px; + height: 36px; + top: 10px; + position: relative; + display: inline-block; + overflow: hidden; + background-color: #2196F3; + color: #FFFFFF; + font-size: 16px; +} + +.fileinput-button input{ + position: absolute; + right: 0px; + top: 0px; + opacity: 0; + -ms-filter: 'alpha(opacity=0)'; +} + +.uping{ + display:flex; + .upclass{ + margin-left: 3px; + height: 30px; + } + .progress{ + position: relative; + top:3% + } + button{ + width: 80px; + height: 30px; + font-size: 10px; + margin-top: 5px; + } + span{ + font-size: 10px; + position: relative; + top: 8px; + } +} diff --git a/src/app/plan-management/create-plan-online-five/create-plan-online-five.component.html b/src/app/plan-management/create-plan-online-five/create-plan-online-five.component.html index 27ac5ee..305830c 100644 --- a/src/app/plan-management/create-plan-online-five/create-plan-online-five.component.html +++ b/src/app/plan-management/create-plan-online-five/create-plan-online-five.component.html @@ -2,9 +2,12 @@
- {{key + 1}}.{{item.groupName}} + + {{item.groupName!='新建'?key + 1:''}}.{{item.groupName}} + +
@@ -22,8 +25,8 @@
-
+ *ngIf="pattern == 'edit' && (selectedItem == '重点图示' || selectedItem == '交通水源' || selectedItem == '预案附件' || selectedItem == '单位概况')||(selectedItem!='灾情设定'&&selectedItem!='力量调集'&&selectedItem!='组织指挥'&&selectedItem!='作战行动'&&selectedItem!='社会联动'&&selectedItem!='勤务保障'&&selectedItem!='特别警示'&&selectedItem!='辅助决策'&&selectedItem!='处置要点'&&tuTrue)"> +
重点图示
@@ -259,7 +262,7 @@
-
+

@@ -425,13 +428,14 @@

-
+
{{item.groupName}}
+
+
+ + +
+
+
+
+ + + +
+
+ + + + + + + + + + +
+ + +
+ + + +
+
+
+ + +
+
+
+ +
+
+
+
+
+
+
+ delete + + +
+
+ + +
+
+
+ +
+
+
+
+
+
+ + +
+
+
+ +
+
+ {{data.type=='新建'?'新建':'更改'}} +
+ + +
+ +
+
+ + +
+
\ No newline at end of file diff --git a/src/app/plan-management/plan-management.module.ts b/src/app/plan-management/plan-management.module.ts index b8bfe71..9266f39 100644 --- a/src/app/plan-management/plan-management.module.ts +++ b/src/app/plan-management/plan-management.module.ts @@ -70,11 +70,14 @@ import { UiModule } from '../ui/ui.module'; import { TreeDiagramModule } from '../ui/ng-tree-diagram/src/ng-tree-diagram'; import { KeyUnitModule } from '../key-unit/key-unit.module'; import { yinYong } from './create-plan-online-five/create-plan-online-five.component' +import { newTitle } from './create-plan-online-five/create-plan-online-five.component' +import { disaster } from './create-plan-online-five/create-plan-online-five.component' @NgModule({ declarations: [EntryPlanComponent, PassPlanComponent, OpenPlanComponent, EntryPlanLookComponent, AddPlanone, PlanType, AuditSatus, PlanLevel, DownloadFile, AuditResult, ChangeName, WebLookComponent, OnetwoEntryPlanComponent, newunitComponent, MeetPlanComponent, newunitMeet, TypePlanComponent, newunitType, PsViewer, onetwoAuditResult, meetAuditResult, - typeAuditResult, MaintainUpComponent, GkPsViewer, GkhtmlPsViewer, UnitInfo, ReinforcePlanComponent, state, ImgDetails, CreatePlanOnlineFiveComponent, CreatePlanOnlineThreeComponent, OpenPlanToolDialog,yinYong], + typeAuditResult, MaintainUpComponent, GkPsViewer, GkhtmlPsViewer, UnitInfo, ReinforcePlanComponent, state, ImgDetails, CreatePlanOnlineFiveComponent, CreatePlanOnlineThreeComponent, + OpenPlanToolDialog,yinYong,newTitle,disaster], imports: [ CommonModule, PlanManagementRoutingModule, diff --git a/src/app/ui/plan-template/plan-template.component.html b/src/app/ui/plan-template/plan-template.component.html index 8de5f3a..4d2bb30 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-07-02 14:46:11 + * @LastEditTime: 2021-09-04 11:13:31 -->