Commit da78d66d authored by wangqinghua's avatar wangqinghua

style update

parent 564d644b
<nz-modal [nzWidth]="980" [(nzVisible)]="isShow" [nzFooter]="null" nzTitle="发送记录" (nzOnCancel)="closeModal()" (nzOnOk)="closeModal()"> <nz-modal [nzWidth]="780" [(nzVisible)]="isShow" [nzFooter]="null" nzTitle="发送记录" (nzOnCancel)="closeModal()" (nzOnOk)="closeModal()">
<nz-table #nzTable [nzData]="logList" [nzFrontPagination]="false" [nzTotal]="totalNum" [nzPageIndex]="pageNum" <nz-table #nzTable [nzData]="logList" [nzFrontPagination]="false" [nzTotal]="totalNum" [nzPageIndex]="pageNum"
[nzPageSize]="pageCount" (nzPageIndexChange)="change($event)" [nzLoading]="loading"> [nzPageSize]="pageCount" (nzPageIndexChange)="change($event)" [nzLoading]="loading">
<thead> <thead>
......
...@@ -33,6 +33,7 @@ export class SendLogComponent implements OnInit { ...@@ -33,6 +33,7 @@ export class SendLogComponent implements OnInit {
//获取列表 //获取列表
getList() { getList() {
this.loading = true;
const data1 = { const data1 = {
hostids: [this.data.hostid], hostids: [this.data.hostid],
groupid: [this.data.groupid], groupid: [this.data.groupid],
...@@ -43,6 +44,7 @@ export class SendLogComponent implements OnInit { ...@@ -43,6 +44,7 @@ export class SendLogComponent implements OnInit {
(res) => { (res) => {
this.logList = res.data.data; this.logList = res.data.data;
this.totalNum = res.data.totalNum; this.totalNum = res.data.totalNum;
this.loading = false;
} }
); );
} }
......
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
</div> </div>
<div class="search-form tag-form handle"> <div class="search-form tag-form handle">
<ng-container *ngFor="let item of warnCountList"> <ng-container *ngFor="let item of warnCountList">
<span [ngClass]="{'select-border': selectHostId == item.hostid}" (click)="search(item.hostid)"> <span [ngClass]="{'select-border': selectHostId == item.hostid}" (click)="search()">
<nz-tag *ngIf="item.level == 4 || item.level == 5" class="tag-red" [nzColor]="color.red"></nz-tag> <nz-tag *ngIf="item.level == 4 || item.level == 5" class="tag-red" [nzColor]="color.red"></nz-tag>
<nz-tag *ngIf="item.level == 2 || item.level == 3" class="tag-yellow" [nzColor]="color.yellow"></nz-tag> <nz-tag *ngIf="item.level == 2 || item.level == 3" class="tag-yellow" [nzColor]="color.yellow"></nz-tag>
{{item.name}}({{item.size}}) {{item.name}}({{item.size}})
......
...@@ -28,9 +28,12 @@ ...@@ -28,9 +28,12 @@
<td>{{data.continuedTime}}</td> <td>{{data.continuedTime}}</td>
<td> <td>
<ng-container *ngIf="data.r_clock"><span class="color-green"><i class="anticon anticon-check-square-o"></i></span> </ng-container> <ng-container *ngIf="data.r_clock"><span class="color-green"><i class="anticon anticon-check-square-o"></i></span> </ng-container>
<ng-container *ngIf="!data.r_clock"><span class="color-red"> <i class="anticon anticon-warning"></i></span></ng-container> <ng-container *ngIf="!data.r_clock"><span class="color-red"><i class="anticon anticon-warning"></i></span></ng-container>
</td> </td>
<td class="list-icon cursor" (click)="showLog(data)"><i class="anticon anticon-profile"></i></td> <td class="list-icon cursor" (click)="showLog(data)">
<i class="anticon anticon-profile">
</i></td>
</tr> </tr>
</tbody> </tbody>
</nz-table> </nz-table>
......
...@@ -8,11 +8,15 @@ import {SendLogComponent} from '../../alarm/modal/send-log/send-log.component'; ...@@ -8,11 +8,15 @@ import {SendLogComponent} from '../../alarm/modal/send-log/send-log.component';
selector: 'smart-warn-list', selector: 'smart-warn-list',
templateUrl: './warn-list.component.html', templateUrl: './warn-list.component.html',
styles: [ styles: [
` .list-icon { `
font-size: 20px; .list-icon {
text-align: center; font-size: 20px;
color: #8cb6ce; text-align: center;
} color: #8cb6ce;
}
.anticon{
font-size: 18px;
}
` `
] ]
}) })
......
...@@ -135,6 +135,4 @@ export class TriListComponent implements OnInit { ...@@ -135,6 +135,4 @@ export class TriListComponent implements OnInit {
); );
}); });
} }
} }
...@@ -13,7 +13,7 @@ import { Principal } from './principal.service'; ...@@ -13,7 +13,7 @@ import { Principal } from './principal.service';
* ``` * ```
*/ */
@Directive({ @Directive({
selector: '[jhiHasAnyAuthority]' selector: '[smartJhiHasAnyAuthority]'
}) })
export class HasAnyAuthorityDirective { export class HasAnyAuthorityDirective {
......
...@@ -86,7 +86,7 @@ ...@@ -86,7 +86,7 @@
<tbody> <tbody>
<tr *ngFor="let data of nzTable.data"> <tr *ngFor="let data of nzTable.data">
<td>{{data.id}}</td> <td>{{data.id}}</td>
<td>{{data.changeTime | date:'yyyy-MM-dd HH:mm:ss'}}</td> <td>{{data.createTime | date:'yyyy-MM-dd HH:mm:ss'}}</td>
<td>{{data.manageUserName}}</td> <td>{{data.manageUserName}}</td>
<td> <td>
<span *ngIf="data.type == 1">普通变更</span> <span *ngIf="data.type == 1">普通变更</span>
......
...@@ -101,6 +101,4 @@ export class DictComponent implements OnInit { ...@@ -101,6 +101,4 @@ export class DictComponent implements OnInit {
this.isVisiable = false; this.isVisiable = false;
this.initForm(); this.initForm();
} }
} }
...@@ -35,7 +35,6 @@ export class SystemChangeService { ...@@ -35,7 +35,6 @@ export class SystemChangeService {
return this.http.get(SERVER_API_URL + '/sysChange/export?' + this.commonSer.toQuery(data),{responseType:'blob'}); return this.http.get(SERVER_API_URL + '/sysChange/export?' + this.commonSer.toQuery(data),{responseType:'blob'});
} }
//查询变更跟踪信息 //查询变更跟踪信息
findMsg(params): Observable<any> { findMsg(params): Observable<any> {
return this.http.get(SERVER_API_URL + '/sysChange/findMsg/' + params); return this.http.get(SERVER_API_URL + '/sysChange/findMsg/' + params);
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
<div nz-row [nzGutter]="12"> <div nz-row [nzGutter]="12">
<div nz-col nzSpan="8" > <div nz-col nzSpan="8" >
<div class="padding-15-0"> <div class="padding-15-0">
<button (click)="showGroupModal()" nz-button nzType="primary"><i class="anticon anticon-plus-circle-o"></i>新增组织</button> <button (click)="showGroupModal()" nz-button nzType="default"><i class="anticon anticon-plus-circle-o"></i>新增组织</button>
</div> </div>
<div class="tree-left"> <div class="tree-left">
<nz-tree [(ngModel)]="nodes" [nzShowLine]="true"> <nz-tree [(ngModel)]="nodes" [nzShowLine]="true">
...@@ -41,7 +41,6 @@ ...@@ -41,7 +41,6 @@
<div class="padding-15-0"> <div class="padding-15-0">
<button (click)="showUserModal()" nz-button nzType="default"><i class="anticon anticon-plus-circle-o"></i>新增用户</button> <button (click)="showUserModal()" nz-button nzType="default"><i class="anticon anticon-plus-circle-o"></i>新增用户</button>
<button (click)="batchDelete()" nz-button nzType="default"><i class="anticon anticon-close-circle-o"></i>批量删除</button> <button (click)="batchDelete()" nz-button nzType="default"><i class="anticon anticon-close-circle-o"></i>批量删除</button>
<!--<button nz-button nzType="default">批量修改</button>-->
<button (click)="downLoad()" nz-button nzType="default"><i class="anticon anticon-download"></i>下载模版</button> <button (click)="downLoad()" nz-button nzType="default"><i class="anticon anticon-download"></i>下载模版</button>
<button (click)="showUploadModalOrg()" nz-button nzType="default"><i class="anticon anticon-download"></i>导入组织</button> <button (click)="showUploadModalOrg()" nz-button nzType="default"><i class="anticon anticon-download"></i>导入组织</button>
<button (click)="showUploadModalUser()" nz-button nzType="default"><i class="anticon anticon-download"></i>导入用户</button> <button (click)="showUploadModalUser()" nz-button nzType="default"><i class="anticon anticon-download"></i>导入用户</button>
......
...@@ -369,3 +369,15 @@ ...@@ -369,3 +369,15 @@
padding: 15px; padding: 15px;
background-color: #fff; background-color: #fff;
} }
.ant-table,
.ant-input,
.ant-btn,
.ant-select,
.ant-select-dropdown,
.ant-form label,
.ant-breadcrumb,
.ant-radio-group,
.ant-menu-inline .ant-menu-item, .ant-menu-inline .ant-menu-submenu-title, .ant-menu-vertical-left .ant-menu-item, .ant-menu-vertical-left .ant-menu-submenu-title, .ant-menu-vertical-right .ant-menu-item, .ant-menu-vertical-right .ant-menu-submenu-title, .ant-menu-vertical .ant-menu-item, .ant-menu-vertical .ant-menu-submenu-title
{
font-size: 12px;
}
...@@ -12,6 +12,7 @@ p { ...@@ -12,6 +12,7 @@ p {
} }
body { body {
font-size: 12px;
background: #ffffff; background: #ffffff;
} }
......
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
<meta name="description" content=""> <meta name="description" content="">
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="theme-color" content="#000000"> <meta name="theme-color" content="#000000">
<link rel="shortcut icon" href="favicon.ico" />
<script src="javascript/jquery-3.3.1/jquery-3.3.1.min.js" type="text/javascript"></script> <script src="javascript/jquery-3.3.1/jquery-3.3.1.min.js" type="text/javascript"></script>
<script src="javascript/jtopo/js/util.js" type="text/javascript"></script> <script src="javascript/jtopo/js/util.js" type="text/javascript"></script>
<script src="javascript/jtopo/js/jtopo-0.4.8-dev.js" type="text/javascript"></script> <script src="javascript/jtopo/js/jtopo-0.4.8-dev.js" type="text/javascript"></script>
......
...@@ -73,7 +73,7 @@ module.exports = (options) => ({ ...@@ -73,7 +73,7 @@ module.exports = (options) => ({
utils.root('src/main/webapp/app'), {} utils.root('src/main/webapp/app'), {}
), ),
new CopyWebpackPlugin([ new CopyWebpackPlugin([
// { from: './src/main/webapp/favicon.ico', to: 'favicon.ico' }, { from: './src/main/webapp/favicon.ico', to: 'favicon.ico' },
// { from: './src/main/webapp/manifest.webapp', to: 'manifest.webapp' }, // { from: './src/main/webapp/manifest.webapp', to: 'manifest.webapp' },
// jhipster-needle-add-assets-to-webpack - JHipster will add/remove third-party resources in this array // jhipster-needle-add-assets-to-webpack - JHipster will add/remove third-party resources in this array
{ from: './src/main/webapp/content/json', to: 'json' }, { from: './src/main/webapp/content/json', to: 'json' },
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment