From 8ff6a2817e521995569b56d383643369ed26de9c Mon Sep 17 00:00:00 2001 From: zhangab Date: Tue, 23 Oct 2018 18:51:56 +0800 Subject: content Alarm function modification Change-Id: I9e37bed3cf619fcd60f3b638f3816a8781111cc2 Issue-ID: USECASEUI-165 Signed-off-by: zhangab --- usecaseui-portal/src/app/alarm/alarm.component.css | 38 +++-- .../src/app/alarm/alarm.component.html | 169 ++++++++++----------- .../src/app/alarm/alarm.component.less | 104 +++++++------ usecaseui-portal/src/app/alarm/alarm.component.ts | 132 +++------------- 4 files changed, 183 insertions(+), 260 deletions(-) diff --git a/usecaseui-portal/src/app/alarm/alarm.component.css b/usecaseui-portal/src/app/alarm/alarm.component.css index 757a55b6..cb6a8edc 100644 --- a/usecaseui-portal/src/app/alarm/alarm.component.css +++ b/usecaseui-portal/src/app/alarm/alarm.component.css @@ -24,6 +24,13 @@ hr { background-color: #dce1e7; margin-bottom: 20px; } +.select { + clear: both; +} +.select .query_criteria { + width: 75%; + float: left; +} .select .query_criteria span { display: inline-block; font: 700 14px "Arial"; @@ -64,6 +71,12 @@ hr { color: #fff; font-weight: 400; } +.select .thumbnail { + width: 25%; + height: 90px; + float: left; + margin-top: 8px; +} ::ng-deep .vertical-center-modal { display: flex; align-items: center; @@ -72,19 +85,14 @@ hr { ::ng-deep .vertical-center-modal .ant-modal { top: 0; } -.content { - clear: both; - padding-top: 20px; -} -.content .title { +.titles { border-radius: 5px 5px 5px 5px; background-color: #fff; height: 106px; border-bottom: 1px solid #f0f0f0; margin-bottom: 20px; - clear: both; } -.content .title ul { +.titles ul { display: flex; display: -webkit-flex; justify-content: space-around; @@ -95,29 +103,27 @@ hr { width: 70%; float: left; } -.content .title ul li { +.titles ul li { list-style: none; padding-left: 32px; width: 100%; border-left: 1px solid #eceff4; } -.content .title ul li h5 { +.titles ul li h5 { font: 500 14px "Arial"; color: #3d4d65; } -.content .title ul li p { +.titles ul li p { font: 500 24px "Arial"; color: #3fa8eb; margin-bottom: 0; } -.content .title ul li:nth-child(1) { +.titles ul li:nth-child(1) { border: none; } -.content .title .thumbnail { - width: 25%; - height: 90px; - float: left; - margin-top: 8px; +.content { + clear: both; + padding-top: 20px; } .content .tablelist { background-color: #fff; diff --git a/usecaseui-portal/src/app/alarm/alarm.component.html b/usecaseui-portal/src/app/alarm/alarm.component.html index 8f95de37..fcb0e70e 100644 --- a/usecaseui-portal/src/app/alarm/alarm.component.html +++ b/usecaseui-portal/src/app/alarm/alarm.component.html @@ -14,100 +14,95 @@ limitations under the License. -->

Alarm > - Details

+ Details
-
-
- Source Name: - - - - -    - Priority: - - - - -    - Status: - - - - -

- Report Time: - +
+
    +
  • +
    Closed
    +

    {{alarmList.closed }}

    +
    • +
  • +
    Action
    +

    {{alarmList.Action }}

    +
    • +
- -
- - - -
-
-
    -
  • -
    All
    -

    {{alarmList.all }}

    +
    +
    + Source Name: + + +
      +
    • + {{item}}
      • -
    • -
      Closed
      -

      {{alarmList.closed }}

      +
    +     +    + Priority: + + +
      +
    • + {{item}}
      • -
    • -
      Action
      -

      {{alarmList.Action }}

      +
    +     +    + Status: + + + -
    - -
    -
    -
    - - - - NO - Source Name - Priority - SpecificProblem - Report Time - Status - Action - - - - - - {{i+1}} - {{item.name}} - {{item.age}} - {{item.address}} - {{item.address}} - {{item.address}} - - - - - -
    + +

    + Report Time: + + + +
    +
    + +
    +
+ + + +
+
+ + + + NO + Source Name + Priority + SpecificProblem + Report Time + Status + Action + + + + + {{i+1}} + {{item.sourceName}} + {{item.priority}} + {{item.specificProblem}} + {{item.sequence}} + {{item.status}} + + + + +
- +
\ No newline at end of file diff --git a/usecaseui-portal/src/app/alarm/alarm.component.less b/usecaseui-portal/src/app/alarm/alarm.component.less index 2d05c703..dc07bdc6 100644 --- a/usecaseui-portal/src/app/alarm/alarm.component.less +++ b/usecaseui-portal/src/app/alarm/alarm.component.less @@ -1,3 +1,18 @@ +/* + Copyright (C) 2018 CMCC, Inc. and others. All rights reserved. + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +*/ .title { font: 700 18px/18px "思源黑体"; color: #4c5e70; @@ -10,7 +25,10 @@ hr { margin-bottom: 20px; } .select { + clear: both; .query_criteria { + width: 75%; + float: left; span { display: inline-block; font: 700 14px "Arial"; @@ -53,10 +71,14 @@ hr { } } } - + .thumbnail { + width: 25%; + height: 90px; + float: left; + margin-top: 8px; + } } // model style - ::ng-deep .vertical-center-modal { display: flex; align-items: center; @@ -65,53 +87,47 @@ hr { ::ng-deep .vertical-center-modal .ant-modal { top: 0; } - -.content { - clear: both; - padding-top: 20px; - .title { - border-radius: 5px 5px 5px 5px; - background-color: #fff; - height: 106px; - border-bottom: 1px solid #f0f0f0; - margin-bottom: 20px; - clear: both; - ul { - display: flex; - display: -webkit-flex; - justify-content: space-around; - align-items: center; - padding: 0; - margin: 0; - height: 100%; - width: 70%; - float: left; - li { - list-style: none; - padding-left: 32px; - width: 100%; - border-left: 1px solid #eceff4; - h5 { - font: 500 14px "Arial"; - color: #3d4d65; - } - p { - font: 500 24px "Arial"; - color: #3fa8eb; - margin-bottom: 0; - } +.titles { + border-radius: 5px 5px 5px 5px; + background-color: #fff; + height: 106px; + border-bottom: 1px solid #f0f0f0; + margin-bottom: 20px; + // clear: both; + ul { + display: flex; + display: -webkit-flex; + justify-content: space-around; + align-items: center; + padding: 0; + margin: 0; + height: 100%; + width: 70%; + float: left; + li { + list-style: none; + padding-left: 32px; + width: 100%; + border-left: 1px solid #eceff4; + h5 { + font: 500 14px "Arial"; + color: #3d4d65; } - li:nth-child(1){ - border: none; + p { + font: 500 24px "Arial"; + color: #3fa8eb; + margin-bottom: 0; } } - .thumbnail { - width: 25%; - height: 90px; - float: left; - margin-top: 8px; + li:nth-child(1){ + border: none; } } + +} +.content { + clear: both; + padding-top: 20px; .tablelist { background-color: #fff; padding: 24px 10px 0px; diff --git a/usecaseui-portal/src/app/alarm/alarm.component.ts b/usecaseui-portal/src/app/alarm/alarm.component.ts index 72dd5181..42b05b16 100644 --- a/usecaseui-portal/src/app/alarm/alarm.component.ts +++ b/usecaseui-portal/src/app/alarm/alarm.component.ts @@ -1,3 +1,18 @@ +/* + Copyright (C) 2018 CMCC, Inc. and others. All rights reserved. + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +*/ import { Component, OnInit, Input, Output, EventEmitter, HostBinding } from '@angular/core'; import { MyhttpService } from '../myhttp.service'; import * as addDays from 'date-fns/add_days'; @@ -41,18 +56,11 @@ export class AlarmComponent implements OnInit { } // 筛选框（下拉框） - // sourceNameList = ['aaaa','bbbb','cccc','dddddDDDDDDDDDDDDDDD']; - sourceNameList=[ - {key:null,name:'请选择'}, - {key:1,name:'aaaa'}, - {key:2,name:'bbbb'}, - {key:3,name:'cccc'}, - {key:4,name:'dddddDDDDDDDDDDDDDDD'} - ] - sourceNameSelected = this.sourceNameList[0].name; - priorityList = ['aaaa','bbbb','cccc','ddddd']; + sourceNameList = ['---auto---','shentao-test-1001','vnf_a_1','cccc','dddddDDDDDDD']; + sourceNameSelected = this.sourceNameList[0]; + priorityList = ['---auto---','Critical','Major','Minor','Warning']; prioritySelected = this.priorityList[0]; - statusList = ['aaaa','bbbb','cccc','ddddd']; + statusList = ['---auto---','active','Close']; statusSelected = this.statusList[0]; choseSourceName(item){ console.log(item,'item1'); @@ -73,16 +81,11 @@ export class AlarmComponent implements OnInit { onChange(result: Date): void { console.log('onChange: ', result); } - // search(){ - // this.myhttp.getAlarmFormData().subscribe - - // } sort(e){ } // 数量统计 alarmList = { - all:22439, closed:37923, Action: 12342 } @@ -250,101 +253,6 @@ export class AlarmComponent implements OnInit { ] } }; - //表格数据 - dataSet = [ - { - name : 'John Brown', - age : 32, - expand : false, - address : 'New York No. 1', - description: 'My name is John Brown, I am 32 years old, living in New York No. 1 Lake Park.' - }, - { - name : 'Aim Green', - age : 42, - expand : false, - address : 'London No. 1', - description: 'My name is Jim Green, I am 42 years old, living in London No. 1 Lake Park.' - }, - { - name : 'Bim Green', - age : 42, - expand : false, - address : 'London No. 1', - description: 'My name is Jim Green, I am 42 years old, living in London No. 1 Lake Park.' - }, - { - name : 'Cim Green', - age : 42, - expand : false, - address : 'London No. 1', - description: 'My name is Jim Green, I am 42 years old, living in London No. 1 Lake Park.' - }, - { - name : 'Jim Green', - age : 42, - expand : false, - address : 'London No. 1', - description: 'My name is Jim Green, I am 42 years old, living in London No. 1 Lake Park.' - }, - { - name : 'Xim Green', - age : 42, - expand : false, - address : 'London No. 1', - description: 'My name is Jim Green, I am 42 years old, living in London No. 1 Lake Park.' - }, - { - name : 'Jim Green', - age : 42, - expand : false, - address : 'London No. 1', - description: 'My name is Jim Green, I am 42 years old, living in London No. 1 Lake Park.' - }, - { - name : 'Jim Green', - age : 42, - expand : false, - address : 'London No. 1', - description: 'My name is Jim Green, I am 42 years old, living in London No. 1 Lake Park.' - }, - { - name : 'Jim Green', - age : 42, - expand : false, - address : 'London No. 1', - description: 'My name is Jim Green, I am 42 years old, living in London No. 1 Lake Park.' - }, - { - name : 'Jim Green', - age : 42, - expand : false, - address : 'London No. 1', - description: 'My name is Jim Green, I am 42 years old, living in London No. 1 Lake Park.' - }, - { - name : 'cim Green', - age : 42, - expand : false, - address : 'London No. 1', - description: 'My name is Jim Green, I am 42 years old, living in London No. 1 Lake Park.' - }, - { - name : 'bim Green', - age : 42, - expand : false, - address : 'London No. 1', - description: 'My name is Jim Green, I am 42 years old, living in London No. 1 Lake Park.' - }, - { - name : 'aoe Black', - age : 32, - expand : false, - address : 'Sidney No. 1', - description: 'My name is Joe Black, I am 32 years old, living in Sidney No. 1 Lake Park.' - } - ]; - //详情页标题显示 detailshow = false; // 显示隐藏动画 @@ -371,9 +279,7 @@ export class AlarmComponent implements OnInit { }; getAlarmFormData(){ this.myhttp.getAlarmFormData(this.pageNumber,this.pageSize,this.name,this.Priority,this.Status,this.Report).subscribe((data)=>{ - if(data.retCode ==200){ this.list = data.list; - } console.log(data,'data'); }) } -- cgit 1.2.3-korg