update

src/main/webapp/app/app.constants.ts

@@ -25,6 +25,5 @@ const urlPath = window.document.location.href;  //浏览器显示地址
 const docPath = window.document.location.pathname; //文件在服务器相对地址
 const index = urlPath.indexOf(docPath);
 const serverPath = urlPath.substring(0, index);//服务器地址
-export const imgUrl = serverPath + "file/icon/";
-// export const fileUrl = "http://10.10.38.99:8282/file/";
-export const fileUrl =  serverPath + "file/";
+export const imgUrl = serverPath + "/file/icon/";
+export const fileUrl =  serverPath + "/file/";

src/main/webapp/app/app.route.ts

@@ -48,31 +48,30 @@ export const route: Routes = [
             {
                 path: 'main', component: JhiMainComponent,canActivate:[LoginGuard],data: { breadcrumb: '首页' },
                 children: [
-                    {path: 'home', component: HomeComponent,data: { breadcrumb: '资源可用性统计' },},
-                    {path: 'basic', component: BasicComponent,data: { breadcrumb: '资源可用性统计' },},
-                    {path: 'basic-detail', component: BasicDetailComponent,data: { breadcrumb: '资源可用性统计' },},
-                    {path: 'networkCheck', component: NetworkCheckComponent,data: { breadcrumb: '资源可用性统计' },},
-                    {path: 'network-detail', component: NetworkDetailComponent,data: { breadcrumb: '资源可用性统计' },},
-                    {path: 'audit', component: AuditComponent,data: { breadcrumb: '资源可用性统计' },},
-                    {path: 'examine', component: ExamineComponent,data: { breadcrumb: '资源可用性统计' },},
-                    {path: 'group', component: GroupComponent,data: { breadcrumb: '资源可用性统计' },},
-                    {path: 'power', component: PowerComponent,data: { breadcrumb: '资源可用性统计' },},
-                    {path: 'alarmList', component: AlarmListComponent,data: { breadcrumb: '告警推送日志' },},
-                    {path: 'alarmLog', component: AlarmLogComponent,data: { breadcrumb: '告警记录' },},
-                    {path: 'alarmManage', component: AlarmManageComponent,data: { breadcrumb: '资源可用性统计' },},
-                    {path: 'alarmSet', component: AlarmSetComponent,data: { breadcrumb: '资源可用性统计' },},
-                    {path: 'nowAlarm', component: NowAlarmComponent,data: { breadcrumb: '资源可用性统计' },},
-                    {path: 'sendSet', component: SendSetComponent,data: { breadcrumb: '资源可用性统计' },},
-                    {path: 'neTopology', component: NeTopologyComponent,data: { breadcrumb: '资源可用性统计' },},
-                    {path: 'flowTrend', component: FlowTrendComponent,data: { breadcrumb: '资源可用性统计' },},
-                    {path: 'topoImg', component: TopologyImgComponent,data: { breadcrumb: '资源可用性统计' },},
-                    {path: 'workHandle', component: WorkHandleComponent,data: { breadcrumb: '资源可用性统计' },},
-                    {path: 'inspectPlan', component: InspectPlanComponent,data: { breadcrumb: '资源可用性统计' },},
-                    {path: 'assetPart', component: AssetPartComponent,data: { breadcrumb: '资源可用性统计' },},
-                    {path: 'assetChild', component: ChildAssetsComponent,data: { breadcrumb: '资源可用性统计' },},
-                    {path: 'assetsDetail', component: AssetsDetailComponent,data: { breadcrumb: '资源可用性统计' },},
-                    {path: 'handleDetail', component: HandleDetailComponent,data: { breadcrumb: '资源可用性统计' },},
-                    {path: 'handleEvent', component: HandleEventComponent,data: { breadcrumb: '资源可用性统计' },},
+                    {path: 'home', component: HomeComponent,data: { breadcrumb: '首页' },},
+                    {path: 'basic', component: BasicComponent,data: { breadcrumb: '基础资源监控' },},
+                    {path: 'basic-detail', component: BasicDetailComponent,data: { breadcrumb: '资源详情' },},
+                    {path: 'networkCheck', component: NetworkCheckComponent,data: { breadcrumb: '网站监测' },},
+                    {path: 'network-detail', component: NetworkDetailComponent,data: { breadcrumb: '网站监测详情' },},
+                    {path: 'audit', component: AuditComponent,data: { breadcrumb: '系统审计' },},
+                    {path: 'examine', component: ExamineComponent,data: { breadcrumb: '系统审核' },},
+                    {path: 'group', component: GroupComponent,data: { breadcrumb: '组织用户' },},
+                    {path: 'power', component: PowerComponent,data: { breadcrumb: '角色与权限' },},
+                    {path: 'alarmList', component: AlarmListComponent,data: { breadcrumb: '告警记录' },},
+                    {path: 'alarmLog', component: AlarmLogComponent,data: { breadcrumb: '告警推送日志' },},
+                    {path: 'alarmSet', component: AlarmSetComponent,data: { breadcrumb: '告警推送设置' },},
+                    {path: 'nowAlarm', component: NowAlarmComponent,data: { breadcrumb: '当前告警' },},
+                    {path: 'sendSet', component: SendSetComponent,data: { breadcrumb: '发送方式设置' },},
+                    {path: 'neTopology', component: NeTopologyComponent,data: { breadcrumb: '网络拓扑图' },},
+                    {path: 'flowTrend', component: FlowTrendComponent,data: { breadcrumb: '流量趋势' },},
+                    {path: 'topoImg', component: TopologyImgComponent,data: { breadcrumb: '拓扑图标管理' },},
+                    {path: 'workHandle', component: WorkHandleComponent,data: { breadcrumb: '运维事件' },},
+                    {path: 'inspectPlan', component: InspectPlanComponent,data: { breadcrumb: '巡检计划' },},
+                    {path: 'assetPart', component: AssetPartComponent,data: { breadcrumb: '资产备件' },},
+                    {path: 'assetChild', component: ChildAssetsComponent,data: { breadcrumb: '资产子分类' },},
+                    {path: 'assetsDetail', component: AssetsDetailComponent,data: { breadcrumb: '资产详情' },},
+                    {path: 'handleDetail', component: HandleDetailComponent,data: { breadcrumb: '事件详情' },},
+                    {path: 'handleEvent', component: HandleEventComponent,data: { breadcrumb: '处理事件' },},
                     {path: 'resourceUsabil', component: ResourceUsabilComponent,data: { breadcrumb: '资源可用性统计' },},
                     {path: 'operationWork', component: OperationWorkComponent,data: { breadcrumb: '运维工作' },},
                     {path: 'resourceAlarm', component: ResourceAlarmComponent,data: { breadcrumb: '资源告警统计' },},

src/main/webapp/app/home/home.component.html

@@ -19,8 +19,7 @@
                 <div nz-row class="padding-10">
                     <div nz-col nzSpan="12"> <h2>运行情况统计</h2></div>
                     <div nz-col nzSpan="12">
-                        <nz-select style="width: 200px;float: right" nzPlaceHolder="选择分组" [(ngModel)]="obj.leftGroupId"
-                                   (ngModelChange)="countGroupItem()">
+                        <nz-select nzAllowClear style="width: 200px;float: right" nzPlaceHolder="选择分组" [(ngModel)]="obj.leftGroupId" (ngModelChange)="countGroupItem()">
                             <ng-container *ngFor="let item of groupList;let i = index;">
                                 <nz-option [nzLabel]="item.name" [nzValue]="item.groupid"></nz-option>
                             </ng-container>

src/main/webapp/app/overAll/basic/basic.component.ts

@@ -71,7 +71,7 @@ export class BasicComponent implements OnInit {
     gray;
 
     //搜索
-    searchStatus = false;
+    searchStatus = true;
     searchName;
     searchData;
 

src/main/webapp/app/system/audit/audit.component.html

@@ -20,7 +20,7 @@
 
 <div nz-row class="search-form">
   <div nz-col nzSpan="16">
-    <nz-select style="width: 200px;" [(ngModel)]="obj.moduleId"  nzPlaceHolder="全部">
+    <nz-select nzAllowClear style="width: 200px;" [(ngModel)]="obj.moduleId"  nzPlaceHolder="全部">
       <nz-option *ngFor="let item of menuList" [nzLabel]="item.name" [nzValue]="item.id"></nz-option>
     </nz-select>
     <nz-radio-group [(ngModel)]="timeType" (ngModelChange)="changeType()">

src/main/webapp/app/system/modal/user/user.component.html

@@ -17,7 +17,7 @@
     <nz-form-item>
       <nz-form-label [nzSm]="6" [nzXs]="24"   nzRequired>性别</nz-form-label>
       <nz-form-control [nzSm]="14" [nzXs]="24">
-        <nz-select id="gender"  formControlName="gender" nzPlaceHolder="选择性别">
+        <nz-select nzAllowClear id="gender"  formControlName="gender" nzPlaceHolder="选择性别">
           <nz-option nzValue="1" nzLabel="男"></nz-option>
           <nz-option nzValue="0" nzLabel="女"></nz-option>
         </nz-select>

src/main/webapp/app/work/inspect-plan/inspect-plan.component.html

@@ -5,7 +5,7 @@
                 首页
             </nz-breadcrumb-item>
             <nz-breadcrumb-item>
-                <a>运维工作</a>
+               运维工作
             </nz-breadcrumb-item>
             <nz-breadcrumb-item>
                 巡检计划
@@ -19,18 +19,17 @@
 </div>
 <div nz-row [nzGutter]="4" class="search-form">
     <div nz-col nzSpan="3">
-        <button (click)="addPlan()" nz-button nzType="default"><i class="anticon anticon-plus-circle-o"></i>新增计划
-        </button>
+        <button (click)="addPlan()" nz-button nzType="default"><i class="anticon anticon-plus-circle-o"></i>新增计划</button>
     </div>
     <div nz-col nzSpan="4">
-        <nz-select style="width: 100%;" [(ngModel)]="obj.status" nzPlaceHolder="计划状态">
+        <nz-select nzAllowClear style="width: 100%;" [(ngModel)]="obj.status" nzPlaceHolder="计划状态">
             <nz-option nzLabel="未开始" nzValue="0"></nz-option>
             <nz-option nzLabel="进行中" nzValue="1"></nz-option>
             <nz-option nzLabel="结束" nzValue="2"></nz-option>
         </nz-select>
     </div>
     <div nz-col nzSpan="4">
-        <nz-select style="width: 100%;" [(ngModel)]="obj.typeId" nzPlaceHolder="计划类型">
+        <nz-select nzAllowClear style="width: 100%;" [(ngModel)]="obj.typeId" nzPlaceHolder="计划类型">
             <ng-container *ngFor="let item of planTypeList">
                 <nz-option [nzValue]="item.id" [nzLabel]="item.name"></nz-option>
             </ng-container>
@@ -41,8 +40,7 @@
         <input type="text" nz-input [(ngModel)]="obj.searchStr" placeholder="计划名称/负责人">
     </div>
     <div nz-col nzSpan="2">
-        <button (click)="getList()" nz-button nzType="default"><i class="anticon anticon-search"
-                                                                 style="color: #6097b7"></i>搜索
+        <button (click)="getList()" nz-button nzType="default"><i class="anticon anticon-search" style="color: #6097b7"></i>搜索
         </button>
     </div>
 </div>

src/main/webapp/app/work/modal/assets/assets.component.html

@@ -42,7 +42,7 @@
                         <nz-form-label [nzSpan]="6" nzRequired>子分类
                         </nz-form-label>
                         <nz-form-control [nzSpan]="14">
-                            <nz-select name="secondLevelType" nzPlaceHolder="选择子分类" formControlName="inventoryTypeid">
+                            <nz-select nzAllowClear name="secondLevelType" nzPlaceHolder="选择子分类" formControlName="inventoryTypeid">
                                 <ng-container *ngFor="let item of typeList">
                                     <nz-option [nzLabel]="item.name" [nzValue]="item.id"></nz-option>
                                 </ng-container>

src/main/webapp/app/work/work-handle/work-handle.component.html

@@ -22,20 +22,20 @@
     <button (click)="showAddModal()" nz-button nzType="default"><i class="anticon anticon-plus-circle-o"></i>新增事件</button>
   </div>
   <div nz-col nzSpan="2">
-    <nz-select style="width: 100%;" [(ngModel)]="obj.type" nzPlaceHolder="事件分类">
+    <nz-select nzAllowClear style="width: 100%;" [(ngModel)]="obj.type" nzPlaceHolder="事件分类">
       <ng-container *ngFor="let item of eventTypeList">
         <nz-option [nzLabel]="item.name" [nzValue]="item.id"></nz-option>
       </ng-container>
     </nz-select>
   </div>
   <div nz-col nzSpan="2">
-    <nz-select style="width: 100%;"  [(ngModel)]="obj.status" nzPlaceHolder="事件状态">
+    <nz-select nzAllowClear style="width: 100%;"  [(ngModel)]="obj.status" nzPlaceHolder="事件状态">
         <nz-option nzLabel="待处理" nzValue="0"></nz-option>
         <nz-option nzLabel="已结束" nzValue="1"></nz-option>
     </nz-select>
   </div>
   <div nz-col nzSpan="3">
-    <nz-select style="width: 100%;" [(ngModel)]="obj.source" nzPlaceHolder="事件来源">
+    <nz-select nzAllowClear style="width: 100%;" [(ngModel)]="obj.source" nzPlaceHolder="事件来源">
         <nz-option nzLabel="系统警告" nzValue="0"></nz-option>
         <nz-option nzLabel="手动新增" nzValue="1"></nz-option>
     </nz-select>

src/main/webapp/content/javascript/jtopo/js/util.js

@@ -12,13 +12,12 @@ var SysUtil = {
         // 获取主机地址，如： http://localhost:8083
         var localhostPath = curWwwPath.substring(0, pos)
         // 获取带"/"的项目名，如：/uimcardprj
-        var projectName = pathName.substring(0, pathName.substr(1).indexOf('/') + 2)
+        var projectName = pathName.substring(0, pathName.substr(1).indexOf('/') + 2);
         return localhostPath;
     }
 }
 // url根路径
 var rootPath = SysUtil.getRootPath();
-// var topoImgPath = 'javascript/jtopo/img/';
 var topoImgPath =  rootPath +  '/file/icon/';
 
 /*