diff --git a/package-lock.json b/package-lock.json index 37fd692..62b8f74 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2435,7 +2435,7 @@ }, "@babylonjs/core": { "version": "4.2.1", - "resolved": "https://registry.npmmirror.com/@babylonjs/core/-/core-4.2.1.tgz", + "resolved": "https://registry.npmmirror.com/@babylonjs/core/download/@babylonjs/core-4.2.1.tgz", "integrity": "sha512-Z2ZVNRKPB1UvmMeqQtxCJKrQtQ/hb5FcAZi66YEEE0MKBQlLmf6oZEM9vS1RljPK7NZoV/dZSdwjJgiQlGsuhA==", "requires": { "tslib": ">=1.10.0" @@ -2443,7 +2443,7 @@ }, "@babylonjs/gui": { "version": "4.2.1", - "resolved": "https://registry.npmmirror.com/@babylonjs/gui/-/gui-4.2.1.tgz", + "resolved": "https://registry.npmmirror.com/@babylonjs/gui/download/@babylonjs/gui-4.2.1.tgz", "integrity": "sha512-6gOolbWYFO5lrRWKunawYWQkX4a47dvuiIBrEmY6eKRN97e4f7YrR7oYolqeWFHLXzbn0JR0blOYQyUB5jQqmg==", "requires": { "@babylonjs/core": "4.2.1", @@ -2452,7 +2452,7 @@ }, "@babylonjs/inspector": { "version": "4.2.1", - "resolved": "https://registry.npmmirror.com/@babylonjs/inspector/-/inspector-4.2.1.tgz", + "resolved": "https://registry.npmmirror.com/@babylonjs/inspector/download/@babylonjs/inspector-4.2.1.tgz", "integrity": "sha512-P0l3oAVniyxYJIgpZsAJ3veJnA9Sq02HLsy7Dr3y5UOA8WP0n7X1Uv2T1MbONdTkXJ1YoX/KBfAYVAA81FXhbg==", "requires": { "@babylonjs/core": "4.2.1", @@ -2466,7 +2466,7 @@ }, "@babylonjs/loaders": { "version": "4.2.1", - "resolved": "https://registry.npmmirror.com/@babylonjs/loaders/-/loaders-4.2.1.tgz", + "resolved": "https://registry.npmmirror.com/@babylonjs/loaders/download/@babylonjs/loaders-4.2.1.tgz", "integrity": "sha512-huLdk18nTqwXHYIbxpXRTo1smcL1eCD8TvvyWiHciRjPttpRNjoACSR/G2J2FD0ymSBu8ZS8cdMvq1by7x2DsA==", "requires": { "@babylonjs/core": "4.2.1", @@ -2476,7 +2476,7 @@ }, "@babylonjs/materials": { "version": "4.2.1", - "resolved": "https://registry.npmmirror.com/@babylonjs/materials/-/materials-4.2.1.tgz", + "resolved": "https://registry.npmmirror.com/@babylonjs/materials/download/@babylonjs/materials-4.2.1.tgz", "integrity": "sha512-G4mfmixt2BnATaa2/uhf7xfZv4fqD6bGHocbEWT1Iu0KOJcpU7Q0EYjN8bqx78hVFjd94e4g0/7Bey2JaGrakA==", "requires": { "@babylonjs/core": "4.2.1", @@ -2485,7 +2485,7 @@ }, "@babylonjs/serializers": { "version": "4.2.1", - "resolved": "https://registry.npmmirror.com/@babylonjs/serializers/-/serializers-4.2.1.tgz", + "resolved": "https://registry.npmmirror.com/@babylonjs/serializers/download/@babylonjs/serializers-4.2.1.tgz", "integrity": "sha512-G4Jw9ILUJp8hO49Jg+sxVAKfYMZlgxGClNrUKCOcsIGWg5Yy0hKd1BZd86wEiyJAYt+MDpuocWCShzkEV2mJhA==", "requires": { "@babylonjs/core": "4.2.1", @@ -5175,12 +5175,12 @@ }, "babylonjs": { "version": "4.2.1", - "resolved": "https://registry.npmmirror.com/babylonjs/-/babylonjs-4.2.1.tgz", + "resolved": "https://registry.npmmirror.com/babylonjs/download/babylonjs-4.2.1.tgz", "integrity": "sha512-FQdJ2VTENUpUJQ30ddihwTjV6K94kglET0P7jV8OQzjA4eez3sotmG22Fn9+8yb069SA26KnrAGOI2sKMQ7BCw==" }, "babylonjs-gltf2interface": { "version": "4.2.1", - "resolved": "https://registry.npmmirror.com/babylonjs-gltf2interface/-/babylonjs-gltf2interface-4.2.1.tgz", + "resolved": "https://registry.npmmirror.com/babylonjs-gltf2interface/download/babylonjs-gltf2interface-4.2.1.tgz", "integrity": "sha512-ZBfKgIoztO1x1nyf9aPQJ+WXmB6Kw0VlyxvcKchIixbICqeeExiN8nmjvypwXC4hl+5ZDMnUKQNrIhh7uzulnA==" }, "backo2": { diff --git a/package.json b/package.json index afc7441..6db11a6 100644 --- a/package.json +++ b/package.json @@ -81,4 +81,4 @@ "tslint": "~5.15.0", "typescript": "~3.7.5" } -} \ No newline at end of file +} diff --git a/src/app/pages/criminal-records-admin/criminal-records-admin.component.html b/src/app/pages/criminal-records-admin/criminal-records-admin.component.html index 891e4e3..dd5414c 100644 --- a/src/app/pages/criminal-records-admin/criminal-records-admin.component.html +++ b/src/app/pages/criminal-records-admin/criminal-records-admin.component.html @@ -21,10 +21,10 @@ - - - - + + + + @@ -196,10 +196,14 @@ {{key + 1}}
- - - - + + + + Ⅰ级 Ⅱ级 Ⅲ级 diff --git a/src/app/pages/criminal-records/criminal-records.component.html b/src/app/pages/criminal-records/criminal-records.component.html index 16da2bd..4e090e5 100644 --- a/src/app/pages/criminal-records/criminal-records.component.html +++ b/src/app/pages/criminal-records/criminal-records.component.html @@ -19,10 +19,10 @@ - - - - + + + + diff --git a/src/app/pages/home-page/home-page.component.scss b/src/app/pages/home-page/home-page.component.scss index 2bcbd41..eea676e 100644 --- a/src/app/pages/home-page/home-page.component.scss +++ b/src/app/pages/home-page/home-page.component.scss @@ -1016,7 +1016,7 @@ } // 适配150% -@media screen and (max-height: 600px) { +@media screen and (max-height: 630px) { .informbox { width: 100%; height: 32px; @@ -1333,6 +1333,38 @@ width: 76%; // border: 1px solid red; } + + .oilNum { + position: absolute; + left: 4%; + bottom: 16px; + display: flex; + flex-direction: column; + + .oilNumItem { + display: flex; + align-items: center; + justify-content: space-between; + color: white; + font-size: 12px; + + span { + margin: 0 4px; + } + + .pointbox { + display: flex; + align-items: center; + } + + .point { + width: 6px; + height: 6px; + background-color: #91CCFF; + + } + } + } } } @@ -1356,3 +1388,6 @@ height: 6px; } } + + +//适配1366*768 diff --git a/src/app/pages/home-page/home-page.component.ts b/src/app/pages/home-page/home-page.component.ts index 6a86b41..9fecdc0 100644 --- a/src/app/pages/home-page/home-page.component.ts +++ b/src/app/pages/home-page/home-page.component.ts @@ -424,6 +424,13 @@ export class HomePageComponent implements OnInit { this.getHomeAggregation() }, 10 * 6000); + + this.resolutionRatio() + } + + resolutionRatio() { + console.log(document.documentElement.clientWidth) + console.log(document.documentElement.clientHeight) } //获得所有未读消息 @@ -669,7 +676,7 @@ export class HomePageComponent implements OnInit { isOpenModel: boolean = false look(item) { - console.log('消息item', item) + console.log('消息item', item) if (item.notification.data.eventSystemName == '灭火器维护') { this.isOpenModel = true let copydata = item.notification.data diff --git a/src/app/pages/home/home.component.ts b/src/app/pages/home/home.component.ts index d0d97c1..3bd3a87 100644 --- a/src/app/pages/home/home.component.ts +++ b/src/app/pages/home/home.component.ts @@ -322,6 +322,7 @@ export class HomeComponent implements OnInit { console.log('退出') abp.event.off('abp.notifications.received', this.reloadPage); abp.signalr.disconnect() + this.notificationService.remove() } //获得时间 diff --git a/src/app/pages/login/login.component.html b/src/app/pages/login/login.component.html index c14a77a..56bc092 100644 --- a/src/app/pages/login/login.component.html +++ b/src/app/pages/login/login.component.html @@ -7,14 +7,14 @@ - + - @@ -47,4 +47,4 @@

智能安全管理系统

-->
- + \ No newline at end of file diff --git a/src/app/pages/oil-unloading-process-list/oil-unloading-process-list.component.html b/src/app/pages/oil-unloading-process-list/oil-unloading-process-list.component.html index 244bb6a..38a01ff 100644 --- a/src/app/pages/oil-unloading-process-list/oil-unloading-process-list.component.html +++ b/src/app/pages/oil-unloading-process-list/oil-unloading-process-list.component.html @@ -52,7 +52,8 @@
- + @@ -164,13 +165,22 @@ {{item.allProccessCount}} -->
- - 合规 + + + 合规 + + + 预警 + - 预警 + 卸油中 + + + +
查看 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 {