Commit 669c6e1e authored by xch666's avatar xch666

修改bug

parent c6919bbb
...@@ -6726,8 +6726,7 @@ ...@@ -6726,8 +6726,7 @@
"ansi-regex": { "ansi-regex": {
"version": "2.1.1", "version": "2.1.1",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"aproba": { "aproba": {
"version": "1.2.0", "version": "1.2.0",
...@@ -6748,14 +6747,12 @@ ...@@ -6748,14 +6747,12 @@
"balanced-match": { "balanced-match": {
"version": "1.0.0", "version": "1.0.0",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"brace-expansion": { "brace-expansion": {
"version": "1.1.11", "version": "1.1.11",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"balanced-match": "^1.0.0", "balanced-match": "^1.0.0",
"concat-map": "0.0.1" "concat-map": "0.0.1"
...@@ -6770,20 +6767,17 @@ ...@@ -6770,20 +6767,17 @@
"code-point-at": { "code-point-at": {
"version": "1.1.0", "version": "1.1.0",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"concat-map": { "concat-map": {
"version": "0.0.1", "version": "0.0.1",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"console-control-strings": { "console-control-strings": {
"version": "1.1.0", "version": "1.1.0",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"core-util-is": { "core-util-is": {
"version": "1.0.2", "version": "1.0.2",
...@@ -6900,8 +6894,7 @@ ...@@ -6900,8 +6894,7 @@
"inherits": { "inherits": {
"version": "2.0.3", "version": "2.0.3",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"ini": { "ini": {
"version": "1.3.5", "version": "1.3.5",
...@@ -6913,7 +6906,6 @@ ...@@ -6913,7 +6906,6 @@
"version": "1.0.0", "version": "1.0.0",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"number-is-nan": "^1.0.0" "number-is-nan": "^1.0.0"
} }
...@@ -6928,7 +6920,6 @@ ...@@ -6928,7 +6920,6 @@
"version": "3.0.4", "version": "3.0.4",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"brace-expansion": "^1.1.7" "brace-expansion": "^1.1.7"
} }
...@@ -6936,14 +6927,12 @@ ...@@ -6936,14 +6927,12 @@
"minimist": { "minimist": {
"version": "0.0.8", "version": "0.0.8",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"minipass": { "minipass": {
"version": "2.2.4", "version": "2.2.4",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"safe-buffer": "^5.1.1", "safe-buffer": "^5.1.1",
"yallist": "^3.0.0" "yallist": "^3.0.0"
...@@ -6962,7 +6951,6 @@ ...@@ -6962,7 +6951,6 @@
"version": "0.5.1", "version": "0.5.1",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"minimist": "0.0.8" "minimist": "0.0.8"
} }
...@@ -7043,8 +7031,7 @@ ...@@ -7043,8 +7031,7 @@
"number-is-nan": { "number-is-nan": {
"version": "1.0.1", "version": "1.0.1",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"object-assign": { "object-assign": {
"version": "4.1.1", "version": "4.1.1",
...@@ -7056,7 +7043,6 @@ ...@@ -7056,7 +7043,6 @@
"version": "1.4.0", "version": "1.4.0",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"wrappy": "1" "wrappy": "1"
} }
...@@ -7142,8 +7128,7 @@ ...@@ -7142,8 +7128,7 @@
"safe-buffer": { "safe-buffer": {
"version": "5.1.1", "version": "5.1.1",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"safer-buffer": { "safer-buffer": {
"version": "2.1.2", "version": "2.1.2",
...@@ -7179,7 +7164,6 @@ ...@@ -7179,7 +7164,6 @@
"version": "1.0.2", "version": "1.0.2",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"code-point-at": "^1.0.0", "code-point-at": "^1.0.0",
"is-fullwidth-code-point": "^1.0.0", "is-fullwidth-code-point": "^1.0.0",
...@@ -7199,7 +7183,6 @@ ...@@ -7199,7 +7183,6 @@
"version": "3.0.1", "version": "3.0.1",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"ansi-regex": "^2.0.0" "ansi-regex": "^2.0.0"
} }
...@@ -7243,14 +7226,12 @@ ...@@ -7243,14 +7226,12 @@
"wrappy": { "wrappy": {
"version": "1.0.2", "version": "1.0.2",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"yallist": { "yallist": {
"version": "3.0.2", "version": "3.0.2",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
} }
} }
}, },
...@@ -9917,15 +9898,13 @@ ...@@ -9917,15 +9898,13 @@
"version": "1.36.0", "version": "1.36.0",
"resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.36.0.tgz", "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.36.0.tgz",
"integrity": "sha512-L+xvyD9MkoYMXb1jAmzI/lWYAxAMCPvIBSWur0PZ5nOf5euahRLVqH//FKW9mWp2lkqUgYiXPgkzfMUFi4zVDw==", "integrity": "sha512-L+xvyD9MkoYMXb1jAmzI/lWYAxAMCPvIBSWur0PZ5nOf5euahRLVqH//FKW9mWp2lkqUgYiXPgkzfMUFi4zVDw==",
"dev": true, "dev": true
"optional": true
}, },
"mime-types": { "mime-types": {
"version": "2.1.20", "version": "2.1.20",
"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.20.tgz", "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.20.tgz",
"integrity": "sha512-HrkrPaP9vGuWbLK1B1FfgAkbqNjIuy4eHlIYnFi7kamZyLLrGlo2mpcx0bBmNpKqBtYtAfGbodDddIgddSJC2A==", "integrity": "sha512-HrkrPaP9vGuWbLK1B1FfgAkbqNjIuy4eHlIYnFi7kamZyLLrGlo2mpcx0bBmNpKqBtYtAfGbodDddIgddSJC2A==",
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"mime-db": "~1.36.0" "mime-db": "~1.36.0"
} }
...@@ -19343,6 +19322,11 @@ ...@@ -19343,6 +19322,11 @@
} }
} }
}, },
"yarn": {
"version": "1.21.1",
"resolved": "https://registry.npm.taobao.org/yarn/download/yarn-1.21.1.tgz",
"integrity": "sha1-HV2gGpoDSS3EpZV778H9EtqD2Jw="
},
"yauzl": { "yauzl": {
"version": "2.4.1", "version": "2.4.1",
"resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.4.1.tgz", "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.4.1.tgz",
......
...@@ -38,6 +38,7 @@ ...@@ -38,6 +38,7 @@
"swagger-ui": "2.2.10", "swagger-ui": "2.2.10",
"tether": "1.4.0", "tether": "1.4.0",
"web-animations-js": "^2.3.1", "web-animations-js": "^2.3.1",
"yarn": "^1.21.1",
"zone.js": "0.8.19" "zone.js": "0.8.19"
}, },
"devDependencies": { "devDependencies": {
......
...@@ -106,7 +106,7 @@ ...@@ -106,7 +106,7 @@
(click)="operationHost(item,'1','关闭')">停止监控</span></ng-container> (click)="operationHost(item,'1','关闭')">停止监控</span></ng-container>
</a></li> </a></li>
<li (click)="showTempStop(item)" nz-menu-item> <li (click)="showTempStop(item)" nz-menu-item>
<a><span *ngIf="item.monitorTask">取消</span>临时暂停</a> <a *ngIf="!item.monitorTask">临时暂停</a>
</li> </li>
<li (click)="showAlarm(item)" nz-menu-item><a>添加告警</a></li> <li (click)="showAlarm(item)" nz-menu-item><a>添加告警</a></li>
</ul> </ul>
......
...@@ -101,6 +101,20 @@ ...@@ -101,6 +101,20 @@
</div> </div>
</div> </div>
<div nz-row> <div nz-row>
<div nz-col nzSpan="4">关联费用</div>
<div nz-col nzSpan="1"></div>
<div nz-col nzSpan="19">
</div>
</div>
<div nz-row>
<div nz-col nzSpan="4">违规通报</div>
<div nz-col nzSpan="1"></div>
<div nz-col nzSpan="19">
</div>
</div>
<div nz-row>
<div nz-col nzSpan="4">处理情况</div> <div nz-col nzSpan="4">处理情况</div>
<div nz-col nzSpan="1"></div> <div nz-col nzSpan="1"></div>
<div nz-col nzSpan="19"> <div nz-col nzSpan="19">
......
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