Merge branch 'master-500-dev' of http://192.168.1.136:82/monitor_v3/anji-plus-re…

…port into master-500-dev

@@ -14,7 +14,7 @@ service.interceptors.request.use(
     return config
     return config
   },
   },
   error => {
   error => {
-    // Do something with request error 
+    // Do something with request error
     Promise.reject(error)
     Promise.reject(error)
   }
   }
 )
 )

@@ -55,11 +55,17 @@ service.interceptors.response.use(
     }
     }
   },
   },
   error => {
   error => {
-    Message({
-      message: error.message,
-      type: 'error',
-      duration: 5 * 1000
-    })
+    //start lsq 超时用console输出信息 2022-03-14
+    if(error.code == 'ECONNABORTED' && error.message.indexOf('timeout')!=-1){
+     console.log(error.message)
+    }else{
+      Message({
+        message: error.message,
+        type: 'error',
+        duration: 5 * 1000
+      })
+    }
+    //end lsq 2022-03-14
     return Promise.reject(error)
     return Promise.reject(error)
   }
   }
 )
 )

@@ -55,11 +55,17 @@ service.interceptors.response.use(
     }
     }
   },
   },
   error => {
   error => {
-    Message({
-      message: error.message,
-      type: 'error',
-      duration: 5 * 1000
-    })
+    //start lsq 超时用console输出信息 2022-03-14
+    if(error.code == 'ECONNABORTED' && error.message.indexOf('timeout')!=-1){
+      console.log(error.message)
+    }else{
+      Message({
+        message: error.message,
+        type: 'error',
+        duration: 5 * 1000
+      })
+    }
+    //end lsq 2022-03-14
     return Promise.reject(error)
     return Promise.reject(error)
   }
   }
 )
 )

@@ -15,7 +15,7 @@
         </div>
         </div>
       </div>
       </div>
       <!--数据-->
       <!--数据-->
-      <div class="bd">
+      <div class="bd"    v-loading="loading">
           <ul class="infoList">
           <ul class="infoList">
             <li v-for="(item, index) in list" :key="index" :style="tableRowHeight()" >
             <li v-for="(item, index) in list" :key="index" :style="tableRowHeight()" >
               <div
               <div
@@ -67,6 +67,7 @@ export default {
   },
   },
   data() {
   data() {
     return {
     return {
+      loading:true,
       currentPage:1,
       currentPage:1,
       pageSize:10,
       pageSize:10,
       pageSizes:[10,50,100, 200, 300, 400],
       pageSizes:[10,50,100, 200, 300, 400],
@@ -198,6 +199,7 @@ export default {
     },
     },
     handlerStaticData(data) {
     handlerStaticData(data) {
       this.list = data;
       this.list = data;
+      this.loading=false;
     },
     },
     handlerDynamicData(data, refreshTime) {
     handlerDynamicData(data, refreshTime) {
       if (!data) return;
       if (!data) return;
@@ -214,6 +216,7 @@ export default {
       const data = this.queryEchartsData(val);
       const data = this.queryEchartsData(val);
       data.then(res => {
       data.then(res => {
         this.list = res;
         this.list = res;
+        this.loading=false;
         if(this.list && this.list.length>0){
         if(this.list && this.list.length>0){
           this.total=this.list[0].lineCount;
           this.total=this.list[0].lineCount;
         }
         }
@@ -268,6 +271,8 @@ export default {
     handleCurrentChange(val){
     handleCurrentChange(val){
       //props.currentPage = val;
       //props.currentPage = val;
       this.currentPage = val;
       this.currentPage = val;
+      console.log("aaaaaaaaaaaaaa",val)
+
       this.handleTableData();
       this.handleTableData();
     },
     },
     // 切换页码
     // 切换页码
@@ -287,6 +292,7 @@ export default {
     handleTableData(){
     handleTableData(){
       let optionsData=this.optionsData;
       let optionsData=this.optionsData;
       if(this.optionsData.dataType=="dynamicData" && this.optionsSetUp.isPage){
       if(this.optionsData.dataType=="dynamicData" && this.optionsSetUp.isPage){
+        this.loading=true;
         let limit=parseInt(this.optionsData.dynamicData.contextData.limit);
         let limit=parseInt(this.optionsData.dynamicData.contextData.limit);
         let page=parseInt(this.currentPage-1)*limit;
         let page=parseInt(this.currentPage-1)*limit;
         //改变参数值-月季度年，重新加载动态数据--待测
         //改变参数值-月季度年，重新加载动态数据--待测