commit e6593fe513dacfc9917d57b1d8087237e8e5bc8e
author Allen Wang <Allen.Wang.123@outlook.com> Thu Dec 13 10:31:41 2018 +0800
committer GitHub <noreply@github.com> Thu Dec 13 10:31:41 2018 +0800
tree fca31daa0eed79d457041480fcb27074508f46f1
parent 81e8989b00f770445e32859f9e8b513be4c6614a
parent 69c507a0a93fbf7da628ef7806d34955e86c0a23

Merge pull request #36 from zhaoyuguang/bugfix_z2

文案bug

src/store/dispatch/trace.ts

diff --git a/src/store/dispatch/trace.ts b/src/store/dispatch/trace.ts
index 1cbbff5..c17139c 100644
--- a/src/store/dispatch/trace.ts
+++ b/src/store/dispatch/trace.ts
@@ -4,7 +4,7 @@
 
 export const getTraces = (params: any): void => {
   let step = 'MINUTE';
-  const unix = Math.round(params.time[1].getTime()) - Math.round(params.time[0].getTime());
+  const unix = Math.round(new Date(params.time[1]).getTime()) - Math.round(new Date(params.time[0]).getTime());
   if (unix <= 60 * 60 * 1000) {
     step = 'MINUTE';
   } else if (unix <= 24 * 60 * 60 * 1000) {

src/views/components/trace/search-box.vue

diff --git a/src/views/components/trace/search-box.vue b/src/views/components/trace/search-box.vue
index 762f334..8827297 100644
--- a/src/views/components/trace/search-box.vue
+++ b/src/views/components/trace/search-box.vue
@@ -16,7 +16,8 @@
       <div class="mb5 label">TraceID</div>
       <input class="rk-trace-input" type="text" v-model="option.traceId">
     </div>
-    <RkDate position="bottom" v-model="option.time" format="YYYY-MM-DD HH:mm:ss"/>
+    <RkDate class="mr10" position="bottom" v-model="option.time" format="YYYY-MM-DD HH:mm:ss"/>
+    <button class="trace-search-btn" @click="handleChanged">Search</button>
   </div>
   <div class="rk-trace-search-subbox container mb10">
     <div class="label">Max:</div>
@@ -44,7 +45,7 @@
 <script lang="ts">
 import Vue from 'vue';
 import { State } from 'vuex-class';
-import { Component, Watch } from 'vue-property-decorator';
+import { Component } from 'vue-property-decorator';
 import { getTraces } from '@/store/dispatch/trace.ts';
 
 @Component({
@@ -74,9 +75,10 @@
     } else {
       this.option.time = [this.stateGlobal.duration.start, this.stateGlobal.duration.end];
     }
+    getTraces(this.option);
   }
-  @Watch('option', { deep: true })
-  onOptionChanged(): void {
+  // @Watch('option', { deep: true })
+  handleChanged() {
     getTraces(this.option);
     window.sessionStorage.setItem('traceOption', JSON.stringify(this.option));
   }
@@ -86,6 +88,16 @@
 }
 </script>
 <style lang="scss">
+.trace-search-btn{
+  cursor: pointer;
+  display: inline-block;
+  border-radius: 4px;
+  background-color: #4477dd;
+  border: 0;
+  color: #fff;
+  outline: none;
+  padding: 6.5px .7em;
+}
 .rk-trace-search-subbox{
   display: flex;
   flex-shrink: 0;