From eb5d4feec6d7ccd3d2f9063f6a4e1fcd0fafefff Mon Sep 17 00:00:00 2001
From: gengby <858962040@qq.com>
Date: Tue, 5 Jul 2022 14:31:48 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=AE=BE=E5=A4=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../log/service/impl/RootLogServiceImpl.java   |  6 ++++++
 .../acs/monitor/device/XJDeviceMonitor.vue     |  5 ++---
 wcs/qd/src/views/log/deviceLog/index.vue       | 18 +++++++++++++-----
 3 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/wcs/hd/nladmin-system/src/main/java/org/nl/modules/log/service/impl/RootLogServiceImpl.java b/wcs/hd/nladmin-system/src/main/java/org/nl/modules/log/service/impl/RootLogServiceImpl.java
index 9c78ace5..f174168b 100644
--- a/wcs/hd/nladmin-system/src/main/java/org/nl/modules/log/service/impl/RootLogServiceImpl.java
+++ b/wcs/hd/nladmin-system/src/main/java/org/nl/modules/log/service/impl/RootLogServiceImpl.java
@@ -43,6 +43,7 @@ public class RootLogServiceImpl implements RootLogService {
         if (StrUtil.isEmpty(log_type)) {
             log_type = "default";
         }
+
         if (StrUtil.isNotEmpty(log_level)){
             query.addCriteria(Criteria.where("level").is(log_level));
         }
@@ -72,6 +73,8 @@ public class RootLogServiceImpl implements RootLogService {
         String device_code = (String) whereJson.get("device_code");
         String begin_time = (String) whereJson.get("begin_time");
         String end_time = (String) whereJson.get("end_time");
+        String error_info = (String) whereJson.get("error_info");
+
 
         Query query = new Query();
         query.with(Sort.by(Sort.Order.desc("create_time")));
@@ -81,6 +84,9 @@ public class RootLogServiceImpl implements RootLogService {
             JSONObject json = array.getJSONObject(0);
             device_code = json.getString("device_code");
         }
+        if (StrUtil.isNotEmpty(error_info)){
+            query.addCriteria(Criteria.where("message").regex(error_info));
+        }
         if (StrUtil.isNotEmpty(begin_time) && StrUtil.isNotEmpty(end_time)) {
             query.addCriteria(Criteria.where("create_time")
                     .gte(begin_time)
diff --git a/wcs/qd/src/views/acs/monitor/device/XJDeviceMonitor.vue b/wcs/qd/src/views/acs/monitor/device/XJDeviceMonitor.vue
index 6086d551..f6a8a160 100644
--- a/wcs/qd/src/views/acs/monitor/device/XJDeviceMonitor.vue
+++ b/wcs/qd/src/views/acs/monitor/device/XJDeviceMonitor.vue
@@ -3,16 +3,16 @@
     title="监控详情"
     append-to-body
     :visible.sync="dialogVisible"
+    fullscreen
     @open="open"
     @close="close"
-   fullscreen
   >
     <el-row :gutter="20">
       <el-col :span="18" style="border: 1px solid white">
         <span />
       </el-col>
       <el-col :span="6" style="margin-bottom: 20px">
-<!--        <span style="float: right">
+        <!--        <span style="float: right">
            <el-button icon="el-icon-close" size="mini" type="info" @click="dialogVisible = false">返 回</el-button>
         </span>-->
       </el-col>
@@ -183,7 +183,6 @@ export default {
             const obj = JSON.parse(JSON.stringify(item))
             if (obj.device_code === that.device_code) {
               that.form = obj.data
-              console.log(that.form)
             }
           }
         }
diff --git a/wcs/qd/src/views/log/deviceLog/index.vue b/wcs/qd/src/views/log/deviceLog/index.vue
index cd9e96ca..12f72c13 100644
--- a/wcs/qd/src/views/log/deviceLog/index.vue
+++ b/wcs/qd/src/views/log/deviceLog/index.vue
@@ -37,9 +37,17 @@
           end-placeholder="结束日期"
           align="right"
         />
+        <el-input
+          v-model="query.error_info"
+          clearable
+          size="small"
+          placeholder="请输入异常信息"
+          style="width: 220px;"
+          class="filter-item"
+        />
         <rrOperation />
       </div>
-      <crudOperation :permission="permission"/>
+      <crudOperation :permission="permission" />
       <!--表格渲染-->
       <el-table
         ref="table"
@@ -50,11 +58,11 @@
         @selection-change="crud.selectionChangeHandler"
       >
         <el-table-column type="selection" width="55" />
-        <el-table-column prop="device_code" label="设备编码"/>
+        <el-table-column prop="device_code" label="设备编码" />
         <el-table-column prop="create_time" label="创建时间" />
-        <el-table-column prop="vehicle_code" label="载具号"/>
+        <el-table-column prop="vehicle_code" label="载具号" />
         <el-table-column prop="inst_code" label="指令号" />
-        <el-table-column prop="message" label="异常详情" width="300"/>
+        <el-table-column prop="message" label="异常详情" width="300" />
       </el-table>
       <!--分页组件-->
       <pagination />
@@ -71,7 +79,7 @@ import udOperation from '@crud/UD.operation'
 import pagination from '@crud/Pagination'
 import { get } from '@/api/system/dictDetail'
 import Search from '@/views/monitor/lucene/search'
-import deviceCrud from "@/api/acs/device/device";
+import deviceCrud from '@/api/acs/device/device'
 
 const defaultForm = {
   _id: null,