Commit 93d7f175 authored by 王晓倩's avatar 王晓倩

工单列表、巡检计划列表、隐患信息列表、历史数据列表按时间倒序

parent 889143bd
......@@ -82,6 +82,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="communicationStatus != null and communicationStatus != ''"> and t.communication_status = #{communicationStatus}</if>
<if test="deviceStatus != null and deviceStatus != ''"> and t.device_status = #{deviceStatus}</if>
</where>
order by t.report_time desc
</select>
<select id="selectRealtimeDataList" parameterType="DeviceReportDataForm" resultMap="TDeviceReportDataResultVo">
......
......@@ -46,11 +46,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="pictureUrl != null and pictureUrl != ''"> and picture_url = #{pictureUrl}</if>
<if test="reportMan != null "> and report_man = #{reportMan}</if>
</where>
order by create_time desc
</select>
<select id="getMapTHiddenTroubleList" resultMap="THiddenTroubleResult">
<include refid="selectTHiddenTroubleVo"/>
where is_del = '0' and (deal_status is null or deal_status = '3')
order by create_time desc
</select>
<select id="selectTHiddenTroubleById" parameterType="int" resultMap="THiddenTroubleResult">
......
......@@ -36,6 +36,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="planStatus != null and planStatus != ''"> and plan_status = #{planStatus}</if>
<if test="remarks != null "> and remarks &lt;= #{remarks}</if>
</where>
order by create_time desc
</select>
<select id="selectTInspectionPlanById" parameterType="int" resultMap="TInspectionPlanResult">
......
......@@ -41,6 +41,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="endAllotTime != null "> and t.allot_time &lt;= #{endAllotTime}</if>
<if test="userName != null and userName != ''"> and s.user_name = #{userName}</if>
</where>
order by t.allot_time desc
</select>
<select id="selectTWorkOrderById" parameterType="String" resultMap="TWorkOrderResult">
......
......@@ -39,7 +39,7 @@
<el-table-column label="工况流量(m³/h)" align="center" prop="workingConditionFlow" />
<el-table-column label="温度(℃)" align="center" prop="temperature" />
<el-table-column label="压力(KPa)" align="center" prop="pressure" />
<el-table-column label="上报时间" align="center" prop="reportTime" />
<el-table-column label="上报时间" align="center" prop="reportTime" width="180px"/>
<el-table-column label="设备状态" align="center" prop="deviceStatus" >
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
......
......@@ -38,7 +38,7 @@
<el-table-column label="工况流量(m³/h)" align="center" prop="workingConditionFlow" />
<el-table-column label="温度(℃)" align="center" prop="temperature" />
<el-table-column label="压力(KPa)" align="center" prop="pressure" />
<el-table-column label="上报时间" align="center" prop="reportTime" />
<el-table-column label="上报时间" align="center" prop="reportTime" width="180px"/>
<el-table-column label="设备状态" align="center" prop="deviceStatus" >
</el-table-column>
</el-table>
......
......@@ -10,8 +10,8 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="状态" prop="planStatus">
<el-select v-model="queryParams.planStatus" placeholder="请选择状态" clearable size="small">
<el-form-item label="计划状态" prop="planStatus">
<el-select v-model="queryParams.planStatus" placeholder="请选择计划状态" clearable size="small">
<el-option
v-for="dict in typeOptions"
:key="dict.dictValue"
......@@ -52,7 +52,7 @@
</el-table-column>
<el-table-column label="地址" align="center" prop="address"/>
<el-table-column label="计划描述" align="center" prop="remarks"/>
<el-table-column label="状态" align="center" prop="planStatus">
<el-table-column label="计划状态" align="center" prop="planStatus">
<template slot-scope="scope">
<span v-if="scope.row.planStatus == 0">未生成工单</span>
<span v-if="scope.row.planStatus == 1">已生成工单</span>
......
<template>
<div class="app-container basicsInfo">
<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px">
<!-- <el-form-item label="工单类型" prop="orderType">
<el-select v-model="queryParams.orderType" placeholder="请选择工单类型" clearable size="small">
<el-option
......
<template>
<div class="app-container basicsInfo">
<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px">
<!-- <el-form-item label="工单类型" prop="orderType">
<el-select v-model="queryParams.orderType" placeholder="请选择工单类型" clearable size="small">
<el-option
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment