software/glogcenter
1
0
Fork 0
mirror of https://github.com/gotoeasy/glogcenter.git synced 2025-09-15 12:58:34 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

v0.15.0

Browse Source
This commit is contained in:
gotoeasy 2024-04-08 08:42:32 +08:00
parent 3fddc548b5
commit c05556d41c
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
glc/www/controller/log_search_controller.go
View File

@ -153,6 +153,10 @@ func LogSearchController(req *gweb.HttpRequest) *gweb.HttpResult {
result.Total = cmn.Uint32ToString(total) // 总件数 result.Total = cmn.Uint32ToString(total) // 总件数
result.Count = cmn.Uint32ToString(count) // 最大匹配检索（笼统，在最大查取件数（5000件）内查完时，前端会改成精确的和结果一样的件数） result.Count = cmn.Uint32ToString(count) // 最大匹配检索（笼统，在最大查取件数（5000件）内查完时，前端会改成精确的和结果一样的件数）
result.TimeMessage = "耗时" + getTimeInfo(time.Since(startTime).Milliseconds()) // 查询耗时 result.TimeMessage = "耗时" + getTimeInfo(time.Since(startTime).Milliseconds()) // 查询耗时
if cond.NewNearId > 0 && len(result.Data) == 0 {
// 相邻检索时确保能返回定位日志
result.Data = append(result.Data, search.GetLogDataModelById(cond.NearStoreName, cond.NewNearId))
}
return gweb.Result(result) return gweb.Result(result)
} }

6
glc/www/web/src/views/glc/search/GlcMain.vue
View File

@ -221,8 +221,10 @@ const fnSearchNear = (row) => {
if (searchNearMode.value) { if (searchNearMode.value) {
// 相邻检索模式下，继续进行相邻检索，需使用输入的条件进一步筛选 // 相邻检索模式下，继续进行相邻检索，需使用输入的条件进一步筛选
if (newNearId.value != row.id) {
oldNearId.value = newNearId.value; oldNearId.value = newNearId.value;
newNearId.value = row.id; newNearId.value = row.id;
}
} else { } else {
// 普通检索模式下，进行相邻检索 // 普通检索模式下，进行相邻检索
oldNearId.value = 0; oldNearId.value = 0;
@ -352,10 +354,10 @@ function search() {
data.datetimeFrom = (formData.value.datetime || ['', ''])[0]; data.datetimeFrom = (formData.value.datetime || ['', ''])[0];
data.datetimeTo = (formData.value.datetime || ['', ''])[1]; data.datetimeTo = (formData.value.datetime || ['', ''])[1];
data.user = formData.value.user; data.user = formData.value.user;
if (searchNearMode.value && newNearId.value) { if (searchNearMode.value) {
data.oldNearId = oldNearId.value; data.oldNearId = oldNearId.value;
data.newNearId = newNearId.value; data.newNearId = newNearId.value;
data.nearStoreName = newNearId.value ? nearStoreName.value : ''; data.nearStoreName = nearStoreName.value;
} }
// 保存好滚动检索的输入条件，保持和检索时一致，避免修改输入再滚动查询而出现矛盾结果 // 保存好滚动检索的输入条件，保持和检索时一致，避免修改输入再滚动查询而出现矛盾结果