Parcourir la source

fix:请求参数默认5分钟的时间戳修改

liujing il y a 11 mois
Parent
commit
275ceb3693

+ 14 - 0
src/utils/getCurrentTime.js

@@ -0,0 +1,14 @@
+import moment from 'moment'
+export function getCurrentStarEndTime(){
+    // 获取当前时间戳(秒数)
+    let date ={
+        start_time:0,
+        end_time:0
+    }
+    date.end_time =  moment().unix();
+    // 获取当前时间减去5分钟的时间戳
+    date.start_time = moment().subtract(5, 'minutes').unix();
+
+    return date
+
+}

+ 1 - 3
src/views/apps/components/Service.vue

@@ -129,10 +129,8 @@
 </template>
 
 <script>
-import { listUrlMapping, addUrlMapping, getUrlMapping, updateUrlMapping, delUrlMapping, favor,getUrlMappingRange,favorList } from '@/api/mapping'
-import { formatJson } from '@/utils'
+import { getUrlMappingRange,favorList } from '@/api/mapping'
 import storage from '@/utils/storage'
-import bus from '@/utils/bus'
 
 import moment from 'moment'
 import { getToken } from '@/utils/auth'

+ 1 - 1
src/views/dashboard/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <BasicLayout style="padding;24px">
+    <BasicLayout style="padding:24px">
       <template #wrapper>
         <div style="margin-top:10px;padding:14px;">
         <!-- <el-card class="box-card" style="margin-top:10px"> -->

+ 13 - 12
src/views/service/Interface/components/InterfaceMap.vue

@@ -364,7 +364,7 @@ import { getToken } from '@/utils/auth'
 // import echarts from 'echarts'
 import resize from './mixins/resize'
 import moment from 'moment'
-// import elTableInfiniteScroll from 'el-table-infinite-scroll';
+import { getCurrentStarEndTime } from '@/utils/getCurrentTime'
 export default {
   name: 'ServiceMap',
   mixins: [resize],
@@ -535,12 +535,15 @@ export default {
     this.appsItem=storage.get('appsItem');
      if(JSON.stringify(this.appsItem) !="{}"){
       this.queryParams.app_id=this.appsItem.id;
-      this.queryParams.start_time = this.appsItem.start_time;
-      this.queryParams.end_time = this.appsItem.end_time;
+
+     
+
+      this.queryParams.start_time = getCurrentStarEndTime().start_time;
+      this.queryParams.end_time = getCurrentStarEndTime().end_time;
       this.childQueryParams.app_id = this.appsItem.id;
       this.serviceParams.app_id = this.appsItem.id;
-      this.serviceParams.start_time = this.appsItem.start_time;
-      this.serviceParams.end_time = this.appsItem.end_time;
+      this.serviceParams.start_time = getCurrentStarEndTime().start_time;
+      this.serviceParams.end_time = getCurrentStarEndTime().end_time;
       // this.getList()
     }
     if(this.$route.query.service_name !=undefined && this.$route.query.url !=undefined){
@@ -683,13 +686,11 @@ export default {
       this.myChartboxList=[];
       this.myChartBox2List=[];
       listUrlMapping(this.queryParams).then(res => {
-          if(res.code == 200){
-            this.loading = false;
-            // this.serveceMapList= this.serveceMapList.concat(res.data.list);
-            this.serveceMapList=res.data.list
-            this.tableCount = res.data.count;
-            // this.queryParams.pageIndex = res.data.pageIndex;
-          }
+        if(res.code == 200){
+          this.loading = false;
+          this.serveceMapList=res.data.list
+          this.tableCount = res.data.count;
+        }
       })
     },
     beforeUpload(file) {

+ 3 - 2
src/views/service/Interface/components/Latency.vue

@@ -9,6 +9,7 @@ import {analyst} from '@/api/apps'
 import { mapGetters } from 'vuex'
 import storage from '@/utils/storage'
 import moment from 'moment'
+import { getCurrentStarEndTime } from '@/utils/getCurrentTime'
 
 let tmpData={}
 
@@ -332,8 +333,8 @@ export default {
     if(JSON.stringify(this.appItem) !="{}"){
       this.app_alias = this.appItem.alias;
       this.appId = this.appItem.id;
-      this.analystQuery.start_time = this.appsItem.start_time;
-      this.analystQuery.end_time = this.appsItem.end_time;
+      this.analystQuery.start_time = getCurrentStarEndTime().start_time;
+      this.analystQuery.end_time = getCurrentStarEndTime().end_time;
       this.getAnalyst();
     }
 

+ 3 - 2
src/views/service/Interface/components/TreeViews.vue

@@ -33,6 +33,7 @@ import resize from './mixins/resize'
 // import * as echarts from 'echarts';
 import storage from '@/utils/storage'
 import { listSankey } from '@/api/mapping'
+import { getCurrentStarEndTime } from '@/utils/getCurrentTime'
 
   // const formatUtil = this.$echarts5.format;
   function getLevelOption() {
@@ -194,8 +195,8 @@ export default {
     // this.queryParams.app_id = this.appsItem.id;
      if(JSON.stringify(this.appsItem) !="{}"){
       this.queryParams.app_id = this.appsItem.id;
-      this.queryParams.start_time = this.appsItem.start_time;
-      this.queryParams.end_time = this.appsItem.end_time;
+      this.queryParams.start_time = getCurrentStarEndTime().start_time;
+      this.queryParams.end_time = getCurrentStarEndTime().end_time;
      }
     // if(this.$route.query.id !=undefined){
     //   this.queryParams.app_id = this.$route.query.id;

+ 7 - 10
src/views/service/Interface/index.vue

@@ -128,10 +128,8 @@ import Latency from "./components/Latency.vue"
 import TreeViews from "./components/TreeViews.vue"
 import RectTree from "./components/RectTree.vue"
 import InterfaceMap from "./components/InterfaceMap.vue"
-import { serviceGraphSide} from '@/api/topo'
-import {otAppDashboard,addDashBoard} from "@/api/dashboard"
-import { listOtPlugins, singleOtPlugin,addOtPlugins,updateOtPlugins,delOtPlugins } from "@/api/plugin";
-import {eventNums,fireEvent,notate} from '@/api/event'
+import { listOtPlugins } from "@/api/plugin";
+import {eventNums} from '@/api/event'
 
 import storage from '@/utils/storage'
 // import qs from 'qs'
@@ -296,11 +294,11 @@ export default {
   },
   mounted(){
 
-      let name = sessionStorage.getItem('currentTab') 
-     // 判断是否存在currentTab,即tab页之前是否被点击切换到别的页面
-     if(name){
-       this.activeName = name
-      }
+    let name = sessionStorage.getItem('currentTab') 
+    // 判断是否存在currentTab,即tab页之前是否被点击切换到别的页面
+    if(name){
+      this.activeName = name
+    }
 
   },
   created(){
@@ -371,7 +369,6 @@ export default {
       this.percentile = Number(val);
     },
     getList() {
-      // listPlug(this.queryParams).then((response) => {});
       listOtPlugins().then((res) => {
         if (res.code == 200) {
           this.pluginList = res.data.list;

+ 3 - 2
src/views/service/service/components/Latency.vue

@@ -9,6 +9,7 @@ import {analyst} from '@/api/apps'
 import { mapGetters } from 'vuex'
 import storage from '@/utils/storage'
 import moment from 'moment'
+import { getCurrentStarEndTime } from '@/utils/getCurrentTime'
 
 let tmpData={}
 
@@ -318,8 +319,8 @@ export default {
     if(JSON.stringify(this.appItem) !="{}"){
       this.app_alias = this.appItem.alias;
       this.appId = this.appItem.id;
-      this.analystQuery.start_time = this.appsItem.start_time;
-      this.analystQuery.end_time = this.appsItem.end_time;
+      this.analystQuery.start_time = getCurrentStarEndTime().start_time;
+      this.analystQuery.end_time = getCurrentStarEndTime().end_time;
       this.getAnalyst();
     }