修改上传模板，前端获取文件名失败

qax-os · Jun 22, 2017 · 050de50 · 050de50
1 parent 746b130
commit 050de50
Show file tree

Hide file tree

Showing 13 changed files with 21 additions and 15 deletions.
diff --git a/dist/index.html b/dist/index.html
@@ -1 +1 @@
-<!DOCTYPE html><html class=no-js lang=en><head><meta charset=utf-8><meta content="IE=edge,chrome=1" http-equiv=X-UA-Compatible><title>Elastic HD Dashboard</title><meta content=bibinbin name=author><meta content="elasticsearch go Edition head plugin" name=description><meta content=ElasticHD name=keywords><link href=/static/css/app.64c3c1953f23623e2fc954ac3bc5f0f6.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.716df97a49718cfd7183.js></script><script type=text/javascript src=/static/js/vendor.661d7e9a2eddc40ecf43.js></script><script type=text/javascript src=/static/js/app.8ac9c3048194f4e70a31.js></script></body></html>
+<!DOCTYPE html><html class=no-js lang=en><head><meta charset=utf-8><meta content="IE=edge,chrome=1" http-equiv=X-UA-Compatible><title>Elastic HD Dashboard</title><meta content=bibinbin name=author><meta content="elasticsearch go Edition head plugin" name=description><meta content=ElasticHD name=keywords><link href=/static/css/app.64c3c1953f23623e2fc954ac3bc5f0f6.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.3b7a4333a2fa155a81fd.js></script><script type=text/javascript src=/static/js/vendor.661d7e9a2eddc40ecf43.js></script><script type=text/javascript src=/static/js/app.2578e2ab5e128427d2eb.js></script></body></html>
diff --git a/dist/static/js/app.2578e2ab5e128427d2eb.js b/dist/static/js/app.2578e2ab5e128427d2eb.js
diff --git a/dist/static/js/app.2578e2ab5e128427d2eb.js.map b/dist/static/js/app.2578e2ab5e128427d2eb.js.map
diff --git a/dist/static/js/app.8ac9c3048194f4e70a31.js b/dist/static/js/app.8ac9c3048194f4e70a31.js
diff --git a/dist/static/js/app.8ac9c3048194f4e70a31.js.map b/dist/static/js/app.8ac9c3048194f4e70a31.js.map
diff --git a/dist/static/js/manifest.3b7a4333a2fa155a81fd.js b/dist/static/js/manifest.3b7a4333a2fa155a81fd.js
diff --git a/...c/js/manifest.716df97a49718cfd7183.js.map → ...c/js/manifest.3b7a4333a2fa155a81fd.js.map b/...c/js/manifest.716df97a49718cfd7183.js.map → ...c/js/manifest.3b7a4333a2fa155a81fd.js.map
diff --git a/dist/static/js/manifest.716df97a49718cfd7183.js b/dist/static/js/manifest.716df97a49718cfd7183.js
diff --git a/main/search/search.go b/main/search/search.go
@@ -153,6 +153,8 @@ func (se *Search) clusterStats(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 	var elasticStats = Stats{}
+	elasticStats.CPUUsed = stats.Nodes.Process.CPU.Percent
+	elasticStats.CPUFree = 100 - stats.Nodes.Process.CPU.Percent
 	elasticStats.ClusterName = stats.ClusterName
 	elasticStats.Docs = stats.Indices.Docs.Count
 	elasticStats.FieldDataMemUsed = stats.Indices.Fielddata.MemorySizeInBytes
@@ -166,7 +168,7 @@ func (se *Search) clusterStats(w http.ResponseWriter, r *http.Request) {
 	for _, item := range stats.Nodes.Jvm.Versions {
 		elasticStats.JvmVersions += item.Version + ","
 	}
-	elasticStats.MemFree = stats.Nodes.Os.Mem.FreeInBytes
+	elasticStats.MemFree = stats.Nodes.Os.Mem.TotalInBytes - stats.Nodes.Os.Mem.UsedInBytes
 	elasticStats.MemToatl = stats.Nodes.Os.Mem.TotalInBytes
 	elasticStats.MemUsed = stats.Nodes.Os.Mem.UsedInBytes
 	elasticStats.Plugins = stats.Nodes.Plugins

diff --git a/main/search/struct.go b/main/search/struct.go
@@ -58,6 +58,8 @@ type Stats struct {
 	FieldDataMemUsed int64       `json:"fielddata_mem_used"`
 	QueryCache       interface{} `json:"query_cache"`
 	Timestamp        int64       `json:"timestamp"`
+	CPUUsed          int         `json:"cpuused"`
+	CPUFree          int         `json:"cpufree"`
 }
 
 // System ...

diff --git a/main/statik/statik.go b/main/statik/statik.go
diff --git a/src/components/mapping.vue b/src/components/mapping.vue
@@ -2,7 +2,7 @@
   <section id="mapping-view">
     <el-row :gutter="0">
       <el-col :xs="24" :sm="24" :md="8" :lg="8">
-        <el-card :body-style="{ padding: '0px' }">
+        <el-card :body-style="{ padding: '0px', height: '300px' }">
           <img src="../assets/hero.svg" class="image">
           <div style="background-color:#D3DCE6;">
             <div style="text-align:center;">Indices Templates</div>
@@ -23,12 +23,12 @@
       </el-col>
       <el-col :xs="24" :sm="12" :md="8" :lg="8">
         <div>
-          <el-upload class="upload-demo" drag :action="action" :on-change="handleChange" :file-list="fileList" :before-upload="beforeFileUpload" :on-success="fileUploadSuccess" :on-error="fileUploadError" style="width:369px;">
+          <el-upload class="upload-demo" drag :action="action" :on-change="handleChange" :file-list="fileList" :before-upload="beforeFileUpload" :on-success="fileUploadSuccess" :on-error="fileUploadError" style="width:400px;">
             <i class="el-icon-upload"></i>
             <div class="el-upload__text">将文件拖到此处，或
               <em>点击上传</em>
             </div>
-            <div class="el-upload__tip" style="text-align:center; background-color:#D3DCE6;margin-top:0px; width:369px" slot="tip">更新ElasticSerach Index Template: 要求只能上传application/json文件、不超过2M、且文件名是对应的Index Template名称</div>
+            <div class="el-upload__tip" style="text-align:center; background-color:#D3DCE6;margin-top:0px; width:360px" slot="tip">更新ElasticSerach Index Template: 要求只能上传application/json文件、不超过2M、且文件名是对应的Index Template名称</div>
           </el-upload>
         </div>
       </el-col>
@@ -147,8 +147,8 @@ export default {
     fileUploadError (file, error) {
       this.$message.error(error.name + ' 模板部署失败，请打开开发者模式查看错误信息提示')
     },
-    fileUploadSuccess (file) {
-      console.log(file)
+    fileUploadSuccess (res, file) {
+      // console.log(res, file, 2222)
       this.$message.success(file.name + ' 模板部署成功')
     },
     handleChange (file, fileList) {

diff --git a/src/store/modules/overviewx.js b/src/store/modules/overviewx.js
@@ -154,7 +154,9 @@ const overviewx = {
               fstotal: response.body.data.fstotal,
               fsfree: response.body.data.fsfree,
               fielddata_mem_used: response.body.data.fielddata_mem_used,
-              query_cache_memory_size: response.body.data.query_cache.memory_size_in_bytes
+              query_cache_memory_size: response.body.data.query_cache.memory_size_in_bytes,
+              cpuused: response.body.data.cpuused,
+              cpufree: response.body.data.cpufree
             }
             commit('SET_CHARTS', chart)
           }
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<!DOCTYPE html><html class=no-js lang=en><head><meta charset=utf-8><meta content="IE=edge,chrome=1" http-equiv=X-UA-Compatible><title>Elastic HD Dashboard</title><meta content=bibinbin name=author><meta content="elasticsearch go Edition head plugin" name=description><meta content=ElasticHD name=keywords><link href=/static/css/app.64c3c1953f23623e2fc954ac3bc5f0f6.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.716df97a49718cfd7183.js></script><script type=text/javascript src=/static/js/vendor.661d7e9a2eddc40ecf43.js></script><script type=text/javascript src=/static/js/app.8ac9c3048194f4e70a31.js></script></body></html>
		<!DOCTYPE html><html class=no-js lang=en><head><meta charset=utf-8><meta content="IE=edge,chrome=1" http-equiv=X-UA-Compatible><title>Elastic HD Dashboard</title><meta content=bibinbin name=author><meta content="elasticsearch go Edition head plugin" name=description><meta content=ElasticHD name=keywords><link href=/static/css/app.64c3c1953f23623e2fc954ac3bc5f0f6.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.3b7a4333a2fa155a81fd.js></script><script type=text/javascript src=/static/js/vendor.661d7e9a2eddc40ecf43.js></script><script type=text/javascript src=/static/js/app.2578e2ab5e128427d2eb.js></script></body></html>