From 89a46e3046ebe79a3270235bd15e10b29777a824 Mon Sep 17 00:00:00 2001 From: SHAOJIAHAO <55341701@qq.com> Date: Fri, 9 Apr 2021 14:23:50 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=AE=8C=E5=96=84]=E5=88=9B=E5=BB=BA=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E5=88=9B=E5=BB=BA=E5=8D=95=E4=BD=8D=E6=97=B6=E6=9B=B4?= =?UTF-8?q?=E6=94=B9=E5=BF=85=E5=A1=AB=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fire-force/fire-force.component.scss | 10 ++- .../linkage-forces.component.scss | 10 ++- .../water-collection.component.scss | 11 ++- .../fire-fighting-device.component.html | 8 +-- .../fire-fighting-device.component.html | 4 +- .../createunit.component.html | 2 +- .../water-road/water-road.component.ts | 9 +++ .../entry-plan/entry-plan.component.html | 70 +++++++++---------- .../meet-plan/meet-plan.component.scss | 2 +- .../onetwo-entry-plan.component.scss | 2 +- .../type-plan/type-plan.component.scss | 2 +- src/app/ui/usermanagement/createUser.html | 11 ++- src/app/ui/usermanagement/editUser.html | 10 ++- .../usermanagement.component.ts | 4 ++ 14 files changed, 98 insertions(+), 57 deletions(-) diff --git a/src/app/data-collection/fire-force/fire-force.component.scss b/src/app/data-collection/fire-force/fire-force.component.scss index 2e6718b..ff93dcc 100644 --- a/src/app/data-collection/fire-force/fire-force.component.scss +++ b/src/app/data-collection/fire-force/fire-force.component.scss @@ -278,7 +278,7 @@ cursor: pointer; } .tabsbox{ - margin-top: 10px; + // margin-top: 10px; width: 100%; height: 40px; overflow: hidden; @@ -524,6 +524,9 @@ } } .noHeight{ + .tabsbox{ + margin-top: 10px; + } height: 0px; transition: height 0.5s; } @@ -625,7 +628,7 @@ height:338px; transition: height 0.5s; .tabsbox{ - margin-top: 5px; + // margin-top: 5px; height: 38px; line-height: 38px; .tabs{ @@ -688,6 +691,9 @@ } } .noHeight{ + .tabsbox{ + margin-top: 10px; + } height: 0px; transition: height 0.5s; } diff --git a/src/app/data-collection/linkage-forces/linkage-forces.component.scss b/src/app/data-collection/linkage-forces/linkage-forces.component.scss index 3aea706..9476fe0 100644 --- a/src/app/data-collection/linkage-forces/linkage-forces.component.scss +++ b/src/app/data-collection/linkage-forces/linkage-forces.component.scss @@ -249,7 +249,7 @@ display: flex; justify-content: space-between; font-size: 15px; - margin-top: 10px; + // margin-top: 10px; .tabs{ div{ float: left; @@ -488,6 +488,9 @@ } } .noHeight{ + .tabsbox{ + margin-top: 10px; + } height: 0px; transition: height 0.5s; } @@ -614,7 +617,7 @@ .tabsbox{ height: 38px; line-height: 38px; - margin-top: 5px; + // margin-top: 5px; .tabs{ div{ width: 90px; @@ -674,6 +677,9 @@ } } .noHeight{ + .tabsbox{ + margin-top: 10px; + } height: 0px; transition: height 0.5s; } diff --git a/src/app/data-collection/water-collection/water-collection.component.scss b/src/app/data-collection/water-collection/water-collection.component.scss index 5aee980..368f4fd 100644 --- a/src/app/data-collection/water-collection/water-collection.component.scss +++ b/src/app/data-collection/water-collection/water-collection.component.scss @@ -232,7 +232,7 @@ display: flex; justify-content: space-between; font-size: 15px; - margin-top: 10px; + // margin-top: 10px; .tabs{ div{ float: left; @@ -333,6 +333,9 @@ } } .noHeight{ + .tabsbox{ + margin-top: 10px; + } height: 0px; transition: height 0.5s; } @@ -433,7 +436,7 @@ transition: height 0.5s; .tabsbox{ height: 38px; - margin-top: 5px; + // margin-top: 5px; line-height: 38px; .tabs{ div{ @@ -485,8 +488,12 @@ } } .noHeight{ + .tabsbox{ + margin-top: 10px; + } height: 0px; transition: height 0.5s; + } } } diff --git a/src/app/key-unit/fire-fighting-device-look/fire-fighting-device.component.html b/src/app/key-unit/fire-fighting-device-look/fire-fighting-device.component.html index dc84234..71f0bf9 100644 --- a/src/app/key-unit/fire-fighting-device-look/fire-fighting-device.component.html +++ b/src/app/key-unit/fire-fighting-device-look/fire-fighting-device.component.html @@ -1,6 +1,6 @@
- +
@@ -75,7 +72,6 @@

{{item.name}}

-
@@ -94,7 +90,7 @@
- + -->
diff --git a/src/app/key-unit/fire-fighting-device/fire-fighting-device.component.html b/src/app/key-unit/fire-fighting-device/fire-fighting-device.component.html index 1c825ef..e18b570 100644 --- a/src/app/key-unit/fire-fighting-device/fire-fighting-device.component.html +++ b/src/app/key-unit/fire-fighting-device/fire-fighting-device.component.html @@ -1,7 +1,7 @@
- +
diff --git a/src/app/key-unit/key-unit-management/createunit.component.html b/src/app/key-unit/key-unit-management/createunit.component.html index d658baf..0e4aa3f 100644 --- a/src/app/key-unit/key-unit-management/createunit.component.html +++ b/src/app/key-unit/key-unit-management/createunit.component.html @@ -9,7 +9,7 @@ - diff --git a/src/app/key-unit/water-road/water-road.component.ts b/src/app/key-unit/water-road/water-road.component.ts index 3b2583b..0b63f74 100644 --- a/src/app/key-unit/water-road/water-road.component.ts +++ b/src/app/key-unit/water-road/water-road.component.ts @@ -33,6 +33,15 @@ export class WaterRoadComponent implements OnInit { {id:'0',name:'消火栓',selected:true}, {id:'1',name:'消防水池',selected:true}, {id:'2',name:'天然水源',selected:true}, + {id:'3',name:'总队',selected:true}, + {id:'4',name:'支队',selected:true}, + {id:'5',name:'大队',selected:true}, + {id:'6',name:'中队(消防站)',selected:true}, + {id:'7',name:'其他消防队伍',selected:true} + ] + + fireForceList:any[] = [ + ] waterAreaDefault:any = '5000' //默认水源范围 selectedWaterList:any = [] //选择提交的水源 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 82735dc..63a88f2 100644 --- a/src/app/plan-management/entry-plan/entry-plan.component.html +++ b/src/app/plan-management/entry-plan/entry-plan.component.html @@ -55,17 +55,17 @@
- - + + - 卡片预案 - 二维预案 - 三维预案 - 其他预案 + 卡片预案 + 二维预案 + 三维预案 + 其他预案 - - 更多筛选条件 - 收起 + + 更多筛选条件 + 收起
@@ -74,47 +74,47 @@
- + {{item.name}} - + 包含下级 -
+
- - + + - 未提交审核 - 审核中 - 审核通过 - 审核退回 + 未提交审核 + 审核中 + 审核通过 + 审核退回 - +
- - -
- - - - 从高到低 - 从低到高 - - -
-
- + + +
+ - - 有预案 - 无预案 + + 从高到低 + 从低到高
+
+ + + + 有预案 + 无预案 + + +
diff --git a/src/app/plan-management/meet-plan/meet-plan.component.scss b/src/app/plan-management/meet-plan/meet-plan.component.scss index 31ef63e..996a31f 100644 --- a/src/app/plan-management/meet-plan/meet-plan.component.scss +++ b/src/app/plan-management/meet-plan/meet-plan.component.scss @@ -95,7 +95,7 @@ } .newadd{ margin-top: 12px; - margin-left: 70px; + margin-left: 30px; display: flex; button{ font-size: 16px; 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 index ae47af9..5483b3e 100644 --- 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 @@ -95,7 +95,7 @@ } .newadd{ margin-top: 12px; - margin-left: 70px; + margin-left: 30px; display: flex; button{ font-size: 16px; diff --git a/src/app/plan-management/type-plan/type-plan.component.scss b/src/app/plan-management/type-plan/type-plan.component.scss index 5f3d4fc..81b800b 100644 --- a/src/app/plan-management/type-plan/type-plan.component.scss +++ b/src/app/plan-management/type-plan/type-plan.component.scss @@ -95,7 +95,7 @@ } .newadd{ margin-top: 12px; - margin-left: 70px; + margin-left: 30px; display: flex; button{ font-size: 16px; diff --git a/src/app/ui/usermanagement/createUser.html b/src/app/ui/usermanagement/createUser.html index 76a1820..b9ee297 100644 --- a/src/app/ui/usermanagement/createUser.html +++ b/src/app/ui/usermanagement/createUser.html @@ -12,6 +12,12 @@ +
+ + + +
+
@@ -20,14 +26,14 @@
- +
+ ngModel name="phone" placeholder="联系电话">
@@ -41,6 +47,7 @@
+

{{errmsg}}

diff --git a/src/app/ui/usermanagement/editUser.html b/src/app/ui/usermanagement/editUser.html index 938d017..62202bf 100644 --- a/src/app/ui/usermanagement/editUser.html +++ b/src/app/ui/usermanagement/editUser.html @@ -9,6 +9,12 @@ +
+ + + +
+
@@ -17,14 +23,14 @@
- +
+ [(ngModel)]="phone" name="phone" placeholder="联系电话">
diff --git a/src/app/ui/usermanagement/usermanagement.component.ts b/src/app/ui/usermanagement/usermanagement.component.ts index 9f7bd67..481b59a 100644 --- a/src/app/ui/usermanagement/usermanagement.component.ts +++ b/src/app/ui/usermanagement/usermanagement.component.ts @@ -375,6 +375,7 @@ export class CreateNewUser { name:e.name, realName:e.user, post:e.post, + identityCard:e.identityCard, phone:e.phone, enabled:true, creationTime:time, @@ -412,6 +413,7 @@ export class EditNewUser { this.getTreeData() this.name=this.data.e.name this.realName=this.data.e.realName + this.identityCard = this.data.e.identityCard this.post=this.data.e.post, this.phone=this.data.e.phone, this.affiliate=this.data.e.organizationId @@ -483,11 +485,13 @@ export class EditNewUser { // console.log(item) } //编辑 + identityCard:any//身份证 onSubmit (e) { this.http.put(`/api/Users/${this.data.e.name}`,{ name:this.data.e.name, realName:this.realName, post:this.post, + identityCard:this.identityCard, phone:this.phone, roleNames:this.data.e.roleNames, enabled: this.data.e.enabled,