Merge branch 'develop' of http://39.106.31.193:9211/mengff/jihe-hs into develop

ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/components/monthlyEquipment/index.vue

@@ -141,6 +141,12 @@
                 color:"#FFCE85",
                 top:430,
                 left:620,
+            },{
+                num:60,
+                text:"智能设备箱" ,
+                color:"#FFCE85",
+                top:430,
+                left:920,
             }
         ]
       }

ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/index.vue

@@ -6,14 +6,12 @@
               <div class="topTabs" >
                  <div class="item" v-for=" item in equipments" >
                    <div class="title-tool" >
-                     <span class="text" >设备数</span>
+                     <span class="text" >{{ item.text }}</span>
-                     <div class="num" >{{ item.num }}</div>
-                     <span class="unit">套</span>
                    </div>
                    <div class="item-body" >
                       <div class="left-body" >
                         <img src="./assets/shexiangtou.png"  />
-                        <span>{{ item.text }}</span>
+                        <span class="num" >{{ item.num }} <span class="unit">套</span></span>
                       </div>
                       <div class="line" ></div>
                       <div class="right-list" >
@@ -173,6 +171,7 @@ import * as echarts from "echarts";
   import Pagination from '@screen/components/Pagination.vue';
   import InputSearch from '@screen/components/InputSearch/index.vue';
   import {  searchFormList } from "./data";
+  import { Loading } from 'element-ui';
 
   export default {
     name: 'publicService',
@@ -455,7 +454,7 @@ import * as echarts from "echarts";
       },
       //导出
       SystemStatusExport(){
-   
+          let loadingInstance = Loading.service({fullscreen:true,background:"#00000052",text:"文件正在下载..."});
         getSystemStatusExport({
           startTime:this.startTime,
           time:this.time,
@@ -472,7 +471,7 @@ import * as echarts from "echarts";
           URL.revokeObjectURL(link.href) // 释放URL 对象
           document.body.removeChild(link)
           link = null
-
+          loadingInstance.close();
         })
       },
       queryChartList(){
@@ -567,6 +566,7 @@ import * as echarts from "echarts";
   
   <style lang='scss' scoped>
 
+
   .bottomTabs {
     position: relative;
     display: inline-flex;
@@ -586,6 +586,8 @@ import * as echarts from "echarts";
     }
   }
 
+
+
   .topTabs {
     display: inline-flex;
     width: 100%;
@@ -632,14 +634,26 @@ import * as echarts from "echarts";
           align-items: center;
           margin:0 10px;
 
-          > span {
+          .num {
-             display: inline-flex;
+          display: inline-flex;
-             margin-top:10px;
+          font-size: 19px;
-             font-size: 14px;
+          font-family: PangMenZhengDao, PangMenZhengDao;
-            font-family: PingFang SC, PingFang SC;
+          font-weight: 400;
-            font-weight: 400;
+          color: #00D1FF;
-            color: #FFFFFFcc;
+          margin:0 10px;
-          }
+          margin-top:20px;
+        }
+
+
+        .unit {
+          font-size: 12px;
+          font-family: PingFang SC, PingFang SC;
+          font-weight: 500;
+          color: #FFFFFFF0;
+          position: relative;
+          top:5px;
+          left:5px;
+        }  
 
         }
 
@@ -666,7 +680,7 @@ import * as echarts from "echarts";
             position: relative;
             width:100%;
             height:40px;
-            font-size: 14px;
+            font-size: 12px;
             font-family: PingFang SC, PingFang SC;
             font-weight: 400;
             color: #FFFFFF;
@@ -675,21 +689,21 @@ import * as echarts from "echarts";
 
             .show-text1 {
                color:#00EBC1ee;
-               font-size: 16px;
+               font-size: 14px;
               font-family: PangMenZhengDao, PangMenZhengDao;
               font-weight: 800;
             }
 
             .show-text2 {
                color:#FFFFFFee;
-               font-size: 16px;
+               font-size: 14px;
               font-family: PangMenZhengDao, PangMenZhengDao;
               font-weight: 800;               
             }
 
             .show-text3 {
                color:#FFD15Cee;
-               font-size: 16px;
+               font-size: 14px;
               font-family: PangMenZhengDao, PangMenZhengDao;
               font-weight: 800;              
             }
@@ -717,20 +731,9 @@ import * as echarts from "echarts";
           color: #FFFFFF;
         }
 
-        .num {
-          font-size: 19px;
-          font-family: PangMenZhengDao, PangMenZhengDao;
-          font-weight: 400;
-          color: #00D1FF;
-          margin:0 10px;
-        }
 
-        .unit {
+
-          font-size: 11px;
+      
-          font-family: PingFang SC, PingFang SC;
-          font-weight: 500;
-          color: #FFFFFF50;
-        }
 
 
       }

ruoyi-ui/src/views/JiHeExpressway/scss/el-reset.scss

@@ -296,7 +296,6 @@ body {
   div.el-input {
     input.el-input__inner {
       border: 0;
-      height: 100%;
       min-height: fit-content;
       line-height: unset;
       font-size: 12px;