From 1ec3b0eab5c0171a5fde0b11cf08c8b8b6abc53e Mon Sep 17 00:00:00 2001
From: wangwenrui <wangwenrui@zdjizhi.com>
Date: Fri, 15 May 2020 15:03:42 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E5=A4=9A=E4=BD=99=E4=BE=9D=E8=B5=96?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../page/dashboard/explore/explore.vue        |  4 ++--
 nezha-fronted/src/main.js                     |  3 ++-
 nezha-fronted/src/tools.js                    | 19 +++++++++++++++++++
 3 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/nezha-fronted/src/components/page/dashboard/explore/explore.vue b/nezha-fronted/src/components/page/dashboard/explore/explore.vue
index 43f4b9eeb..b41bd89bf 100644
--- a/nezha-fronted/src/components/page/dashboard/explore/explore.vue
+++ b/nezha-fronted/src/components/page/dashboard/explore/explore.vue
@@ -208,7 +208,7 @@ instance_cpu_time_ns{app="fox", proc="widget", rev="4d3a513", env="prod", job="c
 <script>
   import bus from "../../../../libs/bus";
   import promqlInput from "./promqlInput";
-  import promqlInputPlus from "./promqlInputPlus";
+  // import promqlInputPlus from "./promqlInputPlus";
   import chart from "../overview/chart";
   import axios from 'axios';
   import chartBox from "../../../page/dashboard/chartBox";
@@ -219,7 +219,7 @@ instance_cpu_time_ns{app="fox", proc="widget", rev="4d3a513", env="prod", job="c
     name: "explore",
     components: {
       'promql-input': promqlInput,
-      'promql-input-plus':promqlInputPlus,
+      // 'promql-input-plus':promqlInputPlus,
       'chart': chart,
       'chart-box': chartBox,
     },
diff --git a/nezha-fronted/src/main.js b/nezha-fronted/src/main.js
index 3de628a37..d8154fe7b 100644
--- a/nezha-fronted/src/main.js
+++ b/nezha-fronted/src/main.js
@@ -19,7 +19,7 @@ import plTable from 'pl-table'
 import 'pl-table/themes/index.css'
 
 import {post, get, put, del} from './http.js'
-import {toTop, clickoutside, scrollBar, bottomBoxWindow,stringTimeParseToUnix} from './tools.js'
+import {toTop, clickoutside, scrollBar, bottomBoxWindow,stringTimeParseToUnix,unixTimeParseToString} from './tools.js'
 
 
 import Pagination from "./components/common/pagination"; //引入全局分页组件
@@ -80,6 +80,7 @@ Vue.prototype.$delete = del;
 Vue.prototype.$toTop = toTop; //toTop置顶按钮方法
 Vue.prototype.$bottomBoxWindow = bottomBoxWindow; //底部上滑框控制
 Vue.prototype.$stringTimeParseToUnix = stringTimeParseToUnix;
+Vue.prototype.$unixTimeParseToString = unixTimeParseToString;
 Vue.prototype.$tableHeight = { //列表页表格的高度
   normal: 'calc(100% - 100px)',  //常规高度，特例在下方定义
   openSubList: { //打开二级列表后的高度
diff --git a/nezha-fronted/src/tools.js b/nezha-fronted/src/tools.js
index 8ef9db0b9..da2be9eef 100644
--- a/nezha-fronted/src/tools.js
+++ b/nezha-fronted/src/tools.js
@@ -338,3 +338,22 @@ export function stringTimeParseToUnix(stringTime){
   let time=new Date(stringTime).getTime();
   return time/1000;
 }
+
+export function unixTimeParseToString(unixTime,fmt='yyyy-MM-dd hh-mm-ss'){
+  let date=new Date(unixTime * 1000);
+  var o = {
+    "M+" : date.getMonth()+1,                 //月份
+    "d+" : date.getDate(),                    //日
+    "h+" : date.getHours(),                   //小时
+    "m+" : date.getMinutes(),                 //分
+    "s+" : date.getSeconds(),                 //秒
+    "q+" : Math.floor((date.getMonth()+3)/3), //季度
+    "S"  : date.getMilliseconds()             //毫秒
+  };
+  if(/(y+)/.test(fmt))
+    fmt=fmt.replace(RegExp.$1, (date.getFullYear()+"").substr(4 - RegExp.$1.length));
+  for(var k in o)
+    if(new RegExp("("+ k +")").test(fmt))
+      fmt = fmt.replace(RegExp.$1, (RegExp.$1.length==1) ? (o[k]) : (("00"+ o[k]).substr((""+ o[k]).length)));
+  return fmt;
+}