Merge pull request 'fix : 不同浏览器匹配样式修改' (#297) from dengjie into dev

Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/297

src/assets/styles/index.scss

@@ -70,7 +70,7 @@ body,
     display: flex;
     z-index: 3;
     position: absolute;
-    top: 85px;
+    top: 66px;
     left: 30px;
 
     .btn-box {
@@ -117,7 +117,7 @@ body,
   .top-right {
     z-index: 2;
     position: absolute;
-    top: 50px;
+    top: 28px;
     right: 70px;
     font-size: 28px;
     color: #ffffff;

src/components/content/airInfo/AirInfo.vue

@@ -313,7 +313,7 @@ const initChart = (type, values) => {
 <style lang="scss" scoped>
 #air-info {
   //min-height: 350px;
-  margin-top: 40px;
+  margin-top: 30px;
   //position: absolute;
   z-index: 100;
   width: 824px;
@@ -334,7 +334,7 @@ const initChart = (type, values) => {
     color: #ffffff;
     align-items: center;
     padding: 5px 0 5px 15px;
-    margin-bottom: 25px;
+    margin-bottom: 15px;
     margin-left: 21px;
 
     > div:first-child {

src/components/content/airInfo/childComps/ItemInfo.vue

@@ -76,7 +76,7 @@ const setValue = () => {
   align-items: center;
   width: 790px;
   padding: 5px 14px;
-  margin-bottom: 25px;
+  margin-bottom: 15px;
   margin-left: 21px;
 
   &:hover {

src/components/content/badGasInfo/BadGasInfo.vue

@@ -386,7 +386,7 @@ const initChart = (type, values) => {
 
 <style lang="scss" scoped>
 #bad-gas-info {
-  margin-top: 40px;
+  margin-top: 30px;
   cursor: pointer;
   //position: absolute;
   width: 824px;

src/components/content/windPressure/WindPressureList.vue

@@ -266,7 +266,7 @@ const initChart = (type, values) => {
     color: #38cafb;
     line-height: 42px;
     margin-left: 50px;
-    margin-bottom: 38px;
+    margin-bottom: 6px;
   }
 }
 </style>

src/views/tunnel/index.vue

@@ -85,7 +85,7 @@
       </div>
     </el-dialog>
   </div>
-  <div class="digital-tunnel">
+  <div class="digital-tunnel" >
     <el-dialog :close-on-click-modal="false" v-model="isVisited" title="报警信息"
                width="2175px"
                :modal="false">
@@ -134,7 +134,7 @@
             </template>
           </el-table-column>
         </el-table>
-        <div class="pagination">
+        <div class="pagination" :style="{bottom: roleKey==='administrator'?'50px':''}">
           <el-pagination background v-model:current-page="pageInfo.pageNum" v-model:page-size="pageInfo.pageSize"
                          :total="total" prev-text="上一页" next-text="下一页" layout="prev, pager, next"
                          @current-change="handleCurrentChange" :hide-on-single-page="true"/>
@@ -183,6 +183,7 @@ const isDetailVisited = ref(false);
 const showFan = ref(false);
 const drawerLeft = ref(true);
 const showTunnelTitle = ref(true);
+// const loading = ref(false);
 const initialIndex = ref(0)
 const showFanLoading = ref(0)
 const showWindLoading = ref(0)
@@ -325,12 +326,14 @@ const handleChangeState = (row) => {
   });
 }
 const getAlarmList = () => {
+  // loading.value = true
   getAlarmInfo({
     tunnelId: tunnelId.value,
     lookupStatus: queryParams.lookupStatus,
     ...pageInfo
   }).then(res => {
     if (res.code === 1000) {
+      // loading.value = false
       alarmList.value = res.data.rows
       total.value = res.data.total
     }
@@ -616,7 +619,7 @@ const initWebSocket = () => {
 }
 
 .el-drawer__body {
-  padding: 180px 68px 0 68px;
+  padding: 160px 68px 0 68px;
   overflow: hidden;
 }
 
@@ -685,6 +688,20 @@ const initWebSocket = () => {
     margin: 820px auto 0 auto;
   }
 }
+:deep(.el-table__body-wrapper){
+  height: 90px;
+}
+:deep(.el-loading-mask) {
+  background-color: transparent;
+  .el-loading-spinner{
+    height: 60px;
+  }
+}
+
+:deep(.el-table__empty-block) {
+  font-size: 40px;
+  background-color: transparent;
+}
 
 .digital-tunnel {
   .detail {