diff --git a/glc/ldb/engine_test.go b/glc/ldb/engine_test.go index 657ead0..5eb5bd4 100644 --- a/glc/ldb/engine_test.go +++ b/glc/ldb/engine_test.go @@ -11,7 +11,7 @@ func Test_all(t *testing.T) { engine := NewDefaultEngine() for i := 1; i <= 100; i++ { - engine.AddTextLog("date", fmt.Sprintf(` java.sql.SQLException: ddduse them aalav_%d`, i), "sssss_ssss") + engine.AddTextLog("date", fmt.Sprintf(`java.sql.SQLException: ddduse them aalav_%d`, i), "sssss_ssss") } time.Sleep(time.Duration(5) * time.Second) diff --git a/glc/ldb/search/search_keys.go b/glc/ldb/search/search_keys.go index ca4cc6a..4d31eb5 100644 --- a/glc/ldb/search/search_keys.go +++ b/glc/ldb/search/search_keys.go @@ -92,11 +92,11 @@ func SearchLogData(storeName string, pageSize int, currentDocId uint64, forward // 有关键词时走索引检索 func SearchWordIndex(storeName string, word string, pageSize int, currentDocId uint64, forward bool) *SearchResult { - var rs = new(SearchResult) // 检索结果 - storeLogData := storage.NewLogDataStorageHandle(storeName) // 数据 - storeIndex := storage.NewWordIndexStorage(storeName, word) // 索引 - totalCount := storeIndex.TotalCount() // 总件数 - rs.Total = cmn.Uint64ToString(totalCount, 10) // 返回的总件数用10进制字符串形式以避免出现科学计数法 + var rs = new(SearchResult) // 检索结果 + storeLogData := storage.NewLogDataStorageHandle(storeName) // 数据 + storeIndex := storage.NewWordIndexStorage(storeName, word) // 索引 + totalCount := storeIndex.TotalCount() // 总件数 + rs.Total = cmn.Uint64ToString(storeLogData.TotalCount(), 10) // 返回的总件数用10进制字符串形式以避免出现科学计数法 if totalCount == 0 { return rs diff --git a/glc/ldb/search/search_same.go b/glc/ldb/search/search_same.go index 9ab8c3d..35e0594 100644 --- a/glc/ldb/search/search_same.go +++ b/glc/ldb/search/search_same.go @@ -103,6 +103,6 @@ func findSame(pageSize int, currentDocId uint64, forward bool, storeLogData *sto } } - rs.Total = fmt.Sprintf("%d", rsCnt) + rs.Total = fmt.Sprintf("%d", storeLogData.TotalCount()) return rs } diff --git a/glc/www/controller/log_search_controller.go b/glc/www/controller/log_search_controller.go index 7bee3e2..e01a728 100644 --- a/glc/www/controller/log_search_controller.go +++ b/glc/www/controller/log_search_controller.go @@ -17,5 +17,5 @@ func LogSearchController(req *gweb.HttpRequest) *gweb.HttpResult { eng := ldb.NewEngine(storeNmae) rs := eng.Search(searchKey, pageSize, currentId, forward) - return gweb.Result(rs.Data) + return gweb.Result(rs) } diff --git a/glc/www/web/index.html b/glc/www/web/index.html index 7849610..3129d84 100644 --- a/glc/www/web/index.html +++ b/glc/www/web/index.html @@ -68,6 +68,9 @@ overflow: hidden; } + div.el-table th.el-table__cell{ + padding: 4px 0; + }
diff --git a/glc/www/web/src/views/dashboard.vue b/glc/www/web/src/views/dashboard.vue index d44eef3..fd97e6c 100644 --- a/glc/www/web/src/views/dashboard.vue +++ b/glc/www/web/src/views/dashboard.vue @@ -21,7 +21,7 @@ - +