monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by xwx
Commit 64cd87b08b8143def60d1eab48189b88a16eb145 2 parents 7a8a9d2e 7efad4c4

Merge branch 'master' of http://113.200.75.45:82/monitor_v3/hg-monitor-web into master-v32-xwx

Inline Side-by-side
Showing 4 changed files with 6 additions and 3 deletions
@@ -159,7 +159,7 @@ li{ @@ -159,7 +159,7 @@ li{
159 159
160 160
161 .info-text{ 161 .info-text{
162 - height:50px; 162 + height:40px;
163 font-weight: bolder; 163 font-weight: bolder;
164 font-size: 20px; 164 font-size: 20px;
165 color:#fff 165 color:#fff
@@ -250,7 +250,7 @@ li{ @@ -250,7 +250,7 @@ li{
250 250
251 251
252 .info-text{ 252 .info-text{
253 - height:50px; 253 + height:40px;
254 font-weight: bolder; 254 font-weight: bolder;
255 font-size: 20px; 255 font-size: 20px;
256 color:#fff; 256 color:#fff;
@@ -110,4 +110,7 @@ @@ -110,4 +110,7 @@
110 } 110 }
111 .dataCenter-container .el-dialog__body{ 111 .dataCenter-container .el-dialog__body{
112 min-height: 700px; 112 min-height: 700px;
  113 +}
  114 +.dataCenter-container .alarm-dialog .el-dialog__body{
  115 + min-height: 500px;
113 } 116 }
@@ -300,7 +300,7 @@ export default { @@ -300,7 +300,7 @@ export default {
300 let params={ 300 let params={
301 page:currentPage.value, 301 page:currentPage.value,
302 limit:pageSize.value, 302 limit:pageSize.value,
303 - resId:resId 303 + resId:proxy.deviceDataInfo.resId
304 } 304 }
305 proxy.$http.get(`/api-web/home/alarm/alarmListPage`, params, function (res) { 305 proxy.$http.get(`/api-web/home/alarm/alarmListPage`, params, function (res) {
306 if (res && res.success == true && res.data) { 306 if (res && res.success == true && res.data) {