报警信息列表调整

gassafety-web/src/views/dataMonitoring/deviceAlarm/index.vue

 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-      <!--<el-form-item label="设备编号" prop="deviceCode">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100">
+      <el-form-item label="设备编号" prop="deviceCode">
         <el-input
           v-model="queryParams.deviceCode"
           placeholder="请输入设备编号"
@@ -10,6 +10,15 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="管道编号" prop="pipeCode">
+        <el-input
+          v-model="queryParams.pipeCode"
+          placeholder="请输入管道编号"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
       <el-form-item label="报警类型" prop="alarmType">
         <el-select v-model="queryParams.alarmType" placeholder="请选择报警类型" clearable size="small">
           <el-option
@@ -20,10 +29,31 @@
           ></el-option>
         </el-select>
       </el-form-item>
+      <el-form-item label="报警开始时间" prop="startTime1">
+        <el-date-picker
+          clearable size="small"
+          v-model="queryParams.startTime1"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          type="datetime"
+          placeholder="请选择起始时间"
+          align="right">
+        </el-date-picker>
+        <font color="#C0C4CC"> 至</font>
+      </el-form-item>
+      <el-form-item label="" prop="endTime1">
+        <el-date-picker
+          clearable size="small"
+          v-model="queryParams.endTime1"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          type="datetime"
+          placeholder="请选择截止时间"
+          align="right">
+        </el-date-picker>
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-      </el-form-item>-->
+      </el-form-item>
     </el-form>
 
     <el-table v-loading="loading" :data="deviceAlarmList" @selection-change="handleSelectionChange">
@@ -56,7 +86,7 @@
       </el-table-column>
       <el-table-column label="处理状态" align="center" prop="dealStatus" >
         <template slot-scope="scope">
-          <span v-if="scope.row.orderId == null || scope.row.orderId == ''">未下发</span>
+          <span v-if="scope.row.orderId == null || scope.row.orderId == ''">未生成工单</span>
           <span v-if="(scope.row.dealStatus == null || scope.row.dealStatus == '')
                 && scope.row.orderId != null && scope.row.orderId != ''">未处理</span>
           <span v-if="scope.row.dealStatus == 1">不需处理</span>
@@ -179,12 +209,11 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        deviceId: null,
+        deviceCode: null,
         orderId: null,
         alarmType: null,
-        alarmValue: null,
-        startTime: null,
-        endTime: null,
+        startTime1: null,
+        endTime1: null,
         dealStatus: null
       },
       // 表单参数