-电能质量定时器 loading flag优化调试

src/views/powerQuality/asseReport/loopReport.vue

@@ -877,9 +877,7 @@ export default defineComponent({
           type: 1,
         })
         .then((requset) => {
-           setTimeout(()=>{
-          loading.value=false
-        },10)
+           loading.value=false
           if (requset.status === 'SUCCESS') {
             // console.log('requset.data.uaStatus')
             // console.log(requset.data.uaStatus)

src/views/powerQuality/asseReport/scoreReport.vue

@@ -303,6 +303,7 @@ import descripDialog from './scoreReportComponent/descripDialog'
 import * as api from '@/api/powerQuality/scoreReport.js'
 import { ElMessage } from 'element-plus'
 import { parseTime } from '@/utils'
+import { ElNotification } from 'element-plus'
 
 export default defineComponent({
   name: 'ScoreReport',
@@ -322,6 +323,7 @@ export default defineComponent({
     const dateType = ref('date')
     const dateTime = ref(new Date())
     const deviceCode=ref('')
+    const flag=ref(false)
     const getData = ref([
       {
         loop: '',
@@ -353,7 +355,20 @@ export default defineComponent({
     }
     //主页面数据请求
     function evaluationReport() {
-       loading.value=true
+
+       
+       
+       if(!store.state.siteId){
+         loading.value=false
+          ElNotification({
+          title: '提示',
+          message: '请选择站点',
+          type: 'warning',
+        })
+        return
+       }
+       loading.value=true;
+      
       let list = {}
 
       if (listTabPosition.value == 'dayValue') {
@@ -377,18 +392,20 @@ export default defineComponent({
         }
       }
 
+      
+
       api.evaluationReport(list).then((requset) => {
-        setTimeout(()=>{
-          loading.value=false
-        },10)
+        loading.value=false
         if (requset.status === 'SUCCESS') {
           
           if(requset.data[0]){
             getData.value[0] = requset.data[0]
             deviceCode.value= requset.data[0].deviceCode
+            flag.value=true
      
           }else{
               ElMessage.warning('暂无数据')
+               flag.value=false
           }
         } else {
           ElMessage.error(requset.msg)
@@ -579,6 +596,9 @@ export default defineComponent({
 
     // 点击表格弹框图表
     function oneClick(params) {
+      if(!flag.value){
+        return
+      }
       dialogTitle.value = params
       showDialog.value = true
       rtRealScore(params)
@@ -618,6 +638,7 @@ export default defineComponent({
       listTabsChange,
       dateType,
       dateTime,
+      flag,
       tableData: [
         {
           huilv: '/HZ183',

src/views/powerQuality/harmonicReport/index.vue

@@ -190,7 +190,7 @@ export default defineComponent({
     }
 
     function listSelect() {
-       loading.value=true
+      
       let list = {}
 
       if (listTabPosition.value == 'dayValue') {
@@ -209,6 +209,7 @@ export default defineComponent({
         }
       }
       if(!deviceCode.value){
+         loading.value=false
           ElNotification({
           title: '提示',
           message: '请选择左侧设备信息',
@@ -216,10 +217,9 @@ export default defineComponent({
         })
 
       }else{
+         loading.value=true
         api.rtRealScore(list).then((requset) => {
-         setTimeout(()=>{
-          loading.value=false
-        },10)
+         loading.value=false
         if (requset.status === 'SUCCESS') {
           
           tableList.value = requset.data

src/views/powerQuality/realTimeMonitoring/loopMonitor.vue

@@ -225,6 +225,8 @@ import descripDialog from './loopMonitorComponent/descripDialog'
 
 import * as api from '@/api/powerQuality/loopMonitor.js'
 import { ElMessage } from 'element-plus'
+import { ElNotification } from 'element-plus'
+
 
 export default defineComponent({
   name: 'LoopMonitor',
@@ -268,11 +270,18 @@ export default defineComponent({
 
     //数据请求
     function realScoreOne() {
+      if(!deviceCode.value){
+        
+          ElNotification({
+          title: '提示',
+          message: '请选择左侧设备信息',
+          type: 'warning',
+        })
+        return
+      }
        loading.value=true
       api.realScoreOne({ deviceCode: deviceCode.value }).then((requset) => {
-        setTimeout(()=>{
-          loading.value=false
-        },10)
+        loading.value=false
         if (requset.status === 'SUCCESS') {
           getData.value = requset.data
         } else {

src/views/powerQuality/realTimeMonitoring/realScore.vue

@@ -274,6 +274,7 @@ import { defineComponent, onMounted, ref,watch } from 'vue'
 import * as api from '@/api/powerQuality/realScore.js'
 import { ElMessage } from 'element-plus'
 import { parseTime } from '@/utils'
+import { ElNotification } from 'element-plus'
 
 export default defineComponent({
   name: 'RealScore',
@@ -351,11 +352,19 @@ export default defineComponent({
 
     //主页面数据请求
     function realScore() {
+
+      if(!deviceCode.value){
+        
+          ElNotification({
+          title: '提示',
+          message: '请选择左侧设备信息',
+          type: 'warning',
+        })
+        return
+      }
        loading.value=true
       api.realScore({ deviceCode: deviceCode.value }).then((requset) => {
-         setTimeout(()=>{
-          loading.value=false
-        },10)
+        loading.value=false
         
         if (requset.status === 'SUCCESS') {
           getData.value[0] = requset.data

src/views/powerQuality/unbalanceAnalysis/index.vue

@@ -170,13 +170,14 @@ export default defineComponent({
             deviceCode.value = requset.data[0]?requset.data[0].deviceCode:''
 
           } else {
+            
             ElMessage.error(requset.msg)
           }
         })
     }
 
     function rtRealScore() {
-       loading.value=true
+      
         console.log('dateTime.value')
        console.log(dateTime.value)
       if (!dateTime.value) {
@@ -185,9 +186,18 @@ export default defineComponent({
           message: '请选择开始和结束时间',
           type: 'warning',
         })
-        loading.value=false
+         return
+      }
+      if(!deviceCode.value){
+        
+          ElNotification({
+          title: '提示',
+          message: '请选择左侧设备信息',
+          type: 'warning',
+        })
         return
       }
+       loading.value=true
       store.commit('TimeAll_function', dateTime.value)
       const time = store.state.Time_Data
       api
@@ -197,9 +207,7 @@ export default defineComponent({
           endTime: time[1],
         })
         .then((requset) => {
-          setTimeout(()=>{
           loading.value=false
-        },10)
           if (requset.status === 'SUCCESS') {
             echartsData.value = requset.data
 
@@ -207,7 +215,6 @@ export default defineComponent({
                ElMessage.warning('暂无数据') 
                return
             }
-      
           } else {
             ElMessage.error(requset.msg)
           }