diff --git a/glc/www/controller/log_search_controller.go b/glc/www/controller/log_search_controller.go index 57bc30c..ed9f1a1 100644 --- a/glc/www/controller/log_search_controller.go +++ b/glc/www/controller/log_search_controller.go @@ -153,6 +153,10 @@ func LogSearchController(req *gweb.HttpRequest) *gweb.HttpResult { result.Total = cmn.Uint32ToString(total) // 总件数 result.Count = cmn.Uint32ToString(count) // 最大匹配检索(笼统,在最大查取件数(5000件)内查完时,前端会改成精确的和结果一样的件数) 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) } diff --git a/glc/www/web/src/views/glc/search/GlcMain.vue b/glc/www/web/src/views/glc/search/GlcMain.vue index fef6ebb..062b454 100644 --- a/glc/www/web/src/views/glc/search/GlcMain.vue +++ b/glc/www/web/src/views/glc/search/GlcMain.vue @@ -221,8 +221,10 @@ const fnSearchNear = (row) => { if (searchNearMode.value) { // 相邻检索模式下,继续进行相邻检索,需使用输入的条件进一步筛选 - oldNearId.value = newNearId.value; - newNearId.value = row.id; + if (newNearId.value != row.id) { + oldNearId.value = newNearId.value; + newNearId.value = row.id; + } } else { // 普通检索模式下,进行相邻检索 oldNearId.value = 0; @@ -352,10 +354,10 @@ function search() { data.datetimeFrom = (formData.value.datetime || ['', ''])[0]; data.datetimeTo = (formData.value.datetime || ['', ''])[1]; data.user = formData.value.user; - if (searchNearMode.value && newNearId.value) { + if (searchNearMode.value) { data.oldNearId = oldNearId.value; data.newNearId = newNearId.value; - data.nearStoreName = newNearId.value ? nearStoreName.value : ''; + data.nearStoreName = nearStoreName.value; } // 保存好滚动检索的输入条件,保持和检索时一致,避免修改输入再滚动查询而出现矛盾结果