历史数据列表检索条件增加上报时间

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

@@ -98,8 +98,13 @@
       <el-table-column label="报警类型" align="center" prop="alarmType" />
       <el-table-column label="报警值" align="center" prop="alarmValue" />
       <el-table-column label="报警开始时间" align="center" prop="startTime" />
-      <el-table-column label="报警结束时间" align="center" prop="endTime" />
-      <el-table-column label="处理状态" align="center" prop="dealStatus">
+      <el-table-column label="报警结束时间" align="center" prop="endTime" >
+        <template slot-scope="scope">
+          <span v-if="scope.row.endTime == null || scope.row.endTime == ''">-</span>
+          <span v-if="scope.row.endTime != null && scope.row.endTime != ''">{{scope.row.endTime}}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="处理状态" align="center" prop="dealStatus">n
         <template slot-scope="scope">
           <span v-if="scope.row.orderId == null || scope.row.orderId == ''">未生成工单</span>
           <span v-if="(scope.row.dealStatus == null || scope.row.dealStatus == '') &&

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

@@ -16,6 +16,27 @@
           <el-option label="压力表" value="4" />
         </el-select>
       </el-form-item>
+      <el-form-item label="上报时间" prop="startReportTime">
+        <el-date-picker
+          clearable size="small"
+          v-model="queryParams.startReportTime"
+          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="endReportTime">
+        <el-date-picker
+          clearable size="small"
+          v-model="queryParams.endReportTime"
+          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>
@@ -98,6 +119,8 @@ export default {
         reportTime: null,
         communicationStatus: null,
         deviceStatus: null,
+        startReportTime: null,
+        endReportTime: null,
       },
       // 表单参数
       form: {},

gassafety-web/src/views/deviceInspection/inspectionPlan/index.vue

@@ -53,8 +53,8 @@
       <el-table-column label="地址" align="center" prop="address"/>
       <el-table-column label="计划描述" align="center" prop="remarks">
         <template slot-scope="scope">
-          <span v-if="scope.row.remarks != null">{{ scope.row.remarks }}</span>
-          <span v-if="scope.row.remarks == null">-</span>
+          <span v-if="scope.row.remarks != null && scope.row.remarks != ''">{{ scope.row.remarks }}</span>
+          <span v-if="scope.row.remarks == null || scope.row.remarks == ''">-</span>
         </template>
       </el-table-column>
       <el-table-column label="计划状态" align="center" prop="planStatus">

gassafety-web/src/views/workOrder/basicsInfo/index.vue

@@ -90,8 +90,8 @@
       </el-table-column>
       <el-table-column label="工单描述" align="center" prop="remarks" >
         <template slot-scope="scope">
-          <span v-if="scope.row.remarks != null">{{ scope.row.remarks }}</span>
-          <span v-if="scope.row.remarks == null">-</span>
+          <span v-if="scope.row.remarks != null && scope.row.remarks != ''">{{ scope.row.remarks }}</span>
+          <span v-if="scope.row.remarks == null || scope.row.remarks == ''">-</span>
         </template>
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">