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

XuHaoJie
Commit c58fa0e1d083b59cc9991b93fe6cd4fa2b844188 2 parents 87d3716a 64ff70dc
Showing 2 changed files with 2 additions and 2 deletions
hg-monitor-web-zj/src/main/resources/static/vue3/public/css/machineroom.css
hg-monitor-web-zj/src/main/resources/static/vue3/src/views/commonComponents/huzhouOne/index.html
--- a/hg-monitor-web-zj/src/main/resources/static/vue3/public/css/machineroom.css
View file @c58fa0e
+++ b/hg-monitor-web-zj/src/main/resources/static/vue3/public/css/machineroom.css
View file @c58fa0e
@@ -24,7 +24,7 @@ body
     padding-top: 30px;
     border: 2px solid #0a93be;
     width: 900px;
-     height: 600px;
+     min-height: 666px;
     margin: 0 auto;
     font-size: 16px;
     border-radius: 5px;
--- a/hg-monitor-web-zj/src/main/resources/static/vue3/src/views/commonComponents/huzhouOne/index.html
View file @c58fa0e
+++ b/hg-monitor-web-zj/src/main/resources/static/vue3/src/views/commonComponents/huzhouOne/index.html
View file @c58fa0e
- <div v-if="!isDetailShow" class="outlinediv" style="height: 666px">
+ <div v-if="!isDetailShow" class="outlinediv" >
     <!--    <span>湖州灾备一机房平面图</span>-->
     <div class="huzhouone-topcabinet">
         <table>