查看
diff --git a/src/app/pages/oil-unloading-process-list/oil-unloading-process-list.component.ts b/src/app/pages/oil-unloading-process-list/oil-unloading-process-list.component.ts
index d4a2b56..ec0f578 100644
--- a/src/app/pages/oil-unloading-process-list/oil-unloading-process-list.component.ts
+++ b/src/app/pages/oil-unloading-process-list/oil-unloading-process-list.component.ts
@@ -239,6 +239,7 @@ export class OilUnloadingProcessListComponent implements OnInit {
}
],
legend: {
+ selectedMode: false, // 是否允许点击
data: ['卸油事件'],
textStyle: {
color: '#fff'
@@ -353,6 +354,7 @@ export class OilUnloadingProcessListComponent implements OnInit {
}
},
legend: {
+ selectedMode: false, // 是否允许点击
data: ['事前准备', '事中操作', '全程监测'],
textStyle: {
color: '#fff'
@@ -529,7 +531,13 @@ export class OilUnloadingProcessListComponent implements OnInit {
this.SkipCount = '0'
this.getViolateRecordList()
}
-
+ stateChange($event) {
+ if (!$event) {
+ this.list = []
+ this.SkipCount = '0'
+ this.getViolateRecordList()
+ }
+ }
defaultOrId: string
diff --git a/src/app/pages/plan-admin/plan-admin.component.html b/src/app/pages/plan-admin/plan-admin.component.html
index 9370510..8c6e93f 100644
--- a/src/app/pages/plan-admin/plan-admin.component.html
+++ b/src/app/pages/plan-admin/plan-admin.component.html
@@ -63,13 +63,13 @@
区域
所属公司
-
联系人
-
联系电话
-
油站等级
-
经营品类
-
油机数量
-
车道数量
-
油罐容积
+
联系人
+
联系电话
+
油站等级
+
经营品类
+
油机数量
+
车道数量
+
油罐容积
操作
@@ -83,15 +83,15 @@
{{item.locationName}}
{{item.companyName}}
-
{{item.leaderName}}
-
{{item.leaderContact}}
-
{{item.stationLevel}}
-
{{item.sellVariety}}
-
{{item.gasStationCount}}
-
{{item.laneCount}}
-
+ {{item.leaderName}}
+
{{item.leaderContact}}
+
{{item.stationLevel}}
+
{{item.sellVariety}}
+
{{item.gasStationCount}}
+
{{item.laneCount}}
+
{{item.tankVolume}}
- {{item.tankVolume ? 'm³' : null}}
+ {{item.tankVolume ? 'm³' : null}}
查看
diff --git a/src/app/pages/today-warning-admin/today-warning-admin.component.html b/src/app/pages/today-warning-admin/today-warning-admin.component.html
index 638951d..515b7c7 100644
--- a/src/app/pages/today-warning-admin/today-warning-admin.component.html
+++ b/src/app/pages/today-warning-admin/today-warning-admin.component.html
@@ -12,10 +12,10 @@
-
diff --git a/src/app/pages/today-warning/today-warning.component.html b/src/app/pages/today-warning/today-warning.component.html
index 217800e..70ad296 100644
--- a/src/app/pages/today-warning/today-warning.component.html
+++ b/src/app/pages/today-warning/today-warning.component.html
@@ -12,17 +12,18 @@
-
-
+
@@ -50,13 +51,15 @@
-
-
@@ -76,6 +79,32 @@
+
+
+ 预警级别
+
+
+ 预警类型
+
+
+ 预警信息
+
+
+ 区域
+
+
+ 摄像头
+
+
+ 预警时间
+
+
+ 处置状态
+
+
+ 操作
+
+
@@ -105,16 +134,16 @@
- 预警类型: {{item.violation.violationType}}
+ {{item.violation.violationType}}
- 预警信息: {{item.violation.eventSystemName}}
+ {{item.violation.eventSystemName}}
- 区域: {{item.violateArea}}
+ {{item.violateArea ? item.violateArea : '/'}}
- 摄像头: {{item.cameraNo}}
+ {{item.cameraNo ? item.cameraNo : '/'}}
{{item.violateTime | date:"yyyy-MM-dd HH:mm:ss"}}
@@ -128,9 +157,7 @@
- 查看
-
+ 查看
diff --git a/src/app/pages/today-warning/today-warning.component.scss b/src/app/pages/today-warning/today-warning.component.scss
index 4cdd9cb..0ddeff2 100644
--- a/src/app/pages/today-warning/today-warning.component.scss
+++ b/src/app/pages/today-warning/today-warning.component.scss
@@ -126,7 +126,10 @@
}
}
}
-
+ .listitem2{
+ height: 40px;
+ line-height: 40px;
+ }
.dispositioned {
color: #23D9FF;
}
diff --git a/src/app/pages/warning-statistics-list/warning-statistics-list.component.html b/src/app/pages/warning-statistics-list/warning-statistics-list.component.html
index 198d224..f6f97d6 100644
--- a/src/app/pages/warning-statistics-list/warning-statistics-list.component.html
+++ b/src/app/pages/warning-statistics-list/warning-statistics-list.component.html
@@ -167,8 +167,8 @@
{{item.violatedItemSnapshotObj.name ? item.violatedItemSnapshotObj.name : '/'}}
- {{item.violatedItemSnapshotObj.validityEndTime ?
- (item.violatedItemSnapshotObj.validityEndTime | date:"yyyy-MM-dd") : '/'}}
+ {{item.violatedItemSnapshotObj.endTime ?
+ (item.violatedItemSnapshotObj.endTime | date:"yyyy-MM-dd") : '/'}}
查看
diff --git a/src/app/pages/warning-statistics-list/warning-statistics-list.component.ts b/src/app/pages/warning-statistics-list/warning-statistics-list.component.ts
index 29c95f9..9a1630a 100644
--- a/src/app/pages/warning-statistics-list/warning-statistics-list.component.ts
+++ b/src/app/pages/warning-statistics-list/warning-statistics-list.component.ts
@@ -207,6 +207,7 @@ export class WarningStatisticsListComponent implements OnInit {
}
],
legend: {
+ selectedMode: false, // 是否允许点击
data: ['预警事件'],
textStyle: {
color: '#fff'
@@ -321,6 +322,7 @@ export class WarningStatisticsListComponent implements OnInit {
}
},
legend: {
+ selectedMode: false, // 是否允许点击
data: ['事前准备', '事中操作', '全程监测'],
textStyle: {
color: '#fff'
diff --git a/src/theme.less b/src/theme.less
index bb526e6..58220b1 100644
--- a/src/theme.less
+++ b/src/theme.less
@@ -201,7 +201,7 @@
//滚动条样式
::-webkit-scrollbar {
- width: 10px;
+ width: 5px;
}
::-webkit-scrollbar-thumb {
- 
- 
- 
+