[新增]推送管理页面

src/app/pages/criminal-records-admin/criminal-records-admin.component.ts

@@ -303,9 +303,6 @@ export class CriminalRecordsAdminComponent implements OnInit {
     this.mybarChart.setOption(this.baroption);
 
     this.warningType()
-
-    console.log('当前日期', enddate)
-    console.log('三十天前日期', startdate)
   }
 
 

src/app/system-management/analysis-of-the-host/analysis-of-the-host.component.ts

@@ -26,7 +26,14 @@ export class AnalysisOfTheHostComponent implements OnInit {
   nzExpandAll = false;
   totalCount: string
   getAllOrganization() {
-    this.http.get('/api/services/app/Organization/GetAll').subscribe((data: any) => {
+    let OrganizationUnitId = sessionStorage.getItem('isGasStation') == 'true' ? JSON.parse(sessionStorage.getItem('userdataOfgasstation')).organization.id : JSON.parse(sessionStorage.getItem('userdata')).organization.id
+    let params = {
+      OrganizationUnitId: OrganizationUnitId,
+      IsContainsChildren: "true"
+    }
+    this.http.get('/api/services/app/Organization/GetAll', {
+      params: params
+    }).subscribe((data: any) => {
       this.totalCount = data.result.totalCount
       data.result.items.forEach(element => {
         element.key = element.id

src/app/system-management/navigation/navigation.component.html

@@ -17,6 +17,7 @@
         <li [routerLink]="['/system/user']"  routerLinkActive="router-link-active"><img src="../../../assets/images/icon/user.png" alt="">用户管理</li>
         <li [routerLink]="['/system/role']"  routerLinkActive="router-link-active"><img src="../../../assets/images/icon/role.png" alt="">角色管理</li>
         <li [routerLink]="['/system/host']"  routerLinkActive="router-link-active"><img src="../../../assets/images/icon/host.png" alt="">分析主机管理</li>
+        <li [routerLink]="['/system/push']"  routerLinkActive="router-link-active"><img src="../../../assets/images/icon/push.png" alt="">推送管理</li>
       </ul>
     </div>
   </nz-sider>

src/app/system-management/organization/organization.component.ts

@@ -36,7 +36,14 @@ export class OrganizationComponent implements OnInit {
   nzExpandAll = false;
   totalCount: string
   getAllOrganization() {
-    this.http.get('/api/services/app/Organization/GetAll').subscribe((data: any) => {
+    let OrganizationUnitId = sessionStorage.getItem('isGasStation') == 'true' ? JSON.parse(sessionStorage.getItem('userdataOfgasstation')).organization.id : JSON.parse(sessionStorage.getItem('userdata')).organization.id
+    let params = {
+      OrganizationUnitId: OrganizationUnitId,
+      IsContainsChildren: "true"
+    }
+    this.http.get('/api/services/app/Organization/GetAll', {
+      params: params
+    }).subscribe((data: any) => {
       this.totalCount = data.result.totalCount
       // console.log('组织机构',data.result.totalCount)
       data.result.items.forEach(element => {

src/app/system-management/push/edit-push-item/edit-push-item.component.html

@@ -0,0 +1 @@
+<p>edit-push-item works!</p>

src/app/system-management/push/edit-push-item/edit-push-item.component.spec.ts

@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { EditPushItemComponent } from './edit-push-item.component';
+
+describe('EditPushItemComponent', () => {
+  let component: EditPushItemComponent;
+  let fixture: ComponentFixture<EditPushItemComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ EditPushItemComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(EditPushItemComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

src/app/system-management/push/edit-push-item/edit-push-item.component.ts

@@ -0,0 +1,15 @@
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+  selector: 'app-edit-push-item',
+  templateUrl: './edit-push-item.component.html',
+  styleUrls: ['./edit-push-item.component.scss']
+})
+export class EditPushItemComponent implements OnInit {
+
+  constructor() { }
+
+  ngOnInit(): void {
+  }
+
+}

src/app/system-management/push/push.component.html

@@ -0,0 +1,46 @@
+<div class="pushbox" id="pushbox">
+    <div class="topbox">
+        <div class="lefttop">
+            <span>通知推送权限配置</span>
+        </div>
+        <div class="righttop">
+            <form nz-form [formGroup]="validateForm" (ngSubmit)="submitForm()">
+                <nz-form-item>
+                    <nz-form-control>
+                        <nz-input-group nzPrefixIcon="search">
+                            <input type="text" nz-input placeholder="请输入预案类别" formControlName="search" />
+                        </nz-input-group>
+                    </nz-form-control>
+                    <button style="display: none;" type="submit"></button>
+                </nz-form-item>
+            </form>
+            <!-- <button nz-button nzType="primary"><i nz-icon nzType="plus-circle" nzTheme="outline"></i>新增</button> -->
+        </div>
+    </div>
+    <div class="tablebox">
+        <table>
+            <tr>
+                <th style="width: 20%;">预警类别</th>
+                <th style="width: 20%;">预警/分析事件</th>
+                <th style="width: 25%;">预警推送范围</th>
+                <th style="width: 25%;">预警处置范围</th>
+                <th style="width: 10%;">操作</th>
+            </tr>
+            <tr *ngFor="let item of list">
+                <td>{{item.violationType}}</td>
+                <td>{{item.violationName}}</td>
+                <td>3</td>
+                <td>4</td>
+                <td>
+                    <span style="color: #2399FF;cursor: pointer;" (click)="edititem(item)">编辑</span>
+                </td>
+            </tr>
+        </table>
+    </div>
+    <!-- <div class="pagination">
+      <nz-pagination [nzHideOnSinglePage]="false" [nzPageIndex]="1" [nzTotal]="usersNum" [nzPageSize]="16"
+        [nzShowTotal]="totalTemplate" nzShowQuickJumper (nzPageIndexChange)="pageChange($event)">
+      </nz-pagination>
+      <ng-template #totalTemplate let-total> 16条/页,共{{usersNum}}条 </ng-template>
+    </div> -->
+</div>

src/app/system-management/push/push.component.scss

@@ -0,0 +1,81 @@
+.pushbox {
+  width: 100%;
+  height: 100%;
+  background: #FFFFFF;
+  box-sizing: border-box;
+  padding: 20px;
+  overflow: hidden;
+  display: flex;
+  flex-direction: column;
+
+}
+
+.topbox {
+  width: 100%;
+  height: 36px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  margin-bottom: 12px;
+
+  .lefttop {
+    span:nth-child(1) {
+      color: #000D21;
+      margin-right: 16px;
+    }
+
+    span:nth-child(2) {
+      color: rgba(36, 36, 36, 0.24);
+    }
+  }
+
+  .righttop {
+    display: flex;
+
+    button {
+      margin-left: 16px;
+    }
+
+    nz-input-group {
+      height: 32px;
+    }
+  }
+}
+
+.tablebox {
+  flex: 1;
+  overflow-y: auto;
+
+  //滚动条样式
+  ::-webkit-scrollbar {
+    display: none;
+  }
+  table{
+    width: 100%;
+    tr{
+      height: 40px;
+      line-height: 40px;
+      font-size: 14px;
+    }
+    tr:nth-child(1) th{
+      font-weight: 600;
+      font-size: 15px;
+    }
+    tr,tr th,td{
+      border: 0px;
+      color: #000D21;
+      font-family: synormal;
+      font-weight: 400;
+    }
+    tr:nth-child(odd) {
+      background-color:rgba(145, 204, 255, 0.16);
+    }
+    tr:nth-child(even) {
+      background-color:#fff;
+    }
+    tr th:nth-child(1),td:nth-child(1){
+      box-sizing: border-box;
+      padding-left: 5%;
+    }
+  }
+}

src/app/system-management/push/push.component.ts

@@ -0,0 +1,46 @@
+import { HttpClient } from '@angular/common/http';
+import { Component, OnInit } from '@angular/core';
+import { FormBuilder, FormGroup, Validators } from '@angular/forms';
+@Component({
+  selector: 'app-push',
+  templateUrl: './push.component.html',
+  styleUrls: ['./push.component.scss']
+})
+
+export class PushComponent implements OnInit {
+
+  validateForm!: FormGroup;
+  constructor(private fb: FormBuilder, private http: HttpClient) { }
+
+  ngOnInit(): void {
+    this.validateForm = this.fb.group({
+      search: [null]
+    });
+    this.getViolation()
+  }
+
+
+  //获取预警类型
+  list:any
+  getViolation() {
+    this.http.get('/api/services/app/Violation/GetAllList').subscribe((data:any) => {
+      this.list = data.result
+      console.log('预警类型', data)
+    })
+  }
+
+
+  edititem(item){
+    
+  }
+
+
+
+  //搜索框提交
+  submitForm(): void {
+    for (const i in this.validateForm.controls) {
+      this.validateForm.controls[i].markAsDirty();
+      this.validateForm.controls[i].updateValueAndValidity();
+    }
+  }
+}

src/app/system-management/system-management-routing.module.ts

@@ -6,12 +6,14 @@ import { RoleComponent } from './role/role.component';
 import { OrganizationComponent } from './organization/organization.component';
 import { UserComponent } from './user/user.component';
 import { AnalysisOfTheHostComponent } from './analysis-of-the-host/analysis-of-the-host.component';
+import { PushComponent } from './push/push.component';
 
 const routes: Routes = [
     { path: 'organization', component: OrganizationComponent },
     { path: 'user', component: UserComponent },
     { path: 'role', component: RoleComponent },
-    { path: 'host', component: AnalysisOfTheHostComponent }
+    { path: 'host', component: AnalysisOfTheHostComponent },
+    { path: 'push', component: PushComponent }
 ];
 
 @NgModule({

src/app/system-management/system-management.module.ts

@@ -32,8 +32,10 @@ import { AddhostComponent } from './analysis-of-the-host/addhost/addhost.compone
 import { EdithostComponent } from './analysis-of-the-host/edithost/edithost.component';
 import { AddcameraComponent } from './analysis-of-the-host/addcamera/addcamera.component';
 import { EditcameraComponent } from './analysis-of-the-host/editcamera/editcamera.component';
+import { PushComponent } from './push/push.component';
+import { EditPushItemComponent } from './push/edit-push-item/edit-push-item.component';
 @NgModule({
-  declarations: [OrganizationComponent, UserComponent, RoleComponent, NavigationComponent, AdduserComponent, EdituserComponent, AddroleComponent, EditroleComponent, AddorComponent, EditorComponent, AnalysisOfTheHostComponent, AddhostComponent, EdithostComponent, AddcameraComponent, EditcameraComponent],
+  declarations: [OrganizationComponent, UserComponent, RoleComponent, NavigationComponent, AdduserComponent, EdituserComponent, AddroleComponent, EditroleComponent, AddorComponent, EditorComponent, AnalysisOfTheHostComponent, AddhostComponent, EdithostComponent, AddcameraComponent, EditcameraComponent, PushComponent, EditPushItemComponent],
   imports: [
     CommonModule,
     SystemRoutingModule,

src/app/system-management/user/adduser/adduser.component.ts

@@ -43,7 +43,14 @@ export class AdduserComponent implements OnInit {
   //获取所有组织机构
   nodes:any = []
   getAllOrganization() {
-    this.http.get('/api/services/app/Organization/GetAll').subscribe((data: any) => {
+    let OrganizationUnitId = sessionStorage.getItem('isGasStation') == 'true' ? JSON.parse(sessionStorage.getItem('userdataOfgasstation')).organization.id : JSON.parse(sessionStorage.getItem('userdata')).organization.id
+    let params = {
+      OrganizationUnitId: OrganizationUnitId,
+      IsContainsChildren: "true"
+    }
+    this.http.get('/api/services/app/Organization/GetAll', {
+      params: params
+    }).subscribe((data: any) => {
       data.result.items.forEach(element => {
         element.key = element.id
         element.title = element.displayName

src/app/system-management/user/edituser/edituser.component.ts

@@ -45,7 +45,14 @@ export class EdituserComponent implements OnInit {
   //获取所有组织机构
   nodes:any = []
   getAllOrganization() {
-    this.http.get('/api/services/app/Organization/GetAll').subscribe((data: any) => {
+    let OrganizationUnitId = sessionStorage.getItem('isGasStation') == 'true' ? JSON.parse(sessionStorage.getItem('userdataOfgasstation')).organization.id : JSON.parse(sessionStorage.getItem('userdata')).organization.id
+    let params = {
+      OrganizationUnitId: OrganizationUnitId,
+      IsContainsChildren: "true"
+    }
+    this.http.get('/api/services/app/Organization/GetAll', {
+      params: params
+    }).subscribe((data: any) => {
       data.result.items.forEach(element => {
         element.key = element.id
         element.title = element.displayName