shaojiahao
/
Sinopec-Anxin
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/Sinopec-Anxin

dev
刘向辉 3 years ago
parent
bafcfeb7e9 b5d4767436
commit
546df5804e
5 changed files with 90 additions and 46 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 18
      src/app/pages/criminal-records-admin/criminal-records-admin.component.html
  2. 22
      src/app/pages/criminal-records-admin/criminal-records-admin.component.scss
  3. 14
      src/app/pages/criminal-records/criminal-records.component.html
  4. 24
      src/app/pages/criminal-records/criminal-records.component.scss
  5. 4
      src/app/system-management/user/user.component.ts

18
src/app/pages/criminal-records-admin/criminal-records-admin.component.html
Unescape View File

@ -146,13 +146,13 @@
<div nz-col nzSpan="2"> <div nz-col nzSpan="2">
预警类型 预警类型
</div> </div>
<div nz-col nzSpan="3"> <div nz-col nzSpan="2">
预警事件 预警事件
</div> </div>
<div nz-col nzSpan="2"> <div nz-col nzSpan="2">
所属公司 所属公司
</div> </div>
<div nz-col nzSpan="2"> <div nz-col nzSpan="3">
管理区域 管理区域
</div> </div>
<div nz-col nzSpan="1"> <div nz-col nzSpan="1">
@ -191,28 +191,28 @@
<span *ngIf="item.violation.level == 3">Ⅲ级</span> <span *ngIf="item.violation.level == 3">Ⅲ级</span>
<span *ngIf="item.violation.level == 4">Ⅳ级</span> <span *ngIf="item.violation.level == 4">Ⅳ级</span>
</div> </div>
<div nz-col nzSpan="2"> <div nz-col nzSpan="2" [title]="item.violation.violationType">
{{item.violation.violationType}} {{item.violation.violationType}}
</div> </div>
<div nz-col nzSpan="3"> <div nz-col nzSpan="2" [title]="item.violation.eventSystemName">
{{item.violation.eventSystemName}} {{item.violation.eventSystemName}}
</div> </div>
<div nz-col nzSpan="2"> <div nz-col nzSpan="2" [title]="item.gasStation.companyName">
{{item.gasStation.companyName}} {{item.gasStation.companyName}}
</div> </div>
<div nz-col nzSpan="2"> <div nz-col nzSpan="3" [title]="item.gasStation.locationName">
{{item.gasStation.locationName}} {{item.gasStation.locationName}}
</div> </div>
<div nz-col nzSpan="1" style="text-align: right;box-sizing: border-box;padding-right: 8px;"> <div nz-col nzSpan="1" style="text-align: right;box-sizing: border-box;padding-right: 8px;">
<!-- <span class="ziying">自营</span> --> <!-- <span class="ziying">自营</span> -->
</div> </div>
<div nz-col nzSpan="2"> <div nz-col nzSpan="2" [title]="item.gasStation.stationName">
{{item.gasStation.stationName}} {{item.gasStation.stationName}}
</div> </div>
<div nz-col nzSpan="2"> <div nz-col nzSpan="2" [title]="item.violateArea">
{{item.violateArea}} {{item.violateArea}}
</div> </div>
<div nz-col nzSpan="2"> <div nz-col nzSpan="2" [title]="item.cameraNo">
{{item.cameraNo}} {{item.cameraNo}}
</div> </div>
<div nz-col nzSpan="3"> <div nz-col nzSpan="3">

22
src/app/pages/criminal-records-admin/criminal-records-admin.component.scss
Unescape View File

@ -27,9 +27,11 @@
// flex: 5; // flex: 5;
width: 150px; width: 150px;
} }
.searchParamsLong { .searchParamsLong {
width: 250px; width: 250px;
} }
.searchParams2 { .searchParams2 {
width: 220px; width: 220px;
} }
@ -41,9 +43,11 @@
nz-select { nz-select {
color: rgba(145, 204, 255, 0.95); color: rgba(145, 204, 255, 0.95);
} }
nz-tree-select { nz-tree-select {
color: rgba(145, 204, 255, 0.95); color: rgba(145, 204, 255, 0.95);
} }
nz-range-picker { nz-range-picker {
background-color: rgba(0, 0, 0, 0); background-color: rgba(0, 0, 0, 0);
width: 100%; width: 100%;
@ -221,10 +225,12 @@
background: none; background: none;
cursor: pointer; cursor: pointer;
} }
.rankingBtnbox { .rankingBtnbox {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
} }
.selectedbtn { .selectedbtn {
background: linear-gradient(180deg, #000D21 0%, #001331 27%, #2399FF 100%); background: linear-gradient(180deg, #000D21 0%, #001331 27%, #2399FF 100%);
color: white; color: white;
@ -269,12 +275,16 @@
div { div {
color: #91CCFF; color: #91CCFF;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
.look { .look {
color: #36A2FF; color: #36A2FF;
cursor: pointer; cursor: pointer;
} }
} }
img { img {
width: 36px; width: 36px;
} }
@ -365,6 +375,7 @@
.chartsbox { .chartsbox {
width: 100%; width: 100%;
height: 43%; height: 43%;
.chartname { .chartname {
position: absolute; position: absolute;
left: 20px; left: 20px;
@ -373,6 +384,7 @@
.chart { .chart {
height: 100%; height: 100%;
div { div {
span { span {
font-size: 14px; font-size: 14px;
@ -414,6 +426,7 @@
display: flex; display: flex;
flex-direction: row; flex-direction: row;
z-index: 999; z-index: 999;
.rankingBtn { .rankingBtn {
margin-right: 12px; margin-right: 12px;
} }
@ -435,9 +448,11 @@
.tr { .tr {
height: 32px; height: 32px;
line-height: 32px; line-height: 32px;
div { div {
font-size: 12px !important; font-size: 12px !important;
} }
img { img {
width: 32px; width: 32px;
} }
@ -455,6 +470,7 @@
padding: 0 22px; padding: 0 22px;
height: 32px; height: 32px;
margin-bottom: 6px; margin-bottom: 6px;
form { form {
width: 100%; width: 100%;
height: 32px; height: 32px;
@ -509,6 +525,7 @@
.chartsbox { .chartsbox {
width: 100%; width: 100%;
height: 40%; height: 40%;
.chartname { .chartname {
position: absolute; position: absolute;
left: 20px; left: 20px;
@ -517,6 +534,7 @@
.chart { .chart {
height: 100%; height: 100%;
div { div {
span { span {
font-size: 14px; font-size: 14px;
@ -547,6 +565,7 @@
.rightbox { .rightbox {
box-shadow: 0 0 22px 0px #1a7fd7 inset; box-shadow: 0 0 22px 0px #1a7fd7 inset;
.btnbox { .btnbox {
position: absolute; position: absolute;
right: 28px; right: 28px;
@ -554,6 +573,7 @@
display: flex; display: flex;
flex-direction: row; flex-direction: row;
z-index: 999; z-index: 999;
.rankingBtn { .rankingBtn {
margin-right: 8px; margin-right: 8px;
} }
@ -575,9 +595,11 @@
.tr { .tr {
height: 28px; height: 28px;
line-height: 28px; line-height: 28px;
div { div {
font-size: 10px !important; font-size: 10px !important;
} }
img { img {
width: 30px; width: 30px;
} }

14
src/app/pages/criminal-records/criminal-records.component.html
Unescape View File

@ -132,10 +132,10 @@
<div nz-col nzSpan="2"> <div nz-col nzSpan="2">
预警类型 预警类型
</div> </div>
<div nz-col nzSpan="3"> <div nz-col nzSpan="2">
预警事件 预警事件
</div> </div>
<div nz-col nzSpan="3"> <div nz-col nzSpan="4">
管理区域 管理区域
</div> </div>
<div nz-col nzSpan="3"> <div nz-col nzSpan="3">
@ -168,19 +168,19 @@
<span *ngIf="item.violation.level == 3">Ⅲ级</span> <span *ngIf="item.violation.level == 3">Ⅲ级</span>
<span *ngIf="item.violation.level == 4">Ⅳ级</span> <span *ngIf="item.violation.level == 4">Ⅳ级</span>
</div> </div>
<div nz-col nzSpan="2"> <div nz-col nzSpan="2" [title]="item.violation.violationType">
{{item.violation.violationType}} {{item.violation.violationType}}
</div> </div>
<div nz-col nzSpan="3"> <div nz-col nzSpan="2" [title]="item.violation.eventSystemName">
{{item.violation.eventSystemName}} {{item.violation.eventSystemName}}
</div> </div>
<div nz-col nzSpan="3"> <div nz-col nzSpan="4" [title]="item.gasStation.locationName">
{{item.gasStation.locationName}} {{item.gasStation.locationName}}
</div> </div>
<div nz-col nzSpan="3"> <div nz-col nzSpan="3" [title]="item.violateArea">
{{item.violateArea}} {{item.violateArea}}
</div> </div>
<div nz-col nzSpan="3"> <div nz-col nzSpan="3" [title]="item.cameraNo">
{{item.cameraNo}} {{item.cameraNo}}
</div> </div>
<div nz-col nzSpan="3"> <div nz-col nzSpan="3">

24
src/app/pages/criminal-records/criminal-records.component.scss
Unescape View File

@ -18,16 +18,20 @@
display: flex; display: flex;
justify-content: flex-start; justify-content: flex-start;
.searchParams,.btn{ .searchParams,
.btn {
margin: 0 3px; margin: 0 3px;
} }
.searchParams { .searchParams {
// flex: 5; // flex: 5;
width: 150px; width: 150px;
} }
.searchParams2 { .searchParams2 {
width: 220px; width: 220px;
} }
.btn { .btn {
// flex: 1; // flex: 1;
} }
@ -95,9 +99,11 @@
font-family: titlefont; font-family: titlefont;
cursor: pointer; cursor: pointer;
} }
span:nth-child(1) { span:nth-child(1) {
margin-left: 12px; margin-left: 12px;
} }
.grey { .grey {
color: #68829F; color: #68829F;
} }
@ -254,12 +260,16 @@
div { div {
color: #91CCFF; color: #91CCFF;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
.look { .look {
color: #36A2FF; color: #36A2FF;
cursor: pointer; cursor: pointer;
} }
} }
img { img {
width: 36px; width: 36px;
} }
@ -349,6 +359,7 @@
.chartsbox { .chartsbox {
width: 100%; width: 100%;
height: 43%; height: 43%;
.chartname { .chartname {
position: absolute; position: absolute;
left: 20px; left: 20px;
@ -358,6 +369,7 @@
.chart { .chart {
width: 97%; width: 97%;
height: 100%; height: 100%;
div { div {
span { span {
font-size: 14px; font-size: 14px;
@ -399,6 +411,7 @@
display: flex; display: flex;
flex-direction: row; flex-direction: row;
z-index: 999; z-index: 999;
.rankingBtn { .rankingBtn {
margin-right: 12px; margin-right: 12px;
} }
@ -420,9 +433,11 @@
.tr { .tr {
height: 32px; height: 32px;
line-height: 32px; line-height: 32px;
div { div {
font-size: 12px !important; font-size: 12px !important;
} }
img { img {
width: 32px; width: 32px;
} }
@ -441,6 +456,7 @@
padding: 0 22px; padding: 0 22px;
height: 32px; height: 32px;
margin-bottom: 6px; margin-bottom: 6px;
form { form {
width: 100%; width: 100%;
height: 32px; height: 32px;
@ -495,6 +511,7 @@
.chartsbox { .chartsbox {
width: 100%; width: 100%;
height: 40%; height: 40%;
.chartname { .chartname {
position: absolute; position: absolute;
left: 20px; left: 20px;
@ -504,6 +521,7 @@
.chart { .chart {
width: 98%; width: 98%;
height: 100%; height: 100%;
div { div {
span { span {
font-size: 14px; font-size: 14px;
@ -534,6 +552,7 @@
.rightbox { .rightbox {
box-shadow: 0 0 22px 0px #1a7fd7 inset; box-shadow: 0 0 22px 0px #1a7fd7 inset;
.btnbox { .btnbox {
position: absolute; position: absolute;
right: 28px; right: 28px;
@ -541,6 +560,7 @@
display: flex; display: flex;
flex-direction: row; flex-direction: row;
z-index: 999; z-index: 999;
.rankingBtn { .rankingBtn {
margin-right: 8px; margin-right: 8px;
} }
@ -562,9 +582,11 @@
.tr { .tr {
height: 28px; height: 28px;
line-height: 28px; line-height: 28px;
div { div {
font-size: 10px !important; font-size: 10px !important;
} }
img { img {
width: 30px; width: 30px;
} }

4
src/app/system-management/user/user.component.ts
Unescape View File

@ -100,7 +100,7 @@ export class UserComponent implements OnInit {
nzTitle: '新增用户', nzTitle: '新增用户',
nzContent: AdduserComponent, nzContent: AdduserComponent,
nzViewContainerRef: this.viewContainerRef, nzViewContainerRef: this.viewContainerRef,
nzWidth: 288, nzWidth: 360,
nzComponentParams: { nzComponentParams: {
title: '', title: '',
subtitle: '' subtitle: ''
@ -149,7 +149,7 @@ export class UserComponent implements OnInit {
nzTitle: '编辑用户', nzTitle: '编辑用户',
nzContent: EdituserComponent, nzContent: EdituserComponent,
nzViewContainerRef: this.viewContainerRef, nzViewContainerRef: this.viewContainerRef,
nzWidth: 288, nzWidth: 360,
// nzOkLoading: true, // nzOkLoading: true,
nzComponentParams: { nzComponentParams: {
data: data, data: data,

Write Preview
Loading…
Cancel
Save