bug update

src/main/webapp/app/alarm/alarm-set/alarm-set.component.html

@@ -43,7 +43,7 @@
           (nzPageIndexChange)="change($event)">
   <thead>
   <tr>
-    <th>名称</th>
+    <th nzWidth="20%">名称</th>
     <th>状态</th>
     <th>发送方式</th>
     <th nzWidth="15%">发送对象</th>

src/main/webapp/app/alarm/send-set/send-set.component.html

@@ -24,7 +24,7 @@
 <nz-table #nzTable [nzData]="sendList" [nzLoading]="isLoading">
   <thead>
   <tr>
-    <th nzShowSort>名称</th>
+    <th nzShowSort nzWidth="20%">名称</th>
     <th>类型</th>
     <th>用于告警推送</th>
     <th>状态</th>

src/main/webapp/app/business/b-config/b-config.component.html

@@ -114,7 +114,7 @@
               (nzPageIndexChange)="change($event)">
         <thead>
         <tr>
-            <th>名称</th>
+            <th nzWidth="20%">名称</th>
             <th>状态</th>
             <th>关联网站</th>
             <th>操作</th>

src/main/webapp/app/early-warning/role-warning/role-warning.component.html

@@ -43,7 +43,7 @@
           [nzPageIndex]="page.pageNum" [nzPageSize]="page.pageCount" (nzPageIndexChange)="change($event)">
     <thead>
     <tr>
-        <th>规则名称</th>
+        <th nzWidth="20%">规则名称</th>
         <th>预警类别</th>
         <th>预警级别</th>
         <th>预警内容</th>

src/main/webapp/app/modal/alarm-modal/alarm-modal.component.ts

@@ -373,19 +373,18 @@ export class AlarmModalComponent implements OnInit {
             this.message.error('请输入告警名称');
             return false;
         }
-        if (this.sendInfoList.length == 0) {
-            this.message.error('请选择发送对象');
-            return false;
-        }
         if (this.title != '添加告警推送' && this.selectTreeList.length == 0) {
             this.message.error('请选择告警目标');
             return false;
         }
-
         if (!this.validateForm.alertGroupId) {
             this.message.error('请选择告警分组');
             return false;
         }
+        if (this.sendInfoList.length == 0) {
+            this.message.error('请选择发送对象');
+            return false;
+        }
 
         if (!this.validateForm.def_longdata) {
             this.message.error('请输入发送信息');

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

@@ -103,7 +103,7 @@
     <thead>
     <tr>
         <th [nzChecked]="allChecked"></th>
-        <th>名称</th>
+        <th nzWidth="20%">名称</th>
         <th>状态</th>
         <th>关联资产</th>
         <th>设备类型</th>
@@ -200,9 +200,7 @@
                     <ul nz-menu nzSelectable>
                         <li (click)="showTempStop(item)" nz-menu-item><a>临时暂停</a></li>
                         <li (click)="openHost(item)" nz-menu-item><a>
-                            <ng-container *ngIf="item.status == 1">开启</ng-container>
-                            <ng-container *ngIf="item.status == 0">停止</ng-container>
-                            监控
+                            <ng-container *ngIf="item.status == 1">开启</ng-container><ng-container *ngIf="item.status == 0">停止</ng-container>监控
                         </a></li>
                         <li nz-menu-item (click)="goDetail(item)"><a>查看监测点</a></li>
                         <li (click)="showAlarm()" nz-menu-item><a>添加告警</a></li>

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

@@ -470,9 +470,10 @@ export class BasicComponent implements OnInit {
 
     //开启or停止监控
     openHost(item) {
+        let opr = item.status == 1 ? '开启' : '停止';
         this.modalService.confirm({
             nzTitle: '监控',
-            nzContent: '确定开启监控设备' + item.name + '？',
+            nzContent: `确定${opr}监控设备${item.name}`,
             nzOkText: '确定',
             nzCancelText: '取消',
             nzOnOk: () => {

src/main/webapp/app/project-manager/modal/cost-modal/cost-modal.component.ts

@@ -28,7 +28,7 @@ export class CostModalComponent implements OnInit {
     isVisiable = false;
     isDisabled = false;
 
-    obj =　<any> {
+    obj = <any>{
         projectName: '',
         projectId: '',
         people: '',
@@ -60,6 +60,7 @@ export class CostModalComponent implements OnInit {
             projectName: null,
             projectId: null,
             total: 0,
+            people: this.$localStorage.retrieve('userInfo').userName,
             purchasenum: 0,
             purchasemoney: 0,
             outsourcingnum: 0,
@@ -69,6 +70,7 @@ export class CostModalComponent implements OnInit {
             costdescribe: '',
             time: null
         };
+        console.log(this.obj);
     }
 
     showAddModal() {

src/main/webapp/app/project-manager/opr-company/opr-company.component.html

@@ -44,7 +44,7 @@
           [nzPageIndex]="page.pageNum" [nzPageSize]="page.pageCount" (nzPageIndexChange)="change($event)">
   <thead>
   <tr>
-    <th>维护公司名称</th>
+    <th nzWidth="20%">维护公司名称</th>
     <th>运维负责人</th>
     <th>工作类型</th>
     <th>当前项目</th>

src/main/webapp/app/project-manager/opr-cost/opr-cost.component.html

@@ -65,7 +65,7 @@
           [nzPageIndex]="page.pageNum" [nzPageSize]="page.pageCount" (nzPageIndexChange)="change($event)">
     <thead>
     <tr>
-        <th>维护项目</th>
+        <th nzWidth="10%">维护项目</th>
         <th>填报时间</th>
         <th>填报人</th>
         <th>费用说明</th>

src/main/webapp/app/project-manager/opr-project/opr-project.component.html

@@ -62,7 +62,7 @@
     <thead>
     <tr>
         <th>项目单位</th>
-        <th>项目名称</th>
+        <th nzWidth="10%">项目名称</th>
         <th>项目负责人</th>
         <th>项目年度</th>
         <th>项目状态</th>

src/main/webapp/app/project-manager/opr-team/opr-team.component.html

@@ -44,7 +44,7 @@
           [nzPageIndex]="page.pageNum" [nzPageSize]="page.pageCount" (nzPageIndexChange)="change($event)">
     <thead>
     <tr>
-        <th>团队名称</th>
+        <th nzWidth="20%">团队名称</th>
         <th>团队类型</th>
         <th>所在公司</th>
         <th>关联项目</th>

src/main/webapp/app/system-change/change-params/change-params.component.html

@@ -6,10 +6,10 @@
                 首页
             </nz-breadcrumb-item>
             <nz-breadcrumb-item>
-                <a>运维工作</a>
+                <a>系统变更</a>
             </nz-breadcrumb-item>
             <nz-breadcrumb-item>
-                参数配置
+               变更参数配置
             </nz-breadcrumb-item>
         </nz-breadcrumb>
     </div>
@@ -21,19 +21,6 @@
 <div class="content-params">
     <div nz-row>
         <div nz-col class="text-right" nzSpan="3">
-            事件编号前缀
-        </div>
-        <div nz-col nzSpan="1"></div>
-        <div nz-col nzSpan="16">
-            <input class="padding-left-10" style="width: 50%" nz-input placeholder="事件编号前缀" disabled="{{isDisabled}}"
-                   [(ngModel)]="eventPre.eventNoPre">
-            <button *ngIf="isDisabled" (click)="editType()" nz-button nzType="default">编辑</button>
-            <button *ngIf="!isDisabled" (click)="saveType()" nz-button nzType="default">保存</button>
-        </div>
-    </div>
-
-    <div nz-row>
-        <div nz-col class="text-right" nzSpan="3">
             变更类型
         </div>
         <div nz-col nzSpan="1"></div>

src/main/webapp/app/work/asset-part/asset-part.component.html

@@ -47,7 +47,7 @@
           [nzLoading]="isLoading">
     <thead>
     <tr>
-        <th>子分类</th>
+        <th nzWidth="20%">子分类</th>
         <th>资产总数</th>
         <th>库存</th>
         <th>使用中</th>

src/main/webapp/app/work/asset-part/child-assets/child-assets.component.html

@@ -66,7 +66,7 @@
         <th nzShowCheckbox [nzIndeterminate]="indeterminate" [nzChecked]="allChecked"
             (nzCheckedChange)="checkAll($event)"></th>
         <th>资产编号</th>
-        <th>资产名称</th>
+        <th nzWidth="20%">资产名称</th>
         <th>资产总数</th>
         <th>库存</th>
         <th>使用</th>

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

@@ -66,7 +66,7 @@
 <nz-table #nzTable [nzData]="page.list" [nzLoading]="page.isLoading">
     <thead>
     <tr>
-        <th>计划名称</th>
+        <th nzWidth="20%">计划名称</th>
         <th>计划类型</th>
         <th>计划负责人</th>
         <th>开始日期</th>

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

@@ -48,7 +48,7 @@
 <nz-table #nzTable [nzData]="planList" [nzLoading]="isLoading">
     <thead>
     <tr>
-        <th>计划名称</th>
+        <th nzWidth="20%">计划名称</th>
         <th>计划类型</th>
         <th>计划负责人</th>
         <th>循环周期</th>

src/main/webapp/app/work/spare-parts-management/spare-parts-management.component.html

@@ -45,7 +45,7 @@
     <thead>
     <tr>
         <th>编号</th>
-        <th>名称</th>
+        <th nzWidth="10%">名称</th>
         <th>品牌</th>
         <th>型号</th>
         <th>序列号</th>

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

@@ -63,7 +63,7 @@
   <thead>
   <tr>
     <th>事件编号</th>
-    <th>标题</th>
+    <th nzWidth="20%">标题</th>
     <th>时间</th>
     <th>事件来源</th>
     <th>事件分类</th>