opt:优化日志；add：包装机一体机页面新增空筐送回

mes/qd/src/views/monitor/eslog/view/index.vue

@@ -33,6 +33,14 @@
             />
           </el-select>
         </el-form-item>
+        <el-form-item label="接口">
+          <el-input
+            v-model="requestMethod"
+            size="mini"
+            placeholder="请输入内容"
+            clearable
+          />
+        </el-form-item>
         <el-form-item label="关键字">
           <el-input
             v-model="message"
@@ -50,15 +58,15 @@
           />
         </el-form-item>
 
-        <el-form-item label="SQL日志" prop="filterSql">
-          <el-switch
-            v-model="filterSql"
-            active-color="#F56C6C"
-            inactive-color="#409EFF"
-            active-value="1"
-            inactive-valu="0"
-          />
-        </el-form-item>
+<!--        <el-form-item label="SQL日志" prop="filterSql">-->
+<!--          <el-switch-->
+<!--            v-model="filterSql"-->
+<!--            active-color="#F56C6C"-->
+<!--            inactive-color="#409EFF"-->
+<!--            active-value="1"-->
+<!--            inactive-valu="0"-->
+<!--          />-->
+<!--        </el-form-item>-->
         <el-form-item label="HTTP日志" prop="isRequest">
           <el-switch
             v-model="isRequest"
@@ -84,12 +92,13 @@
           />
         </el-form-item>
         <el-form-item v-show="showOptions" label="时间段">
-          <el-select v-model="timeZoneValue" filterable placeholder="请选择标签" size="mini" @change="queryData">
+          <el-select v-model="timeZoneValue" clearable filterable placeholder="请选择标签" size="mini" @change="queryData">
             <el-option
               v-for="item in timeZoneOptions"
               :key="item.index"
               :label="item.label"
               :value="item.value"
+              clearable
             />
           </el-select>
         </el-form-item>
@@ -201,6 +210,7 @@ export default {
       labelsOptions: [], // 所有标签和对应所有值数据
       systemOptions: [], // 所有标签和对应所有值数据
       logLevelValue: '',
+      requestMethod: '',
       system: '',
       timeRange: [],
       message: '',
@@ -302,6 +312,7 @@ export default {
       // 清空查询数据
       this.clearParam()
       queryParam.logLevel = this.logLevelValue
+      queryParam.requestMethod = this.requestMethod
       const time = new Date()
       if (this.timeZoneValue !== '') {
         queryParam.startTime = new Date(((time.getTime() - this.timeZoneValue)))
@@ -312,7 +323,7 @@ export default {
       }
       queryParam.message = this.message.replace(/^\s*|\s*$/g, '')
       queryParam.filterSql = this.filterSql === '1'
-      queryParam.isRequest = this.filterSql === '1'
+      queryParam.isRequest = this.isRequest === '1'
       queryParam.traceId = this.traceId
       queryParam.size = this.size
       queryParam.page = this.page
@@ -323,8 +334,8 @@ export default {
         this.total = res.total
         // 清空
         this.logs = []
-        for (const j in res.records) { // 用push的方式将所有日志数组添加进去
-          this.logs.push(res.records[j])
+        for (const j in res.page) { // 用push的方式将所有日志数组添加进去
+          this.logs.push(res.page[j])
         }
       })
     },