From 6684657a09d8af38f0307a4a97c52ab1b022ec3b Mon Sep 17 00:00:00 2001
From: yyl <279235553@qq.com>
Date: Thu, 18 Jan 2024 16:43:45 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=96=87=E4=BB=B6=E4=B8=8B?=
 =?UTF-8?q?=E8=BD=BD=E9=81=AE=E7=BD=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/monthlyEquipment/index.vue                   | 6 ++++++
 .../maintenanceOperations/statisticalAnalysis/index.vue     | 5 +++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/components/monthlyEquipment/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/components/monthlyEquipment/index.vue
index a790e505..990a5a8d 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/components/monthlyEquipment/index.vue
+++ b/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,
             }
         ]
       }
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/index.vue
index aeae40f4..a8b7eded 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/index.vue
@@ -173,6 +173,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 +456,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 +473,7 @@ import * as echarts from "echarts";
           URL.revokeObjectURL(link.href) // 释放URL 对象
           document.body.removeChild(link)
           link = null
-
+          loadingInstance.close();
         })
       },
       queryChartList(){