From 3b420358929ef3fc1fecb2756051e57c7a29c602 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Tue, 5 Mar 2024 22:59:09 +0800
Subject: [PATCH] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E6=95=B0=E6=8D=AEl?=
 =?UTF-8?q?oading=E5=8A=A0=E8=BD=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/styles/index.scss               | 13 +++++++++++++
 src/components/content/usedEle/UsedEle.vue |  2 +-
 src/views/device-manage/index.vue          |  5 +++--
 src/views/edit/edit.vue                    |  5 +++--
 src/views/login/index.vue                  | 17 +++++++++--------
 src/views/site/index.vue                   | 13 ++++++++++---
 src/views/tunnel-manage/index.vue          |  5 +++--
 src/views/tunnel/index.vue                 |  2 ++
 src/views/user/index.vue                   | 17 +++++++++++++----
 9 files changed, 57 insertions(+), 22 deletions(-)

diff --git a/src/assets/styles/index.scss b/src/assets/styles/index.scss
index f3d8322..3bc876d 100644
--- a/src/assets/styles/index.scss
+++ b/src/assets/styles/index.scss
@@ -18,6 +18,19 @@
 body {
   background-color: #f5f5f5;
 }
+.allLoading.el-loading-mask.is-fullscreen{
+  .el-loading-spinner{
+    .circular{
+      width: 75px;
+      height: 75px;
+    }
+    .el-loading-text{
+      font-size: 26px;
+      letter-spacing: 2px;
+    }
+  }
+}
+
 
 .el-container {
   height: 100%;
diff --git a/src/components/content/usedEle/UsedEle.vue b/src/components/content/usedEle/UsedEle.vue
index a853f9b..3aeda31 100644
--- a/src/components/content/usedEle/UsedEle.vue
+++ b/src/components/content/usedEle/UsedEle.vue
@@ -1,6 +1,6 @@
 <template>
   <div id="used-ele" :style="{ backgroundColor: bgImage }" @click="handleOpenChart">
-    <div v-if="electricityConsumptionMonthly===0||monthlySavings===0" class="showNull ">
+    <div v-if="electricityConsumptionMonthly===0&&monthlySavings===0" class="showNull ">
       <div class="loading" v-if="loading===0"></div>
       {{ loading === 0 ? '加载中...' : '暂无数据~' }}
     </div>
diff --git a/src/views/device-manage/index.vue b/src/views/device-manage/index.vue
index b5bbe3a..0c83fc3 100644
--- a/src/views/device-manage/index.vue
+++ b/src/views/device-manage/index.vue
@@ -364,12 +364,12 @@ const handleChangeMenu = (e) => {
 const getList = () => {
   const loading = ElLoading.service({
     lock: true,
-    text: '正在加载系统资源',
+    text: '正在加载系统资源...',
     background: 'rgba(0, 0, 0, 0.7)',
+    customClass:'allLoading'
   })
   getEquipmentList(tunnelId).then(res => {
     if (res.code === 1000) {
-      loading.close()
       fanData.value = res.data.frequencyChangerList
       res.data.windPressureSensorList.forEach(item => {
         item.offset = item.offset + 4000
@@ -390,6 +390,7 @@ const getList = () => {
         }
       })
     }
+    loading.close()
   })
 }
 const getTunnel = () => {
diff --git a/src/views/edit/edit.vue b/src/views/edit/edit.vue
index 97502e6..7cd828d 100644
--- a/src/views/edit/edit.vue
+++ b/src/views/edit/edit.vue
@@ -99,14 +99,15 @@ const form = ref({
 const getTunnel = () => {
   const loading = ElLoading.service({
     lock: true,
-    text: '正在加载系统资源',
+    text: '正在加载系统资源...',
     background: 'rgba(0, 0, 0, 0.7)',
+    customClass:'allLoading'
   })
   getTunnelDetail(tunnelId).then((res) => {
     if (res?.code === 1000) {
-      loading.close()
       form.value = res.data;
     }
+    loading.close()
   });
 };
 getTunnel();
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 804a9a2..93d5ade 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -76,10 +76,11 @@ const handleLogin = (instance) => {
     await authStore.userLogin(loginForm).then((res) => {
       if (res) {
         ElLoading.service({
-          text: "正在加载系统资源",
-          background: "#409eff",
           lock: true,
-        });
+          text: '登录中...',
+          background: 'rgba(0, 0, 0, 0.7)',
+          customClass:'allLoading'
+        })
         router.push("/");
       } else {
         getCode();
@@ -89,14 +90,14 @@ const handleLogin = (instance) => {
 };
 
 getCode();
-
 onBeforeUnmount(() => {
   ElLoading.service({
-    text: "正在加载系统资源",
-    background: "#409eff",
     lock: true,
-  }).close();
-});
+    text: '登录中...',
+    background: 'rgba(0, 0, 0, 0.7)',
+    customClass:'allLoading'
+  }).close()
+})
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/views/site/index.vue b/src/views/site/index.vue
index 0e223e8..32ab902 100644
--- a/src/views/site/index.vue
+++ b/src/views/site/index.vue
@@ -204,15 +204,15 @@ const handleGoHome = () => {
 const getList = () => {
   const loading = ElLoading.service({
     lock: true,
-    text: '正在加载系统资源',
+    text: '正在加载系统资源...',
     background: 'rgba(0, 0, 0, 0.7)',
+    customClass:'allLoading'
   })
   getSiteList({
     userId: userId,
     ...pageInfo
   }).then((res) => {
     if (res.code === 1000) {
-      loading.close()
       total.value = res.data.total;
       if (total.value == 0) {
 
@@ -230,8 +230,8 @@ const getList = () => {
       })
       siteList.value = res.data.rows;
     }
+    loading.close()
   });
-
 }
 getList()
 const handleClickSite = (type) => {
@@ -268,10 +268,17 @@ const restFrom = () => {
 const handleEdit = (item) => {
   title.value = '编辑站点'
   restFrom()
+  const loading = ElLoading.service({
+    lock: true,
+    text: '正在加载系统资源...',
+    background: 'rgba(0, 0, 0, 0.7)',
+    customClass:'allLoading'
+  })
   getSiteDetail(item.siteId).then((res) => {
     form.value = res.data;
     form.value = item;
     isVisited.value = true
+    loading.close()
   });
 }
 const handleUpload = (siteId) => {
diff --git a/src/views/tunnel-manage/index.vue b/src/views/tunnel-manage/index.vue
index 7ef84f2..a769617 100644
--- a/src/views/tunnel-manage/index.vue
+++ b/src/views/tunnel-manage/index.vue
@@ -325,15 +325,15 @@ getTunnel(siteId)
 const getList = () => {
   const loading = ElLoading.service({
     lock: true,
-    text: '正在加载系统资源',
+    text: '正在加载系统资源...',
     background: 'rgba(0, 0, 0, 0.7)',
+    customClass:'allLoading'
   })
   getTunnelList({
     siteId: siteId,
     ...pageInfo
   }).then(res => {
     if (res.code === 1000) {
-      loading.close()
       total.value = res.data.total
       tunnelList.value = res.data.rows
       showFirst.value = total.value / pageInfo.pageSize >= 1;
@@ -341,6 +341,7 @@ const getList = () => {
     } else {
       ElMessage.warning(res.msg)
     }
+    loading.close()
   })
 }
 getList()
diff --git a/src/views/tunnel/index.vue b/src/views/tunnel/index.vue
index efa1c85..b77e30c 100644
--- a/src/views/tunnel/index.vue
+++ b/src/views/tunnel/index.vue
@@ -521,8 +521,10 @@ const changeTunnel = (e) => {
   showBadLoading.value = 0
   showWindLoading.value = 0
   showFanLoading.value = 0
+  showUsedLoading.value = 0
   pageInfo.pageNum = 1
   getScreenInfo(newObj.value)
+  showFan.value = false
   nextTick(() => {
     showFan.value = true;
   });
diff --git a/src/views/user/index.vue b/src/views/user/index.vue
index c2dc94e..88bfae6 100644
--- a/src/views/user/index.vue
+++ b/src/views/user/index.vue
@@ -214,16 +214,24 @@ const handleAddUser = () => {
 }
 const handleEditUser = (row) => {
   reset()
+  const loading = ElLoading.service({
+    lock: true,
+    text: '正在加载系统资源...',
+    background: 'rgba(0, 0, 0, 0.7)',
+    customClass:'allLoading'
+  })
   getUserDetail(row.userId).then(res => {
     if (res.code === 1000) {
       getTunnel()
       form.value = res.data.user
       form.value.roleId = res.data.roleIds[0]
       form.value.tunnelList = res.data.user.tunnelList
+      title.value = '修改用户'
+      isVisited.value = true
     }
+    loading.close()
   })
-  title.value = '修改用户'
-  isVisited.value = true
+
 }
 
 const handleDelete = () => {
@@ -266,8 +274,9 @@ getRoleOptionInfo()
 const getInfo = () => {
   const loading = ElLoading.service({
     lock: true,
-    text: '正在加载系统资源',
+    text: '正在加载系统资源...',
     background: 'rgba(0, 0, 0, 0.7)',
+    customClass:'allLoading'
   })
   getUser({
     siteId: siteId,
@@ -275,11 +284,11 @@ const getInfo = () => {
     ...pageInfo
   }).then(res => {
     if (res.code === 1000) {
-      loading.close()
       userData.value = res.data.rows
       total.value = res.data.total
       showFirst.value = total.value / pageInfo.pageSize >= 1;
     }
+    loading.close()
   })
 }
 getInfo()